feat(ws): Notebooks 2.0 // Frontend // Fetch workspaces

Signed-off-by: Yehudit Kerido <[email protected]>

Author: Yehudit Kerido

workspaces/frontend/src/__tests__/cypress/cypress/downloads/downloads.htm

@@ -1,3 +1,4 @@
+import type { Workspace, WorkspaceKind } from '~/shared/types';
 import { WorkspaceState } from '~/shared/types';
 
 const generateMockWorkspace = (
@@ -10,52 +11,15 @@ const generateMockWorkspace = (
   podConfigId: string,
   podConfigDisplayName: string,
   pvcName: string,
-): {
-  name: string;
-  namespace: string;
-  workspaceKind: { name: string };
-  deferUpdates: boolean;
-  paused: boolean;
-  pausedTime: number;
-  pendingRestart: boolean;
-  state: WorkspaceState;
-  stateMessage: string;
-  podTemplate: {
-    podMetadata: { labels: object; annotations: object };
-    volumes: {
-      home: { pvcName: string; mountPath: string; readOnly: boolean };
-      data: { pvcName: string; mountPath: string; readOnly: boolean }[];
-    };
-    options: {
-      imageConfig: {
-        current: {
-          id: string;
-          displayName: string;
-          description: string;
-          labels: { key: string; value: string }[];
-        };
-      };
-      podConfig: {
-        current: {
-          id: string;
-          displayName: string;
-          description: string;
-          labels: ({ key: string; value: string } | { key: string; value: string })[];
-        };
-      };
-    };
-  };
-  activity: { lastActivity: number; lastUpdate: number };
-  services: { httpService: { displayName: string; httpPath: string } }[];
-} => {
+): Workspace => {
   const currentTime = Date.now();
   const lastActivityTime = currentTime - Math.floor(Math.random() * 1000000);
   const lastUpdateTime = currentTime - Math.floor(Math.random() * 100000);
 
   return {
     name,
     namespace,
-    workspaceKind: { name: 'jupyterlab' },
+    workspaceKind: { name: 'jupyterlab' } as WorkspaceKind,
     deferUpdates: paused,
     paused,
     pausedTime: paused ? currentTime - Math.floor(Math.random() * 1000000) : 0,
@@ -92,7 +56,7 @@ const generateMockWorkspace = (
             id: imageConfigId,
             displayName: imageConfigDisplayName,
             description: 'JupyterLab environment',
-            labels: [{ key: 'python_version', value: '3.11' }],
+            labels: [{ key: 'python_version', value: 3.11 }],
           },
         },
         podConfig: {

workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspace.mock.ts

@@ -16,7 +16,7 @@ type WorkspaceDetailsActivityProps = {
 export const WorkspaceDetailsActivity: React.FunctionComponent<WorkspaceDetailsActivityProps> = ({
   workspace,
 }) => {
-  const { activity, pausedTime: pauseTime, pendingRestart } = workspace;
+  const { activity, pausedTime, pendingRestart } = workspace;
 
   return (
     <DescriptionList isHorizontal>
@@ -37,7 +37,7 @@ export const WorkspaceDetailsActivity: React.FunctionComponent<WorkspaceDetailsA
       <DescriptionListGroup>
         <DescriptionListTerm>Pause Time</DescriptionListTerm>
         <DescriptionListDescription data-testid="pauseTime">
-          {formatTimestamp(pauseTime)}
+          {formatTimestamp(pausedTime)}
         </DescriptionListDescription>
       </DescriptionListGroup>
       <Divider />

workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetailsActivity.tsx

@@ -40,7 +40,7 @@ export const WorkspaceDetailsOverview: React.FunctionComponent<WorkspaceDetailsO
     <DescriptionListGroup>
       <DescriptionListTerm>Pod config</DescriptionListTerm>
       <DescriptionListDescription>
-        {JSON.stringify(workspace.podTemplate.options.podConfig, null, 2)}
+        {workspace.podTemplate.options.podConfig.current.displayName}
       </DescriptionListDescription>
     </DescriptionListGroup>
     <Divider />