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

Yehudit Kerido · Yehudit Kerido · commit dc2c1798cd12 · 2025-03-17T08:33:13.000+02:00
Signed-off-by: Yehudit Kerido &lt;yehudit.kerido@nokia.com&gt;
diff --git a/workspaces/backend/internal/models/workspaces/funcs.go b/workspaces/backend/internal/models/workspaces/funcs.go
@@ -120,7 +120,6 @@ func NewWorkspaceModelFromWorkspace(ws *kubefloworgv1beta1.Workspace, wsk *kubef
 				ImageConfig: imageConfigModel,
 				PodConfig:   podConfigModel,
 			},
-			EndPoints: buildEndpointsList(ws, wsk),
 		},
 		Activity: Activity{
 			LastActivity: ws.Status.Activity.LastActivity,
@@ -134,37 +133,6 @@ func NewWorkspaceModelFromWorkspace(ws *kubefloworgv1beta1.Workspace, wsk *kubef
 	return workspaceModel
 }
 
-func buildEndpointsList(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.WorkspaceKind) []EndPoints {
-	var endpoints []EndPoints
-
-	// Return an empty list if wsk is nil.
-	if wsk == nil {
-		return endpoints
-	}
-
-	// Get the image configuration from the WorkspaceKind's PodTemplate options.
-	imageConfig := wsk.Spec.PodTemplate.Options.ImageConfig
-
-	for _, val := range imageConfig.Values {
-		if len(val.Spec.Ports) == 0 {
-			continue
-		}
-		firstPort := val.Spec.Ports[0]
-		portStr := fmt.Sprintf("%d", firstPort.Port)
-		displayName := firstPort.DisplayName
-		if displayName == "" {
-			displayName = val.Id
-		}
-		ep := EndPoints{
-			DisplayName: displayName,
-			Port:        portStr,
-		}
-		endpoints = append(endpoints, ep)
-	}
-
-	return endpoints
-}
-
 func wskExists(wsk *kubefloworgv1beta1.WorkspaceKind) bool {
 	return wsk != nil && wsk.UID != ""
 }
diff --git a/workspaces/backend/internal/models/workspaces/types.go b/workspaces/backend/internal/models/workspaces/types.go
@@ -59,12 +59,6 @@ type PodTemplate struct {
 	PodMetadata PodMetadata        `json:"podMetadata"`
 	Volumes     PodVolumes         `json:"volumes"`
 	Options     PodTemplateOptions `json:"options"`
-	EndPoints   []EndPoints        `json:"end_points"`
-}
-
-type EndPoints struct {
-	DisplayName string `json:"display_name"`
-	Port        string `json:"port"`
 }
 
 type PodMetadata struct {
diff --git a/workspaces/frontend/src/__tests__/cypress/cypress/downloads/downloads.htm b/workspaces/frontend/src/__tests__/cypress/cypress/downloads/downloads.htm
diff --git a/workspaces/frontend/src/__tests__/cypress/cypress/tests/e2e/Workspaces.cy.ts b/workspaces/frontend/src/__tests__/cypress/cypress/tests/e2e/Workspaces.cy.ts
@@ -16,7 +16,7 @@ const validateWorkspaceRow = (workspace: Workspace, index: number) => {
 
   cy.findByTestId(`workspace-row-${index}`)
     .find('[data-testid="pod-config"]')
-    .should('have.text', workspace.pod_template.options.pod_config.current.display_name);
+    .should('have.text', workspace.podTemplate.options.podConfig.current.displayName);
 };
 
 // Test suite for workspace-related tests
diff --git a/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspace.mock.ts b/workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspace.mock.ts
@@ -13,41 +13,40 @@ const generateMockWorkspace = (
 ): {
   name: string;
   namespace: string;
-  workspace_kind: { name: string };
-  defer_updates: boolean;
+  workspaceKind: { name: string };
+  deferUpdates: boolean;
   paused: boolean;
-  paused_time: number;
+  pausedTime: number;
+  pendingRestart: boolean;
   state: WorkspaceState;
-  state_message: string;
-  pod_template: {
-    pod_metadata: { labels: object; annotations: object };
+  stateMessage: string;
+  podTemplate: {
+    podMetadata: { labels: object; annotations: object };
     volumes: {
-      home: { pvc_name: string; mount_path: string; readOnly: boolean };
-      data: { pvc_name: string; mount_path: string; readOnly: boolean }[];
+      home: { pvcName: string; mountPath: string; readOnly: boolean };
+      data: { pvcName: string; mountPath: string; readOnly: boolean }[];
     };
     options: {
-      image_config: {
+      imageConfig: {
         current: {
           id: string;
-          display_name: string;
+          displayName: string;
           description: string;
           labels: { key: string; value: string }[];
         };
       };
-      pod_config: {
+      podConfig: {
         current: {
           id: string;
-          display_name: string;
+          displayName: string;
           description: string;
           labels: ({ key: string; value: string } | { key: string; value: string })[];
         };
       };
     };
-    image_config: { current: string; desired: string; redirect_chain: never[] };
-    pod_config: { current: string; desired: string; redirect_chain: never[] };
-    end_points: { display_name: string; port: string }[];
   };
   activity: { last_activity: number; last_update: number };
+  services: { httpService: { displayName: string; httpPath: string } }[];
 } => {
   const currentTime = Date.now();
   const lastActivityTime = currentTime - Math.floor(Math.random() * 1000000);
@@ -56,55 +55,50 @@ const generateMockWorkspace = (
   return {
     name,
     namespace,
-    workspace_kind: { name: 'jupyterlab' },
-    defer_updates: paused,
+    workspaceKind: { name: 'jupyterlab' },
+    deferUpdates: paused,
     paused,
-    paused_time: paused ? currentTime - Math.floor(Math.random() * 1000000) : 0,
+    pausedTime: paused ? currentTime - Math.floor(Math.random() * 1000000) : 0,
+    pendingRestart: false,
     state,
-    state_message:
+    stateMessage:
       state === WorkspaceState.Running
         ? 'Workspace is running smoothly.'
         : state === WorkspaceState.Paused
           ? 'Workspace is paused.'
           : 'Workspace is operational.',
-    pod_template: {
-      end_points: [
-        {
-          display_name: 'Jupyter-lab',
-          port: '8888',
-        },
-      ],
-      pod_metadata: {
+    podTemplate: {
+      podMetadata: {
         labels: {},
         annotations: {},
       },
       volumes: {
         home: {
-          pvc_name: `${pvcName}-home`,
-          mount_path: '/home/jovyan',
+          pvcName: `${pvcName}-home`,
+          mountPath: '/home/jovyan',
           readOnly: false,
         },
         data: [
           {
-            pvc_name: pvcName,
-            mount_path: '/data/my-data',
+            pvcName,
+            mountPath: '/data/my-data',
             readOnly: paused,
           },
         ],
       },
       options: {
-        image_config: {
+        imageConfig: {
           current: {
             id: imageConfigId,
-            display_name: imageConfigDisplayName,
+            displayName: imageConfigDisplayName,
             description: 'JupyterLab environment',
             labels: [{ key: 'python_version', value: '3.11' }],
           },
         },
-        pod_config: {
+        podConfig: {
           current: {
             id: podConfigId,
-            display_name: podConfigDisplayName,
+            displayName: podConfigDisplayName,
             description: 'Pod configuration with resource limits',
             labels: [
               { key: 'cpu', value: '100m' },
@@ -113,21 +107,19 @@ const generateMockWorkspace = (
           },
         },
       },
-      image_config: {
-        current: imageConfigId,
-        desired: '',
-        redirect_chain: [],
-      },
-      pod_config: {
-        current: podConfigId,
-        desired: podConfigId,
-        redirect_chain: [],
-      },
     },
     activity: {
       last_activity: lastActivityTime,
       last_update: lastUpdateTime,
     },
+    services: [
+      {
+        httpService: {
+          displayName: 'Jupyter-lab',
+          httpPath: `/workspace/${namespace}/${name}/Jupyter-lab/`,
+        },
+      },
+    ],
   };
 };
 
diff --git a/workspaces/frontend/src/app/actions/WorkspaceKindsActions.tsx b/workspaces/frontend/src/app/actions/WorkspaceKindsActions.tsx
@@ -36,7 +36,7 @@ export function buildWorkspaceRedirectStatus(
   const workspaceRedirectStatus: WorkspaceRedirectStatus = {};
   for (const workspaceKind of workspaceKinds) {
     // Loop through the `values` array inside `imageConfig`
-    const redirect = workspaceKind.pod_template.options.image_config.values.find(
+    const redirect = workspaceKind.podTemplate.options.imageConfig.values.find(
       (value) => value.redirect,
     )?.redirect;
     // If redirect exists, extract the necessary properties
diff --git a/workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetailsActivity.tsx b/workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetailsActivity.tsx
@@ -16,7 +16,7 @@ type WorkspaceDetailsActivityProps = {
 export const WorkspaceDetailsActivity: React.FunctionComponent<WorkspaceDetailsActivityProps> = ({
   workspace,
 }) => {
-  const { activity, pauseTime, pendingRestart } = workspace.status;
+  const { activity, pausedTime: pauseTime, pendingRestart } = workspace;
 
   return (
     <DescriptionList isHorizontal>
diff --git a/workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetailsOverview.tsx b/workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetailsOverview.tsx
@@ -23,19 +23,25 @@ export const WorkspaceDetailsOverview: React.FunctionComponent<WorkspaceDetailsO
     <Divider />
     <DescriptionListGroup>
       <DescriptionListTerm>Kind</DescriptionListTerm>
-      <DescriptionListDescription>{workspace.kind}</DescriptionListDescription>
+      <DescriptionListDescription>{workspace.workspaceKind.name}</DescriptionListDescription>
     </DescriptionListGroup>
     <Divider />
     <DescriptionListGroup>
       <DescriptionListTerm>Labels</DescriptionListTerm>
       <DescriptionListDescription>
-        {workspace.podTemplate.podMetadata.labels.join(', ')}
+        {workspace.podTemplate.options.podConfig.current.labels.length > 0
+          ? workspace.podTemplate.options.podConfig.current.labels
+              .map((label) => `${label.key}=${label.value}`)
+              .join(', ')
+          : 'No labels available'}
       </DescriptionListDescription>
     </DescriptionListGroup>
     <Divider />
     <DescriptionListGroup>
       <DescriptionListTerm>Pod config</DescriptionListTerm>
-      <DescriptionListDescription>{workspace.options.podConfig}</DescriptionListDescription>
+      <DescriptionListDescription>
+        {JSON.stringify(workspace.podTemplate.options.podConfig, null, 2)}
+      </DescriptionListDescription>
     </DescriptionListGroup>
     <Divider />
   </DescriptionList>
diff --git a/workspaces/frontend/src/app/pages/Workspaces/WorkspaceConnectAction.tsx b/workspaces/frontend/src/app/pages/Workspaces/WorkspaceConnectAction.tsx
@@ -33,11 +33,11 @@ export const WorkspaceConnectAction: React.FunctionComponent<WorkspaceConnectAct
   };
 
   const onClickConnect = () => {
-    openEndpoint(workspace.pod_template.end_points[0].port);
+    window.open(workspace.services[0].httpService.httpPath, '_blank');
   };
 
-  const openEndpoint = (port: string) => {
-    window.open(`workspace/${workspace.namespace}/${workspace.name}/${port}`, '_blank');
+  const openEndpoint = (value: string) => {
+    window.open(value, '_blank');
   };
 
   return (
@@ -67,9 +67,12 @@ export const WorkspaceConnectAction: React.FunctionComponent<WorkspaceConnectAct
       shouldFocusToggleOnSelect
     >
       <DropdownList>
-        {workspace.pod_template.end_points.map((endpoint) => (
-          <DropdownItem value={endpoint.port} key={`${workspace.name}-${endpoint.port}`}>
-            {endpoint.display_name}
+        {workspace.services.map((service) => (
+          <DropdownItem
+            value={service.httpService.httpPath}
+            key={`${workspace.name}-${service.httpService.displayName}`}
+          >
+            {service.httpService.displayName}
           </DropdownItem>
         ))}
       </DropdownList>
diff --git a/workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx b/workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx
diff --git a/workspaces/frontend/src/shared/types.ts b/workspaces/frontend/src/shared/types.ts
