feat: add blocking modal when admin has no policies and workspace preselection

jakubstec · jakubstec · commit 950a73ad16fc · 2026-04-17T12:18:04.000+02:00
diff --git a/src/languages/de.ts b/src/languages/de.ts
@@ -9106,6 +9106,7 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
             preferredWorkspace: 'Bevorzugter Arbeitsbereich',
             preferredWorkspaceDescription: (enabled: boolean) => `Alle neuen Berichte und Ausgaben werden im ${enabled ? 'ausgewählten bevorzugten' : 'diesem'} Arbeitsbereich erstellt.`,
             preferredWorkspaceSelectDescription: 'Alle neuen Ausgaben und Berichte werden in diesem Arbeitsbereich erstellt.',
+            noWorkspacesMessage: 'Es gibt keine Arbeitsbereiche in dieser Domain. Ein Arbeitsbereich ist erforderlich, um diese Einschränkung zu aktivieren.',
             defaultGroup: 'Standardgruppe für neue Mitglieder',
         },
     },
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -9095,6 +9095,7 @@ const translations = {
             preferredWorkspace: 'Preferred Workspace',
             preferredWorkspaceDescription: (enabled: boolean) => `All new reports and expenses will be created on ${enabled ? 'selected preferred' : 'this'} workspace.`,
             preferredWorkspaceSelectDescription: 'All new expenses and reports will be created on this workspace.',
+            noWorkspacesMessage: 'There are no workspaces on this domain. A workspace is required to enable this restriction.',
             defaultGroup: 'Default group for new members',
         },
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -9332,6 +9332,7 @@ ${amount} para ${merchant} - ${date}`,
                 `Todos los informes y gastos nuevos se crearán en ${enabled ? 'el espacio de trabajo preferido seleccionado' : 'este'} espacio de trabajo.`,
             preferredWorkspace: 'Espacio de trabajo preferido',
             preferredWorkspaceSelectDescription: 'Todos los gastos e informes nuevos se crearán en este espacio de trabajo.',
+            noWorkspacesMessage: 'No hay espacios de trabajo en este dominio. Se requiere un espacio de trabajo para habilitar esta restricción.',
             defaultGroup: 'Grupo predeterminado para nuevos miembros',
         },
     },
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
@@ -9126,6 +9126,7 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
             preferredWorkspaceDescription: (enabled: boolean) =>
                 `Tous les nouveaux rapports et dépenses seront créés dans ${enabled ? "l'espace de travail préféré sélectionné" : 'cet espace de travail'}.`,
             preferredWorkspaceSelectDescription: 'Toutes les nouvelles dépenses et rapports seront créés dans cet espace de travail.',
+            noWorkspacesMessage: "Il n'y a aucun espace de travail sur ce domaine. Un espace de travail est requis pour activer cette restriction.",
             defaultGroup: 'Groupe par défaut pour les nouveaux membres',
         },
     },
diff --git a/src/languages/it.ts b/src/languages/it.ts
@@ -9092,6 +9092,7 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
             preferredWorkspaceDescription: (enabled: boolean) =>
                 `Tutti i nuovi report e le nuove spese verranno creati ${enabled ? "nell'area di lavoro preferita selezionata" : 'in questa area di lavoro'}.`,
             preferredWorkspaceSelectDescription: 'Tutte le nuove spese e i nuovi report verranno creati in questa area di lavoro.',
+            noWorkspacesMessage: 'Non ci sono spazi di lavoro su questo dominio. È necessario uno spazio di lavoro per abilitare questa restrizione.',
             defaultGroup: 'Gruppo predefinito per nuovi membri',
         },
     },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
@@ -8976,6 +8976,7 @@ ${reportName}
             preferredWorkspace: '優先ワークスペース',
             preferredWorkspaceDescription: (enabled: boolean) => `すべての新しいレポートと経費は${enabled ? '選択された優先' : 'この'}ワークスペースで作成されます。`,
             preferredWorkspaceSelectDescription: 'すべての新しい経費とレポートはこのワークスペースで作成されます。',
+            noWorkspacesMessage: 'このドメインにワークスペースがありません。この制限を有効にするにはワークスペースが必要です。',
             defaultGroup: '新しいメンバーのデフォルトグループ',
         },
     },
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
@@ -9064,6 +9064,7 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
             preferredWorkspace: 'Voorkeurswerkruimte',
             preferredWorkspaceDescription: (enabled: boolean) => `Alle nieuwe rapporten en onkosten worden aangemaakt in ${enabled ? 'de geselecteerde voorkeurs' : 'deze'} werkruimte.`,
             preferredWorkspaceSelectDescription: 'Alle nieuwe onkosten en rapporten worden in deze werkruimte aangemaakt.',
+            noWorkspacesMessage: 'Er zijn geen werkruimtes op dit domein. Een werkruimte is vereist om deze beperking in te schakelen.',
             defaultGroup: 'Standaardgroep voor nieuwe leden',
         },
     },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
@@ -9047,6 +9047,7 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
             preferredWorkspace: 'Preferowany obszar roboczy',
             preferredWorkspaceDescription: (enabled: boolean) => `Wszystkie nowe raporty i wydatki będą tworzone w ${enabled ? 'wybranym preferowanym' : 'tym'} obszarze roboczym.`,
             preferredWorkspaceSelectDescription: 'Wszystkie nowe wydatki i raporty będą tworzone w tym obszarze roboczym.',
+            noWorkspacesMessage: 'W tej domenie nie ma żadnych obszarów roboczych. Obszar roboczy jest wymagany, aby włączyć to ograniczenie.',
             defaultGroup: 'Domyślna grupa dla nowych członków',
         },
     },
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
@@ -9056,6 +9056,7 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
             preferredWorkspaceDescription: (enabled: boolean) =>
                 `Todos os novos relatórios e despesas serão criados no ${enabled ? 'espaço de trabalho preferido selecionado' : 'este espaço de trabalho'}.`,
             preferredWorkspaceSelectDescription: 'Todas as novas despesas e relatórios serão criados neste espaço de trabalho.',
+            noWorkspacesMessage: 'Não há espaços de trabalho neste domínio. Um espaço de trabalho é necessário para ativar esta restrição.',
             defaultGroup: 'Grupo padrão para novos membros',
         },
     },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
@@ -8825,6 +8825,7 @@ ${reportName}
             preferredWorkspace: '首选工作区',
             preferredWorkspaceDescription: (enabled: boolean) => `所有新报告和费用将在${enabled ? '选定的首选' : '此'}工作区中创建。`,
             preferredWorkspaceSelectDescription: '所有新费用和报告将在此工作区中创建。',
+            noWorkspacesMessage: '此域上没有工作区。启用此限制需要一个工作区。',
             defaultGroup: '新成员的默认群组',
         },
     },
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -1,7 +1,8 @@
 import {defaultSecurityGroupIDSelector, domainNameSelector} from '@selectors/Domain';
-import {policyNameSelector} from '@selectors/Policy';
+import {createAdminPoliciesSelector, policyNameSelector} from '@selectors/Policy';
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
+import ConfirmModal from '@components/ConfirmModal';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
@@ -20,7 +21,7 @@ import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
-import {clearDomainGroupCreatePreferredPolicyID, createDomainSecurityGroup, setDefaultSecurityGroup} from '@userActions/Domain';
+import {clearDomainGroupCreatePreferredPolicyID, createDomainSecurityGroup, setDefaultSecurityGroup, setDomainGroupCreatePreferredPolicyID} from '@userActions/Domain';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -32,7 +33,7 @@ type DomainGroupCreatePageProps = PlatformStackScreenProps<SettingsNavigatorPara
 function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const styles = useThemeStyles();
     const {domainAccountID} = route.params;
-    const {translate} = useLocalize();
+    const {translate, localeCompare} = useLocalize();
 
     const inputRef = useRef<AnimatedTextInputRef>(null);
 
@@ -42,6 +43,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [restrictExpenseWorkspaceCreation, setRestrictExpenseWorkspaceCreation] = useState(false);
     const [expensifyCardPreferredWorkspace, setExpensifyCardPreferredWorkspace] = useState(false);
     const [preferredWorkspace, setPreferredWorkspace] = useState(false);
+    const [isNoWorkspacesModalVisible, setIsNoWorkspacesModalVisible] = useState(false);
 
     const [preferredPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
     const [preferredPolicyName] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${preferredPolicyID}`, {
@@ -53,6 +55,12 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [defaultSecurityGroupID] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
         selector: defaultSecurityGroupIDSelector,
     });
+    const [adminPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPoliciesSelector()});
+
+    const firstAdminPolicy = Object.values(adminPolicies ?? {})
+        .sort((a, b) => localeCompare(a?.created ?? '', b?.created ?? ''))
+        .at(0);
+    const hasAdminPolicies = !!firstAdminPolicy;
 
     useEffect(() => {
         return () => {
@@ -161,21 +169,37 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         subtitle={translate('domain.groups.preferredWorkspaceDescription', preferredWorkspace)}
                         switchAccessibilityLabel={translate('domain.groups.preferredWorkspace')}
                         isActive={preferredWorkspace}
+                        disabled={!hasAdminPolicies}
+                        disabledAction={() => setIsNoWorkspacesModalVisible(true)}
                         onToggle={(value) => {
                             setPreferredWorkspace(value);
-                            if (!value) {
+                            if (value) {
+                                if (!preferredPolicyID && firstAdminPolicy?.id) {
+                                    setDomainGroupCreatePreferredPolicyID(firstAdminPolicy.id);
+                                }
+                            } else {
                                 clearDomainGroupCreatePreferredPolicyID();
                             }
                         }}
                         wrapperStyle={[styles.ph5, styles.mv3]}
                         shouldPlaceSubtitleBelowSwitch
                     />
-                    {preferredWorkspace && (
+                    <ConfirmModal
+                        onConfirm={() => setIsNoWorkspacesModalVisible(false)}
+                        onCancel={() => setIsNoWorkspacesModalVisible(false)}
+                        isVisible={isNoWorkspacesModalVisible}
+                        title={translate('workspace.distanceRates.oopsNotSoFast')}
+                        prompt={translate('domain.groups.noWorkspacesMessage')}
+                        confirmText={translate('common.buttonConfirm')}
+                        shouldShowCancelButton={false}
+                    />
+                    {hasAdminPolicies && (
                         <MenuItemWithTopDescription
                             description={translate('domain.groups.preferredWorkspace')}
-                            title={preferredPolicyName ?? ''}
+                            title={preferredPolicyName ?? firstAdminPolicy?.name}
                             shouldShowRightIcon
                             onPress={() => Navigation.navigate(ROUTES.DOMAIN_GROUP_CREATE_PREFERRED_WORKSPACE.getRoute(domainAccountID))}
+                            disabled={!preferredWorkspace}
                         />
                     )}
                     <ToggleSettingOptionRow
diff --git a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
@@ -1,5 +1,5 @@
+import {createAdminPoliciesSelector} from '@selectors/Policy';
 import React, {useState} from 'react';
-import type {OnyxCollection} from 'react-native-onyx';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -21,26 +21,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy} from '@src/types/onyx';
 
 type WorkspaceListItem = {
     policyID: string;
+    created?: string;
 } & ListItem;
 
-const createAdminPolicySelector = (currentPolicyID: string | undefined) => (policies: OnyxCollection<Policy>) => {
-    return Object.entries(policies ?? {}).reduce<Record<string, Pick<Policy, 'name' | 'id' | 'avatarURL'>>>((acc, [key, policy]) => {
-        if (!policy?.id || !policy?.name) {
-            return acc;
-        }
-        const isCurrentPolicy = policy.id === currentPolicyID;
-        if (!isCurrentPolicy && (policy.type === CONST.POLICY.TYPE.PERSONAL || policy.role !== CONST.POLICY.ROLE.ADMIN)) {
-            return acc;
-        }
-        acc[key] = {id: policy.id, name: policy.name, avatarURL: policy.avatarURL};
-        return acc;
-    }, {});
-};
-
 type DomainGroupCreatePreferredWorkspacePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.GROUP_CREATE_PREFERRED_WORKSPACE>;
 
 function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePreferredWorkspacePageProps) {
@@ -51,7 +37,7 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
     const icons = useMemoizedLazyExpensifyIcons(['FallbackWorkspaceAvatar']);
 
     const [currentPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
-    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPolicySelector(currentPolicyID)});
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPoliciesSelector(currentPolicyID)});
     const [selectedPolicyID, setSelectedPolicyID] = useState<string | undefined>(currentPolicyID);
     const [shouldShowError, setShouldShowError] = useState(false);
 
@@ -64,6 +50,7 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
         workspaceOptions.push({
             text: policy.name,
             policyID: policy.id,
+            created: policy.created,
             keyForList: policy.id,
             isSelected: selectedPolicyID === policy.id,
             icons: [
@@ -100,7 +87,7 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
                 />
                 <Text style={[styles.ph5, styles.mb3]}>{translate('domain.groups.preferredWorkspaceSelectDescription')}</Text>
                 <SelectionList<WorkspaceListItem>
-                    data={workspaceOptions.sort((a, b) => localeCompare(a.text ?? '', b.text ?? ''))}
+                    data={workspaceOptions.sort((a, b) => localeCompare(a.created ?? '', b.created ?? ''))}
                     ListItem={UserListItem}
                     onSelectRow={(item: WorkspaceListItem) => {
                         setSelectedPolicyID(item.policyID);
diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
@@ -94,6 +94,22 @@ const shouldRedirectToExpensifyClassicSelector = (policies: OnyxCollection<Polic
 
 const policyNameSelector = (policy: OnyxEntry<Policy>) => policy?.name;
 
+const createAdminPoliciesSelector =
+    (currentPolicyID: string | undefined = undefined) =>
+    (policies: OnyxCollection<Policy>) => {
+        return Object.entries(policies ?? {}).reduce<Record<string, Pick<Policy, 'name' | 'id' | 'avatarURL' | 'created'>>>((acc, [key, policy]) => {
+            if (!policy?.id || !policy?.name) {
+                return acc;
+            }
+            const isCurrentPolicy = policy.id === currentPolicyID;
+            if (!isCurrentPolicy && (policy.type === CONST.POLICY.TYPE.PERSONAL || policy.role !== CONST.POLICY.ROLE.ADMIN)) {
+                return acc;
+            }
+            acc[key] = {id: policy.id, name: policy.name, avatarURL: policy.avatarURL, created: policy.created};
+            return acc;
+        }, {});
+    };
+
 // deepEqual on ~15 fields is cheaper than re-rendering IOURequestStartPage's full hook/memo tree.
 const iouRequestPolicyCollectionSelector = (policies: OnyxCollection<Policy>): OnyxCollection<Policy> => {
     if (!policies) {
@@ -208,4 +224,5 @@ export {
     hasReusablePoliciesConnectedToQBDSelector,
     lastWorkspaceNumberSelector,
     policyNameSelector,
+    createAdminPoliciesSelector,
 };
diff --git a/src/types/onyx/DomainErrors.ts b/src/types/onyx/DomainErrors.ts
@@ -48,7 +48,7 @@ type DomainSecurityGroupErrors = {
     /**
      * Base errors related to the security group
      */
-    errors?: OnyxCommon.Errors; 
+    errors?: OnyxCommon.Errors;
 };
 
 /**
diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts
@@ -1178,10 +1178,10 @@ describe('actions/Domain', () => {
             const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
             const timestamp = 789;
 
-            await Onyx.merge(
-                `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
-                {[SECURITY_GROUP_KEY]: {name: 'Test Group', shared: {}}} as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
-            );
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {[SECURITY_GROUP_KEY]: {name: 'Test Group', shared: {}}} as PrefixedRecord<
+                typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX,
+                DomainSecurityGroup
+            >);
             await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, {
                 [SECURITY_GROUP_KEY]: {errors: {[timestamp]: 'error'}},
             });
diff --git a/tests/unit/PolicySelectorTest.ts b/tests/unit/PolicySelectorTest.ts
