From 362fd90128d7a02255454afe9bd79bdeacb25f57 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Wed, 20 May 2026 21:13:13 +0100 Subject: [PATCH 01/36] feat: add confirmation titles and descriptions for workspace settings copy --- src/languages/de.ts | 3 +++ src/languages/en.ts | 2 ++ src/languages/es.ts | 3 +++ src/languages/fr.ts | 3 +++ src/languages/it.ts | 3 +++ src/languages/ja.ts | 2 ++ src/languages/nl.ts | 3 +++ src/languages/pl.ts | 3 +++ src/languages/pt-BR.ts | 3 +++ src/languages/zh-hans.ts | 2 ++ 10 files changed, 27 insertions(+) diff --git a/src/languages/de.ts b/src/languages/de.ts index 4f81f8fa4d57..24eedde333d8 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -6015,6 +6015,9 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU workflowsWithoutMembersConfirm: 'Ohne Mitglieder fortfahren', workflowsWithoutMembersPrompt: 'Das Kopieren von Workflows ohne Mitglieder kopiert keine Genehmigungs-Workflows. Einreichungs- und Zahlungseinstellungen werden trotzdem kopiert.', + confirmTitle: 'Stellen wir sicher, dass alles richtig aussieht.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => + `Wir kopieren die folgenden Einstellungen von ${workspaceName} in die von Ihnen angegebenen Arbeitsbereiche`, }, emptyWorkspace: { title: 'Du hast keine Arbeitsbereiche', diff --git a/src/languages/en.ts b/src/languages/en.ts index d7a1cc2326cc..91ca16f9539a 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -6034,6 +6034,8 @@ const translations = { accountingDisabledTooltip: 'The source and target workspaces are not connected to the same accounting account, so these settings can’t be safely copied.', workflowsWithoutMembersConfirm: 'Continue without members', workflowsWithoutMembersPrompt: 'Copying Workflows without Members will not copy approval workflows. Submission and payment settings will still be copied.', + confirmTitle: 'Let’s make sure everything looks right.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => `We’ll copy the following settings from ${workspaceName} to the workspaces you’ve specified`, }, emptyWorkspace: { title: 'No workspaces yet', diff --git a/src/languages/es.ts b/src/languages/es.ts index 5895a330895c..9d9bc696550d 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5848,6 +5848,9 @@ ${amount} para ${merchant} - ${date}`, accountingDisabledTooltip: 'Los espacios de trabajo de origen y destino no están conectados a la misma cuenta de contabilidad, por lo que no es seguro copiar estos ajustes.', workflowsWithoutMembersConfirm: 'Continuar sin miembros', workflowsWithoutMembersPrompt: 'Copiar flujos de trabajo sin miembros no copiará los flujos de aprobación. La configuración de envío y pago sí se copiará.', + confirmTitle: 'Vamos a asegurarnos de que todo se vea bien.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => + `Copiaríamos los siguientes ajustes de ${workspaceName} a los espacios de trabajo que has especificado`, }, emptyWorkspace: { title: 'Aún no hay espacios de trabajo', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 7ca3c3801865..72a27f58161e 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -6035,6 +6035,9 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. workflowsWithoutMembersConfirm: 'Continuer sans membres', workflowsWithoutMembersPrompt: 'La copie d’espaces de travail sans membres ne copiera pas les workflows d’approbation. Les paramètres de soumission et de paiement seront tout de même copiés.', + confirmTitle: 'Assurons-nous que tout est correct.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => + `Nous copierons les paramètres suivants de ${workspaceName} vers les espaces de travail que vous avez indiqués`, }, emptyWorkspace: { title: 'Vous n’avez aucun espace de travail', diff --git a/src/languages/it.ts b/src/languages/it.ts index 2f9e6864e91c..44a8b14f61f9 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -6005,6 +6005,9 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. workflowsWithoutMembersConfirm: 'Continua senza membri', workflowsWithoutMembersPrompt: 'Copiare Flussi di lavoro senza Membri non copierà i flussi di lavoro di approvazione. Le impostazioni di invio e pagamento verranno comunque copiate.', + confirmTitle: 'Assicuriamoci che sia tutto corretto.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => + `Copieremo le seguenti impostazioni da ${workspaceName} agli spazi di lavoro che hai specificato`, }, emptyWorkspace: { title: 'Non hai nessuna area di lavoro', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 69ebb6ef116d..996f70460a06 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5935,6 +5935,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO accountingDisabledTooltip: '元となるワークスペースと対象のワークスペースが同じ会計アカウントに接続されていないため、これらの設定を安全にコピーすることはできません。', workflowsWithoutMembersConfirm: 'メンバーなしで続行', workflowsWithoutMembersPrompt: 'メンバーなしでワークフローをコピーすると、承認ワークフローはコピーされません。提出と支払いの設定は引き続きコピーされます。', + confirmTitle: 'すべて正しく表示されているか確認しましょう。', + confirmDescription: ({workspaceName}: {workspaceName: string}) => `次の設定を${workspaceName}から指定したワークスペースにコピーします`, }, emptyWorkspace: { title: 'ワークスペースがありません', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 66b5f7e1372e..d30bbba4084b 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5982,6 +5982,9 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ accountingDisabledTooltip: 'De bron- en doelwerkruimtes zijn niet gekoppeld aan dezelfde boekhoudrekening, waardoor deze instellingen niet veilig kunnen worden gekopieerd.', workflowsWithoutMembersConfirm: 'Doorgaan zonder leden', workflowsWithoutMembersPrompt: 'Workflows kopiëren zonder leden zal goedkeuringsworkflows niet kopiëren. Instellingen voor indienen en betalen worden nog steeds gekopieerd.', + confirmTitle: 'Laten we controleren of alles er goed uitziet.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => + `We kopiëren de volgende instellingen van ${workspaceName} naar de werkruimtes die je hebt opgegeven`, }, emptyWorkspace: { title: 'Je hebt geen werkruimtes', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 25e9ef36dec1..91ec91bad67d 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5976,6 +5976,9 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy accountingDisabledTooltip: 'Źródłowy i docelowy obszar roboczy nie są podłączone do tego samego konta księgowego, więc tych ustawień nie można bezpiecznie skopiować.', workflowsWithoutMembersConfirm: 'Kontynuuj bez członków', workflowsWithoutMembersPrompt: 'Kopiowanie przepływów pracy bez członków nie skopiuje przepływów zatwierdzania. Ustawienia przesyłania i płatności nadal zostaną skopiowane.', + confirmTitle: 'Upewnijmy się, że wszystko wygląda poprawnie.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => + `Skopiujemy następujące ustawienia z ${workspaceName} do wskazanych przez ciebie przestrzeni roboczych`, }, emptyWorkspace: { title: 'Nie masz żadnych przestrzeni roboczych', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 760327ce513c..0bffdbff205c 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5983,6 +5983,9 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS 'Os espaços de trabalho de origem e destino não estão conectados à mesma conta contábil, portanto essas configurações não podem ser copiadas com segurança.', workflowsWithoutMembersConfirm: 'Continuar sem membros', workflowsWithoutMembersPrompt: 'Copiar fluxos de trabalho sem membros não copiará os fluxos de aprovação. As configurações de envio e pagamento ainda serão copiadas.', + confirmTitle: 'Vamos garantir que está tudo certo.', + confirmDescription: ({workspaceName}: {workspaceName: string}) => + `Vamos copiar as seguintes configurações de ${workspaceName} para os espaços de trabalho que você especificou`, }, emptyWorkspace: { title: 'Você não tem nenhum workspace', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index c80d21b72836..1b427f070c57 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -5836,6 +5836,8 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM accountingDisabledTooltip: '源工作区和目标工作区未连接到同一会计账户,因此无法安全地复制这些设置。', workflowsWithoutMembersConfirm: '继续且无成员', workflowsWithoutMembersPrompt: '在不包含成员的情况下复制工作流时,将不会复制审批工作流。但提交和付款设置仍会被复制。', + confirmTitle: '让我们确认一切都正确无误。', + confirmDescription: ({workspaceName}: {workspaceName: string}) => `我们会将以下设置从 ${workspaceName} 复制到你指定的工作区`, }, emptyWorkspace: { title: '你还没有工作区', From a6e2f3b59861b666b4a1161515c78831b7f66749 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Wed, 20 May 2026 21:14:10 +0100 Subject: [PATCH 02/36] feat: centralize feature rows in CopyPolicySettingsUtils and update selection page to use them --- src/libs/CopyPolicySettingsUtils.ts | 26 +++++++++++++++++-- .../CopyPolicySettingsSelectFeaturesPage.tsx | 23 +--------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/libs/CopyPolicySettingsUtils.ts b/src/libs/CopyPolicySettingsUtils.ts index 50302dfb165a..f855bb41c53f 100644 --- a/src/libs/CopyPolicySettingsUtils.ts +++ b/src/libs/CopyPolicySettingsUtils.ts @@ -1,9 +1,31 @@ import CONST from '@src/CONST'; +import type {TranslationPaths} from '@src/languages/types'; import type {Policy} from '@src/types/onyx'; import type {ConnectionName} from '@src/types/onyx/Policy'; import {isAuthenticationError} from './actions/connections'; import type {Part} from './actions/Policy/CopyPolicySettings'; +type FeatureRow = { + part: Part; + labelKey: TranslationPaths; +}; + +const FEATURE_ROWS = [ + {part: 'overview', labelKey: 'workspace.common.profile'}, + {part: 'members', labelKey: 'workspace.common.members'}, + {part: 'reports', labelKey: 'workspace.common.reports'}, + {part: 'accounting', labelKey: 'workspace.common.accounting'}, + {part: 'categories', labelKey: 'workspace.common.categories'}, + {part: 'tags', labelKey: 'workspace.common.tags'}, + {part: 'taxes', labelKey: 'workspace.common.taxes'}, + {part: 'workflows', labelKey: 'workspace.common.workflows'}, + {part: 'rules', labelKey: 'workspace.common.rules'}, + {part: 'distanceRates', labelKey: 'workspace.common.distanceRates'}, + {part: 'perDiem', labelKey: 'workspace.common.perDiem'}, + {part: 'invoices', labelKey: 'workspace.common.invoices'}, + {part: 'travel', labelKey: 'workspace.common.travel'}, +] as const satisfies readonly FeatureRow[]; + type CopyPolicySettingsSourceFeatureContext = { policy: Policy | undefined; memberCount: number; @@ -176,5 +198,5 @@ function isCopyPolicySettingsPartEnabledOnSource(part: Part, context: CopyPolicy } } -export {getConnectionCompanyID, getAccountingConnectionIdentity, arePoliciesAccountingCompatible, areAllTargetsAccountingCompatible, isCopyPolicySettingsPartEnabledOnSource}; -export type {AccountingConnectionIdentity, CopyPolicySettingsSourceFeatureContext}; +export {getConnectionCompanyID, getAccountingConnectionIdentity, arePoliciesAccountingCompatible, areAllTargetsAccountingCompatible, isCopyPolicySettingsPartEnabledOnSource, FEATURE_ROWS}; +export type {AccountingConnectionIdentity, CopyPolicySettingsSourceFeatureContext, FeatureRow}; diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx index ef6baa86ae6c..84006bc42cbe 100644 --- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx +++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx @@ -14,7 +14,7 @@ import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import {setCopyPolicySettingsData} from '@libs/actions/Policy/CopyPolicySettings'; import type {Part} from '@libs/actions/Policy/CopyPolicySettings'; -import {areAllTargetsAccountingCompatible, isCopyPolicySettingsPartEnabledOnSource} from '@libs/CopyPolicySettingsUtils'; +import {areAllTargetsAccountingCompatible, FEATURE_ROWS, isCopyPolicySettingsPartEnabledOnSource} from '@libs/CopyPolicySettingsUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types'; import type {PolicyCopySettingsNavigatorParamList} from '@libs/Navigation/types'; @@ -41,27 +41,6 @@ const ACCOUNTING_COMPATIBILITY_REQUIRED_PARTS = ['accounting', 'categories', 'ta */ const ACCOUNTING_FORCE_ENABLED_PARTS = ['categories', 'tags', 'reports', 'taxes'] as const satisfies readonly Part[]; -type FeatureRow = { - part: Part; - labelKey: Parameters['translate']>[0]; -}; - -const FEATURE_ROWS = [ - {part: 'overview', labelKey: 'workspace.common.profile'}, - {part: 'members', labelKey: 'workspace.common.members'}, - {part: 'reports', labelKey: 'workspace.common.reports'}, - {part: 'accounting', labelKey: 'workspace.common.accounting'}, - {part: 'categories', labelKey: 'workspace.common.categories'}, - {part: 'tags', labelKey: 'workspace.common.tags'}, - {part: 'taxes', labelKey: 'workspace.common.taxes'}, - {part: 'workflows', labelKey: 'workspace.common.workflows'}, - {part: 'rules', labelKey: 'workspace.common.rules'}, - {part: 'distanceRates', labelKey: 'workspace.common.distanceRates'}, - {part: 'perDiem', labelKey: 'workspace.common.perDiem'}, - {part: 'invoices', labelKey: 'workspace.common.invoices'}, - {part: 'travel', labelKey: 'workspace.common.travel'}, -] as const satisfies readonly FeatureRow[]; - function CopyPolicySettingsSelectFeaturesPage() { const route = useRoute>(); const sourcePolicyID = route?.params?.policyID; From d95e19f1f7be3796cb909d0d936c6652dbd07a42 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Wed, 20 May 2026 21:14:19 +0100 Subject: [PATCH 03/36] feat: implement CopyPolicySettingsConfirmPage with confirmation modal and navigation for policy copying --- .../CopyPolicySettingsConfirmPage.tsx | 150 +++++++++++++++++- 1 file changed, 149 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx index 68ba8a92a7d0..5abad16e7cea 100644 --- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx +++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx @@ -1,5 +1,153 @@ +import {useRoute} from '@react-navigation/native'; +import React from 'react'; +import {View} from 'react-native'; +import type {OnyxCollection} from 'react-native-onyx'; +import Button from '@components/Button'; +import FixedFooter from '@components/FixedFooter'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; +import {ModalActions} from '@components/Modal/Global/ModalContext'; +import ScreenWrapper from '@components/ScreenWrapper'; +import ScrollView from '@components/ScrollView'; +import Text from '@components/Text'; +import useConfirmModal from '@hooks/useConfirmModal'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {copyPolicySettings} from '@libs/actions/Policy/CopyPolicySettings'; +import type {Part} from '@libs/actions/Policy/CopyPolicySettings'; +import {FEATURE_ROWS} from '@libs/CopyPolicySettingsUtils'; +import Navigation from '@libs/Navigation/Navigation'; +import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types'; +import type {PolicyCopySettingsNavigatorParamList} from '@libs/Navigation/types'; +import {getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils'; +import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import type SCREENS from '@src/SCREENS'; +import type {PolicyCategories, PolicyTagLists} from '@src/types/onyx'; + function CopyPolicySettingsConfirmPage() { - return null; + const route = useRoute>(); + const sourcePolicyID = route?.params?.policyID; + + const styles = useThemeStyles(); + const {translate} = useLocalize(); + const {showConfirmModal} = useConfirmModal(); + + const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); + const [copyPolicySettingsState] = useOnyx(ONYXKEYS.COPY_POLICY_SETTINGS); + const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${sourcePolicyID}`); + const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${sourcePolicyID}`); + + const sourcePolicy = sourcePolicyID ? policies?.[`${ONYXKEYS.COLLECTION.POLICY}${sourcePolicyID}`] : undefined; + const targetPolicyIDs = copyPolicySettingsState?.targetPolicyIDs ?? []; + const parts = (copyPolicySettingsState?.parts ?? []) as Part[]; + + const targetPolicies = targetPolicyIDs.map((id) => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${id}`]).filter((policy) => policy !== undefined); + + const translatedParts = parts + .map((part) => { + const row = FEATURE_ROWS.find((r) => r.part === part); + return row ? translate(row.labelKey) : ''; + }) + .filter(Boolean) + .join(', '); + + const handleCopy = () => { + if (!sourcePolicy) { + return; + } + + const executeCopy = () => { + copyPolicySettings(sourcePolicy, targetPolicies, parts, policyCategories as unknown as OnyxCollection, policyTags as unknown as OnyxCollection); + Navigation.dismissModal(); + }; + + const isWorkflowsSelected = parts.includes('workflows'); + const isMembersSelected = parts.includes('members'); + const memberCount = Object.keys(getMemberAccountIDsForWorkspace(sourcePolicy?.employeeList, false, false)).length; + const hasMembersToCopy = memberCount > 1; + + if (!isWorkflowsSelected || isMembersSelected || !hasMembersToCopy) { + executeCopy(); + return; + } + + showConfirmModal({ + title: translate('common.headsUp'), + prompt: translate('workspace.copyPolicySettings.workflowsWithoutMembersPrompt'), + confirmText: translate('workspace.copyPolicySettings.workflowsWithoutMembersConfirm'), + cancelText: translate('common.cancel'), + }).then((result) => { + if (result.action !== ModalActions.CONFIRM) { + return; + } + executeCopy(); + }); + }; + + const navigateToSelectFeatures = () => { + if (!sourcePolicyID) { + return; + } + Navigation.navigate(ROUTES.POLICY_COPY_SETTINGS_SELECT_FEATURES.getRoute(sourcePolicyID)); + }; + + const navigateToSelectWorkspaces = () => { + if (!sourcePolicyID) { + return; + } + Navigation.navigate(ROUTES.POLICY_COPY_SETTINGS.getRoute(sourcePolicyID)); + }; + + return ( + + + + + + {translate('workspace.copyPolicySettings.confirmTitle')} + {translate('workspace.copyPolicySettings.confirmDescription', {workspaceName: sourcePolicy?.name ?? ''})} + + + + policy?.name).join(', ')} + description={translate('common.workspaces')} + onPress={navigateToSelectWorkspaces} + shouldShowRightIcon + /> + + + +