From 09f808d30fe96b23dcfd0e22c29b8fe778c15580 Mon Sep 17 00:00:00 2001 From: Claudio Fuentes Date: Wed, 19 Mar 2025 18:16:20 -0400 Subject: [PATCH 1/3] fix azure --- packages/integrations/src/azure/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/integrations/src/azure/config.ts b/packages/integrations/src/azure/config.ts index bc74281c57..9f23feb9f6 100644 --- a/packages/integrations/src/azure/config.ts +++ b/packages/integrations/src/azure/config.ts @@ -24,7 +24,7 @@ const config: { category: string; fetch: any; } = { - name: "AZURE", + name: "Azure", id: "azure", active: true, logo: imageBase64(), From 7b1261fc55fab177b5df16e5a4a1a28bfbfb912e Mon Sep 17 00:00:00 2001 From: Claudio Fuentes Date: Wed, 19 Mar 2025 18:30:55 -0400 Subject: [PATCH 2/3] fix vendors --- .../(dashboard)/[orgId]/vendors/(overview)/layout.tsx | 8 ++++---- .../{ => [orgId]}/vendors/[riskId]/comments/page.tsx | 0 .../(dashboard)/{ => [orgId]}/vendors/[riskId]/layout.tsx | 0 .../(dashboard)/{ => [orgId]}/vendors/[riskId]/page.tsx | 0 .../[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts | 0 .../[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts | 0 .../vendors/[riskId]/tasks/[taskId]/page.tsx | 0 .../{ => [orgId]}/vendors/[riskId]/tasks/search-params.ts | 0 .../vendors/components/create-risk-comment-form.tsx | 0 .../{ => [orgId]}/vendors/components/create-risk-form.tsx | 0 .../vendors/components/create-vendor-sheet.tsx | 0 .../vendors/components/inherent-risk-form.tsx | 0 .../vendors/components/residual-risk-form.tsx | 0 .../{ => [orgId]}/vendors/components/risk-overview.tsx | 0 .../vendors/components/task/create-task-comment-form.tsx | 0 .../vendors/components/task/create-task-form.tsx | 0 .../vendors/components/task/update-task-form.tsx | 0 .../vendors/components/task/update-task-overview-form.tsx | 0 .../{ => [orgId]}/vendors/components/update-risk-form.tsx | 0 .../vendors/register/VendorRegisterTable.tsx | 0 .../register/components/table/RiskRegisterColumns.tsx | 0 .../register/components/table/RiskRegisterFilters.tsx | 0 .../(dashboard)/{ => [orgId]}/vendors/register/layout.tsx | 0 .../(dashboard)/{ => [orgId]}/vendors/register/page.tsx | 0 .../{ => [orgId]}/vendors/register/search-params.ts | 0 25 files changed, 4 insertions(+), 4 deletions(-) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/[riskId]/comments/page.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/[riskId]/layout.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/[riskId]/page.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/[riskId]/tasks/[taskId]/page.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/[riskId]/tasks/search-params.ts (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/create-risk-comment-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/create-risk-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/create-vendor-sheet.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/inherent-risk-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/residual-risk-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/risk-overview.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/task/create-task-comment-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/task/create-task-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/task/update-task-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/task/update-task-overview-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/components/update-risk-form.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/register/VendorRegisterTable.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/register/components/table/RiskRegisterColumns.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/register/components/table/RiskRegisterFilters.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/register/layout.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/register/page.tsx (100%) rename apps/app/src/app/[locale]/(app)/(dashboard)/{ => [orgId]}/vendors/register/search-params.ts (100%) diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx index 2babdff01c..4e823ea1a2 100644 --- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx +++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx @@ -17,10 +17,10 @@ export default async function Layout({ diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/comments/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/comments/page.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/comments/page.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/comments/page.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/layout.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/page.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/page.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/page.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/page.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/page.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/page.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/search-params.ts similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/search-params.ts rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/search-params.ts diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-comment-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-comment-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-comment-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-comment-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/inherent-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/inherent-risk-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/inherent-risk-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/inherent-risk-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/residual-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/residual-risk-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/residual-risk-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/residual-risk-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/risk-overview.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/risk-overview.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/risk-overview.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/risk-overview.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-comment-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-comment-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-comment-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-comment-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-overview-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-overview-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/update-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/update-risk-form.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/VendorRegisterTable.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/VendorRegisterTable.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterColumns.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterColumns.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterColumns.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterFilters.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterFilters.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/layout.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/search-params.ts similarity index 100% rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/search-params.ts rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/search-params.ts From 12150d1a748a54ad8b1ed96e4d54666fc0795c45 Mon Sep 17 00:00:00 2001 From: Claudio Fuentes Date: Wed, 19 Mar 2025 18:31:58 -0400 Subject: [PATCH 3/3] refactor: update vendor layout to use organization ID for routing and improve menu structure --- .../[orgId]/vendors/[riskId]/layout.tsx | 16 ++++----- .../[orgId]/vendors/register/layout.tsx | 35 +++++++++++-------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx index f69ab0e564..7c74189739 100644 --- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx +++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx @@ -14,28 +14,28 @@ interface LayoutProps { export default async function Layout({ children, params }: LayoutProps) { const t = await getI18n(); const session = await auth(); + const user = session?.user; + const orgId = user?.organizationId; - if (!session || !session.user.organizationId) { + if (!session || !orgId) { redirect("/"); } const riskId = await params; - const risk = await getRisk(riskId.riskId, session.user.organizationId); + const risk = await getRisk(riskId.riskId, orgId); if (!risk) { redirect("/risk"); } return ( -
+
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx index 71699d2dc1..4e823ea1a2 100644 --- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx +++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx @@ -1,23 +1,30 @@ +import { auth } from "@/auth"; import { getI18n } from "@/locales/server"; import { SecondaryMenu } from "@bubba/ui/secondary-menu"; export default async function Layout({ - children, + children, }: { - children: React.ReactNode; + children: React.ReactNode; }) { - const t = await getI18n(); + const t = await getI18n(); + const session = await auth(); + const user = session?.user; + const orgId = user?.organizationId; - return ( -
- + return ( +
+ -
{children}
-
- ); +
{children}
+
+ ); }