Fix navigating on create workspace button and adjust jest tests

Author: WojtekBoman

src/pages/home/GettingStartedSection/hooks/useGettingStartedItems.ts

@@ -3,6 +3,7 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {hasCompanyCardFeeds} from '@libs/CardUtils';
+import Navigation from '@libs/Navigation/Navigation';
 import {hasAccountingConnections, hasCustomCategories, hasNonDefaultRules, isPaidGroupPolicy, isPendingDeletePolicy} from '@libs/PolicyUtils';
 import isWithinGettingStartedPeriod from '@pages/home/GettingStartedSection/utils/isWithinGettingStartedPeriod';
 import {enablePolicyCategories} from '@userActions/Policy/Category';
@@ -67,7 +68,7 @@ function useGettingStartedItems(): UseGettingStartedItemsResult {
         key: 'createWorkspace',
         label: translate('homePage.gettingStartedSection.createWorkspace'),
         isComplete: true,
-        route: shouldUseNarrowLayout ? ROUTES.WORKSPACE_INITIAL.getRoute(activePolicyID) : ROUTES.WORKSPACE_OVERVIEW.getRoute(activePolicyID),
+        route: shouldUseNarrowLayout ? ROUTES.WORKSPACE_INITIAL.getRoute(activePolicyID, Navigation.getActiveRoute()) : ROUTES.WORKSPACE_OVERVIEW.getRoute(activePolicyID),
     });
 
     const isDirectConnect = !!reportedIntegration && DIRECT_CONNECT_INTEGRATIONS.has(reportedIntegration);

tests/unit/hooks/useGettingStartedItems.test.ts

@@ -19,6 +19,11 @@ jest.mock('@hooks/useLocalize', () =>
     })),
 );
 
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn(() => ({shouldUseNarrowLayout: false})));
+
+jest.mock('@userActions/Policy/Category', () => ({enablePolicyCategories: jest.fn()}));
+jest.mock('@userActions/Policy/Policy', () => ({enableCompanyCards: jest.fn(), enablePolicyConnections: jest.fn(), enablePolicyRules: jest.fn()}));
+
 const POLICY_ID = '1';
 
 function buildPolicy(overrides: Partial<Policy> = {}): Policy {
@@ -349,10 +354,10 @@ describe('useGettingStartedItems', () => {
     });
 
     describe('row 3 - Link company cards', () => {
-        it('should be shown when company cards feature is enabled on the workspace', async () => {
+        it('should always be shown', async () => {
             await setupManageTeamScenario({
                 accounting: CONST.POLICY.CONNECTIONS.NAME.QBO,
-                policy: {areCompanyCardsEnabled: true},
+                policy: {areCompanyCardsEnabled: false},
             });
 
             const {result} = renderHook(() => useGettingStartedItems());
@@ -361,7 +366,19 @@ describe('useGettingStartedItems', () => {
             expect(companyCardsItem).toBeDefined();
         });
 
-        it('should be hidden when company cards feature is not enabled on the workspace', async () => {
+        it('should have isFeatureEnabled=true when company cards feature is enabled', async () => {
+            await setupManageTeamScenario({
+                accounting: CONST.POLICY.CONNECTIONS.NAME.QBO,
+                policy: {areCompanyCardsEnabled: true},
+            });
+
+            const {result} = renderHook(() => useGettingStartedItems());
+
+            const companyCardsItem = result.current.items.find((item) => item.key === 'linkCompanyCards');
+            expect(companyCardsItem?.isFeatureEnabled).toBe(true);
+        });
+
+        it('should have isFeatureEnabled=false when company cards feature is not enabled', async () => {
             await setupManageTeamScenario({
                 accounting: CONST.POLICY.CONNECTIONS.NAME.QBO,
                 policy: {areCompanyCardsEnabled: false},
@@ -370,7 +387,7 @@ describe('useGettingStartedItems', () => {
             const {result} = renderHook(() => useGettingStartedItems());
 
             const companyCardsItem = result.current.items.find((item) => item.key === 'linkCompanyCards');
-            expect(companyCardsItem).toBeUndefined();
+            expect(companyCardsItem?.isFeatureEnabled).toBe(false);
         });
 
         it('should navigate to workspace company cards route', async () => {
@@ -399,10 +416,10 @@ describe('useGettingStartedItems', () => {
     });
 
     describe('row 4 - Set up spend rules', () => {
-        it('should be shown when rules feature is enabled on the workspace', async () => {
+        it('should always be shown', async () => {
             await setupManageTeamScenario({
                 accounting: CONST.POLICY.CONNECTIONS.NAME.QBO,
-                policy: {areRulesEnabled: true},
+                policy: {areRulesEnabled: false},
             });
 
             const {result} = renderHook(() => useGettingStartedItems());
@@ -411,7 +428,19 @@ describe('useGettingStartedItems', () => {
             expect(rulesItem).toBeDefined();
         });
 
-        it('should be hidden when rules feature is not enabled on the workspace', async () => {
+        it('should have isFeatureEnabled=true when rules feature is enabled', async () => {
+            await setupManageTeamScenario({
+                accounting: CONST.POLICY.CONNECTIONS.NAME.QBO,
+                policy: {areRulesEnabled: true},
+            });
+
+            const {result} = renderHook(() => useGettingStartedItems());
+
+            const rulesItem = result.current.items.find((item) => item.key === 'setupRules');
+            expect(rulesItem?.isFeatureEnabled).toBe(true);
+        });
+
+        it('should have isFeatureEnabled=false when rules feature is not enabled', async () => {
             await setupManageTeamScenario({
                 accounting: CONST.POLICY.CONNECTIONS.NAME.QBO,
                 policy: {areRulesEnabled: false},
@@ -420,7 +449,7 @@ describe('useGettingStartedItems', () => {
             const {result} = renderHook(() => useGettingStartedItems());
 
             const rulesItem = result.current.items.find((item) => item.key === 'setupRules');
-            expect(rulesItem).toBeUndefined();
+            expect(rulesItem?.isFeatureEnabled).toBe(false);
         });
 
         it('should navigate to workspace rules route', async () => {
@@ -511,7 +540,7 @@ describe('useGettingStartedItems', () => {
             expect(keys).toEqual(['createWorkspace', 'customizeCategories', 'linkCompanyCards', 'setupRules']);
         });
 
-        it('should only contain createWorkspace and accounting row when no optional features are enabled', async () => {
+        it('should always contain all four rows even when optional features are disabled', async () => {
             await setupManageTeamScenario({
                 accounting: CONST.POLICY.CONNECTIONS.NAME.QBO,
                 policy: {areCompanyCardsEnabled: false, areRulesEnabled: false},
@@ -520,7 +549,7 @@ describe('useGettingStartedItems', () => {
             const {result} = renderHook(() => useGettingStartedItems());
 
             const keys = result.current.items.map((item) => item.key);
-            expect(keys).toEqual(['createWorkspace', 'connectAccounting']);
+            expect(keys).toEqual(['createWorkspace', 'connectAccounting', 'linkCompanyCards', 'setupRules']);
         });
     });
 

tests/unit/pages/home/GettingStartedSection/GettingStartedSectionTest.tsx

@@ -12,6 +12,7 @@ const TEST_POLICY_ID = 'ABC123';
 
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
+    setNavigationActionToMicrotaskQueue: jest.fn((callback: () => void) => callback()),
 }));
 
 jest.mock('@hooks/useLocalize', () =>
@@ -195,12 +196,12 @@ describe('GettingStartedSection', () => {
             expect(screen.getByText('homePage.gettingStartedSection.linkCompanyCards')).toBeTruthy();
         });
 
-        it('hides "Link company cards" row when company cards feature is disabled', async () => {
+        it('always shows "Link company cards" row even when company cards feature is disabled', async () => {
             await setManageTeamUserState({areCompanyCardsEnabled: false});
 
             renderGettingStartedSection();
 
-            expect(screen.queryByText('homePage.gettingStartedSection.linkCompanyCards')).toBeNull();
+            expect(screen.getByText('homePage.gettingStartedSection.linkCompanyCards')).toBeTruthy();
         });
 
         it('shows "Set up spend rules" row when rules feature is enabled', async () => {
@@ -211,12 +212,12 @@ describe('GettingStartedSection', () => {
             expect(screen.getByText('homePage.gettingStartedSection.setupRules')).toBeTruthy();
         });
 
-        it('hides "Set up spend rules" row when rules feature is disabled', async () => {
+        it('always shows "Set up spend rules" row even when rules feature is disabled', async () => {
             await setManageTeamUserState({areRulesEnabled: false});
 
             renderGettingStartedSection();
 
-            expect(screen.queryByText('homePage.gettingStartedSection.setupRules')).toBeNull();
+            expect(screen.getByText('homePage.gettingStartedSection.setupRules')).toBeTruthy();
         });
 
         it('renders rows in the expected order: workspace, accounting, cards, rules', async () => {