@zeniai/client-epic-state 4.19.37-betaVR11 → 4.19.37-betaVR12

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

@@ -16,9 +16,11 @@ export const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$
     }
     const periodId = toMonthYearPeriodId(selectedPeriod);
     const batchList = bulkUpload.batchListByPeriod[periodId] ?? [];
+    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
     const unfetchedBatchIds = batchList
         .filter((batch) => batch.status === 'completed' &&
-        bulkUpload.batchDetailsById[batch.batchId] == null)
+        bulkUpload.batchDetailsById[batch.batchId] == null &&
+        !failedIds.has(batch.batchId))
         .map((batch) => batch.batchId);
     if (unfetchedBatchIds.length === 0) {
         return of(fetchMoreBatchDetailsComplete());

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

@@ -1,9 +1,9 @@
-import { EMPTY, from } from 'rxjs';
+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, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { fetchBulkUploadBatchesSuccess, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
+import { batchDetailFetchFailed, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
 const INITIAL_BATCH_PAGE_SIZE = 4;
 export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     if (batchIds.length === 0) {
@@ -25,7 +25,7 @@ export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     }), catchError((error) => {
         console.error(`Failed to fetch batch details for ${batchId}:`, createZeniAPIStatus('Unexpected Error', 'Fetch batch details errored out: ' +
             JSON.stringify(error)));
-        return EMPTY;
+        return of(batchDetailFetchFailed({ batchId }));
     })), 5));
 }
 export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatchesSuccess.match), mergeMap((action) => {
@@ -35,5 +35,9 @@ export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => acti
         .filter((batch) => batch.status === 'completed' &&
         batchDetailsById[batch.batchId] == null)
         .map((batch) => batch.batchId);
-    return fetchBatchDetailsByIds(completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE), zeniAPI);
+    const batchIdsToFetch = completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE);
+    if (batchIdsToFetch.length === 0) {
+        return EMPTY;
+    }
+    return concat(of(setInitialBatchDetailsLoading()), fetchBatchDetailsByIds(batchIdsToFetch, zeniAPI), of(fetchMoreBatchDetailsComplete()));
 }));

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

@@ -1,47 +1,35 @@
-import { of, timer } from 'rxjs';
+import { from, of, timer } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap, takeUntil, takeWhile, } from 'rxjs/operators';
-import { convertToPeriod } from '../../../../commonStateTypes/timePeriod';
-import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { isSuccessResponse } from '../../../../responsePayload';
-import { toBatchListItem, } from '../../payload/missingReceiptsPayload';
-import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, pusherBatchStatusUpdate, } from '../../reducers/missingReceiptsViewReducer';
+import { extractTransactionPayloadsFromBatchFiles, toBatchDetails, } from '../../payload/missingReceiptsPayload';
+import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, } from '../../reducers/missingReceiptsViewReducer';
 export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.status === 'completed'), mergeMap(() => of(fetchBulkUploadBatchDetails())));
 const FALLBACK_POLL_INTERVAL_MS = 10000;
-export const pollBulkUploadBatchStatusEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), switchMap((action) => {
+export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), switchMap((action) => {
     const { batchId } = action.payload;
     return timer(0, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(actions$.pipe(filter((a) => clearBulkUpload.match(a) ||
         (pusherBatchStatusUpdate.match(a) &&
             a.payload.status === 'completed')))), switchMap(() => {
-        const state = state$.value;
-        const { expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
-        const currentTenant = getCurrentTenant(state);
-        const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-        const period = convertToPeriod(selectedPeriod);
-        const queryParam = {
-            start_date: period.start,
-            end_date: period.end,
-            sort_order: 'desc',
-        };
         return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+            .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
             .pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
-                const batchList = response.data.batches.map(toBatchListItem);
-                const currentBatch = batchList.find((b) => b.batchId === batchId);
-                if (currentBatch?.status === 'completed') {
-                    return [
-                        fetchBulkUploadBatchesSuccess({
-                            batchList,
-                            selectedPeriod,
-                        }),
-                        fetchBulkUploadBatchDetails(),
-                    ];
+                if (response.data.status === 'completed') {
+                    const actions = [];
+                    const transactionPayloads = extractTransactionPayloadsFromBatchFiles(response.data.files);
+                    if (transactionPayloads.length > 0) {
+                        actions.push(updateTransactions(transactionPayloads, (value) => value.transaction_id));
+                    }
+                    actions.push(fetchBulkUploadBatchDetailsSuccess(toBatchDetails(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
+                    actions.push(fetchBulkUploadBatches(true));
+                    return from(actions);
                 }
             }
             return [];
         }), catchError(() => of()));
     }), takeWhile((emittedAction) => {
-        if (fetchBulkUploadBatchDetails.match(emittedAction)) {
+        if (fetchBulkUploadBatchDetailsSuccess.match(emittedAction)) {
             return false;
         }
         return true;

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

@@ -11,6 +11,7 @@ export const initialBulkUploadState = {
     confirmMatchStatus: { fetchState: 'Not-Started', error: undefined },
     currentBatchId: undefined,
     currentResultsTab: 'unmatched',
+    failedBatchDetailIds: [],
     manualSearch: {
         fetchState: { fetchState: 'Not-Started', error: undefined },
         results: [],
@@ -197,6 +198,18 @@ const expenseAutomationMissingReceiptsView = createSlice({
             const details = action.payload;
             draft.bulkUpload.batchDetailsById[details.batchId] = details;
         },
+        batchDetailFetchFailed(draft, action) {
+            const { batchId } = action.payload;
+            if (!draft.bulkUpload.failedBatchDetailIds.includes(batchId)) {
+                draft.bulkUpload.failedBatchDetailIds.push(batchId);
+            }
+        },
+        setInitialBatchDetailsLoading(draft) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         fetchMoreBatchDetails(_draft) {
             _draft.bulkUpload.batchDetailsPaginationState = {
@@ -399,7 +412,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
 });
 export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, 
 // Bulk Upload
-bulkUploadReceipts, updateBulkUploadProgress, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, pusherBatchStatusUpdate, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, 
+bulkUploadReceipts, updateBulkUploadProgress, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, pusherBatchStatusUpdate, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, batchDetailFetchFailed, setInitialBatchDetailsLoading, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, 
 // Completed Transactions
 fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, } = expenseAutomationMissingReceiptsView.actions;
 export default expenseAutomationMissingReceiptsView.reducer;

package/lib/esm/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -59,8 +59,10 @@ export function getExpenseAutomationMissingReceiptsView(state) {
     const currentBatchDetails = effectiveCurrentBatchId != null
         ? bulkUpload.batchDetailsById[effectiveCurrentBatchId]
         : undefined;
-    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, transactionState));
-    const hasMoreBatchDetails = completedBatchesSorted.some((b) => bulkUpload.batchDetailsById[b.batchId] == null);
+    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, currentBatchDetails.batchId, transactionState));
+    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
+    const hasMoreBatchDetails = completedBatchesSorted.some((b) => bulkUpload.batchDetailsById[b.batchId] == null &&
+        !failedIds.has(b.batchId));
     const getSortValue = (file) => {
         const t = file.matchedTransaction;
         if (t == null) {
@@ -107,7 +109,7 @@ export function getExpenseAutomationMissingReceiptsView(state) {
         }
         return details.files
             .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
-            .map((f) => resolveBatchFile(f, transactionState));
+            .map((f) => resolveBatchFile(f, b.batchId, transactionState));
     });
     const completedTransactionsForPeriod = monthYearPeriodId != null
         ? bulkUpload.completedTransactionsByPeriod[monthYearPeriodId]
@@ -164,7 +166,7 @@ export function getExpenseAutomationMissingReceiptsView(state) {
         },
     };
 }
-function resolveBatchFile(file, transactionState) {
+function resolveBatchFile(file, batchId, transactionState) {
     const matchedTransaction = file.matchedTransactionId != null
         ? getSupportedTransactionById(transactionState, file.matchedTransactionId)
         : undefined;
@@ -178,6 +180,7 @@ function resolveBatchFile(file, transactionState) {
         .filter((c) => c != null);
     return {
         attachmentId: file.attachmentId,
+        batchId,
         fileDownloadUrl: file.fileDownloadUrl,
         fileId: file.fileId,
         filename: file.filename,

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 { fetchBulkUploadBatchesSuccess, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof fetchMoreBatchDetails> | ReturnType<typeof fetchMoreBatchDetailsComplete> | ReturnType<typeof fetchMoreBatchDetailsFailure> | ReturnType<typeof storeBatchDetails> | ReturnType<typeof updateTransactions>;
+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>;
 export declare const fetchMoreBatchDetailsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -19,9 +19,11 @@ const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((
     }
     const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
     const batchList = bulkUpload.batchListByPeriod[periodId] ?? [];
+    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
     const unfetchedBatchIds = batchList
         .filter((batch) => batch.status === 'completed' &&
-        bulkUpload.batchDetailsById[batch.batchId] == null)
+        bulkUpload.batchDetailsById[batch.batchId] == null &&
+        !failedIds.has(batch.batchId))
         .map((batch) => batch.batchId);
     if (unfetchedBatchIds.length === 0) {
         return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsComplete)());

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 { fetchBulkUploadBatchesSuccess, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof updateTransactions> | ReturnType<typeof storeBatchDetails>;
+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>;
 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

@@ -29,7 +29,7 @@ function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     }), (0, operators_1.catchError)((error) => {
         console.error(`Failed to fetch batch details for ${batchId}:`, (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch batch details errored out: ' +
             JSON.stringify(error)));
-        return rxjs_1.EMPTY;
+        return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.batchDetailFetchFailed)({ batchId }));
     })), 5));
 }
 const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchBulkUploadBatchesSuccess.match), (0, operators_1.mergeMap)((action) => {
@@ -39,6 +39,10 @@ const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pi
         .filter((batch) => batch.status === 'completed' &&
         batchDetailsById[batch.batchId] == null)
         .map((batch) => batch.batchId);
-    return fetchBatchDetailsByIds(completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE), zeniAPI);
+    const batchIdsToFetch = completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE);
+    if (batchIdsToFetch.length === 0) {
+        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)()));
 }));
 exports.fetchMultipleBatchDetailsEpic = fetchMultipleBatchDetailsEpic;

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

@@ -1,8 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
+import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, pusherBatchStatusUpdate } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof clearBulkUpload>;
+import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload>;
 export declare const pusherBatchStatusCompletionEpic: (actions$: ActionsObservable<ActionType>) => Observable<ActionType>;
-export declare const pollBulkUploadBatchStatusEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const pollBulkUploadBatchStatusEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,49 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pollBulkUploadBatchStatusEpic = exports.pusherBatchStatusCompletionEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
+const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const missingReceiptsPayload_1 = require("../../payload/missingReceiptsPayload");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
 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.mergeMap)(() => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)())));
 exports.pusherBatchStatusCompletionEpic = pusherBatchStatusCompletionEpic;
 const FALLBACK_POLL_INTERVAL_MS = 10000;
-const pollBulkUploadBatchStatusEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.bulkUploadReceiptsSuccess.match), (0, operators_1.switchMap)((action) => {
+const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.bulkUploadReceiptsSuccess.match), (0, operators_1.switchMap)((action) => {
     const { batchId } = action.payload;
     return (0, rxjs_1.timer)(0, FALLBACK_POLL_INTERVAL_MS).pipe((0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)((a) => missingReceiptsViewReducer_1.clearBulkUpload.match(a) ||
         (missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match(a) &&
             a.payload.status === 'completed')))), (0, operators_1.switchMap)(() => {
-        const state = state$.value;
-        const { expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
-        const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
-        const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-        const period = (0, timePeriod_1.convertToPeriod)(selectedPeriod);
-        const queryParam = {
-            start_date: period.start,
-            end_date: period.end,
-            sort_order: 'desc',
-        };
         return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+            .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-                const batchList = response.data.batches.map(missingReceiptsPayload_1.toBatchListItem);
-                const currentBatch = batchList.find((b) => b.batchId === batchId);
-                if (currentBatch?.status === 'completed') {
-                    return [
-                        (0, missingReceiptsViewReducer_1.fetchBulkUploadBatchesSuccess)({
-                            batchList,
-                            selectedPeriod,
-                        }),
-                        (0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)(),
-                    ];
+                if (response.data.status === 'completed') {
+                    const actions = [];
+                    const transactionPayloads = (0, missingReceiptsPayload_1.extractTransactionPayloadsFromBatchFiles)(response.data.files);
+                    if (transactionPayloads.length > 0) {
+                        actions.push((0, transactionReducer_1.updateTransactions)(transactionPayloads, (value) => value.transaction_id));
+                    }
+                    actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess)((0, missingReceiptsPayload_1.toBatchDetails)(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
+                    actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)(true));
+                    return (0, rxjs_1.from)(actions);
                 }
             }
             return [];
         }), (0, operators_1.catchError)(() => (0, rxjs_1.of)()));
     }), (0, operators_1.takeWhile)((emittedAction) => {
-        if (missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails.match(emittedAction)) {
+        if (missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess.match(emittedAction)) {
             return false;
         }
         return true;

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

@@ -36,7 +36,9 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
     error: ZeniAPIStatus;
 }, "expenseAutomationMissingReceiptsView/bulkUploadReceiptsFailure">, pusherBatchStatusUpdate: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchStatus, "expenseAutomationMissingReceiptsView/pusherBatchStatusUpdate">, fetchBulkUploadBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetails">, fetchBulkUploadBatchDetailsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchDetails, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetailsSuccess">, fetchBulkUploadBatchDetailsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
-}, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetailsFailure">, storeBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchDetails, "expenseAutomationMissingReceiptsView/storeBatchDetails">, fetchMoreBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchMoreBatchDetails">, fetchMoreBatchDetailsComplete: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchMoreBatchDetailsComplete">, fetchMoreBatchDetailsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetailsFailure">, storeBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchDetails, "expenseAutomationMissingReceiptsView/storeBatchDetails">, batchDetailFetchFailed: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    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;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchCompletedTransactionsFailure = exports.fetchCompletedTransactionsSuccess = exports.fetchCompletedTransactions = exports.clearManualSearchResults = exports.searchTransactionsForManualMatchFailure = exports.searchTransactionsForManualMatchSuccess = exports.searchTransactionsForManualMatch = exports.clearBulkUpload = exports.setBulkUploadSortConfig = exports.setBulkUploadCompletedSubTab = exports.setBulkUploadResultsTab = exports.confirmBulkUploadMatchFailure = exports.confirmBulkUploadMatchSuccess = exports.confirmBulkUploadMatch = exports.fetchBulkUploadBatchesFailure = exports.fetchBulkUploadBatchesSuccess = exports.fetchBulkUploadBatches = exports.fetchMoreBatchDetailsFailure = exports.fetchMoreBatchDetailsComplete = exports.fetchMoreBatchDetails = exports.storeBatchDetails = exports.fetchBulkUploadBatchDetailsFailure = exports.fetchBulkUploadBatchDetailsSuccess = exports.fetchBulkUploadBatchDetails = exports.pusherBatchStatusUpdate = exports.bulkUploadReceiptsFailure = exports.bulkUploadReceiptsSuccess = exports.updateBulkUploadProgress = exports.bulkUploadReceipts = exports.clearExpenseAutomationMissingReceiptsView = exports.markMissingReceiptAsDone = exports.updateMissingReceiptsUIState = exports.updateMissingReceiptUploadState = exports.uploadMissingReceiptSuccess = exports.fetchMissingReceiptsFailure = exports.fetchMissingReceiptsSuccess = exports.fetchMissingReceipts = exports.initialState = exports.initialBulkUploadState = void 0;
+exports.fetchCompletedTransactionsFailure = exports.fetchCompletedTransactionsSuccess = exports.fetchCompletedTransactions = exports.clearManualSearchResults = exports.searchTransactionsForManualMatchFailure = exports.searchTransactionsForManualMatchSuccess = exports.searchTransactionsForManualMatch = exports.clearBulkUpload = exports.setBulkUploadSortConfig = exports.setBulkUploadCompletedSubTab = exports.setBulkUploadResultsTab = exports.confirmBulkUploadMatchFailure = exports.confirmBulkUploadMatchSuccess = exports.confirmBulkUploadMatch = exports.fetchBulkUploadBatchesFailure = exports.fetchBulkUploadBatchesSuccess = exports.fetchBulkUploadBatches = exports.fetchMoreBatchDetailsFailure = exports.fetchMoreBatchDetailsComplete = exports.fetchMoreBatchDetails = exports.setInitialBatchDetailsLoading = exports.batchDetailFetchFailed = exports.storeBatchDetails = exports.fetchBulkUploadBatchDetailsFailure = exports.fetchBulkUploadBatchDetailsSuccess = exports.fetchBulkUploadBatchDetails = exports.pusherBatchStatusUpdate = exports.bulkUploadReceiptsFailure = exports.bulkUploadReceiptsSuccess = exports.updateBulkUploadProgress = exports.bulkUploadReceipts = exports.clearExpenseAutomationMissingReceiptsView = exports.markMissingReceiptAsDone = exports.updateMissingReceiptsUIState = exports.updateMissingReceiptUploadState = exports.uploadMissingReceiptSuccess = exports.fetchMissingReceiptsFailure = exports.fetchMissingReceiptsSuccess = exports.fetchMissingReceipts = exports.initialState = exports.initialBulkUploadState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 exports.initialBulkUploadState = {
@@ -15,6 +15,7 @@ exports.initialBulkUploadState = {
     confirmMatchStatus: { fetchState: 'Not-Started', error: undefined },
     currentBatchId: undefined,
     currentResultsTab: 'unmatched',
+    failedBatchDetailIds: [],
     manualSearch: {
         fetchState: { fetchState: 'Not-Started', error: undefined },
         results: [],
@@ -201,6 +202,18 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
             const details = action.payload;
             draft.bulkUpload.batchDetailsById[details.batchId] = details;
         },
+        batchDetailFetchFailed(draft, action) {
+            const { batchId } = action.payload;
+            if (!draft.bulkUpload.failedBatchDetailIds.includes(batchId)) {
+                draft.bulkUpload.failedBatchDetailIds.push(batchId);
+            }
+        },
+        setInitialBatchDetailsLoading(draft) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         fetchMoreBatchDetails(_draft) {
             _draft.bulkUpload.batchDetailsPaginationState = {
@@ -403,7 +416,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
 });
 _a = expenseAutomationMissingReceiptsView.actions, exports.fetchMissingReceipts = _a.fetchMissingReceipts, exports.fetchMissingReceiptsSuccess = _a.fetchMissingReceiptsSuccess, exports.fetchMissingReceiptsFailure = _a.fetchMissingReceiptsFailure, exports.uploadMissingReceiptSuccess = _a.uploadMissingReceiptSuccess, exports.updateMissingReceiptUploadState = _a.updateMissingReceiptUploadState, exports.updateMissingReceiptsUIState = _a.updateMissingReceiptsUIState, exports.markMissingReceiptAsDone = _a.markMissingReceiptAsDone, exports.clearExpenseAutomationMissingReceiptsView = _a.clearExpenseAutomationMissingReceiptsView, 
 // Bulk Upload
-exports.bulkUploadReceipts = _a.bulkUploadReceipts, exports.updateBulkUploadProgress = _a.updateBulkUploadProgress, exports.bulkUploadReceiptsSuccess = _a.bulkUploadReceiptsSuccess, exports.bulkUploadReceiptsFailure = _a.bulkUploadReceiptsFailure, exports.pusherBatchStatusUpdate = _a.pusherBatchStatusUpdate, exports.fetchBulkUploadBatchDetails = _a.fetchBulkUploadBatchDetails, exports.fetchBulkUploadBatchDetailsSuccess = _a.fetchBulkUploadBatchDetailsSuccess, exports.fetchBulkUploadBatchDetailsFailure = _a.fetchBulkUploadBatchDetailsFailure, exports.storeBatchDetails = _a.storeBatchDetails, exports.fetchMoreBatchDetails = _a.fetchMoreBatchDetails, exports.fetchMoreBatchDetailsComplete = _a.fetchMoreBatchDetailsComplete, exports.fetchMoreBatchDetailsFailure = _a.fetchMoreBatchDetailsFailure, exports.fetchBulkUploadBatches = _a.fetchBulkUploadBatches, exports.fetchBulkUploadBatchesSuccess = _a.fetchBulkUploadBatchesSuccess, exports.fetchBulkUploadBatchesFailure = _a.fetchBulkUploadBatchesFailure, exports.confirmBulkUploadMatch = _a.confirmBulkUploadMatch, exports.confirmBulkUploadMatchSuccess = _a.confirmBulkUploadMatchSuccess, exports.confirmBulkUploadMatchFailure = _a.confirmBulkUploadMatchFailure, exports.setBulkUploadResultsTab = _a.setBulkUploadResultsTab, exports.setBulkUploadCompletedSubTab = _a.setBulkUploadCompletedSubTab, exports.setBulkUploadSortConfig = _a.setBulkUploadSortConfig, exports.clearBulkUpload = _a.clearBulkUpload, exports.searchTransactionsForManualMatch = _a.searchTransactionsForManualMatch, exports.searchTransactionsForManualMatchSuccess = _a.searchTransactionsForManualMatchSuccess, exports.searchTransactionsForManualMatchFailure = _a.searchTransactionsForManualMatchFailure, exports.clearManualSearchResults = _a.clearManualSearchResults, 
+exports.bulkUploadReceipts = _a.bulkUploadReceipts, exports.updateBulkUploadProgress = _a.updateBulkUploadProgress, exports.bulkUploadReceiptsSuccess = _a.bulkUploadReceiptsSuccess, exports.bulkUploadReceiptsFailure = _a.bulkUploadReceiptsFailure, exports.pusherBatchStatusUpdate = _a.pusherBatchStatusUpdate, exports.fetchBulkUploadBatchDetails = _a.fetchBulkUploadBatchDetails, exports.fetchBulkUploadBatchDetailsSuccess = _a.fetchBulkUploadBatchDetailsSuccess, exports.fetchBulkUploadBatchDetailsFailure = _a.fetchBulkUploadBatchDetailsFailure, exports.storeBatchDetails = _a.storeBatchDetails, exports.batchDetailFetchFailed = _a.batchDetailFetchFailed, exports.setInitialBatchDetailsLoading = _a.setInitialBatchDetailsLoading, exports.fetchMoreBatchDetails = _a.fetchMoreBatchDetails, exports.fetchMoreBatchDetailsComplete = _a.fetchMoreBatchDetailsComplete, exports.fetchMoreBatchDetailsFailure = _a.fetchMoreBatchDetailsFailure, exports.fetchBulkUploadBatches = _a.fetchBulkUploadBatches, exports.fetchBulkUploadBatchesSuccess = _a.fetchBulkUploadBatchesSuccess, exports.fetchBulkUploadBatchesFailure = _a.fetchBulkUploadBatchesFailure, exports.confirmBulkUploadMatch = _a.confirmBulkUploadMatch, exports.confirmBulkUploadMatchSuccess = _a.confirmBulkUploadMatchSuccess, exports.confirmBulkUploadMatchFailure = _a.confirmBulkUploadMatchFailure, exports.setBulkUploadResultsTab = _a.setBulkUploadResultsTab, exports.setBulkUploadCompletedSubTab = _a.setBulkUploadCompletedSubTab, exports.setBulkUploadSortConfig = _a.setBulkUploadSortConfig, exports.clearBulkUpload = _a.clearBulkUpload, exports.searchTransactionsForManualMatch = _a.searchTransactionsForManualMatch, exports.searchTransactionsForManualMatchSuccess = _a.searchTransactionsForManualMatchSuccess, exports.searchTransactionsForManualMatchFailure = _a.searchTransactionsForManualMatchFailure, exports.clearManualSearchResults = _a.clearManualSearchResults, 
 // Completed Transactions
 exports.fetchCompletedTransactions = _a.fetchCompletedTransactions, exports.fetchCompletedTransactionsSuccess = _a.fetchCompletedTransactionsSuccess, exports.fetchCompletedTransactionsFailure = _a.fetchCompletedTransactionsFailure;
 exports.default = expenseAutomationMissingReceiptsView.reducer;

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

@@ -15,6 +15,7 @@ export interface ResolvedCandidate {
 }
 export interface ResolvedBatchFile {
     attachmentId: ID;
+    batchId: ID;
     fileDownloadUrl: string | null;
     fileId: ID;
     filename: string;

package/lib/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -65,8 +65,10 @@ function getExpenseAutomationMissingReceiptsView(state) {
     const currentBatchDetails = effectiveCurrentBatchId != null
         ? bulkUpload.batchDetailsById[effectiveCurrentBatchId]
         : undefined;
-    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, transactionState));
-    const hasMoreBatchDetails = completedBatchesSorted.some((b) => bulkUpload.batchDetailsById[b.batchId] == null);
+    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, currentBatchDetails.batchId, transactionState));
+    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
+    const hasMoreBatchDetails = completedBatchesSorted.some((b) => bulkUpload.batchDetailsById[b.batchId] == null &&
+        !failedIds.has(b.batchId));
     const getSortValue = (file) => {
         const t = file.matchedTransaction;
         if (t == null) {
@@ -113,7 +115,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
         }
         return details.files
             .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
-            .map((f) => resolveBatchFile(f, transactionState));
+            .map((f) => resolveBatchFile(f, b.batchId, transactionState));
     });
     const completedTransactionsForPeriod = monthYearPeriodId != null
         ? bulkUpload.completedTransactionsByPeriod[monthYearPeriodId]
@@ -170,7 +172,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
         },
     };
 }
-function resolveBatchFile(file, transactionState) {
+function resolveBatchFile(file, batchId, transactionState) {
     const matchedTransaction = file.matchedTransactionId != null
         ? (0, transactionSelector_1.getSupportedTransactionById)(transactionState, file.matchedTransactionId)
         : undefined;
@@ -184,6 +186,7 @@ function resolveBatchFile(file, transactionState) {
         .filter((c) => c != null);
     return {
         attachmentId: file.attachmentId,
+        batchId,
         fileDownloadUrl: file.fileDownloadUrl,
         fileId: file.fileId,
         filename: file.filename,

package/lib/view/expenseAutomationView/types/missingReceiptsViewState.d.ts

@@ -109,6 +109,7 @@ export interface BulkUploadState {
     completedTransactionsByPeriod: Record<MonthYearPeriodId, CompletedTransactionsState>;
     confirmMatchStatus: FetchStateAndError;
     currentResultsTab: BulkUploadResultsTab;
+    failedBatchDetailIds: ID[];
     manualSearch: ManualSearchState;
     phase: BulkUploadPhase;
     sortKey: BulkUploadSortKey;

package/package.json

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