@zeniai/client-epic-state 4.17.29 → 4.17.30

package/lib/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js

@@ -32,12 +32,9 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
         companyId == null) {
         throw Error(`Invalid start - ${timePeriodStart} and end - ${timePeriodEnd} period from given ${selectedPeriod}`);
     }
-    const remainingTransactionCategorizationTab = selectedTransactionCategorizationTab === 'review'
-        ? 'autoCategorized'
-        : 'review';
     if (cacheOverride === true) {
         const actions = [];
-        actions.push((0, transactionsViewReducer_1.fetchTransactionCategorizationView)(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground), (0, transactionsViewReducer_1.fetchTransactionCategorizationView)(remainingTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, true), (0, missingReceiptsViewReducer_1.fetchMissingReceipts)({ start: timePeriodStart, end: timePeriodEnd }, {
+        actions.push((0, transactionsViewReducer_1.fetchTransactionCategorizationView)(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground), (0, missingReceiptsViewReducer_1.fetchMissingReceipts)({ start: timePeriodStart, end: timePeriodEnd }, {
             amount: 75.0,
             currencyCode: 'USD',
             currencySymbol: '$',
@@ -84,26 +81,14 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
             reconciliationEnabled) {
             fetchActions.push((0, reconciliationViewReducer_1.fetchReconciliation)(selectedPeriod, undefined, cacheOverride, refreshViewInBackground));
         }
-        const selectedTabTransactionCategorizationViewState = state.expenseAutomationTransactionsViewState
-            .transactionCategorizationView[selectedTransactionCategorizationTab];
-        const remainingTabTransactionCategorizationViewState = state.expenseAutomationTransactionsViewState
-            .transactionCategorizationView[remainingTransactionCategorizationTab];
-        if (selectedTabTransactionCategorizationViewState.fetchState !==
-            'In-Progress' &&
-            (selectedTabTransactionCategorizationViewState.hasValidState() ===
-                false ||
-                selectedTabTransactionCategorizationViewState
-                    .transactionIdsBySelectedPeriod[monthYearPeriodId] == null)) {
+        if (state.expenseAutomationTransactionsViewState
+            .transactionCategorizationView[selectedTransactionCategorizationTab]
+            .fetchState !== 'In-Progress' &&
+            (state.expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab].hasValidState() === false ||
+                state.expenseAutomationTransactionsViewState
+                    .transactionCategorizationView[selectedTransactionCategorizationTab].transactionIdsBySelectedPeriod[monthYearPeriodId] == null)) {
             fetchActions.push((0, transactionsViewReducer_1.fetchTransactionCategorizationView)(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground));
         }
-        if (remainingTabTransactionCategorizationViewState.fetchState !==
-            'In-Progress' &&
-            (remainingTabTransactionCategorizationViewState.hasValidState() ===
-                false ||
-                remainingTabTransactionCategorizationViewState
-                    .transactionIdsBySelectedPeriod[monthYearPeriodId] == null)) {
-            fetchActions.push((0, transactionsViewReducer_1.fetchTransactionCategorizationView)(remainingTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, true));
-        }
         return (0, rxjs_1.from)(fetchActions);
     }
 }));

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.js

@@ -10,16 +10,9 @@ const responsePayload_1 = require("../../../../responsePayload");
 const transactionCategorizationLocalDataHelper_1 = require("../../helpers/transactionCategorizationLocalDataHelper");
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
 const transactionsViewState_1 = require("../../types/transactionsViewState");
-const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorization.match), 
-// Group requests by selectedTab to handle them differently
-(0, operators_1.groupBy)((action) => action.payload.selectedTab), (0, operators_1.mergeMap)((tabGroup$) => tabGroup$.pipe((0, operators_1.switchMap)((action) => {
-    // Processing new request for tab "selectedTab" - will ignore any previous request for this tab
-    return processTransactionCategorizationRequest(action, state$, zeniAPI);
-}))));
-exports.fetchTransactionCategorizationEpic = fetchTransactionCategorizationEpic;
-const processTransactionCategorizationRequest = (action, state$, zeniAPI) => {
+const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorization.match), (0, operators_1.switchMap)((action) => {
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationTransactionsViewState, } = state$.value;
-    const { period, keepExistingListItems, selectedTab, refreshViewInBackground } = action.payload;
+    const { period, keepExistingListItems, selectedTab, refreshViewInBackground, } = action.payload;
     const uiState = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab].uiState;
     const { pageToken, sortOrder, sortKey } = uiState;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state$.value);
@@ -77,4 +70,5 @@ const processTransactionCategorizationRequest = (action, state$, zeniAPI) => {
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'fetch Transaction Categorization REST API call errored out' +
             JSON.stringify(error)),
     }))));
-};
+}));
+exports.fetchTransactionCategorizationEpic = fetchTransactionCategorizationEpic;

package/package.json

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