Skip to content

Commit cd199f8

Browse files
authored
Merge pull request Expensify#82934 from software-mansion-labs/war-in/domains/security-group-details-page
[Domain Control] [Release 4] Create DomainSecurityGroupDetailsPage RHP with domain name
2 parents c70c52b + ae17cbd commit cd199f8

31 files changed

Lines changed: 676 additions & 25 deletions

src/ONYXKEYS.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,8 @@ const ONYXKEYS = {
10851085
ADD_DOMAIN_MEMBER_FORM_DRAFT: 'addDomainMemberFormDraft',
10861086
ADD_WORK_EMAIL_FORM: 'addWorkEmailForm',
10871087
ADD_WORK_EMAIL_FORM_DRAFT: 'addWorkEmailFormDraft',
1088+
EDIT_DOMAIN_GROUP_NAME_FORM: 'editDomainGroupNameForm',
1089+
EDIT_DOMAIN_GROUP_NAME_FORM_DRAFT: 'editDomainGroupNameFormDraft',
10881090
},
10891091
DERIVED: {
10901092
REPORT_ATTRIBUTES: 'reportAttributes',
@@ -1229,6 +1231,7 @@ type OnyxFormValuesMapping = {
12291231
[ONYXKEYS.FORMS.SPEND_RULE_FORM]: FormTypes.SpendRuleForm;
12301232
[ONYXKEYS.FORMS.ADD_DOMAIN_MEMBER_FORM]: FormTypes.AddDomainMemberForm;
12311233
[ONYXKEYS.FORMS.ADD_WORK_EMAIL_FORM]: FormTypes.AddWorkEmailForm;
1234+
[ONYXKEYS.FORMS.EDIT_DOMAIN_GROUP_NAME_FORM]: FormTypes.DomainGroupEditNameForm;
12321235
};
12331236

12341237
type OnyxFormDraftValuesMapping = {

src/ROUTES.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4090,6 +4090,16 @@ const ROUTES = {
40904090
route: 'domain/:domainAccountID/members/:accountID/lock-account',
40914091
getRoute: (domainAccountID: number, accountID: number) => `domain/${domainAccountID}/members/${accountID}/lock-account` as const,
40924092
},
4093+
4094+
DOMAIN_GROUP_DETAILS: {
4095+
route: 'domain/:domainAccountID/groups/:groupID',
4096+
getRoute: (domainAccountID: number, groupID: string) => `domain/${domainAccountID}/groups/${groupID}` as const,
4097+
},
4098+
4099+
DOMAIN_GROUP_EDIT_NAME: {
4100+
route: 'domain/:domainAccountID/groups/:groupID/name',
4101+
getRoute: (domainAccountID: number, groupID: string) => `domain/${domainAccountID}/groups/${groupID}/name` as const,
4102+
},
40934103
} as const;
40944104

40954105
/**

src/SCREENS.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,8 @@ const SCREENS = {
10081008
MEMBER_FORCE_TWO_FACTOR_AUTH: 'Member_Force_Two_Factor_Auth',
10091009
MEMBER_LOCK_ACCOUNT: 'Member_Lock_Account',
10101010
MEMBERS_MOVE_TO_GROUP: 'Members_Move_To_Group',
1011+
GROUP_DETAILS: 'Domain_Group_Details',
1012+
GROUP_EDIT_NAME: 'Domain_Group_Edit_Name',
10111013
},
10121014
MULTIFACTOR_AUTHENTICATION: {
10131015
MAGIC_CODE: 'Multifactor_Authentication_Magic_Code',

src/languages/de.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9139,8 +9139,12 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
91399139
forceTwoFactorAuthDescription: `<muted-text>Zwei-Faktor-Authentifizierung für alle Mitglieder dieser Domain verlangen. Domänenmitglieder werden beim Anmelden aufgefordert, die Zwei-Faktor-Authentifizierung für ihr Konto einzurichten.</muted-text>`,
91409140
forceTwoFactorAuthError: 'Die Erzwingung der Zwei-Faktor-Authentifizierung konnte nicht geändert werden. Bitte versuche es später erneut.',
91419141
resetTwoFactorAuth: 'Zwei-Faktor-Authentifizierung zurücksetzen',
9142+
error: 'Diese Änderung konnte nicht gespeichert werden. Bitte versuche es erneut.',
9143+
},
9144+
groups: {
9145+
title: 'Gruppen',
9146+
memberCount: () => ({one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`}),
91429147
},
9143-
groups: {title: 'Gruppen', memberCount: () => ({one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`})},
91449148
},
91459149
proactiveAppReview: {
91469150
title: 'Gefällt dir das neue Expensify?',

src/languages/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9129,6 +9129,7 @@ const translations = {
91299129
forceTwoFactorAuthDescription: `<muted-text>Require two-factor authentication for all members of this domain. Domain members will be prompted to set up two-factor authentication on their account when they sign in.</muted-text>`,
91309130
forceTwoFactorAuthError: "Force two-factor authentication couldn't be changed. Please try again later.",
91319131
resetTwoFactorAuth: 'Reset two-factor authentication',
9132+
error: "Couldn't save this change. Please try again.",
91329133
},
91339134
groups: {
91349135
title: 'Groups',

src/languages/es.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9360,6 +9360,7 @@ ${amount} para ${merchant} - ${date}`,
93609360
forceTwoFactorAuthDescription: `<muted-text>Requiere la autenticación de dos factores para todos los miembros de este dominio. Se les pedirá a los miembros del dominio que configuren la autenticación de dos factores en su cuenta cuando inicien sesión.</muted-text>`,
93619361
forceTwoFactorAuthError: 'No se pudo cambiar la autenticación de dos factores forzada. Por favor, inténtalo de nuevo más tarde.',
93629362
resetTwoFactorAuth: 'Restablecer la autenticación de dos factores',
9363+
error: 'No se pudo guardar este cambio. Por favor, inténtalo de nuevo.',
93639364
},
93649365
groups: {
93659366
title: 'Grupos',

src/languages/fr.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9162,8 +9162,12 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
91629162
forceTwoFactorAuthDescription: `<muted-text>Exiger l’authentification à deux facteurs pour tous les membres de ce domaine. Les membres du domaine seront invités à configurer l’authentification à deux facteurs sur leur compte lorsqu’ils se connectent.</muted-text>`,
91639163
forceTwoFactorAuthError: 'L’activation forcée de l’authentification à deux facteurs n’a pas pu être modifiée. Veuillez réessayer plus tard.',
91649164
resetTwoFactorAuth: 'Réinitialiser l’authentification à deux facteurs',
9165+
error: 'Impossible d’enregistrer cette modification. Veuillez réessayer.',
9166+
},
9167+
groups: {
9168+
title: 'Groupes',
9169+
memberCount: () => ({one: '1 membre', other: (count: number) => `${count} membres`}),
91659170
},
9166-
groups: {title: 'Groupes', memberCount: () => ({one: '1 membre', other: (count: number) => `${count} membres`})},
91679171
},
91689172
proactiveAppReview: {
91699173
title: 'Vous appréciez le nouveau Expensify ?',

src/languages/it.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9129,8 +9129,12 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
91299129
forceTwoFactorAuthDescription: `<muted-text>Richiedi l’autenticazione a due fattori per tutti i membri di questo dominio. Ai membri del dominio verrà chiesto di configurare l’autenticazione a due fattori sul proprio account quando effettuano l’accesso.</muted-text>`,
91309130
forceTwoFactorAuthError: 'Impossibile modificare l’impostazione “Forza l’autenticazione a due fattori”. Riprova più tardi.',
91319131
resetTwoFactorAuth: 'Reimposta l’autenticazione a due fattori',
9132+
error: 'Impossibile salvare questa modifica. Riprova.',
9133+
},
9134+
groups: {
9135+
title: 'Gruppi',
9136+
memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membri`}),
91329137
},
9133-
groups: {title: 'Gruppi', memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membri`})},
91349138
},
91359139
proactiveAppReview: {
91369140
title: 'Ti piace il nuovo Expensify?',

src/languages/ja.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9015,8 +9015,12 @@ ${reportName}
90159015
forceTwoFactorAuthDescription: `<muted-text>このドメインのすべてのメンバーに二要素認証を必須にします。ドメインメンバーは、サインイン時に自分のアカウントで二要素認証を設定するよう求められます。</muted-text>`,
90169016
forceTwoFactorAuthError: '2要素認証の強制設定を変更できませんでした。後でもう一度お試しください。',
90179017
resetTwoFactorAuth: '2 要素認証をリセット',
9018+
error: 'この変更を保存できませんでした。もう一度お試しください。',
9019+
},
9020+
groups: {
9021+
title: 'グループ',
9022+
memberCount: () => ({one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`}),
90189023
},
9019-
groups: {title: 'グループ', memberCount: () => ({one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`})},
90209024
},
90219025
proactiveAppReview: {
90229026
title: '新しい Expensify をお楽しみいただけていますか?',

src/languages/nl.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9102,8 +9102,12 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
91029102
forceTwoFactorAuthDescription: `<muted-text>Tweeledige verificatie vereisen voor alle leden van dit domein. Domeinleden worden gevraagd om tweefactorauthenticatie voor hun account in te stellen wanneer ze zich aanmelden.</muted-text>`,
91039103
forceTwoFactorAuthError: 'Verplichte twee-factor-authenticatie kon niet worden gewijzigd. Probeer het later opnieuw.',
91049104
resetTwoFactorAuth: 'Tweeledige verificatie opnieuw instellen',
9105+
error: 'Kon deze wijziging niet opslaan. Probeer het opnieuw.',
9106+
},
9107+
groups: {
9108+
title: 'Groepen',
9109+
memberCount: () => ({one: '1 lid', other: (count: number) => `${count} leden`}),
91059110
},
9106-
groups: {title: 'Groepen', memberCount: () => ({one: '1 lid', other: (count: number) => `${count} leden`})},
91079111
},
91089112
proactiveAppReview: {
91099113
title: 'Geniet je van de nieuwe Expensify?',

0 commit comments

Comments
 (0)