@zeniai/client-epic-state 4.20.1 → 4.20.2-beta0ND

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

@@ -5,7 +5,7 @@ import { JEScheduledTransactionPayload } from '../../../entity/jeSchedules/jeSch
 import { JEScheduleTransactionKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { AccountTypeRecommendationPayload } from '../../accountMappingView/accountTypeRecommendation/accountTypeRecommendationPayload';
-import { AccountSettingsLocalData, AccountSettingsState, JEScheduleLocalData, JESchedulesViewState } from '../types/jeSchedulesViewState';
+import { AccountSettingsLocalData, AccountSettingsState, JEScheduleLocalData, JESchedulesViewState, JESchedulesViewUIState } from '../types/jeSchedulesViewState';
 export declare const accountSettingsInitialState: AccountSettingsState;
 export declare const initialState: JESchedulesViewState;
 export declare const clearExpenseAutomationJESchedulesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/clearExpenseAutomationJESchedulesView">, clearJeAccountSettingsLocalData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/clearJeAccountSettingsLocalData">, clearJeScheduleLocalData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/clearJeScheduleLocalData">, fetchAccountSettingsListForAccountTypes: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/fetchAccountSettingsListForAccountTypes">, fetchJeSchedules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
@@ -56,7 +56,7 @@ export declare const clearExpenseAutomationJESchedulesView: import("@reduxjs/too
     accountPayload: AccountMetadataPayload[];
 }, "expenseAutomationJESchedulesView/updateAccountSettingsListForAccountTypes">, updateAccountSettingsListForAccountTypesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: ZeniAPIStatus;
-}, "expenseAutomationJESchedulesView/updateAccountSettingsListForAccountTypesFailure">, updateJeScheduleLocalDataById: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "expenseAutomationJESchedulesView/updateAccountSettingsListForAccountTypesFailure">, updateJESchedulesUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<Partial<JESchedulesViewUIState>, "expenseAutomationJESchedulesView/updateJESchedulesUIState">, updateJeScheduleLocalDataById: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     localData: Partial<JEScheduleLocalData>;
     scheduledJournalEntryID: ID;
 }, "expenseAutomationJESchedulesView/updateJeScheduleLocalDataById">, updateJeScheduleTransactionKeys: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[jeScheduleKeys: (`${string}_bill_${string}` | `${string}_expense_${string}` | `${string}_check_${string}` | `${string}_refund_${string}` | `${string}_invoice_${string}` | `${string}_payment_${string}` | `${string}_credit_memo_${string}` | `${string}_sales_receipt_${string}` | `${string}_delayed_credit_${string}` | `${string}_delayed_charge_${string}` | `${string}_bill_payment_${string}` | `${string}_bill_payment_check_${string}` | `${string}_bill_payment_credit_card_${string}` | `${string}_vendor_credit_${string}` | `${string}_credit_card_credit_${string}` | `${string}_transfer_${string}` | `${string}_credit_card_payment_${string}` | `${string}_deposit_${string}` | `${string}_journal_entry_${string}`)[], selectedPeriod: MonthYearPeriod], {

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateRecommendationForAccountSettingsFailure = exports.updateRecommendationForAccountSettings = exports.updateJeScheduleTransactionKeys = exports.updateJeScheduleLocalDataById = exports.updateAccountSettingsListForAccountTypesFailure = exports.updateAccountSettingsListForAccountTypes = exports.saveAccountSettingsSuccess = exports.saveAccountSettingsLocalData = exports.saveAccountSettingsFailure = exports.saveAccountSettings = exports.retryJeScheduleSuccess = exports.retryJeScheduleFailure = exports.retryJeSchedule = exports.removeJeScheduleTransactionKey = exports.removeJeScheduleLocalDataById = exports.removeFailedJeScheduleTransactionKey = exports.initializeJeScheduleLocalData = exports.initializeAccountSettingsView = exports.ignoreRecommendedJeScheduleSuccess = exports.ignoreRecommendedJeScheduleFailure = exports.ignoreRecommendedJeSchedule = exports.fetchRecommendationForAccountSettings = exports.fetchJeSchedulesSuccess = exports.fetchJeSchedulesPage = exports.fetchJeSchedulesFailure = exports.fetchJeSchedules = exports.fetchAccountSettingsListForAccountTypes = exports.clearJeScheduleLocalData = exports.clearJeAccountSettingsLocalData = exports.clearExpenseAutomationJESchedulesView = exports.initialState = exports.accountSettingsInitialState = void 0;
+exports.updateRecommendationForAccountSettingsFailure = exports.updateRecommendationForAccountSettings = exports.updateJeScheduleTransactionKeys = exports.updateJeScheduleLocalDataById = exports.updateJESchedulesUIState = exports.updateAccountSettingsListForAccountTypesFailure = exports.updateAccountSettingsListForAccountTypes = exports.saveAccountSettingsSuccess = exports.saveAccountSettingsLocalData = exports.saveAccountSettingsFailure = exports.saveAccountSettings = exports.retryJeScheduleSuccess = exports.retryJeScheduleFailure = exports.retryJeSchedule = exports.removeJeScheduleTransactionKey = exports.removeJeScheduleLocalDataById = exports.removeFailedJeScheduleTransactionKey = exports.initializeJeScheduleLocalData = exports.initializeAccountSettingsView = exports.ignoreRecommendedJeScheduleSuccess = exports.ignoreRecommendedJeScheduleFailure = exports.ignoreRecommendedJeSchedule = exports.fetchRecommendationForAccountSettings = exports.fetchJeSchedulesSuccess = exports.fetchJeSchedulesPage = exports.fetchJeSchedulesFailure = exports.fetchJeSchedules = exports.fetchAccountSettingsListForAccountTypes = exports.clearJeScheduleLocalData = exports.clearJeAccountSettingsLocalData = exports.clearExpenseAutomationJESchedulesView = exports.initialState = exports.accountSettingsInitialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const getNestedAccountIDHierarchyForReport_1 = require("../../../commonStateTypes/accountView/getNestedAccountIDHierarchyForReport");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
@@ -48,6 +48,8 @@ exports.initialState = {
     uiState: {
         searchString: '',
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+        sortKey: 'startMonth',
+        sortOrder: 'descending',
         totalCount: 0,
         limit: 10,
     },
@@ -369,12 +371,26 @@ const expenseAutomationJESchedulesView = (0, toolkit_1.createSlice)({
         clearJeAccountSettingsLocalData(draft) {
             draft.accountSettings.localData = exports.accountSettingsInitialState.localData;
         },
+        updateJESchedulesUIState(draft, action) {
+            if (action.payload.sortKey != null) {
+                draft.uiState.sortKey = action.payload.sortKey;
+            }
+            if (action.payload.sortOrder != null) {
+                draft.uiState.sortOrder = action.payload.sortOrder;
+            }
+            if (action.payload.searchString != null) {
+                draft.uiState.searchString = action.payload.searchString;
+            }
+            if (action.payload.scrollPosition != null) {
+                draft.uiState.scrollPosition = action.payload.scrollPosition;
+            }
+        },
         clearExpenseAutomationJESchedulesView(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
 });
-_a = expenseAutomationJESchedulesView.actions, exports.clearExpenseAutomationJESchedulesView = _a.clearExpenseAutomationJESchedulesView, exports.clearJeAccountSettingsLocalData = _a.clearJeAccountSettingsLocalData, exports.clearJeScheduleLocalData = _a.clearJeScheduleLocalData, exports.fetchAccountSettingsListForAccountTypes = _a.fetchAccountSettingsListForAccountTypes, exports.fetchJeSchedules = _a.fetchJeSchedules, exports.fetchJeSchedulesFailure = _a.fetchJeSchedulesFailure, exports.fetchJeSchedulesPage = _a.fetchJeSchedulesPage, exports.fetchJeSchedulesSuccess = _a.fetchJeSchedulesSuccess, exports.fetchRecommendationForAccountSettings = _a.fetchRecommendationForAccountSettings, exports.ignoreRecommendedJeSchedule = _a.ignoreRecommendedJeSchedule, exports.ignoreRecommendedJeScheduleFailure = _a.ignoreRecommendedJeScheduleFailure, exports.ignoreRecommendedJeScheduleSuccess = _a.ignoreRecommendedJeScheduleSuccess, exports.initializeAccountSettingsView = _a.initializeAccountSettingsView, exports.initializeJeScheduleLocalData = _a.initializeJeScheduleLocalData, exports.removeFailedJeScheduleTransactionKey = _a.removeFailedJeScheduleTransactionKey, exports.removeJeScheduleLocalDataById = _a.removeJeScheduleLocalDataById, exports.removeJeScheduleTransactionKey = _a.removeJeScheduleTransactionKey, exports.retryJeSchedule = _a.retryJeSchedule, exports.retryJeScheduleFailure = _a.retryJeScheduleFailure, exports.retryJeScheduleSuccess = _a.retryJeScheduleSuccess, exports.saveAccountSettings = _a.saveAccountSettings, exports.saveAccountSettingsFailure = _a.saveAccountSettingsFailure, exports.saveAccountSettingsLocalData = _a.saveAccountSettingsLocalData, exports.saveAccountSettingsSuccess = _a.saveAccountSettingsSuccess, exports.updateAccountSettingsListForAccountTypes = _a.updateAccountSettingsListForAccountTypes, exports.updateAccountSettingsListForAccountTypesFailure = _a.updateAccountSettingsListForAccountTypesFailure, exports.updateJeScheduleLocalDataById = _a.updateJeScheduleLocalDataById, exports.updateJeScheduleTransactionKeys = _a.updateJeScheduleTransactionKeys, exports.updateRecommendationForAccountSettings = _a.updateRecommendationForAccountSettings, exports.updateRecommendationForAccountSettingsFailure = _a.updateRecommendationForAccountSettingsFailure;
+_a = expenseAutomationJESchedulesView.actions, exports.clearExpenseAutomationJESchedulesView = _a.clearExpenseAutomationJESchedulesView, exports.clearJeAccountSettingsLocalData = _a.clearJeAccountSettingsLocalData, exports.clearJeScheduleLocalData = _a.clearJeScheduleLocalData, exports.fetchAccountSettingsListForAccountTypes = _a.fetchAccountSettingsListForAccountTypes, exports.fetchJeSchedules = _a.fetchJeSchedules, exports.fetchJeSchedulesFailure = _a.fetchJeSchedulesFailure, exports.fetchJeSchedulesPage = _a.fetchJeSchedulesPage, exports.fetchJeSchedulesSuccess = _a.fetchJeSchedulesSuccess, exports.fetchRecommendationForAccountSettings = _a.fetchRecommendationForAccountSettings, exports.ignoreRecommendedJeSchedule = _a.ignoreRecommendedJeSchedule, exports.ignoreRecommendedJeScheduleFailure = _a.ignoreRecommendedJeScheduleFailure, exports.ignoreRecommendedJeScheduleSuccess = _a.ignoreRecommendedJeScheduleSuccess, exports.initializeAccountSettingsView = _a.initializeAccountSettingsView, exports.initializeJeScheduleLocalData = _a.initializeJeScheduleLocalData, exports.removeFailedJeScheduleTransactionKey = _a.removeFailedJeScheduleTransactionKey, exports.removeJeScheduleLocalDataById = _a.removeJeScheduleLocalDataById, exports.removeJeScheduleTransactionKey = _a.removeJeScheduleTransactionKey, exports.retryJeSchedule = _a.retryJeSchedule, exports.retryJeScheduleFailure = _a.retryJeScheduleFailure, exports.retryJeScheduleSuccess = _a.retryJeScheduleSuccess, exports.saveAccountSettings = _a.saveAccountSettings, exports.saveAccountSettingsFailure = _a.saveAccountSettingsFailure, exports.saveAccountSettingsLocalData = _a.saveAccountSettingsLocalData, exports.saveAccountSettingsSuccess = _a.saveAccountSettingsSuccess, exports.updateAccountSettingsListForAccountTypes = _a.updateAccountSettingsListForAccountTypes, exports.updateAccountSettingsListForAccountTypesFailure = _a.updateAccountSettingsListForAccountTypesFailure, exports.updateJESchedulesUIState = _a.updateJESchedulesUIState, exports.updateJeScheduleLocalDataById = _a.updateJeScheduleLocalDataById, exports.updateJeScheduleTransactionKeys = _a.updateJeScheduleTransactionKeys, exports.updateRecommendationForAccountSettings = _a.updateRecommendationForAccountSettings, exports.updateRecommendationForAccountSettingsFailure = _a.updateRecommendationForAccountSettingsFailure;
 exports.default = expenseAutomationJESchedulesView.reducer;
 const doUpdateRecommendationForAccountSettings = (draft, payload) => {
     const { prepaidExpensesRecommendations, fixedAssetsRecommendations, accruedExpensesRecommendations, } = (0, accountTypeRecommendationPayload_1.mapAccountTypeRecommendationPayloadToAccountRecommendationByType)(payload);

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

@@ -18,10 +18,12 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     allDepreciationAccountList: AccountBase[];
     allDepreciationAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
+    completedSchedules: JEScheduledTransaction[];
     completionStatus: CompletionStatusType;
     draftSchedules: JEScheduledTransaction[];
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
+    ongoingSchedules: JEScheduledTransaction[];
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     resolveSchedules: JEScheduledTransactionWithFailedEntries[];

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationFluxAnalysisView = getExpenseAutomationFluxAnalysisView;
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const classSelector_1 = require("../../../entity/class/classSelector");
@@ -9,7 +10,7 @@ const userSelector_1 = require("../../../entity/user/userSelector");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 function getExpenseAutomationFluxAnalysisView(state) {
-    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState } = state;
+    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { fetchState, error, refreshStatus, uiState, reviewOperatingExpenseIdsByPeriod, selectedSectionIdsByPeriod, groupsBySelectedPeriod, fluxAnalysisEntities, bulkReviewStatus, currency, totalBalancesAndVariance, } = expenseAutomationFluxAnalysisViewState;
     const fetchStateAndError = {
         fetchState,
@@ -94,10 +95,17 @@ function getExpenseAutomationFluxAnalysisView(state) {
         },
     };
     const completionStatus = fluxCompletionStatus != null ? fluxCompletionStatus : 'incomplete';
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        fetchStateAndError,
+        monthEndFetchState,
+    ]);
     return {
         sections,
         totalBalancesAndVariance,
-        fetchStatus: fetchStateAndError,
+        fetchStatus: reducedFetchStatus,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

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

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationJESchedulesView = getExpenseAutomationJESchedulesView;
 const omit_1 = __importDefault(require("lodash/omit"));
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
+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");
@@ -16,10 +18,48 @@ const scheduleDetailSelector_1 = require("../../scheduleView/scheduleDetailView/
 const scheduleListHelper_1 = require("../../scheduleView/scheduleListView/scheduleListHelper");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const jeAccountSettingsViewSelector_1 = require("./jeAccountSettingsViewSelector");
+function getJEScheduleSortAccessor(sortKey) {
+    switch (sortKey) {
+        case 'vendor':
+            return (s) => s.vendor.name?.toLowerCase();
+        case 'category':
+            return (s) => s.jeDebit.account?.accountName?.toLowerCase();
+        case 'class':
+            return (s) => s.jeDebit.accountingClass?.className?.toLowerCase();
+        case 'depCategory':
+            return (s) => s.jeCredit.account?.accountName?.toLowerCase();
+        case 'scheduleCategory':
+            return (s) => s.jeScheduleType;
+        case 'startMonth':
+            return (s) => s.startDate?.valueOf();
+        case 'type':
+            return (s) => s.baseTransaction.typeOfTransaction;
+        case 'amortizationPeriod':
+            return (s) => s.period;
+        case 'jePostingDate':
+            return (s) => s.dayOfPostingDate;
+        case 'remainingMonths':
+            return (s) => s.period;
+        case 'runningBalance':
+            return (s) => s.balanceAsOfToday?.amount;
+        case 'totalAmount':
+            return (s) => s.baseTransaction.amount.amount;
+        case 'transactionDate':
+            return (s) => s.baseTransaction.date.valueOf();
+        case 'memo':
+            return (s) => s.baseTransaction.memo?.toLowerCase();
+        default:
+            return (s) => s.startDate?.valueOf();
+    }
+}
+function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
+    const accessor = getJEScheduleSortAccessor(sortKey);
+    return (0, orderBy_1.default)(transactions, [accessor], [sortOrder === 'ascending' ? 'asc' : 'desc']);
+}
 function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
-    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, } = state;
+    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = (0, jeAccountSettingsViewSelector_1.getJEAccountSettingsView)(state);
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -65,18 +105,33 @@ function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const draftSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft');
-    const resolveSchedules = [];
+    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) => {
-            resolveSchedules.push({ ...schedule, scheduledJournalEntry: journalEntry });
+            unsortedResolveSchedules.push({
+                ...schedule,
+                scheduledJournalEntry: journalEntry,
+            });
         });
     });
+    const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
     const jeCompletionStatus = allSteps.find((step) => step.step === 'je_schedules')?.completionStatus;
     const completionStatus = jeCompletionStatus != null ? jeCompletionStatus : 'incomplete';
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -85,15 +140,17 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
+        completedSchedules,
         draftSchedules,
+        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
-        fetchState: fetchState,
+        fetchState: reducedFetchStatus.fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
-        error: error,
+        error: reducedFetchStatus.error,
         refreshStatus,
         completionStatus,
     };

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationMissingReceiptsView = getExpenseAutomationMissingReceiptsView;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
@@ -13,7 +14,7 @@ const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewRed
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
 function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -42,7 +43,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
                     transaction.lines.length > 0 &&
                     transaction.lines[0]
                         ?.class != null
-                    ? transaction.lines[0].class.className.toLowerCase()
+                    ? transaction.lines[0].class?.className.toLowerCase()
                     : null;
             case 'vendor':
             default:
@@ -181,9 +182,16 @@ function getExpenseAutomationMissingReceiptsView(state) {
             vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
         };
     });
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
-        fetchState,
-        error,
+        fetchState: reducedFetchStatus.fetchState,
+        error: reducedFetchStatus.error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,

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

@@ -19,7 +19,7 @@ const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const reconciliationViewReducer_1 = require("../reducers/reconciliationViewReducer");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
-exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((state) => state, (state) => (0, tenantSelector_1.getCurrentTenant)(state), (state) => state.expenseAutomationReconciliationViewState, (state) => state.expenseAutomationViewState, (state) => state.plaidAccountViewState, (state) => state.accountListState, (state) => state.accountState, (state) => state.classListState, (state) => state.classState, (state) => state.monthEndCloseChecksState, (state) => state.vendorState, (state, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState) => {
+exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((state) => state, (state) => (0, tenantSelector_1.getCurrentTenant)(state), (state) => state.expenseAutomationReconciliationViewState, (state) => state.expenseAutomationViewState, (state) => state.plaidAccountViewState, (state) => state.accountListState, (state) => state.accountState, (state) => state.classListState, (state) => state.classState, (state) => state.monthEndCloseChecksState, (state) => state.vendorState, (state) => state.monthEndCloseChecksViewState, (state, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState, monthEndCloseChecksViewState) => {
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const reconcileTabUiState = reconciliationViewState.reconTabsState.reconcile.uiState;
     const reviewTabUiState = reconciliationViewState.reconTabsState.review.uiState;
@@ -41,6 +41,13 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         }
         return acc;
     }, []);
+    const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : null;
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? {
+            fetchState: 'Not-Started',
+            error: undefined,
+        })
+        : { fetchState: 'Not-Started', error: undefined };
     if (accountReconForMonthYearPeriod == null) {
         return {
             bankAccounts: [],
@@ -50,10 +57,13 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             classListNestedAccountHierarchy: [],
             allAccountList: [],
             allClassList: [],
-            fetchStatus: {
-                fetchState: reconciliationViewState.fetchState,
-                error: reconciliationViewState.error,
-            },
+            fetchStatus: (0, reduceFetchState_1.reduceAnyFetchState)([
+                {
+                    fetchState: reconciliationViewState.fetchState,
+                    error: reconciliationViewState.error,
+                },
+                monthEndFetchState,
+            ]),
             plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
                 .plaidConnectionDetails,
             completionStatus: 'incomplete',
@@ -276,10 +286,13 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: {
-            fetchState: reconciliationViewState.fetchState,
-            error: reconciliationViewState.error,
-        },
+        fetchStatus: (0, reduceFetchState_1.reduceAnyFetchState)([
+            {
+                fetchState: reconciliationViewState.fetchState,
+                error: reconciliationViewState.error,
+            },
+            monthEndFetchState,
+        ]),
         plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
             .plaidConnectionDetails,
         reconciliationTabsState: reconciliationViewState.reconTabsState,

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

@@ -14,7 +14,7 @@ const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 function getExpenseAutomationTransactionView(state) {
-    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
     const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
@@ -47,10 +47,16 @@ function getExpenseAutomationTransactionView(state) {
         .filter((transaction) => transaction != null);
     const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
     const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
-    const fetchStatus = (0, reduceFetchState_1.reduceAllFetchState)([
-        accountList,
-        classList,
-        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        (0, reduceFetchState_1.reduceAllFetchState)([
+            accountList,
+            classList,
+            expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
+        ]),
+        monthEndFetchState,
     ]);
     const totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;

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

@@ -1,16 +1,21 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { Recommendation } from '../../../commonStateTypes/recommendationBase';
+import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { AccountBase } from '../../../entity/account/accountState';
 import { JEScheduleTransactionKey, 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";
+export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
 export interface JESchedulesViewUIState {
     scrollPosition: {
         scrollTop: number;
         scrollLeft?: number;
     } | undefined;
     searchString: string;
+    sortKey: JEScheduleSortKey;
+    sortOrder: SortOrder;
     totalCount: number;
     limit?: number;
 }

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

@@ -1,2 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toJEScheduleSortKey = void 0;
+const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
+const JE_SCHEDULE_SORT_KEYS = [
+    'vendor',
+    'category',
+    'class',
+    'depCategory',
+    'scheduleCategory',
+    'startMonth',
+    'type',
+    'amortizationPeriod',
+    'jePostingDate',
+    'remainingMonths',
+    'runningBalance',
+    'totalAmount',
+    'transactionDate',
+    'memo',
+];
+const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
+exports.toJEScheduleSortKey = toJEScheduleSortKey;

package/lib/view/profitAndLossClassesView/horizontalSectionEmptyBalancesSlice.d.ts

@@ -0,0 +1,9 @@
+import { COABalanceTimeFrame } from '../../commonStateTypes/coaBalance/coaBalance';
+import { COABalancesSlice } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
+import { Month } from '../../commonStateTypes/timePeriod';
+/**
+ * Empty `COABalancesSlice` for horizontal P&L-by-class section / calculated headers when
+ * enrichment has not produced balances yet, or for UI mapping fallbacks.
+ * Structure matches {@link enrichProfitAndLossByClassHorizontalReport} output.
+ */
+export declare function getEmptyHorizontalSectionBalancesSlice(firstMonthOfFY: Month, timeframe?: COABalanceTimeFrame): COABalancesSlice;

package/lib/view/profitAndLossClassesView/horizontalSectionEmptyBalancesSlice.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEmptyHorizontalSectionBalancesSlice = getEmptyHorizontalSectionBalancesSlice;
+/**
+ * Empty `COABalancesSlice` for horizontal P&L-by-class section / calculated headers when
+ * enrichment has not produced balances yet, or for UI mapping fallbacks.
+ * Structure matches {@link enrichProfitAndLossByClassHorizontalReport} output.
+ */
+function getEmptyHorizontalSectionBalancesSlice(firstMonthOfFY, timeframe = 'month') {
+    return {
+        balances: [],
+        additionalBalances: [],
+        filter: {
+            firstMonthOfFY,
+            timeframe,
+            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
+            additionalBalances: [],
+        },
+    };
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector.js

@@ -6,6 +6,7 @@ const getSummationBalance_1 = require("../../commonStateTypes/coaBalance/additio
 const currencyHelper_1 = require("../../commonStateTypes/currencyHelper");
 const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
 const sectionClassesViewSelector_1 = require("../../entity/sectionClassesViewV2/sectionClassesViewSelector");
+const profitAndLossClassesByClassHorizontalSelectorTypes_1 = require("./profitAndLossClassesByClassHorizontalSelectorTypes");
 const profitAndLossHorizontalEnrichment_1 = require("./profitAndLossHorizontalEnrichment");
 exports.profitAndLossHorizontalIdsInOrder = [
     'income',
@@ -307,6 +308,7 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency)
         startDate,
         type: 'default',
         label: col.className,
+        id: col.classId,
     }));
     // Add a "Total" column
     balances.push({
@@ -316,6 +318,7 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency)
         startDate,
         type: 'default',
         label: 'Total',
+        id: profitAndLossClassesByClassHorizontalSelectorTypes_1.HORIZONTAL_CLASS_TOTAL_BALANCE_ID,
     });
     return balances;
 }

package/lib/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enrichProfitAndLossByClassHorizontalReport = enrichProfitAndLossByClassHorizontalReport;
 const currencyHelper_1 = require("../../commonStateTypes/currencyHelper");
+const horizontalSectionEmptyBalancesSlice_1 = require("./horizontalSectionEmptyBalancesSlice");
 const profitAndLossClassesByClassHorizontalSelectorTypes_1 = require("./profitAndLossClassesByClassHorizontalSelectorTypes");
 /**
  * Populates `sectionHeaderBalancesSlice`, and per-account `accountReportData`, so the
@@ -42,17 +43,17 @@ function enrichHorizontalSection(report, section) {
     };
     const siblingsPerRow = buildSiblingIndicesPerRow(section.accounts, parentIndices);
     const hasChildFlags = computeHorizontalHasChildFlags(parentIndices);
-    for (let i = 0; i < section.accounts.length; i++) {
-        const row = section.accounts[i];
+    for (let accountIndex = 0; accountIndex < section.accounts.length; accountIndex++) {
+        const row = section.accounts[accountIndex];
         // Same column order as `report.classColumns` (see `pivotSectionToHorizontal`).
-        const classRowAmounts = row.classBalances.map((b) => b.balance.amount);
+        const classRowAmounts = row.classBalances.map((classBalance) => classBalance.balance.amount);
         row.accountReportData = {
             accountId: row.accountId,
             accountName: row.accountName,
             accountType: row.accountType,
             depth: row.depth,
             balancesInTimeframe: buildHorizontalClassColumnBalancesSlice(report, classRowAmounts, row.rowTotal.amount),
-            horizontalTreeView: buildHorizontalTreeViewFromPrecomputed(section.accounts, i, parentIndices, siblingsPerRow, hasChildFlags),
+            horizontalTreeView: buildHorizontalTreeViewFromPrecomputed(section.accounts, accountIndex, parentIndices, siblingsPerRow, hasChildFlags),
         };
     }
 }
@@ -70,23 +71,13 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
     const currencyCode = firstHeader?.balance.currencyCode ?? fallback.currencyCode;
     const currencySymbol = firstHeader?.balance.currencySymbol ?? fallback.currencySymbol;
     const timeframe = firstHeader?.balanceTimeFrame ?? 'month';
-    const emptySlice = {
-        balances: [],
-        additionalBalances: [],
-        filter: {
-            firstMonthOfFY: report.firstMonthOfFY,
-            timeframe,
-            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
-            additionalBalances: [],
-        },
-    };
     if (report.selectedPeriod == null) {
-        return emptySlice;
+        return (0, horizontalSectionEmptyBalancesSlice_1.getEmptyHorizontalSectionBalancesSlice)(report.firstMonthOfFY, timeframe);
     }
     const { startDate, endDate } = report.selectedPeriod;
-    const balances = report.classColumns.map((col, i) => ({
+    const balances = report.classColumns.map((col, columnIndex) => ({
         balance: {
-            amount: classAmounts[i] ?? 0,
+            amount: classAmounts[columnIndex] ?? 0,
             currencyCode,
             currencySymbol,
         },
@@ -137,22 +128,22 @@ function computeHorizontalAccountParentIndices(rows) {
         if (accountRow == null) {
             continue;
         }
-        const d = accountRow.depth;
+        const depth = accountRow.depth;
         while (stack.length > 0) {
             const topRow = rows[stack[stack.length - 1]];
             if (topRow == null) {
                 stack.pop();
                 continue;
             }
-            if (topRow.depth < d) {
+            if (topRow.depth < depth) {
                 break;
             }
             stack.pop();
         }
-        if (d > 2 && stack.length > 0) {
+        if (depth > 2 && stack.length > 0) {
             const peek = stack[stack.length - 1];
             const parentRow = rows[peek];
-            if (parentRow != null && parentRow.depth === d - 1) {
+            if (parentRow != null && parentRow.depth === depth - 1) {
                 parentIndex[rowIndex] = peek;
             }
         }
@@ -171,12 +162,12 @@ function buildSiblingIndicesPerRow(rows, parentIndices) {
             continue;
         }
         const key = `${parentRowIndex}:${accountRow.depth}`;
-        let g = keyToIndices.get(key);
-        if (g == null) {
-            g = [];
-            keyToIndices.set(key, g);
+        let siblingGroup = keyToIndices.get(key);
+        if (siblingGroup == null) {
+            siblingGroup = [];
+            keyToIndices.set(key, siblingGroup);
         }
-        g.push(rowIndex);
+        siblingGroup.push(rowIndex);
     }
     const siblingsPerRow = new Array(accountRowCount);
     for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
@@ -244,14 +235,14 @@ function buildHorizontalTreeViewFromPrecomputed(dfsOrderedAccountRows, currentRo
     const hasChildrenFlag = hasChildFlags[currentRowIndex];
     const treeDepth = accountRow != null ? Math.max(0, accountRow.depth - 2) : 0;
     const hasChildren = hasChildrenFlag === true;
-    const sibs = siblingIndices ?? [currentRowIndex];
+    const siblings = siblingIndices ?? [currentRowIndex];
     return {
         subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags),
         treeDepth,
         hasChildren,
-        hasSiblings: sibs.length > 1,
+        hasSiblings: siblings.length > 1,
         isLeaf: !hasChildren,
-        isLastNode: currentRowIndex === sibs[sibs.length - 1],
+        isLastNode: currentRowIndex === siblings[siblings.length - 1],
     };
 }
 function buildHorizontalAccountChildIndicesByParent(parentIndices) {

package/lib/view/scheduleView/scheduleListView/scheduleListTypes.d.ts

@@ -7,7 +7,7 @@ export declare const getScheduleListKey: (selectedCategory: ID, selectedTimefram
 export type ScheduleListKey = ReturnType<typeof getScheduleListKey>;
 export declare const toScheduleSubTabType: (v: string) => "completed" | "new" | "ongoing" | "all";
 export type ScheduleSubTabType = ReturnType<typeof toScheduleSubTabType>;
-declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "user" | "createTime" | "class" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "accruedExpenseCategory" | "scheduleCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "startMonth" | "endMonth";
+declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "user" | "createTime" | "class" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "scheduleCategory" | "startMonth" | "accruedExpenseCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "endMonth";
 export declare type ScheduleListSortKey = ReturnType<typeof toScheduleSortKeyType>;
 export interface DownloadJEScheduleTabOptions {
     categoryId: ID;