@zeniai/client-epic-state 4.13.56 → 4.13.57

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

@@ -8,10 +8,10 @@ const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const jeSchedulesReducer_1 = require("../../../../entity/jeSchedules/jeSchedulesReducer");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
-const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedules.match), (0, operators_1.switchMap)((action) => {
+const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedules.match), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
-    const { period } = action.payload;
+    const { period, refreshViewInBackground } = action.payload;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const queryParam = {
@@ -35,6 +35,7 @@ const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
                     ...response.data.failed_je_postings.je_schedules,
                 ],
                 selectedPeriod: selectedPeriod,
+                refreshViewInBackground: refreshViewInBackground,
             }));
             return (0, rxjs_1.from)(updateActions);
         }

package/lib/view/expenseAutomationView/expenseAutomationViewSelector.js

@@ -27,12 +27,61 @@ function getExpenseAutomationView(state) {
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { currentSelectedView, selectedPeriodByTenantId, selectedTransactionCategorizationTab, } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
+    let currentSelectedViewFetchState = {
+        fetchState: 'Not-Started',
+        error: undefined,
+    };
+    let currentSelectedViewBackgroundRefreshFetchState = {
+        fetchState: 'Not-Started',
+        error: undefined,
+    };
     const monthEndCloseChecksView = (0, monthEndCloseChecksViewSelector_1.getMonthEndCloseChecksViewByTenantId)(state, currentTenant.tenantId);
     const missingReceipts = (0, missingReceiptsSelector_1.getExpenseAutomationMissingReceiptsView)(state);
     const fluxAnalysis = (0, fluxAnalysisViewSelector_1.getExpenseAutomationFluxAnalysisView)(state);
     const monthEndInsights = (0, companyMonthEndReportViewSelector_1.getCompanyMonthEndReportSelectorView)(state, currentTenant.companyId, loggedInUser);
     const expenseAutomationTransactionsViewState = (0, transactionCategorizationSelector_1.getExpenseAutomationTransactionView)(state, selectedTransactionCategorizationTab);
     const jeSchedules = (0, jeSchedulesViewSelector_1.getExpenseAutomationJESchedulesView)(state);
+    switch (currentSelectedView) {
+        case 'flux_analysis':
+            currentSelectedViewFetchState = fluxAnalysis.fetchStatus;
+            currentSelectedViewBackgroundRefreshFetchState =
+                fluxAnalysis.refreshStatus;
+            break;
+        case 'je_schedules':
+            currentSelectedViewFetchState = {
+                fetchState: jeSchedules.fetchState,
+                error: jeSchedules.error,
+            };
+            currentSelectedViewBackgroundRefreshFetchState =
+                jeSchedules.refreshStatus;
+            break;
+        case 'missing_receipts':
+            currentSelectedViewFetchState = {
+                fetchState: missingReceipts.fetchState,
+                error: missingReceipts.error,
+            };
+            currentSelectedViewBackgroundRefreshFetchState =
+                missingReceipts.refreshStatus;
+            break;
+        case 'transaction_categorization':
+            currentSelectedViewFetchState = {
+                fetchState: expenseAutomationTransactionsViewState.fetchState,
+                error: expenseAutomationTransactionsViewState.error,
+            };
+            currentSelectedViewBackgroundRefreshFetchState =
+                expenseAutomationTransactionsViewState.refreshStatus;
+            break;
+        case 'month_end_insights':
+            currentSelectedViewFetchState = {
+                fetchState: monthEndInsights.fetchState,
+                error: monthEndInsights.error,
+            };
+            currentSelectedViewBackgroundRefreshFetchState = {
+                fetchState: 'Not-Started',
+                error: undefined,
+            };
+            break;
+    }
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
@@ -94,6 +143,8 @@ function getExpenseAutomationView(state) {
         jeSchedules,
         transactionView: expenseAutomationTransactionsViewState,
         missingReceipts,
+        currentSelectedViewFetchState,
+        currentSelectedViewBackgroundRefreshFetchState,
         fluxAnalysis,
         fetchState: reducedFetchStatus.fetchState,
         error: undefined,

package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.d.ts

@@ -15,6 +15,7 @@ export declare const clearExpenseAutomationJESchedulesView: import("@reduxjs/too
     jeSchedules: JEScheduledTransactionPayload[];
     failedJeSchedules: JEScheduledTransactionPayload[];
     selectedPeriod: MonthYearPeriod;
+    refreshViewInBackground: boolean;
 }, string>, fetchJeSchedulesPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
     period: TimePeriod;
     refreshViewInBackground: any;

package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.js

@@ -67,7 +67,7 @@ const expenseAutomationJESchedulesView = (0, toolkit_1.createSlice)({
             },
         },
         fetchJeSchedulesSuccess(draft, action) {
-            const { jeSchedules, selectedPeriod, failedJeSchedules } = action.payload;
+            const { jeSchedules, selectedPeriod, failedJeSchedules, refreshViewInBackground, } = action.payload;
             const jeScheduleTransactionKeys = jeSchedules.map((schedules) => {
                 const transactionID = (0, transactionIDPayload_1.toTransactionID)(schedules.base_transaction);
                 return (0, transactionDetailState_1.getZeniTransactionDetailKey)(transactionID);
@@ -76,7 +76,8 @@ const expenseAutomationJESchedulesView = (0, toolkit_1.createSlice)({
                 const transactionID = (0, transactionIDPayload_1.toTransactionID)(schedules.base_transaction);
                 return (0, transactionDetailState_1.getZeniTransactionDetailKey)(transactionID);
             });
-            if (draft.refreshStatus.fetchState === 'In-Progress') {
+            if (refreshViewInBackground === true &&
+                draft.refreshStatus.fetchState === 'In-Progress') {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
             }
             else {

package/lib/view/expenseAutomationView/selectorTypes/expenseAutomationViewSelectorTypes.d.ts

@@ -32,6 +32,8 @@ export interface ExpenseAutomationViewSelector extends SelectorView {
     monthEndInsights?: CompanyMonthEndReportSelectorView;
     saveStatus: FetchStateAndError;
     updateStatus: FetchStateAndError;
+    currentSelectedViewFetchState: FetchStateAndError;
+    currentSelectedViewBackgroundRefreshFetchState: FetchStateAndError;
     allSteps: ExpenseAutomationStepDetails[];
     completionStatus: CompletionStatusType;
     auditSummary?: MonthEndAuditSummary;

package/package.json

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