@zeniai/client-epic-state 4.20.3-betaSS12 → 4.20.3-betaSS13

package/lib/esm/view/expenseAutomationView/epics/accountRecon/excludeAccountFromReconciliationEpic.js

@@ -0,0 +1,63 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { changeAccountKey } from '../../../../entity/account/accountReducer';
+import { getAccountKey } from '../../../../entity/account/accountState';
+import { getAccountReconByAccountIdAndSelectedPeriod } from '../../../../entity/accountRecon/accountReconSelector';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { excludeAccountFromReconciliation, excludeAccountFromReconciliationFailure, excludeAccountFromReconciliationSuccess, } from '../../reducers/reconciliationViewReducer';
+export const excludeAccountFromReconciliationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(excludeAccountFromReconciliation.match), mergeMap((action) => {
+    const { accountId } = action.payload;
+    const state = state$.value;
+    const currentTenant = getCurrentTenant(state);
+    const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
+    const reconciliationData = getAccountReconByAccountIdAndSelectedPeriod(state, accountId, selectedPeriod);
+    const payload = {
+        account_id: accountId,
+        bank_balance: reconciliationData?.balance?.amount ?? null,
+        cleared_balance: reconciliationData?.clearedBalance?.amount ?? null,
+        variance: reconciliationData?.variance?.amount ?? null,
+    };
+    const apiUrl = `${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/excluded-accounts`;
+    return zeniAPI
+        .postAndGetJSON(apiUrl, payload)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response)) {
+            const newAccountKey = getAccountKey('excluded_account_reconciliation', accountId);
+            const oldAccountKey = getAccountKey('account_reconciliation', accountId);
+            return of(excludeAccountFromReconciliationSuccess({
+                account: response.data?.excluded_account ?? undefined,
+                selectedPeriod,
+            }), changeAccountKey({
+                oldKey: oldAccountKey,
+                newKey: newAccountKey,
+            }), openSnackbar({
+                messageSection: 'account_excluded_from_reconciliation',
+                messageText: 'success',
+                type: 'success',
+                variables: [
+                    {
+                        variableName: '_account-name_',
+                        variableValue: reconciliationData?.account.accountName ?? '',
+                    },
+                ],
+            }));
+        }
+        else {
+            return of(excludeAccountFromReconciliationFailure({
+                error: response.status,
+            }), openSnackbar({
+                messageSection: 'account_excluded_from_reconciliation',
+                messageText: 'failed',
+                type: 'error',
+            }));
+        }
+    }), catchError((error) => of(excludeAccountFromReconciliationFailure({
+        error: createZeniAPIStatus('Unexpected Error', `Exclude account from reconciliation REST API call errored out ${JSON.stringify(error)}`),
+    }), openSnackbar({
+        messageSection: 'account_excluded_from_reconciliation',
+        messageText: 'failed',
+        type: 'error',
+    }))));
+}));

package/lib/esm/view/expenseAutomationView/epics/accountRecon/fetchReconciliationViewEpic.js

@@ -53,22 +53,17 @@ export const fetchReconciliationViewEpic = (actions$, state$, zeniAPI) => action
         return zeniAPI.getJSON(apiUrl).pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const updateActions = [];
-                updateActions.push(updateAccounts(response.data.accounts, 'account_reconciliation'));
-                updateActions.push(updateAllUsers({
+                const allTransactionsPerRecon = getAllReviewTransactionsFromReconcilePayload(response.data.reconciliation);
+                updateActions.push(updateAccounts(response.data.accounts, 'account_reconciliation'), updateAccounts(response.data.excluded_accounts ?? [], 'excluded_account_reconciliation'), updateAllUsers({
                     users: response.data.users ?? [],
                     updateType: 'merge',
-                }));
-                updateActions.push(updateFiles({ files: response.data.files ?? [] }));
-                const allTransactionsPerRecon = getAllReviewTransactionsFromReconcilePayload(response.data.reconciliation);
-                updateActions.push(updateMultipleReconcileTransactions(allTransactionsPerRecon, 'merge'));
-                updateActions.push(updateAccountRecon(selectedPeriod, response.data.reconciliation));
+                }), updateFiles({ files: response.data.files ?? [] }), updateMultipleReconcileTransactions(allTransactionsPerRecon, 'merge'), updateAccountRecon(selectedPeriod, response.data.reconciliation));
                 const reviewTabLocalData = prepareReviewTabLocalData(response.data.reconciliation[0]?.transactions?.review ?? []);
                 if (accountId != null) {
                     const selectedTransactionIds = getTransactionIdFromCheckedMatchedTransactionPayload(response.data.reconciliation[0].transactions.reconcile);
                     updateActions.push(updateReconcileTabLocalData({
                         selectedTransactionIds: selectedTransactionIds,
-                    }));
-                    updateActions.push(initializeReconciliationReviewTabLocalData(reviewTabLocalData));
+                    }), initializeReconciliationReviewTabLocalData(reviewTabLocalData));
                 }
                 updateActions.push(fetchReconciliationSuccess(selectedPeriod, response.data, refreshViewInBackground, accountId));
                 return from(updateActions);

package/lib/esm/view/expenseAutomationView/epics/accountRecon/includeAccountInReconciliationEpic.js

@@ -0,0 +1,65 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { convertToPeriod } from '../../../../commonStateTypes/timePeriod';
+import { changeAccountKey } from '../../../../entity/account/accountReducer';
+import { getAccountBase } from '../../../../entity/account/accountSelector';
+import { getAccountKey } from '../../../../entity/account/accountState';
+import { updateAccountRecon } from '../../../../entity/accountRecon/accountReconReducer';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { includeAccountInReconciliation, includeAccountInReconciliationFailure, includeAccountInReconciliationSuccess, } from '../../reducers/reconciliationViewReducer';
+export const includeAccountInReconciliationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(includeAccountInReconciliation.match), mergeMap((action) => {
+    const { accountId } = action.payload;
+    const state = state$.value;
+    const currentTenant = getCurrentTenant(state);
+    const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
+    const account = getAccountBase(state.accountState, accountId, 'excluded_account_reconciliation');
+    const period = convertToPeriod(selectedPeriod, true);
+    const query = JSON.stringify({
+        start_date: period.start,
+        end_date: period.end,
+    });
+    const apiUrl = `${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/excluded-accounts/${accountId}?query=${encodeURIComponent(query)}`;
+    return zeniAPI
+        .deleteAndGetJSON(apiUrl)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const reconciliation = response.data.reconciliation;
+            const oldAccountKey = getAccountKey('excluded_account_reconciliation', reconciliation.account_id);
+            const newAccountKey = getAccountKey('account_reconciliation', reconciliation.account_id);
+            return of(updateAccountRecon(selectedPeriod, [reconciliation]), includeAccountInReconciliationSuccess({
+                reconciliation,
+                selectedPeriod,
+            }), changeAccountKey({
+                oldKey: oldAccountKey,
+                newKey: newAccountKey,
+            }), openSnackbar({
+                messageSection: 'account_included_in_reconciliation',
+                messageText: 'success',
+                type: 'success',
+                variables: [
+                    {
+                        variableName: '_account-name_',
+                        variableValue: account?.accountName ?? '',
+                    },
+                ],
+            }));
+        }
+        else {
+            return of(includeAccountInReconciliationFailure({
+                error: response.status,
+            }), openSnackbar({
+                messageSection: 'account_included_in_reconciliation',
+                messageText: 'failed',
+                type: 'error',
+            }));
+        }
+    }), catchError((error) => of(includeAccountInReconciliationFailure({
+        error: createZeniAPIStatus('Unexpected Error', `Include account in reconciliation REST API call errored out ${JSON.stringify(error)}`),
+    }), openSnackbar({
+        messageSection: 'account_included_in_reconciliation',
+        messageText: 'failed',
+        type: 'error',
+    }))));
+}));

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js

@@ -21,13 +21,13 @@ export const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe
         if (isSuccessResponse(response) && response.data != null) {
             const updateActions = [];
             updateActions.push(updateJESchedules([
-                ...response.data.draft_je_schedules,
+                ...response.data.je_schedules,
                 ...response.data.failed_je_postings.je_schedules,
             ]), updateJESchedulesDetails([...response.data.failed_je_postings.je_schedules], response.data.failed_je_postings.scheduled_journal_entries), initializeJeScheduleLocalData([
                 ...response.data.failed_je_postings.je_schedules,
             ]));
             updateActions.push(fetchJeSchedulesSuccess({
-                jeSchedules: [...response.data.draft_je_schedules],
+                jeSchedules: [...response.data.je_schedules],
                 failedJeSchedules: [
                     ...response.data.failed_je_postings.je_schedules,
                 ],

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

@@ -0,0 +1,33 @@
+import { merge, of } from 'rxjs';
+import { filter, mergeMap, switchMap, take, takeUntil } from 'rxjs/operators';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, restoreBulkUploadMatchingState, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
+/**
+ * Show a success toast when batch details arrive for the current upload batch,
+ * e.g. "17 out of 20 Receipts Matched". Scoped per upload session so it fires
+ * only once: starts on `bulkUploadReceiptsSuccess` (or `restoreBulkUploadMatchingState`
+ * for a restored session), waits for the first batch-details action for that batch,
+ * emits the toast, then stops. `clearBulkUpload` cancels the in-flight wait.
+ */
+export const bulkUploadMatchResultToastEpic = (actions$) => actions$.pipe(filter((action) => bulkUploadReceiptsSuccess.match(action) ||
+    restoreBulkUploadMatchingState.match(action)), switchMap((uploadAction) => {
+    const { batchId } = uploadAction.payload;
+    return merge(actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match)), actions$.pipe(filter(storeBatchDetails.match))).pipe(filter((a) => a.payload.batchId === batchId), take(1), mergeMap((action) => {
+        const { summary } = action.payload;
+        return of(openSnackbar({
+            messageSection: 'receipts_bulk_match',
+            messageText: 'success',
+            type: 'success',
+            variables: [
+                {
+                    variableName: '_matched_',
+                    variableValue: String(summary.matched),
+                },
+                {
+                    variableName: '_total_',
+                    variableValue: String(summary.total),
+                },
+            ],
+        }));
+    }), takeUntil(actions$.pipe(filter(clearBulkUpload.match))));
+}));

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

@@ -1,9 +1,9 @@
 import { concat, of, timer } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { BULK_UPLOAD_BAR_COMPLETE_HOLD_MS } from '../../bulkUploadTiming';
+import { BULK_UPLOAD_BAR_COMPLETE_HOLD_MS } from '../../helpers/bulkUploadTiming';
 import { bulkUploadReceipts, bulkUploadReceiptsFailure, bulkUploadReceiptsSuccess, updateBulkUploadProgress, } from '../../reducers/missingReceiptsViewReducer';
-export const bulkUploadReceiptsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceipts.match), mergeMap((action) => {
+export const bulkUploadReceiptsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceipts.match), switchMap((action) => {
     const { files } = action.payload;
     const formData = new FormData();
     for (const file of files) {

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

@@ -1,10 +1,12 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
-import { convertToPeriod, toMonthYearPeriodId, } from '../../../../commonStateTypes/timePeriod';
+import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { toBatchListItem, } from '../../payload/missingReceiptsPayload';
 import { fetchBulkUploadBatches, fetchBulkUploadBatchesFailure, fetchBulkUploadBatchesSuccess, } from '../../reducers/missingReceiptsViewReducer';
+import { BULK_UPLOAD_BATCH_LIST_DATE_RANGE_DAYS } from '../../helpers/bulkUploadTiming';
+import { rollingCalendarDateRangeInclusive } from '../../helpers/rollingCalendarDateRangeInclusive';
 export const fetchBulkUploadBatchesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatches.match), switchMap((action) => {
     const { cacheOverride } = action.payload;
     const state = state$.value;
@@ -19,10 +21,10 @@ export const fetchBulkUploadBatchesEpic = (actions$, state$, zeniAPI) => actions
             selectedPeriod,
         }));
     }
-    const period = convertToPeriod(selectedPeriod);
+    const { end, start } = rollingCalendarDateRangeInclusive(BULK_UPLOAD_BATCH_LIST_DATE_RANGE_DAYS);
     const queryParam = {
-        start_date: period.start,
-        end_date: period.end,
+        start_date: start,
+        end_date: end,
         sort_order: 'desc',
     };
     return zeniAPI

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

@@ -12,7 +12,13 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = toMonthYearPeriodId(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    const cacheKey = getCompletedTransactionsCacheKey(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
+    /**
+     * 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 existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
     if (isInitialLoad &&
         action.payload.cacheOverride !== true &&
@@ -24,13 +30,13 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const queryPayload = {
         start_date: period.start,
         end_date: period.end,
-        sort_by: bulkUpload.sortKey,
-        sort_order: bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc',
+        sort_by: sortKey,
+        sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
-    if (bulkUpload.completedSubTab !== 'all') {
-        queryPayload.match_type = bulkUpload.completedSubTab;
+    if (completedSubTab !== 'all') {
+        queryPayload.match_type = completedSubTab;
     }
     const encodedQuery = encodeURIComponent(JSON.stringify(queryPayload));
     return zeniAPI
@@ -46,16 +52,25 @@ 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/refetchCompletedTransactionsOnBulkUploadSortEpic.js

@@ -0,0 +1,12 @@
+import { of } from 'rxjs';
+import { filter, mergeMap } from 'rxjs/operators';
+import { fetchCompletedTransactions, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, } from '../../reducers/missingReceiptsViewReducer';
+/**
+ * Completed transactions are cached per sort key/order/sub-tab. After a sort or sub-tab
+ * change, the fetch epic would otherwise skip the network when that cache entry already
+ * exists — dispatch a cache-bypassing initial fetch whenever either changes from the UI.
+ */
+export const refetchCompletedTransactionsOnBulkUploadSortEpic = (actions$) => {
+    return actions$.pipe(filter((action) => setBulkUploadSortConfig.match(action) ||
+        setBulkUploadCompletedSubTab.match(action)), mergeMap(() => of(fetchCompletedTransactions(undefined, true))));
+};

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

@@ -0,0 +1,98 @@
+import { EMPTY, concat, from, of } from 'rxjs';
+import { catchError, concatMap, filter, mergeMap, take } from 'rxjs/operators';
+import { isSuccessResponse } from '../../../../responsePayload';
+import { isBatchDetailsStatusPendingOrProcessing, toBatchListItem, } from '../../payload/missingReceiptsPayload';
+import { fetchBulkUploadBatchesSuccess, restoreBulkUploadAutomatchingOnMount, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
+import { BULK_UPLOAD_BATCH_LIST_DATE_RANGE_DAYS } from '../../helpers/bulkUploadTiming';
+import { rollingCalendarDateRangeInclusive } from '../../helpers/rollingCalendarDateRangeInclusive';
+import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+/**
+ * On missing-receipts entry / period switch, hydrate the automatching banner for the logged-in
+ * user without relying on UI-driven list fetches (the Missing tab does not fetch the batch list
+ * while `phase === 'idle'`). Flow:
+ *  1. Call `GET /1.0/batches` (rolling 30-day window).
+ *  2. Emit `fetchBulkUploadBatchesSuccess` so `batchListByPeriod` is populated for the selected
+ *     period (prevents a duplicate list fetch when the user switches to the Unmatched tab).
+ *  3. For each `processing|pending` row, call `GET /1.0/batches/:id` in order; for the first row
+ *     whose details `user_id` matches the logged-in user and whose status is still
+ *     pending/processing, dispatch `restoreBulkUploadMatchingState` and stop.
+ */
+export const restoreBulkUploadAutomatchingOnMountEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(restoreBulkUploadAutomatchingOnMount.match), mergeMap(() => {
+    const state = state$.value;
+    const { expenseAutomationMissingReceiptsViewState: { bulkUpload }, expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
+    if (bulkUpload.phase !== 'idle') {
+        return EMPTY;
+    }
+    if (bulkUpload.batchListFetchState.fetchState === 'In-Progress') {
+        return EMPTY;
+    }
+    const loggedInUserId = state.tenantState.loggedInUser?.userId;
+    if (loggedInUserId == null) {
+        return EMPTY;
+    }
+    const currentTenant = getCurrentTenant(state);
+    const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
+    if (selectedPeriod == null) {
+        return EMPTY;
+    }
+    const { end, start } = rollingCalendarDateRangeInclusive(BULK_UPLOAD_BATCH_LIST_DATE_RANGE_DAYS);
+    const queryParam = {
+        start_date: start,
+        end_date: end,
+        sort_order: 'desc',
+    };
+    const listUrl = `${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches?query=${encodeURIComponent(JSON.stringify(queryParam))}`;
+    const detailsBaseUrl = `${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/`;
+    const periodId = toMonthYearPeriodId(selectedPeriod);
+    const alreadyCached = (bulkUpload.batchListByPeriod[periodId] ?? []).length > 0 &&
+        bulkUpload.batchListFetchState.fetchState === 'Completed';
+    const listSource = alreadyCached
+        ? of(null)
+        : zeniAPI.getJSON(listUrl).pipe(catchError(() => of(null)));
+    return listSource.pipe(mergeMap((listResponse) => {
+        const batchList = alreadyCached
+            ? bulkUpload.batchListByPeriod[periodId] ?? []
+            : listResponse != null &&
+                isSuccessResponse(listResponse) &&
+                listResponse.data != null
+                ? listResponse.data.batches.map(toBatchListItem)
+                : null;
+        if (batchList == null) {
+            return EMPTY;
+        }
+        const successAction = alreadyCached
+            ? null
+            : fetchBulkUploadBatchesSuccess({
+                batchList,
+                selectedPeriod,
+            });
+        const processingBatches = batchList.filter((b) => {
+            const status = b.status.toLowerCase();
+            return status === 'processing' || status === 'pending';
+        });
+        const restoreStream = from(processingBatches).pipe(concatMap((batch) => zeniAPI
+            .getJSON(`${detailsBaseUrl}${batch.batchId}`)
+            .pipe(mergeMap((response) => {
+            if (!isSuccessResponse(response) || response.data == null) {
+                return EMPTY;
+            }
+            const data = response.data;
+            const detailsUserId = data.user_id;
+            if (detailsUserId == null ||
+                detailsUserId !== loggedInUserId) {
+                return EMPTY;
+            }
+            if (!isBatchDetailsStatusPendingOrProcessing(data.status)) {
+                return EMPTY;
+            }
+            return of(restoreBulkUploadMatchingState({
+                batchId: batch.batchId,
+                totalFiles: batch.totalFiles,
+            }));
+        }), catchError(() => EMPTY))), take(1));
+        return successAction != null
+            ? concat(of(successAction), restoreStream)
+            : restoreStream;
+    }));
+}));

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

@@ -1,18 +1,19 @@
 import { EMPTY, from, merge, of } from 'rxjs';
 import { catchError, debounceTime, filter, mergeMap, switchMap, } from 'rxjs/operators';
-import { convertToPeriod } from '../../../../commonStateTypes/timePeriod';
-import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { supportedTransactionPayloadToManualSearchResult } from '../../payload/missingReceiptsPayload';
 import { searchTransactionsForManualMatch, searchTransactionsForManualMatchFailure, searchTransactionsForManualMatchSuccess, } from '../../reducers/missingReceiptsViewReducer';
 import { toTransactionsSortKey } from '../../types/transactionsViewState';
+import { rollingCalendarDateRangeInclusive } from '../../helpers/rollingCalendarDateRangeInclusive';
 /**
  * `auto_categorized` for manual transaction search (Unmatched).
  * Backend contract TBD — align with `fetchTransactionCategorizationEpic` (`selectedTab === 'autoCategorized'`)
  * when the expense-automation API documents the intended filter for this flow.
  */
 export const MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED = false;
+/** Inclusive rolling window for manual match search (ignores accounting period picker). */
+const MANUAL_SEARCH_TRANSACTION_DATE_RANGE_DAYS = 90;
 export const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI) => {
     const searchActions$ = actions$.pipe(filter(searchTransactionsForManualMatch.match));
     const pagination$ = searchActions$.pipe(filter((action) => action.payload.pageToken != null));
@@ -29,18 +30,11 @@ export const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI)
             return EMPTY;
         }
         const state = state$.value;
-        const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload: { manualSearch, sortKey, sortOrder }, }, } = state;
-        const currentTenant = getCurrentTenant(state);
-        const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-        if (selectedPeriod == null) {
-            return of(searchTransactionsForManualMatchFailure({
-                error: createZeniAPIStatus('Unexpected Error', 'Manual search requires a selected accounting period.'),
-            }));
-        }
-        const period = convertToPeriod(selectedPeriod);
+        const { expenseAutomationMissingReceiptsViewState: { bulkUpload: { manualSearch, sortKey, sortOrder }, }, } = state;
+        const { end, start } = rollingCalendarDateRangeInclusive(MANUAL_SEARCH_TRANSACTION_DATE_RANGE_DAYS);
         const queryParam = {
-            start_date: period.start,
-            end_date: period.end,
+            start_date: start,
+            end_date: end,
             auto_categorized: MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED,
             sort_by: toTransactionsSortKey(sortKey),
             sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',

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

@@ -3,11 +3,13 @@ import { catchError, debounceTime, filter, mergeMap, switchMap, takeUntil, } fro
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { isSuccessResponse } from '../../../../responsePayload';
-import { BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS } from '../../bulkUploadTiming';
+import { BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS } from '../../helpers/bulkUploadTiming';
 import { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, } 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),
@@ -25,16 +27,25 @@ export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filte
  * force `phase` to `completed` (dismiss automatching banner) and refresh the batch list.
  * Cancels when the batch completes normally, bulk state is cleared, or another upload supersedes.
  */
-export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), mergeMap((action) => {
+export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.pipe(filter((action) => bulkUploadReceiptsSuccess.match(action) ||
+    restoreBulkUploadMatchingState.match(action)), mergeMap((action) => {
     const { batchId } = action.payload;
     return timer(BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS).pipe(mergeMap(() => {
         const bulk = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
         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)))));
@@ -44,10 +55,15 @@ export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.
  * error snackbar per upload session (first failure only) so the user is not spammed every
  * interval; Pusher or a later successful poll still completes the flow.
  */
-export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), mergeMap((action) => {
+export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter((action) => bulkUploadReceiptsSuccess.match(action) ||
+    restoreBulkUploadMatchingState.match(action)), mergeMap((action) => {
     const { batchId } = action.payload;
     let pollErrorNotified = false;
-    return timer(FALLBACK_FIRST_DELAY_MS, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.batchId === batchId)), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((action) => action.payload.batchId === batchId)), actions$.pipe(filter(bulkUploadAutomatchingTimedOut.match), filter((action) => action.payload.batchId === batchId)))), switchMap(() => zeniAPI
+    const firstDelay = restoreBulkUploadMatchingState.match(action)
+        ? RESTORE_FIRST_DELAY_MS
+        : FALLBACK_FIRST_DELAY_MS;
+    return timer(firstDelay, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.batchId === batchId &&
+        action.payload.status === 'completed')), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((action) => action.payload.batchId === batchId)), actions$.pipe(filter(bulkUploadAutomatchingTimedOut.match), filter((action) => action.payload.batchId === batchId)))), switchMap(() => zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
         .pipe(mergeMap((response) => {
         /** Same batch-details URL; polls until `status` is completed (Pusher may win first). */

package/lib/esm/view/expenseAutomationView/expenseAutomationViewSelector.js

@@ -91,7 +91,6 @@ export function getExpenseAutomationView(state) {
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
-        monthEndCloseChecksView,
         expenseAutomationTransactionsView,
         expenseAutomationReconciliationViewState,
     ];

package/lib/esm/view/expenseAutomationView/helpers/bulkUploadTiming.js

@@ -0,0 +1,16 @@
+/**
+ * After upload API success, hold the bar at 100% this long before transitioning to matching,
+ * so the fill animation can complete without an abrupt swap to the auto-matching banner.
+ */
+export const BULK_UPLOAD_BAR_COMPLETE_HOLD_MS = 400;
+/**
+ * Max wall-clock wait for Pusher + batch-details resolution after upload. If exceeded, we stop
+ * fallback polling, clear the automatching banner (`phase` → completed), and refresh batch list.
+ */
+export const BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS = 300000;
+/**
+ * Rolling window (in days) for the bulk-upload batch list API. Period-agnostic — the batch list
+ * ignores the accounting month picker. Shared between the regular batch-list fetch and the
+ * restore-on-mount hydration so both flows always query the same window.
+ */
+export const BULK_UPLOAD_BATCH_LIST_DATE_RANGE_DAYS = 30;

package/lib/esm/view/expenseAutomationView/helpers/rollingCalendarDateRangeInclusive.js

@@ -0,0 +1,13 @@
+import { DEFAULT_DATE_FORMAT } from '../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY';
+import { dateNow } from '../../../zeniDayJS';
+/**
+ * Local calendar dates from (end − (days − 1)) through end, inclusive.
+ */
+export function rollingCalendarDateRangeInclusive(days) {
+    const end = dateNow().startOf('day');
+    const start = end.subtract(days - 1, 'day');
+    return {
+        end: end.format(DEFAULT_DATE_FORMAT),
+        start: start.format(DEFAULT_DATE_FORMAT),
+    };
+}

package/lib/esm/view/expenseAutomationView/helpers/saveTransactionHelper.js

@@ -64,8 +64,8 @@ export const toTransactionUpdatesFromTransactionCategorizationLocalData = (trans
                 lineItem.account?.qboId !== accountLine.account.qboId &&
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
-                Boolean(lineItem.class?.qboId) &&
-                    lineItem.class?.qboId !== accountLine.class.qboId;
+                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
+                    lineItem.class?.qboId !== accountLine.class?.qboId;
             const recommendedAccountBase = toRecommendedAccountBase(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = toRecommendedClassBase(lineItem.amount.amount, lineItem.class);
             if (entityDetails != null &&

package/lib/esm/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -234,7 +234,7 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                         isPreFilled: true,
                     };
                 }
-                if (accountLine.class.classId === '' &&
+                if (Boolean(accountLine.class?.classId) === false &&
                     higherPreferenceRecommendation?.class != null) {
                     record.class = {
                         ...higherPreferenceRecommendation.class,
@@ -464,7 +464,7 @@ export const setEntityRecommendationForLineIdInLocalData = (draft, transaction,
                                 }
                                 : accountLine.account;
                     record.class =
-                        accountLine.class.classId !== ''
+                        Boolean(accountLine.class?.classId) !== false
                             ? accountLine.class
                             : recommendations?.[0]?.class
                                 ? {

package/lib/esm/view/expenseAutomationView/payload/missingReceiptsPayload.js

@@ -99,8 +99,16 @@ export function toBatchDetails(payload, filesEndPoint) {
         files: payload.files.map((file) => toBatchFile(file, filesEndPoint)),
         status: toBatchStatusValue(payload.status),
         summary: toBatchSummary(payload.summary),
+        ...(payload.user_id != null && payload.user_id !== ''
+            ? { userId: payload.user_id }
+            : {}),
     };
 }
+/** Batch is still in-flight for automatching (GET /batches/:id while not completed). */
+export function isBatchDetailsStatusPendingOrProcessing(status) {
+    const s = status.toLowerCase();
+    return s === 'processing' || s === 'pending';
+}
 /** Batch list `status` is a string from the API — compare case-insensitively. */
 export function isBatchListStatusCompleted(status) {
     return status.toLowerCase() === 'completed';
@@ -158,6 +166,7 @@ export function toBatchListItem(payload) {
         possibleMatchesCount: payload.possible_matches_count,
         status: payload.status,
         totalFiles: payload.total_files,
+        userId: payload.user_id,
     };
 }
 /**