From dbd3742bbe9b9da305673fd841b482ccdfab854d Mon Sep 17 00:00:00 2001
From: Nawaz Dhandala <hello@nawazdhandala.com>
Date: Thu, 8 Jan 2026 19:22:15 +0000
Subject: [PATCH] Refactor routing in ExceptionsTable and ExceptionsRoutes for
 improved clarity and structure

---
 .../Components/Exceptions/ExceptionsTable.tsx |  2 +-
 Dashboard/src/Routes/ExceptionsRoutes.tsx     | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx b/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx
index 5aa1caf396..f67954fab1 100644
--- a/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx
+++ b/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx
@@ -36,7 +36,7 @@ const TelemetryExceptionTable: FunctionComponent<ComponentProps> = (
   props: ComponentProps,
 ): ReactElement => {
   let viewRoute: Route = RouteUtil.populateRouteParams(
-    RouteMap[PageMap.TELEMETRY_EXCEPTIONS_ROOT]!,
+    RouteMap[PageMap.EXCEPTIONS_VIEW]!,
   );
 
   if (props.telemetryServiceId) {
diff --git a/Dashboard/src/Routes/ExceptionsRoutes.tsx b/Dashboard/src/Routes/ExceptionsRoutes.tsx
index 42d45a47e0..a27dd581ab 100644
--- a/Dashboard/src/Routes/ExceptionsRoutes.tsx
+++ b/Dashboard/src/Routes/ExceptionsRoutes.tsx
@@ -91,23 +91,24 @@ const ExceptionsRoutes: FunctionComponent<ComponentProps> = (
             </Suspense>
           }
         />
+      </PageRoute>
 
+      {/* Exception View - separate from main layout */}
+      <PageRoute
+        path={ExceptionsRoutePath[PageMap.EXCEPTIONS_VIEW] || ""}
+        element={<ExceptionViewLayout {...props} />}
+      >
         <PageRoute
-          path={ExceptionsRoutePath[PageMap.EXCEPTIONS_VIEW] || ""}
-          element={<ExceptionViewLayout {...props} />}
-        >
-          <PageRoute
-            index
-            element={
-              <Suspense fallback={Loader}>
-                <ExceptionView
-                  {...props}
-                  pageRoute={RouteMap[PageMap.EXCEPTIONS_VIEW] as Route}
-                />
-              </Suspense>
-            }
-          />
-        </PageRoute>
+          index
+          element={
+            <Suspense fallback={Loader}>
+              <ExceptionView
+                {...props}
+                pageRoute={RouteMap[PageMap.EXCEPTIONS_VIEW] as Route}
+              />
+            </Suspense>
+          }
+        />
       </PageRoute>
     </Routes>
   );