-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Add helper functions in getMatchingCentralPaneRouteForState #36397
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
833ea1f
7d18914
49049a5
b21f8d7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,11 @@ | ||
import getTopmostBottomTabRoute from '@libs/Navigation/getTopmostBottomTabRoute'; | ||
import type {CentralPaneName, NavigationPartialRoute, RootStackParamList, State} from '@libs/Navigation/types'; | ||
import type {CentralPaneName, CentralPaneNavigatorParamList, NavigationPartialRoute, RootStackParamList, State} from '@libs/Navigation/types'; | ||
import NAVIGATORS from '@src/NAVIGATORS'; | ||
import SCREENS from '@src/SCREENS'; | ||
import TAB_TO_CENTRAL_PANE_MAPPING from './TAB_TO_CENTRAL_PANE_MAPPING'; | ||
|
||
const WORKSPACES_SCREENS = TAB_TO_CENTRAL_PANE_MAPPING[SCREENS.WORKSPACE.INITIAL].concat(TAB_TO_CENTRAL_PANE_MAPPING[SCREENS.ALL_SETTINGS]); | ||
|
||
/** | ||
* @param state - react-navigation state | ||
*/ | ||
|
@@ -31,8 +33,47 @@ const getTopMostReportIDFromRHP = (state: State): string => { | |
return ''; | ||
}; | ||
|
||
// Check if the given route has a policyID equal to the id provided in the function params | ||
function hasRouteMatchingPolicyID(route: NavigationPartialRoute<CentralPaneName>, policyID?: string) { | ||
if (!route.params) { | ||
return false; | ||
} | ||
|
||
const params = `params` in route?.params ? (route.params.params as Record<string, string | undefined>) : undefined; | ||
|
||
// If params are not defined, then we need to check if the policyID exists | ||
if (!params) { | ||
return !policyID; | ||
} | ||
|
||
return 'policyID' in params && params.policyID === policyID; | ||
} | ||
|
||
// Get already opened settings screen within the policy | ||
function getAlreadyOpenedSettingsScreen(rootState?: State, policyID?: string): keyof CentralPaneNavigatorParamList | undefined { | ||
if (!rootState) { | ||
return undefined; | ||
} | ||
|
||
// If one of the screen from WORKSPACES_SCREENS is now in the navigation state, we can decide which screen we should display. | ||
// A screen from the navigation state can be pushed to the navigation state again only if it has a matching policyID with the currently selected workspace. | ||
// Otherwise, when we switch the workspace, we want to display the initial screen in the settings tab. | ||
const alreadyOpenedSettingsTab = rootState.routes | ||
.filter((item) => item.params && 'screen' in item.params && WORKSPACES_SCREENS.includes(item.params.screen as keyof CentralPaneNavigatorParamList)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's a lot of type assertion going on (here and in other places). I gave it a quick look and I couldn't come up with any quick fixes. Do you have any ideas how we could at least reduce the number of type assertions ( There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, I am trying to figure it out, but it's not easy because the screen is |
||
.at(-1); | ||
|
||
if (!hasRouteMatchingPolicyID(alreadyOpenedSettingsTab as NavigationPartialRoute<CentralPaneName>, policyID)) { | ||
return undefined; | ||
} | ||
|
||
const settingsScreen = | ||
alreadyOpenedSettingsTab?.params && 'screen' in alreadyOpenedSettingsTab?.params ? (alreadyOpenedSettingsTab?.params?.screen as keyof CentralPaneNavigatorParamList) : undefined; | ||
|
||
return settingsScreen; | ||
} | ||
|
||
// Get matching central pane route for bottom tab navigator. e.g HOME -> REPORT | ||
function getMatchingCentralPaneRouteForState(state: State<RootStackParamList>): NavigationPartialRoute<CentralPaneName> | undefined { | ||
function getMatchingCentralPaneRouteForState(state: State<RootStackParamList>, rootState?: State): NavigationPartialRoute<CentralPaneName> | undefined { | ||
const topmostBottomTabRoute = getTopmostBottomTabRoute(state); | ||
|
||
if (!topmostBottomTabRoute) { | ||
|
@@ -42,7 +83,10 @@ function getMatchingCentralPaneRouteForState(state: State<RootStackParamList>): | |
const centralPaneName = TAB_TO_CENTRAL_PANE_MAPPING[topmostBottomTabRoute.name][0]; | ||
|
||
if (topmostBottomTabRoute.name === SCREENS.WORKSPACE.INITIAL) { | ||
return {name: centralPaneName, params: topmostBottomTabRoute.params}; | ||
// When we go back to the settings tab without switching the workspace id, we want to return to the previously opened screen | ||
const policyID = topmostBottomTabRoute?.params && 'policyID' in topmostBottomTabRoute?.params ? (topmostBottomTabRoute.params.policyID as string) : undefined; | ||
const screen = getAlreadyOpenedSettingsScreen(rootState, policyID) ?? centralPaneName; | ||
return {name: screen, params: topmostBottomTabRoute.params}; | ||
} | ||
|
||
if (topmostBottomTabRoute.name === SCREENS.HOME) { | ||
|
Uh oh!
There was an error while loading. Please reload this page.