diff --git a/src/components/PeopleManagement/EnterpriseCustomerUserDatatable.jsx b/src/components/PeopleManagement/EnterpriseCustomerUserDatatable.jsx index 32b517baea..d815e9acf5 100644 --- a/src/components/PeopleManagement/EnterpriseCustomerUserDatatable.jsx +++ b/src/components/PeopleManagement/EnterpriseCustomerUserDatatable.jsx @@ -18,7 +18,7 @@ export const BaseSelectWithContext = ({ row, enterpriseGroupLearners }) => { checked, ...toggleRowSelectedProps } = row.getToggleRowSelectedProps(); - const isAddedMember = enterpriseGroupLearners.find(learner => learner.enterpriseCustomerUserId === Number(row.id)); + const isAddedMember = enterpriseGroupLearners.find(learner => learner.lmsUserId === Number(row.id)); return (
row.enterpriseCustomerUser.name.toString(), + getRowId: row => row.enterpriseCustomerUser.userId.toString(), }} pageCount={enterpriseMembersTableData.pageCount} manualSelectColumn={ diff --git a/src/components/PeopleManagement/PeopleManagementTable.jsx b/src/components/PeopleManagement/PeopleManagementTable.jsx index 3602e9b797..2e3fd468e6 100644 --- a/src/components/PeopleManagement/PeopleManagementTable.jsx +++ b/src/components/PeopleManagement/PeopleManagementTable.jsx @@ -37,7 +37,7 @@ const PeopleManagementTable = ({ enterpriseId }) => { pageSize: 10, pageIndex: 0, sortBy: [ - { id: 'enterpriseCustomerUser.name', desc: true }, + { id: 'name', desc: true }, ], filters: [], }} diff --git a/src/components/PeopleManagement/data/hooks/useEnterpriseMembersTableData.js b/src/components/PeopleManagement/data/hooks/useEnterpriseMembersTableData.js index e3f1d861d6..c94c972167 100644 --- a/src/components/PeopleManagement/data/hooks/useEnterpriseMembersTableData.js +++ b/src/components/PeopleManagement/data/hooks/useEnterpriseMembersTableData.js @@ -35,13 +35,6 @@ const useEnterpriseMembersTableData = ({ enterpriseId }) => { options.user_query = value; } }); - // if (args?.sortBy.length > 0) { - // const sortByValue = args.sortBy[0].id; - // options.sort_by = _.snakeCase(sortByValue); - // if (!args.sortBy[0].desc) { - // options.is_reversed = !args.sortBy[0].desc; - // } - if (args?.sortBy.length > 0) { const sortByValue = args.sortBy[0].id; options.sort_by = _.snakeCase(sortByValue); @@ -49,7 +42,6 @@ const useEnterpriseMembersTableData = ({ enterpriseId }) => { options.is_reversed = !args.sortBy[0].desc; } } - // } options.page = args.pageIndex + 1; const response = await LmsApiService.fetchEnterpriseCustomerMembers(enterpriseId, options); const data = camelCaseObject(response.data);