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

package/lib/esm/view/expenseAutomationView/reducers/missingReceiptsViewReducer.js

@@ -1,38 +1,6 @@
-import { createAction, createSlice } from '@reduxjs/toolkit';
+import { createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
-import { MIN_MANUAL_TRANSACTION_SEARCH_LENGTH, } from '../types/missingReceiptsViewState';
-export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => `completed-${subTab}-${sortKey}-${sortOrder === 'ascending' ? 'asc' : 'desc'}-${periodId}`;
-export const initialBulkUploadState = {
-    batchDetailsById: {},
-    batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
-    batchListByPeriod: {},
-    batchListFetchState: { fetchState: 'Not-Started', error: undefined },
-    batchStatusById: {},
-    completedSubTab: 'all',
-    completedTransactionsByPeriod: {},
-    confirmMatchStatus: { fetchState: 'Not-Started', error: undefined },
-    currentBatchId: undefined,
-    currentResultsTab: 'unmatched',
-    failedBatchDetailIds: [],
-    manualSearchUiResetKey: 0,
-    manualSearch: {
-        fetchState: { fetchState: 'Not-Started', error: undefined },
-        isLoadingMore: false,
-        nextPageToken: null,
-        pageSize: 25,
-        results: [],
-        searchQuery: '',
-        totalCount: 0,
-    },
-    phase: 'idle',
-    sortKey: 'date',
-    sortOrder: 'descending',
-    uploadProgress: 0,
-    uploadStatus: { fetchState: 'Not-Started', error: undefined },
-};
 export const initialState = {
-    bulkUpload: initialBulkUploadState,
-    pendingMissingReceiptsTabNavigation: null,
     uploadReceiptStatusById: {},
     refreshStatus: {
         fetchState: 'Not-Started',
@@ -51,8 +19,6 @@ export const initialState = {
         return this.fetchState == 'Completed';
     },
 };
-/** Epic trigger only; batch-details fetch is handled in epics. */
-export const fetchBulkUploadBatchDetails = createAction('expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetails');
 const expenseAutomationMissingReceiptsView = createSlice({
     name: 'expenseAutomationMissingReceiptsView',
     initialState,
@@ -154,404 +120,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
         clearExpenseAutomationMissingReceiptsView(draft) {
             Object.assign(draft, initialState);
         },
-        // -- Bulk Upload Actions --
-        bulkUploadReceipts: {
-            reducer(draft) {
-                draft.bulkUpload.phase = 'uploading';
-                draft.bulkUpload.uploadProgress = 0;
-                draft.bulkUpload.uploadStatus = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(files) {
-                return { payload: { files } };
-            },
-        },
-        updateBulkUploadProgress(draft, action) {
-            draft.bulkUpload.uploadProgress = action.payload;
-        },
-        bulkUploadReceiptsSuccess(draft, action) {
-            draft.bulkUpload.currentBatchId = action.payload.batchId;
-            draft.bulkUpload.uploadProgress = 100;
-            draft.bulkUpload.uploadStatus = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            draft.bulkUpload.phase = 'matching';
-        },
-        bulkUploadReceiptsFailure(draft, action) {
-            draft.bulkUpload.uploadStatus = {
-                fetchState: 'Error',
-                error: action.payload.error,
-            };
-            draft.bulkUpload.phase = 'idle';
-        },
-        bulkUploadAutomatchingTimedOut: {
-            reducer(draft, action) {
-                if (draft.bulkUpload.phase !== 'matching' ||
-                    draft.bulkUpload.currentBatchId !== action.payload.batchId) {
-                    return;
-                }
-                draft.bulkUpload.phase = 'completed';
-            },
-            prepare(batchId) {
-                return { payload: { batchId } };
-            },
-        },
-        pusherBatchStatusUpdate(draft, action) {
-            const batchStatus = action.payload;
-            draft.bulkUpload.batchStatusById[batchStatus.batchId] = batchStatus;
-            /**
-             * Auto-matching banner (`phase === 'matching'`) must clear when the server reports this
-             * upload batch is done — otherwise the Missing tab keeps MatchingProgressBanner until
-             * batch-details APIs run; EmailUploadBanner should show again for the next upload.
-             */
-            if (batchStatus.status === 'completed' &&
-                draft.bulkUpload.phase === 'matching' &&
-                draft.bulkUpload.currentBatchId === batchStatus.batchId) {
-                draft.bulkUpload.phase = 'completed';
-            }
-        },
-        requestMissingReceiptsTabNavigation(draft, action) {
-            draft.pendingMissingReceiptsTabNavigation = action.payload.tab;
-        },
-        clearMissingReceiptsTabNavigation(draft) {
-            draft.pendingMissingReceiptsTabNavigation = null;
-        },
-        fetchBulkUploadBatchDetailsSuccess(draft, action) {
-            const details = action.payload;
-            draft.bulkUpload.batchDetailsById[details.batchId] = details;
-            draft.bulkUpload.phase = 'completed';
-        },
-        fetchBulkUploadBatchDetailsFailure: {
-            reducer(draft) {
-                draft.bulkUpload.phase = 'completed';
-            },
-            prepare(payload) {
-                return { payload };
-            },
-        },
-        storeBatchDetails(draft, action) {
-            const details = action.payload;
-            draft.bulkUpload.batchDetailsById[details.batchId] = details;
-            /**
-             * Multi-batch fetch paths use `storeBatchDetails` (not `fetchBulkUploadBatchDetailsSuccess`).
-             * Without this, `phase` stays `matching` after upload forever and the Unmatched tab keeps
-             * showing the skeleton (`bulkUploadPhase === 'matching'` in web-components).
-             */
-            if (draft.bulkUpload.phase === 'matching' &&
-                draft.bulkUpload.currentBatchId === details.batchId) {
-                draft.bulkUpload.phase = 'completed';
-            }
-        },
-        batchDetailFetchFailed(draft, action) {
-            const { batchId } = action.payload;
-            if (!draft.bulkUpload.failedBatchDetailIds.includes(batchId)) {
-                draft.bulkUpload.failedBatchDetailIds.push(batchId);
-            }
-            if (draft.bulkUpload.phase === 'matching' &&
-                draft.bulkUpload.currentBatchId === batchId) {
-                draft.bulkUpload.phase = 'completed';
-            }
-        },
-        setInitialBatchDetailsLoading(draft) {
-            draft.bulkUpload.batchDetailsPaginationState = {
-                fetchState: 'In-Progress',
-                error: undefined,
-            };
-        },
-        fetchMoreBatchDetails(draft) {
-            draft.bulkUpload.batchDetailsPaginationState = {
-                fetchState: 'In-Progress',
-                error: undefined,
-            };
-        },
-        fetchMoreBatchDetailsComplete(draft) {
-            draft.bulkUpload.batchDetailsPaginationState = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            const currentId = draft.bulkUpload.currentBatchId;
-            const currentDetails = currentId != null
-                ? draft.bulkUpload.batchDetailsById[currentId]
-                : undefined;
-            if (draft.bulkUpload.phase === 'matching' &&
-                currentId != null &&
-                currentDetails?.status === 'completed') {
-                draft.bulkUpload.phase = 'completed';
-            }
-        },
-        fetchMoreBatchDetailsFailure(draft, action) {
-            draft.bulkUpload.batchDetailsPaginationState = {
-                fetchState: 'Error',
-                error: action.payload.error,
-            };
-        },
-        fetchBulkUploadBatches: {
-            reducer(draft, action) {
-                if (action.payload.invalidateBatchDetailsCache === true) {
-                    draft.bulkUpload.batchDetailsById = {};
-                    draft.bulkUpload.failedBatchDetailIds = [];
-                }
-                draft.bulkUpload.batchListFetchState = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(input) {
-                const fetchOptions = input ?? {};
-                return {
-                    payload: {
-                        cacheOverride: fetchOptions.cacheOverride === true,
-                        invalidateBatchDetailsCache: fetchOptions.invalidateBatchDetailsCache === true,
-                    },
-                };
-            },
-        },
-        fetchBulkUploadBatchesSuccess(draft, action) {
-            const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
-            draft.bulkUpload.batchListByPeriod[periodId] = action.payload.batchList;
-            draft.bulkUpload.batchListFetchState = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            /**
-             * When the multi-batch-details epic has nothing to fetch (e.g. list rows not `completed`
-             * yet, or details already present), `phase` can stay `matching` even though we already
-             * have completed details for `currentBatchId` (from polling / Pusher). Sync so the UI can
-             * dismiss the Unmatched skeleton.
-             */
-            const currentId = draft.bulkUpload.currentBatchId;
-            if (draft.bulkUpload.phase === 'matching' && currentId != null) {
-                const existing = draft.bulkUpload.batchDetailsById[currentId];
-                if (existing?.status === 'completed') {
-                    draft.bulkUpload.phase = 'completed';
-                }
-            }
-        },
-        fetchBulkUploadBatchesFailure(draft, action) {
-            draft.bulkUpload.batchListFetchState = {
-                fetchState: 'Error',
-                error: action.payload.error,
-            };
-        },
-        confirmBulkUploadMatch: {
-            reducer(draft) {
-                draft.bulkUpload.confirmMatchStatus = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(batchId, attachmentId, transactionId, transactionType, fileName) {
-                return {
-                    payload: {
-                        batchId,
-                        attachmentId,
-                        transactionId,
-                        transactionType,
-                        fileName,
-                    },
-                };
-            },
-        },
-        confirmBulkUploadMatchSuccess(draft, action) {
-            const { batchId, attachmentId, transactionId } = action.payload;
-            draft.bulkUpload.confirmMatchStatus = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            const details = draft.bulkUpload.batchDetailsById[batchId];
-            if (details != null) {
-                const file = details.files.find((batchFile) => batchFile.attachmentId === attachmentId);
-                if (file != null) {
-                    const originalStatus = file.status;
-                    file.status = 'exact_match';
-                    file.matchedTransactionId = transactionId;
-                    file.candidates = undefined;
-                    details.summary.matched += 1;
-                    if (originalStatus === 'no_match') {
-                        details.summary.noMatch = Math.max(0, details.summary.noMatch - 1);
-                    }
-                    else if (originalStatus === 'possible_matches') {
-                        details.summary.possibleMatches = Math.max(0, details.summary.possibleMatches - 1);
-                    }
-                }
-            }
-            draft.bulkUpload.manualSearch = initialBulkUploadState.manualSearch;
-            draft.bulkUpload.manualSearchUiResetKey += 1;
-        },
-        confirmBulkUploadMatchFailure(draft, action) {
-            draft.bulkUpload.confirmMatchStatus = {
-                fetchState: 'Error',
-                error: action.payload.error,
-            };
-        },
-        setBulkUploadResultsTab(draft, action) {
-            draft.bulkUpload.currentResultsTab = action.payload;
-        },
-        setBulkUploadCompletedSubTab(draft, action) {
-            draft.bulkUpload.completedSubTab = action.payload;
-        },
-        setBulkUploadSortConfig(draft, action) {
-            draft.bulkUpload.sortKey = action.payload.sortKey;
-            draft.bulkUpload.sortOrder = action.payload.sortOrder;
-        },
-        clearBulkUpload(draft) {
-            Object.assign(draft.bulkUpload, initialBulkUploadState);
-            draft.pendingMissingReceiptsTabNavigation = null;
-        },
-        searchTransactionsForManualMatch: {
-            reducer(draft, action) {
-                const { query, pageToken } = action.payload;
-                const isLoadMore = pageToken != null;
-                const trimmed = query.trim();
-                /**
-                 * Cleared or too-short query: no API (see epic). Reset fully (no In-Progress).
-                 * Only bump `manualSearchUiResetKey` when clearing a real search — not when the UI
-                 * dispatches `""` on every keystroke while length is below MIN (web-components always sends
-                 * `onSearch("")` in that case), or ReceiptCard remounts and the input loses focus.
-                 */
-                if (!isLoadMore &&
-                    trimmed.length < MIN_MANUAL_TRANSACTION_SEARCH_LENGTH) {
-                    const hadActiveSearch = draft.bulkUpload.manualSearch.searchQuery.trim().length >=
-                        MIN_MANUAL_TRANSACTION_SEARCH_LENGTH ||
-                        draft.bulkUpload.manualSearch.results.length > 0;
-                    draft.bulkUpload.manualSearch = initialBulkUploadState.manualSearch;
-                    if (hadActiveSearch) {
-                        draft.bulkUpload.manualSearchUiResetKey += 1;
-                    }
-                    return;
-                }
-                draft.bulkUpload.manualSearch.searchQuery = query;
-                if (isLoadMore) {
-                    draft.bulkUpload.manualSearch.isLoadingMore = true;
-                }
-                else {
-                    draft.bulkUpload.manualSearch.isLoadingMore = false;
-                    draft.bulkUpload.manualSearch.results = [];
-                    draft.bulkUpload.manualSearch.nextPageToken = null;
-                    draft.bulkUpload.manualSearch.totalCount = 0;
-                    draft.bulkUpload.manualSearch.fetchState = {
-                        fetchState: 'In-Progress',
-                        error: undefined,
-                    };
-                }
-            },
-            prepare(query, pageToken) {
-                return { payload: { query, pageToken: pageToken ?? undefined } };
-            },
-        },
-        searchTransactionsForManualMatchSuccess(draft, action) {
-            const { append, nextPageToken, results, totalCount } = action.payload;
-            if (append) {
-                const merged = [...draft.bulkUpload.manualSearch.results, ...results];
-                const byId = new Map(merged.map((result) => [result.transactionId, result]));
-                draft.bulkUpload.manualSearch.results = Array.from(byId.values());
-            }
-            else {
-                draft.bulkUpload.manualSearch.results = results;
-            }
-            draft.bulkUpload.manualSearch.nextPageToken = nextPageToken;
-            draft.bulkUpload.manualSearch.totalCount = totalCount;
-            draft.bulkUpload.manualSearch.isLoadingMore = false;
-            draft.bulkUpload.manualSearch.fetchState = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-        },
-        searchTransactionsForManualMatchFailure(draft, action) {
-            draft.bulkUpload.manualSearch.isLoadingMore = false;
-            draft.bulkUpload.manualSearch.fetchState = {
-                fetchState: 'Error',
-                error: action.payload.error,
-            };
-        },
-        clearManualSearchResults(draft) {
-            draft.bulkUpload.manualSearch = initialBulkUploadState.manualSearch;
-            draft.bulkUpload.manualSearchUiResetKey += 1;
-        },
-        acknowledgeBulkUploadConfirmMatchComplete(draft) {
-            draft.bulkUpload.confirmMatchStatus = {
-                fetchState: 'Not-Started',
-                error: undefined,
-            };
-        },
-        // -- Completed Transactions Actions --
-        fetchCompletedTransactions: {
-            reducer(draft, action) {
-                const { pageToken } = action.payload;
-                if (pageToken != null) {
-                    const periods = draft.bulkUpload.completedTransactionsByPeriod;
-                    for (const entry of Object.values(periods)) {
-                        if (entry.nextPageToken === pageToken) {
-                            entry.fetchState = {
-                                fetchState: 'In-Progress',
-                                error: undefined,
-                            };
-                            break;
-                        }
-                    }
-                }
-            },
-            prepare(pageToken, cacheOverride) {
-                return { payload: { pageToken, cacheOverride } };
-            },
-        },
-        fetchCompletedTransactionsSuccess(draft, action) {
-            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, } = action.payload;
-            const periodId = toMonthYearPeriodId(selectedPeriod);
-            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
-            if (isInitialLoad) {
-                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
-                    transactionIds,
-                    nextPageToken,
-                    totalCount,
-                    fetchState: { fetchState: 'Completed', error: undefined },
-                };
-            }
-            else {
-                const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
-                if (existing != null) {
-                    existing.transactionIds.push(...transactionIds);
-                    existing.nextPageToken = nextPageToken;
-                    existing.totalCount = totalCount;
-                    existing.fetchState = { fetchState: 'Completed', error: undefined };
-                }
-                else {
-                    draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
-                        transactionIds,
-                        nextPageToken,
-                        totalCount,
-                        fetchState: { fetchState: 'Completed', error: undefined },
-                    };
-                }
-            }
-        },
-        fetchCompletedTransactionsFailure(draft, action) {
-            const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
-            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
-            const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
-            if (existing != null) {
-                existing.fetchState = {
-                    fetchState: 'Error',
-                    error: action.payload.error,
-                };
-            }
-            else {
-                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
-                    fetchState: { fetchState: 'Error', error: action.payload.error },
-                    nextPageToken: null,
-                    totalCount: 0,
-                    transactionIds: [],
-                };
-            }
-        },
     },
 });
-export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, 
-// Bulk Upload
-bulkUploadReceipts, updateBulkUploadProgress, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, bulkUploadAutomatchingTimedOut, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, clearMissingReceiptsTabNavigation, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, batchDetailFetchFailed, setInitialBatchDetailsLoading, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, acknowledgeBulkUploadConfirmMatchComplete, 
-// Completed Transactions
-fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, } = expenseAutomationMissingReceiptsView.actions;
+export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, } = expenseAutomationMissingReceiptsView.actions;
 export default expenseAutomationMissingReceiptsView.reducer;

package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js

@@ -36,7 +36,6 @@ export const initialTransactionTabViewState = {
     transactionIdsBySelectedPeriod: {},
     selectedCheckBoxTransactionIds: [],
     transactionIdsWithUnsavedData: [],
-    uploadReceiptStatusById: {},
     selectedTransactionId: undefined,
     selectedTransactionLineId: undefined,
 };
@@ -700,27 +699,6 @@ const expenseAutomationTransactionsView = createSlice({
         clearExpenseAutomationTransactionsView(draft) {
             Object.assign(draft, initialState);
         },
-        updateTransactionCategorizationUploadReceiptState: {
-            reducer(draft, action) {
-                const { transactionId, fetchStatus, selectedTab } = action.payload;
-                draft.transactionCategorizationView[selectedTab].uploadReceiptStatusById[transactionId] = fetchStatus;
-            },
-            prepare(selectedTab, transactionId, fetchStatus) {
-                return { payload: { selectedTab, transactionId, fetchStatus } };
-            },
-        },
-        uploadTransactionCategorizationReceiptSuccess: {
-            reducer(draft, action) {
-                const { transactionPayload, selectedTab } = action.payload;
-                draft.transactionCategorizationView[selectedTab].uploadReceiptStatusById[transactionPayload.transaction_id] = {
-                    fetchState: 'Completed',
-                    error: undefined,
-                };
-            },
-            prepare(selectedTab, transactionPayload, updateType = 'merge') {
-                return { payload: { selectedTab, transactionPayload, updateType } };
-            },
-        },
         syncTransactionCategorizationFromDetailSave: {
             prepare(transactionId, updatedTransaction, pendingReviewLineIds, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled) {
                 return {
@@ -792,5 +770,5 @@ const expenseAutomationTransactionsView = createSlice({
         },
     },
 });
-export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
+export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, } = expenseAutomationTransactionsView.actions;
 export default expenseAutomationTransactionsView.reducer;

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

@@ -1,4 +1,3 @@
-import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountBase } from '../../../entity/account/accountSelector';
 import { getClassById } from '../../../entity/class/classSelector';
@@ -7,7 +6,7 @@ import { getUserByUserId } from '../../../entity/user/userSelector';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 export 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,
@@ -92,17 +91,10 @@ export 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 = reduceAnyFetchState([
-        fetchStateAndError,
-        monthEndFetchState,
-    ]);
     return {
         sections,
         totalBalancesAndVariance,
-        fetchStatus: reducedFetchStatus,
+        fetchStatus: fetchStateAndError,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

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

@@ -1,6 +1,4 @@
 import omit from 'lodash/omit';
-import orderBy from 'lodash/orderBy';
-import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
 import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
@@ -12,48 +10,10 @@ import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDet
 import { getAccountLabelForScheduleType, getAccountsTypesForScheduleList, } from '../../scheduleView/scheduleListView/scheduleListHelper';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 import { getJEAccountSettingsView } from './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 orderBy(transactions, [accessor], [sortOrder === 'ascending' ? 'asc' : 'desc']);
-}
 export 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 = getJEAccountSettingsView(state);
     const currentTenant = getCurrentTenant(state);
@@ -99,33 +59,18 @@ export function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = 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
         ? 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 = reduceAnyFetchState([
-        { fetchState, error },
-        monthEndFetchState,
-    ]);
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -134,17 +79,15 @@ export 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,
     };