solve conflicts, update tests

Signed-off-by: Qxisylolo <[email protected]>
opensearch-project · Nov 11, 2024 · f52af39 · f52af39
1 parent fcf568f
commit f52af39
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 95 deletions.
diff --git a/.../workspace/public/components/workspace_list/__snapshots__/default_workspace.test.tsx.snap b/.../workspace/public/components/workspace_list/__snapshots__/default_workspace.test.tsx.snap
diff --git a/src/plugins/workspace/public/components/workspace_list/index.test.tsx b/src/plugins/workspace/public/components/workspace_list/index.test.tsx
@@ -308,9 +308,12 @@ describe('WorkspaceList', () => {
     expect(checkboxes.length).toBeGreaterThanOrEqual(2);
     fireEvent.click(checkboxes[0]);
     expect(getByText('Delete 1 workspace')).toBeInTheDocument();
-    const deleteButton = getByTestId('workspace-list-page-delete-button');
+    const deleteButton = getByTestId('multi-deletion-button');
     fireEvent.click(deleteButton);
     expect(screen.queryByLabelText('mock delete workspace modal')).toBeInTheDocument();
+    const modalCancelButton = screen.getByLabelText('mock delete workspace modal button');
+    fireEvent.click(modalCancelButton);
+    expect(screen.queryByLabelText('mock delete workspace modal')).not.toBeInTheDocument();
   });
 
   it('should display "Delete 2 workspaces" and show modal when two workspaces are selected for deletion', async () => {
@@ -320,9 +323,12 @@ describe('WorkspaceList', () => {
     fireEvent.click(checkboxes[0]);
     fireEvent.click(checkboxes[1]);
     expect(getByText('Delete 2 workspaces')).toBeInTheDocument();
-    const deleteButton = getByTestId('workspace-list-page-delete-button');
+    const deleteButton = getByTestId('multi-deletion-button');
     fireEvent.click(deleteButton);
     expect(screen.queryByLabelText('mock delete workspace modal')).toBeInTheDocument();
+    const modalCancelButton = screen.getByLabelText('mock delete workspace modal button');
+    fireEvent.click(modalCancelButton);
+    expect(screen.queryByLabelText('mock delete workspace modal')).not.toBeInTheDocument();
   });
 
   it('should render data source badge when more than two data sources', async () => {

diff --git a/src/plugins/workspace/public/components/workspace_list/index.tsx b/src/plugins/workspace/public/components/workspace_list/index.tsx
@@ -355,10 +355,10 @@ export const WorkspaceListInner = ({
             data-test-subj="multi-deletion-button"
           >
             {i18n.translate('workspace.list.page.delete.button.info', {
-              defaultMessage: 'Delete {num} workspace{pluralSuffix, select, true {} other {s}}',
+              defaultMessage:
+                '{selectedCount, plural, one {Delete # workspace} other {Delete # workspaces}}',
               values: {
-                num: selection.length,
-                pluralSuffix: selection.length === 1,
+                selectedCount: selection.length,
               },
             })}
           </EuiButton>