diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 4f22f01b50d4..be6daee4576a 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -3918,6 +3918,11 @@ const ROUTES = { MULTIFACTOR_AUTHENTICATION_NOT_FOUND: 'multifactor-authentication/not-found', MULTIFACTOR_AUTHENTICATION_REVOKE: 'multifactor-authentication/revoke', + + DOMAIN_GROUPS: { + route: 'domain/:domainAccountID/groups', + getRoute: (domainAccountID: number) => `domain/${domainAccountID}/groups` as const, + }, } as const; /** diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 2f5062cfd97c..ce3d37074855 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -945,6 +945,7 @@ const SCREENS = { ADD_MEMBER: 'Domain_Add_Member', MEMBERS_SETTINGS: 'Members_Settings', MEMBERS_SETTINGS_TWO_FACTOR_AUTH: 'Members_Settings_Two_Factor_Auth', + GROUPS: 'Domain_Groups', }, MULTIFACTOR_AUTHENTICATION: { MAGIC_CODE: 'Multifactor_Authentication_Magic_Code', diff --git a/src/components/SelectionListWithModal/CustomListHeader.tsx b/src/components/SelectionListWithModal/CustomListHeader.tsx index b3ae8a84349e..3264ed3e82b5 100644 --- a/src/components/SelectionListWithModal/CustomListHeader.tsx +++ b/src/components/SelectionListWithModal/CustomListHeader.tsx @@ -44,7 +44,7 @@ function CustomListHeader({ if (canSelectMultiple) { return header; } - return {header}; + return {header}; } export default CustomListHeader; diff --git a/src/languages/de.ts b/src/languages/de.ts index 4058c4bef4c7..195c1ad4d2cd 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -8495,6 +8495,7 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`, forceTwoFactorAuthError: 'Die Erzwingung der Zwei-Faktor-Authentifizierung konnte nicht geändert werden. Bitte versuche es später erneut.', }, common: {settings: 'Einstellungen'}, + groups: {title: 'Gruppen', memberCount: () => ({one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`})}, }, }; export default translations; diff --git a/src/languages/en.ts b/src/languages/en.ts index d4d7e35c773d..5b492f151089 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -8436,6 +8436,15 @@ const translations = { common: { settings: 'Settings', }, + groups: { + title: 'Groups', + memberCount: () => { + return { + one: '1 member', + other: (count: number) => `${count} members`, + }; + }, + }, }, }; diff --git a/src/languages/es.ts b/src/languages/es.ts index 05785d05c4c5..45e6ffba995b 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -8619,6 +8619,15 @@ ${amount} para ${merchant} - ${date}`, common: { settings: 'Configuración', }, + groups: { + title: 'Grupos', + memberCount: () => { + return { + one: '1 miembro', + other: (count: number) => `${count} miembros`, + }; + }, + }, }, gps: { disclaimer: 'Utiliza el GPS para crear un gasto a partir de tu trayecto. Toca Iniciar a continuación para comenzar el seguimiento.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index d526962ba311..d131a2da48f4 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -8515,6 +8515,7 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`, forceTwoFactorAuthError: 'L’activation forcée de l’authentification à deux facteurs n’a pas pu être modifiée. Veuillez réessayer plus tard.', }, common: {settings: 'Paramètres'}, + groups: {title: 'Groupes', memberCount: () => ({one: '1 membre', other: (count: number) => `${count} membres`})}, }, }; export default translations; diff --git a/src/languages/it.ts b/src/languages/it.ts index faafa229ccc5..72b5a2543b19 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -8479,6 +8479,7 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`, forceTwoFactorAuthError: 'Impossibile modificare l’impostazione “Forza l’autenticazione a due fattori”. Riprova più tardi.', }, common: {settings: 'Impostazioni'}, + groups: {title: 'Gruppi', memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membri`})}, }, }; export default translations; diff --git a/src/languages/ja.ts b/src/languages/ja.ts index dee50b7fbab8..bb1836b8ef0f 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -8401,6 +8401,7 @@ ${reportName} forceTwoFactorAuthError: '2要素認証の強制設定を変更できませんでした。後でもう一度お試しください。', }, common: {settings: '設定'}, + groups: {title: 'グループ', memberCount: () => ({one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`})}, }, }; export default translations; diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 4d89f45f5546..a5c126845f91 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -8464,6 +8464,7 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`, forceTwoFactorAuthError: 'Verplichte twee-factor-authenticatie kon niet worden gewijzigd. Probeer het later opnieuw.', }, common: {settings: 'Instellingen'}, + groups: {title: 'Groepen', memberCount: () => ({one: '1 lid', other: (count: number) => `${count} leden`})}, }, }; export default translations; diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 76c45d3e01a9..94d107299cab 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -8444,6 +8444,7 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`, forceTwoFactorAuthError: 'Nie udało się zmienić wymuszania uwierzytelniania dwuskładnikowego. Spróbuj ponownie później.', }, common: {settings: 'Ustawienia'}, + groups: {title: 'Grupy', memberCount: () => ({one: '1 członek', other: (count: number) => `${count} członków`})}, }, }; export default translations; diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index ba49d5c20731..544fb9e89f66 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -8448,6 +8448,7 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`, forceTwoFactorAuthError: 'Não foi possível alterar a exigência de autenticação em duas etapas. Tente novamente mais tarde.', }, common: {settings: 'Configurações'}, + groups: {title: 'Grupos', memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membros`})}, }, }; export default translations; diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 2b1acc856d0b..1b997c4a52dd 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -8274,6 +8274,7 @@ ${reportName} forceTwoFactorAuthError: '无法更改强制启用双重身份验证设置。请稍后再试。', }, common: {settings: '设置'}, + groups: {title: '群组', memberCount: () => ({one: '1 名成员', other: (count: number) => `${count} 名成员`})}, }, }; export default translations; diff --git a/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx index cb0ba3589801..78fdcb8ca47d 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx @@ -15,6 +15,7 @@ const loadDomainInitialPage = () => require('../../../../p const loadDomainSamlPage = () => require('../../../../pages/domain/DomainSamlPage').default; const loadDomainAdminsPage = () => require('../../../../pages/domain/Admins/DomainAdminsPage').default; const loadDomainMembersPage = () => require('../../../../pages/domain/Members/DomainMembersPage').default; +const loadDomainGroupsPage = () => require('../../../../pages/domain/Groups/DomainGroupsPage').default; const Split = createSplitNavigator(); @@ -57,6 +58,12 @@ function DomainSplitNavigator({route, navigation}: PlatformStackScreenProps + + diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts index abc405c42b87..8817d39f7e37 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts @@ -7,6 +7,7 @@ const DOMAIN_TO_RHP: Partial['config'] = { [SCREENS.DOMAIN.MEMBERS]: { path: ROUTES.DOMAIN_MEMBERS.route, }, + [SCREENS.DOMAIN.GROUPS]: { + path: ROUTES.DOMAIN_GROUPS.route, + }, }, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 38ea1b1f4047..62d17c27a653 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -2717,6 +2717,9 @@ type DomainSplitNavigatorParamList = { domainAccountID: number; accountID: number; }; + [SCREENS.DOMAIN.GROUPS]: { + domainAccountID: number; + }; }; type OnboardingModalNavigatorParamList = { diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx new file mode 100644 index 000000000000..b1b4752c6a78 --- /dev/null +++ b/src/pages/domain/Groups/DomainGroupsPage.tsx @@ -0,0 +1,94 @@ +import type {DomainSecurityGroupWithID} from '@selectors/Domain'; +import {groupsSelector} from '@selectors/Domain'; +import React from 'react'; +import {View} from 'react-native'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import SelectionList from '@components/SelectionList'; +import TableListItem from '@components/SelectionList/ListItem/TableListItem'; +import CustomListHeader from '@components/SelectionListWithModal/CustomListHeader'; +import Text from '@components/Text'; +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useResponsiveLayout from '@hooks/useResponsiveLayout'; +import useThemeStyles from '@hooks/useThemeStyles'; +import Navigation from '@navigation/Navigation'; +import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types'; +import type {DomainSplitNavigatorParamList} from '@navigation/types'; +import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type SCREENS from '@src/SCREENS'; +import getEmptyArray from '@src/types/utils/getEmptyArray'; + +type DomainGroupsPageProps = PlatformStackScreenProps; + +function DomainGroupsPage({route}: DomainGroupsPageProps) { + const {domainAccountID} = route.params; + + const styles = useThemeStyles(); + const {translate} = useLocalize(); + const illustrations = useMemoizedLazyIllustrations(['Members']); + const {shouldUseNarrowLayout} = useResponsiveLayout(); + + const [groups = getEmptyArray()] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {canBeMissing: false, selector: groupsSelector}); + + const data = groups.map((group) => { + return { + keyForList: group.id, + text: group.details.name ?? '', + rightElement: ( + + + {translate('domain.groups.memberCount', {count: Object.keys(group.details.shared).length})} + + + ), + }; + }); + + const getCustomListHeader = () => { + if (!data || data?.length === 0) { + return null; + } + + return ( + + ); + }; + + return ( + + + + null} + customListHeader={getCustomListHeader()} + /> + + + ); +} + +export default DomainGroupsPage; diff --git a/src/selectors/Domain.ts b/src/selectors/Domain.ts index 157cd0798771..7fa41f62e456 100644 --- a/src/selectors/Domain.ts +++ b/src/selectors/Domain.ts @@ -5,6 +5,11 @@ import type {CardFeeds, Domain, DomainPendingActions, DomainSecurityGroup, Domai import type {SecurityGroupKey, UserSecurityGroupData} from '@src/types/onyx/Domain'; import getEmptyArray from '@src/types/utils/getEmptyArray'; +type DomainSecurityGroupWithID = { + id: string; + details: DomainSecurityGroup; +}; + const domainMemberSettingsSelector = (domainSettings: OnyxEntry) => domainSettings?.settings; const domainSamlSettingsStateSelector = (domain: OnyxEntry) => @@ -141,6 +146,19 @@ const adminPendingActionSelector = (pendingAction: OnyxEntry) => domain?.domain_defaultSecurityGroupID; +function groupsSelector(domain: OnyxEntry): DomainSecurityGroupWithID[] { + if (!domain) { + return getEmptyArray(); + } + + return Object.entries(domain).reduce((acc, [key, value]) => { + if (key.startsWith(CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX)) { + acc.push({id: key.replace(CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, ''), details: value as DomainSecurityGroup}); + } + return acc; + }, []); +} + export { domainMemberSettingsSelector, domainSettingsPrimaryContactSelector, @@ -156,4 +174,7 @@ export { selectSecurityGroupForAccount, memberPendingActionSelector, isSecurityGroupEntry, + groupsSelector, }; + +export {type DomainSecurityGroupWithID}; diff --git a/tests/unit/DomainSelectorsTest.ts b/tests/unit/DomainSelectorsTest.ts index d62d796215bd..198d22c3692f 100644 --- a/tests/unit/DomainSelectorsTest.ts +++ b/tests/unit/DomainSelectorsTest.ts @@ -4,6 +4,7 @@ import { defaultSecurityGroupIDSelector, domainEmailSelector, domainSettingsPrimaryContactSelector, + groupsSelector, isSecurityGroupEntry, memberAccountIDsSelector, selectSecurityGroupForAccount, @@ -392,4 +393,40 @@ describe('domainSelectors', () => { expect(isSecurityGroupEntry(entry)).toBe(false); }); }); + + describe('groupsSelector', () => { + it('Should return an empty array if the domain object is undefined', () => { + expect(groupsSelector(undefined)).toEqual([]); + }); + + it('Should return an empty array if the domain object is empty', () => { + const domain = {} as OnyxEntry; + expect(groupsSelector(domain)).toEqual([]); + }); + + it('Should return an array of groups when keys start with the security group prefix', () => { + const domain = { + [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}123`]: {name: 'Group 1'}, + [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}456`]: {name: 'Group 2'}, + } as unknown as OnyxEntry; + + const expectedGroups = [ + {id: '123', details: {name: 'Group 1'}}, + {id: '456', details: {name: 'Group 2'}}, + ]; + + expect(groupsSelector(domain)).toEqual(expectedGroups); + }); + + it('Should ignore keys that do not start with the security group prefix', () => { + const domain = { + [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}123`]: {name: 'Group 1'}, + otherKey: 'value', + } as unknown as OnyxEntry; + + const expectedGroups = [{id: '123', details: {name: 'Group 1'}}]; + + expect(groupsSelector(domain)).toEqual(expectedGroups); + }); + }); });