Revert "feat: Remove default values from URL (#666)"

This reverts commit 9f0c5dc.
kernelci · Dec 13, 2024 · 0aa0b8f · 0aa0b8f
1 parent 9f0c5dc
commit 0aa0b8f
Show file tree

Hide file tree

Showing 42 changed files with 154 additions and 296 deletions.
diff --git a/dashboard/src/components/BootsTable/BootsTable.tsx b/dashboard/src/components/BootsTable/BootsTable.tsx
@@ -17,9 +17,10 @@ import { FormattedMessage, useIntl } from 'react-intl';
 
 import type {
   TestByCommitHash,
+  TestsTableFilter,
   TTestByCommitHashResponse,
 } from '@/types/tree/TreeDetails';
-import { possibleTestsTableFilter } from '@/types/general';
+import { possibleTestsTableFilter } from '@/types/tree/TreeDetails';
 
 import { TooltipDateTime } from '@/components/TooltipDateTime';
 
@@ -32,7 +33,7 @@ import {
   TableRow,
 } from '@/components/ui/table';
 
-import type { TestHistory, TestsTableFilter } from '@/types/general';
+import type { TestHistory } from '@/types/general';
 
 import BaseTable, { TableHead } from '@/components/Table/BaseTable';
 

diff --git a/dashboard/src/components/BuildDetails/BuildDetails.tsx b/dashboard/src/components/BuildDetails/BuildDetails.tsx
@@ -23,7 +23,7 @@ import { Sheet, SheetTrigger } from '@/components/Sheet';
 
 import { LogSheet } from '@/pages/TreeDetails/Tabs/LogSheet';
 
-import type { TableFilter, TestsTableFilter } from '@/types/general';
+import type { TableFilter, TestsTableFilter } from '@/types/tree/TreeDetails';
 
 import BuildDetailsTestSection from './BuildDetailsTestSection';
 

diff --git a/dashboard/src/components/BuildDetails/BuildDetailsTestSection.tsx b/dashboard/src/components/BuildDetails/BuildDetailsTestSection.tsx
@@ -8,9 +8,9 @@ import { Separator } from '@/components/ui/separator';
 
 import { useBuildTests } from '@/api/buildTests';
 
-import { TestsTable } from '@/components/TestsTable/TestsTable';
+import type { TableFilter, TestsTableFilter } from '@/types/tree/TreeDetails';
 
-import type { TableFilter, TestsTableFilter } from '@/types/general';
+import { TestsTable } from '@/components/TestsTable/TestsTable';
 
 interface IBuildDetailsTestSection {
   buildId: string;

diff --git a/dashboard/src/components/BuildsTable/BuildsTable.tsx b/dashboard/src/components/BuildsTable/BuildsTable.tsx
@@ -34,7 +34,11 @@ import TableStatusFilter from '@/components/Table/TableStatusFilter';
 import { TableBody, TableCell, TableRow } from '@/components/ui/table';
 import type { IAccordionItems } from '@/pages/TreeDetails/Tabs/Build/BuildAccordionContent';
 import AccordionBuildContent from '@/pages/TreeDetails/Tabs/Build/BuildAccordionContent';
-import type { AccordionItemBuilds } from '@/types/tree/TreeDetails';
+import type {
+  AccordionItemBuilds,
+  BuildsTableFilter,
+} from '@/types/tree/TreeDetails';
+import { possibleBuildsTableFilter } from '@/types/tree/TreeDetails';
 
 import { useBuildStatusCount } from '@/api/treeDetails';
 import WrapperTable from '@/pages/TreeDetails/Tabs/WrapperTable';
@@ -43,8 +47,6 @@ import { cn } from '@/lib/utils';
 import { usePaginationState } from '@/hooks/usePaginationState';
 
 import type { TableKeys } from '@/utils/constants/tables';
-import { possibleBuildsTableFilter } from '@/types/general';
-import type { BuildsTableFilter } from '@/types/general';
 
 export interface IBuildsTable {
   tableKey: TableKeys;

diff --git a/dashboard/src/components/Table/TableStatusFilter.tsx b/dashboard/src/components/Table/TableStatusFilter.tsx
@@ -2,8 +2,10 @@ import classNames from 'classnames';
 import { useCallback, useMemo } from 'react';
 
 import { Button } from '@/components/ui/button';
-
-import type { BuildsTableFilter, TestsTableFilter } from '@/types/general';
+import type {
+  BuildsTableFilter,
+  TestsTableFilter,
+} from '@/types/tree/TreeDetails';
 
 interface ITableStatusFilter {
   onClickBuild?: (value: BuildsTableFilter) => void;

diff --git a/dashboard/src/components/TestsTable/TestsTable.tsx b/dashboard/src/components/TestsTable/TestsTable.tsx
@@ -19,14 +19,10 @@ import { FormattedMessage, useIntl } from 'react-intl';
 
 import type { LinkProps } from '@tanstack/react-router';
 
-import { possibleTestsTableFilter } from '@/types/general';
+import type { TestsTableFilter } from '@/types/tree/TreeDetails';
+import { possibleTestsTableFilter } from '@/types/tree/TreeDetails';
 
-import type {
-  TestHistory,
-  TestsTableFilter,
-  TIndividualTest,
-  TPathTests,
-} from '@/types/general';
+import type { TestHistory, TIndividualTest, TPathTests } from '@/types/general';
 
 import { StatusTable } from '@/utils/constants/database';
 

diff --git a/dashboard/src/components/TreeListingPage/InputTime.tsx b/dashboard/src/components/TreeListingPage/InputTime.tsx
@@ -12,7 +12,7 @@ import { Controller, useForm } from 'react-hook-form';
 import type { ChangeEvent } from 'react';
 import { useCallback } from 'react';
 
-import { DEFAULT_TREE_INTERVAL_IN_DAYS } from '@/pages/treeConstants';
+import { DEFAULT_TIME_SEARCH } from '@/pages/treeConstants';
 import { toast } from '@/hooks/useToast';
 
 import DebounceInput from '../DebounceInput/DebounceInput';
@@ -37,7 +37,7 @@ export function InputTime(): JSX.Element {
   const { handleSubmit, control } = useForm<z.infer<typeof InputTimeSchema>>({
     resolver: zodResolver(InputTimeSchema),
     defaultValues: {
-      intervalInDays: `${DEFAULT_TREE_INTERVAL_IN_DAYS}`,
+      intervalInDays: `${DEFAULT_TIME_SEARCH}`,
     },
   });
 
@@ -94,7 +94,7 @@ export function InputTime(): JSX.Element {
         min={1}
         className={`${fieldError ? 'border-red' : 'border-gray'} mx-[10px] flex w-[100px] flex-1 rounded-md border`}
         startingValue={
-          interval ? interval.toString() : `${DEFAULT_TREE_INTERVAL_IN_DAYS}`
+          interval ? interval.toString() : `${DEFAULT_TIME_SEARCH}`
         }
         placeholder="7"
         {...rest}

diff --git a/dashboard/src/components/TreeListingPage/TreeTable.tsx b/dashboard/src/components/TreeListingPage/TreeTable.tsx
@@ -23,14 +23,15 @@ import { useSearch } from '@tanstack/react-router';
 import { TooltipDateTime } from '@/components/TooltipDateTime';
 
 import type { TreeTableBody } from '@/types/tree/Tree';
+import { zOrigin } from '@/types/general';
+
+import { formattedBreakLineValue } from '@/locales/messages';
+
 import {
   possibleBuildsTableFilter,
   possibleTestsTableFilter,
-  zOrigin,
   zPossibleTabValidator,
-} from '@/types/general';
-
-import { formattedBreakLineValue } from '@/locales/messages';
+} from '@/types/tree/TreeDetails';
 
 import { usePaginationState } from '@/hooks/usePaginationState';
 

diff --git a/dashboard/src/pages/BuildDetails/BuildDetails.tsx b/dashboard/src/pages/BuildDetails/BuildDetails.tsx
@@ -8,10 +8,10 @@ import {
   useRouterState,
 } from '@tanstack/react-router';
 
+import type { TestsTableFilter } from '@/types/tree/TreeDetails';
 import BuildDetails from '@/components/BuildDetails/BuildDetails';
 
 import { RedirectFrom } from '@/types/general';
-import type { TestsTableFilter } from '@/types/general';
 
 import TreeBuildDetails from '@/pages/TreeBuildDetails';
 import HardwareBuildDetails from '@/pages/HardwareBuildDetails';

diff --git a/dashboard/src/pages/Hardware/HardwareTable.tsx b/dashboard/src/pages/Hardware/HardwareTable.tsx
@@ -41,7 +41,7 @@ import { sumStatus } from '@/utils/status';
 
 import { usePaginationState } from '@/hooks/usePaginationState';
 
-import { zPossibleTabValidator } from '@/types/general';
+import { zPossibleTabValidator } from '@/types/tree/TreeDetails';
 
 import type { ListingTableColumnMeta } from '@/types/table';
 

diff --git a/dashboard/src/pages/HardwareBuildDetails/HardwareBuildDetails.tsx b/dashboard/src/pages/HardwareBuildDetails/HardwareBuildDetails.tsx
@@ -20,7 +20,7 @@ import {
 } from '@/components/Breadcrumb/Breadcrumb';
 
 import BuildDetails from '@/components/BuildDetails/BuildDetails';
-import type { TestsTableFilter } from '@/types/general';
+import type { TestsTableFilter } from '@/types/tree/TreeDetails';
 
 const HardwareBuildDetails = (): JSX.Element => {
   const searchParams = useSearch({ from: '/build/$buildId' });

diff --git a/dashboard/src/pages/TreeBuildDetails/TreeBuildDetails.tsx b/dashboard/src/pages/TreeBuildDetails/TreeBuildDetails.tsx
@@ -20,7 +20,7 @@ import {
 } from '@/components/Breadcrumb/Breadcrumb';
 
 import BuildDetails from '@/components/BuildDetails/BuildDetails';
-import type { TestsTableFilter } from '@/types/general';
+import type { TestsTableFilter } from '@/types/tree/TreeDetails';
 
 const TreeBuildDetails = (): JSX.Element => {
   const searchParams = useSearch({ from: '/build/$buildId' });

diff --git a/dashboard/src/pages/TreeDetails/Tabs/Boots/BootsTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/Boots/BootsTab.tsx
@@ -12,6 +12,7 @@ import { Skeleton } from '@/components/Skeleton';
 import { BootsTable } from '@/components/BootsTable/BootsTable';
 import MemoizedIssuesList from '@/components/Cards/IssuesList';
 import MemoizedHardwareTested from '@/components/Cards/HardwareTested';
+import type { TestsTableFilter } from '@/types/tree/TreeDetails';
 import {
   DesktopGrid,
   MobileGrid,
@@ -23,8 +24,7 @@ import MemoizedConfigList from '@/components/Tabs/Tests/ConfigsList';
 import MemoizedErrorsSummary from '@/components/Tabs/Tests/ErrorsSummary';
 
 import MemoizedStatusCard from '@/components/Tabs/Tests/StatusCard';
-
-import type { TestsTableFilter, TFilter } from '@/types/general';
+import type { TFilter } from '@/types/general';
 
 import TreeCommitNavigationGraph from '@/pages/TreeDetails/Tabs/TreeCommitNavigationGraph';
 
@@ -34,16 +34,16 @@ interface BootsTabProps {
 
 const BootsTab = ({ reqFilter }: BootsTabProps): JSX.Element => {
   const { treeId } = useParams({
-    from: '/tree/$treeId',
+    from: '/tree/$treeId/',
   });
   const { tableFilter, diffFilter } = useSearch({
-    from: '/tree/$treeId',
+    from: '/tree/$treeId/',
   });
   const currentPathFilter = diffFilter.bootPath
     ? Object.keys(diffFilter.bootPath)[0]
     : undefined;
 
-  const navigate = useNavigate({ from: '/tree/$treeId' });
+  const navigate = useNavigate({ from: '/tree/$treeId/' });
 
   const updatePathFilter = useCallback(
     (pathFilter: string) => {

diff --git a/dashboard/src/pages/TreeDetails/Tabs/Build/BuildTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/Build/BuildTab.tsx
@@ -36,7 +36,7 @@ const BuildTab = ({ treeDetailsData }: BuildTab): JSX.Element => {
   });
 
   const { diffFilter } = useSearch({
-    from: '/tree/$treeId',
+    from: '/tree/$treeId/',
   });
 
   const toggleFilterBySection = useCallback(

diff --git a/dashboard/src/pages/TreeDetails/Tabs/Build/TreeDetailsBuildsTable.tsx b/dashboard/src/pages/TreeDetails/Tabs/Build/TreeDetailsBuildsTable.tsx
@@ -11,8 +11,10 @@ import ColoredCircle from '@/components/ColoredCircle/ColoredCircle';
 import { ItemType } from '@/components/ListingItem/ListingItem';
 import { TableHeader } from '@/components/Table/TableHeader';
 import { TooltipDateTime } from '@/components/TooltipDateTime';
-import type { AccordionItemBuilds } from '@/types/tree/TreeDetails';
-import type { BuildsTableFilter } from '@/types/general';
+import type {
+  AccordionItemBuilds,
+  BuildsTableFilter,
+} from '@/types/tree/TreeDetails';
 
 export interface TTreeDetailsBuildsTable {
   buildItems: AccordionItemBuilds[];
@@ -104,9 +106,9 @@ const columns: ColumnDef<AccordionItemBuilds>[] = [
 export function TreeDetailsBuildsTable({
   buildItems,
 }: TTreeDetailsBuildsTable): JSX.Element {
-  const { treeId } = useParams({ from: '/tree/$treeId' });
-  const { tableFilter } = useSearch({ from: '/tree/$treeId' });
-  const navigate = useNavigate({ from: '/tree/$treeId' });
+  const { treeId } = useParams({ from: '/tree/$treeId/' });
+  const { tableFilter } = useSearch({ from: '/tree/$treeId/' });
+  const navigate = useNavigate({ from: '/tree/$treeId/' });
 
   const navigateToBuildDetails = useCallback(
     (buildId: string) => {

diff --git a/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx
@@ -10,6 +10,8 @@ import { Skeleton } from '@/components/Skeleton';
 import { useTreeDetails } from '@/api/treeDetails';
 import BaseCard from '@/components/Cards/BaseCard';
 
+import type { TestsTableFilter } from '@/types/tree/TreeDetails';
+
 import MemoizedIssuesList from '@/components/Cards/IssuesList';
 import MemoizedHardwareTested from '@/components/Cards/HardwareTested';
 
@@ -24,8 +26,7 @@ import MemoizedConfigList from '@/components/Tabs/Tests/ConfigsList';
 import MemoizedErrorsSummary from '@/components/Tabs/Tests/ErrorsSummary';
 
 import MemoizedStatusCard from '@/components/Tabs/Tests/StatusCard';
-
-import type { TestsTableFilter, TFilter } from '@/types/general';
+import type { TFilter } from '@/types/general';
 
 import TreeCommitNavigationGraph from '@/pages/TreeDetails/Tabs/TreeCommitNavigationGraph';
 
@@ -34,14 +35,14 @@ interface TestsTabProps {
 }
 
 const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
-  const { treeId } = useParams({ from: '/tree/$treeId' });
+  const { treeId } = useParams({ from: '/tree/$treeId/' });
   const { isLoading, data, error } = useTreeDetails({
     treeId: treeId ?? '',
     filter: reqFilter,
   });
 
   const { tableFilter, diffFilter } = useSearch({
-    from: '/tree/$treeId',
+    from: '/tree/$treeId/',
   });
   const currentPathFilter = diffFilter.testPath
     ? Object.keys(diffFilter.testPath)[0]

diff --git a/dashboard/src/pages/TreeDetails/Tabs/TreeCommitNavigationGraph.tsx b/dashboard/src/pages/TreeDetails/Tabs/TreeCommitNavigationGraph.tsx
@@ -10,10 +10,10 @@ const TreeCommitNavigationGraph = (): React.ReactNode => {
     currentPageTab,
     diffFilter,
     treeInfo: { gitUrl, gitBranch, headCommitHash },
-  } = useSearch({ from: '/tree/$treeId' });
+  } = useSearch({ from: '/tree/$treeId/' });
 
   const { treeId } = useParams({
-    from: '/tree/$treeId',
+    from: '/tree/$treeId/',
   });
 
   const navigate = useNavigate({

diff --git a/dashboard/src/pages/TreeDetails/Tabs/TreeDetailsTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/TreeDetailsTab.tsx
@@ -6,9 +6,11 @@ import { useCallback, useMemo } from 'react';
 import type { ITabItem } from '@/components/Tabs/Tabs';
 import Tabs from '@/components/Tabs/Tabs';
 
+import { zPossibleTabValidator } from '@/types/tree/TreeDetails';
+
 import type { ITreeDetails } from '@/pages/TreeDetails/TreeDetails';
 
-import { zPossibleTabValidator, type TFilter } from '@/types/general';
+import type { TFilter } from '@/types/general';
 
 import BuildTab from './Build';
 import BootsTab from './Boots';
@@ -33,7 +35,7 @@ const TreeDetailsTab = ({
   countElements,
 }: ITreeDetailsTab): JSX.Element => {
   const { currentPageTab } = useSearch({
-    from: '/tree/$treeId',
+    from: '/tree/$treeId/',
   });
   const navigate = useNavigate({ from: '/tree/$treeId' });
   const treeDetailsTab: ITabItem[] = useMemo(

diff --git a/dashboard/src/pages/TreeDetails/TreeDetails.tsx b/dashboard/src/pages/TreeDetails/TreeDetails.tsx
@@ -121,10 +121,10 @@ const TreeHeader = ({
 };
 
 function TreeDetails(): JSX.Element {
-  const { treeId } = useParams({ from: '/tree/$treeId' });
-  const searchParams = useSearch({ from: '/tree/$treeId' });
+  const { treeId } = useParams({ from: '/tree/$treeId/' });
+  const searchParams = useSearch({ from: '/tree/$treeId/' });
   const { diffFilter, treeInfo } = searchParams;
-  const navigate = useNavigate({ from: '/tree/$treeId' });
+  const navigate = useNavigate({ from: '/tree/$treeId/' });
 
   const reqFilter = mapFilterToReq(diffFilter);
 

diff --git a/dashboard/src/pages/TreeDetails/TreeDetailsFilter.tsx b/dashboard/src/pages/TreeDetails/TreeDetailsFilter.tsx
@@ -136,7 +136,7 @@ const TreeDetailsFilter = ({
   paramFilter,
   treeUrl,
 }: ITreeDetailsFilter): JSX.Element => {
-  const { treeId } = useParams({ from: '/tree/$treeId' });
+  const { treeId } = useParams({ from: '/tree/$treeId/' });
 
   const { data, isLoading } = useTreeDetails({
     treeId,

diff --git a/dashboard/src/pages/hardwareDetails/HardwareDetailsFilter.tsx b/dashboard/src/pages/hardwareDetails/HardwareDetailsFilter.tsx
@@ -158,7 +158,7 @@ const HardwareDetailsFilter = ({
   const isLoading = false;
 
   const navigate = useNavigate({
-    from: '/hardware/$hardwareId',
+    from: '/hardware/$hardwareId/',
   });
 
   const filter: TFilterCreate = useMemo(() => {

diff --git a/dashboard/src/pages/hardwareDetails/Tabs/Boots/BootsTab.tsx b/dashboard/src/pages/hardwareDetails/Tabs/Boots/BootsTab.tsx
@@ -12,6 +12,8 @@ import MemoizedIssuesList from '@/components/Cards/IssuesList';
 
 import type { THardwareDetails } from '@/types/hardware/hardwareDetails';
 
+import type { TestsTableFilter } from '@/types/tree/TreeDetails';
+
 import {
   DesktopGrid,
   MobileGrid,
@@ -23,7 +25,6 @@ import MemoizedConfigList from '@/components/Tabs/Tests/ConfigsList';
 import MemoizedErrorsSummary from '@/components/Tabs/Tests/ErrorsSummary';
 
 import HardwareCommitNavigationGraph from '@/pages/hardwareDetails/Tabs/HardwareCommitNavigationGraph';
-import type { TestsTableFilter } from '@/types/general';
 
 interface TBootsTab {
   boots: THardwareDetails['boots'];

diff --git a/dashboard/src/pages/hardwareDetails/Tabs/Build/BuildTab.tsx b/dashboard/src/pages/hardwareDetails/Tabs/Build/BuildTab.tsx
@@ -33,11 +33,11 @@ interface TBuildTab {
 
 const BuildTab = ({ builds, hardwareId, trees }: TBuildTab): JSX.Element => {
   const navigate = useNavigate({
-    from: '/hardware/$hardwareId',
+    from: '/hardware/$hardwareId/',
   });
 
   const { diffFilter } = useSearch({
-    from: '/hardware/$hardwareId',
+    from: '/hardware/$hardwareId/',
   });
 
   const toggleFilterBySection = useCallback(