@zeniai/client-epic-state 5.0.25 → 5.0.26

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

@@ -30,15 +30,11 @@ 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',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
-    if (sortKey != null) {
-        queryPayload.sort_by = sortKey;
-    }
-    if (sortOrder != null) {
-        queryPayload.sort_order = sortOrder === 'ascending' ? 'asc' : 'desc';
-    }
     if (completedSubTab !== 'all') {
         queryPayload.match_type = completedSubTab;
     }

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

@@ -32,17 +32,12 @@ export const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI)
         const state = state$.value;
         const { expenseAutomationMissingReceiptsViewState: { bulkUpload: { manualSearch, sortKey, sortOrder }, }, } = state;
         const { end, start } = rollingCalendarDateRangeInclusive(MANUAL_SEARCH_TRANSACTION_DATE_RANGE_DAYS);
-        // Manual search is independent of the Completed tab's optional sort: when the
-        // bulk upload sort is neutral (no user-applied sort), fall back to date/desc so
-        // search results stay deterministic for the matching UX.
-        const manualSearchSortKey = sortKey ?? 'date';
-        const manualSearchSortOrder = sortOrder ?? 'descending';
         const queryParam = {
             start_date: start,
             end_date: end,
             auto_categorized: MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED,
-            sort_by: toTransactionsSortKey(manualSearchSortKey),
-            sort_order: manualSearchSortOrder === 'ascending' ? 'asc' : 'desc',
+            sort_by: toTransactionsSortKey(sortKey),
+            sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
             page_token: pageToken ?? null,
             page_size: manualSearch.pageSize,
             search_text: query,

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

@@ -5,23 +5,22 @@ 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, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, 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. */
 const RESTORE_FIRST_DELAY_MS = 5000;
 const FALLBACK_POLL_INTERVAL_MS = 10000;
 /**
- * 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.
+ * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
+ * 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({
         cacheOverride: true,
         invalidateBatchDetailsCache: true,
     }),
+    requestMissingReceiptsTabNavigation({ tab: 'unmatched' }),
 ])));
 /**
  * If Pusher and batch-details are delayed beyond {@link BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS},
@@ -77,6 +76,7 @@ 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/reducers/missingReceiptsViewReducer.js

@@ -1,11 +1,7 @@
 import { createAction, createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { MIN_MANUAL_TRANSACTION_SEARCH_LENGTH, } from '../types/missingReceiptsViewState';
-export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => {
-    const sortKeyPart = sortKey ?? 'none';
-    const sortOrderPart = sortOrder == null ? 'none' : sortOrder === 'ascending' ? 'asc' : 'desc';
-    return `completed-${subTab}-${sortKeyPart}-${sortOrderPart}-${periodId}`;
-};
+export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => `completed-${subTab}-${sortKey}-${sortOrder === 'ascending' ? 'asc' : 'desc'}-${periodId}`;
 export const initialBulkUploadState = {
     batchDetailsById: {},
     batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
@@ -29,8 +25,8 @@ export const initialBulkUploadState = {
         totalCount: 0,
     },
     phase: 'idle',
-    sortKey: undefined,
-    sortOrder: undefined,
+    sortKey: 'date',
+    sortOrder: 'descending',
     uploadedFileCount: 0,
     uploadProgress: 0,
     uploadStatus: { fetchState: 'Not-Started', error: undefined },

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

@@ -199,8 +199,6 @@ 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',