@zeniai/client-epic-state 5.1.85-betaRD3 → 5.1.86-beta2UT

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

@@ -65,8 +65,8 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     cotTrackingByTransactionId: COTTransactionTrackingByTransactionId;
 }, "expenseAutomationTransactionsView/updateTransactionCategorization", never, never>, updateCurrentSelectedTransactionCategorizationTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[newSelectedTab: "review" | "autoCategorized"], {
     newSelectedTab: "review" | "autoCategorized";
-}, "expenseAutomationTransactionsView/updateCurrentSelectedTransactionCategorizationTab", never, never>, updateTransactionCategorizationCompletedSubTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[newSubTab: "manual" | "all" | "ai_accountant"], {
-    newSubTab: "manual" | "all" | "ai_accountant";
+}, "expenseAutomationTransactionsView/updateCurrentSelectedTransactionCategorizationTab", never, never>, updateTransactionCategorizationCompletedSubTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[newSubTab: "all" | "manual" | "ai_accountant"], {
+    newSubTab: "all" | "manual" | "ai_accountant";
 }, "expenseAutomationTransactionsView/updateTransactionCategorizationCompletedSubTab", never, never>, updateTransactionCategorizationSaveStatus: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", fetchState: FetchState, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
     selectedTab: "review" | "autoCategorized";
     fetchState: FetchState;

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

@@ -4,30 +4,12 @@ import { CompletionStatusType, FetchStateAndError, ID } from '../../../commonSta
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
-import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { JEScheduledTransaction } from '../../../entity/jeSchedules/jeSchedulesSelector';
+import { JEScheduleTransactionKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { UncategorizedAccounts } from '../../accountList/accountListSelector';
 import { JEAccountSettingsView } from '../selectorTypes/jeAccountSettingsViewSelectorTypes';
-import { NewScheduleView } from '../selectorTypes/jeNewScheduleViewSelectorTypes';
-import { JEScheduleRow, JEScheduledTransactionWithFailedEntries } from '../selectors/jeSchedulesViewSelector';
-import { JEPageTab, JEScheduleLocalData, JESchedulesViewUIState } from '../types/jeSchedulesViewState';
-export interface JEKpiSummary {
-    aiAccountant: {
-        amount: number;
-        count: number;
-    };
-    manual: {
-        amount: number;
-        count: number;
-    };
-    needsReview: {
-        amount: number;
-        count: number;
-    };
-    total: {
-        amount: number;
-        count: number;
-    };
-}
+import { JEScheduledTransactionWithFailedEntries } from '../selectors/jeSchedulesViewSelector';
+import { JEScheduleLocalData, JESchedulesViewUIState } from '../types/jeSchedulesViewState';
 export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     accountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     accountSettingsView: JEAccountSettingsView;
@@ -36,24 +18,16 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     allDepreciationAccountList: AccountBase[];
     allDepreciationAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
+    completedSchedules: JEScheduledTransaction[];
     completionStatus: CompletionStatusType;
-    createdSchedules: JEScheduleRow[];
-    createdTotal: number;
-    hasLoadedForSelectedTab: boolean;
+    draftSchedules: JEScheduledTransaction[];
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
-    jeScheduleTypeCounts: {
-        active: Record<ScheduleTypes, number>;
-        ongoing: Record<ScheduleTypes, number>;
-    };
-    kpiSummary: JEKpiSummary;
-    newScheduleView: NewScheduleView | undefined;
-    pendingReviewSchedules: JEScheduleRow[];
-    pendingReviewTotal: number;
+    ongoingSchedules: JEScheduledTransaction[];
+    pendingReviewSchedules: (JEScheduledTransaction | JEScheduledTransactionWithFailedEntries)[];
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     resolveSchedules: JEScheduledTransactionWithFailedEntries[];
-    scheduleCountsByTab: Partial<Record<JEPageTab, number>>;
     uiState: JESchedulesViewUIState;
     uncategorizedAccounts: UncategorizedAccounts;
 }

package/lib/view/expenseAutomationView/selectors/jeSchedulesViewSelector.d.ts

@@ -1,16 +1,7 @@
-import { JEAccruedSchedule, JEOneTimeAccrual, JEScheduledTransaction, ScheduledJournalEntry } from '../../../entity/jeSchedules/jeSchedulesSelector';
-import { ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { JEScheduledTransaction, ScheduledJournalEntry } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { RootState } from '../../../reducer';
 import { ExpenseAutomationJESchedulesViewSelector } from '../selectorTypes/jeSchedulesSelectorTypes';
-export declare function getJEScheduleRowType(schedule: JEScheduleRow): ScheduleTypes | undefined;
-export declare function isPendingReviewRow(schedule: JEScheduleRow): boolean;
-export declare function isExistingTabRow(schedule: JEScheduleRow): boolean;
-export declare const isAiAccountantSchedule: (schedule: JEScheduleRow) => boolean;
-export declare function isAccruedScheduleRow(schedule: JEScheduleRow): schedule is JEAccruedSchedule;
-export declare function isOneTimeAccrualRow(schedule: JEScheduleRow): schedule is JEOneTimeAccrual;
 export declare function getExpenseAutomationJESchedulesView(state: RootState): ExpenseAutomationJESchedulesViewSelector;
 export interface JEScheduledTransactionWithFailedEntries extends Omit<JEScheduledTransaction, 'scheduledJournalEntry'> {
     scheduledJournalEntry: ScheduledJournalEntry;
 }
-export type JEScheduleRow = JEAccruedSchedule | JEOneTimeAccrual | JEScheduledTransaction | JEScheduledTransactionWithFailedEntries;
-export type JEScheduleRowWithoutOneTimeAccrual = Exclude<JEScheduleRow, JEOneTimeAccrual>;

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

@@ -3,12 +3,6 @@ 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.getJEScheduleRowType = getJEScheduleRowType;
-exports.isPendingReviewRow = isPendingReviewRow;
-exports.isExistingTabRow = isExistingTabRow;
-exports.isAccruedScheduleRow = isAccruedScheduleRow;
-exports.isOneTimeAccrualRow = isOneTimeAccrualRow;
 exports.getExpenseAutomationJESchedulesView = getExpenseAutomationJESchedulesView;
 const omit_1 = __importDefault(require("lodash/omit"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
@@ -16,7 +10,6 @@ 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");
@@ -24,119 +17,8 @@ const scheduleDetailLocalDataHelper_1 = require("../../scheduleView/scheduleDeta
 const scheduleDetailSelector_1 = require("../../scheduleView/scheduleDetailView/scheduleDetailSelector");
 const scheduleListHelper_1 = require("../../scheduleView/scheduleListView/scheduleListHelper");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
-const jeSchedulesViewState_1 = require("../types/jeSchedulesViewState");
 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';
-// A one-time accrual has no jeScheduleType of its own — it is not a JE schedule. It is still an
-// accrued expense, so it counts and filters under that type on the page's type tabs.
-const ONE_TIME_ACCRUAL_SCHEDULE_TYPE = 'accrued_expenses';
-// Which of the two list buckets an accrual belongs in. `draft` still needs a human to post it and
-// `posting_blocked` needs attention, so both are review work; everything else is already on the
-// books or in a transient claim.
-const ONE_TIME_ACCRUAL_REVIEW_STATUSES = [
-    'draft',
-    'posting_blocked',
-];
-function getJEScheduleRowType(schedule) {
-    return isOneTimeAccrualRow(schedule)
-        ? ONE_TIME_ACCRUAL_SCHEDULE_TYPE
-        : schedule.jeScheduleType;
-}
-function isPendingReviewRow(schedule) {
-    return isOneTimeAccrualRow(schedule)
-        ? ONE_TIME_ACCRUAL_REVIEW_STATUSES.includes(schedule.accrualStatus)
-        : schedule.status.code === 'draft';
-}
-// Belongs on the Existing Schedules tab. For an accrual the endpoint has already filtered to
-// posted, so this only has to agree with that rather than re-derive it.
-function isExistingTabRow(schedule) {
-    return isOneTimeAccrualRow(schedule)
-        ? schedule.accrualStatus === 'posted'
-        : schedule.status.code === 'ongoing';
-}
-// 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) => {
-    // A one-time accrual records who made it as `origin`, which is authoritative — no email
-    // sniffing needed, and the JE bot is often absent from the user entity entirely.
-    if (isOneTimeAccrualRow(schedule)) {
-        return schedule.origin === 'agent';
-    }
-    return (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;
-}
-// Same structural approach as isAccruedScheduleRow, and for the same reason: jeOneTimeAccrualKey
-// exists only on this shape. Note the two guards are NOT interchangeable — a one-time accrual is
-// not an accrued *schedule*, and routing it into the accrued branch would read recurringAmount,
-// render postedCount/lifecycleTotal as a lifecycle and startDate–endDate as a period, none of
-// which it has.
-function isOneTimeAccrualRow(schedule) {
-    return 'jeOneTimeAccrualKey' in schedule;
-}
-function getScheduleAmount(schedule) {
-    if (isOneTimeAccrualRow(schedule)) {
-        return schedule.estimatedAmount.amount;
-    }
-    if (isAccruedScheduleRow(schedule)) {
-        return schedule.recurringAmount.amount;
-    }
-    return schedule.baseTransaction.amount.amount;
-}
-// A one-time accrual shares almost no sortable field with a schedule, so it gets its own accessor
-// rather than a guard on each of the dozen cases below. Keys with no meaning for a single-month
-// accrual -- amortizationPeriod, remainingMonths, runningBalance, jePostingDate, scheduleCategory --
-// deliberately fall through to undefined, which sorts them together at one end.
-function getOneTimeAccrualSortValue(accrual, sortKey) {
-    switch (sortKey) {
-        case 'vendor':
-            return accrual.vendorName.toLowerCase();
-        case 'category':
-            return accrual.jeDebitAccountName?.toLowerCase();
-        case 'class':
-            return accrual.jeDebitAccountingClassName?.toLowerCase();
-        case 'depCategory':
-            return accrual.jeCreditAccountName?.toLowerCase();
-        case 'type':
-            return ONE_TIME_ACCRUAL_SCHEDULE_TYPE;
-        case 'totalAmount':
-            return accrual.estimatedAmount.amount;
-        case 'transactionDate':
-            return accrual.postingDate?.valueOf();
-        case 'memo':
-            return accrual.memo.toLowerCase();
-        case 'startMonth':
-            return accrual.serviceMonth;
-        default:
-            return undefined;
-    }
-}
 function getJEScheduleSortAccessor(sortKey) {
-    const scheduleAccessor = getScheduleRowSortAccessor(sortKey);
-    return (schedule) => isOneTimeAccrualRow(schedule)
-        ? getOneTimeAccrualSortValue(schedule, sortKey)
-        : scheduleAccessor(schedule);
-}
-function getScheduleRowSortAccessor(sortKey) {
     switch (sortKey) {
         case 'vendor':
             return (s) => s.vendor.name?.toLowerCase();
@@ -147,9 +29,7 @@ function getScheduleRowSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => isAccruedScheduleRow(s)
-                ? undefined
-                : s.baseTransaction.account?.accountName?.toLowerCase();
+            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
@@ -177,13 +57,11 @@ function getScheduleRowSortAccessor(sortKey) {
                 return s.balanceAsOfToday?.amount ?? null;
             };
         case 'totalAmount':
-            return (s) => getScheduleAmount(s);
+            return (s) => s.baseTransaction.amount.amount;
         case 'transactionDate':
-            return (s) => s.createTime?.valueOf();
+            return (s) => s.baseTransaction.date.valueOf();
         case 'memo':
-            return (s) => isAccruedScheduleRow(s)
-                ? s.memo.toLowerCase()
-                : s.baseTransaction.memo?.toLowerCase();
+            return (s) => s.baseTransaction.memo?.toLowerCase();
         default:
             return (s) => s.startDate?.valueOf();
     }
@@ -195,15 +73,9 @@ function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
 function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
-    const accruedSchedules = [];
-    const oneTimeAccruals = [];
     const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
-    const { jeScheduleTransactionKeysByPeriodAndTab, jeScheduleAccruedKeysByPeriodAndTab, jeScheduleOneTimeAccrualKeysByPeriodAndTab, failedJeScheduleTransactionKeysByPeriodAndTab, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = expenseAutomationJESchedulesViewState;
+    const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = 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];
@@ -231,48 +103,27 @@ function getExpenseAutomationJESchedulesView(state) {
     const filteredDepAccountListNestedAccountHierarchy = (0, scheduleDetailSelector_1.filterNestedAccountHierarchyById)(depAccountListNestedAccountHierarchy, filteredDepAccounts.map((account) => account.accountId));
     const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
     const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : null;
-    const selectedPeriodTabKey = monthYearPeriodId != null
-        ? (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(uiState.selectedPageTab, monthYearPeriodId)
+    const jeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
+        ? jeScheduleTransactionKeysByPeriod[monthYearPeriodId]
         : null;
-    const jeScheduleTransactionKeysForSelectedTab = selectedPeriodTabKey != null
-        ? jeScheduleTransactionKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined;
-    const failedJeScheduleTransactionKeysForSelectedTab = selectedPeriodTabKey != null
-        ? failedJeScheduleTransactionKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined;
-    // Distinguishes "this tab has never been fetched for this period" from "fetched and genuinely
-    // empty". Without it the page cannot tell a first visit from a real empty state, and renders an
-    // empty table where it should render a skeleton.
-    const hasLoadedForSelectedTab = jeScheduleTransactionKeysForSelectedTab != null;
-    const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedTab ?? [];
-    const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedTab ?? [];
-    const jeScheduleAccruedKeys = (selectedPeriodTabKey != null
-        ? jeScheduleAccruedKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined) ?? [];
-    const jeScheduleOneTimeAccrualKeys = (selectedPeriodTabKey != null
-        ? jeScheduleOneTimeAccrualKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined) ?? [];
-    jeScheduleOneTimeAccrualKeys.forEach((jeOneTimeAccrualKey) => {
-        const accrual = (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(jeOneTimeAccrualKey, state.jeSchedulesState);
-        if (accrual != null) {
-            oneTimeAccruals.push(accrual);
-        }
-    });
+    const failedJeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
+        ? failedJeScheduleTransactionKeysByPeriod[monthYearPeriodId]
+        : null;
+    const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedPeriod ?? [];
+    const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedPeriod ?? [];
     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, selectedJETypeFilter } = uiState;
+    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 unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
@@ -284,87 +135,10 @@ function getExpenseAutomationJESchedulesView(state) {
     });
     const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
-    const matchesTypeFilter = (schedule) => selectedJETypeFilter == null ||
-        getJEScheduleRowType(schedule) === selectedJETypeFilter;
-    const isCreatedStatus = (schedule) => {
-        // An accrual is "created" once it is not review work: posted, reversing, reversed, or in a
-        // transient posting claim.
-        if (isOneTimeAccrualRow(schedule)) {
-            return !isPendingReviewRow(schedule);
-        }
-        return (schedule.status.code === 'ongoing' ||
-            schedule.status.code === 'completed' ||
-            schedule.status.code === 'marked_as_completed');
-    };
-    const allScheduleRows = [
-        ...jeScheduledTransaction,
-        ...accruedSchedules,
-        ...oneTimeAccruals,
-    ];
     const pendingReviewSchedules = sortJEScheduledTransactions([
-        ...allScheduleRows.filter((schedule) => isPendingReviewRow(schedule) && matchesTypeFilter(schedule)),
+        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
         ...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) => isPendingReviewRow(schedule));
-    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),
-        },
-    };
-    // Each tab's badge counts from that tab's own bucket. A tab that has not been fetched yet
-    // reports undefined rather than 0, so the UI can hide the badge instead of asserting "none".
-    const scheduleCountsByTab = {};
-    jeSchedulesViewState_1.ALL_JE_PAGE_TABS.forEach((pageTab) => {
-        const periodTabKey = monthYearPeriodId != null
-            ? (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(pageTab, monthYearPeriodId)
-            : null;
-        const transactionKeys = periodTabKey != null
-            ? jeScheduleTransactionKeysByPeriodAndTab[periodTabKey]
-            : undefined;
-        if (transactionKeys == null) {
-            return;
-        }
-        const accruedKeys = (periodTabKey != null
-            ? jeScheduleAccruedKeysByPeriodAndTab[periodTabKey]
-            : undefined) ?? [];
-        const oneTimeAccrualKeys = (periodTabKey != null
-            ? jeScheduleOneTimeAccrualKeysByPeriodAndTab[periodTabKey]
-            : undefined) ?? [];
-        const rowsForTab = [
-            ...transactionKeys.map((transactionKey) => (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(transactionKey, state)),
-            ...accruedKeys
-                .map((accruedKey) => (0, jeSchedulesSelector_1.getJEAccruedScheduleByJEScheduleKey)(accruedKey, state))
-                .filter((accruedRow) => accruedRow != null),
-            ...oneTimeAccrualKeys
-                .map((accrualKey) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(accrualKey, state.jeSchedulesState))
-                .filter((accrualRow) => accrualRow != null),
-        ];
-        scheduleCountsByTab[pageTab] =
-            pageTab === 'existing_schedules'
-                ? rowsForTab.filter((row) => isExistingTabRow(row)).length
-                : rowsForTab.filter((row) => isPendingReviewRow(row) || isCreatedStatus(row)).length;
-    });
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -377,20 +151,6 @@ 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) => {
-            const scheduleType = getJEScheduleRowType(schedule);
-            if (scheduleType != null) {
-                counts[scheduleType] += 1;
-            }
-        });
-        return counts;
-    };
-    const jeScheduleTypeCounts = {
-        active: countByType(allSchedules.filter((schedule) => isPendingReviewRow(schedule) || isCreatedStatus(schedule))),
-        ongoing: countByType(allSchedules.filter((schedule) => isExistingTabRow(schedule))),
-    };
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -399,17 +159,12 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        createdSchedules,
-        createdTotal,
-        hasLoadedForSelectedTab,
-        jeScheduleTypeCounts,
-        scheduleCountsByTab,
-        kpiSummary,
+        completedSchedules,
+        draftSchedules,
+        ongoingSchedules,
         pendingReviewSchedules,
-        pendingReviewTotal,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
-        newScheduleView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
         fetchState: reducedFetchStatus.fetchState,

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

@@ -1,4 +1,4 @@
-export declare const toCompletedSubTab: (v: string) => "manual" | "all" | "ai_accountant";
+export declare const toCompletedSubTab: (v: string) => "all" | "manual" | "ai_accountant";
 export type CompletedSubTab = ReturnType<typeof toCompletedSubTab>;
 /**
  * "No sub-tab filter" sentinel — single source of truth for the default

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

@@ -1,31 +1,22 @@
 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, ScheduleDaysOfMonth } from '../../../commonStateTypes/timePeriod';
+import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { AccountBase } from '../../../entity/account/accountState';
-import { JEOneTimeAccrualKey, JEScheduleKey, JEScheduleTransactionKey, ScheduleJournalEntryStatusCodeType, ScheduleTransactionID, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { VendorBase } from '../../../entity/vendor/vendorState';
-import { ZeniDate } from '../../../zeniDayJS';
-import { JETransactionLink } from '../../scheduleView/scheduleDetailView/scheduleDetailState';
-export declare const toJEScheduleSortKey: (v: string) => "type" | "vendor" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "jePostingDate" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "remainingMonths";
+export declare const toJEScheduleSortKey: (v: string) => "type" | "vendor" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "jePostingDate" | "remainingMonths";
 export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
-export declare const toJEPageTab: (v: string) => "schedules" | "existing_schedules";
-export type JEPageTab = ReturnType<typeof toJEPageTab>;
-export declare const ALL_JE_PAGE_TABS: readonly JEPageTab[];
-export type JESchedulePeriodTabKey = `${JEPageTab}_${MonthYearPeriodId}`;
-export declare const getJESchedulePeriodTabKey: (selectedPageTab: JEPageTab, monthYearPeriodId: MonthYearPeriodId) => JESchedulePeriodTabKey;
+export declare const toJEScheduleMainTab: (v: string) => "completed" | "pending_review" | "ongoing";
+export type JEScheduleMainTab = ReturnType<typeof toJEScheduleMainTab>;
 export interface JESchedulesViewUIState {
-    createdGroupCollapsed: boolean;
-    pendingGroupCollapsed: boolean;
     scrollPosition: {
         scrollTop: number;
         scrollLeft?: number;
     } | undefined;
     searchString: string;
-    selectedJETypeFilter: ScheduleTypes | null;
-    selectedPageTab: JEPageTab;
+    selectedMainTab: JEScheduleMainTab;
     sortKey: JEScheduleSortKey;
     sortOrder: SortOrder;
     totalCount: number;
@@ -42,56 +33,14 @@ export interface JEScheduleLocalData {
 }
 export interface JESchedulesViewState extends FetchedState {
     accountSettings: AccountSettingsState;
-    failedJeScheduleTransactionKeysByPeriodAndTab: Record<JESchedulePeriodTabKey, JEScheduleTransactionKey[]>;
+    failedJeScheduleTransactionKeysByPeriod: Record<MonthYearPeriodId, JEScheduleTransactionKey[]>;
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
-    jeScheduleAccruedKeysByPeriodAndTab: Record<JESchedulePeriodTabKey, JEScheduleKey[]>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
-    jeScheduleOneTimeAccrualKeysByPeriodAndTab: Record<JESchedulePeriodTabKey, JEOneTimeAccrualKey[]>;
-    jeScheduleTransactionKeysByPeriodAndTab: Record<JESchedulePeriodTabKey, JEScheduleTransactionKey[]>;
-    newSchedule: NewJeScheduleState;
+    jeScheduleTransactionKeysByPeriod: Record<MonthYearPeriodId, JEScheduleTransactionKey[]>;
     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.MIN_NEW_SCHEDULE_SEARCH_LENGTH = exports.getJESchedulePeriodTabKey = exports.ALL_JE_PAGE_TABS = exports.toJEPageTab = exports.toJEScheduleSortKey = void 0;
+exports.toJEScheduleMainTab = exports.toJEScheduleSortKey = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const JE_SCHEDULE_SORT_KEYS = [
     'vendor',
@@ -20,10 +20,10 @@ const JE_SCHEDULE_SORT_KEYS = [
 ];
 const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
 exports.toJEScheduleSortKey = toJEScheduleSortKey;
-const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
-const toJEPageTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_PAGE_TABS);
-exports.toJEPageTab = toJEPageTab;
-exports.ALL_JE_PAGE_TABS = JE_PAGE_TABS;
-const getJESchedulePeriodTabKey = (selectedPageTab, monthYearPeriodId) => `${selectedPageTab}_${monthYearPeriodId}`;
-exports.getJESchedulePeriodTabKey = getJESchedulePeriodTabKey;
-exports.MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;
+const JE_SCHEDULE_MAIN_TABS = [
+    'pending_review',
+    'ongoing',
+    'completed',
+];
+const toJEScheduleMainTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_MAIN_TABS);
+exports.toJEScheduleMainTab = toJEScheduleMainTab;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.85-betaRD3",
+  "version": "5.1.86-beta2UT",
   "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/epics/jeSchedule/newSchedule/initializeNewScheduleEpic.js

@@ -1,21 +0,0 @@
-import { from } from 'rxjs';
-import { filter, mergeMap } from 'rxjs/operators';
-import { fetchAccountList } from '../../../../accountList/accountListReducer';
-import { fetchClassList } from '../../../../classList/classListReducer';
-import { getAccountsTypesForScheduleEpics } from '../../../../scheduleView/scheduleListView/scheduleListHelper';
-import { clearSearchTransactionsForNewSchedule, initializeNewSchedule, resetNewScheduleLocalData, } from '../../../reducers/jeSchedulesViewReducer';
-export const initializeNewScheduleEpic = (actions$, state$) => actions$.pipe(filter(initializeNewSchedule.match), mergeMap((action) => {
-    const newScheduleActions = [];
-    const accountType = getAccountsTypesForScheduleEpics();
-    const { accountListState, classListState } = state$.value;
-    if (accountListState.byReportId[accountType.accountListKey]?.fetchState ===
-        'Not-Started') {
-        newScheduleActions.push(fetchAccountList(accountType.accountListKey, true, false, false, false, accountType.allowedAccountList));
-    }
-    if (classListState.fetchState === 'Not-Started') {
-        newScheduleActions.push(fetchClassList());
-    }
-    newScheduleActions.push(resetNewScheduleLocalData({ scheduleType: action.payload.scheduleType }));
-    newScheduleActions.push(clearSearchTransactionsForNewSchedule());
-    return from(newScheduleActions);
-}));