restore policy/domain validation via collection subscription

TMisiukiewicz · TMisiukiewicz · commit 5a83e128a7fd · 2026-05-07T13:24:17.000+02:00
diff --git a/src/hooks/useRestoreWorkspacesTabOnNavigate.ts b/src/hooks/useRestoreWorkspacesTabOnNavigate.ts
@@ -7,7 +7,10 @@ import {getTabState} from '@libs/Navigation/helpers/tabNavigatorUtils';
 import navigationRef from '@libs/Navigation/navigationRef';
 import type {DomainSplitNavigatorParamList, WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
 import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
+import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
+import useOnyx from './useOnyx';
 import useResponsiveLayout from './useResponsiveLayout';
 
 type WorkspaceRouteType = NavigationState['routes'][number] | NonNullable<PartialState<NavigationState>['routes']>[number];
@@ -59,12 +62,17 @@ function getWorkspacesTabState(route: WorkspaceRouteType | undefined): Navigatio
  * or a specific domain page. When the user navigates away and comes back to the tab,
  * this hook ensures they return to whichever of those they had open last — not always the list.
  *
- * Resolves nav state and route IDs at click time inside the returned callback so the hook
- * has no reactive subscriptions to nav state — unrelated navigations (e.g. opening a report)
- * don't trigger re-renders. The destination workspace/domain page handles invalid IDs.
+ * Resolves nav state and route IDs at click time inside the returned callback so the hook has
+ * no reactive subscriptions to nav state — unrelated navigations (e.g. opening a report) don't
+ * trigger re-renders. The POLICY/DOMAIN collections are subscribed at hook level so the click
+ * handler can validate the last viewed workspace/domain via closure; these collections rarely
+ * tick during navigation.
  */
 function useRestoreWorkspacesTabOnNavigate() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [allDomains] = useOnyx(ONYXKEYS.COLLECTION.DOMAIN);
 
     return () => {
         const rootState = navigationRef.isReady() ? navigationRef.getRootState() : undefined;
@@ -73,13 +81,21 @@ function useRestoreWorkspacesTabOnNavigate() {
         const workspacesTabState = getWorkspacesTabState(lastWorkspacesTabNavigatorRoute);
 
         const params = workspacesTabState?.routes?.at(0)?.params as WorkspaceParams | undefined;
-        const policyID = params && 'policyID' in params ? params.policyID : undefined;
-        const domainAccountID = params && 'domainAccountID' in params ? params.domainAccountID : undefined;
+        const paramsPolicyID = params && 'policyID' in params ? params.policyID : undefined;
+        const paramsDomainAccountID = params && 'domainAccountID' in params ? params.domainAccountID : undefined;
+
+        const policy =
+            lastWorkspacesTabNavigatorRoute?.name === NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR && paramsPolicyID ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${paramsPolicyID}`] : undefined;
+        const domain =
+            lastWorkspacesTabNavigatorRoute?.name === NAVIGATORS.DOMAIN_SPLIT_NAVIGATOR && paramsDomainAccountID
+                ? allDomains?.[`${ONYXKEYS.COLLECTION.DOMAIN}${paramsDomainAccountID}`]
+                : undefined;
 
         navigateToWorkspacesPage({
             shouldUseNarrowLayout,
-            policyID,
-            domainAccountID,
+            currentUserLogin,
+            policy,
+            domain,
             lastWorkspacesTabNavigatorRoute,
             topmostFullScreenRoute,
             workspacesTabState,
diff --git a/src/libs/Navigation/helpers/navigateToWorkspacesPage.ts b/src/libs/Navigation/helpers/navigateToWorkspacesPage.ts
@@ -4,10 +4,12 @@ import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import {getPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
 import Navigation from '@libs/Navigation/Navigation';
 import navigationRef from '@libs/Navigation/navigationRef';
+import {isPendingDeletePolicy, shouldShowPolicy as shouldShowPolicyUtil} from '@libs/PolicyUtils';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import type {Domain, Policy} from '@src/types/onyx';
 import getActiveTabName from './getActiveTabName';
 import getPathFromState from './getPathFromState';
 import {getTabState} from './tabNavigatorUtils';
@@ -24,9 +26,10 @@ function wrapStateInNavigators(state: PartialState<NavigationState>, navigators:
 }
 
 type Params = {
+    currentUserLogin?: string;
     shouldUseNarrowLayout: boolean;
-    policyID?: string;
-    domainAccountID?: number;
+    policy?: Policy;
+    domain?: Domain;
     lastWorkspacesTabNavigatorRoute?: RouteType;
     topmostFullScreenRoute?: RouteType;
     /**
@@ -40,7 +43,7 @@ type Params = {
     workspacesTabState?: NavigationState | PartialState<NavigationState>;
 };
 
-const navigateToWorkspacesPage = ({shouldUseNarrowLayout, policyID, domainAccountID, lastWorkspacesTabNavigatorRoute, topmostFullScreenRoute, workspacesTabState}: Params) => {
+const navigateToWorkspacesPage = ({currentUserLogin, shouldUseNarrowLayout, policy, domain, lastWorkspacesTabNavigatorRoute, topmostFullScreenRoute, workspacesTabState}: Params) => {
     const rootState = navigationRef.getRootState();
     const focusedRoute = rootState ? findFocusedRoute(rootState) : undefined;
     const isOnWorkspacesList = focusedRoute?.name === SCREENS.WORKSPACES_LIST;
@@ -90,40 +93,45 @@ const navigateToWorkspacesPage = ({shouldUseNarrowLayout, policyID, domainAccoun
             return;
         }
 
-        // Workspace route found: navigate to last workspace screen by ID.
-        // Validation is deferred to the destination — if the policy was deleted or access
-        // revoked, the workspace page will redirect to the list itself.
+        // Workspace route found: try to restore last workspace screen.
         if (lastWorkspacesTabNavigatorRoute.name === NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR) {
-            if (!policyID) {
+            const shouldShowPolicy = shouldShowPolicyUtil(policy, false, currentUserLogin);
+            const isPendingDelete = isPendingDeletePolicy(policy);
+
+            // Workspace is not accessible or is being deleted: go to list.
+            if (!shouldShowPolicy || isPendingDelete) {
                 Navigation.navigate(ROUTES.WORKSPACES_LIST.route);
                 return;
             }
-            // Synthesize a URL from the captured WorkspaceSplitNavigator inner state and navigate
-            // to it. URL-based navigation goes through `getStateFromPath`, which produces a fully
-            // formed nested state and reliably handles pushing a fresh TabNavigator on top of an
-            // existing fullscreen stack. The state has to be wrapped with its full ancestor chain
-            // (TAB_NAVIGATOR > WORKSPACE_NAVIGATOR > WORKSPACE_SPLIT_NAVIGATOR) so `getPathFromState`
-            // can match the linking-config hierarchy and produce a real URL like
-            // `/workspaces/POLICY_ID/workflows`; otherwise the resolver falls back to navigator
-            // names as path segments and the result hits 404. Narrow layouts skip the deep-restore
-            // and go to the workspace's initial page (mirrors mobile behavior).
-            const wrappedState =
-                !shouldUseNarrowLayout && workspacesTabState
-                    ? wrapStateInNavigators(workspacesTabState as PartialState<NavigationState>, [
-                          NAVIGATORS.TAB_NAVIGATOR,
-                          NAVIGATORS.WORKSPACE_NAVIGATOR,
-                          NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR,
-                      ])
-                    : undefined;
-            const targetPath = (wrappedState ? getPathFromState(wrappedState) : ROUTES.WORKSPACE_INITIAL.getRoute(policyID)) as Route;
-            Navigation.navigate(targetPath);
+
+            if (policy?.id) {
+                // Synthesize a URL from the captured WorkspaceSplitNavigator inner state and navigate
+                // to it. URL-based navigation goes through `getStateFromPath`, which produces a fully
+                // formed nested state and reliably handles pushing a fresh TabNavigator on top of an
+                // existing fullscreen stack. The state has to be wrapped with its full ancestor chain
+                // (TAB_NAVIGATOR > WORKSPACE_NAVIGATOR > WORKSPACE_SPLIT_NAVIGATOR) so `getPathFromState`
+                // can match the linking-config hierarchy and produce a real URL like
+                // `/workspaces/POLICY_ID/workflows`; otherwise the resolver falls back to navigator
+                // names as path segments and the result hits 404. Narrow layouts skip the deep-restore
+                // and go to the workspace's initial page (mirrors mobile behavior).
+                const wrappedState =
+                    !shouldUseNarrowLayout && workspacesTabState
+                        ? wrapStateInNavigators(workspacesTabState as PartialState<NavigationState>, [
+                              NAVIGATORS.TAB_NAVIGATOR,
+                              NAVIGATORS.WORKSPACE_NAVIGATOR,
+                              NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR,
+                          ])
+                        : undefined;
+                const targetPath = (wrappedState ? getPathFromState(wrappedState) : ROUTES.WORKSPACE_INITIAL.getRoute(policy.id)) as Route;
+                Navigation.navigate(targetPath);
+            }
             return;
         }
 
-        // Domain route found: navigate to last domain screen by ID.
+        // Domain route found: try to restore last domain screen.
         if (lastWorkspacesTabNavigatorRoute.name === NAVIGATORS.DOMAIN_SPLIT_NAVIGATOR) {
-            if (domainAccountID !== undefined) {
-                Navigation.navigate(ROUTES.DOMAIN_INITIAL.getRoute(domainAccountID));
+            if (domain?.accountID !== undefined) {
+                Navigation.navigate(ROUTES.DOMAIN_INITIAL.getRoute(domain.accountID));
                 return;
             }
         }
diff --git a/tests/unit/navigateToWorkspacesPageTest.ts b/tests/unit/navigateToWorkspacesPageTest.ts
@@ -2,13 +2,16 @@ import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import getPathFromState from '@libs/Navigation/helpers/getPathFromState';
 import navigateToWorkspacesPage from '@libs/Navigation/helpers/navigateToWorkspacesPage';
 import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import createRandomPolicy from '../utils/collections/policies';
 
 jest.mock('@libs/Navigation/navigationRef');
 jest.mock('@libs/Navigation/Navigation');
 jest.mock('@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState');
+jest.mock('@libs/PolicyUtils');
 jest.mock('@libs/interceptAnonymousUser');
 jest.mock('@libs/Navigation/helpers/getPathFromState', () => ({
     __esModule: true,
@@ -18,7 +21,8 @@ jest.mock('@libs/Navigation/helpers/getPathFromState', () => ({
 const mockedGetPathFromState = getPathFromState as jest.MockedFunction<typeof getPathFromState>;
 
 const fakePolicyID = '344559B2CCF2B6C1';
-const baseParams = {shouldUseNarrowLayout: false, policyID: fakePolicyID};
+const mockPolicy = {...createRandomPolicy(0), id: fakePolicyID};
+const baseParams = {currentUserLogin: 'test@example.com', shouldUseNarrowLayout: false, policy: mockPolicy};
 
 describe('navigateToWorkspacesPage', () => {
     beforeEach(() => {
@@ -63,6 +67,9 @@ describe('navigateToWorkspacesPage', () => {
     });
 
     it('navigates to the workspace initial URL when no workspacesTabState is provided', () => {
+        (PolicyUtils.shouldShowPolicy as jest.Mock).mockReturnValue(true);
+        (PolicyUtils.isPendingDeletePolicy as jest.Mock).mockReturnValue(false);
+
         mockIntercept();
         navigateToWorkspacesPage({
             ...baseParams,
@@ -75,6 +82,8 @@ describe('navigateToWorkspacesPage', () => {
     });
 
     it('navigates to the URL produced by getPathFromState when workspacesTabState is provided on wide layouts', () => {
+        (PolicyUtils.shouldShowPolicy as jest.Mock).mockReturnValue(true);
+        (PolicyUtils.isPendingDeletePolicy as jest.Mock).mockReturnValue(false);
         const restoredPath = `/workspaces/${fakePolicyID}/workflows` as const;
         mockedGetPathFromState.mockReturnValue(restoredPath);
 
@@ -119,6 +128,9 @@ describe('navigateToWorkspacesPage', () => {
     });
 
     it('falls back to the workspace initial URL on narrow layouts even when workspacesTabState is provided', () => {
+        (PolicyUtils.shouldShowPolicy as jest.Mock).mockReturnValue(true);
+        (PolicyUtils.isPendingDeletePolicy as jest.Mock).mockReturnValue(false);
+
         mockIntercept();
         navigateToWorkspacesPage({
             ...baseParams,
@@ -138,11 +150,39 @@ describe('navigateToWorkspacesPage', () => {
         expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.WORKSPACE_INITIAL.getRoute(fakePolicyID));
     });
 
+    it('navigates to WORKSPACES_LIST if policy is pending delete', () => {
+        (PolicyUtils.shouldShowPolicy as jest.Mock).mockReturnValue(true);
+        (PolicyUtils.isPendingDeletePolicy as jest.Mock).mockReturnValue(true);
+
+        mockIntercept();
+        navigateToWorkspacesPage({
+            ...baseParams,
+            topmostFullScreenRoute: {name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR},
+            lastWorkspacesTabNavigatorRoute: {name: NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR},
+        });
+
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.WORKSPACES_LIST.route);
+    });
+
+    it('navigates to WORKSPACES_LIST if shouldShowPolicy is false for the user', () => {
+        (PolicyUtils.shouldShowPolicy as jest.Mock).mockReturnValue(false);
+        (PolicyUtils.isPendingDeletePolicy as jest.Mock).mockReturnValue(false);
+
+        mockIntercept();
+        navigateToWorkspacesPage({
+            ...baseParams,
+            topmostFullScreenRoute: {name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR},
+            lastWorkspacesTabNavigatorRoute: {name: NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR},
+        });
+
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.WORKSPACES_LIST.route);
+    });
+
     it('navigates to WORKSPACES_LIST if policyID is missing', () => {
         mockIntercept();
         navigateToWorkspacesPage({
             ...baseParams,
-            policyID: undefined,
+            policy: undefined,
             topmostFullScreenRoute: {name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR},
             lastWorkspacesTabNavigatorRoute: {name: NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR},
         });
