@zeniai/client-epic-state 4.19.99-betaVR3 → 4.19.100

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

@@ -1,7 +1,6 @@
 "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");
@@ -10,7 +9,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, monthEndCloseChecksViewState, } = state;
+    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState } = state;
     const { fetchState, error, refreshStatus, uiState, reviewOperatingExpenseIdsByPeriod, selectedSectionIdsByPeriod, groupsBySelectedPeriod, fluxAnalysisEntities, bulkReviewStatus, currency, totalBalancesAndVariance, } = expenseAutomationFluxAnalysisViewState;
     const fetchStateAndError = {
         fetchState,
@@ -95,17 +94,10 @@ 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: reducedFetchStatus,
+        fetchStatus: fetchStateAndError,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

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

@@ -5,8 +5,6 @@ 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");
@@ -18,48 +16,10 @@ 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, monthEndCloseChecksViewState, } = state;
+    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, } = 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);
@@ -105,33 +65,18 @@ function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const { sortKey, sortOrder } = uiState;
-    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
-    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
-    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
-        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
-    const unsortedResolveSchedules = [];
+    const draftSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft');
+    const resolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
-            unsortedResolveSchedules.push({
-                ...schedule,
-                scheduledJournalEntry: journalEntry,
-            });
+            resolveSchedules.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,
@@ -140,17 +85,15 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
         draftSchedules,
-        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
-        fetchState: reducedFetchStatus.fetchState,
+        fetchState: fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
-        error: reducedFetchStatus.error,
+        error: error,
         refreshStatus,
         completionStatus,
     };

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

@@ -1,3 +1,3 @@
 import { RootState } from '../../../reducer';
-import type { ExpenseAutomationMissingReceiptsViewSelector } from '../selectorTypes/missingReceiptsSelectorTypes';
+import { ExpenseAutomationMissingReceiptsViewSelector } from '../selectorTypes/missingReceiptsSelectorTypes';
 export declare function getExpenseAutomationMissingReceiptsView(state: RootState): ExpenseAutomationMissingReceiptsViewSelector;

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

@@ -5,16 +5,12 @@ 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");
-const missingReceiptsPayload_1 = require("../payload/missingReceiptsPayload");
-const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewReducer");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
-const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
 function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -43,7 +39,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:
@@ -57,260 +53,13 @@ function getExpenseAutomationMissingReceiptsView(state) {
     const completionStatus = missingReceiptsCompletionStatus != null
         ? missingReceiptsCompletionStatus
         : 'incomplete';
-    const { bulkUpload, pendingMissingReceiptsTabNavigation } = expenseAutomationMissingReceiptsViewState;
-    const currentBatchStatus = bulkUpload.currentBatchId != null
-        ? bulkUpload.batchStatusById[bulkUpload.currentBatchId]
-        : undefined;
-    const batchList = monthYearPeriodId != null
-        ? (bulkUpload.batchListByPeriod[monthYearPeriodId] ?? [])
-        : [];
-    /**
-     * Primary "Unmatched" batch = first completed batch in platform list order, preferring the
-     * first batch that still has possible_matches/no_match work when any completed batch has such work.
-     * Batches without details yet: wait if the list row still reports unmatched work; otherwise skip
-     * so we do not block the whole tab while other rows are not fetched yet.
-     */
-    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
-    /**
-     * During upload/matching, prefer `currentBatchId` only when its batch details are loaded,
-     * completed, and still have unmatched-tab work. Otherwise keep `primaryBatchIdFromDetailsOrder`.
-     *
-     * If we pinned to `currentBatchId` as soon as it was absent from the batch list (in-flight
-     * upload), details are often not loaded yet — `unmatchedFiles` would empty while older batches
-     * moved to "past", so the primary "Unmatched Receipts" section vanished during auto-matching.
-     */
-    const unmatchedSectionBatchId = (() => {
-        const phase = bulkUpload.phase;
-        if (phase !== 'matching' && phase !== 'uploading') {
-            return primaryBatchIdFromDetailsOrder;
-        }
-        const currentId = bulkUpload.currentBatchId;
-        if (currentId == null) {
-            return primaryBatchIdFromDetailsOrder;
-        }
-        const currentDetails = bulkUpload.batchDetailsById[currentId];
-        if (currentDetails != null &&
-            currentDetails.status === 'completed' &&
-            batchDetailsHasUnmatchedWork(currentDetails)) {
-            return currentId;
-        }
-        return primaryBatchIdFromDetailsOrder;
-    })();
-    const completedBatchesInApiOrder = batchList.filter((batchListItem) => (0, missingReceiptsPayload_1.isBatchListStatusCompleted)(batchListItem.status));
-    const currentBatchDetails = unmatchedSectionBatchId != null
-        ? bulkUpload.batchDetailsById[unmatchedSectionBatchId]
-        : undefined;
-    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, currentBatchDetails.batchId, transactionState));
-    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
-    const hasMoreBatchDetails = completedBatchesInApiOrder.some((batchListItem) => bulkUpload.batchDetailsById[batchListItem.batchId] == null &&
-        !failedIds.has(batchListItem.batchId));
-    const getSortValue = (file) => {
-        const matchedTransaction = file.matchedTransaction;
-        if (matchedTransaction == null) {
-            return null;
-        }
-        switch (bulkUpload.sortKey) {
-            case 'vendor':
-                return ((matchedTransaction.vendorName ?? matchedTransaction.description)?.toLowerCase() ?? null);
-            case 'category': {
-                const line = matchedTransaction.lines?.[0];
-                return line?.account?.accountName?.toLowerCase() ?? null;
-            }
-            case 'class': {
-                const line = matchedTransaction.lines?.[0];
-                return line?.class?.className?.toLowerCase() ?? null;
-            }
-            case 'date':
-                return matchedTransaction.date.valueOf();
-            case 'amount':
-                return matchedTransaction.amount.amount;
-            default:
-                return null;
-        }
-    };
-    const bulkUploadSortDirection = bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc';
-    const matchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((resolvedFile) => resolvedFile.status === 'exact_match') ?? [], getSortValue, bulkUploadSortDirection);
-    const unmatchedFiles = (0, orderBy_1.default)(resolvedFiles?.filter((resolvedFile) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(resolvedFile.status)) ?? [], getSortValue, bulkUploadSortDirection);
-    const progress = currentBatchStatus != null
-        ? {
-            ...currentBatchStatus.progress,
-            percentage: currentBatchStatus.progress.total > 0
-                ? Math.round((currentBatchStatus.progress.processed /
-                    currentBatchStatus.progress.total) *
-                    100)
-                : 0,
-        }
-        : { total: 0, processed: 0, percentage: 0 };
-    const batchListFetchState = bulkUpload.batchListFetchState;
-    /**
-     * When primary batch is not resolved yet, still aggregate unmatched files from every batch
-     * that has details loaded (otherwise past is empty and receipts vanish from the UI).
-     */
-    const pastBatches = unmatchedSectionBatchId != null
-        ? batchList.filter((batchListItem) => batchListItem.batchId !== unmatchedSectionBatchId)
-        : batchList;
-    const pastUnmatchedFiles = pastBatches.flatMap((pastBatch) => {
-        const details = bulkUpload.batchDetailsById[pastBatch.batchId];
-        if (details == null) {
-            return [];
-        }
-        return details.files
-            .filter((batchFile) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(batchFile.status))
-            .map((batchFile) => resolveBatchFile(batchFile, pastBatch.batchId, transactionState));
-    });
-    const completedTransactionsCacheKey = monthYearPeriodId != null
-        ? (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
-        : undefined;
-    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
-        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
-        : undefined;
-    const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
-    const resolvedCompletedTransactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, completedTransactionIds);
-    const resolvedBatchDetails = currentBatchDetails != null && resolvedFiles != null
-        ? {
-            batchId: currentBatchDetails.batchId,
-            createdAt: currentBatchDetails.createdAt,
-            files: resolvedFiles,
-            status: currentBatchDetails.status,
-            summary: currentBatchDetails.summary,
-        }
-        : undefined;
-    const manualSearchResults = bulkUpload.manualSearch.results.map((result) => {
-        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, result.transactionId);
-        return {
-            ...result,
-            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: reducedFetchStatus.fetchState,
-        error: reducedFetchStatus.error,
+        fetchState,
+        error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,
         transactions: sortedTransactions,
         completionStatus,
-        pendingMissingReceiptsTabNavigation: pendingMissingReceiptsTabNavigation ?? null,
-        bulkUpload: {
-            phase: bulkUpload.phase,
-            uploadStatus: bulkUpload.uploadStatus,
-            batchStatus: currentBatchStatus,
-            batchDetails: resolvedBatchDetails,
-            completedSubTab: bulkUpload.completedSubTab,
-            completedTransactions: {
-                fetchState: completedTransactionsForPeriod?.fetchState ?? {
-                    fetchState: 'Not-Started',
-                    error: undefined,
-                },
-                nextPageToken: completedTransactionsForPeriod?.nextPageToken ?? null,
-                totalCount: completedTransactionsForPeriod?.totalCount ?? 0,
-                transactions: resolvedCompletedTransactions,
-            },
-            matchedFiles,
-            unmatchedFiles,
-            progress,
-            currentResultsTab: bulkUpload.currentResultsTab,
-            sortKey: bulkUpload.sortKey,
-            sortOrder: bulkUpload.sortOrder,
-            batchList,
-            batchListFetchState,
-            pastBatches,
-            pastUnmatchedFiles,
-            confirmMatchStatus: bulkUpload.confirmMatchStatus,
-            manualSearchUiResetKey: bulkUpload.manualSearchUiResetKey,
-            hasMoreBatchDetails,
-            batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
-            manualSearch: {
-                ...bulkUpload.manualSearch,
-                results: manualSearchResults,
-            },
-            uploadProgress: bulkUpload.uploadProgress,
-        },
-    };
-}
-function batchDetailsHasUnmatchedWork(details) {
-    return details.files.some((file) => (0, missingReceiptsViewState_1.isUnmatchedTabFileStatus)(file.status));
-}
-/** List row summary before batch details load — aligns with unmatched / possible-match work. */
-function batchListItemHasUnmatchedWork(batch) {
-    return batch.noMatchCount > 0 || batch.possibleMatchesCount > 0;
-}
-/**
- * `batchList` must match platform order (same sequence as the bulk-upload batches API). Picks the
- * primary batch for the top "Unmatched" section. Skips failed detail fetches.
- *
- * If details are not loaded for an earlier list row but that row reports no unmatched work, we
- * skip it so later rows with loaded details can be primary (avoids an empty tab when the first
- * fetch page only loaded later batches). If the list reports unmatched work but details are still
- * loading, we wait (undefined) so primary order stays correct once details arrive.
- */
-function getPrimaryBatchIdFromBatchListOrder(batchListInPlatformOrder, batchDetailsById, failedBatchDetailIds) {
-    const failedIds = new Set(failedBatchDetailIds);
-    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((batch) => {
-        if (failedIds.has(batch.batchId)) {
-            return false;
-        }
-        const details = batchDetailsById[batch.batchId];
-        if (details != null &&
-            details.status === 'completed' &&
-            batchDetailsHasUnmatchedWork(details)) {
-            return true;
-        }
-        return details == null && batchListItemHasUnmatchedWork(batch);
-    });
-    for (const batch of batchListInPlatformOrder) {
-        if (failedIds.has(batch.batchId)) {
-            continue;
-        }
-        const details = batchDetailsById[batch.batchId];
-        if (details == null) {
-            if (batchListItemHasUnmatchedWork(batch)) {
-                return undefined;
-            }
-            continue;
-        }
-        if (details.status !== 'completed') {
-            continue;
-        }
-        if (anyCompletedBatchHasUnmatchedWork) {
-            if (batchDetailsHasUnmatchedWork(details)) {
-                return batch.batchId;
-            }
-            continue;
-        }
-        return batch.batchId;
-    }
-    return undefined;
-}
-function resolveBatchFile(file, batchId, transactionState) {
-    const matchedTransaction = file.matchedTransactionId != null
-        ? (0, transactionSelector_1.getSupportedTransactionById)(transactionState, file.matchedTransactionId)
-        : undefined;
-    const candidates = file.candidates
-        ?.map((ref) => {
-        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, ref.transactionId);
-        return transaction != null
-            ? { transaction, matchScore: ref.matchScore }
-            : undefined;
-    })
-        .filter((candidate) => candidate != null);
-    return {
-        attachmentId: file.attachmentId,
-        batchId,
-        fileDownloadUrl: file.fileDownloadUrl,
-        fileId: file.fileId,
-        filename: file.filename,
-        filePreviewUrl: file.filePreviewUrl,
-        status: file.status,
-        matchedTransaction,
-        candidates: candidates != null && candidates.length > 0 ? candidates : undefined,
-        matchSource: file.matchSource,
     };
 }

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) => state.monthEndCloseChecksViewState, (state, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState, monthEndCloseChecksViewState) => {
+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) => {
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const reconcileTabUiState = reconciliationViewState.reconTabsState.reconcile.uiState;
     const reviewTabUiState = reconciliationViewState.reconTabsState.review.uiState;
@@ -41,13 +41,6 @@ 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: [],
@@ -57,13 +50,10 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             classListNestedAccountHierarchy: [],
             allAccountList: [],
             allClassList: [],
-            fetchStatus: (0, reduceFetchState_1.reduceAnyFetchState)([
-                {
-                    fetchState: reconciliationViewState.fetchState,
-                    error: reconciliationViewState.error,
-                },
-                monthEndFetchState,
-            ]),
+            fetchStatus: {
+                fetchState: reconciliationViewState.fetchState,
+                error: reconciliationViewState.error,
+            },
             plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
                 .plaidConnectionDetails,
             completionStatus: 'incomplete',
@@ -286,13 +276,10 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: (0, reduceFetchState_1.reduceAnyFetchState)([
-            {
-                fetchState: reconciliationViewState.fetchState,
-                error: reconciliationViewState.error,
-            },
-            monthEndFetchState,
-        ]),
+        fetchStatus: {
+            fetchState: reconciliationViewState.fetchState,
+            error: reconciliationViewState.error,
+        },
         plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
             .plaidConnectionDetails,
         reconciliationTabsState: reconciliationViewState.reconTabsState,

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

@@ -14,9 +14,9 @@ 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, monthEndCloseChecksViewState, } = state;
+    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
     const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
@@ -47,16 +47,10 @@ 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 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 fetchStatus = (0, reduceFetchState_1.reduceAllFetchState)([
+        accountList,
+        classList,
+        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
     ]);
     const totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;
@@ -106,7 +100,6 @@ function getExpenseAutomationTransactionView(state) {
         completionStatus,
         totalCountByTab,
         fetchStateByTransactionTabs: fetchStateByTab,
-        uploadReceiptStatusById,
         selectedTransactionId,
         selectedTransactionLineId,
     };

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

@@ -1,21 +1,16 @@
 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,22 +1,2 @@
 "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;