Handle deleted container size in workbenches

opendatahub-io · Jul 16, 2024 · 66a7bb4 · 66a7bb4
1 parent dc5de07
commit 66a7bb4
Show file tree

Hide file tree

Showing 9 changed files with 323 additions and 113 deletions.
diff --git a/frontend/src/__mocks__/mockDashboardConfig.ts b/frontend/src/__mocks__/mockDashboardConfig.ts
@@ -1,4 +1,5 @@
 import { DashboardConfigKind, KnownLabels } from '~/k8sTypes';
+import { NotebookSize } from '~/types';
 
 type MockDashboardConfigType = {
   disableInfo?: boolean;
@@ -26,6 +27,7 @@ type MockDashboardConfigType = {
   disableDistributedWorkloads?: boolean;
   disableModelRegistry?: boolean;
   disableNotebookController?: boolean;
+  notebookSizes?: NotebookSize[];
 };
 
 export const mockDashboardConfig = ({
@@ -54,6 +56,73 @@ export const mockDashboardConfig = ({
   disableDistributedWorkloads = false,
   disableModelRegistry = true,
   disableNotebookController = false,
+  notebookSizes = [
+    {
+      name: 'XSmall',
+      resources: {
+        limits: {
+          cpu: '0.5',
+          memory: '500Mi',
+        },
+        requests: {
+          cpu: '0.1',
+          memory: '100Mi',
+        },
+      },
+    },
+    {
+      name: 'Small',
+      resources: {
+        limits: {
+          cpu: '2',
+          memory: '8Gi',
+        },
+        requests: {
+          cpu: '1',
+          memory: '8Gi',
+        },
+      },
+    },
+    {
+      name: 'Medium',
+      resources: {
+        limits: {
+          cpu: '6',
+          memory: '24Gi',
+        },
+        requests: {
+          cpu: '3',
+          memory: '24Gi',
+        },
+      },
+    },
+    {
+      name: 'Large',
+      resources: {
+        limits: {
+          cpu: '14',
+          memory: '56Gi',
+        },
+        requests: {
+          cpu: '7',
+          memory: '56Gi',
+        },
+      },
+    },
+    {
+      name: 'X Large',
+      resources: {
+        limits: {
+          cpu: '30',
+          memory: '120Gi',
+        },
+        requests: {
+          cpu: '15',
+          memory: '120Gi',
+        },
+      },
+    },
+  ],
 }: MockDashboardConfigType): DashboardConfigKind => ({
   apiVersion: 'opendatahub.io/v1alpha',
   kind: 'OdhDashboardConfig',
@@ -147,73 +216,7 @@ export const mockDashboardConfig = ({
         },
       },
     ],
-    notebookSizes: [
-      {
-        name: 'XSmall',
-        resources: {
-          limits: {
-            cpu: '0.5',
-            memory: '500Mi',
-          },
-          requests: {
-            cpu: '0.1',
-            memory: '100Mi',
-          },
-        },
-      },
-      {
-        name: 'Small',
-        resources: {
-          limits: {
-            cpu: '2',
-            memory: '8Gi',
-          },
-          requests: {
-            cpu: '1',
-            memory: '8Gi',
-          },
-        },
-      },
-      {
-        name: 'Medium',
-        resources: {
-          limits: {
-            cpu: '6',
-            memory: '24Gi',
-          },
-          requests: {
-            cpu: '3',
-            memory: '24Gi',
-          },
-        },
-      },
-      {
-        name: 'Large',
-        resources: {
-          limits: {
-            cpu: '14',
-            memory: '56Gi',
-          },
-          requests: {
-            cpu: '7',
-            memory: '56Gi',
-          },
-        },
-      },
-      {
-        name: 'X Large',
-        resources: {
-          limits: {
-            cpu: '30',
-            memory: '120Gi',
-          },
-          requests: {
-            cpu: '15',
-            memory: '120Gi',
-          },
-        },
-      },
-    ],
+    notebookSizes,
     templateOrder: ['test-model'],
     templateDisablement: ['test-model'],
   },

diff --git a/frontend/src/__tests__/cypress/cypress/pages/workbench.ts b/frontend/src/__tests__/cypress/cypress/pages/workbench.ts
@@ -299,6 +299,10 @@ class CreateSpawnerPage {
   findBucketInput() {
     return cy.findByTestId('field AWS_S3_BUCKET');
   }
+
+  findContainerSizeInput(name: string) {
+    return cy.findByTestId('container-size-group').contains(name);
+  }
 }
 
 class EditSpawnerPage extends CreateSpawnerPage {
@@ -326,6 +330,10 @@ class EditSpawnerPage extends CreateSpawnerPage {
     cy.findByTestId('container-size-group').contains(name).should('exist');
     return this;
   }
+
+  findCancelButton() {
+    return cy.findByTestId('workbench-cancel-button');
+  }
 }
 
 class NotFoundSpawnerPage {