diff --git a/src/pages/dashboardUsers/components/UsersTableActions/UsersTableRolesFilter.tsx b/src/pages/dashboardUsers/components/UsersTableActions/UsersTableRolesFilter.tsx index d726f6e..b5d1b9a 100644 --- a/src/pages/dashboardUsers/components/UsersTableActions/UsersTableRolesFilter.tsx +++ b/src/pages/dashboardUsers/components/UsersTableActions/UsersTableRolesFilter.tsx @@ -125,6 +125,7 @@ export default function UsersTableRolesFilter({ return ( - selcGroupTotallySelected[s] - ? [t(labels[s].titleKey)] - : Object.keys(productRoleCheckedBySelcRole[s]) + value={selcGroups.flatMap( + (s) => + selcGroupTotallySelected[s] + ? [`group-${s}-${t(labels[s].titleKey)}`] // Add prefix to make parent unique + : Object.keys(productRoleCheckedBySelcRole[s]).map((title) => `child-${s}-${title}`) // Add prefix to make children unique )} renderValue={(selected: any) => { if (selected.length === 0) { @@ -240,6 +242,12 @@ export default function UsersTableRolesFilter({ ); } + + const displayValues = selected.map((value: string) => { + const secondDashIndex = value.indexOf('-', value.indexOf('-') + 1); + return secondDashIndex !== -1 ? value.substring(secondDashIndex + 1) : value; + }); + return ( - {selected.join(', ')} + {displayValues.join(', ')} ); }} @@ -267,6 +275,7 @@ export default function UsersTableRolesFilter({ return [ showSelcRoleGrouped && !isPnpg ? ( handleUserRole(isSelected, selcGroup, selcRole)} key={selcRole} >