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

package/lib/esm/view/aiCfoView/aiCfoViewReducer.js

@@ -1,4 +1,19 @@
 import { createSlice } from '@reduxjs/toolkit';
+function removeSessionIdFromPageKeyMap(draft, sessionId) {
+    const map = draft.uiState.chatSessionIdByPageKey;
+    for (const key of Object.keys(map)) {
+        if (map[key] === sessionId) {
+            delete map[key];
+        }
+    }
+}
+function mirrorCurrentSessionToPageKeyMapIfActive(draft) {
+    const key = draft.uiState.aiCfoSidePanelHostPageKey;
+    const sessionId = draft.uiState.currentChatSessionId;
+    if (key != null && sessionId != null) {
+        draft.uiState.chatSessionIdByPageKey[key] = sessionId;
+    }
+}
 export const initialAiCfoViewState = {
     fetchState: 'Not-Started',
     error: undefined,
@@ -6,6 +21,8 @@ export const initialAiCfoViewState = {
         currentInput: '',
         scrollPositionByChatSessionId: {},
         currentChatSessionId: undefined,
+        aiCfoSidePanelHostPageKey: undefined,
+        chatSessionIdByPageKey: {},
         agentId: undefined,
         chatHistoryNextPageToken: {},
         chatSessionsNextPageToken: { nextPageToken: null, hasMore: false },
@@ -29,6 +46,7 @@ export const initialAiCfoViewState = {
     fetchChatSessionHistoryByChatSessionId: {},
     responseStateByChatSessionId: {},
     stopSubmitStateByChatSessionId: {},
+    suggestedQuestionsByPageContext: {},
 };
 const aiCfoView = createSlice({
     name: 'aiCfoView',
@@ -162,6 +180,7 @@ const aiCfoView = createSlice({
         setSession(draft, action) {
             draft.uiState.currentChatSessionId = action.payload.sessionId;
             draft.uiState.agentId = action.payload.agentId;
+            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSession: {
             reducer(draft, action) {
@@ -185,6 +204,7 @@ const aiCfoView = createSlice({
                 nextPageToken: null,
                 hasMore: false,
             };
+            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSessionFailure(draft, action) {
             draft.createSessionState.fetchState = 'Error';
@@ -222,6 +242,7 @@ const aiCfoView = createSlice({
                 nextPageToken: null,
                 hasMore: false,
             };
+            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSessionAndSubmitSuccess(draft) {
             // Note: currentChatSessionId, agentId, and chatHistoryNextPageToken are set by initializeNewSessionState
@@ -338,6 +359,7 @@ const aiCfoView = createSlice({
                 draft.uiState.currentChatSessionId = undefined;
                 draft.uiState.agentId = undefined;
             }
+            removeSessionIdFromPageKeyMap(draft, chatSessionId);
             delete draft.uiState.chatHistoryNextPageToken[chatSessionId];
             delete draft.uiState.scrollPositionByChatSessionId[chatSessionId];
             delete draft.fetchChatSessionHistoryByChatSessionId[chatSessionId];
@@ -360,6 +382,65 @@ const aiCfoView = createSlice({
         },
         clearCurrentSessionId(draft) {
             draft.uiState.currentChatSessionId = undefined;
+            const key = draft.uiState.aiCfoSidePanelHostPageKey;
+            if (key != null) {
+                delete draft.uiState.chatSessionIdByPageKey[key];
+            }
+        },
+        applyAiCfoSidePanelHostPageTransition(draft, action) {
+            const { newAiCfoSidePanelHostPageKey, nextCurrentChatSessionId } = action.payload;
+            const prevKey = draft.uiState.aiCfoSidePanelHostPageKey;
+            const curId = draft.uiState.currentChatSessionId;
+            if (prevKey != null &&
+                prevKey !== newAiCfoSidePanelHostPageKey &&
+                curId != null) {
+                draft.uiState.chatSessionIdByPageKey[prevKey] = curId;
+            }
+            draft.uiState.aiCfoSidePanelHostPageKey = newAiCfoSidePanelHostPageKey;
+            draft.uiState.currentChatSessionId =
+                nextCurrentChatSessionId != null ? nextCurrentChatSessionId : undefined;
+            draft.uiState.currentInput = '';
+            mirrorCurrentSessionToPageKeyMapIfActive(draft);
+        },
+        clearAiCfoSidePanelHostPageContext(draft) {
+            const key = draft.uiState.aiCfoSidePanelHostPageKey;
+            const curId = draft.uiState.currentChatSessionId;
+            if (key != null && curId != null) {
+                draft.uiState.chatSessionIdByPageKey[key] = curId;
+            }
+            draft.uiState.aiCfoSidePanelHostPageKey = undefined;
+        },
+        fetchSuggestedQuestions(draft, action) {
+            const { pageContext } = action.payload;
+            const prev = draft.suggestedQuestionsByPageContext[pageContext];
+            draft.suggestedQuestionsByPageContext[pageContext] = {
+                fetchState: 'In-Progress',
+                pageContext,
+                suggestedQuestions: prev?.suggestedQuestions ?? [],
+                generatedAt: prev?.generatedAt,
+                error: undefined,
+            };
+        },
+        fetchSuggestedQuestionsSuccess(draft, action) {
+            const { pageContext, generatedAt, suggestedQuestions } = action.payload;
+            draft.suggestedQuestionsByPageContext[pageContext] = {
+                fetchState: 'Completed',
+                pageContext,
+                generatedAt,
+                suggestedQuestions,
+                error: undefined,
+            };
+        },
+        fetchSuggestedQuestionsFailure(draft, action) {
+            const { pageContext, error } = action.payload;
+            const prev = draft.suggestedQuestionsByPageContext[pageContext];
+            draft.suggestedQuestionsByPageContext[pageContext] = {
+                fetchState: 'Error',
+                pageContext,
+                suggestedQuestions: prev?.suggestedQuestions ?? [],
+                generatedAt: prev?.generatedAt,
+                error,
+            };
         },
         clearAiCfoView(draft) {
             Object.assign(draft, initialAiCfoViewState);
@@ -371,5 +452,5 @@ const aiCfoView = createSlice({
         },
     },
 });
-export const { submitQuestion, submitQuestionSuccess, submitQuestionFailure, updateResponseState, updateAiCfoViewScrollPosition, updateCurrentInput, clearInput, setSession, createSession, createSessionSuccess, createSessionFailure, createSessionAndSubmit, initializeNewSessionState, createSessionAndSubmitSuccess, createSessionAndSubmitFailure, fetchChatSessionsForUser, fetchChatSessionsForUserSuccess, fetchChatSessionsForUserFailure, fetchChatHistory, fetchChatHistorySuccess, fetchChatHistoryFailure, clearCurrentSessionId, clearLastContextMessage, stopSubmit, stopSubmitSuccess, stopSubmitFailure, stopSubmitQuestion, stopSubmitQuestionSuccess, stopSubmitQuestionFailure, acceptMasterTOS, acceptMasterTOSSuccess, acceptMasterTOSFailure, deleteChatSession, deleteChatSessionSuccess, deleteChatSessionFailure, clearDeleteChatSessionStatus, clearAiCfoView, updateCotCollapsedState, } = aiCfoView.actions;
+export const { submitQuestion, submitQuestionSuccess, submitQuestionFailure, updateResponseState, updateAiCfoViewScrollPosition, updateCurrentInput, clearInput, setSession, createSession, createSessionSuccess, createSessionFailure, createSessionAndSubmit, initializeNewSessionState, createSessionAndSubmitSuccess, createSessionAndSubmitFailure, fetchChatSessionsForUser, fetchChatSessionsForUserSuccess, fetchChatSessionsForUserFailure, fetchChatHistory, fetchChatHistorySuccess, fetchChatHistoryFailure, clearCurrentSessionId, clearLastContextMessage, stopSubmit, stopSubmitSuccess, stopSubmitFailure, stopSubmitQuestion, stopSubmitQuestionSuccess, stopSubmitQuestionFailure, acceptMasterTOS, acceptMasterTOSSuccess, acceptMasterTOSFailure, deleteChatSession, deleteChatSessionSuccess, deleteChatSessionFailure, clearDeleteChatSessionStatus, clearAiCfoView, updateCotCollapsedState, fetchSuggestedQuestions, fetchSuggestedQuestionsSuccess, fetchSuggestedQuestionsFailure, applyAiCfoSidePanelHostPageTransition, clearAiCfoSidePanelHostPageContext, } = aiCfoView.actions;
 export default aiCfoView.reducer;

package/lib/esm/view/aiCfoView/aiCfoViewSelector.js

@@ -1,6 +1,8 @@
+import { initialAiCfoState } from '../../entity/aiCfo/aiCfoReducer';
 import { getAiCfoSelectorView, } from '../../entity/aiCfo/aiCfoSelector';
+import { initialAiCfoViewState } from './aiCfoViewReducer';
 export const getAiCfoView = (state) => {
-    const { fetchState, error, uiState, createSessionState, createSessionAndSubmitState, deleteChatSessionStateByChatSessionId, stopSubmitStateByChatSessionId, responseStateByChatSessionId, fetchChatSessionHistoryByChatSessionId, masterTOSAcceptanceState, } = state.aiCfoViewState;
+    const { fetchState, error, uiState, createSessionState, createSessionAndSubmitState, deleteChatSessionStateByChatSessionId, stopSubmitStateByChatSessionId, responseStateByChatSessionId, fetchChatSessionHistoryByChatSessionId, masterTOSAcceptanceState, suggestedQuestionsByPageContext, } = state.aiCfoViewState ?? initialAiCfoViewState;
     return {
         fetchState,
         error,
@@ -12,7 +14,11 @@ export const getAiCfoView = (state) => {
         uiState,
         fetchChatSessionHistoryByChatSessionId,
         masterTOSAcceptanceState,
-        ...getAiCfoSelectorView(state.aiCfoState),
+        suggestedQuestionsByPageContext,
+        ...getAiCfoSelectorView(state.aiCfoState ?? initialAiCfoState),
         version: 1,
     };
 };
+export function getSuggestedQuestionsForPageContext(state, pageContext) {
+    return state.aiCfoViewState?.suggestedQuestionsByPageContext?.[pageContext];
+}

package/lib/esm/view/aiCfoView/epics/fetchSuggestedQuestionsEpic.js

@@ -0,0 +1,29 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
+import { fetchSuggestedQuestions, fetchSuggestedQuestionsFailure, fetchSuggestedQuestionsSuccess, } from '../aiCfoViewReducer';
+/** GET {aiCfoMicroServiceBaseUrl}/1.0/suggested-questions?page_context=... */
+export const fetchSuggestedQuestionsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchSuggestedQuestions.match), 
+// mergeMap (not switchMap): each page_context is keyed separately in Redux; switchMap
+// would cancel in-flight HTTP for context A when B is requested, leaving A stuck In-Progress.
+mergeMap((action) => {
+    const { pageContext } = action.payload;
+    const query = new URLSearchParams({ page_context: pageContext });
+    const url = `${zeniAPI.apiEndPoints.aiCfoMicroServiceBaseUrl}/1.0/suggested-questions?${query.toString()}`;
+    return zeniAPI.getJSON(url).pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            return of(fetchSuggestedQuestionsSuccess({
+                pageContext: response.data.page_context,
+                generatedAt: response.data.generated_at,
+                suggestedQuestions: response.data.suggested_questions,
+            }));
+        }
+        return of(fetchSuggestedQuestionsFailure({
+            pageContext,
+            error: response.status,
+        }));
+    }), catchError((error) => of(fetchSuggestedQuestionsFailure({
+        pageContext,
+        error: createZeniAPIStatus('Unexpected Error', 'Fetch suggested questions REST API call failed', error instanceof Error ? { message: error.message } : undefined),
+    }))));
+}));

package/lib/esm/view/classList/fetchClassListEpic.js

@@ -1,9 +1,16 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap, withLatestFrom, } from 'rxjs/operators';
 import { updateClasses } from '../../entity/class/classReducer';
+import { getIsAccountingClassesEnabled } from '../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { fetchClassList, updateClassList, updateClassListFailure, } from './classListReducer';
-export const fetchClassListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchClassList.match), switchMap((action) => {
+export const fetchClassListEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchClassList.match), withLatestFrom(state$), switchMap(([action, state]) => {
+    if (!getIsAccountingClassesEnabled(state)) {
+        return of(updateClassList({
+            status: createZeniAPIStatus('Success', ''),
+            data: { accounting_classes: [] },
+        }));
+    }
     const { isIncludeDeleted } = action.payload;
     const queryParams = isIncludeDeleted === true
         ? `?query=${encodeURIComponent(JSON.stringify({ is_include_deleted: true }))}`

package/lib/esm/view/commonVendorView/vendorView/vendorViewSelector.js

@@ -6,6 +6,7 @@ import { getContactsByIds } from '../../../entity/billPay/contact/contactSelecto
 import { getClassById } from '../../../entity/class/classSelector';
 import { getFilesByFileIds } from '../../../entity/file/fileSelector';
 import { getPaymentInstrumentsByIds } from '../../../entity/paymentInstrument/paymentInstrumentSelector';
+import { getIsAccountingClassesEnabled } from '../../../entity/tenant/tenantSelector';
 import { getUserByUserId, getUsersByUserIds, } from '../../../entity/user/userSelector';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
 import { getAccountList, getNestedAccountListHierarchy, } from '../../accountList/accountListSelector';
@@ -60,13 +61,17 @@ export const getVendorView = (state, vendorIdFromUrl) => {
                 ?.vendorDetailLocalData,
             supportedCountries: billPayConfigState.vendor.supportedCountries,
         };
-        fetchState = reduceFetchState([
+        const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state);
+        const editFetchStateList = [
             accountList,
-            classList,
             vendorTypeListState,
             vendorViewState.editVendorStateById[vendorIdFromUrl]?.fetchStatus ??
                 vendorViewInitialState.newVendorState.fetchStatus,
-        ]);
+        ];
+        if (isAccountingClassesEnabled) {
+            editFetchStateList.push(classList);
+        }
+        fetchState = reduceFetchState(editFetchStateList);
     }
     else {
         const basicVendorDetails = getBasicVendorDetailsForNewVendor(state, vendorViewState.newVendorState);
@@ -95,11 +100,17 @@ export const getVendorView = (state, vendorIdFromUrl) => {
         if (tentativeName != null) {
             entityRecommendations = getRecommendationsForEntity(state, tentativeName, 'vendor');
         }
+        const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state);
         const fetchStateList = [
             { fetchState: accountList.fetchState, error: accountList.error },
-            { fetchState: classList.fetchState, error: classList.error },
             vendorTypeListState,
         ];
+        if (isAccountingClassesEnabled) {
+            fetchStateList.push({
+                fetchState: classList.fetchState,
+                error: classList.error,
+            });
+        }
         if (entityRecommendations != null &&
             entityRecommendations.recommendations != null &&
             entityRecommendations.recommendations.length > 0) {
@@ -144,6 +155,7 @@ export const getVendorView = (state, vendorIdFromUrl) => {
         fetchState: fetchState.fetchState,
         hasWireTransfer,
         hasInternationalWireTransfer,
+        isAccountingClassesEnabled: getIsAccountingClassesEnabled(state),
         deleteFileStatusById,
         updateFileStatusById,
         loggedInUserVerification,
@@ -219,9 +231,10 @@ const getBasicVendorDetailsForNewVendor = (state, newVendor) => {
 };
 export const getVendorDetailPageView = (state, vendorId, entity) => {
     const trendWithTransactions = getTrendWithTransactions(state, entity, 'EntityDetail');
+    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state);
     const reducedFetchState = reduceAnyFetchState([
         state.accountListState.byReportId.accountList,
-        state.classListState,
+        ...(isAccountingClassesEnabled ? [state.classListState] : []),
         state.vendorTypeListState,
         state.ownerListState,
         state.vendorViewState.editVendorStateById[vendorId]?.fetchStatus ?? {

package/lib/esm/view/commonVendorView/vendorsTabVendorView/vendorsTabVendorViewSelector.js

@@ -6,6 +6,7 @@ import { getAccountBase } from '../../../entity/account/accountSelector';
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getContactsByIds } from '../../../entity/billPay/contact/contactSelector';
 import { getClassById } from '../../../entity/class/classSelector';
+import { getIsAccountingClassesEnabled } from '../../../entity/tenant/tenantSelector';
 import { getUserByUserId, getUsersByUserIds, } from '../../../entity/user/userSelector';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
 import { dateNow } from '../../../zeniDayJS';
@@ -20,6 +21,7 @@ const ALL_VENDOR_DETAIL_TABS_TYPES = [
 export const toVendorDetailTabsType = (v) => stringToUnion(v, ALL_VENDOR_DETAIL_TABS_TYPES);
 export const getVendorsTabVendorView = (state, vendorIdFromUrl) => {
     const { accountListState, accountState, classListState, classState, vendorState, userState, vendorsTabVendorViewState, vendorTypeListState, addressState, addressViewState, contactState, } = state;
+    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state);
     const accountList = getAccountList(accountState, accountListState, 'accountList');
     const classList = getClassList(classState, classListState);
     const ownerList = getUsersByUserIds(state.userState, state.ownerListState.ownerIds);
@@ -51,7 +53,7 @@ export const getVendorsTabVendorView = (state, vendorIdFromUrl) => {
     }
     fetchState = reduceFetchState([
         accountList,
-        classList,
+        ...(isAccountingClassesEnabled ? [classList] : []),
         vendorTypeListState,
         vendorsTabVendorViewState.vendorStateById[vendorIdFromUrl]?.fetchStatus ?? {
             fetchState: 'Not-Started',
@@ -62,6 +64,7 @@ export const getVendorsTabVendorView = (state, vendorIdFromUrl) => {
     return {
         accountList: accountList,
         classList: classList,
+        isAccountingClassesEnabled,
         vendorTypeList: vendorTypeList,
         accountsHierarchyList,
         classHierarchyList,
@@ -102,9 +105,10 @@ export const getVendorsTabDetailPageView = (state, vendorId, entity) => {
         ? getTransactionListByEntityForSinglePeriod(state, entity, state.vendorsTabVendorViewState.allTransactionsTabData
             .numberOfQuartersFetched)
         : undefined;
+    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state);
     const reducedFetchState = reduceAnyFetchState([
         state.accountListState.byReportId.accountList,
-        state.classListState,
+        ...(isAccountingClassesEnabled ? [state.classListState] : []),
         state.ownerListState,
         state.vendorTypeListState,
         state.vendorsTabVendorViewState.vendorStateById[vendorId]?.fetchStatus ?? {

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js

@@ -21,13 +21,13 @@ export const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe
         if (isSuccessResponse(response) && response.data != null) {
             const updateActions = [];
             updateActions.push(updateJESchedules([
-                ...response.data.draft_je_schedules,
+                ...response.data.je_schedules,
                 ...response.data.failed_je_postings.je_schedules,
             ]), updateJESchedulesDetails([...response.data.failed_je_postings.je_schedules], response.data.failed_je_postings.scheduled_journal_entries), initializeJeScheduleLocalData([
                 ...response.data.failed_je_postings.je_schedules,
             ]));
             updateActions.push(fetchJeSchedulesSuccess({
-                jeSchedules: [...response.data.draft_je_schedules],
+                jeSchedules: [...response.data.je_schedules],
                 failedJeSchedules: [
                     ...response.data.failed_je_postings.je_schedules,
                 ],

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/bulkUploadReceiptsEpic.js

@@ -1,9 +1,9 @@
 import { concat, of, timer } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { BULK_UPLOAD_BAR_COMPLETE_HOLD_MS } from '../../bulkUploadTiming';
 import { bulkUploadReceipts, bulkUploadReceiptsFailure, bulkUploadReceiptsSuccess, updateBulkUploadProgress, } from '../../reducers/missingReceiptsViewReducer';
-export const bulkUploadReceiptsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceipts.match), mergeMap((action) => {
+export const bulkUploadReceiptsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceipts.match), switchMap((action) => {
     const { files } = action.payload;
     const formData = new FormData();
     for (const file of files) {

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/watchBulkUploadBatchStatusEpic.js

@@ -25,7 +25,7 @@ export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filte
  * force `phase` to `completed` (dismiss automatching banner) and refresh the batch list.
  * Cancels when the batch completes normally, bulk state is cleared, or another upload supersedes.
  */
-export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), mergeMap((action) => {
+export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), switchMap((action) => {
     const { batchId } = action.payload;
     return timer(BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS).pipe(mergeMap(() => {
         const bulk = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
@@ -44,10 +44,11 @@ export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.
  * error snackbar per upload session (first failure only) so the user is not spammed every
  * interval; Pusher or a later successful poll still completes the flow.
  */
-export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), mergeMap((action) => {
+export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), switchMap((action) => {
     const { batchId } = action.payload;
     let pollErrorNotified = false;
-    return timer(FALLBACK_FIRST_DELAY_MS, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.batchId === batchId)), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((action) => action.payload.batchId === batchId)), actions$.pipe(filter(bulkUploadAutomatchingTimedOut.match), filter((action) => action.payload.batchId === batchId)))), switchMap(() => zeniAPI
+    return timer(FALLBACK_FIRST_DELAY_MS, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.batchId === batchId &&
+        action.payload.status === 'completed')), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((action) => action.payload.batchId === batchId)), actions$.pipe(filter(bulkUploadAutomatchingTimedOut.match), filter((action) => action.payload.batchId === batchId)))), switchMap(() => zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
         .pipe(mergeMap((response) => {
         /** Same batch-details URL; polls until `status` is completed (Pusher may win first). */

package/lib/esm/view/expenseAutomationView/expenseAutomationViewSelector.js

@@ -91,7 +91,6 @@ export function getExpenseAutomationView(state) {
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
-        monthEndCloseChecksView,
         expenseAutomationTransactionsView,
         expenseAutomationReconciliationViewState,
     ];

package/lib/esm/view/expenseAutomationView/helpers/saveTransactionHelper.js

@@ -64,8 +64,8 @@ export const toTransactionUpdatesFromTransactionCategorizationLocalData = (trans
                 lineItem.account?.qboId !== accountLine.account.qboId &&
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
-                Boolean(lineItem.class?.qboId) &&
-                    lineItem.class?.qboId !== accountLine.class.qboId;
+                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
+                    lineItem.class?.qboId !== accountLine.class?.qboId;
             const recommendedAccountBase = toRecommendedAccountBase(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = toRecommendedClassBase(lineItem.amount.amount, lineItem.class);
             if (entityDetails != null &&

package/lib/esm/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -234,7 +234,7 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                         isPreFilled: true,
                     };
                 }
-                if (accountLine.class.classId === '' &&
+                if (Boolean(accountLine.class?.classId) === false &&
                     higherPreferenceRecommendation?.class != null) {
                     record.class = {
                         ...higherPreferenceRecommendation.class,
@@ -464,7 +464,7 @@ export const setEntityRecommendationForLineIdInLocalData = (draft, transaction,
                                 }
                                 : accountLine.account;
                     record.class =
-                        accountLine.class.classId !== ''
+                        Boolean(accountLine.class?.classId) !== false
                             ? accountLine.class
                             : recommendations?.[0]?.class
                                 ? {

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

@@ -44,6 +44,8 @@ export const initialState = {
     uiState: {
         searchString: '',
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+        sortKey: 'startMonth',
+        sortOrder: 'descending',
         totalCount: 0,
         limit: 10,
     },
@@ -365,12 +367,26 @@ const expenseAutomationJESchedulesView = createSlice({
         clearJeAccountSettingsLocalData(draft) {
             draft.accountSettings.localData = 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, initialState);
         },
     },
 });
-export const { clearExpenseAutomationJESchedulesView, clearJeAccountSettingsLocalData, clearJeScheduleLocalData, fetchAccountSettingsListForAccountTypes, fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesPage, fetchJeSchedulesSuccess, fetchRecommendationForAccountSettings, ignoreRecommendedJeSchedule, ignoreRecommendedJeScheduleFailure, ignoreRecommendedJeScheduleSuccess, initializeAccountSettingsView, initializeJeScheduleLocalData, removeFailedJeScheduleTransactionKey, removeJeScheduleLocalDataById, removeJeScheduleTransactionKey, retryJeSchedule, retryJeScheduleFailure, retryJeScheduleSuccess, saveAccountSettings, saveAccountSettingsFailure, saveAccountSettingsLocalData, saveAccountSettingsSuccess, updateAccountSettingsListForAccountTypes, updateAccountSettingsListForAccountTypesFailure, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, updateRecommendationForAccountSettings, updateRecommendationForAccountSettingsFailure, } = expenseAutomationJESchedulesView.actions;
+export const { clearExpenseAutomationJESchedulesView, clearJeAccountSettingsLocalData, clearJeScheduleLocalData, fetchAccountSettingsListForAccountTypes, fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesPage, fetchJeSchedulesSuccess, fetchRecommendationForAccountSettings, ignoreRecommendedJeSchedule, ignoreRecommendedJeScheduleFailure, ignoreRecommendedJeScheduleSuccess, initializeAccountSettingsView, initializeJeScheduleLocalData, removeFailedJeScheduleTransactionKey, removeJeScheduleLocalDataById, removeJeScheduleTransactionKey, retryJeSchedule, retryJeScheduleFailure, retryJeScheduleSuccess, saveAccountSettings, saveAccountSettingsFailure, saveAccountSettingsLocalData, saveAccountSettingsSuccess, updateAccountSettingsListForAccountTypes, updateAccountSettingsListForAccountTypesFailure, updateJESchedulesUIState, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, updateRecommendationForAccountSettings, updateRecommendationForAccountSettingsFailure, } = expenseAutomationJESchedulesView.actions;
 export default expenseAutomationJESchedulesView.reducer;
 const doUpdateRecommendationForAccountSettings = (draft, payload) => {
     const { prepaidExpensesRecommendations, fixedAssetsRecommendations, accruedExpensesRecommendations, } = mapAccountTypeRecommendationPayloadToAccountRecommendationByType(payload);

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

@@ -1,3 +1,4 @@
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountBase } from '../../../entity/account/accountSelector';
 import { getClassById } from '../../../entity/class/classSelector';
@@ -6,7 +7,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 } = state;
+    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { fetchState, error, refreshStatus, uiState, reviewOperatingExpenseIdsByPeriod, selectedSectionIdsByPeriod, groupsBySelectedPeriod, fluxAnalysisEntities, bulkReviewStatus, currency, totalBalancesAndVariance, } = expenseAutomationFluxAnalysisViewState;
     const fetchStateAndError = {
         fetchState,
@@ -91,10 +92,17 @@ 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: fetchStateAndError,
+        fetchStatus: reducedFetchStatus,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

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

@@ -1,4 +1,6 @@
 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';
@@ -10,10 +12,48 @@ 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, } = state;
+    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = getJEAccountSettingsView(state);
     const currentTenant = getCurrentTenant(state);
@@ -59,18 +99,33 @@ export function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = 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
         ? 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,
@@ -79,15 +134,17 @@ export 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,
     };