@zeniai/client-epic-state 4.19.90-betaSS4 → 4.19.90-betaSS6

package/lib/view/aiCfoView/aiCfoViewReducer.js

@@ -1,8 +1,23 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateCotCollapsedState = exports.clearAiCfoView = exports.clearDeleteChatSessionStatus = exports.deleteChatSessionFailure = exports.deleteChatSessionSuccess = exports.deleteChatSession = exports.acceptMasterTOSFailure = exports.acceptMasterTOSSuccess = exports.acceptMasterTOS = exports.stopSubmitQuestionFailure = exports.stopSubmitQuestionSuccess = exports.stopSubmitQuestion = exports.stopSubmitFailure = exports.stopSubmitSuccess = exports.stopSubmit = exports.clearLastContextMessage = exports.clearCurrentSessionId = exports.fetchChatHistoryFailure = exports.fetchChatHistorySuccess = exports.fetchChatHistory = exports.fetchChatSessionsForUserFailure = exports.fetchChatSessionsForUserSuccess = exports.fetchChatSessionsForUser = exports.createSessionAndSubmitFailure = exports.createSessionAndSubmitSuccess = exports.initializeNewSessionState = exports.createSessionAndSubmit = exports.createSessionFailure = exports.createSessionSuccess = exports.createSession = exports.setSession = exports.clearInput = exports.updateCurrentInput = exports.updateAiCfoViewScrollPosition = exports.updateResponseState = exports.submitQuestionFailure = exports.submitQuestionSuccess = exports.submitQuestion = exports.initialAiCfoViewState = void 0;
+exports.clearAiCfoSidePanelHostPageContext = exports.applyAiCfoSidePanelHostPageTransition = exports.fetchSuggestedQuestionsFailure = exports.fetchSuggestedQuestionsSuccess = exports.fetchSuggestedQuestions = exports.updateCotCollapsedState = exports.clearAiCfoView = exports.clearDeleteChatSessionStatus = exports.deleteChatSessionFailure = exports.deleteChatSessionSuccess = exports.deleteChatSession = exports.acceptMasterTOSFailure = exports.acceptMasterTOSSuccess = exports.acceptMasterTOS = exports.stopSubmitQuestionFailure = exports.stopSubmitQuestionSuccess = exports.stopSubmitQuestion = exports.stopSubmitFailure = exports.stopSubmitSuccess = exports.stopSubmit = exports.clearLastContextMessage = exports.clearCurrentSessionId = exports.fetchChatHistoryFailure = exports.fetchChatHistorySuccess = exports.fetchChatHistory = exports.fetchChatSessionsForUserFailure = exports.fetchChatSessionsForUserSuccess = exports.fetchChatSessionsForUser = exports.createSessionAndSubmitFailure = exports.createSessionAndSubmitSuccess = exports.initializeNewSessionState = exports.createSessionAndSubmit = exports.createSessionFailure = exports.createSessionSuccess = exports.createSession = exports.setSession = exports.clearInput = exports.updateCurrentInput = exports.updateAiCfoViewScrollPosition = exports.updateResponseState = exports.submitQuestionFailure = exports.submitQuestionSuccess = exports.submitQuestion = exports.initialAiCfoViewState = void 0;
 const toolkit_1 = require("@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;
+    }
+}
 exports.initialAiCfoViewState = {
     fetchState: 'Not-Started',
     error: undefined,
@@ -10,6 +25,8 @@ exports.initialAiCfoViewState = {
         currentInput: '',
         scrollPositionByChatSessionId: {},
         currentChatSessionId: undefined,
+        aiCfoSidePanelHostPageKey: undefined,
+        chatSessionIdByPageKey: {},
         agentId: undefined,
         chatHistoryNextPageToken: {},
         chatSessionsNextPageToken: { nextPageToken: null, hasMore: false },
@@ -33,6 +50,7 @@ exports.initialAiCfoViewState = {
     fetchChatSessionHistoryByChatSessionId: {},
     responseStateByChatSessionId: {},
     stopSubmitStateByChatSessionId: {},
+    suggestedQuestionsByPageContext: {},
 };
 const aiCfoView = (0, toolkit_1.createSlice)({
     name: 'aiCfoView',
@@ -166,6 +184,7 @@ const aiCfoView = (0, toolkit_1.createSlice)({
         setSession(draft, action) {
             draft.uiState.currentChatSessionId = action.payload.sessionId;
             draft.uiState.agentId = action.payload.agentId;
+            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSession: {
             reducer(draft, action) {
@@ -189,6 +208,7 @@ const aiCfoView = (0, toolkit_1.createSlice)({
                 nextPageToken: null,
                 hasMore: false,
             };
+            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSessionFailure(draft, action) {
             draft.createSessionState.fetchState = 'Error';
@@ -226,6 +246,7 @@ const aiCfoView = (0, toolkit_1.createSlice)({
                 nextPageToken: null,
                 hasMore: false,
             };
+            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSessionAndSubmitSuccess(draft) {
             // Note: currentChatSessionId, agentId, and chatHistoryNextPageToken are set by initializeNewSessionState
@@ -342,6 +363,7 @@ const aiCfoView = (0, toolkit_1.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];
@@ -364,6 +386,65 @@ const aiCfoView = (0, toolkit_1.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, exports.initialAiCfoViewState);
@@ -375,5 +456,5 @@ const aiCfoView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = aiCfoView.actions, exports.submitQuestion = _a.submitQuestion, exports.submitQuestionSuccess = _a.submitQuestionSuccess, exports.submitQuestionFailure = _a.submitQuestionFailure, exports.updateResponseState = _a.updateResponseState, exports.updateAiCfoViewScrollPosition = _a.updateAiCfoViewScrollPosition, exports.updateCurrentInput = _a.updateCurrentInput, exports.clearInput = _a.clearInput, exports.setSession = _a.setSession, exports.createSession = _a.createSession, exports.createSessionSuccess = _a.createSessionSuccess, exports.createSessionFailure = _a.createSessionFailure, exports.createSessionAndSubmit = _a.createSessionAndSubmit, exports.initializeNewSessionState = _a.initializeNewSessionState, exports.createSessionAndSubmitSuccess = _a.createSessionAndSubmitSuccess, exports.createSessionAndSubmitFailure = _a.createSessionAndSubmitFailure, exports.fetchChatSessionsForUser = _a.fetchChatSessionsForUser, exports.fetchChatSessionsForUserSuccess = _a.fetchChatSessionsForUserSuccess, exports.fetchChatSessionsForUserFailure = _a.fetchChatSessionsForUserFailure, exports.fetchChatHistory = _a.fetchChatHistory, exports.fetchChatHistorySuccess = _a.fetchChatHistorySuccess, exports.fetchChatHistoryFailure = _a.fetchChatHistoryFailure, exports.clearCurrentSessionId = _a.clearCurrentSessionId, exports.clearLastContextMessage = _a.clearLastContextMessage, exports.stopSubmit = _a.stopSubmit, exports.stopSubmitSuccess = _a.stopSubmitSuccess, exports.stopSubmitFailure = _a.stopSubmitFailure, exports.stopSubmitQuestion = _a.stopSubmitQuestion, exports.stopSubmitQuestionSuccess = _a.stopSubmitQuestionSuccess, exports.stopSubmitQuestionFailure = _a.stopSubmitQuestionFailure, exports.acceptMasterTOS = _a.acceptMasterTOS, exports.acceptMasterTOSSuccess = _a.acceptMasterTOSSuccess, exports.acceptMasterTOSFailure = _a.acceptMasterTOSFailure, exports.deleteChatSession = _a.deleteChatSession, exports.deleteChatSessionSuccess = _a.deleteChatSessionSuccess, exports.deleteChatSessionFailure = _a.deleteChatSessionFailure, exports.clearDeleteChatSessionStatus = _a.clearDeleteChatSessionStatus, exports.clearAiCfoView = _a.clearAiCfoView, exports.updateCotCollapsedState = _a.updateCotCollapsedState;
+_a = aiCfoView.actions, exports.submitQuestion = _a.submitQuestion, exports.submitQuestionSuccess = _a.submitQuestionSuccess, exports.submitQuestionFailure = _a.submitQuestionFailure, exports.updateResponseState = _a.updateResponseState, exports.updateAiCfoViewScrollPosition = _a.updateAiCfoViewScrollPosition, exports.updateCurrentInput = _a.updateCurrentInput, exports.clearInput = _a.clearInput, exports.setSession = _a.setSession, exports.createSession = _a.createSession, exports.createSessionSuccess = _a.createSessionSuccess, exports.createSessionFailure = _a.createSessionFailure, exports.createSessionAndSubmit = _a.createSessionAndSubmit, exports.initializeNewSessionState = _a.initializeNewSessionState, exports.createSessionAndSubmitSuccess = _a.createSessionAndSubmitSuccess, exports.createSessionAndSubmitFailure = _a.createSessionAndSubmitFailure, exports.fetchChatSessionsForUser = _a.fetchChatSessionsForUser, exports.fetchChatSessionsForUserSuccess = _a.fetchChatSessionsForUserSuccess, exports.fetchChatSessionsForUserFailure = _a.fetchChatSessionsForUserFailure, exports.fetchChatHistory = _a.fetchChatHistory, exports.fetchChatHistorySuccess = _a.fetchChatHistorySuccess, exports.fetchChatHistoryFailure = _a.fetchChatHistoryFailure, exports.clearCurrentSessionId = _a.clearCurrentSessionId, exports.clearLastContextMessage = _a.clearLastContextMessage, exports.stopSubmit = _a.stopSubmit, exports.stopSubmitSuccess = _a.stopSubmitSuccess, exports.stopSubmitFailure = _a.stopSubmitFailure, exports.stopSubmitQuestion = _a.stopSubmitQuestion, exports.stopSubmitQuestionSuccess = _a.stopSubmitQuestionSuccess, exports.stopSubmitQuestionFailure = _a.stopSubmitQuestionFailure, exports.acceptMasterTOS = _a.acceptMasterTOS, exports.acceptMasterTOSSuccess = _a.acceptMasterTOSSuccess, exports.acceptMasterTOSFailure = _a.acceptMasterTOSFailure, exports.deleteChatSession = _a.deleteChatSession, exports.deleteChatSessionSuccess = _a.deleteChatSessionSuccess, exports.deleteChatSessionFailure = _a.deleteChatSessionFailure, exports.clearDeleteChatSessionStatus = _a.clearDeleteChatSessionStatus, exports.clearAiCfoView = _a.clearAiCfoView, exports.updateCotCollapsedState = _a.updateCotCollapsedState, exports.fetchSuggestedQuestions = _a.fetchSuggestedQuestions, exports.fetchSuggestedQuestionsSuccess = _a.fetchSuggestedQuestionsSuccess, exports.fetchSuggestedQuestionsFailure = _a.fetchSuggestedQuestionsFailure, exports.applyAiCfoSidePanelHostPageTransition = _a.applyAiCfoSidePanelHostPageTransition, exports.clearAiCfoSidePanelHostPageContext = _a.clearAiCfoSidePanelHostPageContext;
 exports.default = aiCfoView.reducer;

package/lib/view/aiCfoView/aiCfoViewSelector.d.ts

@@ -3,7 +3,8 @@ import { FetchStateAndError } from '../../commonStateTypes/common';
 import { SelectorView } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { AiCfoSelectorView } from '../../entity/aiCfo/aiCfoSelector';
 import { RootState } from '../../reducer';
-import { AiCfoViewUIState } from './aiCfoViewState';
+import { AiCfoSuggestedQuestionsPageContext } from './aiCfoViewState';
+import { AiCfoViewUIState, SuggestedQuestionsForPageContext } from './aiCfoViewState';
 export interface AiCfoViewSelector extends SelectorView, AiCfoSelectorView {
     createSessionAndSubmitState: FetchStateAndError;
     createSessionState: FetchStateAndError;
@@ -17,6 +18,8 @@ export interface AiCfoViewSelector extends SelectorView, AiCfoSelectorView {
         thought: FetchStateAndError;
     }>;
     stopSubmitStateByChatSessionId: Record<ID, FetchStateAndError>;
+    suggestedQuestionsByPageContext: Partial<Record<AiCfoSuggestedQuestionsPageContext, SuggestedQuestionsForPageContext>>;
     uiState: AiCfoViewUIState;
 }
 export declare const getAiCfoView: (state: RootState) => AiCfoViewSelector;
+export declare function getSuggestedQuestionsForPageContext(state: RootState, pageContext: AiCfoSuggestedQuestionsPageContext): SuggestedQuestionsForPageContext | undefined;

package/lib/view/aiCfoView/aiCfoViewSelector.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAiCfoView = void 0;
+exports.getSuggestedQuestionsForPageContext = getSuggestedQuestionsForPageContext;
+const aiCfoReducer_1 = require("../../entity/aiCfo/aiCfoReducer");
 const aiCfoSelector_1 = require("../../entity/aiCfo/aiCfoSelector");
+const aiCfoViewReducer_1 = require("./aiCfoViewReducer");
 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 ?? aiCfoViewReducer_1.initialAiCfoViewState;
     return {
         fetchState,
         error,
@@ -15,8 +18,12 @@ const getAiCfoView = (state) => {
         uiState,
         fetchChatSessionHistoryByChatSessionId,
         masterTOSAcceptanceState,
-        ...(0, aiCfoSelector_1.getAiCfoSelectorView)(state.aiCfoState),
+        suggestedQuestionsByPageContext,
+        ...(0, aiCfoSelector_1.getAiCfoSelectorView)(state.aiCfoState ?? aiCfoReducer_1.initialAiCfoState),
         version: 1,
     };
 };
 exports.getAiCfoView = getAiCfoView;
+function getSuggestedQuestionsForPageContext(state, pageContext) {
+    return state.aiCfoViewState?.suggestedQuestionsByPageContext?.[pageContext];
+}

package/lib/view/aiCfoView/aiCfoViewState.d.ts

@@ -9,6 +9,8 @@ export interface AiCfoViewUIState {
     chatHistoryNextPageToken: {
         [chatSessionId: ID]: PageTokenState;
     };
+    /** Last focused chat session id per side-panel host page key (e.g. `dashboard`, `reports:profit_loss`). */
+    chatSessionIdByPageKey: Partial<Record<string, ID>>;
     chatSessionsFirstPageFetched: boolean;
     chatSessionsNextPageToken: PageTokenState;
     cotCollapsedByQuestionAnswerId: {
@@ -20,11 +22,24 @@ export interface AiCfoViewUIState {
             scrollTop: number;
         };
     };
-    agentId?: ID;
+    agentId?: ID; /**
+     * When set, the side panel on host routes (e.g. dashboard/reports) is scoped to this **page key**;
+     * session ids are mirrored into {@link chatSessionIdByPageKey}. Full `/ai-cfo/...` should clear this.
+     */
+    aiCfoSidePanelHostPageKey?: string;
     currentChatSessionId?: ID;
     lastContextMessage?: string;
     lastContextStatus?: ContextStatus;
 }
+/**
+ * Supported `page_context` values for GET .../suggested-questions and related UI state.
+ */
+export type AiCfoSuggestedQuestionsPageContext = 'balance_sheet' | 'profit_loss' | 'vendors' | 'transactions' | 'cash_flow' | 'accounts_receivable' | 'accounts_payable' | 'transaction_details';
+export interface SuggestedQuestionsForPageContext extends FetchStateAndError {
+    pageContext: AiCfoSuggestedQuestionsPageContext;
+    suggestedQuestions: string[];
+    generatedAt?: string;
+}
 export interface AiCfoViewState extends FetchStateAndError {
     allChatSessionIds: ID[];
     createSessionAndSubmitState: FetchStateAndError;
@@ -39,5 +54,7 @@ export interface AiCfoViewState extends FetchStateAndError {
         thought: FetchStateAndError;
     }>;
     stopSubmitStateByChatSessionId: Record<ID, FetchStateAndError>;
+    /** Keyed by `page_context` query value (e.g. balance_sheet). */
+    suggestedQuestionsByPageContext: Partial<Record<AiCfoSuggestedQuestionsPageContext, SuggestedQuestionsForPageContext>>;
     uiState: AiCfoViewUIState;
 }

package/lib/view/aiCfoView/epics/fetchSuggestedQuestionsEpic.d.ts

@@ -0,0 +1,8 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { RootState } from '../../../reducer';
+import { ZeniAPI } from '../../../zeniAPI';
+import { fetchSuggestedQuestions, fetchSuggestedQuestionsFailure, fetchSuggestedQuestionsSuccess } from '../aiCfoViewReducer';
+export type ActionType = ReturnType<typeof fetchSuggestedQuestions> | ReturnType<typeof fetchSuggestedQuestionsSuccess> | ReturnType<typeof fetchSuggestedQuestionsFailure>;
+/** GET {aiCfoMicroServiceBaseUrl}/1.0/suggested-questions?page_context=... */
+export declare const fetchSuggestedQuestionsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchSuggestedQuestionsEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const responsePayload_1 = require("../../../responsePayload");
+const aiCfoViewReducer_1 = require("../aiCfoViewReducer");
+/** GET {aiCfoMicroServiceBaseUrl}/1.0/suggested-questions?page_context=... */
+const fetchSuggestedQuestionsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(aiCfoViewReducer_1.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.
+(0, operators_1.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((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            return (0, rxjs_1.of)((0, aiCfoViewReducer_1.fetchSuggestedQuestionsSuccess)({
+                pageContext: response.data.page_context,
+                generatedAt: response.data.generated_at,
+                suggestedQuestions: response.data.suggested_questions,
+            }));
+        }
+        return (0, rxjs_1.of)((0, aiCfoViewReducer_1.fetchSuggestedQuestionsFailure)({
+            pageContext,
+            error: response.status,
+        }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, aiCfoViewReducer_1.fetchSuggestedQuestionsFailure)({
+        pageContext,
+        error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch suggested questions REST API call failed', error instanceof Error ? { message: error.message } : undefined),
+    }))));
+}));
+exports.fetchSuggestedQuestionsEpic = fetchSuggestedQuestionsEpic;

package/lib/view/auditReportView/auditReportViewState.d.ts

@@ -3,7 +3,7 @@ import { Status } from '../../commonStateTypes/status';
 import { View } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { ZeniDate } from '../../zeniDayJS';
 import { AuditSummary } from '../reviewCompanyView/reviewCompanyViewState';
-export declare const toAuditRuleEntityType: (v: string) => "dashboard" | "reports" | "transactions";
+export declare const toAuditRuleEntityType: (v: string) => "dashboard" | "transactions" | "reports";
 export type AuditRuleEntityType = ReturnType<typeof toAuditRuleEntityType>;
 declare const toAuditRuleEntityIdType: (v: string) => "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "revenue" | "revenue_by_classes" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "balance_sheet" | "cash_flow" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "vendor" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "uncategorized-expense" | "uncategorized-income";
 export type AuditRuleEntityIdType = ReturnType<typeof toAuditRuleEntityIdType>;

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

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

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

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

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

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

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

@@ -5,6 +5,7 @@ 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 timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
@@ -16,6 +17,42 @@ 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 '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 = [];
@@ -65,13 +102,21 @@ function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const draftSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft');
-    const resolveSchedules = [];
+    const { sortKey, sortOrder } = uiState;
+    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
+    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
+    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
+        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
+    const unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
-            resolveSchedules.push({ ...schedule, scheduledJournalEntry: journalEntry });
+            unsortedResolveSchedules.push({
+                ...schedule,
+                scheduledJournalEntry: journalEntry,
+            });
         });
     });
+    const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -85,7 +130,9 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
+        completedSchedules,
         draftSchedules,
+        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

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

@@ -1,16 +1,21 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { Recommendation } from '../../../commonStateTypes/recommendationBase';
+import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { AccountBase } from '../../../entity/account/accountState';
 import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { VendorBase } from '../../../entity/vendor/vendorState';
+export declare const toJEScheduleSortKey: (v: string) => "vendor" | "type" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "jePostingDate" | "remainingMonths";
+export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
 export interface JESchedulesViewUIState {
     scrollPosition: {
         scrollTop: number;
         scrollLeft?: number;
     } | undefined;
     searchString: string;
+    sortKey: JEScheduleSortKey;
+    sortOrder: SortOrder;
     totalCount: number;
     limit?: number;
 }

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

@@ -1,2 +1,21 @@
 "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',
+    'scheduleCategory',
+    'startMonth',
+    'type',
+    'amortizationPeriod',
+    'jePostingDate',
+    'remainingMonths',
+    'runningBalance',
+    'totalAmount',
+    'transactionDate',
+    'memo',
+];
+const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
+exports.toJEScheduleSortKey = toJEScheduleSortKey;

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

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

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -424,6 +424,14 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                     transactionsWithNoSortKeyValue.push(transaction);
                 }
                 break;
+            case 'invoiceNumber':
+                if (transaction.documentId != null) {
+                    transactionsWithSortKeyValue.push(transaction);
+                }
+                else {
+                    transactionsWithNoSortKeyValue.push(transaction);
+                }
+                break;
             case 'dueDate':
                 if (currentTab === 'draft') {
                     if (Boolean(transaction.dueDate) === true) {
@@ -526,6 +534,8 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                 return transaction.totalAmountInUSD?.amount ?? 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
+            case 'invoiceNumber':
+                return transaction.documentId;
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/view/spendManagement/billPay/billList/billListState.d.ts

@@ -37,7 +37,7 @@ declare const toBillTabType: (v: string) => "paid" | "pending_approval" | "sched
 export type BillTab = ReturnType<typeof toBillTabType>;
 declare const toBillsSubTabType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "offline";
 export type BillsSubTabType = ReturnType<typeof toBillsSubTabType>;
-declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceDate";
+declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceNumber" | "invoiceDate";
 export declare type BillPayViewSortKey = ReturnType<typeof toBillPaySortKeyType>;
 export interface BillPayFilters {
     categories: BillPayFilterCategory[];

package/lib/view/spendManagement/billPay/billList/billListState.js

@@ -47,6 +47,7 @@ const ALL_BILL_PAY_SORT_KEYS = [
     'invoiceDate',
     'name',
     'paymentMethod',
+    'invoiceNumber',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toBillPaySortKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_BILL_PAY_SORT_KEYS);

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.d.ts

@@ -61,7 +61,7 @@ export declare const initialCreditAcc: CreditAccount;
 export declare const initialDebitCardSummaries: DebitCardSummaries;
 export declare const initialResendRevokeCardInvite: ResendRevokeCardInvite;
 export declare const initialCreditAccountRepayment: CreditAccountRepayment;
-export declare const toChargeCardSortKeyType: (v: string) => "status" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
+export declare const toChargeCardSortKeyType: (v: string) => "status" | "accountType" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
 export declare type ChargeCardViewSortKey = ReturnType<typeof toChargeCardSortKeyType>;
 export declare const ALL_CASHBACK_SORT_KEYS: readonly ["month", "cashback"];
 export declare const toCashbackSortKeyType: (v: string) => "month" | "cashback";

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.js

@@ -78,6 +78,7 @@ const ALL_CHARGE_CARD_SORT_KEYS = [
     'cardName',
     'department',
     'cardType',
+    'accountType',
     'status',
     'utilisation',
     'limit',

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.js

@@ -233,6 +233,8 @@ const getCardsBySortKey = (card, sortKey) => {
             return card.cardName.toLowerCase();
         case 'cardType':
             return card.type.code;
+        case 'accountType':
+            return card.type.code.includes('credit') ? 'credit' : 'debit';
         case 'status':
             return card.status.code;
         case 'utilisation':

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.d.ts

@@ -42,6 +42,7 @@ export interface ReimbursementView extends Reimbursement {
     approvers: Approvers;
     submittedBy: User | undefined;
     bulkSelectInfo?: RemiBulkSelectInfo;
+    createdByUser?: User;
 }
 export declare const getRemiList: (state: RootState, currentTimePeriod: TimePeriod, isBulkActionFeatureEnabled: boolean) => RemiListReport;
 export declare const getApproversOrRejectors: (reimbursement: Reimbursement, entityApprovalStatusState: EntityApprovalStatusState, userState: UserState) => Approvers;