From fe7e942fd650e87480c0940c3a9c44c1262a2f59 Mon Sep 17 00:00:00 2001
From: Juntao Wang <juntwang@redhat.com>
Date: Tue, 29 Oct 2024 17:15:13 -0400
Subject: [PATCH] UX updates for content and behavior in event log modal for a
 starting workbench

---
 frontend/src/__tests__/cypress/cypress/pages/workbench.ts   | 2 +-
 .../cypress/cypress/tests/mocked/projects/workbench.cy.ts   | 2 +-
 .../src/pages/projects/notebook/NotebookStateStatus.tsx     | 6 +++---
 frontend/src/pages/projects/notebook/StartNotebookModal.tsx | 6 +++---
 .../projects/screens/detail/notebooks/NotebookTableRow.tsx  | 2 +-
 .../screens/projects/ProjectTableRowNotebookTableRow.tsx    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/__tests__/cypress/cypress/pages/workbench.ts b/frontend/src/__tests__/cypress/cypress/pages/workbench.ts
index 7b03d5b6ef..feddc7522f 100644
--- a/frontend/src/__tests__/cypress/cypress/pages/workbench.ts
+++ b/frontend/src/__tests__/cypress/cypress/pages/workbench.ts
@@ -182,7 +182,7 @@ class NotebookRow extends TableRow {
   }
 
   findNotebookStatusPopover(name: string) {
-    return cy.findByTestId('notebook-status-popover').contains(name);
+    return cy.findByTestId('workbench-status-popover').contains(name);
   }
 }
 
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
index 054d238967..93befc4ef0 100644
--- a/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts
+++ b/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts
@@ -618,7 +618,7 @@ describe('Workbench page', () => {
         { op: 'remove', path: '/metadata/annotations/kubeflow-resource-stopped' },
       ]);
     });
-    notebookRow.findNotebookStatusPopover('Waiting for notebook to start...').should('exist');
+    notebookRow.findNotebookStatusPopover('Waiting for workbench to start...').should('exist');
   });
 
   it('Validate the start button is enabled when the notebook image is deleted', () => {
diff --git a/frontend/src/pages/projects/notebook/NotebookStateStatus.tsx b/frontend/src/pages/projects/notebook/NotebookStateStatus.tsx
index 43aa1f199b..9d4040d9d9 100644
--- a/frontend/src/pages/projects/notebook/NotebookStateStatus.tsx
+++ b/frontend/src/pages/projects/notebook/NotebookStateStatus.tsx
@@ -74,14 +74,14 @@ const NotebookStateStatus: React.FC<NotebookStateStatusProps> = ({
     return (
       <>
         <Popover
-          data-testid="notebook-status-popover"
+          data-testid="workbench-status-popover"
           shouldClose={() => setPopoverVisible(false)}
           isVisible={isPopoverVisible}
-          headerContent="Notebook status"
+          headerContent="Workbench status"
           bodyContent={
             events[events.length - 1]
               ? getEventFullMessage(events[events.length - 1])
-              : 'Waiting for notebook to start...'
+              : 'Waiting for workbench to start...'
           }
           footerContent={
             <Button
diff --git a/frontend/src/pages/projects/notebook/StartNotebookModal.tsx b/frontend/src/pages/projects/notebook/StartNotebookModal.tsx
index f40680f8d9..dcdda78b2c 100644
--- a/frontend/src/pages/projects/notebook/StartNotebookModal.tsx
+++ b/frontend/src/pages/projects/notebook/StartNotebookModal.tsx
@@ -137,7 +137,7 @@ const StartNotebookModal: React.FC<StartNotebookModalProps> = ({
         onClick={() => onClose(true)}
         isDisabled={!open}
       >
-        Cancel
+        Stop workbench
       </Button>
     ) : (
       <NotebookRouteLink
@@ -178,11 +178,11 @@ const StartNotebookModal: React.FC<StartNotebookModalProps> = ({
 
   return (
     <Modal
-      aria-label="Starting server modal"
+      aria-label="Starting workbench modal"
       description="Depending on the size and resources requested, this can take several minutes."
       appendTo={document.body}
       variant={ModalVariant.small}
-      title="Starting server"
+      title="Starting workbench"
       isOpen
       showClose
       onClose={() => onClose(false)}
diff --git a/frontend/src/pages/projects/screens/detail/notebooks/NotebookTableRow.tsx b/frontend/src/pages/projects/screens/detail/notebooks/NotebookTableRow.tsx
index 8a14e57c9e..432af2afc8 100644
--- a/frontend/src/pages/projects/screens/detail/notebooks/NotebookTableRow.tsx
+++ b/frontend/src/pages/projects/screens/detail/notebooks/NotebookTableRow.tsx
@@ -191,7 +191,7 @@ const NotebookTableRow: React.FC<NotebookTableRowProps> = ({
           </Td>
         ) : null}
         <Td dataLabel="Status">
-          <NotebookStateStatus notebookState={obj} stopNotebook={handleStop} />
+          <NotebookStateStatus notebookState={obj} stopNotebook={onStop} />
         </Td>
         <Td>
           <NotebookStateAction
diff --git a/frontend/src/pages/projects/screens/projects/ProjectTableRowNotebookTableRow.tsx b/frontend/src/pages/projects/screens/projects/ProjectTableRowNotebookTableRow.tsx
index 2a69f28c8c..1e3ecb7fae 100644
--- a/frontend/src/pages/projects/screens/projects/ProjectTableRowNotebookTableRow.tsx
+++ b/frontend/src/pages/projects/screens/projects/ProjectTableRowNotebookTableRow.tsx
@@ -77,7 +77,7 @@ const ProjectTableRowNotebookTableRow: React.FC<ProjectTableRowNotebookTableRowP
         />
       </Td>
       <Td dataLabel="Status">
-        <NotebookStateStatus notebookState={notebookState} stopNotebook={handleStop} />
+        <NotebookStateStatus notebookState={notebookState} stopNotebook={onStop} />
       </Td>
       <Td>
         <NotebookStateAction