@zeniai/client-epic-state 5.0.19 → 5.0.21-beta0ND

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

@@ -24,6 +24,7 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
     ongoingSchedules: JEScheduledTransaction[];
+    pendingReviewSchedules: (JEScheduledTransaction | JEScheduledTransactionWithFailedEntries)[];
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     resolveSchedules: JEScheduledTransactionWithFailedEntries[];

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

@@ -29,19 +29,33 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.jeScheduleType;
+            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
-            return (s) => s.baseTransaction.typeOfTransaction;
+            return (s) => s.jeScheduleType;
         case 'amortizationPeriod':
             return (s) => s.period;
         case 'jePostingDate':
-            return (s) => s.dayOfPostingDate;
+            return (s) => s.lastDayOfMonth === true
+                ? timePeriod_1.LAST_SCHEDULE_DAY_OF_MONTH
+                : (s.dayOfPostingDate ?? null);
         case 'remainingMonths':
-            return (s) => s.period;
+            return (s) => {
+                const total = s.period ?? 0;
+                const posted = Array.isArray(s.scheduledJournalEntry)
+                    ? s.scheduledJournalEntry.length
+                    : 0;
+                return total - posted;
+            };
         case 'runningBalance':
-            return (s) => s.balanceAsOfToday?.amount;
+            return (s) => {
+                const sje = s.scheduledJournalEntry;
+                if (sje != null && !Array.isArray(sje)) {
+                    return sje.runningBalance?.amount ?? null;
+                }
+                return s.balanceAsOfToday?.amount ?? null;
+            };
         case 'totalAmount':
             return (s) => s.baseTransaction.amount.amount;
         case 'transactionDate':
@@ -120,6 +134,11 @@ function getExpenseAutomationJESchedulesView(state) {
         });
     });
     const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
+    const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
+    const pendingReviewSchedules = sortJEScheduledTransactions([
+        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
+        ...validResolveForPending,
+    ], sortKey, sortOrder);
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -143,6 +162,7 @@ function getExpenseAutomationJESchedulesView(state) {
         completedSchedules,
         draftSchedules,
         ongoingSchedules,
+        pendingReviewSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

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/scheduleView/scheduleListView/scheduleListSelector.js

@@ -53,8 +53,13 @@ const sortedJETransactionsView = (jeTransactions, sortKey, sortOrder) => {
                 return jeTransaction.endDate != null
                     ? jeTransaction.endDate.valueOf()
                     : null;
-            case 'months':
-                return jeTransaction.period ?? null;
+            case 'months': {
+                const total = jeTransaction.period ?? 0;
+                const posted = Array.isArray(jeTransaction.scheduledJournalEntry)
+                    ? jeTransaction.scheduledJournalEntry.length
+                    : 0;
+                return total - posted;
+            }
             case 'transactionType':
                 return jeTransaction.baseTransaction.type.toLowerCase();
             case 'status':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.19",
+  "version": "5.0.21-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",