@zeniai/client-epic-state 4.19.37-betaVR24 → 4.19.37-betaVR26

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchMoreBatchDetailsEpic.js

@@ -6,7 +6,7 @@ import { createZeniAPIStatus } from '../../../../responsePayload';
 import { filterBatchListItemsForBatchDetailsFetch } from '../../payload/missingReceiptsPayload';
 import { fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, } from '../../reducers/missingReceiptsViewReducer';
 import { fetchBatchDetailsByIds } from './fetchMultipleBatchDetailsEpic';
-const MORE_BATCH_PAGE_SIZE = 4;
+const MORE_BATCH_PAGE_SIZE = 1;
 export const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchMoreBatchDetails.match), 
 /** One page at a time — avoids duplicate loads if IO + scroll fallback both fire. */
 exhaustMap(() => {

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchMultipleBatchDetailsEpic.js

@@ -2,8 +2,8 @@ import { EMPTY, concat, from, of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { extractTransactionPayloadsFromBatchFiles, filterBatchListItemsForBatchDetailsFetch, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { batchDetailFetchFailed, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
+import { extractTransactionPayloadsFromBatchFiles, filterBatchListItemsForBatchDetailsFetch, isBatchDetailsApiStatusCompleted, shouldFetchBatchDetailsForBatchId, toBatchDetails, } from '../../payload/missingReceiptsPayload';
+import { batchDetailFetchFailed, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
 const INITIAL_BATCH_PAGE_SIZE = 1;
 export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     if (batchIds.length === 0) {
@@ -38,6 +38,19 @@ export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => acti
     const completedBatchIds = completedBatchesMissingDetails.map((batch) => batch.batchId);
     const batchIdsToFetch = completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE);
     if (batchIdsToFetch.length === 0) {
+        /**
+         * List refresh can complete while no row is `completed` yet (multi-fetch skips), or
+         * `currentBatchId` may not appear in the filtered list but still needs `GET /batches/:id`.
+         * Fall back to the single-batch-details epic so `phase` and details can resolve.
+         */
+        const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+        const currentId = bulkUpload.currentBatchId;
+        if (currentId != null &&
+            bulkUpload.phase === 'matching' &&
+            bulkUpload.batchDetailsById[currentId] == null &&
+            shouldFetchBatchDetailsForBatchId(bulkUpload.batchStatusById, bulkUpload.batchListByPeriod, currentId)) {
+            return of(fetchBulkUploadBatchDetails());
+        }
         return EMPTY;
     }
     return concat(of(setInitialBatchDetailsLoading()), fetchBatchDetailsByIds(batchIdsToFetch, zeniAPI), of(fetchMoreBatchDetailsComplete()));

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

@@ -12,7 +12,10 @@ const FALLBACK_POLL_INTERVAL_MS = 10000;
  * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
  */
 export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.status === 'completed'), debounceTime(300), mergeMap(() => from([
-    fetchBulkUploadBatches(true),
+    fetchBulkUploadBatches({
+        cacheOverride: true,
+        invalidateBatchDetailsCache: true,
+    }),
     requestMissingReceiptsTabNavigation({ tab: 'unmatched' }),
 ])));
 export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), mergeMap((action) => {

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

@@ -186,6 +186,16 @@ const expenseAutomationMissingReceiptsView = createSlice({
         pusherBatchStatusUpdate(draft, action) {
             const batchStatus = action.payload;
             draft.bulkUpload.batchStatusById[batchStatus.batchId] = batchStatus;
+            /**
+             * Auto-matching banner (`phase === 'matching'`) must clear when the server reports this
+             * upload batch is done — otherwise the Missing tab keeps MatchingProgressBanner until
+             * batch-details APIs run; EmailUploadBanner should show again for the next upload.
+             */
+            if (batchStatus.status === 'completed' &&
+                draft.bulkUpload.phase === 'matching' &&
+                draft.bulkUpload.currentBatchId === batchStatus.batchId) {
+                draft.bulkUpload.phase = 'completed';
+            }
         },
         requestMissingReceiptsTabNavigation(draft, action) {
             draft.pendingMissingReceiptsTabNavigation = action.payload.tab;
@@ -263,15 +273,32 @@ const expenseAutomationMissingReceiptsView = createSlice({
             };
         },
         fetchBulkUploadBatches: {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            reducer(draft, _action) {
+            reducer(draft, action) {
+                if (action.payload.invalidateBatchDetailsCache === true) {
+                    draft.bulkUpload.batchDetailsById = {};
+                    draft.bulkUpload.failedBatchDetailIds = [];
+                }
                 draft.bulkUpload.batchListFetchState = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(cacheOverride = false) {
-                return { payload: { cacheOverride } };
+            prepare(input) {
+                if (input === true || input === false) {
+                    return {
+                        payload: {
+                            cacheOverride: input === true,
+                            invalidateBatchDetailsCache: false,
+                        },
+                    };
+                }
+                const o = input ?? {};
+                return {
+                    payload: {
+                        cacheOverride: o.cacheOverride === true,
+                        invalidateBatchDetailsCache: o.invalidateBatchDetailsCache === true,
+                    },
+                };
             },
         },
         fetchBulkUploadBatchesSuccess(draft, action) {
@@ -281,6 +308,20 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 fetchState: 'Completed',
                 error: undefined,
             };
+            /**
+             * When the multi-batch-details epic has nothing to fetch (e.g. list rows not `completed`
+             * yet, or details already present), `phase` can stay `matching` even though we already
+             * have completed details for `currentBatchId` (from polling / Pusher). Sync so the UI can
+             * dismiss the Unmatched skeleton.
+             */
+            const currentId = draft.bulkUpload.currentBatchId;
+            if (draft.bulkUpload.phase === 'matching' &&
+                currentId != null) {
+                const existing = draft.bulkUpload.batchDetailsById[currentId];
+                if (existing?.status === 'completed') {
+                    draft.bulkUpload.phase = 'completed';
+                }
+            }
         },
         fetchBulkUploadBatchesFailure(draft, action) {
             draft.bulkUpload.batchListFetchState = {

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

@@ -3,6 +3,6 @@ import { Observable } from 'rxjs';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { batchDetailFetchFailed, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, setInitialBatchDetailsLoading, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof fetchMoreBatchDetails> | ReturnType<typeof fetchMoreBatchDetailsComplete> | ReturnType<typeof fetchMoreBatchDetailsFailure> | ReturnType<typeof batchDetailFetchFailed> | ReturnType<typeof setInitialBatchDetailsLoading> | ReturnType<typeof storeBatchDetails> | ReturnType<typeof updateTransactions>;
+import { batchDetailFetchFailed, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, setInitialBatchDetailsLoading, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof fetchMoreBatchDetails> | ReturnType<typeof fetchMoreBatchDetailsComplete> | ReturnType<typeof fetchMoreBatchDetailsFailure> | ReturnType<typeof batchDetailFetchFailed> | ReturnType<typeof setInitialBatchDetailsLoading> | ReturnType<typeof storeBatchDetails> | ReturnType<typeof updateTransactions>;
 export declare const fetchMoreBatchDetailsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -9,7 +9,7 @@ const responsePayload_1 = require("../../../../responsePayload");
 const missingReceiptsPayload_1 = require("../../payload/missingReceiptsPayload");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
 const fetchMultipleBatchDetailsEpic_1 = require("./fetchMultipleBatchDetailsEpic");
-const MORE_BATCH_PAGE_SIZE = 4;
+const MORE_BATCH_PAGE_SIZE = 1;
 const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchMoreBatchDetails.match), 
 /** One page at a time — avoids duplicate loads if IO + scroll fallback both fire. */
 (0, operators_1.exhaustMap)(() => {

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

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { batchDetailFetchFailed, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof updateTransactions> | ReturnType<typeof storeBatchDetails> | ReturnType<typeof batchDetailFetchFailed> | ReturnType<typeof setInitialBatchDetailsLoading> | ReturnType<typeof fetchMoreBatchDetailsComplete>;
+import { batchDetailFetchFailed, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof updateTransactions> | ReturnType<typeof storeBatchDetails> | ReturnType<typeof batchDetailFetchFailed> | ReturnType<typeof setInitialBatchDetailsLoading> | ReturnType<typeof fetchMoreBatchDetailsComplete>;
 export declare function fetchBatchDetailsByIds(batchIds: string[], zeniAPI: ZeniAPI): Observable<ActionType>;
 export declare const fetchMultipleBatchDetailsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -42,6 +42,19 @@ const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pi
     const completedBatchIds = completedBatchesMissingDetails.map((batch) => batch.batchId);
     const batchIdsToFetch = completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE);
     if (batchIdsToFetch.length === 0) {
+        /**
+         * List refresh can complete while no row is `completed` yet (multi-fetch skips), or
+         * `currentBatchId` may not appear in the filtered list but still needs `GET /batches/:id`.
+         * Fall back to the single-batch-details epic so `phase` and details can resolve.
+         */
+        const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+        const currentId = bulkUpload.currentBatchId;
+        if (currentId != null &&
+            bulkUpload.phase === 'matching' &&
+            bulkUpload.batchDetailsById[currentId] == null &&
+            (0, missingReceiptsPayload_1.shouldFetchBatchDetailsForBatchId)(bulkUpload.batchStatusById, bulkUpload.batchListByPeriod, currentId)) {
+            return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)());
+        }
         return rxjs_1.EMPTY;
     }
     return (0, rxjs_1.concat)((0, rxjs_1.of)((0, missingReceiptsViewReducer_1.setInitialBatchDetailsLoading)()), fetchBatchDetailsByIds(batchIdsToFetch, zeniAPI), (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsComplete)()));

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

@@ -15,7 +15,10 @@ const FALLBACK_POLL_INTERVAL_MS = 10000;
  * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
  */
 const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match), (0, operators_1.filter)((action) => action.payload.status === 'completed'), (0, operators_1.debounceTime)(300), (0, operators_1.mergeMap)(() => (0, rxjs_1.from)([
-    (0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)(true),
+    (0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)({
+        cacheOverride: true,
+        invalidateBatchDetailsCache: true,
+    }),
     (0, missingReceiptsViewReducer_1.requestMissingReceiptsTabNavigation)({ tab: 'unmatched' }),
 ])));
 exports.pusherBatchStatusCompletionEpic = pusherBatchStatusCompletionEpic;

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

@@ -44,8 +44,12 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
     batchId: ID;
 }, "expenseAutomationMissingReceiptsView/batchDetailFetchFailed">, setInitialBatchDetailsLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/setInitialBatchDetailsLoading">, fetchMoreBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchMoreBatchDetails">, fetchMoreBatchDetailsComplete: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchMoreBatchDetailsComplete">, fetchMoreBatchDetailsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
-}, "expenseAutomationMissingReceiptsView/fetchMoreBatchDetailsFailure">, fetchBulkUploadBatches: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
-    cacheOverride: any;
+}, "expenseAutomationMissingReceiptsView/fetchMoreBatchDetailsFailure">, fetchBulkUploadBatches: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[input?: boolean | {
+    cacheOverride?: boolean;
+    invalidateBatchDetailsCache?: boolean;
+} | undefined], {
+    cacheOverride: boolean;
+    invalidateBatchDetailsCache: boolean;
 }, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatches", never, never>, fetchBulkUploadBatchesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     batchList: BatchListItem[];
     selectedPeriod: MonthYearPeriod;

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

@@ -191,6 +191,16 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         pusherBatchStatusUpdate(draft, action) {
             const batchStatus = action.payload;
             draft.bulkUpload.batchStatusById[batchStatus.batchId] = batchStatus;
+            /**
+             * Auto-matching banner (`phase === 'matching'`) must clear when the server reports this
+             * upload batch is done — otherwise the Missing tab keeps MatchingProgressBanner until
+             * batch-details APIs run; EmailUploadBanner should show again for the next upload.
+             */
+            if (batchStatus.status === 'completed' &&
+                draft.bulkUpload.phase === 'matching' &&
+                draft.bulkUpload.currentBatchId === batchStatus.batchId) {
+                draft.bulkUpload.phase = 'completed';
+            }
         },
         requestMissingReceiptsTabNavigation(draft, action) {
             draft.pendingMissingReceiptsTabNavigation = action.payload.tab;
@@ -268,15 +278,32 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
             };
         },
         fetchBulkUploadBatches: {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            reducer(draft, _action) {
+            reducer(draft, action) {
+                if (action.payload.invalidateBatchDetailsCache === true) {
+                    draft.bulkUpload.batchDetailsById = {};
+                    draft.bulkUpload.failedBatchDetailIds = [];
+                }
                 draft.bulkUpload.batchListFetchState = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(cacheOverride = false) {
-                return { payload: { cacheOverride } };
+            prepare(input) {
+                if (input === true || input === false) {
+                    return {
+                        payload: {
+                            cacheOverride: input === true,
+                            invalidateBatchDetailsCache: false,
+                        },
+                    };
+                }
+                const o = input ?? {};
+                return {
+                    payload: {
+                        cacheOverride: o.cacheOverride === true,
+                        invalidateBatchDetailsCache: o.invalidateBatchDetailsCache === true,
+                    },
+                };
             },
         },
         fetchBulkUploadBatchesSuccess(draft, action) {
@@ -286,6 +313,20 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                 fetchState: 'Completed',
                 error: undefined,
             };
+            /**
+             * When the multi-batch-details epic has nothing to fetch (e.g. list rows not `completed`
+             * yet, or details already present), `phase` can stay `matching` even though we already
+             * have completed details for `currentBatchId` (from polling / Pusher). Sync so the UI can
+             * dismiss the Unmatched skeleton.
+             */
+            const currentId = draft.bulkUpload.currentBatchId;
+            if (draft.bulkUpload.phase === 'matching' &&
+                currentId != null) {
+                const existing = draft.bulkUpload.batchDetailsById[currentId];
+                if (existing?.status === 'completed') {
+                    draft.bulkUpload.phase = 'completed';
+                }
+            }
         },
         fetchBulkUploadBatchesFailure(draft, action) {
             draft.bulkUpload.batchListFetchState = {

package/package.json

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