@zeniai/client-epic-state 5.1.43-betaRD4 → 5.1.44

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

@@ -100,12 +100,12 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                     }
                 }
                 else {
-                    // reset the selected tab to "review" when visiing detail page and we are  not refreshing in Background
+                    // Visiting an account detail page selects it and opens review; background
+                    // refresh (e.g. statement Pusher) must not change navigation selection.
                     if (action.payload.refreshViewInBackground !== true) {
                         draft.selectedTab = 'review';
+                        draft.selectedAccountId = action.payload.accountId;
                     }
-                    // select the account for which we are fetching
-                    draft.selectedAccountId = action.payload.accountId;
                     const accountReconciliationRecords = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod)];
                     const { transactionFetchState } = accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId];
                     if (transactionFetchState.fetchState !== 'Completed' ||
@@ -522,21 +522,33 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         },
         parseStatementSuccess: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementParseStatus = {
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.statementParseStatus = {
                 fetchState: 'Completed',
                 error: undefined,
             };
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementParseInProgress = false;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementProcessingFailed = false;
+            accountRecon.statementParseInProgress = false;
+            accountRecon.statementProcessingFailed = false;
+            // Stop elapsed-time step simulation; keep dismissed flag so the
+            // app-level completion snackbar can still fire.
+            accountRecon.statementProcessingStartedAtMs = undefined;
+            accountRecon.statementProcessingTotalDurationSeconds = undefined;
         },
         parseStatementFailure: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementParseStatus = {
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.statementParseStatus = {
                 fetchState: 'Error',
                 error: action.payload.error,
             };
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementParseInProgress = false;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementProcessingFailed = true;
+            accountRecon.statementParseInProgress = false;
+            accountRecon.statementProcessingFailed = true;
         },
         reparseStatement: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;

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

@@ -10,24 +10,6 @@ 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,11 +18,12 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     allDepreciationAccountList: AccountBase[];
     allDepreciationAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
+    completedSchedules: JEScheduledTransaction[];
     completionStatus: CompletionStatusType;
-    createdSchedules: JEScheduledTransaction[];
+    draftSchedules: JEScheduledTransaction[];
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
-    kpiSummary: JEKpiSummary;
+    ongoingSchedules: JEScheduledTransaction[];
     pendingReviewSchedules: (JEScheduledTransaction | JEScheduledTransactionWithFailedEntries)[];
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;

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

@@ -119,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) => {
@@ -132,40 +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 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)
         : [];
@@ -186,8 +159,9 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        createdSchedules,
-        kpiSummary,
+        completedSchedules,
+        draftSchedules,
+        ongoingSchedules,
         pendingReviewSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,

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" | "historical_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', 'historical_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.43-betaRD4",
+  "version": "5.1.44",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",