@zeniai/client-epic-state 5.1.37-betaRD3 → 5.1.38

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

@@ -0,0 +1,313 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyStatementParseFormChange = exports.toStatementUpdateLocalDataFromFormView = exports.getStatementParseFormView = exports.mergeStatementParseDeletedTransactionIds = exports.areStatementParseBalancesConsistent = exports.resolveStatementParseBalanceFields = exports.shouldRecalculateStatementParseBalances = exports.isStatementParseManualBalanceField = exports.isStatementParseTransactionFieldChange = exports.getDateFilteredDeletedTransactionIds = exports.getStatementTransactionPeriodById = exports.getParsedStatementDataForView = exports.filterStatementTransactionsByPeriod = exports.isStatementTransactionInPeriod = exports.getEffectiveStatementPeriod = void 0;
+const zeniDayJS_1 = require("../../../zeniDayJS");
+const getEffectiveStatementPeriod = (parsedMeta, localMeta) => ({
+    statementStartDate: localMeta?.statementStartDate != null && localMeta.statementStartDate !== ''
+        ? localMeta.statementStartDate
+        : parsedMeta.statementStartDate,
+    statementEndDate: localMeta?.statementEndDate != null && localMeta.statementEndDate !== ''
+        ? localMeta.statementEndDate
+        : parsedMeta.statementEndDate,
+});
+exports.getEffectiveStatementPeriod = getEffectiveStatementPeriod;
+const isStatementTransactionInPeriod = (transactionDate, statementStartDate, statementEndDate) => {
+    if (statementStartDate === '' ||
+        statementEndDate === '' ||
+        transactionDate === '') {
+        return true;
+    }
+    const txn = (0, zeniDayJS_1.date)(transactionDate).startOf('day');
+    const start = (0, zeniDayJS_1.date)(statementStartDate).startOf('day');
+    const end = (0, zeniDayJS_1.date)(statementEndDate).startOf('day');
+    return txn.isSameOrAfter(start, 'day') && txn.isSameOrBefore(end, 'day');
+};
+exports.isStatementTransactionInPeriod = isStatementTransactionInPeriod;
+const filterStatementTransactionsByPeriod = (transactions, statementPeriod) => {
+    const { statementStartDate, statementEndDate } = statementPeriod;
+    if (statementStartDate === '' || statementEndDate === '') {
+        return transactions;
+    }
+    return transactions.filter((transaction) => (0, exports.isStatementTransactionInPeriod)(transaction.transactionDate, statementStartDate, statementEndDate));
+};
+exports.filterStatementTransactionsByPeriod = filterStatementTransactionsByPeriod;
+const getParsedStatementDataForView = (parsedStatementData, statementUpdateLocalData) => {
+    if (parsedStatementData == null) {
+        return undefined;
+    }
+    const statementUpload = parsedStatementData.statementUpload;
+    if (statementUpload == null) {
+        return undefined;
+    }
+    const parsedMeta = statementUpload.statementMeta;
+    const localMeta = statementUpdateLocalData?.statementMeta;
+    const effectiveMeta = localMeta ?? parsedMeta;
+    const statementPeriod = (0, exports.getEffectiveStatementPeriod)(parsedMeta, localMeta);
+    return {
+        statementUpload: {
+            ...statementUpload,
+            statementMeta: effectiveMeta,
+            statementTransactions: (0, exports.filterStatementTransactionsByPeriod)(statementUpload.statementTransactions, statementPeriod),
+        },
+    };
+};
+exports.getParsedStatementDataForView = getParsedStatementDataForView;
+const getStatementTransactionPeriodById = (allParsedTransactions, parsedMeta, localMeta) => {
+    const statementPeriod = (0, exports.getEffectiveStatementPeriod)(parsedMeta, localMeta);
+    return Object.fromEntries(allParsedTransactions
+        .filter((transaction) => transaction.statementTransactionId !== '')
+        .map((transaction) => [
+        transaction.statementTransactionId,
+        (0, exports.isStatementTransactionInPeriod)(transaction.transactionDate, statementPeriod.statementStartDate, statementPeriod.statementEndDate),
+    ]));
+};
+exports.getStatementTransactionPeriodById = getStatementTransactionPeriodById;
+const getDateFilteredDeletedTransactionIds = (allParsedTransactions, statementPeriod) => {
+    if (statementPeriod.statementStartDate === '' ||
+        statementPeriod.statementEndDate === '') {
+        return [];
+    }
+    return allParsedTransactions
+        .filter((transaction) => transaction.statementTransactionId !== '' &&
+        !(0, exports.isStatementTransactionInPeriod)(transaction.transactionDate, statementPeriod.statementStartDate, statementPeriod.statementEndDate))
+        .map((transaction) => transaction.statementTransactionId);
+};
+exports.getDateFilteredDeletedTransactionIds = getDateFilteredDeletedTransactionIds;
+const roundCurrency = (value) => Math.round(value * 100) / 100;
+const toApiDateString = (value) => {
+    if (value == null || value === '') {
+        return '';
+    }
+    return (0, zeniDayJS_1.date)(value).format('YYYY-MM-DD');
+};
+const computeStatementTransactionTotals = (transactions) => {
+    const totalDeposits = roundCurrency(transactions
+        .filter((txn) => txn.transactionDirection === 'credit')
+        .reduce((sum, txn) => sum + Math.abs(txn.amount ?? 0), 0));
+    const totalPayments = roundCurrency(transactions
+        .filter((txn) => txn.transactionDirection === 'debit')
+        .reduce((sum, txn) => sum + Math.abs(txn.amount ?? 0), 0));
+    return { totalDeposits, totalPayments };
+};
+const computeStatementClosingBalance = (openingBalance, totalDeposits, totalPayments) => roundCurrency(openingBalance + totalDeposits - totalPayments);
+const filterFormTransactionsInPeriod = (transactions, statementStartDate, statementEndDate) => {
+    if (statementStartDate === '' || statementEndDate === '') {
+        return transactions;
+    }
+    const periodStart = (0, zeniDayJS_1.date)(statementStartDate).startOf('day');
+    const periodEnd = (0, zeniDayJS_1.date)(statementEndDate).startOf('day');
+    return transactions.filter((txn) => {
+        if (txn.transactionDate === '') {
+            return true;
+        }
+        const txnDate = (0, zeniDayJS_1.date)(txn.transactionDate).startOf('day');
+        return (txnDate.isSameOrAfter(periodStart, 'day') &&
+            txnDate.isSameOrBefore(periodEnd, 'day'));
+    });
+};
+const isStatementParseTransactionFieldChange = (changedField) => changedField === 'transactions' ||
+    changedField?.startsWith('transactions.') === true;
+exports.isStatementParseTransactionFieldChange = isStatementParseTransactionFieldChange;
+const isStatementParseBalanceAffectingTransactionFieldChange = (changedField) => {
+    if (changedField === 'transactions') {
+        return true;
+    }
+    if (changedField?.startsWith('transactions.') !== true) {
+        return false;
+    }
+    return !changedField.endsWith('.transactionMemo');
+};
+const isStatementParseManualBalanceField = (field) => field === 'totalDeposits' ||
+    field === 'totalPayments' ||
+    field === 'closingBalance';
+exports.isStatementParseManualBalanceField = isStatementParseManualBalanceField;
+const shouldRecalculateStatementParseBalances = (changedField) => isStatementParseBalanceAffectingTransactionFieldChange(changedField) ||
+    changedField === 'statementStartDate' ||
+    changedField === 'statementEndDate';
+exports.shouldRecalculateStatementParseBalances = shouldRecalculateStatementParseBalances;
+const resolveStatementParseBalanceFields = (formView, changedField) => {
+    const inPeriodTransactions = filterFormTransactionsInPeriod(formView.transactions, formView.statementStartDate, formView.statementEndDate);
+    const { totalDeposits, totalPayments } = computeStatementTransactionTotals(inPeriodTransactions);
+    if (!(0, exports.shouldRecalculateStatementParseBalances)(changedField)) {
+        return {
+            openingBalance: formView.openingBalance,
+            closingBalance: formView.closingBalance,
+            totalDeposits: formView.totalDeposits,
+            totalPayments: formView.totalPayments,
+        };
+    }
+    return {
+        openingBalance: formView.openingBalance,
+        totalDeposits,
+        totalPayments,
+        closingBalance: computeStatementClosingBalance(formView.openingBalance, totalDeposits, totalPayments),
+    };
+};
+exports.resolveStatementParseBalanceFields = resolveStatementParseBalanceFields;
+const areStatementParseBalancesConsistent = (formView) => {
+    const { totalDeposits, totalPayments } = computeStatementTransactionTotals(filterFormTransactionsInPeriod(formView.transactions, formView.statementStartDate, formView.statementEndDate));
+    return (roundCurrency(formView.closingBalance) ===
+        computeStatementClosingBalance(formView.openingBalance, totalDeposits, totalPayments));
+};
+exports.areStatementParseBalancesConsistent = areStatementParseBalancesConsistent;
+const mapParsedTransactionToFormRow = (transaction, index) => ({
+    id: transaction.statementTransactionId || `parsed-${index}`,
+    transactionDate: toApiDateString(transaction.transactionDate),
+    transactionMemo: transaction.transactionMemo,
+    amount: transaction.amount,
+    transactionDirection: transaction.transactionDirection,
+    statementTransactionId: transaction.statementTransactionId,
+});
+const mapLocalTransactionToFormRow = (transaction, id) => ({
+    id,
+    transactionDate: toApiDateString(transaction.transactionDate),
+    transactionMemo: transaction.transactionMemo,
+    amount: transaction.amount,
+    transactionDirection: transaction.transactionDirection,
+    statementTransactionId: transaction.statementTransactionId,
+});
+const buildStatementParseFormTransactions = (originalTransactions, localData) => {
+    const deletedIdSet = new Set(localData.statementTransactions?.deletedIds ?? []);
+    const updatedById = new Map((localData.statementTransactions?.updated ?? [])
+        .filter((transaction) => transaction.statementTransactionId != null)
+        .map((transaction) => [
+        transaction.statementTransactionId,
+        transaction,
+    ]));
+    const persistedTransactions = originalTransactions
+        .filter((transaction) => !deletedIdSet.has(transaction.statementTransactionId))
+        .map((transaction, index) => {
+        const updated = updatedById.get(transaction.statementTransactionId);
+        return updated != null
+            ? mapLocalTransactionToFormRow(updated, transaction.statementTransactionId)
+            : mapParsedTransactionToFormRow(transaction, index);
+    });
+    const addedTransactions = (localData.statementTransactions?.added ?? []).map((transaction, index) => mapLocalTransactionToFormRow(transaction, `added-${index}`));
+    return [...persistedTransactions, ...addedTransactions];
+};
+const mergeStatementParseDeletedTransactionIds = (originalTransactions, statementPeriod, currentTransactionIds) => {
+    const dateFilteredDeletedIds = (0, exports.getDateFilteredDeletedTransactionIds)(originalTransactions, statementPeriod);
+    const dateFilteredDeletedIdSet = new Set(dateFilteredDeletedIds);
+    const userDeletedIds = originalTransactions
+        .filter((transaction) => transaction.statementTransactionId !== '' &&
+        !currentTransactionIds.has(transaction.statementTransactionId) &&
+        !dateFilteredDeletedIdSet.has(transaction.statementTransactionId))
+        .map((transaction) => transaction.statementTransactionId);
+    return [...new Set([...userDeletedIds, ...dateFilteredDeletedIds])];
+};
+exports.mergeStatementParseDeletedTransactionIds = mergeStatementParseDeletedTransactionIds;
+const resolveStatementMetaDates = (parsedStatementMeta, localMeta) => ({
+    statementStartDate: localMeta?.statementStartDate != null && localMeta.statementStartDate !== ''
+        ? localMeta.statementStartDate
+        : (parsedStatementMeta?.statementStartDate ?? ''),
+    statementEndDate: localMeta?.statementEndDate != null && localMeta.statementEndDate !== ''
+        ? localMeta.statementEndDate
+        : (parsedStatementMeta?.statementEndDate ?? ''),
+});
+const getStatementParseFormView = ({ parsedStatementMeta, originalTransactions, statementUpdateLocalData, }) => {
+    const transactions = statementUpdateLocalData != null
+        ? buildStatementParseFormTransactions(originalTransactions, statementUpdateLocalData)
+        : originalTransactions.map(mapParsedTransactionToFormRow);
+    const localMeta = statementUpdateLocalData?.statementMeta;
+    const { statementStartDate, statementEndDate } = resolveStatementMetaDates(parsedStatementMeta, localMeta);
+    const { totalDeposits, totalPayments } = computeStatementTransactionTotals(filterFormTransactionsInPeriod(transactions, statementStartDate, statementEndDate));
+    const openingBalance = localMeta?.openingBalance ?? parsedStatementMeta?.openingBalance ?? 0;
+    const computedClosingBalance = computeStatementClosingBalance(openingBalance, totalDeposits, totalPayments);
+    return {
+        statementStartDate,
+        statementEndDate,
+        openingBalance,
+        closingBalance: localMeta?.closingBalance ?? computedClosingBalance,
+        totalDeposits: localMeta?.totalDeposits ?? totalDeposits,
+        totalPayments: localMeta?.totalPayments ?? totalPayments,
+        transactions: filterFormTransactionsInPeriod(transactions, statementStartDate, statementEndDate),
+    };
+};
+exports.getStatementParseFormView = getStatementParseFormView;
+const toStatementUpdateLocalDataFromFormView = ({ formView, parsedStatementMeta, originalTransactions, changedField, }) => {
+    const balanceFields = (0, exports.resolveStatementParseBalanceFields)(formView, changedField);
+    const currentTransactionIds = new Set(formView.transactions
+        .map((transaction) => transaction.statementTransactionId)
+        .filter((id) => id != null && id !== ''));
+    const added = [];
+    const updated = [];
+    formView.transactions.forEach((transaction) => {
+        const transactionDate = toApiDateString(transaction.transactionDate);
+        if (transaction.statementTransactionId == null) {
+            if (transaction.transactionDirection != null) {
+                added.push({
+                    amount: transaction.amount,
+                    transactionDate,
+                    transactionDirection: transaction.transactionDirection,
+                    transactionMemo: transaction.transactionMemo,
+                });
+            }
+            return;
+        }
+        const original = originalTransactions.find((candidate) => candidate.statementTransactionId === transaction.statementTransactionId);
+        if (original != null &&
+            (original.amount !== transaction.amount ||
+                toApiDateString(original.transactionDate) !== transactionDate ||
+                original.transactionMemo !== transaction.transactionMemo)) {
+            updated.push({
+                amount: transaction.amount,
+                transactionDate,
+                transactionDirection: transaction.transactionDirection,
+                transactionMemo: transaction.transactionMemo,
+                statementTransactionId: transaction.statementTransactionId,
+            });
+        }
+    });
+    const statementPeriod = {
+        statementStartDate: toApiDateString(formView.statementStartDate),
+        statementEndDate: toApiDateString(formView.statementEndDate),
+    };
+    const deletedIds = (0, exports.mergeStatementParseDeletedTransactionIds)(originalTransactions, statementPeriod, currentTransactionIds);
+    const deletedIdSet = new Set(deletedIds);
+    const inPeriodAdded = filterFormTransactionsInPeriod(added, statementPeriod.statementStartDate, statementPeriod.statementEndDate);
+    const inPeriodUpdated = updated.filter((transaction) => transaction.statementTransactionId != null &&
+        !deletedIdSet.has(transaction.statementTransactionId));
+    return {
+        statementMeta: {
+            closingBalance: balanceFields.closingBalance,
+            openingBalance: balanceFields.openingBalance,
+            statementDataStatus: parsedStatementMeta?.statementDataStatus ?? {
+                code: '',
+                label: '',
+            },
+            statementEndDate: statementPeriod.statementEndDate,
+            statementStartDate: statementPeriod.statementStartDate,
+            statementStatus: parsedStatementMeta?.statementStatus ?? {
+                code: '',
+                label: '',
+            },
+            statementUploadId: parsedStatementMeta?.statementUploadId ?? '',
+            totalDeposits: balanceFields.totalDeposits,
+            totalPayments: balanceFields.totalPayments,
+        },
+        statementTransactions: {
+            added: inPeriodAdded,
+            deletedIds,
+            updated: inPeriodUpdated,
+        },
+    };
+};
+exports.toStatementUpdateLocalDataFromFormView = toStatementUpdateLocalDataFromFormView;
+const applyStatementParseFormChange = ({ formView, changedField, parsedStatementMeta, originalTransactions, }) => {
+    const balanceFields = (0, exports.resolveStatementParseBalanceFields)(formView, changedField);
+    const shouldRecalculate = (0, exports.shouldRecalculateStatementParseBalances)(changedField);
+    const mergedFormView = shouldRecalculate
+        ? { ...formView, ...balanceFields }
+        : formView;
+    return {
+        didRecalculateBalances: shouldRecalculate,
+        formView: mergedFormView,
+        localData: (0, exports.toStatementUpdateLocalDataFromFormView)({
+            formView: mergedFormView,
+            parsedStatementMeta,
+            originalTransactions,
+            changedField,
+        }),
+    };
+};
+exports.applyStatementParseFormChange = applyStatementParseFormChange;

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

@@ -198,28 +198,15 @@ function getExpenseAutomationTransactionView(state) {
     };
     // Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
     // listing response and used exclusively by the navbar / tab strip badges.
-    // When a search or filter is active the badge switches to the filtered count
-    // so the number tracks what the user is looking at.
-    const autoCatTabView = expenseAutomationTransactionsViewState.transactionCategorizationView
-        .autoCategorized;
-    const reviewTabView = expenseAutomationTransactionsViewState.transactionCategorizationView.review;
-    const autoCatSubTabCache = expenseAutomationTransactionsViewState.autoCategorizedSubTabCache;
-    const autoCatFilterActive = autoCatTabView.uiState.searchString !== '' ||
-        autoCatTabView.filters.categories.length > 0;
-    const reviewFilterActive = reviewTabView.uiState.searchString !== '' ||
-        reviewTabView.filters.categories.length > 0;
+    // Independent of which Completed sub-tab is active so the badge stays
+    // stable across sub-tab switches.
     const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
     const parentTabTotalCountByTab = {
         review: monthYearPeriodId != null
-            ? reviewFilterActive
-                ? totalCountByReview[monthYearPeriodId]
-                : (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
+            ? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
             : 0,
         autoCategorized: monthYearPeriodId != null
-            ? autoCatFilterActive
-                ? (autoCatSubTabCache['all']?.totalCount[monthYearPeriodId] ??
-                    totalCountByAutoCat[monthYearPeriodId])
-                : (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
+            ? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
             : 0,
     };
     const fetchStateByTab = {
@@ -262,13 +249,7 @@ function getExpenseAutomationTransactionView(state) {
         isAccountingProjectsEnabled,
         projectList,
         transactionLocalData: filteredTransactionLocalData,
-        // When a client-side category filter is active the server pageToken is
-        // misleading — the server has more pages but the filter already reduces
-        // what's visible. Masking pageToken here prevents the skeleton "loading"
-        // row from appearing when the user is looking at a filtered result set.
-        uiState: filters.categories.length > 0
-            ? { ...uiState, pageToken: null }
-            : uiState,
+        uiState,
         refreshStatus,
         saveStatus,
         markAsNotMiscategorizedStatus,

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

@@ -232,7 +232,6 @@ export interface ReconciliationViewState extends FetchStateAndError {
     reconTabsState: ReconciliationTabsState;
     refreshStatus: FetchStateAndError;
     selectedTab: ReconciliationViewTabType;
-    statementProcessingFailed: boolean;
     statementUploadChosen: boolean;
     selectedAccountId?: ID;
     selectedDrawerAccountId?: ID;
@@ -259,12 +258,53 @@ export interface StatementTransactionsUpdate {
     deletedIds: string[];
     updated: StatementTransactionForUpdate[];
 }
+export type StatementParseManualBalanceField = 'totalDeposits' | 'totalPayments' | 'closingBalance';
+export interface StatementParseFormTransaction {
+    amount: number;
+    id: string;
+    transactionDate: string;
+    transactionDirection: 'debit' | 'credit';
+    transactionMemo: string;
+    statementTransactionId?: string;
+}
+export interface StatementParseFormView {
+    closingBalance: number;
+    openingBalance: number;
+    statementEndDate: string;
+    statementStartDate: string;
+    totalDeposits: number;
+    totalPayments: number;
+    transactions: StatementParseFormTransaction[];
+}
+export interface GetStatementParseFormViewInput {
+    originalTransactions: StatementTransaction[];
+    parsedStatementMeta: StatementMeta | undefined;
+    statementUpdateLocalData: StatementUpdateLocalData | undefined;
+}
+export interface ToStatementUpdateLocalDataFromFormViewInput {
+    formView: StatementParseFormView;
+    originalTransactions: StatementTransaction[];
+    parsedStatementMeta: StatementMeta | undefined;
+    changedField?: string;
+}
+export interface ApplyStatementParseFormChangeInput {
+    formView: StatementParseFormView;
+    originalTransactions: StatementTransaction[];
+    parsedStatementMeta: StatementMeta | undefined;
+    changedField?: string;
+}
+export interface ApplyStatementParseFormChangeResult {
+    didRecalculateBalances: boolean;
+    formView: StatementParseFormView;
+    localData: StatementUpdateLocalData;
+}
 export interface StatementUpdateLocalData {
     statementMeta: StatementMeta;
     statementTransactions: StatementTransactionsUpdate;
 }
 export interface StatementUpdateLocalDataPayload {
     statement_meta: {
+        closing_balance: number;
         opening_balance: number;
         statement_end_date: string;
         statement_start_date: string;
@@ -299,15 +339,25 @@ export interface AccountReconciliationDataWithTransactionFetchState {
     reparseStatementStatus: FetchStateAndError;
     statementDateConflict: StatementDateConflict | null;
     statementDeleteStatus: FetchStateAndError;
-    /** Derived from bank_status.code === 'parsing' for read-only list/drawer banners. */
+    /** True while statement upload/parse/reparse is in flight (local + entity signals). */
     statementParseInProgress: boolean;
     /** Client-driven fetch state for the parseStatement epic (In-Progress/Completed/Error). */
     statementParseStatus: FetchStateAndError;
+    /** Step progress saved when user continues parsing in background. */
+    statementProcessingBackgroundCompletedSteps: number;
+    /** User dismissed StatementProcessingPage via Continue in Background. */
+    statementProcessingDismissedToBackground: boolean;
+    /** True when statement upload/parse failed for this account (drives drawer error popup). */
+    statementProcessingFailed: boolean;
     statementUpdateStatus: FetchStateAndError;
     statementUploadStatus: FetchStateAndError;
     transactionFetchState: FetchStateAndError;
     accountDetectionReason?: string;
     parsedStatementData?: ParsedStatementData;
     reconciliationId?: ID;
+    /** Wall-clock start used to recompute UI step progress after backgrounding. */
+    statementProcessingStartedAtMs?: number;
+    /** Locked countdown duration (seconds) paired with startedAtMs. */
+    statementProcessingTotalDurationSeconds?: number;
 }
 export {};

package/package.json

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