@zeniai/client-epic-state 5.1.54-betaRD2 → 5.1.54

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

@@ -5,29 +5,11 @@ import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndRep
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { JEScheduledTransaction } from '../../../entity/jeSchedules/jeSchedulesSelector';
-import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { JEScheduleTransactionKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { UncategorizedAccounts } from '../../accountList/accountListSelector';
 import { JEAccountSettingsView } from '../selectorTypes/jeAccountSettingsViewSelectorTypes';
 import { JEScheduledTransactionWithFailedEntries } from '../selectors/jeSchedulesViewSelector';
 import { 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;
-    };
-}
 export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     accountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     accountSettingsView: JEAccountSettingsView;
@@ -36,18 +18,13 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     allDepreciationAccountList: AccountBase[];
     allDepreciationAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
+    completedSchedules: JEScheduledTransaction[];
     completionStatus: CompletionStatusType;
-    createdSchedules: JEScheduledTransaction[];
-    createdTotal: number;
+    draftSchedules: JEScheduledTransaction[];
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
-    jeScheduleTypeCounts: {
-        active: Record<ScheduleTypes, number>;
-        ongoing: Record<ScheduleTypes, number>;
-    };
-    kpiSummary: JEKpiSummary;
+    ongoingSchedules: JEScheduledTransaction[];
     pendingReviewSchedules: (JEScheduledTransaction | JEScheduledTransactionWithFailedEntries)[];
-    pendingReviewTotal: number;
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     resolveSchedules: JEScheduledTransactionWithFailedEntries[];

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

@@ -10,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");
@@ -60,7 +59,7 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'totalAmount':
             return (s) => s.baseTransaction.amount.amount;
         case 'transactionDate':
-            return (s) => s.createTime?.valueOf();
+            return (s) => s.baseTransaction.date.valueOf();
         case 'memo':
             return (s) => s.baseTransaction.memo?.toLowerCase();
         default:
@@ -120,7 +119,11 @@ function getExpenseAutomationJESchedulesView(state) {
         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) => {
@@ -133,42 +136,9 @@ 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' &&
-            (selectedJETypeFilter == null ||
-                schedule.jeScheduleType === selectedJETypeFilter)),
+        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
         ...validResolveForPending,
     ], sortKey, sortOrder);
-    const createdSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => (schedule.status.code === 'ongoing' ||
-        schedule.status.code === 'completed' ||
-        schedule.status.code === 'marked_as_completed') &&
-        (selectedJETypeFilter == null ||
-            schedule.jeScheduleType === selectedJETypeFilter)), sortKey, sortOrder);
-    // KPI summary — derived from unfiltered schedules so counts are always accurate
-    const allSchedules = jeScheduledTransaction;
-    const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (schedule.baseTransaction.amount.amount ?? 0), 0);
-    const pendingReviewTotal = sumAmount(pendingReviewSchedules);
-    const createdTotal = sumAmount(createdSchedules);
-    const aiAccountantSchedules = allSchedules.filter((schedule) => schedule.confidenceScore != null);
-    const pendingUnfiltered = allSchedules.filter((schedule) => schedule.status.code === 'draft');
-    const kpiSummary = {
-        aiAccountant: {
-            count: aiAccountantSchedules.length,
-            amount: sumAmount(aiAccountantSchedules),
-        },
-        manual: {
-            count: allSchedules.filter((schedule) => schedule.confidenceScore == null)
-                .length,
-            amount: sumAmount(allSchedules.filter((schedule) => schedule.confidenceScore == null)),
-        },
-        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)
         : [];
@@ -181,22 +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) => {
-            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,
@@ -205,12 +159,10 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        createdSchedules,
-        createdTotal,
-        jeScheduleTypeCounts,
-        kpiSummary,
+        completedSchedules,
+        draftSchedules,
+        ongoingSchedules,
         pendingReviewSchedules,
-        pendingReviewTotal,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

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

@@ -8,18 +8,15 @@ import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSched
 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";
 export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
-export declare const toJEPageTab: (v: string) => "schedules" | "existing_schedules";
-export type JEPageTab = ReturnType<typeof toJEPageTab>;
+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;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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,6 +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;
+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.54-betaRD2",
+  "version": "5.1.54",
   "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/switchJESchedulesTabEpic.js

@@ -1,22 +0,0 @@
-import { EMPTY, of } from 'rxjs';
-import { filter, mergeMap } from 'rxjs/operators';
-import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
-import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
-import { fetchJeSchedulesPage, updateJESchedulesUIState, } from '../../reducers/jeSchedulesViewReducer';
-export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(updateJESchedulesUIState.match), filter((action) => action.payload.selectedPageTab != null), mergeMap(() => {
-    const state = state$.value;
-    const { fetchState, refreshStatus } = state.expenseAutomationJESchedulesViewState;
-    if (fetchState === 'In-Progress' ||
-        refreshStatus.fetchState === 'In-Progress') {
-        return EMPTY;
-    }
-    const currentTenant = getCurrentTenant(state);
-    const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
-    const period = convertToPeriod(selectedPeriod);
-    const timePeriodStart = toAbsoluteDay(period.start);
-    const timePeriodEnd = toAbsoluteDay(period.end);
-    if (timePeriodStart == null || timePeriodEnd == null) {
-        return EMPTY;
-    }
-    return of(fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, true));
-}));

package/lib/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.d.ts

@@ -1,6 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { RootState } from '../../../../reducer';
-import { fetchJeSchedulesPage, updateJESchedulesUIState } from '../../reducers/jeSchedulesViewReducer';
-export type ActionType = ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof updateJESchedulesUIState>;
-export declare const switchJESchedulesTabEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.switchJESchedulesTabEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
-const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
-const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.updateJESchedulesUIState.match), (0, operators_1.filter)((action) => action.payload.selectedPageTab != null), (0, operators_1.mergeMap)(() => {
-    const state = state$.value;
-    const { fetchState, refreshStatus } = state.expenseAutomationJESchedulesViewState;
-    if (fetchState === 'In-Progress' ||
-        refreshStatus.fetchState === 'In-Progress') {
-        return rxjs_1.EMPTY;
-    }
-    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
-    const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
-    const period = (0, timePeriod_1.convertToPeriod)(selectedPeriod);
-    const timePeriodStart = (0, timePeriod_1.toAbsoluteDay)(period.start);
-    const timePeriodEnd = (0, timePeriod_1.toAbsoluteDay)(period.end);
-    if (timePeriodStart == null || timePeriodEnd == null) {
-        return rxjs_1.EMPTY;
-    }
-    return (0, rxjs_1.of)((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, true));
-}));
-exports.switchJESchedulesTabEpic = switchJESchedulesTabEpic;