refactor: remove redundant code replaced by shared library (#695)

caponetto · web-flow · commit fa36626bd44c · 2025-10-30T11:14:11.000Z
Signed-off-by: Guilherme Caponetto &lt;638737+caponetto@users.noreply.github.com&gt;
diff --git a/workspaces/frontend/src/__mocks__/utils.ts b/workspaces/frontend/src/__mocks__/utils.ts
diff --git a/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/application.cy.ts b/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/application.cy.ts
@@ -1,7 +1,7 @@
+import { mockModArchResponse } from 'mod-arch-core';
 import { pageNotfound } from '~/__tests__/cypress/cypress/pages/pageNotFound';
 import { home } from '~/__tests__/cypress/cypress/pages/home';
 import { mockNamespaces } from '~/__mocks__/mockNamespaces';
-import { mockBFFResponse } from '~/__mocks__/utils';
 import { mockWorkspace1 } from '~/shared/mock/mockNotebookServiceData';
 import { navBar } from '~/__tests__/cypress/cypress/pages/navBar';
 
@@ -12,10 +12,10 @@ describe('Application', () => {
 
   it('Home page should have primary button', () => {
     cy.intercept('GET', '/api/v1/namespaces', {
-      body: mockBFFResponse(mockNamespaces),
+      body: mockModArchResponse(mockNamespaces),
     }).as('getNamespaces');
     cy.intercept('GET', `/api/v1/workspaces/${mockNamespaces[0].name}`, {
-      body: mockBFFResponse([mockWorkspace1]),
+      body: mockModArchResponse([mockWorkspace1]),
     }).as('getWorkspaces');
 
     home.visit();
diff --git a/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/WorkspaceDetailsActivity.cy.ts b/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/WorkspaceDetailsActivity.cy.ts
@@ -1,18 +1,18 @@
-import { mockBFFResponse } from '~/__mocks__/utils';
+import { mockModArchResponse } from 'mod-arch-core';
 import { mockNamespaces } from '~/__mocks__/mockNamespaces';
 import { mockWorkspaces } from '~/__tests__/cypress/cypress/tests/mocked/workspace.mock';
 import { navBar } from '~/__tests__/cypress/cypress/pages/navBar';
 
 describe('WorkspaceDetailsActivity Component', () => {
   beforeEach(() => {
     cy.intercept('GET', '/api/v1/namespaces', {
-      body: mockBFFResponse(mockNamespaces),
+      body: mockModArchResponse(mockNamespaces),
     }).as('getNamespaces');
     cy.intercept('GET', '/api/v1/workspaces', {
-      body: mockBFFResponse(mockWorkspaces),
+      body: mockModArchResponse(mockWorkspaces),
     }).as('getWorkspaces');
     cy.intercept('GET', '/api/v1/workspaces/default', {
-      body: mockBFFResponse(mockWorkspaces),
+      body: mockModArchResponse(mockWorkspaces),
     }).as('getDefaultWorkspaces');
     cy.visit('/');
     cy.wait('@getNamespaces');
diff --git a/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/Workspaces.cy.ts b/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/Workspaces.cy.ts
@@ -1,5 +1,5 @@
+import { mockModArchResponse } from 'mod-arch-core';
 import { mockNamespaces } from '~/__mocks__/mockNamespaces';
-import { mockBFFResponse } from '~/__mocks__/utils';
 import { home } from '~/__tests__/cypress/cypress/pages/home';
 import {
   mockWorkspaces,
@@ -26,11 +26,11 @@ describe('Workspaces Tests', () => {
     home.visit();
 
     cy.intercept('GET', '/api/v1/namespaces', {
-      body: mockBFFResponse(mockNamespaces),
+      body: mockModArchResponse(mockNamespaces),
     }).as('getNamespaces');
 
     cy.intercept('GET', '/api/v1/workspaces', {
-      body: mockBFFResponse(mockWorkspaces),
+      body: mockModArchResponse(mockWorkspaces),
     }).as('getWorkspaces');
     cy.wait('@getWorkspaces');
   });
@@ -65,15 +65,15 @@ describe('Workspace by namespace functionality', () => {
     home.visit();
 
     cy.intercept('GET', '/api/v1/namespaces', {
-      body: mockBFFResponse(mockNamespaces),
+      body: mockModArchResponse(mockNamespaces),
     }).as('getNamespaces');
 
-    cy.intercept('GET', '/api/v1/workspaces', { body: mockBFFResponse(mockWorkspaces) }).as(
+    cy.intercept('GET', '/api/v1/workspaces', { body: mockModArchResponse(mockWorkspaces) }).as(
       'getWorkspaces',
     );
 
     cy.intercept('GET', '/api/v1/workspaces/kubeflow', {
-      body: mockBFFResponse(mockWorkspacesByNS),
+      body: mockModArchResponse(mockWorkspacesByNS),
     }).as('getKubeflowWorkspaces');
 
     cy.wait('@getNamespaces');
@@ -107,14 +107,14 @@ describe('Workspaces Component', () => {
 
     cy.visit('/');
     cy.intercept('GET', '/api/v1/namespaces', {
-      body: mockBFFResponse(mockNamespaces),
+      body: mockModArchResponse(mockNamespaces),
     }).as('getNamespaces');
     cy.wait('@getNamespaces');
     cy.intercept('GET', '/api/v1/workspaces', {
-      body: mockBFFResponse(mockWorkspaces),
+      body: mockModArchResponse(mockWorkspaces),
     }).as('getWorkspaces');
     cy.intercept('GET', '/api/v1/workspaces/kubeflow', {
-      body: mockBFFResponse(mockWorkspacesByNS),
+      body: mockModArchResponse(mockWorkspacesByNS),
     });
   });
 
diff --git a/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/filterWorkspacesTest.cy.ts b/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/filterWorkspacesTest.cy.ts
@@ -1,6 +1,6 @@
+import { mockModArchResponse } from 'mod-arch-core';
 import { mockNamespaces } from '~/__mocks__/mockNamespaces';
 import { mockWorkspaces } from '~/__mocks__/mockWorkspaces';
-import { mockBFFResponse } from '~/__mocks__/utils';
 import { home } from '~/__tests__/cypress/cypress/pages/home';
 import { navBar } from '~/__tests__/cypress/cypress/pages/navBar';
 import { mockWorkspaceKinds } from '~/shared/mock/mockNotebookServiceData';
@@ -16,19 +16,19 @@ const useFilter = (filterKey: string, filterName: string, searchValue: string) =
 describe('Application', () => {
   beforeEach(() => {
     cy.intercept('GET', '/api/v1/namespaces', {
-      body: mockBFFResponse(mockNamespaces),
+      body: mockModArchResponse(mockNamespaces),
     }).as('getNamespaces');
     cy.intercept('GET', '/api/v1/workspaces', {
-      body: mockBFFResponse(mockWorkspaces),
+      body: mockModArchResponse(mockWorkspaces),
     }).as('getWorkspaces');
     cy.intercept('GET', '/api/v1/workspaces/default', {
-      body: mockBFFResponse(mockWorkspaces),
+      body: mockModArchResponse(mockWorkspaces),
     }).as('getDefaultWorkspaces');
     cy.intercept('GET', '/api/v1/workspaces/custom-namespace', {
-      body: mockBFFResponse(mockWorkspaces),
+      body: mockModArchResponse(mockWorkspaces),
     });
     cy.intercept('GET', '/api/v1/workspacekinds', {
-      body: mockBFFResponse(mockWorkspaceKinds),
+      body: mockModArchResponse(mockWorkspaceKinds),
     });
     home.visit();
     cy.wait('@getNamespaces');
diff --git a/workspaces/frontend/src/app/AppRoutes.tsx b/workspaces/frontend/src/app/AppRoutes.tsx
@@ -37,7 +37,7 @@ export const useAdminDebugSettings = (): NavDataItem[] => {
   return [
     {
       label: 'Debug',
-      children: [{ label: 'Notebooks', path: '/notebookDebugSettings' }],
+      children: [{ label: 'Notebooks', path: AppRoutePaths.notebookDebugSettings }],
     },
     {
       label: 'Workspace kinds',
@@ -70,8 +70,10 @@ const AppRoutes: React.FC = () => {
         path={AppRoutePaths.root}
         element={<Navigate to={AppRoutePaths.workspaces} replace />}
       />
+      {user?.clusterAdmin && (
+        <Route path={AppRoutePaths.notebookDebugSettings} element={<Debug />} />
+      )}
       <Route path="*" element={<NotFound />} />
-      {user?.clusterAdmin && <Route path="/notebookDebugSettings/*" element={<Debug />} />}
     </Routes>
   );
 };
diff --git a/workspaces/frontend/src/app/context/useNotebookAPIState.tsx b/workspaces/frontend/src/app/context/useNotebookAPIState.tsx
@@ -1,7 +1,6 @@
 import { useCallback } from 'react';
+import { useAPIState, APIState } from 'mod-arch-core';
 import { NotebookApis, notebookApisImpl } from '~/shared/api/notebookApi';
-import { APIState } from '~/shared/api/types';
-import useAPIState from '~/shared/api/useAPIState';
 import { mockNotebookApisImpl } from '~/shared/mock/mockNotebookApis';
 import { MOCK_API_ENABLED } from '~/shared/utilities/const';
 
diff --git a/workspaces/frontend/src/app/hooks/__tests__/useNamespaces.spec.tsx b/workspaces/frontend/src/app/hooks/__tests__/useNamespaces.spec.tsx
diff --git a/workspaces/frontend/src/app/hooks/useNamespaces.ts b/workspaces/frontend/src/app/hooks/useNamespaces.ts
diff --git a/workspaces/frontend/src/app/hooks/useWorkspaceCountPerKind.ts b/workspaces/frontend/src/app/hooks/useWorkspaceCountPerKind.ts
@@ -4,9 +4,8 @@ import { WorkspaceCountPerOption } from '~/app/types';
 import { WorkspacekindsWorkspaceKind, WorkspacesWorkspace } from '~/generated/data-contracts';
 import { NotebookApis } from '~/shared/api/notebookApi';
 
-export type WorkspaceCountPerKind = Record<
-  WorkspacekindsWorkspaceKind['name'],
-  WorkspaceCountPerOption
+export type WorkspaceCountPerKind = Partial<
+  Record<WorkspacekindsWorkspaceKind['name'], WorkspaceCountPerOption>
 >;
 
 export const useWorkspaceCountPerKind = (): WorkspaceCountPerKind => {
diff --git a/workspaces/frontend/src/app/pages/WorkspaceKinds/Form/WorkspaceKindForm.tsx b/workspaces/frontend/src/app/pages/WorkspaceKinds/Form/WorkspaceKindForm.tsx
@@ -88,7 +88,7 @@ export const WorkspaceKindForm: React.FC = () => {
 
         if (createResult.ok) {
           notification.success(
-            `Workspace kind '${createResult.data.data.name}' created successfully`,
+            `Workspace kind '${createResult.result.data.name}' created successfully`,
           );
           navigate('workspaceKinds');
         } else {
diff --git a/workspaces/frontend/src/app/pages/WorkspaceKinds/details/WorkspaceKindDetailsImages.tsx b/workspaces/frontend/src/app/pages/WorkspaceKinds/details/WorkspaceKindDetailsImages.tsx
@@ -20,11 +20,7 @@ export const WorkspaceKindDetailsImages: React.FunctionComponent<WorkspaceDetail
       workspaceCountRouteState: {
         imageId: image.id,
       },
-      workspaceCount:
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        workspaceCountPerKind[workspaceKind.name]
-          ? (workspaceCountPerKind[workspaceKind.name].countByImage[image.id] ?? 0)
-          : 0,
+      workspaceCount: workspaceCountPerKind[workspaceKind.name]?.countByImage[image.id] ?? 0,
     }))}
     tableKind="image"
   />
diff --git a/workspaces/frontend/src/app/pages/WorkspaceKinds/details/WorkspaceKindDetailsNamespaces.tsx b/workspaces/frontend/src/app/pages/WorkspaceKinds/details/WorkspaceKindDetailsNamespaces.tsx
@@ -12,23 +12,17 @@ export const WorkspaceKindDetailsNamespaces: React.FunctionComponent<
   WorkspaceDetailsNamespacesProps
 > = ({ workspaceKind, workspaceCountPerKind }) => (
   <WorkspaceKindDetailsTable
-    rows={Object.keys(
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      workspaceCountPerKind[workspaceKind.name]
-        ? workspaceCountPerKind[workspaceKind.name].countByNamespace
-        : [],
-    ).map((namespace, rowIndex) => ({
-      id: String(rowIndex),
-      displayName: namespace,
-      kindName: workspaceKind.name,
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      workspaceCount: workspaceCountPerKind[workspaceKind.name]
-        ? workspaceCountPerKind[workspaceKind.name].countByNamespace[namespace]
-        : 0,
-      workspaceCountRouteState: {
-        namespace,
-      },
-    }))}
+    rows={Object.keys(workspaceCountPerKind[workspaceKind.name]?.countByNamespace ?? {}).map(
+      (namespace, rowIndex) => ({
+        id: String(rowIndex),
+        displayName: namespace,
+        kindName: workspaceKind.name,
+        workspaceCount: workspaceCountPerKind[workspaceKind.name]?.countByNamespace[namespace] ?? 0,
+        workspaceCountRouteState: {
+          namespace,
+        },
+      }),
+    )}
     tableKind="namespace"
   />
 );
diff --git a/workspaces/frontend/src/app/pages/WorkspaceKinds/details/WorkspaceKindDetailsPodConfigs.tsx b/workspaces/frontend/src/app/pages/WorkspaceKinds/details/WorkspaceKindDetailsPodConfigs.tsx
@@ -16,10 +16,8 @@ export const WorkspaceKindDetailsPodConfigs: React.FunctionComponent<
       id: podConfig.id,
       displayName: podConfig.displayName,
       kindName: workspaceKind.name,
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      workspaceCount: workspaceCountPerKind[workspaceKind.name]
-        ? (workspaceCountPerKind[workspaceKind.name].countByPodConfig[podConfig.id] ?? 0)
-        : 0,
+      workspaceCount:
+        workspaceCountPerKind[workspaceKind.name]?.countByPodConfig[podConfig.id] ?? 0,
       workspaceCountRouteState: {
         podConfigId: podConfig.id,
       },
diff --git a/workspaces/frontend/src/app/pages/notFound/NotFound.tsx b/workspaces/frontend/src/app/pages/notFound/NotFound.tsx
@@ -9,6 +9,8 @@ import {
 import { PageSection } from '@patternfly/react-core/dist/esm/components/Page';
 import { useTypedNavigate } from '~/app/routerHelper';
 
+// TODO: replace with mod-arch-shared NotFound component
+// Currently, not possible because mod-arch-shared version assumes home route is '/'
 const NotFound: React.FunctionComponent = () => {
   function GoHomeBtn() {
     const navigate = useTypedNavigate();
diff --git a/workspaces/frontend/src/app/routes.ts b/workspaces/frontend/src/app/routes.ts
@@ -7,6 +7,7 @@ export const AppRoutePaths = {
   workspaceKindSummary: '/workspacekinds/:kind/summary',
   workspaceKindCreate: '/workspacekinds/create',
   workspaceKindEdit: '/workspacekinds/:kind/edit',
+  notebookDebugSettings: '/notebookDebugSettings',
 } satisfies Record<string, `/${string}`>;
 
 export type AppRoute = (typeof AppRoutePaths)[keyof typeof AppRoutePaths];
@@ -35,6 +36,7 @@ export type RouteParamsMap = {
   workspaceKindEdit: {
     kind: string;
   };
+  notebookDebugSettings: undefined;
 };
 
 /**
@@ -69,6 +71,7 @@ export type RouteStateMap = {
   workspaceKindEdit: {
     workspaceKindName: string;
   };
+  notebookDebugSettings: undefined;
 };
 
 /**
@@ -90,4 +93,5 @@ export type RouteSearchParamsMap = {
   workspaceKindSummary: undefined;
   workspaceKindCreate: undefined;
   workspaceKindEdit: undefined;
+  notebookDebugSettings: undefined;
 };
diff --git a/workspaces/frontend/src/shared/api/apiUtils.ts b/workspaces/frontend/src/shared/api/apiUtils.ts
@@ -20,8 +20,8 @@ function isApiErrorEnvelope(data: unknown): data is ApiErrorEnvelope {
 
 export async function safeApiCall<T>(fn: () => Promise<T>): Promise<ApiCallResult<T>> {
   try {
-    const data = await fn();
-    return { ok: true, data };
+    const result = await fn();
+    return { ok: true, result };
   } catch (error: unknown) {
     if (axios.isAxiosError<ApiErrorEnvelope>(error)) {
       const apiError = error.response?.data;
diff --git a/workspaces/frontend/src/shared/api/types.ts b/workspaces/frontend/src/shared/api/types.ts
diff --git a/workspaces/frontend/src/shared/api/useAPIState.ts b/workspaces/frontend/src/shared/api/useAPIState.ts
diff --git a/workspaces/frontend/src/shared/typeHelpers.ts b/workspaces/frontend/src/shared/typeHelpers.ts
diff --git a/workspaces/frontend/src/shared/utilities/types.ts b/workspaces/frontend/src/shared/utilities/types.ts
