wip

dashboard/src/api/issue.ts

@@ -18,7 +18,7 @@ const fetchIssueListing = async (
 };
 
 export const useIssueListing = (): UseQueryResult<IssueListingResponse> => {
-  const { origin, intervalInDays } = useSearch({ from: '/_main/issue' });
+  const { origin, intervalInDays } = useSearch({ from: '/_main/issues' });
 
   const queryKey = ['issueTable', origin, intervalInDays];
 

dashboard/src/components/IssueTable/IssueTable.tsx

@@ -51,7 +51,7 @@ const getLinkProps = (
     row.original.git_commit_hash !== undefined
   ) {
     return {
-      from: '/issue',
+      from: '/issues',
       to: '/tree/$treeId',
       params: { treeId: row.original.git_commit_hash },
       state: s => s,
@@ -69,7 +69,7 @@ const getLinkProps = (
   }
 
   return {
-    from: '/issue',
+    from: '/issues',
     to: '/issue/$issueId',
     params: { issueId: row.original.id },
     state: s => ({
@@ -97,12 +97,6 @@ const columns: ColumnDef<IssueListingTableItem>[] = [
         row.original.id
       ),
   },
-  {
-    accessorKey: 'version',
-    header: ({ column }): JSX.Element => (
-      <TableHeader column={column} intlKey="issueDetails.version" />
-    ),
-  },
   {
     id: 'culprit',
     accessorFn: (original, _): boolean[] => {
@@ -162,8 +156,8 @@ interface IIssueTable {
 }
 
 export const IssueTable = ({ issueListing }: IIssueTable): JSX.Element => {
-  const { listingSize } = useSearch({ strict: false });
-  const navigate = useNavigate({ from: '/issue' });
+  const { listingSize } = useSearch({ from: '/_main/issues' });
+  const navigate = useNavigate({ from: '/issues' });
 
   const [sorting, setSorting] = useState<SortingState>([
     {
@@ -267,7 +261,7 @@ export const IssueTable = ({ issueListing }: IIssueTable): JSX.Element => {
           />
         </span>
         <div className="flex items-center justify-between gap-10">
-          <MemoizedInputTime navigateFrom="/issue" />
+          <MemoizedInputTime navigateFrom="/issues" />
           <PaginationInfo
             table={table}
             intlLabel="global.issues"

dashboard/src/components/OpenGraphTags/ListingOGTags.tsx

@@ -27,7 +27,7 @@ const ListingOGTags = ({
       case '/hardware':
         descriptionId = 'hardwareListing.description';
         break;
-      case '/issue':
+      case '/issues':
         descriptionId = 'issueListing.description';
         break;
     }
@@ -45,7 +45,7 @@ const ListingOGTags = ({
         return formatMessage({ id: 'treeListing.title' });
       case '/hardware':
         return formatMessage({ id: 'hardwareListing.title' });
-      case '/issue':
+      case '/issues':
         return formatMessage({ id: 'issueListing.title' });
     }
   }, [formatMessage, monitor]);

dashboard/src/components/SideMenu/SideMenu.tsx

@@ -87,7 +87,7 @@ const SideMenu = (): JSX.Element => {
       selected: false,
     },
     {
-      navigateTo: '/issue',
+      navigateTo: '/issues',
       idIntl: 'routes.issueMonitor',
       icon: <RxRadiobutton className="size-5" />,
       selected: false,

dashboard/src/components/TopBar/TopBar.tsx

@@ -19,8 +19,8 @@ const getTargetPath = (basePath: string): PossibleMonitorPath => {
       return '/tree';
     case 'hardware':
       return '/hardware';
-    case 'issue':
-      return '/issue';
+    case 'issues':
+      return '/issues';
     default:
       return '/tree';
   }
@@ -79,6 +79,8 @@ const TitleName = ({ basePath }: { basePath: string }): JSX.Element => {
       return <FormattedMessage id="routes.treeMonitor" />;
     case 'hardware':
       return <FormattedMessage id="routes.hardwareMonitor" />;
+    case 'issues':
+      return <FormattedMessage id="routes.issueMonitor" />;
     case 'build':
       return <FormattedMessage id="routes.buildDetails" />;
     case 'test':
@@ -104,7 +106,7 @@ const TopBar = (): JSX.Element => {
         </span>
         {(basePath === 'tree' ||
           basePath === 'hardware' ||
-          basePath === 'issue') && <OriginSelect basePath={basePath} />}
+          basePath === 'issues') && <OriginSelect basePath={basePath} />}
       </div>
     </div>
   );

dashboard/src/pages/IssueListing/IssueListing.tsx

@@ -20,7 +20,7 @@ const IssueListing = (): JSX.Element => {
 
   const issueSearch = z.string().catch('').parse(unsafeIssueSearch);
 
-  const navigate = useNavigate({ from: '/issue' });
+  const navigate = useNavigate({ from: '/issues' });
 
   const onInputSearchTextChange = useCallback(
     (e: ChangeEvent<HTMLInputElement>) => {
@@ -38,7 +38,7 @@ const IssueListing = (): JSX.Element => {
 
   return (
     <>
-      <MemoizedListingOGTags monitor="/issue" search={issueSearch} />
+      <MemoizedListingOGTags monitor="/issues" search={issueSearch} />
       <div className="fixed top-0 z-10 mx-[380px] flex w-full pt-5 pr-12 pl-6">
         <div className="flex w-2/3 items-center px-6">
           <DebounceInput

dashboard/src/routeTree.gen.ts

@@ -14,9 +14,11 @@ import { Route as rootRoute } from './routes/__root'
 import { Route as MainRouteImport } from './routes/_main/route'
 import { Route as MainIndexImport } from './routes/_main/index'
 import { Route as MainTreeRouteImport } from './routes/_main/tree/route'
+import { Route as MainIssuesRouteImport } from './routes/_main/issues/route'
 import { Route as MainIssueRouteImport } from './routes/_main/issue/route'
 import { Route as MainHardwareRouteImport } from './routes/_main/hardware/route'
 import { Route as MainTreeIndexImport } from './routes/_main/tree/index'
+import { Route as MainIssuesIndexImport } from './routes/_main/issues/index'
 import { Route as MainIssueIndexImport } from './routes/_main/issue/index'
 import { Route as MainHardwareIndexImport } from './routes/_main/hardware/index'
 import { Route as MainTreeTreeIdRouteImport } from './routes/_main/tree/$treeId/route'
@@ -66,6 +68,12 @@ const MainTreeRouteRoute = MainTreeRouteImport.update({
   getParentRoute: () => MainRouteRoute,
 } as any)
 
+const MainIssuesRouteRoute = MainIssuesRouteImport.update({
+  id: '/issues',
+  path: '/issues',
+  getParentRoute: () => MainRouteRoute,
+} as any)
+
 const MainIssueRouteRoute = MainIssueRouteImport.update({
   id: '/issue',
   path: '/issue',
@@ -84,6 +92,12 @@ const MainTreeIndexRoute = MainTreeIndexImport.update({
   getParentRoute: () => MainTreeRouteRoute,
 } as any)
 
+const MainIssuesIndexRoute = MainIssuesIndexImport.update({
+  id: '/',
+  path: '/',
+  getParentRoute: () => MainIssuesRouteRoute,
+} as any)
+
 const MainIssueIndexRoute = MainIssueIndexImport.update({
   id: '/',
   path: '/',
@@ -300,6 +314,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof MainIssueRouteImport
       parentRoute: typeof MainRouteImport
     }
+    '/_main/issues': {
+      id: '/_main/issues'
+      path: '/issues'
+      fullPath: '/issues'
+      preLoaderRoute: typeof MainIssuesRouteImport
+      parentRoute: typeof MainRouteImport
+    }
     '/_main/tree': {
       id: '/_main/tree'
       path: '/tree'
@@ -370,6 +391,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof MainIssueIndexImport
       parentRoute: typeof MainIssueRouteImport
     }
+    '/_main/issues/': {
+      id: '/_main/issues/'
+      path: '/'
+      fullPath: '/issues/'
+      preLoaderRoute: typeof MainIssuesIndexImport
+      parentRoute: typeof MainIssuesRouteImport
+    }
     '/_main/tree/': {
       id: '/_main/tree/'
       path: '/'
@@ -600,6 +628,18 @@ const MainIssueRouteRouteWithChildren = MainIssueRouteRoute._addFileChildren(
   MainIssueRouteRouteChildren,
 )
 
+interface MainIssuesRouteRouteChildren {
+  MainIssuesIndexRoute: typeof MainIssuesIndexRoute
+}
+
+const MainIssuesRouteRouteChildren: MainIssuesRouteRouteChildren = {
+  MainIssuesIndexRoute: MainIssuesIndexRoute,
+}
+
+const MainIssuesRouteRouteWithChildren = MainIssuesRouteRoute._addFileChildren(
+  MainIssuesRouteRouteChildren,
+)
+
 interface MainTreeTreeIdRouteRouteChildren {
   MainTreeTreeIdIndexRoute: typeof MainTreeTreeIdIndexRoute
   MainTreeTreeIdBuildBuildIdIndexRoute: typeof MainTreeTreeIdBuildBuildIdIndexRoute
@@ -717,6 +757,7 @@ const MainalternativesTTestIdRouteRouteWithChildren =
 interface MainRouteRouteChildren {
   MainHardwareRouteRoute: typeof MainHardwareRouteRouteWithChildren
   MainIssueRouteRoute: typeof MainIssueRouteRouteWithChildren
+  MainIssuesRouteRoute: typeof MainIssuesRouteRouteWithChildren
   MainTreeRouteRoute: typeof MainTreeRouteRouteWithChildren
   MainIndexRoute: typeof MainIndexRoute
   MainalternativesIRouteRoute: typeof MainalternativesIRouteRouteWithChildren
@@ -729,6 +770,7 @@ interface MainRouteRouteChildren {
 const MainRouteRouteChildren: MainRouteRouteChildren = {
   MainHardwareRouteRoute: MainHardwareRouteRouteWithChildren,
   MainIssueRouteRoute: MainIssueRouteRouteWithChildren,
+  MainIssuesRouteRoute: MainIssuesRouteRouteWithChildren,
   MainTreeRouteRoute: MainTreeRouteRouteWithChildren,
   MainIndexRoute: MainIndexRoute,
   MainalternativesIRouteRoute: MainalternativesIRouteRouteWithChildren,
@@ -748,6 +790,7 @@ export interface FileRoutesByFullPath {
   '': typeof MainRouteRouteWithChildren
   '/hardware': typeof MainHardwareRouteRouteWithChildren
   '/issue': typeof MainIssueRouteRouteWithChildren
+  '/issues': typeof MainIssuesRouteRouteWithChildren
   '/tree': typeof MainTreeRouteRouteWithChildren
   '/': typeof MainIndexRoute
   '/i': typeof MainalternativesIRouteRouteWithChildren
@@ -758,6 +801,7 @@ export interface FileRoutesByFullPath {
   '/tree/$treeId': typeof MainTreeTreeIdRouteRouteWithChildren
   '/hardware/': typeof MainHardwareIndexRoute
   '/issue/': typeof MainIssueIndexRoute
+  '/issues/': typeof MainIssuesIndexRoute
   '/tree/': typeof MainTreeIndexRoute
   '/b/$buildId': typeof MainalternativesBBuildIdRouteRouteWithChildren
   '/i/$issueId': typeof MainalternativesIIssueIdRouteRouteWithChildren
@@ -786,6 +830,7 @@ export interface FileRoutesByTo {
   '/': typeof MainIndexRoute
   '/hardware': typeof MainHardwareIndexRoute
   '/issue': typeof MainIssueIndexRoute
+  '/issues': typeof MainIssuesIndexRoute
   '/tree': typeof MainTreeIndexRoute
   '/i': typeof MainalternativesIIndexRoute
   '/build/$buildId': typeof MainBuildBuildIdIndexRoute
@@ -812,6 +857,7 @@ export interface FileRoutesById {
   '/_main': typeof MainRouteRouteWithChildren
   '/_main/hardware': typeof MainHardwareRouteRouteWithChildren
   '/_main/issue': typeof MainIssueRouteRouteWithChildren
+  '/_main/issues': typeof MainIssuesRouteRouteWithChildren
   '/_main/tree': typeof MainTreeRouteRouteWithChildren
   '/_main/': typeof MainIndexRoute
   '/_main/(alternatives)/i': typeof MainalternativesIRouteRouteWithChildren
@@ -822,6 +868,7 @@ export interface FileRoutesById {
   '/_main/tree/$treeId': typeof MainTreeTreeIdRouteRouteWithChildren
   '/_main/hardware/': typeof MainHardwareIndexRoute
   '/_main/issue/': typeof MainIssueIndexRoute
+  '/_main/issues/': typeof MainIssuesIndexRoute
   '/_main/tree/': typeof MainTreeIndexRoute
   '/_main/(alternatives)/b/$buildId': typeof MainalternativesBBuildIdRouteRouteWithChildren
   '/_main/(alternatives)/i/$issueId': typeof MainalternativesIIssueIdRouteRouteWithChildren
@@ -852,6 +899,7 @@ export interface FileRouteTypes {
     | ''
     | '/hardware'
     | '/issue'
+    | '/issues'
     | '/tree'
     | '/'
     | '/i'
@@ -862,6 +910,7 @@ export interface FileRouteTypes {
     | '/tree/$treeId'
     | '/hardware/'
     | '/issue/'
+    | '/issues/'
     | '/tree/'
     | '/b/$buildId'
     | '/i/$issueId'
@@ -889,6 +938,7 @@ export interface FileRouteTypes {
     | '/'
     | '/hardware'
     | '/issue'
+    | '/issues'
     | '/tree'
     | '/i'
     | '/build/$buildId'
@@ -913,6 +963,7 @@ export interface FileRouteTypes {
     | '/_main'
     | '/_main/hardware'
     | '/_main/issue'
+    | '/_main/issues'
     | '/_main/tree'
     | '/_main/'
     | '/_main/(alternatives)/i'
@@ -923,6 +974,7 @@ export interface FileRouteTypes {
     | '/_main/tree/$treeId'
     | '/_main/hardware/'
     | '/_main/issue/'
+    | '/_main/issues/'
     | '/_main/tree/'
     | '/_main/(alternatives)/b/$buildId'
     | '/_main/(alternatives)/i/$issueId'
@@ -974,6 +1026,7 @@ export const routeTree = rootRoute
       "children": [
         "/_main/hardware",
         "/_main/issue",
+        "/_main/issues",
         "/_main/tree",
         "/_main/",
         "/_main/(alternatives)/i",
@@ -999,6 +1052,13 @@ export const routeTree = rootRoute
         "/_main/issue/"
       ]
     },
+    "/_main/issues": {
+      "filePath": "_main/issues/route.tsx",
+      "parent": "/_main",
+      "children": [
+        "/_main/issues/"
+      ]
+    },
     "/_main/tree": {
       "filePath": "_main/tree/route.tsx",
       "parent": "/_main",
@@ -1071,6 +1131,10 @@ export const routeTree = rootRoute
       "filePath": "_main/issue/index.tsx",
       "parent": "/_main/issue"
     },
+    "/_main/issues/": {
+      "filePath": "_main/issues/index.tsx",
+      "parent": "/_main/issues"
+    },
     "/_main/tree/": {
       "filePath": "_main/tree/index.tsx",
       "parent": "/_main/tree"

dashboard/src/routes/_main/(alternatives)/i/index.tsx

@@ -4,7 +4,7 @@ export const Route = createFileRoute('/_main/(alternatives)/i/')({
   loaderDeps: ({ search }) => ({ search }),
   loader: ({ deps, params }) => {
     throw redirect({
-      to: '/issue',
+      to: '/issues',
       search: deps.search,
       params,
     });

dashboard/src/routes/_main/(alternatives)/i/route.tsx

@@ -7,13 +7,13 @@ import {
 import {
   issueListingDefaultValues,
   issueListingSearchSchema,
-} from '@/routes/_main/issue/route';
+} from '@/routes/_main/issues/route';
 
 export const Route = createFileRoute('/_main/(alternatives)/i')({
   loaderDeps: ({ search }) => ({ search }),
   loader: ({ deps, params }) => {
     throw redirect({
-      to: '/issue',
+      to: '/issues',
       search: deps.search,
       params,
     });

dashboard/src/routes/_main/issue/index.tsx

@@ -1,7 +1,12 @@
-import { createFileRoute } from '@tanstack/react-router';
-
-import IssueListing from '@/pages/IssueListing/IssueListing';
+import { createFileRoute, redirect } from '@tanstack/react-router';
 
 export const Route = createFileRoute('/_main/issue/')({
-  component: IssueListing,
+  loaderDeps: ({ search }) => ({ search }),
+  loader: ({ deps, params }) => {
+    throw redirect({
+      to: '/issues',
+      search: deps.search,
+      params,
+    });
+  },
 });