@zeniai/client-epic-state 5.1.4-beta4ND → 5.1.4-beta7ND

package/lib/entity/tenant/epic/initEmailConnectOAuthEpic.js

@@ -25,7 +25,12 @@ const defaultNavigate = (url) => {
 const initEmailConnectOAuthEpic = (actions$, _state$, zeniAPI, 
 // Test seam: callers can override to assert intended URL without actually
 // navigating. Default is full-page redirect via window.location.
-navigate = defaultNavigate) => actions$.pipe((0, operators_1.filter)(tenantReducer_1.initEmailConnectOAuth.match), (0, operators_1.switchMap)((action) => zeniAPI
+navigate = defaultNavigate) => actions$.pipe((0, operators_1.filter)(tenantReducer_1.initEmailConnectOAuth.match), 
+// Per-provider cancellation scope — switchMap at the outer level would
+// cancel an in-flight gmail init when an outlook init fires, stranding
+// the gmail provider's `saveConnectorCredentialsStateBySlug` in
+// `In-Progress` forever. groupBy gives each provider its own stream.
+(0, operators_1.groupBy)((action) => action.payload.provider), (0, operators_1.mergeMap)((perProvider$) => perProvider$.pipe((0, operators_1.switchMap)((action) => zeniAPI
     .postAndGetJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/1.0/connectors/email/${action.payload.provider}/init`, { redirect_after_url: action.payload.redirectAfterUrl }, { 'zeni-tenant-id': action.payload.tenantId })
     .pipe((0, operators_1.mergeMap)((response) => {
     if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
@@ -50,5 +55,5 @@ navigate = defaultNavigate) => actions$.pipe((0, operators_1.filter)(tenantReduc
     return (0, rxjs_1.from)([
         (0, tenantReducer_1.initEmailConnectOAuthFailure)(action.payload.tenantId, action.payload.provider, (0, responsePayload_1.createZeniAPIStatus)(message)),
     ]);
-}))));
+}))))));
 exports.initEmailConnectOAuthEpic = initEmailConnectOAuthEpic;

package/lib/esm/entity/tenant/epic/initEmailConnectOAuthEpic.js

@@ -1,5 +1,5 @@
 import { from } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, filter, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../responsePayload';
 import { initEmailConnectOAuth, initEmailConnectOAuthFailure, initEmailConnectOAuthSuccess, } from '../tenantReducer';
 const defaultNavigate = (url) => {
@@ -22,7 +22,12 @@ const defaultNavigate = (url) => {
 export const initEmailConnectOAuthEpic = (actions$, _state$, zeniAPI, 
 // Test seam: callers can override to assert intended URL without actually
 // navigating. Default is full-page redirect via window.location.
-navigate = defaultNavigate) => actions$.pipe(filter(initEmailConnectOAuth.match), switchMap((action) => zeniAPI
+navigate = defaultNavigate) => actions$.pipe(filter(initEmailConnectOAuth.match), 
+// Per-provider cancellation scope — switchMap at the outer level would
+// cancel an in-flight gmail init when an outlook init fires, stranding
+// the gmail provider's `saveConnectorCredentialsStateBySlug` in
+// `In-Progress` forever. groupBy gives each provider its own stream.
+groupBy((action) => action.payload.provider), mergeMap((perProvider$) => perProvider$.pipe(switchMap((action) => zeniAPI
     .postAndGetJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/1.0/connectors/email/${action.payload.provider}/init`, { redirect_after_url: action.payload.redirectAfterUrl }, { 'zeni-tenant-id': action.payload.tenantId })
     .pipe(mergeMap((response) => {
     if (isSuccessResponse(response) && response.data != null) {
@@ -47,4 +52,4 @@ navigate = defaultNavigate) => actions$.pipe(filter(initEmailConnectOAuth.match)
     return from([
         initEmailConnectOAuthFailure(action.payload.tenantId, action.payload.provider, createZeniAPIStatus(message)),
     ]);
-}))));
+}))))));

package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewLocalStoreDataEpic.js

@@ -12,7 +12,7 @@ import { newAddressInLocalStore, resetNewAddressesInLocalStore, } from '../../..
 import { toAddressViewLocalData } from '../../../../addressView/toAddressViewLocalData';
 import { getCompanyView } from '../../../../companyView/selectorHelpers/getCompanyView';
 import { toSetupViewLocalData } from '../../../../spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic';
-import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
+import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateCurrentSubStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
 import { onboardingStepsData } from '../../onboardingCustomerViewSelector';
 export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$) => actions$.pipe(filter(updateOnboardingCustomerViewLocalStoreData.match), mergeMap((action) => {
     const { companyId, currentStep, reCalculateCurrentStep } = action.payload;
@@ -78,13 +78,16 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 companyView?.company.company.companyOnboardingInfo
                     .subscriptionBillingAddressId != null) {
                 updatedCurrentStep = 'connect_ledger';
-                // After the ledger is connected we move straight to verification —
-                // company_officer / company_details are now sub-steps inside it,
-                // so the page handles which sub-step to land on. The optional
-                // connect_data_source step is opt-in from the sidebar, not from
-                // the recalc.
-                if (isValidConnection) {
-                    updatedCurrentStep = 'verification';
+                const isOnboardingAiActivationViewed = companyOnboardingInfo?.onboardingInfo
+                    ?.onboardingAiActivationInfo?.isOnboardingAiActivationViewed ??
+                    false;
+                // Past the ledger step we always sit on connect_data_source —
+                // it has many integrations, so we treat it as never auto-complete
+                // and only advance to verification on an explicit user dispatch.
+                // While the AI activation interstitial hasn't been viewed yet,
+                // stay on connect_ledger so the interstitial gets its chance.
+                if (isValidConnection && isOnboardingAiActivationViewed) {
+                    updatedCurrentStep = 'connect_data_source';
                 }
             }
         }
@@ -106,6 +109,14 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
         }
         if (reCalculateCurrentStep === true) {
             fetchActions.push(updateCurrentStep({ step: updatedCurrentStep }));
+            // Whenever the recalc lands the user on a different step, reset
+            // the sub-step to the step's landing sub-state — otherwise a
+            // stale subStep (e.g. 'default' carried over from another step)
+            // leaves verification rendering an empty form.
+            if (updatedCurrentStep !== onboardingCustomerViewState.currentStep) {
+                const targetSubStep = updatedCurrentStep === 'verification' ? 'unlock-stack' : 'default';
+                fetchActions.push(updateCurrentSubStep({ subStep: targetSubStep }));
+            }
         }
     }
     if (companyView != null) {

package/lib/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewLocalStoreDataEpic.d.ts

@@ -1,6 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { RootState } from '../../../../../reducer';
 import { newAddressInLocalStore, resetNewAddressDataInLocalStore, resetNewAddressesInLocalStore } from '../../../../addressView/addressViewReducer';
-import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateOnboardingCustomerViewLocalStoreData } from '../../onboardingCustomerViewReducer';
-export type ActionType = ReturnType<typeof updateOnboardingCustomerViewLocalStoreData> | ReturnType<typeof saveOnboardingCustomerViewDataInLocalStore> | ReturnType<typeof clearOnboardingCustomerViewDataInLocalStore> | ReturnType<typeof resetNewAddressesInLocalStore> | ReturnType<typeof newAddressInLocalStore> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateCurrentStep>;
+import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateCurrentSubStep, updateOnboardingCustomerViewLocalStoreData } from '../../onboardingCustomerViewReducer';
+export type ActionType = ReturnType<typeof updateOnboardingCustomerViewLocalStoreData> | ReturnType<typeof saveOnboardingCustomerViewDataInLocalStore> | ReturnType<typeof clearOnboardingCustomerViewDataInLocalStore> | ReturnType<typeof resetNewAddressesInLocalStore> | ReturnType<typeof newAddressInLocalStore> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateCurrentStep> | ReturnType<typeof updateCurrentSubStep>;
 export declare const updateOnboardingCustomerViewLocalStoreDataEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => import("rxjs").Observable<ActionType>;

package/lib/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewLocalStoreDataEpic.js

@@ -84,13 +84,16 @@ const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$) => act
                 companyView?.company.company.companyOnboardingInfo
                     .subscriptionBillingAddressId != null) {
                 updatedCurrentStep = 'connect_ledger';
-                // After the ledger is connected we move straight to verification —
-                // company_officer / company_details are now sub-steps inside it,
-                // so the page handles which sub-step to land on. The optional
-                // connect_data_source step is opt-in from the sidebar, not from
-                // the recalc.
-                if (isValidConnection) {
-                    updatedCurrentStep = 'verification';
+                const isOnboardingAiActivationViewed = companyOnboardingInfo?.onboardingInfo
+                    ?.onboardingAiActivationInfo?.isOnboardingAiActivationViewed ??
+                    false;
+                // Past the ledger step we always sit on connect_data_source —
+                // it has many integrations, so we treat it as never auto-complete
+                // and only advance to verification on an explicit user dispatch.
+                // While the AI activation interstitial hasn't been viewed yet,
+                // stay on connect_ledger so the interstitial gets its chance.
+                if (isValidConnection && isOnboardingAiActivationViewed) {
+                    updatedCurrentStep = 'connect_data_source';
                 }
             }
         }
@@ -112,6 +115,14 @@ const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$) => act
         }
         if (reCalculateCurrentStep === true) {
             fetchActions.push((0, onboardingCustomerViewReducer_1.updateCurrentStep)({ step: updatedCurrentStep }));
+            // Whenever the recalc lands the user on a different step, reset
+            // the sub-step to the step's landing sub-state — otherwise a
+            // stale subStep (e.g. 'default' carried over from another step)
+            // leaves verification rendering an empty form.
+            if (updatedCurrentStep !== onboardingCustomerViewState.currentStep) {
+                const targetSubStep = updatedCurrentStep === 'verification' ? 'unlock-stack' : 'default';
+                fetchActions.push((0, onboardingCustomerViewReducer_1.updateCurrentSubStep)({ subStep: targetSubStep }));
+            }
         }
     }
     if (companyView != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.4-beta4ND",
+  "version": "5.1.4-beta7ND",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",