diff --git a/src/components/PeopleManagement/CreateGroupModalContent.jsx b/src/components/PeopleManagement/CreateGroupModalContent.jsx index 7c9eab902d..d9ec078c99 100644 --- a/src/components/PeopleManagement/CreateGroupModalContent.jsx +++ b/src/components/PeopleManagement/CreateGroupModalContent.jsx @@ -105,7 +105,7 @@ const CreateGroupModalContent = ({

diff --git a/src/components/PeopleManagement/EnrollmentsTableColumnHeader.jsx b/src/components/PeopleManagement/EnrollmentsTableColumnHeader.jsx deleted file mode 100644 index 939b0e0b74..0000000000 --- a/src/components/PeopleManagement/EnrollmentsTableColumnHeader.jsx +++ /dev/null @@ -1,40 +0,0 @@ -import React from 'react'; -import { - OverlayTrigger, - Tooltip, - Stack, - Icon, -} from '@openedx/paragon'; -import { InfoOutline } from '@openedx/paragon/icons'; -import { FormattedMessage } from '@edx/frontend-platform/i18n'; - -const EnrollmentsTableColumnHeader = () => ( - - - - - -
- -
- - )} - > - -
-
-); - -export default EnrollmentsTableColumnHeader; diff --git a/src/components/PeopleManagement/GroupDetailPage/DeleteGroupModal.jsx b/src/components/PeopleManagement/GroupDetailPage/DeleteGroupModal.jsx index ccf98ee650..e02cac73d8 100644 --- a/src/components/PeopleManagement/GroupDetailPage/DeleteGroupModal.jsx +++ b/src/components/PeopleManagement/GroupDetailPage/DeleteGroupModal.jsx @@ -6,7 +6,7 @@ import { logError } from '@edx/frontend-platform/logging'; import { ActionRow, Button, ModalDialog, useToggle, } from '@openedx/paragon'; -import { RemoveCircleOutline } from '@openedx/paragon/icons'; +import { RemoveCircle } from '@openedx/paragon/icons'; import GeneralErrorModal from '../GeneralErrorModal'; import { ROUTE_NAMES } from '../../EnterpriseApp/data/constants'; @@ -56,7 +56,7 @@ const DeleteGroupModal = ({ Go back - diff --git a/src/components/PeopleManagement/GroupDetailPage/GroupDetailPage.jsx b/src/components/PeopleManagement/GroupDetailPage/GroupDetailPage.jsx index 8da3181588..0cd8706863 100644 --- a/src/components/PeopleManagement/GroupDetailPage/GroupDetailPage.jsx +++ b/src/components/PeopleManagement/GroupDetailPage/GroupDetailPage.jsx @@ -13,6 +13,7 @@ import EditGroupNameModal from './EditGroupNameModal'; import formatDates from '../utils'; import GroupMembersTable from './GroupMembersTable'; import AddMembersModal from '../AddMembersModal/AddMembersModal'; +import { makePlural } from '../../../utils'; const GroupDetailPage = () => { const intl = useIntl(); @@ -98,7 +99,7 @@ const GroupDetailPage = () => { /> )} - subtitle={`${enterpriseGroup.acceptedMembersCount} accepted members`} + subtitle={makePlural(enterpriseGroup.acceptedMembersCount, 'member')} /> Created on {formatDates(enterpriseGroup.created)} diff --git a/src/components/PeopleManagement/GroupDetailPage/GroupMembersTable.jsx b/src/components/PeopleManagement/GroupDetailPage/GroupMembersTable.jsx index 4c399da953..c212bd9c93 100644 --- a/src/components/PeopleManagement/GroupDetailPage/GroupMembersTable.jsx +++ b/src/components/PeopleManagement/GroupDetailPage/GroupMembersTable.jsx @@ -9,7 +9,6 @@ import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n'; import TableTextFilter from '../../learner-credit-management/TableTextFilter'; import CustomDataTableEmptyState from '../../learner-credit-management/CustomDataTableEmptyState'; import MemberDetailsTableCell from '../../learner-credit-management/members-tab/MemberDetailsTableCell'; -import EnrollmentsTableColumnHeader from '../EnrollmentsTableColumnHeader'; import { GROUP_MEMBERS_TABLE_DEFAULT_PAGE, GROUP_MEMBERS_TABLE_PAGE_SIZE, @@ -129,7 +128,11 @@ const GroupMembersTable = ({ disableFilters: true, }, { - Header: EnrollmentsTableColumnHeader, + Header: intl.formatMessage({ + id: 'people.management.groups.detail.page.members.columns.enrollments', + defaultMessage: 'Enrollments', + description: 'Enrollments column header in the Members table in the People management Groups detail page', + }), accessor: 'enrollmentCount', Cell: ({ row }) => row.original.enrollments, disableFilters: true, diff --git a/src/components/PeopleManagement/index.jsx b/src/components/PeopleManagement/index.jsx index 5f88a5367b..7a6529a1b2 100644 --- a/src/components/PeopleManagement/index.jsx +++ b/src/components/PeopleManagement/index.jsx @@ -107,12 +107,13 @@ const PeopleManagementPage = ({ enterpriseId }) => { description="Title for people management data table." /> - +

+ +

diff --git a/src/components/PeopleManagement/tests/CreateGroupModal.test.jsx b/src/components/PeopleManagement/tests/CreateGroupModal.test.jsx index 2fc23d40c2..06fd4f616b 100644 --- a/src/components/PeopleManagement/tests/CreateGroupModal.test.jsx +++ b/src/components/PeopleManagement/tests/CreateGroupModal.test.jsx @@ -129,7 +129,7 @@ describe('', () => { }); it('Modal renders as expected', async () => { render(); - expect(screen.getByText('Create a custom group of members')).toBeInTheDocument(); + expect(screen.getByText('Create a custom group')).toBeInTheDocument(); expect(screen.getByText('Name your group')).toBeInTheDocument(); expect(screen.getByText('Select group members')).toBeInTheDocument(); expect(screen.getByText('Upload a CSV or select members from the table below.')).toBeInTheDocument(); diff --git a/src/components/PeopleManagement/tests/GroupDetailPage.test.jsx b/src/components/PeopleManagement/tests/GroupDetailPage.test.jsx index 2145898477..6c8ce15f1d 100644 --- a/src/components/PeopleManagement/tests/GroupDetailPage.test.jsx +++ b/src/components/PeopleManagement/tests/GroupDetailPage.test.jsx @@ -95,7 +95,7 @@ describe('', () => { }); render(); expect(screen.queryAllByText(TEST_GROUP.name)).toHaveLength(2); - expect(screen.getByText('0 accepted members')).toBeInTheDocument(); + expect(screen.getByText('0 members')).toBeInTheDocument(); expect(screen.getByText('View group progress')).toBeInTheDocument(); expect(screen.getByText('Add and remove group members.')).toBeInTheDocument(); expect(screen.getByText('Test 2u')).toBeInTheDocument(); @@ -107,7 +107,7 @@ describe('', () => { sortBy: [{ desc: true, id: 'memberDetails' }], })); - userEvent.click(screen.getByTestId('members-table-enrollments-column-header')); + userEvent.click(screen.getByText('Enrollments')); await waitFor(() => expect(mockFetchEnterpriseGroupLearnersTableData).toHaveBeenCalledWith({ filters: [], pageIndex: 0,