feat: Remove the word 'All' from filter status to avoid confusion ENT…

…-4684 (#590) * feat: Remove the word 'All' from filter status to avoid confusion ENT-4684 ENt-4684 * fix: fix tests fix test assertions missed in first round
openedx · Jul 9, 2021 · 4f4c51b · 4f4c51b
1 parent 542735f
commit 4f4c51b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/components/BulkEnrollmentPage/CourseSearchResults.test.jsx b/src/components/BulkEnrollmentPage/CourseSearchResults.test.jsx
@@ -131,7 +131,7 @@ describe('<CourseSearchResults />', () => {
     const selection = screen.getByTestId('selectAll');
     userEvent.click(selection);
 
-    expect(screen.getByText('All 2 selected')).toBeInTheDocument();
+    expect(screen.getByText('2 selected')).toBeInTheDocument();
   });
   it('renders a message when there are no results', () => {
     const wrapper = mount(<CourseSearchWrapper

diff --git a/src/components/BulkEnrollmentPage/stepper/BulkEnrollmentStepper.test.jsx b/src/components/BulkEnrollmentPage/stepper/BulkEnrollmentStepper.test.jsx
@@ -110,7 +110,7 @@ describe('BulkEnrollmentStepper', () => {
     const prevButton = screen.getByTestId(PREV_BUTTON_TEST_ID);
     userEvent.click(prevButton);
     expect(screen.getAllByText(ADD_COURSES_TITLE)).toHaveLength(2);
-    expect(screen.getByText('All 2 selected')).toBeInTheDocument();
+    expect(screen.getByText('2 selected')).toBeInTheDocument();
     await act(() => mockEmailResponse);
   });
   it('displays the user emails', async () => {

diff --git a/src/components/BulkEnrollmentPage/table/BaseSelectionStatus.jsx b/src/components/BulkEnrollmentPage/table/BaseSelectionStatus.jsx
@@ -14,18 +14,15 @@ const BaseSelectionStatus = ({
   selectedRows,
   dispatch,
 }) => {
-  const {
-    itemCount, rows,
-  } = useContext(DataTableContext);
-  const isAllRowsSelected = selectedRows.length === itemCount;
+  const { rows } = useContext(DataTableContext);
   const selectedRowIds = selectedRows.map((row) => row.id);
   const areAllDisplayedRowsSelected = checkForSelectedRows(selectedRowIds, rows);
 
   const numSelectedRows = selectedRows.length;
 
   return (
     <div className={className}>
-      <span>{isAllRowsSelected && 'All '}{numSelectedRows} selected </span>
+      <span>{numSelectedRows} selected </span>
       {!areAllDisplayedRowsSelected && (
         <Button
           variant="link"

diff --git a/src/components/BulkEnrollmentPage/table/BaseSelectionStatus.test.jsx b/src/components/BulkEnrollmentPage/table/BaseSelectionStatus.test.jsx
@@ -82,6 +82,6 @@ describe('BaseSelectionStatus', () => {
       {...defaultProps}
       selectedRows={defaultDataTableInfo.rows}
     />);
-    expect(screen.getByText(`All ${defaultDataTableInfo.rows.length} selected`)).toBeInTheDocument();
+    expect(screen.getByText(`${defaultDataTableInfo.rows.length} selected`)).toBeInTheDocument();
   });
 });