@zeniai/client-epic-state 4.19.37-betaVR27 → 4.19.37-betaVR4

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

@@ -9,8 +9,6 @@ const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
-const missingReceiptsPayload_1 = require("../payload/missingReceiptsPayload");
-const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewReducer");
 function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -55,32 +53,14 @@ function getExpenseAutomationMissingReceiptsView(state) {
     const completionStatus = missingReceiptsCompletionStatus != null
         ? missingReceiptsCompletionStatus
         : 'incomplete';
-    const { bulkUpload, pendingMissingReceiptsTabNavigation, } = expenseAutomationMissingReceiptsViewState;
+    const { bulkUpload } = expenseAutomationMissingReceiptsViewState;
     const currentBatchStatus = bulkUpload.currentBatchId != null
         ? bulkUpload.batchStatusById[bulkUpload.currentBatchId]
         : undefined;
-    const batchList = monthYearPeriodId != null
-        ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
-        : [];
-    /**
-     * Primary "Unmatched" batch = first completed batch in platform list order, preferring the
-     * first batch that still has un_matched/no_match work when any completed batch has such work.
-     * Batches without details yet: wait if the list row still reports unmatched work; otherwise skip
-     * so we do not block the whole tab while other rows are not fetched yet.
-     */
-    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
-    /** During upload/matching, the in-flight batch may not appear in batchList yet — prefer currentBatchId. */
-    const unmatchedSectionBatchId = bulkUpload.phase === 'matching' || bulkUpload.phase === 'uploading'
-        ? bulkUpload.currentBatchId ?? primaryBatchIdFromDetailsOrder
-        : primaryBatchIdFromDetailsOrder;
-    const completedBatchesInApiOrder = batchList.filter((b) => (0, missingReceiptsPayload_1.isBatchListStatusCompleted)(b.status));
-    const currentBatchDetails = unmatchedSectionBatchId != null
-        ? bulkUpload.batchDetailsById[unmatchedSectionBatchId]
+    const currentBatchDetails = bulkUpload.currentBatchId != null
+        ? bulkUpload.batchDetailsById[bulkUpload.currentBatchId]
         : undefined;
-    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, currentBatchDetails.batchId, transactionState));
-    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
-    const hasMoreBatchDetails = completedBatchesInApiOrder.some((b) => bulkUpload.batchDetailsById[b.batchId] == null &&
-        !failedIds.has(b.batchId));
+    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, transactionState));
     const getSortValue = (file) => {
         const t = file.matchedTransaction;
         if (t == null) {
@@ -118,14 +98,11 @@ function getExpenseAutomationMissingReceiptsView(state) {
                 : 0,
         }
         : { total: 0, processed: 0, percentage: 0 };
+    const batchList = monthYearPeriodId != null
+        ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
+        : [];
     const batchListFetchState = bulkUpload.batchListFetchState;
-    /**
-     * When primary batch is not resolved yet, still aggregate unmatched files from every batch
-     * that has details loaded (otherwise past is empty and receipts vanish from the UI).
-     */
-    const pastBatches = unmatchedSectionBatchId != null
-        ? batchList.filter((b) => b.batchId !== unmatchedSectionBatchId)
-        : batchList;
+    const pastBatches = batchList.filter((b) => b.batchId !== bulkUpload.currentBatchId);
     const pastUnmatchedFiles = pastBatches.flatMap((b) => {
         const details = bulkUpload.batchDetailsById[b.batchId];
         if (details == null) {
@@ -133,13 +110,10 @@ function getExpenseAutomationMissingReceiptsView(state) {
         }
         return details.files
             .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
-            .map((f) => resolveBatchFile(f, b.batchId, transactionState));
+            .map((f) => resolveBatchFile(f, transactionState));
     });
-    const completedTransactionsCacheKey = monthYearPeriodId != null
-        ? (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
-        : undefined;
-    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
-        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
+    const completedTransactionsForPeriod = monthYearPeriodId != null
+        ? bulkUpload.completedTransactionsByPeriod[monthYearPeriodId]
         : undefined;
     const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
     const resolvedCompletedTransactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, completedTransactionIds);
@@ -152,13 +126,6 @@ function getExpenseAutomationMissingReceiptsView(state) {
             summary: currentBatchDetails.summary,
         }
         : undefined;
-    const manualSearchResults = bulkUpload.manualSearch.results.map((r) => {
-        const t = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, r.transactionId);
-        return {
-            ...r,
-            vendorLogo: r.vendorLogo ?? t?.logo?.href,
-        };
-    });
     return {
         fetchState,
         error,
@@ -167,7 +134,6 @@ function getExpenseAutomationMissingReceiptsView(state) {
         refreshStatus,
         transactions: sortedTransactions,
         completionStatus,
-        pendingMissingReceiptsTabNavigation: pendingMissingReceiptsTabNavigation ?? null,
         bulkUpload: {
             phase: bulkUpload.phase,
             uploadStatus: bulkUpload.uploadStatus,
@@ -194,72 +160,12 @@ function getExpenseAutomationMissingReceiptsView(state) {
             pastBatches,
             pastUnmatchedFiles,
             confirmMatchStatus: bulkUpload.confirmMatchStatus,
-            manualSearchUiResetKey: bulkUpload.manualSearchUiResetKey,
-            hasMoreBatchDetails,
-            batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
-            manualSearch: {
-                ...bulkUpload.manualSearch,
-                results: manualSearchResults,
-            },
+            manualSearch: bulkUpload.manualSearch,
             uploadProgress: bulkUpload.uploadProgress,
         },
     };
 }
-function batchDetailsHasUnmatchedWork(details) {
-    return details.files.some((f) => f.status === 'un_matched' || f.status === 'no_match');
-}
-/** List row summary before batch details load — aligns with unmatched / possible-match work. */
-function batchListItemHasUnmatchedWork(batch) {
-    return batch.noMatchCount > 0 || batch.possibleMatchesCount > 0;
-}
-/**
- * `batchList` must match platform order (same sequence as the bulk-upload batches API). Picks the
- * primary batch for the top "Unmatched" section. Skips failed detail fetches.
- *
- * If details are not loaded for an earlier list row but that row reports no unmatched work, we
- * skip it so later rows with loaded details can be primary (avoids an empty tab when the first
- * fetch page only loaded later batches). If the list reports unmatched work but details are still
- * loading, we wait (undefined) so primary order stays correct once details arrive.
- */
-function getPrimaryBatchIdFromBatchListOrder(batchListInPlatformOrder, batchDetailsById, failedBatchDetailIds) {
-    const failedIds = new Set(failedBatchDetailIds);
-    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((b) => {
-        if (failedIds.has(b.batchId)) {
-            return false;
-        }
-        const d = batchDetailsById[b.batchId];
-        if (d != null &&
-            d.status === 'completed' &&
-            batchDetailsHasUnmatchedWork(d)) {
-            return true;
-        }
-        return d == null && batchListItemHasUnmatchedWork(b);
-    });
-    for (const batch of batchListInPlatformOrder) {
-        if (failedIds.has(batch.batchId)) {
-            continue;
-        }
-        const details = batchDetailsById[batch.batchId];
-        if (details == null) {
-            if (batchListItemHasUnmatchedWork(batch)) {
-                return undefined;
-            }
-            continue;
-        }
-        if (details.status !== 'completed') {
-            continue;
-        }
-        if (anyCompletedBatchHasUnmatchedWork) {
-            if (batchDetailsHasUnmatchedWork(details)) {
-                return batch.batchId;
-            }
-            continue;
-        }
-        return batch.batchId;
-    }
-    return undefined;
-}
-function resolveBatchFile(file, batchId, transactionState) {
+function resolveBatchFile(file, transactionState) {
     const matchedTransaction = file.matchedTransactionId != null
         ? (0, transactionSelector_1.getSupportedTransactionById)(transactionState, file.matchedTransactionId)
         : undefined;
@@ -273,8 +179,6 @@ function resolveBatchFile(file, batchId, transactionState) {
         .filter((c) => c != null);
     return {
         attachmentId: file.attachmentId,
-        batchId,
-        fileDownloadUrl: file.fileDownloadUrl,
         fileId: file.fileId,
         filename: file.filename,
         filePreviewUrl: file.filePreviewUrl,

package/lib/view/expenseAutomationView/types/missingReceiptsViewState.d.ts

@@ -36,7 +36,6 @@ export interface MatchCandidate {
 }
 export interface BatchFile {
     attachmentId: ID;
-    fileDownloadUrl: string | null;
     fileId: ID;
     filename: string;
     filePreviewUrl: string | null;
@@ -86,18 +85,11 @@ export interface ManualSearchResult {
     transactionId: ID;
     transactionType: string;
     vendorName: string;
-    /** Present when API/merged transaction state supplies a logo URL. */
-    vendorLogo?: string;
 }
 export interface ManualSearchState {
     fetchState: FetchStateAndError;
-    /** True while appending the next page (initial search uses fetchState only). */
-    isLoadingMore: boolean;
-    nextPageToken: string | null;
-    pageSize: number;
     results: ManualSearchResult[];
     searchQuery: string;
-    totalCount: number;
 }
 export type CompletedTransactionsMatchType = 'all' | 'ai_accountant' | 'manual';
 export interface CompletedTransactionsState {
@@ -108,21 +100,14 @@ export interface CompletedTransactionsState {
 }
 export interface BulkUploadState {
     batchDetailsById: Record<ID, BatchDetails>;
-    batchDetailsPaginationState: FetchStateAndError;
     batchListByPeriod: Record<MonthYearPeriodId, BatchListItem[]>;
     batchListFetchState: FetchStateAndError;
     batchStatusById: Record<ID, BatchStatus>;
     completedSubTab: CompletedSubTab;
-    completedTransactionsByPeriod: Record<string, CompletedTransactionsState>;
+    completedTransactionsByPeriod: Record<MonthYearPeriodId, CompletedTransactionsState>;
     confirmMatchStatus: FetchStateAndError;
     currentResultsTab: BulkUploadResultsTab;
-    failedBatchDetailIds: ID[];
-    /**
-     * Incremented when manual search Redux state is cleared so Unmatched `ManualSearchInput`
-     * instances remount and drop local query text.
-     */
     manualSearch: ManualSearchState;
-    manualSearchUiResetKey: number;
     phase: BulkUploadPhase;
     sortKey: BulkUploadSortKey;
     sortOrder: SortOrder;
@@ -132,11 +117,6 @@ export interface BulkUploadState {
 }
 export interface MissingReceiptsViewState extends FetchedState {
     bulkUpload: BulkUploadState;
-    /**
-     * When set, the app shell should switch the Missing Receipts sub-tab (e.g. to Unmatched)
-     * once, then clear via `clearMissingReceiptsTabNavigation`.
-     */
-    pendingMissingReceiptsTabNavigation: BulkUploadResultsTab | null;
     refreshStatus: FetchStateAndError;
     transactionIdsBySelectedPeriod: Record<MonthYearPeriodId, ID[]>;
     uiState: MissingReceiptsViewUIState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.37-betaVR27",
+  "version": "4.19.37-betaVR4",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -111,7 +111,7 @@
     "find-dead-code": "ts-prune | grep -v '(used in module)'",
     "find-unused-exports": "ts-unused-exports ./tsconfig.json",
     "circular-dependency": "npx madge --circular --extensions ts ./src",
-    "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint...' && eslint . --ext .js,.jsx,.ts,.tsx\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\"",
+    "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint...' && eslint . --ext .js,.jsx,.ts,.tsx\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\" \"echo 'Running tests and typecheck...' && pnpm test\" && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
     "only-build": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc && tsc -p tsconfig.esm.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
     "format": "prettier --write --ignore-unknown \"src/**/*\" && pnpm lint",
     "format-watch": "(git diff --name-only --diff-filter=ACM && git ls-files --others --exclude-standard) | grep -E '\\.(ts|tsx)$' | xargs prettier --write",

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

@@ -1,34 +0,0 @@
-import { concat, of } from 'rxjs';
-import { catchError, exhaustMap, filter } from 'rxjs/operators';
-import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
-import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
-import { createZeniAPIStatus } from '../../../../responsePayload';
-import { filterBatchListItemsForBatchDetailsFetch } from '../../payload/missingReceiptsPayload';
-import { fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, } from '../../reducers/missingReceiptsViewReducer';
-import { fetchBatchDetailsByIds } from './fetchMultipleBatchDetailsEpic';
-const MORE_BATCH_PAGE_SIZE = 1;
-export const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchMoreBatchDetails.match), 
-/** One page at a time — avoids duplicate loads if IO + scroll fallback both fire. */
-exhaustMap(() => {
-    const state = state$.value;
-    const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
-    const currentTenant = getCurrentTenant(state);
-    const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-    if (selectedPeriod == null) {
-        return of(fetchMoreBatchDetailsComplete());
-    }
-    const periodId = toMonthYearPeriodId(selectedPeriod);
-    const batchList = bulkUpload.batchListByPeriod[periodId] ?? [];
-    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
-    const unfetchedBatches = filterBatchListItemsForBatchDetailsFetch(batchList).filter((batch) => bulkUpload.batchDetailsById[batch.batchId] == null &&
-        !failedIds.has(batch.batchId));
-    const unfetchedBatchIds = unfetchedBatches.map((batch) => batch.batchId);
-    if (unfetchedBatchIds.length === 0) {
-        return of(fetchMoreBatchDetailsComplete());
-    }
-    const nextPage = unfetchedBatchIds.slice(0, MORE_BATCH_PAGE_SIZE);
-    return concat(fetchBatchDetailsByIds(nextPage, zeniAPI), of(fetchMoreBatchDetailsComplete())).pipe(catchError((error) => of(fetchMoreBatchDetailsFailure({
-        error: createZeniAPIStatus('Unexpected Error', 'Fetch more batch details errored out: ' +
-            JSON.stringify(error)),
-    }))));
-}));

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

@@ -1,8 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
-import { RootState } from '../../../../reducer';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { batchDetailFetchFailed, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, setInitialBatchDetailsLoading, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof fetchMoreBatchDetails> | ReturnType<typeof fetchMoreBatchDetailsComplete> | ReturnType<typeof fetchMoreBatchDetailsFailure> | ReturnType<typeof batchDetailFetchFailed> | ReturnType<typeof setInitialBatchDetailsLoading> | ReturnType<typeof storeBatchDetails> | ReturnType<typeof updateTransactions>;
-export declare const fetchMoreBatchDetailsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchMoreBatchDetailsEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
-const responsePayload_1 = require("../../../../responsePayload");
-const missingReceiptsPayload_1 = require("../../payload/missingReceiptsPayload");
-const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
-const fetchMultipleBatchDetailsEpic_1 = require("./fetchMultipleBatchDetailsEpic");
-const MORE_BATCH_PAGE_SIZE = 1;
-const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchMoreBatchDetails.match), 
-/** One page at a time — avoids duplicate loads if IO + scroll fallback both fire. */
-(0, operators_1.exhaustMap)(() => {
-    const state = state$.value;
-    const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
-    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
-    const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-    if (selectedPeriod == null) {
-        return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsComplete)());
-    }
-    const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
-    const batchList = bulkUpload.batchListByPeriod[periodId] ?? [];
-    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
-    const unfetchedBatches = (0, missingReceiptsPayload_1.filterBatchListItemsForBatchDetailsFetch)(batchList).filter((batch) => bulkUpload.batchDetailsById[batch.batchId] == null &&
-        !failedIds.has(batch.batchId));
-    const unfetchedBatchIds = unfetchedBatches.map((batch) => batch.batchId);
-    if (unfetchedBatchIds.length === 0) {
-        return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsComplete)());
-    }
-    const nextPage = unfetchedBatchIds.slice(0, MORE_BATCH_PAGE_SIZE);
-    return (0, rxjs_1.concat)((0, fetchMultipleBatchDetailsEpic_1.fetchBatchDetailsByIds)(nextPage, zeniAPI), (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsComplete)())).pipe((0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsFailure)({
-        error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch more batch details errored out: ' +
-            JSON.stringify(error)),
-    }))));
-}));
-exports.fetchMoreBatchDetailsEpic = fetchMoreBatchDetailsEpic;