read real 409 conflict

opendatahub-io · Sep 16, 2024 · 0d9347a · 0d9347a
1 parent 74256cd
commit 0d9347a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts
@@ -555,6 +555,7 @@ describe('Workbench page', () => {
     editSpawnerPage.k8sNameDescription.findDisplayNameInput().fill('Updated Notebook');
 
     cy.interceptK8s('PUT', NotebookModel, mockNotebookK8sResource({})).as('editWorkbenchDryRun');
+    cy.interceptK8s('PATCH', NotebookModel, mockNotebookK8sResource({})).as('editWorkbench');
     editSpawnerPage.findSubmitButton().click();
     cy.wait('@editWorkbenchDryRun').then((interception) => {
       expect(interception.request.url).to.include('?dryRun=All');
@@ -578,8 +579,6 @@ describe('Workbench page', () => {
         },
       });
     });
-
-    cy.interceptK8s('PATCH', NotebookModel, mockNotebookK8sResource({})).as('editWorkbench');
     // Actual request
     cy.wait('@editWorkbench').then((interception) => {
       expect(interception.request.url).not.to.include('?dryRun=All');

diff --git a/frontend/src/pages/projects/screens/spawner/SpawnerFooter.tsx b/frontend/src/pages/projects/screens/spawner/SpawnerFooter.tsx
@@ -13,6 +13,7 @@ import {
   assembleSecret,
   createNotebook,
   createSecret,
+  K8sStatusError,
   mergePatchUpdateNotebook,
   updateNotebook,
 } from '~/api';
@@ -56,7 +57,7 @@ const SpawnerFooter: React.FC<SpawnerFooterProps> = ({
   dataConnection,
   canEnablePipelines,
 }) => {
-  const [errorMessage, setErrorMessage] = React.useState('');
+  const [error, setError] = React.useState<K8sStatusError>();
 
   const {
     dashboardConfig: {
@@ -123,17 +124,17 @@ const SpawnerFooter: React.FC<SpawnerFooterProps> = ({
     refreshAllProjectData();
     navigate(`/projects/${projectName}?section=${ProjectSectionID.WORKBENCHES}`);
   };
-  const handleError = (e: Error) => {
+  const handleError = (e: K8sStatusError) => {
     fireFormTrackingEvent('Workbench Created', {
       outcome: TrackingOutcome.submit,
       success: false,
       error: e.message,
     });
-    setErrorMessage(e.message || 'Error creating workbench');
+    setError(e);
     setCreateInProgress(false);
   };
   const handleStart = () => {
-    setErrorMessage('');
+    setError(undefined);
     setCreateInProgress(true);
   };
 
@@ -280,15 +281,15 @@ const SpawnerFooter: React.FC<SpawnerFooterProps> = ({
 
   return (
     <Stack hasGutter>
-      {errorMessage && (
+      {error && (
         <StackItem>
           <Alert
             isInline
             variant="danger"
             title="Error creating workbench"
             actionLinks={
               // If this is a 409 conflict error
-              errorMessage.includes('the object has been modified') ? (
+              error.statusObject.code === 409 ? (
                 <>
                   <AlertActionLink
                     onClick={() =>
@@ -308,7 +309,7 @@ const SpawnerFooter: React.FC<SpawnerFooterProps> = ({
               ) : undefined
             }
           >
-            {errorMessage}
+            {error.message}
           </Alert>
         </StackItem>
       )}