@zeniai/client-epic-state 4.19.82 → 4.19.84-betaVR1

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

@@ -9,6 +9,8 @@ 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);
@@ -53,6 +55,110 @@ function getExpenseAutomationMissingReceiptsView(state) {
     const completionStatus = missingReceiptsCompletionStatus != null
         ? missingReceiptsCompletionStatus
         : 'incomplete';
+    const { bulkUpload, pendingMissingReceiptsTabNavigation, } = 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]
+        : 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 getSortValue = (file) => {
+        const t = file.matchedTransaction;
+        if (t == null) {
+            return null;
+        }
+        switch (bulkUpload.sortKey) {
+            case 'vendor':
+                return (t.vendorName ?? t.description)?.toLowerCase() ?? null;
+            case 'category': {
+                const line = t.lines?.[0];
+                return line?.account?.accountName?.toLowerCase() ?? null;
+            }
+            case 'class': {
+                const line = t.lines?.[0];
+                return line?.class?.className?.toLowerCase() ?? null;
+            }
+            case 'date':
+                return t.date.valueOf();
+            case 'amount':
+                return t.amount.amount;
+            default:
+                return null;
+        }
+    };
+    const bulkUploadSortDirection = bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc';
+    const matchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((f) => f.status === 'matched') ?? [], getSortValue, bulkUploadSortDirection);
+    const unmatchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((f) => f.status === 'un_matched' || f.status === 'no_match') ?? [], getSortValue, bulkUploadSortDirection);
+    const progress = currentBatchStatus != null
+        ? {
+            ...currentBatchStatus.progress,
+            percentage: currentBatchStatus.progress.total > 0
+                ? Math.round((currentBatchStatus.progress.processed /
+                    currentBatchStatus.progress.total) *
+                    100)
+                : 0,
+        }
+        : { total: 0, processed: 0, percentage: 0 };
+    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 pastUnmatchedFiles = pastBatches.flatMap((b) => {
+        const details = bulkUpload.batchDetailsById[b.batchId];
+        if (details == null) {
+            return [];
+        }
+        return details.files
+            .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
+            .map((f) => resolveBatchFile(f, b.batchId, transactionState));
+    });
+    const completedTransactionsCacheKey = monthYearPeriodId != null
+        ? (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
+        : undefined;
+    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
+        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
+        : undefined;
+    const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
+    const resolvedCompletedTransactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, completedTransactionIds);
+    const resolvedBatchDetails = currentBatchDetails != null && resolvedFiles != null
+        ? {
+            batchId: currentBatchDetails.batchId,
+            createdAt: currentBatchDetails.createdAt,
+            files: resolvedFiles,
+            status: currentBatchDetails.status,
+            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,
@@ -61,5 +167,122 @@ function getExpenseAutomationMissingReceiptsView(state) {
         refreshStatus,
         transactions: sortedTransactions,
         completionStatus,
+        pendingMissingReceiptsTabNavigation: pendingMissingReceiptsTabNavigation ?? null,
+        bulkUpload: {
+            phase: bulkUpload.phase,
+            uploadStatus: bulkUpload.uploadStatus,
+            batchStatus: currentBatchStatus,
+            batchDetails: resolvedBatchDetails,
+            completedSubTab: bulkUpload.completedSubTab,
+            completedTransactions: {
+                fetchState: completedTransactionsForPeriod?.fetchState ?? {
+                    fetchState: 'Not-Started',
+                    error: undefined,
+                },
+                nextPageToken: completedTransactionsForPeriod?.nextPageToken ?? null,
+                totalCount: completedTransactionsForPeriod?.totalCount ?? 0,
+                transactions: resolvedCompletedTransactions,
+            },
+            matchedFiles,
+            unmatchedFiles,
+            progress,
+            currentResultsTab: bulkUpload.currentResultsTab,
+            sortKey: bulkUpload.sortKey,
+            sortOrder: bulkUpload.sortOrder,
+            batchList,
+            batchListFetchState,
+            pastBatches,
+            pastUnmatchedFiles,
+            confirmMatchStatus: bulkUpload.confirmMatchStatus,
+            manualSearchUiResetKey: bulkUpload.manualSearchUiResetKey,
+            hasMoreBatchDetails,
+            batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
+            manualSearch: {
+                ...bulkUpload.manualSearch,
+                results: manualSearchResults,
+            },
+            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) {
+    const matchedTransaction = file.matchedTransactionId != null
+        ? (0, transactionSelector_1.getSupportedTransactionById)(transactionState, file.matchedTransactionId)
+        : undefined;
+    const candidates = file.candidates
+        ?.map((ref) => {
+        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, ref.transactionId);
+        return transaction != null
+            ? { transaction, matchScore: ref.matchScore }
+            : undefined;
+    })
+        .filter((c) => c != null);
+    return {
+        attachmentId: file.attachmentId,
+        batchId,
+        fileDownloadUrl: file.fileDownloadUrl,
+        fileId: file.fileId,
+        filename: file.filename,
+        filePreviewUrl: file.filePreviewUrl,
+        status: file.status,
+        matchedTransaction,
+        candidates: candidates != null && candidates.length > 0
+            ? candidates
+            : undefined,
+        matchSource: file.matchSource,
     };
 }

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

@@ -16,7 +16,7 @@ const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAu
 function getExpenseAutomationTransactionView(state) {
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
     const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
@@ -100,6 +100,7 @@ function getExpenseAutomationTransactionView(state) {
         completionStatus,
         totalCountByTab,
         fetchStateByTransactionTabs: fetchStateByTab,
+        uploadReceiptStatusById,
         selectedTransactionId,
         selectedTransactionLineId,
     };

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

@@ -3,6 +3,7 @@ import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderType
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 export declare const toMissingReceiptsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class";
 export type MissingReceiptsSortKey = ReturnType<typeof toMissingReceiptsSortKey>;
+export type BulkUploadSortKey = 'amount' | 'category' | 'class' | 'date' | 'vendor';
 export interface MissingReceiptsViewUIState {
     scrollPosition: {
         scrollTop: number;
@@ -12,7 +13,130 @@ export interface MissingReceiptsViewUIState {
     sortKey: MissingReceiptsSortKey;
     sortOrder: SortOrder;
 }
+export type BatchStatusValue = 'pending' | 'processing' | 'completed';
+export type BatchFileStatus = 'matched' | 'un_matched' | 'no_match' | 'failed';
+export type BulkUploadPhase = 'idle' | 'uploading' | 'matching' | 'completed';
+export type BulkUploadResultsTab = 'completed' | 'unmatched';
+export type MissingReceiptsTab = 'missing' | BulkUploadResultsTab;
+export type CompletedSubTab = 'all' | 'ai_accountant' | 'manual';
+export type MatchSource = 'ai' | 'manual';
+export interface CandidateRef {
+    matchScore: number;
+    transactionId: ID;
+}
+export interface MatchCandidate {
+    amount: number;
+    currencyCode: string;
+    matchScore: number;
+    transactionDate: string;
+    transactionId: ID;
+    transactionType: string;
+    vendorName: string;
+    vendorLogo?: string;
+}
+export interface BatchFile {
+    attachmentId: ID;
+    fileDownloadUrl: string | null;
+    fileId: ID;
+    filename: string;
+    filePreviewUrl: string | null;
+    status: BatchFileStatus;
+    candidates?: CandidateRef[];
+    matchedTransactionId?: ID;
+    matchSource?: MatchSource;
+}
+export interface BatchSummary {
+    failed: number;
+    matched: number;
+    noMatch: number;
+    possibleMatches: number;
+    total: number;
+}
+export interface BatchStatus {
+    batchId: ID;
+    progress: {
+        processed: number;
+        total: number;
+    };
+    status: BatchStatusValue;
+}
+export interface BatchDetails {
+    batchId: ID;
+    createdAt: string;
+    files: BatchFile[];
+    status: BatchStatusValue;
+    summary: BatchSummary;
+}
+export interface BatchListItem {
+    batchId: ID;
+    createdAt: string;
+    failedCount: number;
+    matchedCount: number;
+    noMatchCount: number;
+    possibleMatchesCount: number;
+    status: string;
+    totalFiles: number;
+}
+export interface ManualSearchResult {
+    amount: number;
+    currencyCode: string;
+    entityId: string;
+    memo: string;
+    transactionDate: string;
+    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 {
+    fetchState: FetchStateAndError;
+    nextPageToken: string | null;
+    totalCount: number;
+    transactionIds: ID[];
+}
+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>;
+    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;
+    uploadProgress: number;
+    uploadStatus: FetchStateAndError;
+    currentBatchId?: ID;
+}
 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/lib/view/expenseAutomationView/types/transactionsViewState.d.ts

@@ -15,7 +15,7 @@ import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { EntityRecommendationKey } from '../../recommendation/recommendationState';
 import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
-export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "memo" | "transaction_type";
+export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "payment_account" | "transaction_type" | "memo_and_receipt";
 export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
 export declare const TRANSACTIONS_TABS: readonly ["review", "autoCategorized"];
 export declare const toTransactionsTabKey: (v: string) => "review" | "autoCategorized";
@@ -97,6 +97,7 @@ export interface TransactionsTabViewState extends FetchedState {
     transactionIdsWithUnsavedData: ID[];
     transactionReviewLocalDataById: Record<ID | TransactionDetailKey, SupportedTransactionCategorization>;
     uiState: TransactionsViewUIState;
+    uploadReceiptStatusById: Record<ID, FetchStateAndError>;
     selectedTransactionId?: ID;
     selectedTransactionLineId?: ID;
 }

package/lib/view/expenseAutomationView/types/transactionsViewState.js

@@ -7,10 +7,11 @@ const TRANSACTIONS_SORT_KEYS = [
     'vendor',
     'amount',
     'transaction_type',
+    'payment_account',
     'date',
     'category',
     'class',
-    'memo',
+    'memo_and_receipt',
 ];
 const toTransactionsSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, TRANSACTIONS_SORT_KEYS);
 exports.toTransactionsSortKey = toTransactionsSortKey;

package/lib/zeniAPI.js

@@ -82,8 +82,6 @@ class ZeniAPIClient {
         return (0, rxjs_1.from)(promise);
     }
     postFormData(restEndPoint, formData, signal) {
-        // Use apiHeaders for auth headers, then remove Content-Type
-        // so the browser sets multipart/form-data with the correct boundary
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { 'Content-Type': _contentType, ...headers } = this.apiHeaders();
         const promise = (0, cross_fetch_1.fetch)(restEndPoint, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.82",
+  "version": "4.19.84-betaVR1",
   "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\" \"echo 'Running tests and typecheck...' && pnpm test\" && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
+    "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\"",
     "only-build": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc && tsc -p tsconfig.esm.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
     "only-build-dev": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc -p tsconfig.dev.json && tsc -p tsconfig.esm.dev.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
     "format": "prettier --write --ignore-unknown \"src/**/*\" && pnpm lint",