@zeniai/client-epic-state 5.1.18-betaRD2 → 5.1.18-betaRD4

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

@@ -1,4 +1,4 @@
-import { from, of } from 'rxjs';
+import { EMPTY, from, of } from 'rxjs';
 import { catchError, filter, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { toString } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
@@ -16,6 +16,7 @@ groupBy((action) => action.payload.selectedTab), mergeMap((group$) => group$.pip
     const { period, keepExistingListItems, selectedTab, refreshViewInBackground, } = action.payload;
     const uiState = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab].uiState;
     const { pageToken, sortOrder, sortKey } = uiState;
+    const requestSearchString = uiState.searchString;
     const currentTenant = getCurrentTenant(state$.value);
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const queryParam = {
@@ -38,6 +39,19 @@ groupBy((action) => action.payload.selectedTab), mergeMap((group$) => group$.pip
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe(mergeMap((response) => {
+        // Stale-response guard: if search was cleared while this
+        // request was in-flight (restoreFullDatasetSnapshot ran),
+        // discard results and errors to avoid overwriting the restored
+        // IDs/counts or marking the tab as Error. Covers both the
+        // success and failure branches. switchMap only cancels on a new
+        // fetchTransactionCategorization for the same tab; restore
+        // doesn't dispatch one, so we guard here instead.
+        const currentSearchString = state$.value.expenseAutomationTransactionsViewState
+            .transactionCategorizationView[selectedTab].uiState
+            .searchString;
+        if (currentSearchString !== requestSearchString) {
+            return EMPTY;
+        }
         if (isSuccessResponse(response) && response.data != null) {
             const updateActions = [];
             updateActions.push(updateTransactions(response.data.transactions, (value) => value.transaction_id, 'merge'));
@@ -89,10 +103,18 @@ groupBy((action) => action.payload.selectedTab), mergeMap((group$) => group$.pip
                 status: response.status,
             }));
         }
-    }), catchError((error) => of(fetchTransactionCategorizationFailure({
-        selectedPeriod,
-        selectedTab,
-        status: createZeniAPIStatus('Unexpected Error', 'fetch Transaction Categorization REST API call errored out' +
-            JSON.stringify(error)),
-    }))));
+    }), catchError((error) => {
+        const currentSearchString = state$.value.expenseAutomationTransactionsViewState
+            .transactionCategorizationView[selectedTab].uiState
+            .searchString;
+        if (currentSearchString !== requestSearchString) {
+            return EMPTY;
+        }
+        return of(fetchTransactionCategorizationFailure({
+            selectedPeriod,
+            selectedTab,
+            status: createZeniAPIStatus('Unexpected Error', 'fetch Transaction Categorization REST API call errored out' +
+                JSON.stringify(error)),
+        }));
+    }));
 }))));

package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js

@@ -744,6 +744,10 @@ const expenseAutomationTransactionsView = createSlice({
                 '';
             draft.transactionCategorizationView[selectedTab].uiState.pageToken = null;
             draft.transactionCategorizationView[selectedTab].fetchState = 'Completed';
+            draft.transactionCategorizationView[selectedTab].refreshStatus = {
+                fetchState: 'Not-Started',
+                error: undefined,
+            };
             draft.transactionCategorizationView[selectedTab].error = undefined;
             draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot =
                 undefined;

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

@@ -19,6 +19,7 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
     const { period, keepExistingListItems, selectedTab, refreshViewInBackground, } = action.payload;
     const uiState = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab].uiState;
     const { pageToken, sortOrder, sortKey } = uiState;
+    const requestSearchString = uiState.searchString;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state$.value);
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const queryParam = {
@@ -41,6 +42,19 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
+        // Stale-response guard: if search was cleared while this
+        // request was in-flight (restoreFullDatasetSnapshot ran),
+        // discard results and errors to avoid overwriting the restored
+        // IDs/counts or marking the tab as Error. Covers both the
+        // success and failure branches. switchMap only cancels on a new
+        // fetchTransactionCategorization for the same tab; restore
+        // doesn't dispatch one, so we guard here instead.
+        const currentSearchString = state$.value.expenseAutomationTransactionsViewState
+            .transactionCategorizationView[selectedTab].uiState
+            .searchString;
+        if (currentSearchString !== requestSearchString) {
+            return rxjs_1.EMPTY;
+        }
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [];
             updateActions.push((0, transactionReducer_1.updateTransactions)(response.data.transactions, (value) => value.transaction_id, 'merge'));
@@ -92,11 +106,19 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
                 status: response.status,
             }));
         }
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, transactionsViewReducer_1.fetchTransactionCategorizationFailure)({
-        selectedPeriod,
-        selectedTab,
-        status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'fetch Transaction Categorization REST API call errored out' +
-            JSON.stringify(error)),
-    }))));
+    }), (0, operators_1.catchError)((error) => {
+        const currentSearchString = state$.value.expenseAutomationTransactionsViewState
+            .transactionCategorizationView[selectedTab].uiState
+            .searchString;
+        if (currentSearchString !== requestSearchString) {
+            return rxjs_1.EMPTY;
+        }
+        return (0, rxjs_1.of)((0, transactionsViewReducer_1.fetchTransactionCategorizationFailure)({
+            selectedPeriod,
+            selectedTab,
+            status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'fetch Transaction Categorization REST API call errored out' +
+                JSON.stringify(error)),
+        }));
+    }));
 }))));
 exports.fetchTransactionCategorizationEpic = fetchTransactionCategorizationEpic;

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

@@ -751,6 +751,10 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 '';
             draft.transactionCategorizationView[selectedTab].uiState.pageToken = null;
             draft.transactionCategorizationView[selectedTab].fetchState = 'Completed';
+            draft.transactionCategorizationView[selectedTab].refreshStatus = {
+                fetchState: 'Not-Started',
+                error: undefined,
+            };
             draft.transactionCategorizationView[selectedTab].error = undefined;
             draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot =
                 undefined;

package/package.json

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