@zeniai/client-epic-state 4.19.84-betaVR16 → 4.19.84-betaVR2

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

@@ -11,7 +11,6 @@ const transactionSelector_1 = require("../../../entity/transaction/transactionSe
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const missingReceiptsPayload_1 = require("../payload/missingReceiptsPayload");
 const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewReducer");
-const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
 function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -65,71 +64,50 @@ function getExpenseAutomationMissingReceiptsView(state) {
         : [];
     /**
      * Primary "Unmatched" batch = first completed batch in platform list order, preferring the
-     * first batch that still has possible_matches/no_match work when any completed batch has such work.
+     * 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, prefer `currentBatchId` only when its batch details are loaded,
-     * completed, and still have unmatched-tab work. Otherwise keep `primaryBatchIdFromDetailsOrder`.
-     *
-     * If we pinned to `currentBatchId` as soon as it was absent from the batch list (in-flight
-     * upload), details are often not loaded yet — `unmatchedFiles` would empty while older batches
-     * moved to "past", so the primary "Unmatched Receipts" section vanished during auto-matching.
-     */
-    const unmatchedSectionBatchId = (() => {
-        const phase = bulkUpload.phase;
-        if (phase !== 'matching' && phase !== 'uploading') {
-            return primaryBatchIdFromDetailsOrder;
-        }
-        const currentId = bulkUpload.currentBatchId;
-        if (currentId == null) {
-            return primaryBatchIdFromDetailsOrder;
-        }
-        const currentDetails = bulkUpload.batchDetailsById[currentId];
-        if (currentDetails != null &&
-            currentDetails.status === 'completed' &&
-            batchDetailsHasUnmatchedWork(currentDetails)) {
-            return currentId;
-        }
-        return primaryBatchIdFromDetailsOrder;
-    })();
-    const completedBatchesInApiOrder = batchList.filter((batchListItem) => (0, missingReceiptsPayload_1.isBatchListStatusCompleted)(batchListItem.status));
+    /** 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((batchListItem) => bulkUpload.batchDetailsById[batchListItem.batchId] == null &&
-        !failedIds.has(batchListItem.batchId));
+    const hasMoreBatchDetails = completedBatchesInApiOrder.some((b) => bulkUpload.batchDetailsById[b.batchId] == null &&
+        !failedIds.has(b.batchId));
     const getSortValue = (file) => {
-        const matchedTransaction = file.matchedTransaction;
-        if (matchedTransaction == null) {
+        const t = file.matchedTransaction;
+        if (t == null) {
             return null;
         }
         switch (bulkUpload.sortKey) {
             case 'vendor':
-                return (matchedTransaction.vendorName ?? matchedTransaction.description)?.toLowerCase() ?? null;
+                return (t.vendorName ?? t.description)?.toLowerCase() ?? null;
             case 'category': {
-                const line = matchedTransaction.lines?.[0];
+                const line = t.lines?.[0];
                 return line?.account?.accountName?.toLowerCase() ?? null;
             }
             case 'class': {
-                const line = matchedTransaction.lines?.[0];
+                const line = t.lines?.[0];
                 return line?.class?.className?.toLowerCase() ?? null;
             }
             case 'date':
-                return matchedTransaction.date.valueOf();
+                return t.date.valueOf();
             case 'amount':
-                return matchedTransaction.amount.amount;
+                return t.amount.amount;
             default:
                 return null;
         }
     };
     const bulkUploadSortDirection = bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc';
-    const matchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((resolvedFile) => resolvedFile.status === 'exact_match') ?? [], getSortValue, bulkUploadSortDirection);
-    const unmatchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((resolvedFile) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(resolvedFile.status)) ?? [], getSortValue, bulkUploadSortDirection);
+    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,
@@ -146,16 +124,16 @@ function getExpenseAutomationMissingReceiptsView(state) {
      * that has details loaded (otherwise past is empty and receipts vanish from the UI).
      */
     const pastBatches = unmatchedSectionBatchId != null
-        ? batchList.filter((batchListItem) => batchListItem.batchId !== unmatchedSectionBatchId)
+        ? batchList.filter((b) => b.batchId !== unmatchedSectionBatchId)
         : batchList;
-    const pastUnmatchedFiles = pastBatches.flatMap((pastBatch) => {
-        const details = bulkUpload.batchDetailsById[pastBatch.batchId];
+    const pastUnmatchedFiles = pastBatches.flatMap((b) => {
+        const details = bulkUpload.batchDetailsById[b.batchId];
         if (details == null) {
             return [];
         }
         return details.files
-            .filter((batchFile) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(batchFile.status))
-            .map((batchFile) => resolveBatchFile(batchFile, pastBatch.batchId, transactionState));
+            .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)
@@ -174,11 +152,11 @@ function getExpenseAutomationMissingReceiptsView(state) {
             summary: currentBatchDetails.summary,
         }
         : undefined;
-    const manualSearchResults = bulkUpload.manualSearch.results.map((result) => {
-        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, result.transactionId);
+    const manualSearchResults = bulkUpload.manualSearch.results.map((r) => {
+        const t = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, r.transactionId);
         return {
-            ...result,
-            vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
+            ...r,
+            vendorLogo: r.vendorLogo ?? t?.logo?.href,
         };
     });
     return {
@@ -228,7 +206,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
     };
 }
 function batchDetailsHasUnmatchedWork(details) {
-    return details.files.some((file) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(file.status));
+    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) {
@@ -245,17 +223,17 @@ function batchListItemHasUnmatchedWork(batch) {
  */
 function getPrimaryBatchIdFromBatchListOrder(batchListInPlatformOrder, batchDetailsById, failedBatchDetailIds) {
     const failedIds = new Set(failedBatchDetailIds);
-    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((batch) => {
-        if (failedIds.has(batch.batchId)) {
+    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((b) => {
+        if (failedIds.has(b.batchId)) {
             return false;
         }
-        const details = batchDetailsById[batch.batchId];
-        if (details != null &&
-            details.status === 'completed' &&
-            batchDetailsHasUnmatchedWork(details)) {
+        const d = batchDetailsById[b.batchId];
+        if (d != null &&
+            d.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(d)) {
             return true;
         }
-        return details == null && batchListItemHasUnmatchedWork(batch);
+        return d == null && batchListItemHasUnmatchedWork(b);
     });
     for (const batch of batchListInPlatformOrder) {
         if (failedIds.has(batch.batchId)) {
@@ -292,7 +270,7 @@ function resolveBatchFile(file, batchId, transactionState) {
             ? { transaction, matchScore: ref.matchScore }
             : undefined;
     })
-        .filter((candidate) => candidate != null);
+        .filter((c) => c != null);
     return {
         attachmentId: file.attachmentId,
         batchId,

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,31 +13,13 @@ export interface MissingReceiptsViewUIState {
     sortKey: MissingReceiptsSortKey;
     sortOrder: SortOrder;
 }
-/**
- * Minimum trimmed query length before manual-match search calls the expense-automation API.
- * Kept in sync with `ManualSearchInput` in web-components (fires search only when length ≥ this).
- */
-export declare const MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = 2;
-export declare const toBatchStatusValue: (v: string) => "pending" | "processing" | "completed";
-export type BatchStatusValue = ReturnType<typeof toBatchStatusValue>;
-/** Canonical batch file statuses (API ingress may use aliases; see `parseBatchFileStatus`). */
-export declare const BATCH_FILE_STATUSES: readonly ["exact_match", "possible_matches", "no_match", "failed"];
-export declare const toBatchFileStatus: (v: string) => "failed" | "exact_match" | "possible_matches" | "no_match";
-export type BatchFileStatus = ReturnType<typeof toBatchFileStatus>;
-/** True for files that belong in the Unmatched tab (possible matches or no match). */
-export declare function isUnmatchedTabFileStatus(status: BatchFileStatus): boolean;
-export declare const toBulkUploadPhase: (v: string) => "completed" | "idle" | "uploading" | "matching";
-export type BulkUploadPhase = ReturnType<typeof toBulkUploadPhase>;
-export declare const toBulkUploadResultsTab: (v: string) => "completed" | "unmatched";
-export type BulkUploadResultsTab = ReturnType<typeof toBulkUploadResultsTab>;
-export declare const toMissingReceiptsTab: (v: string) => "completed" | "unmatched" | "missing";
-export type MissingReceiptsTab = ReturnType<typeof toMissingReceiptsTab>;
-export declare const toCompletedSubTab: (v: string) => "all" | "manual" | "ai_accountant";
-export type CompletedSubTab = ReturnType<typeof toCompletedSubTab>;
-export declare const toMatchSource: (v: string) => "manual" | "ai";
-export type MatchSource = ReturnType<typeof toMatchSource>;
-export declare const toBulkUploadSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class";
-export type BulkUploadSortKey = ReturnType<typeof toBulkUploadSortKey>;
+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;
@@ -116,8 +99,7 @@ export interface ManualSearchState {
     searchQuery: string;
     totalCount: number;
 }
-/** Same union as {@link CompletedSubTab} — used for completed-transactions API `match_type`. */
-export type CompletedTransactionsMatchType = CompletedSubTab;
+export type CompletedTransactionsMatchType = 'all' | 'ai_accountant' | 'manual';
 export interface CompletedTransactionsState {
     fetchState: FetchStateAndError;
     nextPageToken: string | null;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBulkUploadSortKey = exports.toMatchSource = exports.toCompletedSubTab = exports.toMissingReceiptsTab = exports.toBulkUploadResultsTab = exports.toBulkUploadPhase = exports.toBatchFileStatus = exports.BATCH_FILE_STATUSES = exports.toBatchStatusValue = exports.MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = exports.toMissingReceiptsSortKey = void 0;
-exports.isUnmatchedTabFileStatus = isUnmatchedTabFileStatus;
+exports.toMissingReceiptsSortKey = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const MISSING_RECEIPTS_SORT_KEYS = [
     'vendor',
@@ -12,50 +11,3 @@ const MISSING_RECEIPTS_SORT_KEYS = [
 ];
 const toMissingReceiptsSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, MISSING_RECEIPTS_SORT_KEYS);
 exports.toMissingReceiptsSortKey = toMissingReceiptsSortKey;
-// -- Bulk Receipt Upload Types --
-/**
- * Minimum trimmed query length before manual-match search calls the expense-automation API.
- * Kept in sync with `ManualSearchInput` in web-components (fires search only when length ≥ this).
- */
-exports.MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = 2;
-const BATCH_STATUS_VALUES = ['pending', 'processing', 'completed'];
-const toBatchStatusValue = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BATCH_STATUS_VALUES);
-exports.toBatchStatusValue = toBatchStatusValue;
-/** Canonical batch file statuses (API ingress may use aliases; see `parseBatchFileStatus`). */
-exports.BATCH_FILE_STATUSES = [
-    'exact_match',
-    'possible_matches',
-    'no_match',
-    'failed',
-];
-const toBatchFileStatus = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase().replace(/-/g, '_'), exports.BATCH_FILE_STATUSES);
-exports.toBatchFileStatus = toBatchFileStatus;
-const UNMATCHED_TAB_FILE_STATUSES = ['possible_matches', 'no_match'];
-/** True for files that belong in the Unmatched tab (possible matches or no match). */
-function isUnmatchedTabFileStatus(status) {
-    return UNMATCHED_TAB_FILE_STATUSES.includes(status);
-}
-const BULK_UPLOAD_PHASES = ['idle', 'uploading', 'matching', 'completed'];
-const toBulkUploadPhase = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_PHASES);
-exports.toBulkUploadPhase = toBulkUploadPhase;
-const BULK_UPLOAD_RESULTS_TABS = ['completed', 'unmatched'];
-const toBulkUploadResultsTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_RESULTS_TABS);
-exports.toBulkUploadResultsTab = toBulkUploadResultsTab;
-const MISSING_RECEIPTS_TABS = ['missing', 'completed', 'unmatched'];
-const toMissingReceiptsTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), MISSING_RECEIPTS_TABS);
-exports.toMissingReceiptsTab = toMissingReceiptsTab;
-const COMPLETED_SUB_TABS = ['all', 'ai_accountant', 'manual'];
-const toCompletedSubTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), COMPLETED_SUB_TABS);
-exports.toCompletedSubTab = toCompletedSubTab;
-const MATCH_SOURCES = ['ai', 'manual'];
-const toMatchSource = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), MATCH_SOURCES);
-exports.toMatchSource = toMatchSource;
-const BULK_UPLOAD_SORT_KEYS = [
-    'amount',
-    'category',
-    'class',
-    'date',
-    'vendor',
-];
-const toBulkUploadSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_SORT_KEYS);
-exports.toBulkUploadSortKey = toBulkUploadSortKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.84-betaVR16",
+  "version": "4.19.84-betaVR2",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",

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

@@ -1,10 +0,0 @@
-/**
- * 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;

package/lib/view/expenseAutomationView/bulkUploadTiming.d.ts

@@ -1,10 +0,0 @@
-/**
- * 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 declare 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 declare const BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS = 300000;

package/lib/view/expenseAutomationView/bulkUploadTiming.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS = exports.BULK_UPLOAD_BAR_COMPLETE_HOLD_MS = void 0;
-/**
- * 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.
- */
-exports.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.
- */
-exports.BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS = 300000;