@zeniai/client-epic-state 5.1.72 → 5.1.73-betaRD2

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

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAiAccountantSchedule = void 0;
+exports.isAccruedScheduleRow = isAccruedScheduleRow;
 exports.getExpenseAutomationJESchedulesView = getExpenseAutomationJESchedulesView;
 const omit_1 = __importDefault(require("lodash/omit"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
@@ -10,6 +12,7 @@ const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState")
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
+const jeSchedulesTypes_1 = require("../../../entity/jeSchedules/jeSchedulesTypes");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
@@ -18,6 +21,37 @@ const scheduleDetailSelector_1 = require("../../scheduleView/scheduleDetailView/
 const scheduleListHelper_1 = require("../../scheduleView/scheduleListView/scheduleListHelper");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const jeAccountSettingsViewSelector_1 = require("./jeAccountSettingsViewSelector");
+const jeNewScheduleViewSelector_1 = require("./jeNewScheduleViewSelector");
+// Matches the AI-automation user addresses webc's schedule list row already
+// checks (JEScheduleReadOnlyListRow/JEScheduleDraftListRow "Method" column,
+// strings.ts aiBotEmail/botEmail) to determine whether a schedule was
+// created by the AI accountant vs. a human.
+const AI_BOT_EMAIL = 'ai@zeni.ai';
+const BOT_EMAIL = 'bot@zeni.ai';
+// Exported (rather than kept as a closure inside the selector) so it can be
+// unit-tested directly — confidenceScore is a separate, more narrowly
+// populated field that can be null on a schedule the bot user created,
+// which previously caused these schedules to display as "AI Accountant" in
+// the list but count under "Manual" in the KPI summary.
+const isAiAccountantSchedule = (schedule) => schedule.createdByUser?.email === AI_BOT_EMAIL ||
+    schedule.createdByUser?.email === BOT_EMAIL;
+exports.isAiAccountantSchedule = isAiAccountantSchedule;
+// Accrued schedules are structurally distinct — no baseTransaction, carrying recurringAmount and
+// memo in its place — so anything reading baseTransaction has to branch on this first.
+//
+// Discriminates on jeAccruedScheduleKey, which only JEAccruedSchedule carries. jeScheduleType
+// cannot be used: it is a data field present on BOTH row shapes, so an accrued-typed row that
+// arrived through the prepaid/fixed DTO (failed_je_postings, legacy fetches) would be
+// misclassified and then crash on recurringAmount / jeAccruedScheduleKey.
+function isAccruedScheduleRow(schedule) {
+    return 'jeAccruedScheduleKey' in schedule;
+}
+function getScheduleAmount(schedule) {
+    if (isAccruedScheduleRow(schedule)) {
+        return schedule.recurringAmount.amount;
+    }
+    return schedule.baseTransaction.amount.amount;
+}
 function getJEScheduleSortAccessor(sortKey) {
     switch (sortKey) {
         case 'vendor':
@@ -29,7 +63,9 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? undefined
+                : s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
@@ -57,11 +93,13 @@ function getJEScheduleSortAccessor(sortKey) {
                 return s.balanceAsOfToday?.amount ?? null;
             };
         case 'totalAmount':
-            return (s) => s.baseTransaction.amount.amount;
+            return (s) => getScheduleAmount(s);
         case 'transactionDate':
-            return (s) => s.baseTransaction.date.valueOf();
+            return (s) => s.createTime?.valueOf();
         case 'memo':
-            return (s) => s.baseTransaction.memo?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? s.memo.toLowerCase()
+                : s.baseTransaction.memo?.toLowerCase();
         default:
             return (s) => s.startDate?.valueOf();
     }
@@ -73,9 +111,14 @@ function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
 function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
+    const accruedSchedules = [];
     const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
-    const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
+    const { jeScheduleTransactionKeysByPeriod, jeScheduleAccruedKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = (0, jeAccountSettingsViewSelector_1.getJEAccountSettingsView)(state);
+    const newScheduleView = newSchedule.selectedDetailScheduleType === 'fixed_assets' ||
+        newSchedule.selectedDetailScheduleType === 'prepaid_expenses'
+        ? (0, jeNewScheduleViewSelector_1.getNewScheduleView)(state, newSchedule.selectedDetailScheduleType)
+        : undefined;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -111,19 +154,24 @@ function getExpenseAutomationJESchedulesView(state) {
         : null;
     const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedPeriod ?? [];
     const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedPeriod ?? [];
+    const jeScheduleAccruedKeys = (monthYearPeriodId != null
+        ? jeScheduleAccruedKeysByPeriod[monthYearPeriodId]
+        : null) ?? [];
     jeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         jeScheduledTransaction.push(jeScheduleDetails);
     });
+    jeScheduleAccruedKeys.forEach((jeAccruedScheduleKey) => {
+        const accruedScheduleDetails = (0, jeSchedulesSelector_1.getJEAccruedScheduleByJEScheduleKey)(jeAccruedScheduleKey, state);
+        if (accruedScheduleDetails != null) {
+            accruedSchedules.push(accruedScheduleDetails);
+        }
+    });
     failedJeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const { sortKey, sortOrder } = uiState;
-    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
-    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
-    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
-        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
+    const { sortKey, sortOrder, selectedJETypeFilter } = uiState;
     const unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
@@ -135,10 +183,46 @@ function getExpenseAutomationJESchedulesView(state) {
     });
     const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
+    const matchesTypeFilter = (schedule) => selectedJETypeFilter == null ||
+        schedule.jeScheduleType === selectedJETypeFilter;
+    const isCreatedStatus = (schedule) => schedule.status.code === 'ongoing' ||
+        schedule.status.code === 'completed' ||
+        schedule.status.code === 'marked_as_completed';
+    const allScheduleRows = [
+        ...jeScheduledTransaction,
+        ...accruedSchedules,
+    ];
     const pendingReviewSchedules = sortJEScheduledTransactions([
-        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
+        ...allScheduleRows.filter((schedule) => schedule.status.code === 'draft' && matchesTypeFilter(schedule)),
         ...validResolveForPending,
     ], sortKey, sortOrder);
+    const createdSchedules = sortJEScheduledTransactions(allScheduleRows.filter((schedule) => isCreatedStatus(schedule) && matchesTypeFilter(schedule)), sortKey, sortOrder);
+    // KPI summary — derived from unfiltered schedules so counts are always accurate
+    const allSchedules = allScheduleRows;
+    const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (getScheduleAmount(schedule) ?? 0), 0);
+    const pendingReviewTotal = sumAmount(pendingReviewSchedules);
+    const createdTotal = sumAmount(createdSchedules);
+    const aiAccountantSchedules = allSchedules.filter(exports.isAiAccountantSchedule);
+    const manualSchedules = allSchedules.filter((schedule) => !(0, exports.isAiAccountantSchedule)(schedule));
+    const pendingUnfiltered = allSchedules.filter((schedule) => schedule.status.code === 'draft');
+    const kpiSummary = {
+        aiAccountant: {
+            count: aiAccountantSchedules.length,
+            amount: sumAmount(aiAccountantSchedules),
+        },
+        manual: {
+            count: manualSchedules.length,
+            amount: sumAmount(manualSchedules),
+        },
+        needsReview: {
+            count: pendingUnfiltered.length,
+            amount: sumAmount(pendingUnfiltered),
+        },
+        total: {
+            count: allSchedules.length,
+            amount: sumAmount(allSchedules),
+        },
+    };
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -151,6 +235,22 @@ function getExpenseAutomationJESchedulesView(state) {
         { fetchState, error },
         monthEndFetchState,
     ]);
+    const countByType = (schedules) => {
+        const counts = jeSchedulesTypes_1.ALL_SCHEDULES_TYPES.reduce((acc, type) => ({ ...acc, [type]: 0 }), {});
+        schedules.forEach((schedule) => {
+            if (schedule.jeScheduleType != null) {
+                counts[schedule.jeScheduleType] += 1;
+            }
+        });
+        return counts;
+    };
+    const jeScheduleTypeCounts = {
+        active: countByType(allSchedules.filter((schedule) => schedule.status.code === 'draft' ||
+            schedule.status.code === 'ongoing' ||
+            schedule.status.code === 'completed' ||
+            schedule.status.code === 'marked_as_completed')),
+        ongoing: countByType(allSchedules.filter((schedule) => schedule.status.code === 'ongoing')),
+    };
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -159,12 +259,15 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
-        draftSchedules,
-        ongoingSchedules,
+        createdSchedules,
+        createdTotal,
+        jeScheduleTypeCounts,
+        kpiSummary,
         pendingReviewSchedules,
+        pendingReviewTotal,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
+        newScheduleView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
         fetchState: reducedFetchStatus.fetchState,

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

@@ -1,22 +1,28 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
+import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { Recommendation } from '../../../commonStateTypes/recommendationBase';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
-import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { MonthYearPeriodId, ScheduleDaysOfMonth } from '../../../commonStateTypes/timePeriod';
 import { AccountBase } from '../../../entity/account/accountState';
-import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { JEScheduleKey, JEScheduleTransactionKey, ScheduleJournalEntryStatusCodeType, ScheduleTransactionID, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { VendorBase } from '../../../entity/vendor/vendorState';
-export declare const toJEScheduleSortKey: (v: string) => "vendor" | "type" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "jePostingDate" | "remainingMonths";
+import { ZeniDate } from '../../../zeniDayJS';
+import { JETransactionLink } from '../../scheduleView/scheduleDetailView/scheduleDetailState';
+export declare const toJEScheduleSortKey: (v: string) => "vendor" | "type" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "jePostingDate" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "remainingMonths";
 export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
-export declare const toJEScheduleMainTab: (v: string) => "completed" | "pending_review" | "ongoing";
-export type JEScheduleMainTab = ReturnType<typeof toJEScheduleMainTab>;
+export declare const toJEPageTab: (v: string) => "schedules" | "existing_schedules";
+export type JEPageTab = ReturnType<typeof toJEPageTab>;
 export interface JESchedulesViewUIState {
+    createdGroupCollapsed: boolean;
+    pendingGroupCollapsed: boolean;
     scrollPosition: {
         scrollTop: number;
         scrollLeft?: number;
     } | undefined;
     searchString: string;
-    selectedMainTab: JEScheduleMainTab;
+    selectedJETypeFilter: ScheduleTypes | null;
+    selectedPageTab: JEPageTab;
     sortKey: JEScheduleSortKey;
     sortOrder: SortOrder;
     totalCount: number;
@@ -35,12 +41,53 @@ export interface JESchedulesViewState extends FetchedState {
     accountSettings: AccountSettingsState;
     failedJeScheduleTransactionKeysByPeriod: Record<MonthYearPeriodId, JEScheduleTransactionKey[]>;
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
+    jeScheduleAccruedKeysByPeriod: Record<MonthYearPeriodId, JEScheduleKey[]>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
     jeScheduleTransactionKeysByPeriod: Record<MonthYearPeriodId, JEScheduleTransactionKey[]>;
+    newSchedule: NewJeScheduleState;
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     uiState: JESchedulesViewUIState;
 }
+export interface NewJeDetailLocalData {
+    amount: Amount;
+    jeLink: JETransactionLink;
+    memo: string;
+    postingDate: ZeniDate;
+    postingStatus: ScheduleJournalEntryStatusCodeType;
+    runningBalance: Amount;
+}
+export interface NewScheduleLocalData {
+    jeScheduleDetails: NewJeDetailLocalData[];
+    scheduleType: ScheduleTypes;
+    lastDayOfMonth?: boolean;
+    selectedAccount?: ID;
+    selectedBaseTransactionId?: ScheduleTransactionID;
+    selectedClass?: ID;
+    selectedDate?: ZeniDate;
+    selectedDayOfMonth?: ScheduleDaysOfMonth;
+    selectedJEScheduleKey?: JEScheduleTransactionKey;
+    selectedMonths?: number;
+    selectedVendor?: VendorBase;
+}
+export interface NewScheduleLocalDataFixedAssets extends NewScheduleLocalData {
+    assetId?: string;
+    selectedAccumulatedDepreciationCategory?: ID;
+}
+export interface SearchTransactionsState extends FetchStateAndError {
+    searchResults: JEScheduleTransactionKey[];
+    searchString?: string;
+}
+export declare const MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;
+export interface NewJeScheduleState extends FetchStateAndError {
+    newScheduleState: {
+        fixed_assets: NewScheduleLocalDataFixedAssets;
+        prepaid_expenses: NewScheduleLocalData;
+    };
+    saveStatus: FetchStateAndError;
+    searchTransactions: SearchTransactionsState;
+    selectedDetailScheduleType?: ScheduleTypes;
+}
 export interface AccountSettingsLocalData {
     previousAccruedExpensesAccount: AccountBase[];
     previousFixedAssetsAccount: AccountBase[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJEScheduleMainTab = exports.toJEScheduleSortKey = void 0;
+exports.MIN_NEW_SCHEDULE_SEARCH_LENGTH = exports.toJEPageTab = exports.toJEScheduleSortKey = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const JE_SCHEDULE_SORT_KEYS = [
     'vendor',
@@ -20,10 +20,7 @@ const JE_SCHEDULE_SORT_KEYS = [
 ];
 const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
 exports.toJEScheduleSortKey = toJEScheduleSortKey;
-const JE_SCHEDULE_MAIN_TABS = [
-    'pending_review',
-    'ongoing',
-    'completed',
-];
-const toJEScheduleMainTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_MAIN_TABS);
-exports.toJEScheduleMainTab = toJEScheduleMainTab;
+const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+const toJEPageTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_PAGE_TABS);
+exports.toJEPageTab = toJEPageTab;
+exports.MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;

package/package.json

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