From dff0db691367393c0ec697ce08e0ca3b50324a6c Mon Sep 17 00:00:00 2001 From: Lewis Carhart Date: Sun, 16 Mar 2025 14:18:54 -0400 Subject: [PATCH] Refactor Risk Management and RisksByStatus components for improved readability; standardize formatting and remove unnecessary imports. --- .../(dashboard)/risk/(overview)/page.tsx | 87 +++++++++---------- .../risks/charts/risks-by-status.tsx | 52 +++++------ 2 files changed, 69 insertions(+), 70 deletions(-) diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/page.tsx index c382a76233..bd4d24bd77 100644 --- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/page.tsx +++ b/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/page.tsx @@ -1,7 +1,6 @@ import { auth } from "@/auth"; import { RiskOverview } from "@/components/risks/charts/risk-overview"; import { RisksAssignee } from "@/components/risks/charts/risks-assignee"; -import { RisksByAssignee } from "@/components/risks/charts/risks-by-assignee"; import { getI18n } from "@/locales/server"; import { db } from "@bubba/db"; import type { Metadata } from "next"; @@ -10,65 +9,65 @@ import { unstable_cache } from "next/cache"; import { redirect } from "next/navigation"; export default async function RiskManagement({ - params, + params, }: { - params: Promise<{ locale: string }>; + params: Promise<{ locale: string }>; }) { - const { locale } = await params; - setStaticParamsLocale(locale); + const { locale } = await params; + setStaticParamsLocale(locale); - const session = await auth(); + const session = await auth(); - if (!session?.user?.organizationId) { - redirect("/onboarding"); - } + if (!session?.user?.organizationId) { + redirect("/onboarding"); + } - const overview = await getRiskOverview(session.user.organizationId); + const overview = await getRiskOverview(session.user.organizationId); - if (overview?.risks === 0) { - redirect("/risk/register"); - } + if (overview?.risks === 0) { + redirect("/risk/register"); + } - return ( -
-
- -
+ return ( +
+
+ +
-
- -
-
- ); +
+ +
+
+ ); } const getRiskOverview = unstable_cache( - async (organizationId: string) => { - return await db.$transaction(async (tx) => { - const [risks] = await Promise.all([ - tx.risk.count({ - where: { organizationId }, - }), - ]); + async (organizationId: string) => { + return await db.$transaction(async (tx) => { + const [risks] = await Promise.all([ + tx.risk.count({ + where: { organizationId }, + }), + ]); - return { - risks, - }; - }); - }, - ["risk-overview-cache"], + return { + risks, + }; + }); + }, + ["risk-overview-cache"], ); export async function generateMetadata({ - params, + params, }: { - params: Promise<{ locale: string }>; + params: Promise<{ locale: string }>; }): Promise { - const { locale } = await params; - setStaticParamsLocale(locale); - const t = await getI18n(); + const { locale } = await params; + setStaticParamsLocale(locale); + const t = await getI18n(); - return { - title: t("sidebar.risk"), - }; + return { + title: t("sidebar.risk"), + }; } diff --git a/apps/app/src/components/risks/charts/risks-by-status.tsx b/apps/app/src/components/risks/charts/risks-by-status.tsx index 011fd64ed7..ca2ec6be3d 100644 --- a/apps/app/src/components/risks/charts/risks-by-status.tsx +++ b/apps/app/src/components/risks/charts/risks-by-status.tsx @@ -5,39 +5,39 @@ import { Card, CardHeader, CardTitle, CardContent } from "@bubba/ui/card"; import { getI18n } from "@/locales/server"; interface Props { - organizationId: string; + organizationId: string; } export async function RisksByStatus({ organizationId }: Props) { - const t = await getI18n(); + const t = await getI18n(); - const risks = await getRisksByStatus(organizationId); + const risks = await getRisksByStatus(organizationId); - const data = risks.map((risk) => ({ - name: risk.status, - value: risk._count, - })); + const data = risks.map((risk) => ({ + name: risk.status, + value: risk._count, + })); - return ( - - - {t("dashboard.risk_status")} - - - - - - ); + return ( + + + {t("dashboard.risk_status")} + + + + + + ); } const getRisksByStatus = unstable_cache( - async (organizationId: string) => { - return await db.risk.groupBy({ - by: ["status"], - where: { organizationId }, - _count: true, - }); - }, - ["risks-by-status"], - { tags: ["risks", "status"] }, + async (organizationId: string) => { + return await db.risk.groupBy({ + by: ["status"], + where: { organizationId }, + _count: true, + }); + }, + ["risks-by-status"], + { tags: ["risks", "status"] }, );