@zeniai/client-epic-state 5.0.10-betaVR1 → 5.0.10

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

@@ -12,13 +12,7 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = toMonthYearPeriodId(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    /**
-     * 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, sortOrder, completedSubTab } = bulkUpload;
-    const cacheKey = getCompletedTransactionsCacheKey(periodId, sortKey, sortOrder, completedSubTab);
+    const cacheKey = getCompletedTransactionsCacheKey(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
     const existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
     if (isInitialLoad &&
         action.payload.cacheOverride !== true &&
@@ -30,13 +24,13 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const queryPayload = {
         start_date: period.start,
         end_date: period.end,
-        sort_by: sortKey,
-        sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
+        sort_by: bulkUpload.sortKey,
+        sort_order: bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
-    if (completedSubTab !== 'all') {
-        queryPayload.match_type = completedSubTab;
+    if (bulkUpload.completedSubTab !== 'all') {
+        queryPayload.match_type = bulkUpload.completedSubTab;
     }
     const encodedQuery = encodeURIComponent(JSON.stringify(queryPayload));
     return zeniAPI
@@ -52,25 +46,16 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
                 nextPageToken: response.data.next_page_token,
                 totalCount: response.data.total_count,
                 selectedPeriod,
-                sortKey,
-                sortOrder,
-                completedSubTab,
             }));
             return from(updateActions);
         }
         return of(fetchCompletedTransactionsFailure({
             error: response.status,
             selectedPeriod,
-            sortKey,
-            sortOrder,
-            completedSubTab,
         }));
     }), catchError((error) => of(fetchCompletedTransactionsFailure({
         error: createZeniAPIStatus('Unexpected Error', 'Fetch completed transactions errored: ' +
             JSON.stringify(error)),
         selectedPeriod,
-        sortKey,
-        sortOrder,
-        completedSubTab,
     }))));
 }));

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

@@ -5,7 +5,7 @@ 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, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, 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. */
@@ -35,17 +35,9 @@ export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.
         if (bulk.phase !== 'matching' || bulk.currentBatchId !== batchId) {
             return 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 from([
             bulkUploadAutomatchingTimedOut(batchId),
             fetchBulkUploadBatches({ cacheOverride: true }),
-            fetchBulkUploadBatchDetails(),
         ]);
     }), takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((a) => a.payload.batchId === batchId &&
         a.payload.status === 'completed')), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((a) => a.payload.batchId === batchId)))));

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

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