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

@@ -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';
@@ -188,7 +187,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,
+      };
       redirectStatus: '',
       name: workspace.name,
       kind: workspace.workspace_kind.name,
@@ -281,17 +292,14 @@ export const Workspaces: React.FunctionComponent = () => {
     const workspaceState = workspace.state;
     const workspaceActions = [
       {
-        id: 'view-details',
         title: 'View Details',
         onClick: () => viewDetailsClick(workspace),
       },
       {
-        id: 'edit',
         title: 'Edit',
         onClick: () => editAction(workspace),
       },
       {
-        id: 'delete',
         title: 'Delete',
         onClick: () => handleDeleteClick(workspace),
       },
@@ -300,20 +308,17 @@ export const Workspaces: React.FunctionComponent = () => {
       },
       workspaceState !== WorkspaceState.Running
         ? {
-            id: 'start',
             title: 'Start',
             onClick: () => startRestartAction(workspace, ActionType.Start),
           }
         : {
-            id: 'restart',
             title: 'Restart',
             onClick: () => startRestartAction(workspace, ActionType.Restart),
           },
     ] as IActions;
 
     if (workspaceState === WorkspaceState.Running) {
       workspaceActions.push({
-        id: 'stop',
         title: 'Stop',
         onClick: () => stopAction(workspace),
       });
@@ -514,6 +519,27 @@ export const Workspaces: React.FunctionComponent = () => {
                             )
                           : getRedirectStatusIcon(undefined, 'No API response available')}
                       </Td>
+        id: 'view-details',
+        id: 'edit',
+        id: 'delete',
+            id: 'start',
+            id: 'restart',
+        id: 'stop',
+                      <Th
+                        key={`${columnName}-col-name`}
+                        sort={columnName !== 'Redirect Status' ? getSortParams(index) : undefined}
+                      >
+                        {columnName}
+                      </Th>
+                      <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: [
           {