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

Signed-off-by: Yehudit Kerido <yehudit.kerido@nokia.com>

Author: Yehudit Kerido

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

@@ -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.podTemplate.options.imageConfig.values.find(
+    const redirect = workspaceKind.pod_template.options.image_config.values.find(
       (value) => value.redirect,
     )?.redirect;
     // If redirect exists, extract the necessary properties

workspaces/frontend/src/app/actions/WorkspaceKindsActions.tsx

@@ -33,7 +33,6 @@ import {
   QuestionCircleIcon,
   CodeIcon,
 } from '@patternfly/react-icons';
-import { useState } from 'react';
 import { Workspace, WorkspacesColumnNames, WorkspaceState } from '~/shared/types';
 import { WorkspaceDetails } from '~/app/pages/Workspaces/Details/WorkspaceDetails';
 import { ExpandedWorkspaceRow } from '~/app/pages/Workspaces/ExpandedWorkspaceRow';
@@ -44,7 +43,7 @@ import {
 } from '~/app/actions/WorkspaceKindsActions';
 import useWorkspaces from '~/app/hooks/useWorkspaces';
 import { useNamespaceContext } from '~/app/context/NamespaceContextProvider';
-import { buildKindLogoDictionary } from '~/app/actions/WorkspaceKindsActions';
+
 import useWorkspaceKinds from '~/app/hooks/useWorkspaceKinds';
 import { WorkspaceConnectAction } from '~/app/pages/Workspaces/WorkspaceConnectAction';
 import { WorkspaceStartActionModal } from '~/app/pages/Workspaces/workspaceActions/WorkspaceStartActionModal';
@@ -187,18 +186,19 @@ export const Workspaces: React.FunctionComponent = () => {
   const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
 
   const getSortableRowValues = (workspace: Workspace): (string | number | undefined)[] => {
-    const { name, kind, image, podConfig, state, homeVol, cpu, ram, lastActivity } = {
+    const { redirectStatus, name, kind, image, podConfig, state, homeVol, cpu, ram, lastActivity } =
+      {
         redirectStatus: '',
-      name: workspace.name,
-      kind: workspace.workspace_kind.name,
-      image: workspace.pod_template.options.image_config.current.display_name,
-      podConfig: workspace.pod_template.pod_config.current,
-      state: workspace.state,
-      homeVol: workspace.pod_template.volumes.home.pvc_name,
-      cpu: getCpuValue(workspace),
-      ram: getRamValue(workspace),
-      lastActivity: workspace.activity.last_activity,
-    };
+        name: workspace.name,
+        kind: workspace.workspace_kind.name,
+        image: workspace.pod_template.options.image_config.current.display_name,
+        podConfig: workspace.pod_template.pod_config.current,
+        state: workspace.state,
+        homeVol: workspace.pod_template.volumes.home.pvc_name,
+        cpu: getCpuValue(workspace),
+        ram: getRamValue(workspace),
+        lastActivity: workspace.activity.last_activity,
+      };
     return [redirectStatus, name, kind, image, podConfig, state, homeVol, cpu, ram, lastActivity];
   };
 
@@ -469,12 +469,12 @@ export const Workspaces: React.FunctionComponent = () => {
                   <Tr>
                     <Th />
                     {Object.values(columnNames).map((columnName, index) => (
-                        <Th
-                            key={`${columnName}-col-name`}
-                            sort={columnName !== 'Redirect Status' ? getSortParams(index) : undefined}
-                        >
-                            {columnName}
-                        </Th>
+                      <Th
+                        key={`${columnName}-col-name`}
+                        sort={columnName !== 'Redirect Status' ? getSortParams(index) : undefined}
+                      >
+                        {columnName}
+                      </Th>
                     ))}
                     <Th screenReaderText="Primary action" />
                   </Tr>
@@ -498,15 +498,15 @@ export const Workspaces: React.FunctionComponent = () => {
                             setWorkspaceExpanded(workspace, !isWorkspaceExpanded(workspace)),
                         }}
                       />
-                        <Td dataLabel={columnNames.redirectStatus}>
-                            {workspaceRedirectStatus[workspace.kind]
-                                ? getRedirectStatusIcon(
-                                    workspaceRedirectStatus[workspace.kind]?.level,
-                                    workspaceRedirectStatus[workspace.kind]?.message ||
-                                    'No API response available',
-                                )
-                                : getRedirectStatusIcon(undefined, 'No API response available')}
-                        </Td>
+                      <Td dataLabel={columnNames.redirectStatus}>
+                        {workspaceRedirectStatus[workspace.workspace_kind.name]
+                          ? getRedirectStatusIcon(
+                              workspaceRedirectStatus[workspace.workspace_kind.name]?.level,
+                              workspaceRedirectStatus[workspace.workspace_kind.name]?.message ||
+                                'No API response available',
+                            )
+                          : getRedirectStatusIcon(undefined, 'No API response available')}
+                      </Td>
                       <Td data-testid="workspace-name" dataLabel={columnNames.name}>
                         {workspace.name}
                       </Td>

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

@@ -15,7 +15,7 @@ export interface WorkspaceKind {
   hidden: boolean;
   icon: WorkspaceIcon;
   logo: WorkspaceLogo;
-  podTemplate: {
+  pod_template: {
     podMetadata: {
       labels: {
         myWorkspaceKindLabel: string;
@@ -28,7 +28,7 @@ export interface WorkspaceKind {
       home: string;
     };
     options: {
-      imageConfig: {
+      image_config: {
         default: string;
         values: [
           {