@zeniai/client-epic-state 5.0.3-betaRD1 → 5.0.3-betaVR10

package/lib/view/expenseAutomationView/epics/missingReceipts/fetchCompletedTransactionsEpic.js

@@ -15,7 +15,15 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    const cacheKey = (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
+    /**
+     * Snapshot sort config + subTab at request time so success/failure write
+     * into the same cache key the request was made under, even if the user
+     * toggles sort while the request is in flight.
+     */
+    const sortKey = bulkUpload.sortKey;
+    const sortOrder = bulkUpload.sortOrder;
+    const completedSubTab = bulkUpload.completedSubTab;
+    const cacheKey = (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(periodId, sortKey, sortOrder, completedSubTab);
     const existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
     if (isInitialLoad &&
         action.payload.cacheOverride !== true &&
@@ -27,13 +35,13 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
     const queryPayload = {
         start_date: period.start,
         end_date: period.end,
-        sort_by: bulkUpload.sortKey,
-        sort_order: bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc',
+        sort_by: sortKey,
+        sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
-    if (bulkUpload.completedSubTab !== 'all') {
-        queryPayload.match_type = bulkUpload.completedSubTab;
+    if (completedSubTab !== 'all') {
+        queryPayload.match_type = completedSubTab;
     }
     const encodedQuery = encodeURIComponent(JSON.stringify(queryPayload));
     return zeniAPI
@@ -49,17 +57,26 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
                 nextPageToken: response.data.next_page_token,
                 totalCount: response.data.total_count,
                 selectedPeriod,
+                sortKey,
+                sortOrder,
+                completedSubTab,
             }));
             return (0, rxjs_1.from)(updateActions);
         }
         return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchCompletedTransactionsFailure)({
             error: response.status,
             selectedPeriod,
+            sortKey,
+            sortOrder,
+            completedSubTab,
         }));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchCompletedTransactionsFailure)({
         error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch completed transactions errored: ' +
             JSON.stringify(error)),
         selectedPeriod,
+        sortKey,
+        sortOrder,
+        completedSubTab,
     }))));
 }));
 exports.fetchCompletedTransactionsEpic = fetchCompletedTransactionsEpic;

package/lib/view/expenseAutomationView/epics/missingReceipts/watchBulkUploadBatchStatusEpic.d.ts

@@ -4,8 +4,8 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof restoreBulkUploadMatchingState> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof requestMissingReceiptsTabNavigation> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload> | ReturnType<typeof openSnackbar> | ReturnType<typeof bulkUploadAutomatchingTimedOut>;
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof restoreBulkUploadMatchingState> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof requestMissingReceiptsTabNavigation> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload> | ReturnType<typeof openSnackbar> | ReturnType<typeof bulkUploadAutomatchingTimedOut>;
 /**
  * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
  * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.

package/lib/view/expenseAutomationView/epics/missingReceipts/watchBulkUploadBatchStatusEpic.js

@@ -39,9 +39,17 @@ const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.pipe((0
         if (bulk.phase !== 'matching' || bulk.currentBatchId !== batchId) {
             return rxjs_1.EMPTY;
         }
+        /**
+         * Also request the single-batch details directly so the "X out of Y Receipts Matched"
+         * toast still fires when the backend actually completed between the last Pusher ping
+         * and this timeout. If Pusher already tagged the batch as still `processing`,
+         * `fetchBulkUploadBatchDetailsEpic`'s guard will skip the call and we simply rely on
+         * the list refresh to eventually populate details via `fetchMultipleBatchDetailsEpic`.
+         */
         return (0, rxjs_1.from)([
             (0, missingReceiptsViewReducer_1.bulkUploadAutomatchingTimedOut)(batchId),
             (0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)({ cacheOverride: true }),
+            (0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)(),
         ]);
     }), (0, operators_1.takeUntil)((0, rxjs_1.merge)(actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.clearBulkUpload.match)), actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match), (0, operators_1.filter)((a) => a.payload.batchId === batchId &&
         a.payload.status === 'completed')), actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess.match), (0, operators_1.filter)((a) => a.payload.batchId === batchId)))));

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

@@ -101,14 +101,20 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
     pageToken: string | undefined;
     cacheOverride: boolean | undefined;
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactions", never, never>, fetchCompletedTransactionsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    completedSubTab: CompletedSubTab;
     isInitialLoad: boolean;
     nextPageToken: string | null;
     selectedPeriod: MonthYearPeriod;
+    sortKey: BulkUploadSortKey;
+    sortOrder: SortOrder;
     totalCount: number;
     transactionIds: ID[];
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactionsSuccess">, fetchCompletedTransactionsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    completedSubTab: CompletedSubTab;
     error: ZeniAPIStatus;
     selectedPeriod: MonthYearPeriod;
+    sortKey: BulkUploadSortKey;
+    sortOrder: SortOrder;
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactionsFailure">;
 declare const _default: import("redux").Reducer<MissingReceiptsViewState>;
 export default _default;

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

@@ -527,9 +527,9 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
-            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, } = action.payload;
+            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, sortKey, sortOrder, completedSubTab, } = action.payload;
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
-            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, sortKey, sortOrder, completedSubTab);
             if (isInitialLoad) {
                 draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     transactionIds,
@@ -558,7 +558,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod);
-            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, action.payload.sortKey, action.payload.sortOrder, action.payload.completedSubTab);
             const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
             if (existing != null) {
                 existing.fetchState = {

package/package.json

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