@zeniai/client-epic-state 4.19.37-betaVR26 → 4.19.37-betaVR3

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

@@ -1,57 +1,35 @@
-import { EMPTY, concat, from, of } from 'rxjs';
+import { EMPTY, from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { extractTransactionPayloadsFromBatchFiles, filterBatchListItemsForBatchDetailsFetch, isBatchDetailsApiStatusCompleted, shouldFetchBatchDetailsForBatchId, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { batchDetailFetchFailed, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
-const INITIAL_BATCH_PAGE_SIZE = 1;
-export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
-    if (batchIds.length === 0) {
+import { extractTransactionPayloadsFromBatchFiles, toBatchDetails, } from '../../payload/missingReceiptsPayload';
+import { fetchBulkUploadBatchesSuccess, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
+export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatchesSuccess.match), mergeMap((action) => {
+    const batchList = action.payload.batchList;
+    const { batchDetailsById } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const completedBatchIds = batchList
+        .filter((batch) => batch.status === 'completed' &&
+        batchDetailsById[batch.batchId] == null)
+        .map((batch) => batch.batchId);
+    if (completedBatchIds.length === 0) {
         return EMPTY;
     }
-    return from(batchIds).pipe(mergeMap((batchId) => zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
+    return from(completedBatchIds).pipe(mergeMap((batchId) => zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches/${batchId}`)
         .pipe(mergeMap((response) => {
-        if (!isSuccessResponse(response) ||
-            response.data == null ||
-            !isBatchDetailsApiStatusCompleted(response.data.status)) {
-            return EMPTY;
+        if (isSuccessResponse(response) && response.data != null) {
+            const actions = [];
+            const transactionPayloads = extractTransactionPayloadsFromBatchFiles(response.data.files);
+            if (transactionPayloads.length > 0) {
+                actions.push(updateTransactions(transactionPayloads, (value) => value.transaction_id));
+            }
+            actions.push(storeBatchDetails(toBatchDetails(response.data)));
+            return from(actions);
         }
-        const actions = [];
-        const transactionPayloads = extractTransactionPayloadsFromBatchFiles(response.data.files);
-        if (transactionPayloads.length > 0) {
-            actions.push(updateTransactions(transactionPayloads, (value) => value.transaction_id));
-        }
-        actions.push(storeBatchDetails(toBatchDetails(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
-        return from(actions);
+        return EMPTY;
     }), catchError((error) => {
         console.error(`Failed to fetch batch details for ${batchId}:`, createZeniAPIStatus('Unexpected Error', 'Fetch batch details errored out: ' +
             JSON.stringify(error)));
-        return of(batchDetailFetchFailed({ batchId }));
-    })), 5));
-}
-export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatchesSuccess.match), mergeMap((action) => {
-    const batchList = action.payload.batchList;
-    const { batchDetailsById } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
-    /** Only completed list rows may trigger batch-details API; preserve platform order. */
-    const completedBatchesMissingDetails = filterBatchListItemsForBatchDetailsFetch(batchList).filter((batch) => batchDetailsById[batch.batchId] == null);
-    const completedBatchIds = completedBatchesMissingDetails.map((batch) => batch.batchId);
-    const batchIdsToFetch = completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE);
-    if (batchIdsToFetch.length === 0) {
-        /**
-         * List refresh can complete while no row is `completed` yet (multi-fetch skips), or
-         * `currentBatchId` may not appear in the filtered list but still needs `GET /batches/:id`.
-         * Fall back to the single-batch-details epic so `phase` and details can resolve.
-         */
-        const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
-        const currentId = bulkUpload.currentBatchId;
-        if (currentId != null &&
-            bulkUpload.phase === 'matching' &&
-            bulkUpload.batchDetailsById[currentId] == null &&
-            shouldFetchBatchDetailsForBatchId(bulkUpload.batchStatusById, bulkUpload.batchListByPeriod, currentId)) {
-            return of(fetchBulkUploadBatchDetails());
-        }
         return EMPTY;
-    }
-    return concat(of(setInitialBatchDetailsLoading()), fetchBatchDetailsByIds(batchIdsToFetch, zeniAPI), of(fetchMoreBatchDetailsComplete()));
+    })), 5));
 }));

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

@@ -1,68 +1,27 @@
-import { 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 { of } from 'rxjs';
+import { catchError, debounceTime, filter, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { supportedTransactionPayloadToManualSearchResult } from '../../payload/missingReceiptsPayload';
+import { toManualSearchResult, } from '../../payload/missingReceiptsPayload';
 import { searchTransactionsForManualMatch, searchTransactionsForManualMatchFailure, searchTransactionsForManualMatchSuccess, } from '../../reducers/missingReceiptsViewReducer';
-import { toTransactionsSortKey } from '../../types/transactionsViewState';
-/**
- * `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;
-export const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI) => {
-    const searchActions$ = actions$.pipe(filter(searchTransactionsForManualMatch.match));
-    const pagination$ = searchActions$.pipe(filter((a) => a.payload.pageToken != null));
-    const newSearch$ = searchActions$.pipe(filter((a) => a.payload.pageToken == null), debounceTime(300));
-    return merge(pagination$, newSearch$).pipe(switchMap((action) => {
-        const { query, pageToken } = action.payload;
-        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.'),
-            }));
+export const searchTransactionsForManualMatchEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(searchTransactionsForManualMatch.match), debounceTime(300), switchMap((action) => {
+    const { query } = action.payload;
+    const searchQuery = JSON.stringify({
+        search_text: query,
+        search_fields: ['date', 'amount', 'vendor_name'],
+    });
+    const encodedQuery = encodeURIComponent(searchQuery);
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.searchMicroServiceBaseUrl}/1.0/transaction-search?query=${encodedQuery}`)
+        .pipe(switchMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const results = response.data.transactions.map(toManualSearchResult);
+            return of(searchTransactionsForManualMatchSuccess(results));
         }
-        const period = convertToPeriod(selectedPeriod);
-        const queryParam = {
-            start_date: period.start,
-            end_date: period.end,
-            auto_categorized: MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED,
-            sort_by: toTransactionsSortKey(sortKey),
-            sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
-            page_token: pageToken ?? null,
-            page_size: manualSearch.pageSize,
-            search_text: query,
-        };
-        return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
-            .pipe(mergeMap((response) => {
-            if (isSuccessResponse(response) && response.data != null) {
-                const { transactions, next_page_token, total_count } = response.data;
-                const append = pageToken != null;
-                const results = transactions.map(supportedTransactionPayloadToManualSearchResult);
-                const actionsOut = [
-                    updateTransactions(transactions, (value) => value.transaction_id, 'merge'),
-                    searchTransactionsForManualMatchSuccess({
-                        append,
-                        nextPageToken: next_page_token ?? null,
-                        results,
-                        totalCount: total_count,
-                    }),
-                ];
-                return from(actionsOut);
-            }
-            return of(searchTransactionsForManualMatchFailure({
-                error: response.status,
-            }));
-        }), catchError((error) => of(searchTransactionsForManualMatchFailure({
-            error: createZeniAPIStatus('Unexpected Error', 'Search transactions for manual match errored: ' +
-                JSON.stringify(error)),
-        }))));
-    }));
-};
+        return of(searchTransactionsForManualMatchFailure({
+            error: response.status,
+        }));
+    }), catchError((error) => of(searchTransactionsForManualMatchFailure({
+        error: createZeniAPIStatus('Unexpected Error', 'Search transactions for manual match errored: ' +
+            JSON.stringify(error)),
+    }))));
+}));

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

@@ -1,42 +1,41 @@
-import { EMPTY, from, merge, of, timer } from 'rxjs';
-import { catchError, debounceTime, filter, mergeMap, switchMap, takeUntil, } from 'rxjs/operators';
-import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
+import { of, timer } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap, takeUntil, takeWhile, } from 'rxjs/operators';
 import { isSuccessResponse } from '../../../../responsePayload';
-import { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, } from '../../reducers/missingReceiptsViewReducer';
-/** First poll after upload; then interval while batch not resolved via Pusher or API. */
-const FALLBACK_FIRST_DELAY_MS = 30000;
-const FALLBACK_POLL_INTERVAL_MS = 10000;
+import { toBatchStatus, } from '../../payload/missingReceiptsPayload';
+import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, pusherBatchStatusUpdate, updateBulkUploadBatchStatus, } from '../../reducers/missingReceiptsViewReducer';
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
- * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
+ * Watches batch status using two strategies:
+ * 1. Pusher (primary): Reacts to `pusherBatchStatusUpdate` dispatched by the UI layer
+ *    when a Pusher event arrives. Immediately fetches full details on completion.
+ * 2. Polling (fallback): Starts a relaxed 10s poll after upload success as a safety net
+ *    in case the Pusher event is missed. Stops on completion or `clearBulkUpload`.
  */
-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' }),
-])));
-export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), mergeMap((action) => {
+// Pusher-driven: when Pusher delivers a completed status, fetch details
+export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.status === 'completed'), mergeMap(() => of(fetchBulkUploadBatchDetails())));
+// Polling fallback: relaxed interval as safety net
+const FALLBACK_POLL_INTERVAL_MS = 10000;
+export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), switchMap((action) => {
     const { batchId } = action.payload;
-    return timer(FALLBACK_FIRST_DELAY_MS, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((a) => a.payload.batchId === batchId)), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((a) => a.payload.batchId === batchId)))), switchMap(() => zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
+    return timer(0, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(actions$.pipe(filter((a) => clearBulkUpload.match(a) ||
+        (pusherBatchStatusUpdate.match(a) &&
+            a.payload.status === 'completed')))), switchMap(() => zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches/${batchId}/status`)
         .pipe(mergeMap((response) => {
-        /** Same batch-details URL; polls until `status` is completed (Pusher may win first). */
         if (isSuccessResponse(response) && response.data != null) {
-            if (isBatchDetailsApiStatusCompleted(response.data.status)) {
-                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));
-                actions.push(requestMissingReceiptsTabNavigation({ tab: 'unmatched' }));
-                return from(actions);
+            const batchStatus = toBatchStatus(response.data);
+            const actions = [
+                updateBulkUploadBatchStatus(batchStatus),
+            ];
+            if (batchStatus.status === 'completed') {
+                actions.push(fetchBulkUploadBatchDetails());
             }
+            return actions;
+        }
+        return [];
+    }), catchError(() => of()))), takeWhile((action) => {
+        if (fetchBulkUploadBatchDetails.match(action)) {
+            return false;
         }
-        return EMPTY;
-    }), catchError(() => of()))));
+        return true;
+    }, true));
 }));

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

@@ -1,16 +1,12 @@
 import { toURL } from '../../../commonPayloadTypes/urlPayload';
-import { getTransactionPayloadAmount, } from '../../../entity/transaction/payloadTypes/transactionPayload';
 // -- Converter functions --
-export function toBatchFile(payload, filesEndPoint) {
+export function toBatchFile(payload) {
     return {
         attachmentId: payload.attachment_id,
         candidates: payload.candidates?.map((c) => ({
             transactionId: c.transaction_id,
             matchScore: c.match_score,
         })),
-        fileDownloadUrl: payload.file_id != null && filesEndPoint != null
-            ? `${filesEndPoint}/1.0/files/${payload.file_id}?query=${encodeURIComponent(JSON.stringify({ download_file: true }))}`
-            : null,
         fileId: payload.file_id,
         filePreviewUrl: payload.file_preview_url,
         filename: payload.filename,
@@ -62,62 +58,22 @@ export function toBatchSummary(payload) {
         total: payload.total,
     };
 }
-export function toBatchDetails(payload, filesEndPoint) {
+export function toBatchStatus(payload) {
+    return {
+        batchId: payload.batch_id,
+        progress: payload.progress,
+        status: payload.status,
+    };
+}
+export function toBatchDetails(payload) {
     return {
         batchId: payload.batch_id,
         createdAt: payload.created_at,
-        files: payload.files.map((f) => toBatchFile(f, filesEndPoint)),
+        files: payload.files.map(toBatchFile),
         status: payload.status,
         summary: toBatchSummary(payload.summary),
     };
 }
-/** Batch list `status` is a string from the API — compare case-insensitively. */
-export function isBatchListStatusCompleted(status) {
-    return status.toLowerCase() === 'completed';
-}
-/**
- * Subset of the get-all-batches (`/batches?query=...`) list that is eligible for
- * `GET /batches/:batchId` details fetches. The stored list may include pending, failed, or other
- * statuses for UI; only `completed` rows should trigger batch-details requests.
- */
-export function filterBatchListItemsForBatchDetailsFetch(batches) {
-    return batches.filter((b) => isBatchListStatusCompleted(b.status));
-}
-/**
- * Batch details API response `status` field — only completed payloads should be stored from
- * multi-batch fetch paths (list can be briefly stale vs. live processing state).
- */
-export function isBatchDetailsApiStatusCompleted(status) {
-    return status.toLowerCase() === 'completed';
-}
-export function findBatchListItemForBatchId(batchListByPeriod, batchId) {
-    for (const list of Object.values(batchListByPeriod)) {
-        const found = list.find((b) => b.batchId === batchId);
-        if (found != null) {
-            return found;
-        }
-    }
-    return undefined;
-}
-/**
- * Whether it is appropriate to call `GET .../batches/:id` for details.
- * Skips when live batch status or batch list row indicates the batch is not completed yet.
- * When status is unknown in both sources, allows the request (e.g. dispatch before list refresh).
- */
-export function shouldFetchBatchDetailsForBatchId(batchStatusById, batchListByPeriod, batchId) {
-    const live = batchStatusById[batchId]?.status;
-    if (live === 'completed') {
-        return true;
-    }
-    if (live === 'pending' || live === 'processing') {
-        return false;
-    }
-    const listItem = findBatchListItemForBatchId(batchListByPeriod, batchId);
-    if (listItem != null && !isBatchListStatusCompleted(listItem.status)) {
-        return false;
-    }
-    return true;
-}
 export function toBatchListItem(payload) {
     return {
         batchId: payload.batch_id,
@@ -130,18 +86,15 @@ export function toBatchListItem(payload) {
         totalFiles: payload.total_files,
     };
 }
-/** Maps expense-automation transaction rows to manual-search list rows (Unmatched tab). */
-export function supportedTransactionPayloadToManualSearchResult(payload) {
-    const amountPayload = getTransactionPayloadAmount(payload);
+export function toManualSearchResult(payload) {
     return {
-        amount: amountPayload.amount,
-        currencyCode: amountPayload.currencyCode,
-        entityId: payload.vendor_id ?? payload.customer_id ?? '',
-        memo: payload.transaction_memo ?? '',
+        amount: payload.amount,
+        currencyCode: payload.currency,
+        entityId: payload.entity_id,
+        memo: payload.memo,
         transactionDate: payload.transaction_date,
         transactionId: payload.transaction_id,
         transactionType: payload.transaction_type,
-        vendorName: payload.vendor_name ?? '',
-        vendorLogo: toURL(payload.logo)?.href,
+        vendorName: payload.vendor_name,
     };
 }