Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5e827c4
revert initial approch used in previous PR
samranahm Jun 19, 2026
aea501c
Refactor WorkspaceMembersPage to use WorkspaceMembersRoleFilterButton…
samranahm Jun 19, 2026
990d9e2
Add ROLE_FILTER_BUTTON constant for WorkspaceMembers RoleFilterButton
samranahm Jun 19, 2026
0c28608
Add MembersFilterButton component
samranahm Jun 19, 2026
e2a5a88
Add GROUP_FILTER_BUTTON constant for DomainMembers in CONST
samranahm Jun 19, 2026
e59f377
Refactor BaseDomainMembersPage and DomainMembersPage to utilize Membe…
samranahm Jun 19, 2026
832aa14
Enhance domain and workspace member filtering by introducing effectiv…
samranahm Jun 20, 2026
9c4060d
Add tests for role fallback in WorkspaceMembers and group selection i…
samranahm Jun 20, 2026
87e9d57
Refactor MembersFilterButton to add MultiSelectPopup and update relat…
samranahm Jun 22, 2026
9a0bb1f
Remove unused export of MembersFilterButtonProps from MembersFilterBu…
samranahm Jun 22, 2026
d6aa13f
Implement role filter validation on workspace type change
samranahm Jun 22, 2026
48fe06e
Merge remote-tracking branch 'upstream/main' into 90637/members-filte…
samranahm Jun 29, 2026
fb144f3
Refactor DomainMembersTable and useDomainGroupFilter for improved gro…
samranahm Jun 29, 2026
4b90482
Update useDomainGroupFilter tests to sort groups alphabetically and n…
samranahm Jun 29, 2026
191cca8
Merge remote-tracking branch 'upstream/main' into 90637/members-filte…
samranahm Jul 7, 2026
798357b
Refactor DomainMembersTable filter logic to support multi-select and …
samranahm Jul 7, 2026
4b2d14f
Update tests for useDomainGroupFilter to test multi-select filter type
samranahm Jul 7, 2026
c524556
run fmt
samranahm Jul 7, 2026
e91c7aa
Merge branch 'Expensify:main' into 90637/members-filter-multi-select-v2
samranahm Jul 15, 2026
915a5e5
Merge branch 'Expensify:main' into 90637/members-filter-multi-select-v2
samranahm Jul 24, 2026
fbd7c29
Merge branch 'Expensify:main' into 90637/members-filter-multi-select-v2
samranahm Jul 27, 2026
3b36e38
fix: Ignore invalid group IDs and allow all members when no valid sel…
samranahm Jul 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/components/Tables/DomainMembersTable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,19 @@ function DomainMembersGroupFilterSync({shouldShowGroupFilter, groupOptionValuesK
const groupFilterValue = activeFilters.group;

useEffect(() => {
const activeGroupFilter = groupFilterValue?.at(0);
const activeGroupFilters = Array.isArray(groupFilterValue) ? groupFilterValue.filter((value): value is string => typeof value === 'string') : [];
const groupOptionValues = groupOptionValuesKey ? groupOptionValuesKey.split(',') : [];

if (!shouldShowGroupFilter) {
if (activeGroupFilter) {
if (activeGroupFilters.length > 0) {
tableMethods.updateFilter({key: 'group', value: []});
}
return;
}

if (activeGroupFilter && !groupOptionValues.includes(activeGroupFilter)) {
tableMethods.updateFilter({key: 'group', value: []});
const validFilters = activeGroupFilters.filter((filter) => groupOptionValues.includes(filter));
if (validFilters.length !== activeGroupFilters.length) {
tableMethods.updateFilter({key: 'group', value: validFilters});
}
}, [shouldShowGroupFilter, groupOptionValuesKey, groupFilterValue, tableMethods]);

Expand Down
32 changes: 22 additions & 10 deletions src/hooks/useDomainGroupFilter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type {FilterConfig, IsItemInFilterCallback} from '@components/Table';
import type {DomainMemberRowData, DomainMembersTableFilterKey} from '@components/Tables/DomainMembersTable';

import {sortAlphabetically} from '@libs/OptionsListUtils';

import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';

Expand Down Expand Up @@ -29,7 +31,7 @@ type UseDomainGroupFilterResult = {
};

function useDomainGroupFilter(domainAccountID: number): UseDomainGroupFilterResult {
const {translate} = useLocalize();
const {translate, localeCompare} = useLocalize();

const [groups] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
selector: groupsSelector,
Expand All @@ -38,30 +40,40 @@ function useDomainGroupFilter(domainAccountID: number): UseDomainGroupFilterResu
const shouldShowGroupFilter = (groups?.length ?? 0) > 1;
const shouldShowGroupColumn = (groups?.length ?? 0) > 0;

const groupFilterOptions = sortAlphabetically(
(groups ?? []).map((group) => ({
label: group.details.name ?? '',
value: group.id,
})),
'label',
localeCompare,
);

const filterConfig: FilterConfig<DomainMembersTableFilterKey> | undefined = !shouldShowGroupFilter
? undefined
: {
group: {
label: translate('common.group'),
filterType: CONST.TABLES.FILTER_TYPE.SINGLE_SELECT,
options: (groups ?? []).map((group) => ({
label: group.details.name ?? '',
value: group.id,
})),
filterType: CONST.TABLES.FILTER_TYPE.MULTI_SELECT,
options: groupFilterOptions,
},
};

const isItemInFilter: IsItemInFilterCallback<DomainMemberRowData> | undefined = !shouldShowGroupFilter
? undefined
: (item, filterValues) => {
const filterValue = filterValues.at(0);
const matchedGroup = groups?.find((group) => group.id === filterValue);
if (filterValues.length === 0) {
return true;
}

if (!matchedGroup) {
// Ignore stale/removed group IDs so the table stays stable until
// DomainMembersGroupFilterSync clears invalid selections.
const selectedGroups = (groups ?? []).filter((group) => filterValues.includes(group.id));
if (selectedGroups.length === 0) {
return true;
}

return String(item.accountID) in matchedGroup.details.shared;
return selectedGroups.some((group) => String(item.accountID) in group.details.shared);
};

return {
Expand Down
46 changes: 41 additions & 5 deletions tests/unit/hooks/useDomainGroupFilter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ describe('useDomainGroupFilter', () => {
expect(result.current.shouldShowGroupColumn).toBe(true);
});

it('should include all security groups when multiple groups exist', async () => {
it('should sort security groups alphabetically by name in the filter options', async () => {
const domain = buildDomain({
'1': {members: {'100': 'read', '200': 'read'}, name: 'Engineering'},
'2': {members: {'300': 'read'}, name: 'Marketing'},
'1': {members: {'100': 'read', '200': 'read'}, name: 'Engineering'},
});
await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${DOMAIN_ACCOUNT_ID}`, domain);

Expand All @@ -107,6 +107,7 @@ describe('useDomainGroupFilter', () => {
expect(result.current.filterConfig?.group.options).toHaveLength(2);
});

expect(result.current.filterConfig?.group.filterType).toBe(CONST.TABLES.FILTER_TYPE.MULTI_SELECT);
expect(result.current.filterConfig?.group.options.at(0)).toEqual({
label: 'Engineering',
value: '1',
Expand All @@ -124,7 +125,7 @@ describe('useDomainGroupFilter', () => {
expect(result.current.isItemInFilter).toBeUndefined();
});

it('should allow all members through when the group filter is cleared', async () => {
it('should allow all members through when no groups are selected', async () => {
const domain = buildDomain({
'1': {members: {'100': 'read', '200': 'read'}, name: 'Engineering'},
'2': {members: {'300': 'read'}, name: 'Marketing'},
Expand All @@ -141,7 +142,7 @@ describe('useDomainGroupFilter', () => {
expect(result.current.isItemInFilter?.(buildMemberRow(999), [])).toBe(true);
});

it('should filter members to the selected group', async () => {
it('should filter members to a single selected group', async () => {
const domain = buildDomain({
'1': {members: {'100': 'read', '200': 'read'}, name: 'Engineering'},
'2': {members: {'300': 'read'}, name: 'Marketing'},
Expand All @@ -159,7 +160,25 @@ describe('useDomainGroupFilter', () => {
expect(result.current.isItemInFilter?.(buildMemberRow(300), ['1'])).toBe(false);
});

it('should allow all members when the selected group is not found', async () => {
it('should show the union of members when multiple groups are selected', async () => {
const domain = buildDomain({
'1': {members: {'100': 'read'}, name: 'Engineering'},
'2': {members: {'200': 'read'}, name: 'Marketing'},
});
await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${DOMAIN_ACCOUNT_ID}`, domain);

const {result} = renderHook(() => useDomainGroupFilter(DOMAIN_ACCOUNT_ID));

await waitFor(() => {
expect(result.current.isItemInFilter).toBeDefined();
});

expect(result.current.isItemInFilter?.(buildMemberRow(100), ['1', '2'])).toBe(true);
expect(result.current.isItemInFilter?.(buildMemberRow(200), ['1', '2'])).toBe(true);
expect(result.current.isItemInFilter?.(buildMemberRow(999), ['1', '2'])).toBe(false);
});

it('should allow all members when no selected groups are found', async () => {
const domain = buildDomain({
'1': {members: {'100': 'read'}, name: 'Group 1'},
'2': {members: {'200': 'read'}, name: 'Group 2'},
Expand All @@ -175,6 +194,23 @@ describe('useDomainGroupFilter', () => {
expect(result.current.isItemInFilter?.(buildMemberRow(100), ['doesNotExist'])).toBe(true);
expect(result.current.isItemInFilter?.(buildMemberRow(999), ['doesNotExist'])).toBe(true);
});

it('should ignore invalid group IDs and filter by remaining valid selections', async () => {
const domain = buildDomain({
'1': {members: {'100': 'read'}, name: 'Group 1'},
'2': {members: {'200': 'read'}, name: 'Group 2'},
});
await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${DOMAIN_ACCOUNT_ID}`, domain);

const {result} = renderHook(() => useDomainGroupFilter(DOMAIN_ACCOUNT_ID));

await waitFor(() => {
expect(result.current.isItemInFilter).toBeDefined();
});

expect(result.current.isItemInFilter?.(buildMemberRow(100), ['1', 'doesNotExist'])).toBe(true);
expect(result.current.isItemInFilter?.(buildMemberRow(200), ['1', 'doesNotExist'])).toBe(false);
});
});

describe('groups', () => {
Expand Down
Loading