From d7795f9768da890ead4e30d46028a59950ba24de Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:39:32 +0530 Subject: [PATCH 1/5] remove backTo prop and use closeRHPFlow --- src/components/ImportSpreadsheet.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx index 09f8c1d5b925..412656cea993 100644 --- a/src/components/ImportSpreadsheet.tsx +++ b/src/components/ImportSpreadsheet.tsx @@ -26,14 +26,11 @@ import ScreenWrapper from './ScreenWrapper'; import Text from './Text'; type ImportSpreedsheetProps = { - // The route to navigate to when the back button is pressed. - backTo: Routes; - // The route to navigate to after the file import is completed. goTo: Routes; }; -function ImportSpreadsheet({backTo, goTo}: ImportSpreedsheetProps) { +function ImportSpreadsheet({goTo}: ImportSpreedsheetProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const [isReadingFile, setIsReadingFIle] = useState(false); @@ -169,7 +166,7 @@ function ImportSpreadsheet({backTo, goTo}: ImportSpreedsheetProps) { Navigation.goBack(backTo)} + onBackButtonPress={() => Navigation.closeRHPFlow()} /> From dce06f009601ef573d6473d8138f6965fad01650 Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Wed, 4 Dec 2024 07:15:56 +0000 Subject: [PATCH 2/5] remove prop usage from components Signed-off-by: GitHub --- src/pages/workspace/categories/ImportCategoriesPage.tsx | 5 +---- src/pages/workspace/members/ImportMembersPage.tsx | 5 +---- src/pages/workspace/perDiem/ImportPerDiemPage.tsx | 5 +---- src/pages/workspace/tags/ImportTagsPage.tsx | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/pages/workspace/categories/ImportCategoriesPage.tsx b/src/pages/workspace/categories/ImportCategoriesPage.tsx index fcdcf95042be..396d73894f72 100644 --- a/src/pages/workspace/categories/ImportCategoriesPage.tsx +++ b/src/pages/workspace/categories/ImportCategoriesPage.tsx @@ -30,10 +30,7 @@ function ImportCategoriesPage({route}: ImportCategoriesPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } diff --git a/src/pages/workspace/members/ImportMembersPage.tsx b/src/pages/workspace/members/ImportMembersPage.tsx index 4a9d51261a66..8f9cae7445d5 100644 --- a/src/pages/workspace/members/ImportMembersPage.tsx +++ b/src/pages/workspace/members/ImportMembersPage.tsx @@ -22,10 +22,7 @@ function ImportMembersPage({policy}: ImportMembersPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } diff --git a/src/pages/workspace/perDiem/ImportPerDiemPage.tsx b/src/pages/workspace/perDiem/ImportPerDiemPage.tsx index 48a39054799a..e781ee158fc7 100644 --- a/src/pages/workspace/perDiem/ImportPerDiemPage.tsx +++ b/src/pages/workspace/perDiem/ImportPerDiemPage.tsx @@ -22,10 +22,7 @@ function ImportPerDiemPage({route}: ImportPerDiemPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } diff --git a/src/pages/workspace/tags/ImportTagsPage.tsx b/src/pages/workspace/tags/ImportTagsPage.tsx index 1cdc3e1ae7cb..ff796e1fbe14 100644 --- a/src/pages/workspace/tags/ImportTagsPage.tsx +++ b/src/pages/workspace/tags/ImportTagsPage.tsx @@ -24,10 +24,7 @@ function ImportTagsPage({route}: ImportTagsPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } From cd80b7abda18c94d968484a3ebda46e866c5b248 Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:52:09 +0000 Subject: [PATCH 3/5] fix navigation issues in tags and categories --- src/components/ImportSpreadsheet.tsx | 7 +++++-- src/pages/workspace/categories/ImportCategoriesPage.tsx | 5 ++++- src/pages/workspace/categories/WorkspaceCategoriesPage.tsx | 6 +++++- src/pages/workspace/perDiem/ImportPerDiemPage.tsx | 5 ++++- src/pages/workspace/tags/ImportTagsPage.tsx | 5 ++++- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 6 +++++- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx index 61789cf10c84..fac9ce978335 100644 --- a/src/components/ImportSpreadsheet.tsx +++ b/src/components/ImportSpreadsheet.tsx @@ -26,11 +26,14 @@ import ScreenWrapper from './ScreenWrapper'; import Text from './Text'; type ImportSpreedsheetProps = { + // The route to navigate to when the back button is pressed. + backTo?: Routes; + // The route to navigate to after the file import is completed. goTo: Routes; }; -function ImportSpreadsheet({goTo}: ImportSpreedsheetProps) { +function ImportSpreadsheet({goTo, backTo}: ImportSpreedsheetProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const [isReadingFile, setIsReadingFIle] = useState(false); @@ -168,7 +171,7 @@ function ImportSpreadsheet({goTo}: ImportSpreedsheetProps) { Navigation.closeRHPFlow()} + onBackButtonPress={() => Navigation.goBack(backTo)} /> diff --git a/src/pages/workspace/categories/ImportCategoriesPage.tsx b/src/pages/workspace/categories/ImportCategoriesPage.tsx index 396d73894f72..0e23260e56b2 100644 --- a/src/pages/workspace/categories/ImportCategoriesPage.tsx +++ b/src/pages/workspace/categories/ImportCategoriesPage.tsx @@ -30,7 +30,10 @@ function ImportCategoriesPage({route}: ImportCategoriesPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx index a8a37638f87e..d249a1de329c 100644 --- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx +++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx @@ -315,7 +315,11 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { Modal.close(() => setIsOfflineModalVisible(true)); return; } - Navigation.navigate(isQuickSettingsFlow ? ROUTES.SETTINGS_CATEGORIES_IMPORT.getRoute(policyId, backTo) : ROUTES.WORKSPACE_CATEGORIES_IMPORT.getRoute(policyId)); + Navigation.navigate( + isQuickSettingsFlow + ? ROUTES.SETTINGS_CATEGORIES_IMPORT.getRoute(policyId, ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(policyId, backTo)) + : ROUTES.WORKSPACE_CATEGORIES_IMPORT.getRoute(policyId), + ); }, }); } diff --git a/src/pages/workspace/perDiem/ImportPerDiemPage.tsx b/src/pages/workspace/perDiem/ImportPerDiemPage.tsx index e781ee158fc7..48a39054799a 100644 --- a/src/pages/workspace/perDiem/ImportPerDiemPage.tsx +++ b/src/pages/workspace/perDiem/ImportPerDiemPage.tsx @@ -22,7 +22,10 @@ function ImportPerDiemPage({route}: ImportPerDiemPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } diff --git a/src/pages/workspace/tags/ImportTagsPage.tsx b/src/pages/workspace/tags/ImportTagsPage.tsx index ff796e1fbe14..2338ab16e2b9 100644 --- a/src/pages/workspace/tags/ImportTagsPage.tsx +++ b/src/pages/workspace/tags/ImportTagsPage.tsx @@ -24,7 +24,10 @@ function ImportTagsPage({route}: ImportTagsPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index b86a35fa6fca..667ed7151bd9 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -302,7 +302,11 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { Modal.close(() => setIsOfflineModalVisible(true)); return; } - Navigation.navigate(isQuickSettingsFlow ? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, backTo) : ROUTES.WORKSPACE_TAGS_IMPORT.getRoute(policyID)); + Navigation.navigate( + isQuickSettingsFlow + ? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo)) + : ROUTES.WORKSPACE_TAGS_IMPORT.getRoute(policyID), + ); }, }, ]; From 3747927d7974c4c3a53ee7e7838b981ffe82f5c4 Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Thu, 26 Dec 2024 23:24:06 +0530 Subject: [PATCH 4/5] undo order change --- src/components/ImportSpreadsheet.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx index fac9ce978335..a6a27e2d5bcb 100644 --- a/src/components/ImportSpreadsheet.tsx +++ b/src/components/ImportSpreadsheet.tsx @@ -33,7 +33,7 @@ type ImportSpreedsheetProps = { goTo: Routes; }; -function ImportSpreadsheet({goTo, backTo}: ImportSpreedsheetProps) { +function ImportSpreadsheet({backTo, goTo}: ImportSpreedsheetProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const [isReadingFile, setIsReadingFIle] = useState(false); From c85eef62492ba97790653952c514f960924ac567 Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Thu, 26 Dec 2024 18:00:57 +0000 Subject: [PATCH 5/5] fix esLint --- src/pages/workspace/categories/WorkspaceCategoriesPage.tsx | 2 +- src/pages/workspace/members/ImportMembersPage.tsx | 5 ++++- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx index d249a1de329c..3665fee563cf 100644 --- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx +++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx @@ -72,7 +72,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { const [isDownloadFailureModalVisible, setIsDownloadFailureModalVisible] = useState(false); const [deleteCategoriesConfirmModalVisible, setDeleteCategoriesConfirmModalVisible] = useState(false); const {environmentURL} = useEnvironment(); - const policyId = route.params.policyID ?? '-1'; + const policyId = route.params.policyID; const backTo = route.params?.backTo; const policy = usePolicy(policyId); const {selectionMode} = useMobileSelectionMode(); diff --git a/src/pages/workspace/members/ImportMembersPage.tsx b/src/pages/workspace/members/ImportMembersPage.tsx index 8f9cae7445d5..4a9d51261a66 100644 --- a/src/pages/workspace/members/ImportMembersPage.tsx +++ b/src/pages/workspace/members/ImportMembersPage.tsx @@ -22,7 +22,10 @@ function ImportMembersPage({policy}: ImportMembersPageProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]} fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}} > - + ); } diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index 667ed7151bd9..9281efee1a75 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -65,7 +65,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { const [isDownloadFailureModalVisible, setIsDownloadFailureModalVisible] = useState(false); const [isDeleteTagsConfirmModalVisible, setIsDeleteTagsConfirmModalVisible] = useState(false); const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false); - const policyID = route.params.policyID ?? '-1'; + const policyID = route.params.policyID; const backTo = route.params.backTo; const policy = usePolicy(policyID); const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);