@zeniai/client-epic-state 5.0.12-betaVR1 → 5.0.12-betaVR11

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

@@ -5,22 +5,23 @@ import { updateTransactions } from '../../../../entity/transaction/transactionRe
 import { isSuccessResponse } from '../../../../responsePayload';
 import { BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS } from '../../helpers/bulkUploadTiming';
 import { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
 /** First poll after upload; then interval while batch not resolved via Pusher or API. */
 const FALLBACK_FIRST_DELAY_MS = 30000;
 /** Shorter first poll for restored sessions — batch may already be near completion. */
 const RESTORE_FIRST_DELAY_MS = 5000;
 const FALLBACK_POLL_INTERVAL_MS = 10000;
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
- * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
+ * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs).
+ * Debounced to reduce duplicate refreshes. The post-match tab decision
+ * (Unmatched vs Completed) is made client-side in `ExpenseAutomationPage` once fresh
+ * batch details land -- do not dispatch `requestMissingReceiptsTabNavigation` here.
  */
 export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.status === 'completed'), debounceTime(300), mergeMap(() => from([
     fetchBulkUploadBatches({
         cacheOverride: true,
         invalidateBatchDetailsCache: true,
     }),
-    requestMissingReceiptsTabNavigation({ tab: 'unmatched' }),
 ])));
 /**
  * If Pusher and batch-details are delayed beyond {@link BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS},
@@ -76,7 +77,6 @@ export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => act
                 }
                 actions.push(fetchBulkUploadBatchDetailsSuccess(toBatchDetails(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
                 actions.push(fetchBulkUploadBatches({ cacheOverride: true }));
-                actions.push(requestMissingReceiptsTabNavigation({ tab: 'unmatched' }));
                 return from(actions);
             }
         }

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

@@ -199,6 +199,8 @@ export function getExpenseAutomationMissingReceiptsView(state) {
             batchDetails: resolvedBatchDetails,
             completedSubTab: bulkUpload.completedSubTab,
             currentBatchId: bulkUpload.currentBatchId,
+            currentBatchDetailsFetched: bulkUpload.currentBatchId != null &&
+                bulkUpload.batchDetailsById[bulkUpload.currentBatchId] != null,
             completedTransactions: {
                 fetchState: completedTransactionsForPeriod?.fetchState ?? {
                     fetchState: 'Not-Started',

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

@@ -4,11 +4,13 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-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>;
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, 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 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.
+ * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs).
+ * Debounced to reduce duplicate refreshes. The post-match tab decision
+ * (Unmatched vs Completed) is made client-side in `ExpenseAutomationPage` once fresh
+ * batch details land -- do not dispatch `requestMissingReceiptsTabNavigation` here.
  */
 export declare const pusherBatchStatusCompletionEpic: (actions$: ActionsObservable<ActionType>) => Observable<ActionType>;
 /**

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

@@ -15,15 +15,16 @@ const FALLBACK_FIRST_DELAY_MS = 30000;
 const RESTORE_FIRST_DELAY_MS = 5000;
 const FALLBACK_POLL_INTERVAL_MS = 10000;
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
- * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
+ * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs).
+ * Debounced to reduce duplicate refreshes. The post-match tab decision
+ * (Unmatched vs Completed) is made client-side in `ExpenseAutomationPage` once fresh
+ * batch details land -- do not dispatch `requestMissingReceiptsTabNavigation` here.
  */
 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)({
         cacheOverride: true,
         invalidateBatchDetailsCache: true,
     }),
-    (0, missingReceiptsViewReducer_1.requestMissingReceiptsTabNavigation)({ tab: 'unmatched' }),
 ])));
 exports.pusherBatchStatusCompletionEpic = pusherBatchStatusCompletionEpic;
 /**
@@ -81,7 +82,6 @@ const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.p
                 }
                 actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess)((0, missingReceiptsPayload_1.toBatchDetails)(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
                 actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)({ cacheOverride: true }));
-                actions.push((0, missingReceiptsViewReducer_1.requestMissingReceiptsTabNavigation)({ tab: 'unmatched' }));
                 return (0, rxjs_1.from)(actions);
             }
         }

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

@@ -54,6 +54,8 @@ export interface BulkUploadSelectorData {
     uploadedFileCount: number;
     uploadProgress: number;
     uploadStatus: FetchStateAndError;
+    /** True iff `batchDetailsById[currentBatchId]` is populated -- signals post-match data is fresh. */
+    currentBatchDetailsFetched?: boolean;
     currentBatchId?: ID;
 }
 export interface ResolvedBatchDetails {

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

@@ -205,6 +205,8 @@ function getExpenseAutomationMissingReceiptsView(state) {
             batchDetails: resolvedBatchDetails,
             completedSubTab: bulkUpload.completedSubTab,
             currentBatchId: bulkUpload.currentBatchId,
+            currentBatchDetailsFetched: bulkUpload.currentBatchId != null &&
+                bulkUpload.batchDetailsById[bulkUpload.currentBatchId] != null,
             completedTransactions: {
                 fetchState: completedTransactionsForPeriod?.fetchState ?? {
                     fetchState: 'Not-Started',

package/package.json

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