fix: breadcrumb params

kernelci · Nov 18, 2024 · 54a72fe · 54a72fe
1 parent bebe43e
commit 54a72fe
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/dashboard/src/components/TreeListingPage/TreeTable.tsx b/dashboard/src/components/TreeListingPage/TreeTable.tsx
@@ -218,7 +218,7 @@ export function TreeTable({ treeTableRows }: ITreeTable): JSX.Element {
         to: '/tree/$treeId',
         params: { treeId: row.original.id },
 
-        search: {
+        search: previousSearch => ({
           tableFilter: {
             bootsTable: possibleTestsTableFilter[0],
             buildsTable: possibleBuildsTableFilter[2],
@@ -234,7 +234,8 @@ export function TreeTable({ treeTableRows }: ITreeTable): JSX.Element {
             commitName: row.original.commitName,
             headCommitHash: row.original.id,
           },
-        },
+          intervalInDays: previousSearch.intervalInDays,
+        }),
       };
     },
     [origin],

diff --git a/dashboard/src/pages/TreeDetails/TreeDetails.tsx b/dashboard/src/pages/TreeDetails/TreeDetails.tsx
@@ -226,7 +226,15 @@ function TreeDetails(): JSX.Element {
       <Breadcrumb>
         <BreadcrumbList>
           <BreadcrumbItem>
-            <BreadcrumbLink to="/tree" search={searchParams}>
+            <BreadcrumbLink
+              to="/tree"
+              search={previousParams => {
+                return {
+                  intervalInDays: previousParams.intervalInDays,
+                  origin: previousParams.origin,
+                };
+              }}
+            >
               <FormattedMessage id="tree.path" />
             </BreadcrumbLink>
           </BreadcrumbItem>

diff --git a/dashboard/src/pages/hardwareDetails/HardwareDetails.tsx b/dashboard/src/pages/hardwareDetails/HardwareDetails.tsx
@@ -68,7 +68,11 @@ function HardwareDetails(): JSX.Element {
             <BreadcrumbLink
               to="/hardware"
               search={previousParams => {
-                return { ...previousParams, searchParams };
+                return {
+                  intervalInDays: previousParams.intervalInDays,
+                  origin: previousParams.origin,
+                  hardwareSearch: previousParams.hardwareSearch,
+                };
               }}
             >
               <FormattedMessage id="hardware.path" />

diff --git a/dashboard/src/routes/hardware/route.tsx b/dashboard/src/routes/hardware/route.tsx
@@ -3,12 +3,10 @@ import { z } from 'zod';
 
 import { makeZIntervalInDays } from '@/types/general';
 import { DEFAULT_HARDWARE_INTERVAL_IN_DAYS } from '@/utils/constants/hardware';
-import { zTableFilterInfoValidator } from '@/types/tree/TreeDetails';
 
 const zHardwareSchema = z.object({
   intervalInDays: makeZIntervalInDays(DEFAULT_HARDWARE_INTERVAL_IN_DAYS),
   hardwareSearch: z.string().optional().catch(undefined),
-  tableFilter: zTableFilterInfoValidator,
 });
 
 export const Route = createFileRoute('/hardware')({