refactor(ui): Refactor repositories/$repositoryId route and index page

Also refactor the page that is functioning only as a redirection component
that redirects either to the newest run results of the repository, or to
ORT run creation form, in case no runs exist yet for the repository.

Signed-off-by: Jyrki Keisala <[email protected]>

Author: Etsija

ui/src/routes/organizations/$orgId/products/$productId/repositories/$repoId/_repo-layout/runs/index.tsx

@@ -17,14 +17,10 @@
  * License-Filename: LICENSE
  */
 
+import { useQuery } from '@tanstack/react-query';
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { PlusIcon } from 'lucide-react';
 
-import { useRepositoriesServiceGetApiV1RepositoriesByRepositoryId } from '@/api/queries';
-import {
-  prefetchUseRepositoriesServiceGetApiV1RepositoriesByRepositoryId,
-  prefetchUseRepositoriesServiceGetApiV1RepositoriesByRepositoryIdRuns,
-} from '@/api/queries/prefetch';
 import { JobDurations } from '@/components/charts/job-durations';
 import { LoadingIndicator } from '@/components/loading-indicator';
 import { ToastError } from '@/components/toast-error';
@@ -36,6 +32,10 @@ import {
   CardHeader,
   CardTitle,
 } from '@/components/ui/card';
+import {
+  getOrtRunsByRepositoryIdOptions,
+  getRepositoryByIdOptions,
+} from '@/hey-api/@tanstack/react-query.gen';
 import { toast } from '@/lib/toast';
 import { getRepositoryTypeLabel } from '@/lib/types';
 import { paginationSearchParameterSchema } from '@/schemas';
@@ -56,8 +56,10 @@ const RepositoryRunsComponent = () => {
     error: repoError,
     isPending: repoIsPending,
     isError: repoIsError,
-  } = useRepositoriesServiceGetApiV1RepositoriesByRepositoryId({
-    repositoryId: Number.parseInt(params.repoId),
+  } = useQuery({
+    ...getRepositoryByIdOptions({
+      path: { repositoryId: Number.parseInt(params.repoId) },
+    }),
   });
 
   if (repoIsPending) {
@@ -146,23 +148,27 @@ export const Route = createFileRoute(
 )({
   validateSearch: paginationSearchParameterSchema,
   loaderDeps: ({ search: { page, pageSize } }) => ({ page, pageSize }),
-  loader: async ({ context, params, deps: { page, pageSize } }) => {
+  loader: async ({
+    context: { queryClient },
+    params,
+    deps: { page, pageSize },
+  }) => {
     await Promise.allSettled([
-      prefetchUseRepositoriesServiceGetApiV1RepositoriesByRepositoryId(
-        context.queryClient,
-        {
-          repositoryId: Number.parseInt(params.repoId),
-        }
-      ),
-      prefetchUseRepositoriesServiceGetApiV1RepositoriesByRepositoryIdRuns(
-        context.queryClient,
-        {
-          repositoryId: Number.parseInt(params.repoId),
-          limit: pageSize || defaultPageSize,
-          offset: page ? (page - 1) * (pageSize || defaultPageSize) : 0,
-          sort: '-index',
-        }
-      ),
+      queryClient.prefetchQuery({
+        ...getRepositoryByIdOptions({
+          path: { repositoryId: Number.parseInt(params.repoId) },
+        }),
+      }),
+      queryClient.prefetchQuery({
+        ...getOrtRunsByRepositoryIdOptions({
+          path: { repositoryId: Number.parseInt(params.repoId) },
+          query: {
+            limit: pageSize || defaultPageSize,
+            offset: page ? (page - 1) * (pageSize || defaultPageSize) : 0,
+            sort: '-index',
+          },
+        }),
+      }),
     ]);
   },
   component: RepositoryRunsComponent,

ui/src/routes/organizations/$orgId/products/$productId/repositories/$repoId/index.tsx

@@ -17,11 +17,12 @@
  * License-Filename: LICENSE
  */
 
+import { useQuery } from '@tanstack/react-query';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 
-import { useRepositoriesServiceGetApiV1RepositoriesByRepositoryIdRuns } from '@/api/queries';
 import { LoadingIndicator } from '@/components/loading-indicator';
 import { ToastError } from '@/components/toast-error';
+import { getOrtRunsByRepositoryIdOptions } from '@/hey-api/@tanstack/react-query.gen';
 import { toast } from '@/lib/toast';
 
 const RunRedirectComponent = () => {
@@ -33,15 +34,18 @@ const RunRedirectComponent = () => {
     isPending,
     isError,
     error,
-  } = useRepositoriesServiceGetApiV1RepositoriesByRepositoryIdRuns(
-    {
-      repositoryId: Number.parseInt(params.repoId),
-      limit: 1,
-      sort: '-index',
-    },
-    undefined,
-    { staleTime: 1000 }
-  );
+  } = useQuery({
+    ...getOrtRunsByRepositoryIdOptions({
+      path: {
+        repositoryId: Number.parseInt(params.repoId),
+      },
+      query: {
+        limit: 1,
+        sort: '-index',
+      },
+    }),
+    staleTime: 1000,
+  });
 
   if (isPending) {
     return <LoadingIndicator />;

ui/src/routes/organizations/$orgId/products/$productId/repositories/$repoId/route.tsx

@@ -19,8 +19,7 @@
 
 import { createFileRoute, Outlet } from '@tanstack/react-router';
 
-import { useRepositoriesServiceGetApiV1RepositoriesByRepositoryIdKey } from '@/api/queries';
-import { RepositoriesService } from '@/api/requests';
+import { getRepositoryByIdOptions } from '@/hey-api/@tanstack/react-query.gen';
 
 const Layout = () => {
   return <Outlet />;
@@ -31,14 +30,11 @@ export const Route = createFileRoute(
 )({
   loader: async ({ context, params }) => {
     const repo = await context.queryClient.ensureQueryData({
-      queryKey: [
-        useRepositoriesServiceGetApiV1RepositoriesByRepositoryIdKey,
-        params.repoId,
-      ],
-      queryFn: () =>
-        RepositoriesService.getApiV1RepositoriesByRepositoryId({
+      ...getRepositoryByIdOptions({
+        path: {
           repositoryId: Number.parseInt(params.repoId),
-        }),
+        },
+      }),
     });
     context.breadcrumbs.repo = repo.url;
   },