@zeniai/client-epic-state 5.0.24 → 5.0.25-beta0ND

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

@@ -33,11 +33,15 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
     const queryPayload = {
         start_date: period.start,
         end_date: period.end,
-        sort_by: sortKey,
-        sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
+    if (sortKey != null) {
+        queryPayload.sort_by = sortKey;
+    }
+    if (sortOrder != null) {
+        queryPayload.sort_order = sortOrder === 'ascending' ? 'asc' : 'desc';
+    }
     if (completedSubTab !== 'all') {
         queryPayload.match_type = completedSubTab;
     }

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

@@ -35,12 +35,17 @@ const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI) => {
         const state = state$.value;
         const { expenseAutomationMissingReceiptsViewState: { bulkUpload: { manualSearch, sortKey, sortOrder }, }, } = state;
         const { end, start } = (0, rollingCalendarDateRangeInclusive_1.rollingCalendarDateRangeInclusive)(MANUAL_SEARCH_TRANSACTION_DATE_RANGE_DAYS);
+        // Manual search is independent of the Completed tab's optional sort: when the
+        // bulk upload sort is neutral (no user-applied sort), fall back to date/desc so
+        // search results stay deterministic for the matching UX.
+        const manualSearchSortKey = sortKey ?? 'date';
+        const manualSearchSortOrder = sortOrder ?? 'descending';
         const queryParam = {
             start_date: start,
             end_date: end,
             auto_categorized: exports.MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED,
-            sort_by: (0, transactionsViewState_1.toTransactionsSortKey)(sortKey),
-            sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
+            sort_by: (0, transactionsViewState_1.toTransactionsSortKey)(manualSearchSortKey),
+            sort_order: manualSearchSortOrder === 'ascending' ? 'asc' : 'desc',
             page_token: pageToken ?? null,
             page_size: manualSearch.pageSize,
             search_text: query,

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

@@ -4,11 +4,13 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof restoreBulkUploadMatchingState> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof requestMissingReceiptsTabNavigation> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload> | ReturnType<typeof openSnackbar> | ReturnType<typeof bulkUploadAutomatchingTimedOut>;
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, restoreBulkUploadMatchingState } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof restoreBulkUploadMatchingState> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload> | ReturnType<typeof openSnackbar> | ReturnType<typeof bulkUploadAutomatchingTimedOut>;
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
- * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
+ * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs).
+ * Debounced to reduce duplicate refreshes. The post-match tab decision
+ * (Unmatched vs Completed) is made client-side in `ExpenseAutomationPage` once fresh
+ * batch details land -- do not dispatch `requestMissingReceiptsTabNavigation` here.
  */
 export declare const pusherBatchStatusCompletionEpic: (actions$: ActionsObservable<ActionType>) => Observable<ActionType>;
 /**

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

@@ -15,15 +15,16 @@ const FALLBACK_FIRST_DELAY_MS = 30000;
 const RESTORE_FIRST_DELAY_MS = 5000;
 const FALLBACK_POLL_INTERVAL_MS = 10000;
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
- * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
+ * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs).
+ * Debounced to reduce duplicate refreshes. The post-match tab decision
+ * (Unmatched vs Completed) is made client-side in `ExpenseAutomationPage` once fresh
+ * batch details land -- do not dispatch `requestMissingReceiptsTabNavigation` here.
  */
 const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match), (0, operators_1.filter)((action) => action.payload.status === 'completed'), (0, operators_1.debounceTime)(300), (0, operators_1.mergeMap)(() => (0, rxjs_1.from)([
     (0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)({
         cacheOverride: true,
         invalidateBatchDetailsCache: true,
     }),
-    (0, missingReceiptsViewReducer_1.requestMissingReceiptsTabNavigation)({ tab: 'unmatched' }),
 ])));
 exports.pusherBatchStatusCompletionEpic = pusherBatchStatusCompletionEpic;
 /**
@@ -81,7 +82,6 @@ const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.p
                 }
                 actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess)((0, missingReceiptsPayload_1.toBatchDetails)(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
                 actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)({ cacheOverride: true }));
-                actions.push((0, missingReceiptsViewReducer_1.requestMissingReceiptsTabNavigation)({ tab: 'unmatched' }));
                 return (0, rxjs_1.from)(actions);
             }
         }

package/lib/view/expenseAutomationView/reducers/missingReceiptsViewReducer.d.ts

@@ -7,7 +7,7 @@ import { TransactionPayload } from '../../../entity/transaction/payloadTypes/tra
 import { SupportedTransactionPayload } from '../../../entity/transaction/transactionState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { type BatchDetails, type BatchListItem, type BatchStatus, type BulkUploadResultsTab, type BulkUploadSortKey, type BulkUploadState, type CompletedSubTab, type ManualSearchResult, type MissingReceiptsViewState, type MissingReceiptsViewUIState } from '../types/missingReceiptsViewState';
-export declare const getCompletedTransactionsCacheKey: (periodId: MonthYearPeriodId, sortKey: BulkUploadSortKey, sortOrder: SortOrder, subTab: CompletedSubTab) => string;
+export declare const getCompletedTransactionsCacheKey: (periodId: MonthYearPeriodId, sortKey: BulkUploadSortKey | undefined, sortOrder: SortOrder | undefined, subTab: CompletedSubTab) => string;
 export declare const initialBulkUploadState: BulkUploadState;
 export declare const initialState: MissingReceiptsViewState;
 /** Epic trigger only; batch-details fetch is handled in epics. */
@@ -85,8 +85,8 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
 }, "expenseAutomationMissingReceiptsView/confirmBulkUploadMatchSuccess">, confirmBulkUploadMatchFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
 }, "expenseAutomationMissingReceiptsView/confirmBulkUploadMatchFailure">, setBulkUploadResultsTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"completed" | "unmatched", "expenseAutomationMissingReceiptsView/setBulkUploadResultsTab">, setBulkUploadCompletedSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"all" | "manual" | "ai_accountant", "expenseAutomationMissingReceiptsView/setBulkUploadCompletedSubTab">, setBulkUploadSortConfig: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    sortKey: BulkUploadSortKey;
-    sortOrder: SortOrder;
+    sortKey: BulkUploadSortKey | undefined;
+    sortOrder: SortOrder | undefined;
 }, "expenseAutomationMissingReceiptsView/setBulkUploadSortConfig">, clearBulkUpload: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearBulkUpload">, searchTransactionsForManualMatch: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[query: string, pageToken?: string | null | undefined], {
     query: string;
     pageToken: string | undefined;
@@ -105,16 +105,16 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
     isInitialLoad: boolean;
     nextPageToken: string | null;
     selectedPeriod: MonthYearPeriod;
-    sortKey: BulkUploadSortKey;
-    sortOrder: SortOrder;
+    sortKey: BulkUploadSortKey | undefined;
+    sortOrder: SortOrder | undefined;
     totalCount: number;
     transactionIds: ID[];
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactionsSuccess">, fetchCompletedTransactionsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     completedSubTab: CompletedSubTab;
     error: ZeniAPIStatus;
     selectedPeriod: MonthYearPeriod;
-    sortKey: BulkUploadSortKey;
-    sortOrder: SortOrder;
+    sortKey: BulkUploadSortKey | undefined;
+    sortOrder: SortOrder | undefined;
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactionsFailure">;
 declare const _default: import("redux").Reducer<MissingReceiptsViewState>;
 export default _default;

package/lib/view/expenseAutomationView/reducers/missingReceiptsViewReducer.js

@@ -5,7 +5,11 @@ exports.fetchCompletedTransactionsFailure = exports.fetchCompletedTransactionsSu
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
-const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => `completed-${subTab}-${sortKey}-${sortOrder === 'ascending' ? 'asc' : 'desc'}-${periodId}`;
+const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => {
+    const sortKeyPart = sortKey ?? 'none';
+    const sortOrderPart = sortOrder == null ? 'none' : sortOrder === 'ascending' ? 'asc' : 'desc';
+    return `completed-${subTab}-${sortKeyPart}-${sortOrderPart}-${periodId}`;
+};
 exports.getCompletedTransactionsCacheKey = getCompletedTransactionsCacheKey;
 exports.initialBulkUploadState = {
     batchDetailsById: {},
@@ -30,8 +34,8 @@ exports.initialBulkUploadState = {
         totalCount: 0,
     },
     phase: 'idle',
-    sortKey: 'date',
-    sortOrder: 'descending',
+    sortKey: undefined,
+    sortOrder: undefined,
     uploadedFileCount: 0,
     uploadProgress: 0,
     uploadStatus: { fetchState: 'Not-Started', error: undefined },

package/lib/view/expenseAutomationView/selectorTypes/missingReceiptsSelectorTypes.d.ts

@@ -48,12 +48,14 @@ export interface BulkUploadSelectorData {
         processed: number;
         total: number;
     };
-    sortKey: BulkUploadSortKey;
-    sortOrder: SortOrder;
+    sortKey: BulkUploadSortKey | undefined;
+    sortOrder: SortOrder | undefined;
     unmatchedFiles: ResolvedBatchFile[];
     uploadedFileCount: number;
     uploadProgress: number;
     uploadStatus: FetchStateAndError;
+    /** True iff `batchDetailsById[currentBatchId]` is populated -- signals post-match data is fresh. */
+    currentBatchDetailsFetched?: boolean;
     currentBatchId?: ID;
 }
 export interface ResolvedBatchDetails {

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

@@ -205,6 +205,8 @@ function getExpenseAutomationMissingReceiptsView(state) {
             batchDetails: resolvedBatchDetails,
             completedSubTab: bulkUpload.completedSubTab,
             currentBatchId: bulkUpload.currentBatchId,
+            currentBatchDetailsFetched: bulkUpload.currentBatchId != null &&
+                bulkUpload.batchDetailsById[bulkUpload.currentBatchId] != null,
             completedTransactions: {
                 fetchState: completedTransactionsForPeriod?.fetchState ?? {
                     fetchState: 'Not-Started',

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

@@ -145,8 +145,8 @@ export interface BulkUploadState {
     manualSearch: ManualSearchState;
     manualSearchUiResetKey: number;
     phase: BulkUploadPhase;
-    sortKey: BulkUploadSortKey;
-    sortOrder: SortOrder;
+    sortKey: BulkUploadSortKey | undefined;
+    sortOrder: SortOrder | undefined;
     uploadedFileCount: number;
     uploadProgress: number;
     uploadStatus: FetchStateAndError;

package/lib/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.d.ts

@@ -1,6 +1,20 @@
-import { ProfitAndLossByClassHorizontalReport } from './profitAndLossClassesByClassHorizontalSelectorTypes';
+import { COABalance } from '../../commonStateTypes/coaBalance/coaBalance';
+import { HorizontalAccountRow, ProfitAndLossByClassHorizontalReport } from './profitAndLossClassesByClassHorizontalSelectorTypes';
 /**
  * Populates `sectionHeaderBalancesSlice`, and per-account `accountReportData`, so the
  * web layer only maps selector output to tree nodes.
  */
 export declare function enrichProfitAndLossByClassHorizontalReport(report: ProfitAndLossByClassHorizontalReport): void;
+/**
+ * Sum balances across descendant accounts (recursive).
+ *
+ * Parent rows in the horizontal pivot only carry their own direct postings
+ * (zero for "container" accounts), so callers rendering "Total {parent}" rows
+ * must aggregate from descendants to get the real per-class totals.
+ *
+ * Returns one `COABalance` per class column + total (same shape as the
+ * enriched `balancesInTimeframe.balances`), with `amount` summed and `type`
+ * set to `default_with_null_balance` for zeros. Returns `[]` when no
+ * descendants have enriched data.
+ */
+export declare function aggregateHorizontalDescendantBalances(accounts: readonly HorizontalAccountRow[], childIndices: readonly number[], childrenByParent: Readonly<Record<number, readonly number[]>>): COABalance[];

package/lib/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enrichProfitAndLossByClassHorizontalReport = enrichProfitAndLossByClassHorizontalReport;
+exports.aggregateHorizontalDescendantBalances = aggregateHorizontalDescendantBalances;
 const currencyHelper_1 = require("../../commonStateTypes/currencyHelper");
 const horizontalSectionEmptyBalancesSlice_1 = require("./horizontalSectionEmptyBalancesSlice");
 const profitAndLossClassesByClassHorizontalSelectorTypes_1 = require("./profitAndLossClassesByClassHorizontalSelectorTypes");
@@ -118,6 +119,48 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
         },
     };
 }
+/**
+ * Sum balances across descendant accounts (recursive).
+ *
+ * Parent rows in the horizontal pivot only carry their own direct postings
+ * (zero for "container" accounts), so callers rendering "Total {parent}" rows
+ * must aggregate from descendants to get the real per-class totals.
+ *
+ * Returns one `COABalance` per class column + total (same shape as the
+ * enriched `balancesInTimeframe.balances`), with `amount` summed and `type`
+ * set to `default_with_null_balance` for zeros. Returns `[]` when no
+ * descendants have enriched data.
+ */
+function aggregateHorizontalDescendantBalances(accounts, childIndices, childrenByParent) {
+    let template;
+    const sums = new Map();
+    const walk = (idx) => {
+        const childRow = accounts[idx];
+        const childBalances = childRow?.accountReportData?.balancesInTimeframe.balances;
+        if (childBalances != null) {
+            if (template == null) {
+                template = childBalances;
+            }
+            childBalances.forEach((b, i) => {
+                sums.set(i, (sums.get(i) ?? 0) + (b.balance.amount ?? 0));
+            });
+            const grandChildren = childrenByParent[idx] ?? [];
+            grandChildren.forEach(walk);
+        }
+    };
+    childIndices.forEach(walk);
+    if (template == null) {
+        return [];
+    }
+    return template.map((tpl, i) => {
+        const amount = sums.get(i) ?? 0;
+        return {
+            ...tpl,
+            balance: { ...tpl.balance, amount },
+            type: amount === 0 ? 'default_with_null_balance' : 'default',
+        };
+    });
+}
 /**
  * Parent index per DFS row — O(n). Matches the scan in the former
  * `findHorizontalAccountParentIndex` (depth <= 2 rows have no parent).

package/lib/view/reportUIOptions/reportUIOptionsReducer.js

@@ -7,7 +7,7 @@ exports.initialState = {
     timeframe: 'month',
     thisPeriod: undefined,
     balancesOrder: 'ascending_date',
-    isCompareModeOn: true,
+    isCompareModeOn: false,
     maxNumOfPeriodsToHighlight: 0,
     compareMode: 'compare_mode_percent',
     selectedForecast: undefined,

package/lib/view/spendManagement/zeniAccounts/zeniAccountList/zeniAccountListSelector.js

@@ -14,7 +14,9 @@ const getZeniAccountList = (state) => {
         ...baseDepositAccountsSelectorView,
         depositAccounts: baseDepositAccountsSelectorView.depositAccounts.map((depositAccount) => ({
             ...depositAccount,
-            autoTransferRules: autotransferRulesState.rules.filter((rule) => !rule.isDeleted && rule.sourceBankAccountId === depositAccount.id),
+            autoTransferRules: autotransferRulesState.rules.filter((rule) => !rule.isDeleted &&
+                rule.isActive &&
+                rule.sourceBankAccountId === depositAccount.id),
         })),
     };
     const zeniAccountsConfig = (0, zeniAccountsConfigSelector_1.getZeniAccountsConfigDetail)(state);

package/package.json

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