Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 34 additions & 29 deletions src/pages/domain/BaseDomainMembersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,35 +128,40 @@ function BaseDomainMembersPage({
const icons = useMemoizedLazyExpensifyIcons(['FallbackAvatar']);
const illustrations = useMemoizedLazyIllustrations(['EmptyShelves']);

const data: MemberOption[] = accountIDs.map((accountID) => {
const details = personalDetails?.[accountID];
const login = details?.login ?? '';
const customProps = getCustomRowProps?.(accountID, login);
const isPendingActionDelete = customProps?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;

return {
keyForList: String(accountID),
accountID,
login,
text: formatPhoneNumber(getDisplayNameOrDefault(details)),
alternateText: formatPhoneNumber(login),
icons: [
{
source: details?.avatar ?? icons.FallbackAvatar,
name: formatPhoneNumber(login),
type: CONST.ICON_TYPE_AVATAR,
id: accountID,
},
],
rightElement: getCustomRightElement?.(accountID),
errors: getLatestError(customProps?.errors),
pendingAction: customProps?.pendingAction,
isInteractive: !isPendingActionDelete && !details?.isOptimisticPersonalDetail,
isDisabled: isPendingActionDelete,
isDisabledCheckbox: isPendingActionDelete || !!details?.isOptimisticPersonalDetail,
brickRoadIndicator: customProps?.brickRoadIndicator,
};
});
const data: MemberOption[] = accountIDs
.filter((accountID) => {
const details = personalDetails?.[accountID];
return !!details?.login || !!details?.displayName;
})
.map((accountID) => {
const details = personalDetails?.[accountID];
const login = details?.login ?? '';
const customProps = getCustomRowProps?.(accountID, login);
const isPendingActionDelete = customProps?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;

return {
keyForList: String(accountID),
accountID,
login,
text: formatPhoneNumber(getDisplayNameOrDefault(details)),
alternateText: formatPhoneNumber(login),
icons: [
{
source: details?.avatar ?? icons.FallbackAvatar,
name: formatPhoneNumber(login),
type: CONST.ICON_TYPE_AVATAR,
id: accountID,
},
],
rightElement: getCustomRightElement?.(accountID),
errors: getLatestError(customProps?.errors),
pendingAction: customProps?.pendingAction,
isInteractive: !isPendingActionDelete && !details?.isOptimisticPersonalDetail,
isDisabled: isPendingActionDelete,
isDisabledCheckbox: isPendingActionDelete || !!details?.isOptimisticPersonalDetail,
brickRoadIndicator: customProps?.brickRoadIndicator,
};
});

const filterMember = (memberOption: MemberOption, searchQuery: string) => {
const results = tokenizedSearch([memberOption], searchQuery, (option) => [option.text ?? '', option.alternateText ?? '']);
Expand Down
5 changes: 4 additions & 1 deletion src/selectors/Domain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ function memberAccountIDsSelector(domain: OnyxEntry<Domain>): number[] {

const sharedMembers = securityGroup?.shared ?? {};

for (const id of Object.keys(sharedMembers)) {
for (const [id, memberValue] of Object.entries(sharedMembers)) {
if (memberValue === null || memberValue === undefined) {
continue;
}
const accountID = Number(id);
if (!Number.isNaN(accountID)) {
acc.push(accountID);
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/DomainSelectorsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,25 @@ describe('domainSelectors', () => {
expect(memberAccountIDsSelector(domain)).toEqual([111]);
});

it('Should filter out members with null or undefined permission values', () => {
const domain = {
[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}1`]: {
shared: {
// eslint-disable-next-line @typescript-eslint/naming-convention
'100': 'read',
// eslint-disable-next-line @typescript-eslint/naming-convention
'200': null,
// eslint-disable-next-line @typescript-eslint/naming-convention
'300': undefined,
// eslint-disable-next-line @typescript-eslint/naming-convention
'400': 'read',
},
},
} as unknown as OnyxEntry<Domain>;

expect(memberAccountIDsSelector(domain).sort()).toEqual([100, 400]);
});

it('Should filter out non-numeric shared keys', () => {
const domain = {
[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}1`]: {
Expand Down
Loading