From da6e72f89f740d87661abc18b5d61d3db667dab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <nemile.re@gmail.com>
Date: Fri, 4 Apr 2025 12:01:37 +0400
Subject: [PATCH] Fix unauthenticated redirection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Émile Ré <nemile.re@gmail.com>
---
 .../src/pages/organizations/NoOrganizationLayout.tsx     | 9 ++++++---
 .../src/pages/organizations/OrganizationBreadcrumb.tsx   | 9 ++++++---
 .../src/pages/organizations/OrganizationLayout.tsx       | 9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apps/console/src/pages/organizations/NoOrganizationLayout.tsx b/apps/console/src/pages/organizations/NoOrganizationLayout.tsx
index cfd61e545..e5df74eee 100644
--- a/apps/console/src/pages/organizations/NoOrganizationLayout.tsx
+++ b/apps/console/src/pages/organizations/NoOrganizationLayout.tsx
@@ -12,6 +12,7 @@ import {
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
 import { Toaster } from "@/components/ui/toaster";
 import { cn } from "@/lib/utils";
+import ErrorBoundary from "@/components/ErrorBoundary";
 
 const BreadCrumbNavLink = ({
   to,
@@ -57,9 +58,11 @@ function BreadcrumbHome() {
 export default function NoOrganizationLayout() {
   return (
     <SidebarProvider>
-      <Suspense>
-        <AppSidebar className="p-4" />
-      </Suspense>
+      <ErrorBoundary>
+        <Suspense>
+          <AppSidebar className="p-4" />
+        </Suspense>
+      </ErrorBoundary>
       <SidebarInset>
         <div className="mx-auto w-lg md:w-xl lg:w-3xl xl:w-4xl 2xl:w-5xl p-8">
           <header className="flex shrink-0 items-center gap-2">
diff --git a/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx b/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx
index 04adc1ae1..47ff70998 100644
--- a/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx
+++ b/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx
@@ -19,6 +19,7 @@ import { OrganizationBreadcrumbBreadcrumbVendorOverviewQuery } from "./__generat
 import { OrganizationBreadcrumbOrganizationQuery } from "./__generated__/OrganizationBreadcrumbOrganizationQuery.graphql";
 import { OrganizationBreadcrumbBreadcrumbMitigationViewQuery } from "./__generated__/OrganizationBreadcrumbBreadcrumbMitigationViewQuery.graphql";
 import { OrganizationBreadcrumbBreadcrumbControlQuery } from "./__generated__/OrganizationBreadcrumbBreadcrumbControlQuery.graphql";
+import ErrorBoundary from "@/components/ErrorBoundary";
 
 const New = () => {
   return (
@@ -455,9 +456,11 @@ export function BreadCrumb() {
     <Routes>
       <Route
         element={
-          <Suspense>
-            <BreadCrumbOrganization />
-          </Suspense>
+          <ErrorBoundary>
+            <Suspense>
+              <BreadCrumbOrganization />
+            </Suspense>
+          </ErrorBoundary>
         }
       >
         <Route path="mitigations" element={<BreadcrumbMitigationList />}>
diff --git a/apps/console/src/pages/organizations/OrganizationLayout.tsx b/apps/console/src/pages/organizations/OrganizationLayout.tsx
index 30d3e65f2..eb74d5ea4 100644
--- a/apps/console/src/pages/organizations/OrganizationLayout.tsx
+++ b/apps/console/src/pages/organizations/OrganizationLayout.tsx
@@ -5,6 +5,7 @@ import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
 import { Toaster } from "@/components/ui/toaster";
 import { BreadCrumb } from "./OrganizationBreadcrumb";
 import { cn } from "@/lib/utils";
+import ErrorBoundary from "@/components/ErrorBoundary";
 
 export default function OrganizationLayout() {
   const controlMatch = useMatch(
@@ -16,9 +17,11 @@ export default function OrganizationLayout() {
 
   return (
     <SidebarProvider>
-      <Suspense>
-        <AppSidebar className="p-4" />
-      </Suspense>
+      <ErrorBoundary>
+        <Suspense>
+          <AppSidebar className="p-4" />
+        </Suspense>
+      </ErrorBoundary>
       <SidebarInset>
         <div
           className={cn(