Duplicate workspace follow up - remove backTo from routes

src/ROUTES.ts

@@ -2150,15 +2150,11 @@ const ROUTES = {
     },
     WORKSPACE_DUPLICATE: {
         route: 'workspace/:policyID/duplicate',
-
-        // eslint-disable-next-line no-restricted-syntax -- Legacy route generation
-        getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspace/${policyID}/duplicate`, backTo),
+        getRoute: (policyID: string) => `workspace/${policyID}/duplicate` as const,
     },
     WORKSPACE_DUPLICATE_SELECT_FEATURES: {
         route: 'workspace/:policyID/duplicate/select-features',
-
-        // eslint-disable-next-line no-restricted-syntax -- Legacy route generation
-        getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspace/${policyID}/duplicate/select-features`, backTo),
+        getRoute: (policyID: string) => `workspace/${policyID}/duplicate/select-features` as const,
     },
     WORKSPACE_RECEIPT_PARTNERS: {
         route: 'workspaces/:policyID/receipt-partners',

src/libs/Navigation/helpers/getAdaptedStateFromPath.ts

@@ -5,11 +5,12 @@
 import Onyx from 'react-native-onyx';
 import getInitialSplitNavigatorState from '@libs/Navigation/AppNavigator/createSplitNavigator/getInitialSplitNavigatorState';
 import {config} from '@libs/Navigation/linkingConfig/config';
-import {RHP_TO_SEARCH, RHP_TO_SETTINGS, RHP_TO_SIDEBAR, RHP_TO_WORKSPACE} from '@libs/Navigation/linkingConfig/RELATIONS';
+import {RHP_TO_SEARCH, RHP_TO_SETTINGS, RHP_TO_SIDEBAR, RHP_TO_WORKSPACE, RHP_TO_WORKSPACES_LIST} from '@libs/Navigation/linkingConfig/RELATIONS';
 import type {NavigationPartialRoute, RootNavigatorParamList} from '@libs/Navigation/types';
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type {Report} from '@src/types/onyx';
 import getMatchingNewRoute from './getMatchingNewRoute';
@@ -18,7 +19,7 @@
 import replacePathInNestedState from './replacePathInNestedState';
 
 let allReports: OnyxCollection<Report>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -86,6 +87,13 @@
         });
     }
 
+    if (RHP_TO_WORKSPACES_LIST[route.name]) {
+        return {
+            name: SCREENS.WORKSPACES_LIST,
+            path: ROUTES.WORKSPACES_LIST.route,
+        };
+    }
+
     if (RHP_TO_WORKSPACE[route.name]) {
         const paramsFromRoute = getParamsFromRoute(RHP_TO_WORKSPACE[route.name]);
 

src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACES_LIST_TO_RHP.ts

@@ -0,0 +1,8 @@
+import type {WorkspaceDuplicateNavigatorParamList} from '@navigation/types';
+import SCREENS from '@src/SCREENS';
+
+const WORKSPACES_LIST_TO_RHP: Partial<Record<keyof WorkspaceDuplicateNavigatorParamList, string[]>> = {
+    [SCREENS.WORKSPACE_DUPLICATE.ROOT]: [SCREENS.WORKSPACE_DUPLICATE.SELECT_FEATURES, SCREENS.WORKSPACE_DUPLICATE.ROOT],
+};
+
+export default WORKSPACES_LIST_TO_RHP;

src/libs/Navigation/linkingConfig/RELATIONS/index.ts

@@ -4,6 +4,7 @@ import SIDEBAR_TO_RHP from './SIDEBAR_TO_RHP';
 import SIDEBAR_TO_SPLIT from './SIDEBAR_TO_SPLIT';
 import TAB_TO_FULLSCREEN from './TAB_TO_FULLSCREEN';
 import WORKSPACE_TO_RHP from './WORKSPACE_TO_RHP';
+import WORKSPACES_LIST_TO_RHP from './WORKSPACES_LIST_TO_RHP';
 
 /**
  * This module manages the relationships between different fullscreen navigators and screens in the app.
@@ -29,6 +30,7 @@ const RHP_TO_SETTINGS = createInverseRelation(SETTINGS_TO_RHP);
 const RHP_TO_WORKSPACE = createInverseRelation(WORKSPACE_TO_RHP);
 const RHP_TO_SIDEBAR = createInverseRelation(SIDEBAR_TO_RHP);
 const SPLIT_TO_SIDEBAR = createInverseRelation(SIDEBAR_TO_SPLIT);
+const RHP_TO_WORKSPACES_LIST = createInverseRelation(WORKSPACES_LIST_TO_RHP);
 const RHP_TO_SEARCH = createInverseRelation(SEARCH_TO_RHP);
 const FULLSCREEN_TO_TAB = createInverseRelation(TAB_TO_FULLSCREEN);
 
@@ -45,4 +47,5 @@ export {
     SPLIT_TO_SIDEBAR,
     TAB_TO_FULLSCREEN,
     FULLSCREEN_TO_TAB,
+    RHP_TO_WORKSPACES_LIST,
 };

src/pages/workspace/WorkspacesListPage.tsx

@@ -223,7 +223,7 @@
                 threeDotsMenuItems.push({
                     icon: Expensicons.Copy,
                     text: translate('workspace.common.duplicateWorkspace'),
-                    onSelected: () => (item.policyID ? Navigation.navigate(ROUTES.WORKSPACE_DUPLICATE.getRoute(item.policyID, ROUTES.WORKSPACES_LIST.route)) : undefined),
+                    onSelected: () => (item.policyID ? Navigation.navigate(ROUTES.WORKSPACE_DUPLICATE.getRoute(item.policyID)) : undefined),
                 });
             }
 
@@ -319,7 +319,7 @@
                 </OfflineWithFeedback>
             );
         },
         [
             session?.email,
             session?.accountID,
             activePolicyID,

src/pages/workspace/duplicate/WorkspaceDuplicateForm.tsx

@@ -62,7 +62,7 @@ function WorkspaceDuplicateForm({policyID}: WorkspaceDuplicateFormProps) {
             }
             const newPolicyID = generatePolicyID();
             setDuplicateWorkspaceData({policyID: newPolicyID, name, file: avatarFile});
-            Navigation.navigate(ROUTES.WORKSPACE_DUPLICATE_SELECT_FEATURES.getRoute(policyID, ROUTES.WORKSPACES_LIST.route));
+            Navigation.navigate(ROUTES.WORKSPACE_DUPLICATE_SELECT_FEATURES.getRoute(policyID));
         },
         [policyID],
     );

src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx

@@ -310,7 +310,7 @@ function WorkspaceDuplicateSelectFeaturesForm({policyID}: WorkspaceDuplicateForm
     return (
         <>
             <HeaderWithBackButton
-                onBackButtonPress={policyID ? () => Navigation.goBack(ROUTES.WORKSPACE_DUPLICATE.getRoute(policyID, ROUTES.WORKSPACES_LIST.route)) : undefined}
+                onBackButtonPress={policyID ? () => Navigation.goBack(ROUTES.WORKSPACE_DUPLICATE.getRoute(policyID)) : undefined}
                 title={translate('workspace.common.duplicateWorkspace')}
             />
             <>