@zeniai/client-epic-state 5.1.88-betaRD6 → 5.1.88-betaRD7

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js

@@ -1,10 +1,11 @@
 import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
 import { DEFAULT_DATE_FORMAT } from '../../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY';
 import { toAbsoluteDay, toString } from '../../../../commonStateTypes/timePeriod';
 import { updateAccruedJESchedules, updateAccruedJESchedulesDetails, updateJEOneTimeAccruals, updateJESchedules, updateJESchedulesDetails, } from '../../../../entity/jeSchedules/jeSchedulesReducer';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { clearAll } from '../../../../rootActions';
 import { date } from '../../../../zeniDayJS';
 import { fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesSuccess, initializeJeScheduleLocalData, } from '../../reducers/jeSchedulesViewReducer';
 export const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchJeSchedules.match), mergeMap((action) => {
@@ -77,5 +78,9 @@ export const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe
             JSON.stringify(error)),
         selectedPeriod,
         selectedPageTab,
-    }))));
+    }))), 
+    // A tenant switch clears the store while this request is still in flight. Without this
+    // the old tenant's rows are written back into the freshly cleared store and stay on
+    // screen under the new tenant until a manual refresh.
+    takeUntil(actions$.pipe(filter(clearAll.match))));
 }));

package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.d.ts

@@ -2,7 +2,8 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { updateAccruedJESchedules, updateAccruedJESchedulesDetails, updateJEOneTimeAccruals, updateJESchedules, updateJESchedulesDetails } from '../../../../entity/jeSchedules/jeSchedulesReducer';
 import { RootState } from '../../../../reducer';
+import { clearAll } from '../../../../rootActions';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesSuccess, initializeJeScheduleLocalData } from '../../reducers/jeSchedulesViewReducer';
-export type ActionType = ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesFailure> | ReturnType<typeof fetchJeSchedulesSuccess> | ReturnType<typeof initializeJeScheduleLocalData> | ReturnType<typeof updateAccruedJESchedules> | ReturnType<typeof updateAccruedJESchedulesDetails> | ReturnType<typeof updateJEOneTimeAccruals> | ReturnType<typeof updateJESchedules> | ReturnType<typeof updateJESchedulesDetails>;
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesFailure> | ReturnType<typeof fetchJeSchedulesSuccess> | ReturnType<typeof initializeJeScheduleLocalData> | ReturnType<typeof updateAccruedJESchedules> | ReturnType<typeof updateAccruedJESchedulesDetails> | ReturnType<typeof updateJEOneTimeAccruals> | ReturnType<typeof updateJESchedules> | ReturnType<typeof updateJESchedulesDetails>;
 export declare const fetchJeSchedulesEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js

@@ -8,6 +8,7 @@ const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const jeSchedulesReducer_1 = require("../../../../entity/jeSchedules/jeSchedulesReducer");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const responsePayload_1 = require("../../../../responsePayload");
+const rootActions_1 = require("../../../../rootActions");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedules.match), (0, operators_1.mergeMap)((action) => {
@@ -80,6 +81,10 @@ const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
             JSON.stringify(error)),
         selectedPeriod,
         selectedPageTab,
-    }))));
+    }))), 
+    // A tenant switch clears the store while this request is still in flight. Without this
+    // the old tenant's rows are written back into the freshly cleared store and stay on
+    // screen under the new tenant until a manual refresh.
+    (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
 }));
 exports.fetchJeSchedulesEpic = fetchJeSchedulesEpic;

package/package.json

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