From 622280bd2fa631104a835c242f88a0b1f69c5ec5 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 4 Nov 2025 22:05:58 +0800 Subject: [PATCH 1/5] don't allow uesr to make tag list required if it's not a multi level tag --- src/languages/en.ts | 4 ++++ .../workspace/tags/WorkspaceViewTagsPage.tsx | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 353888fa42ad..4507615b3239 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4990,6 +4990,10 @@ const translations = { title: 'Cannot make all tags optional', description: `At least one tag must remain required because your workspace settings require tags.`, }, + cannotMakeTagListRequired: { + title: 'Cannot make tag list required', + description: `You can only make a tag list required if your policy has multiple tag levels configured.`, + }, tagCount: () => ({ one: '1 Tag', other: (count: number) => `${count} Tags`, diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx index 2d86d657d239..ffd6db1385f7 100644 --- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx @@ -74,10 +74,12 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { const isMobileSelectionModeEnabled = useMobileSelectionMode(); const currentTagListName = useMemo(() => getTagListName(policyTags, route.params.orderWeight), [policyTags, route.params.orderWeight]); const hasDependentTags = useMemo(() => hasDependentTagsPolicyUtils(policy, policyTags), [policy, policyTags]); + const isMultiLevelTags = isMultiLevelTagsPolicyUtils(policyTags); const currentPolicyTag = policyTags?.[currentTagListName]; const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.SETTINGS_TAG_LIST_VIEW; const [isCannotMakeAllTagsOptionalModalVisible, setIsCannotMakeAllTagsOptionalModalVisible] = useState(false); const [isCannotDeleteOrDisableLastTagModalVisible, setIsCannotDeleteOrDisableLastTagModalVisible] = useState(false); + const [isRequiresMultiLevelTagsModalVisible, setIsRequiresMultiLevelTagsModalVisible] = useState(false); const fetchTags = useCallback(() => { openPolicyTagsPage(policyID); }, [policyID]); @@ -240,7 +242,6 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { const options: Array>> = []; const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0; - const isMultiLevelTags = isMultiLevelTagsPolicyUtils(policyTags); if (!isThereAnyAccountingConnection && !isMultiLevelTags && selectedTags.length > 0) { options.push({ @@ -371,6 +372,10 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { switchAccessibilityLabel={translate('common.required')} isActive={!!currentPolicyTag?.required} onToggle={(on) => { + if (!isMultiLevelTags) { + setIsRequiresMultiLevelTagsModalVisible(true); + return; + } if (isMakingLastRequiredTagListOptional(policy, policyTags, [currentPolicyTag])) { setIsCannotMakeAllTagsOptionalModalVisible(true); return; @@ -382,7 +387,7 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { errors={currentPolicyTag?.errorFields?.required ?? undefined} onCloseError={() => clearPolicyTagListErrorField({policyID, tagListIndex: route.params.orderWeight, errorField: 'required', policyTags})} disabled={!currentPolicyTag?.required && !Object.values(currentPolicyTag?.tags ?? {}).some((tag) => tag.enabled)} - showLockIcon={isMakingLastRequiredTagListOptional(policy, policyTags, [currentPolicyTag])} + showLockIcon={!isMultiLevelTags || isMakingLastRequiredTagListOptional(policy, policyTags, [currentPolicyTag])} /> )} @@ -448,6 +453,15 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { confirmText={translate('common.buttonConfirm')} shouldShowCancelButton={false} /> + setIsRequiresMultiLevelTagsModalVisible(false)} + onCancel={() => setIsRequiresMultiLevelTagsModalVisible(false)} + title={translate('workspace.tags.cannotMakeTagListRequired.title')} + prompt={translate('workspace.tags.cannotMakeTagListRequired.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> ); From 77e0cf9be915cb317cd2f2b0fb0df10aa9f1c2ca Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 6 Nov 2025 06:25:43 +0800 Subject: [PATCH 2/5] add es copy --- src/languages/es.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/languages/es.ts b/src/languages/es.ts index dd23bc058898..b259793a5cfe 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5004,6 +5004,10 @@ ${amount} para ${merchant} - ${date}`, title: 'No se pueden hacer opcionales todas las etiquetas', description: `Debe haber al menos una etiqueta obligatoria porque la configuración de tu espacio de trabajo requiere etiquetas.`, }, + cannotMakeTagListRequired: { + title: 'No se puede hacer que la lista de etiquetas sea obligatoria.', + description: `olo puedes hacer que una lista de etiquetas sea obligatoria si tu política tiene varios niveles de etiquetas configurados.`, + }, tagCount: () => ({ one: '1 etiqueta', other: (count: number) => `${count} etiquetas`, From b8c4c8d5311bd6ac302d5251f0bc9f0622103886 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 6 Nov 2025 06:59:11 +0800 Subject: [PATCH 3/5] remove dot --- src/languages/es.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index b259793a5cfe..aa08f359294f 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5005,7 +5005,7 @@ ${amount} para ${merchant} - ${date}`, description: `Debe haber al menos una etiqueta obligatoria porque la configuración de tu espacio de trabajo requiere etiquetas.`, }, cannotMakeTagListRequired: { - title: 'No se puede hacer que la lista de etiquetas sea obligatoria.', + title: 'No se puede hacer que la lista de etiquetas sea obligatoria', description: `olo puedes hacer que una lista de etiquetas sea obligatoria si tu política tiene varios niveles de etiquetas configurados.`, }, tagCount: () => ({ From 86bdc8b8be0f94a268d1eb48412a236b4cba1aed Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 6 Nov 2025 07:00:13 +0800 Subject: [PATCH 4/5] typo --- src/languages/es.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index aa08f359294f..e7af0997bf00 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5006,7 +5006,7 @@ ${amount} para ${merchant} - ${date}`, }, cannotMakeTagListRequired: { title: 'No se puede hacer que la lista de etiquetas sea obligatoria', - description: `olo puedes hacer que una lista de etiquetas sea obligatoria si tu política tiene varios niveles de etiquetas configurados.`, + description: `Solo puedes hacer que una lista de etiquetas sea obligatoria si tu política tiene varios niveles de etiquetas configurados.`, }, tagCount: () => ({ one: '1 etiqueta', From 487198ff4eb2da49938f4f218aaa0edd817b6b52 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 6 Nov 2025 12:03:02 +0800 Subject: [PATCH 5/5] add more languages --- src/languages/de.ts | 4 ++++ src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/languages/fr.ts | 4 ++++ src/languages/it.ts | 4 ++++ src/languages/ja.ts | 4 ++++ src/languages/nl.ts | 4 ++++ src/languages/pl.ts | 4 ++++ src/languages/pt-BR.ts | 4 ++++ src/languages/zh-hans.ts | 4 ++++ 10 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 89d33ae8b29a..765412868acc 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5021,6 +5021,10 @@ ${amount} für ${merchant} - ${date}`, title: 'Kann nicht alle Tags optional machen', description: `Mindestens ein Tag muss erforderlich bleiben, da Ihre Arbeitsbereichseinstellungen Tags erfordern.`, }, + cannotMakeTagListRequired: { + title: 'Tag-Liste kann nicht als erforderlich festgelegt werden', + description: 'Sie können eine Tag-Liste nur dann als erforderlich festlegen, wenn in Ihrer Richtlinie mehrere Tag-Ebenen konfiguriert sind.', + }, tagCount: () => ({ one: '1 Tag', other: (count: number) => `${count} Tags`, diff --git a/src/languages/en.ts b/src/languages/en.ts index 4d633d5219bf..61b02896c148 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4992,7 +4992,7 @@ const translations = { }, cannotMakeTagListRequired: { title: 'Cannot make tag list required', - description: `You can only make a tag list required if your policy has multiple tag levels configured.`, + description: 'You can only make a tag list required if your policy has multiple tag levels configured.', }, tagCount: () => ({ one: '1 Tag', diff --git a/src/languages/es.ts b/src/languages/es.ts index e7af0997bf00..03b81ca95d2c 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5006,7 +5006,7 @@ ${amount} para ${merchant} - ${date}`, }, cannotMakeTagListRequired: { title: 'No se puede hacer que la lista de etiquetas sea obligatoria', - description: `Solo puedes hacer que una lista de etiquetas sea obligatoria si tu política tiene varios niveles de etiquetas configurados.`, + description: 'Solo puedes hacer que una lista de etiquetas sea obligatoria si tu política tiene varios niveles de etiquetas configurados.', }, tagCount: () => ({ one: '1 etiqueta', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index a83f7f2dda2d..48e9f71ade65 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5028,6 +5028,10 @@ ${amount} pour ${merchant} - ${date}`, title: 'Impossible de rendre toutes les balises facultatives', description: `Au moins une étiquette doit rester obligatoire car les paramètres de votre espace de travail exigent des étiquettes.`, }, + cannotMakeTagListRequired: { + title: 'Impossible de rendre la liste des balises obligatoire', + description: 'Vous ne pouvez rendre une liste de balises obligatoire que si votre stratégie comporte plusieurs niveaux de balises configurés.', + }, tagCount: () => ({ one: '1 jour', other: (count: number) => `${count} Tags`, diff --git a/src/languages/it.ts b/src/languages/it.ts index c16518a46f67..9cb4a9744310 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5033,6 +5033,10 @@ ${amount} per ${merchant} - ${date}`, title: 'Impossibile rendere tutti i tag opzionali', description: `Almeno un tag deve rimanere obbligatorio perché le impostazioni del tuo spazio di lavoro richiedono tag.`, }, + cannotMakeTagListRequired: { + title: 'Impossibile rendere obbligatoria la lista dei tag', + description: 'È possibile rendere obbligatoria una lista di tag solo se la propria politica ha più livelli di tag configurati.', + }, tagCount: () => ({ one: '1 giorno', other: (count: number) => `${count} Tag`, diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 3ddf3198672d..ff93b37ff8b0 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -4990,6 +4990,10 @@ ${date} - ${merchant}に${amount}`, title: 'すべてのタグをオプションにすることはできません', description: `ワークスペースの設定でタグが必要なため、少なくとも1つのタグを必須にする必要があります。`, }, + cannotMakeTagListRequired: { + title: 'タグリストを必須にすることはできません', + description: 'ポリシーに複数のタグレベルが設定されている場合のみ、タグリストを必須にできます。', + }, tagCount: () => ({ one: '1日', other: (count: number) => `${count} タグ`, diff --git a/src/languages/nl.ts b/src/languages/nl.ts index a637ea92ec48..b291368f740d 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5027,6 +5027,10 @@ ${amount} voor ${merchant} - ${date}`, title: 'Kan niet alle tags optioneel maken', description: `Er moet minstens één tag verplicht blijven omdat uw werkruimte-instellingen tags vereisen.`, }, + cannotMakeTagListRequired: { + title: 'Kan geen taglijst maken vereist', + description: 'Je kunt een taglijst alleen verplicht stellen als je beleid meerdere tagniveaus heeft geconfigureerd.', + }, tagCount: () => ({ one: '1 Dag', other: (count: number) => `${count} Tags`, diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 87a2acf29c2e..6a39616a71ee 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5017,6 +5017,10 @@ ${amount} dla ${merchant} - ${date}`, title: 'Nie można ustawić wszystkich tagów jako opcjonalne.', description: `Co najmniej jeden tag musi pozostać wymagany, ponieważ ustawienia Twojego miejsca pracy wymagają tagów.`, }, + cannotMakeTagListRequired: { + title: 'Nie można utworzyć listy tagów wymaganych', + description: 'Listę tagów można ustawić jako obowiązkową tylko wtedy, gdy w polityce skonfigurowano wiele poziomów tagów.', + }, tagCount: () => ({ one: '1 dzień', other: (count: number) => `${count} tagi`, diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 059669f719ae..4842a769f4c7 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5017,6 +5017,10 @@ ${amount} para ${merchant} - ${date}`, title: 'Não é possível tornar todas as tags opcionais', description: `Pelo menos uma etiqueta deve permanecer obrigatória porque as configurações do seu espaço de trabalho exigem etiquetas.`, }, + cannotMakeTagListRequired: { + title: 'Não é possível tornar a lista de tags obrigatória', + description: 'Você só pode tornar uma lista de tags obrigatória se sua política tiver vários níveis de tags configurados.', + }, tagCount: () => ({ one: '1 Dia', other: (count: number) => `${count} Tags`, diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index d8e05db42b89..d304adb76470 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -4925,6 +4925,10 @@ ${merchant}的${amount} - ${date}`, title: '无法将所有标签设为可选', description: `至少需要保留一个标签为必填项,因为您的工作区设置要求使用标签。`, }, + cannotMakeTagListRequired: { + title: '无法强制要求标签列表', + description: '仅当策略配置了多个标签级别时,才可将标签列表设为必填项。', + }, tagCount: () => ({ one: '1 标签', other: (count: number) => `${count} 个标签`,