@zeniai/client-epic-state 5.0.49 → 5.0.50-betaAR1

package/lib/view/companyTaskManagerView/companyTaskManagerViewReducer.d.ts

@@ -4,10 +4,10 @@ import { CompanyTaskManagerViewPayload } from './companyTaskManagerViewPayload';
 import { CompanyTaskManagerViewState, CompanyTaskManagerViewUIState, TaskManagerMetrics } from './companyTaskManagerViewState';
 export declare const initialUIState: CompanyTaskManagerViewUIState;
 export declare const initialState: CompanyTaskManagerViewState;
-export declare const fetchCompanyTaskManagerView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[pageToken: PageToken, sortKey: "status" | "name" | "tags" | "createdBy" | "dueDate" | "priority" | "assignee" | "taskName", sortOrder: "ascending" | "descending", keepExistingListItems?: any, searchString?: string | undefined], {
+export declare const fetchCompanyTaskManagerView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[pageToken: PageToken, sortKey: "status" | "name" | "priority" | "tags" | "createdBy" | "dueDate" | "assignee" | "taskName", sortOrder: "ascending" | "descending", keepExistingListItems?: any, searchString?: string | undefined], {
     pageToken: PageToken;
     searchString: string | undefined;
-    sortKey: "status" | "name" | "tags" | "createdBy" | "dueDate" | "priority" | "assignee" | "taskName";
+    sortKey: "status" | "name" | "priority" | "tags" | "createdBy" | "dueDate" | "assignee" | "taskName";
     sortOrder: "ascending" | "descending";
     keepExistingListItems: any;
 }, "companyTaskManagerView/fetchCompanyTaskManagerView", never, never>, updateCompanyTaskManagerViewOnSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/companyView/types/cockpitTypes.d.ts

@@ -7,7 +7,7 @@ export declare const toPortfolioSortKeyType: (v: string) => "companyName" | "exp
 export declare const toManagementSortKeyType: (v: string) => "status" | "bookCloseDate" | "companyName" | "group" | "controller" | "plans" | "monthlyRecurringRevenue" | "notes" | "taxStatus" | "preparer" | "reviewer" | "annualRecurringRevenue" | "task" | "customerSuccessManager" | "apAnalyst" | "reportSent" | "taxLead" | "satisfaction";
 export declare const toOnboardingSortKeyType: (v: string) => "companyName" | "notes" | "businessVerified" | "identityVerified" | "bankAccountLinked" | "customerCreated" | "groupCreated" | "qboLinked" | "enroller" | "invite" | "latestCreated";
 export declare const toHealthSortKeyType: (v: string) => "companyName" | "group" | "controller" | "monthlyRecurringRevenue" | "runway" | "companyEngagementMetricsUpdatedAt" | "customerSatisfactionScore" | "externalProductServiceExposure" | "netPromoterScore" | "customerSuccessManager" | "issues" | "productVerticals" | "churnProbability" | "lastReportSent" | "subscriptionDate" | "renewalDate" | "dashboardLastSeen" | "lastEngagement";
-export declare const toTaskManagerSortKeyType: (v: string) => "status" | "name" | "tags" | "createdBy" | "dueDate" | "priority" | "assignee" | "taskName";
+export declare const toTaskManagerSortKeyType: (v: string) => "status" | "name" | "priority" | "tags" | "createdBy" | "dueDate" | "assignee" | "taskName";
 export type PortfolioViewSortKey = ReturnType<typeof toPortfolioSortKeyType>;
 export type ManagementViewSortKey = ReturnType<typeof toManagementSortKeyType>;
 export type OnboardingViewSortKey = ReturnType<typeof toOnboardingSortKeyType>;

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.d.ts

@@ -4,6 +4,7 @@ import { RootState } from '../../../../reducer';
 import { fetchAccountList } from '../../../accountList/accountListReducer';
 import { fetchClassList } from '../../../classList/classListReducer';
 import { fetchOwnerList } from '../../../ownerList/ownerListReducer';
+import { fetchProjectList } from '../../../projectList/projectListReducer';
 import { fetchTransactionCategorization, fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
-export type ActionType = ReturnType<typeof fetchTransactionCategorizationView> | ReturnType<typeof fetchTransactionCategorization> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchOwnerList>;
+export type ActionType = ReturnType<typeof fetchTransactionCategorizationView> | ReturnType<typeof fetchTransactionCategorization> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchOwnerList> | ReturnType<typeof fetchProjectList>;
 export declare const fetchTransactionCategorizationViewEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.js

@@ -4,9 +4,11 @@ exports.fetchTransactionCategorizationViewEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const accountListReducer_1 = require("../../../accountList/accountListReducer");
 const classListReducer_1 = require("../../../classList/classListReducer");
 const ownerListReducer_1 = require("../../../ownerList/ownerListReducer");
+const projectListReducer_1 = require("../../../projectList/projectListReducer");
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
 const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorizationView.match), (0, operators_1.mergeMap)((action) => {
     const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, } = action.payload;
@@ -29,6 +31,12 @@ const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pi
         classList.fetchState === 'Not-Started') {
         updateActions.push((0, classListReducer_1.fetchClassList)());
     }
+    const projectList = state$.value.projectListState;
+    if ((0, tenantSelector_1.getIsAccountingProjectsEnabled)(state$.value) &&
+        projectList.hasValidState() === false &&
+        projectList.fetchState === 'Not-Started') {
+        updateActions.push((0, projectListReducer_1.fetchProjectList)());
+    }
     const vendorOwnerList = state$.value.ownerListState;
     if (vendorOwnerList.hasValidState() === false &&
         vendorOwnerList.fetchState === 'Not-Started') {

package/lib/view/expenseAutomationView/epics/transactionCategorization/updateTransactionCategorizationEpic.js

@@ -117,6 +117,9 @@ const toTransactionUpdatePayload = (updates, detail, transactionId, cotTrackingB
                 if (lineUpdates.class != null) {
                     lineToBeUpdated.class = lineUpdates.class;
                 }
+                if (lineUpdates.project != null) {
+                    lineToBeUpdated.project = lineUpdates.project;
+                }
                 if (lineUpdates.account != null) {
                     lineToBeUpdated.account = lineUpdates.account;
                 }

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

@@ -44,6 +44,7 @@ const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionC
                 lineDescription: lineItem.lineDescription,
                 class: lineItem.class,
                 account: lineItem.account,
+                project: lineItem.project,
                 recommendation: (0, transactionHelper_1.convertCOTRecommendationsToRegular)(lineItem.recommendationsWithCOT),
             };
             if (line.type === 'journal_entry_transaction_line' ||

package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts

@@ -2,6 +2,7 @@ import { ID } from '../../../commonStateTypes/common';
 import { AccountBase } from '../../../entity/account/accountState';
 import { UncategorizedAccountTypes } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
+import { ProjectBase } from '../../../entity/project/projectState';
 import { Entity } from '../../../entity/genericEntity/entity';
 import { RecommendationWithCOTByLineId } from '../../../entity/transaction/stateTypes/transaction';
 import { SupportedTransactionPayload, SupportedTransactionWithCOT } from '../../../entity/transaction/transactionState';
@@ -27,7 +28,7 @@ export declare const removeTransactionFromTabView: (tabView: TransactionsTabView
 export declare const filterAutoTabLineItems: (tabView: TransactionsTabViewState, transactionId: ID, updatedTransaction: SupportedTransactionWithCOT) => void;
 export declare const MAX_SELECTION_LIMIT = 5;
 export declare const toTransactionDetailLocalData: (transaction: SupportedTransactionWithCOT, selectedTab: TransactionsTab, lineItemsByTransactionIds: string[], uncategorizedIncomeExpense: UncategorizedAccounts, isUncategorizedExpenseCategoryEnabled?: boolean) => TransactionReviewLocalData;
-export declare const toSetAllLineItemsToCategoryClass: (draft: TransactionsTabViewState, transaction: SupportedTransactionWithCOT, transactionId: ID, transactionLineId: ID, transactionDetailLocalData: TransactionReviewLocalData, updatedItem: "category" | "class", uncategorizedAccounts: UncategorizedAccounts, selectedTab: TransactionsTab, vendorId?: ID, customerId?: ID, selectedAccount?: AccountBase, selectedClassBase?: ClassBase, isUncategorizedExpenseCategoryEnabled?: boolean, isAccountingClassesEnabled?: boolean) => {
+export declare const toSetAllLineItemsToCategoryClass: (draft: TransactionsTabViewState, transaction: SupportedTransactionWithCOT, transactionId: ID, transactionLineId: ID, transactionDetailLocalData: TransactionReviewLocalData, updatedItem: "category" | "class" | "project", uncategorizedAccounts: UncategorizedAccounts, selectedTab: TransactionsTab, vendorId?: ID, customerId?: ID, selectedAccount?: AccountBase, selectedClassBase?: ClassBase, selectedProjectBase?: ProjectBase, isUncategorizedExpenseCategoryEnabled?: boolean, isAccountingClassesEnabled?: boolean) => {
     localData: TransactionReviewLocalData;
     similarTransactionUpdated: boolean;
 };

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

@@ -190,6 +190,7 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
             const lineId = line.id;
             record.account = accountLine.account;
             record.class = accountLine.class;
+            record.project = accountLine.project;
             record.vendor =
                 accountLine.vendor != null
                     ? {
@@ -312,7 +313,7 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
     });
     return lineItemData;
 };
-const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, transactionLineId, transactionDetailLocalData, updatedItem, uncategorizedAccounts, selectedTab, vendorId, customerId, selectedAccount, selectedClassBase, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) => {
+const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, transactionLineId, transactionDetailLocalData, updatedItem, uncategorizedAccounts, selectedTab, vendorId, customerId, selectedAccount, selectedClassBase, selectedProjectBase, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) => {
     let newLineItems = {};
     let selectedCheckBoxTransactionIds = draft.selectedCheckBoxTransactionIds;
     let similarTransactionUpdated = false;
@@ -332,7 +333,7 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
                     const record = {
                         ...transactionDetailLocalData.lineItemById[lineId],
                     };
-                    // if the line is the one that is being updated, then set the account and class
+                    // if the line is the one that is being updated, then set the account, class, and project
                     if (transactionId === record.transactionId &&
                         transactionLineId === lineId) {
                         if (selectedAccount != null) {
@@ -341,6 +342,9 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
                         if (selectedClassBase != null) {
                             record.class = selectedClassBase;
                         }
+                        if (selectedProjectBase != null) {
+                            record.project = selectedProjectBase;
+                        }
                         const isClassSatisfied = isAccountingClassesEnabled === false || record.class != null;
                         if (isClassSatisfied && record.account != null) {
                             if (selectedCheckBoxTransactionIds.length < exports.MAX_SELECTION_LIMIT &&
@@ -392,6 +396,10 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
                                     selectedCheckBoxTransactionIds.push(transaction.id);
                                 }
                             }
+                            // Project intentionally does NOT propagate to other rows of
+                            // the same vendor: each line can carry a different project,
+                            // and auto-filling siblings (the way class does) leads to
+                            // unexpected bulk selection.
                         }
                     }
                     if (line.type === 'transaction_with_product_or_service_line') {
@@ -522,6 +530,7 @@ const setEntityRecommendationForLineIdInLocalData = (draft, transaction, transac
             ...newLineItem,
             class: matchingRecord.class,
             account: matchingRecord.account,
+            project: matchingRecord.project,
             lineEntity: matchingRecord.lineEntity,
         };
     }

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

@@ -4,6 +4,7 @@ import { MonthYearPeriod, TimePeriod } from '../../../commonStateTypes/timePerio
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
+import { ProjectBase } from '../../../entity/project/projectState';
 import { CustomerBase } from '../../../entity/customer/customerState';
 import { Entity } from '../../../entity/genericEntity/entity';
 import { RecommendationWithCOTByLineId, TransactionID } from '../../../entity/transaction/stateTypes/transaction';
@@ -100,7 +101,7 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     isUncategorizedExpenseCategoryEnabled?: boolean;
     selectedEntity?: Entity;
     updatedCustomer?: CustomerBase;
-}, "expenseAutomationTransactionsView/updateSelectedCustomerForTransaction">, setAllItemsToCategoryClassInLocalDataForCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionId: string, lineId: string, transactions: SupportedTransactionWithCOT[], uncategorizedAccounts: UncategorizedAccounts, vendorId?: string | undefined, customerId?: string | undefined, selectedAccount?: AccountBase | undefined, selectedClassBase?: ClassBase | undefined, lineEntity?: Entity | undefined, recommendations?: RecommendationWithCOT[] | undefined, isUncategorizedExpenseCategoryEnabled?: boolean | undefined, isAccountingClassesEnabled?: boolean | undefined], {
+}, "expenseAutomationTransactionsView/updateSelectedCustomerForTransaction">, setAllItemsToCategoryClassInLocalDataForCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionId: string, lineId: string, transactions: SupportedTransactionWithCOT[], uncategorizedAccounts: UncategorizedAccounts, vendorId?: string | undefined, customerId?: string | undefined, selectedAccount?: AccountBase | undefined, selectedClassBase?: ClassBase | undefined, lineEntity?: Entity | undefined, recommendations?: RecommendationWithCOT[] | undefined, isUncategorizedExpenseCategoryEnabled?: boolean | undefined, isAccountingClassesEnabled?: boolean | undefined, selectedProjectBase?: ProjectBase | undefined], {
     selectedTab: "review" | "autoCategorized";
     transactionId: string;
     lineId: string;
@@ -110,6 +111,7 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     lineEntity: Entity | undefined;
     selectedAccount: AccountBase | undefined;
     selectedClassBase: ClassBase | undefined;
+    selectedProjectBase: ProjectBase | undefined;
     recommendations: RecommendationWithCOT[] | undefined;
     uncategorizedAccounts: UncategorizedAccounts;
     isAccountingClassesEnabled: boolean | undefined;

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

@@ -289,7 +289,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         },
         setAllItemsToCategoryClassInLocalDataForCategorization: {
             reducer(draft, action) {
-                const { vendorId, customerId, selectedAccount, selectedClassBase, transactions, transactionId, lineId, selectedTab, uncategorizedAccounts, isAccountingClassesEnabled, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+                const { vendorId, customerId, selectedAccount, selectedClassBase, selectedProjectBase, transactions, transactionId, lineId, selectedTab, uncategorizedAccounts, isAccountingClassesEnabled, isUncategorizedExpenseCategoryEnabled, } = action.payload;
                 const transactionLocalData = (0, get_1.default)(draft.transactionCategorizationView[selectedTab]
                     .transactionReviewLocalDataById, transactionId, undefined);
                 const existingAccount = transactionLocalData?.transactionReviewLocalData.lineItemById[lineId]
@@ -303,6 +303,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                                 ...transactionLocalData.transactionReviewLocalData.lineItemById[lineId],
                                 account: selectedAccount,
                                 class: selectedClassBase,
+                                project: selectedProjectBase,
                             },
                         },
                     };
@@ -331,9 +332,16 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                         const transactionLocalData = (0, get_1.default)(draft.transactionCategorizationView[selectedTab]
                             .transactionReviewLocalDataById, transaction.id, undefined);
                         if (transactionLocalData != null) {
-                            const { localData, similarTransactionUpdated } = (0, transactionCategorizationLocalDataHelper_1.toSetAllLineItemsToCategoryClass)(draft.transactionCategorizationView[selectedTab], transaction, transactionId, lineId, transactionLocalData.transactionReviewLocalData, existingAccount?.accountId !== selectedAccount?.accountId
+                            const existingClassId = transactionLocalData.transactionReviewLocalData.lineItemById[lineId]?.class?.classId;
+                            const existingProjectId = transactionLocalData.transactionReviewLocalData.lineItemById[lineId]?.project?.projectId;
+                            const updatedItem = existingAccount?.accountId !== selectedAccount?.accountId
                                 ? 'category'
-                                : 'class', uncategorizedAccounts, selectedTab, vendorId, customerId, selectedAccount, selectedClassBase, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled);
+                                : existingClassId !== selectedClassBase?.classId
+                                    ? 'class'
+                                    : existingProjectId !== selectedProjectBase?.projectId
+                                        ? 'project'
+                                        : 'class';
+                            const { localData, similarTransactionUpdated } = (0, transactionCategorizationLocalDataHelper_1.toSetAllLineItemsToCategoryClass)(draft.transactionCategorizationView[selectedTab], transaction, transactionId, lineId, transactionLocalData.transactionReviewLocalData, updatedItem, uncategorizedAccounts, selectedTab, vendorId, customerId, selectedAccount, selectedClassBase, selectedProjectBase, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled);
                             draft.transactionCategorizationView[selectedTab].transactionReviewLocalDataById[transaction.id] = {
                                 transactionId: transaction.id,
                                 transactionReviewLocalData: localData,
@@ -352,7 +360,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                     ...dirtyIds,
                 ]);
             },
-            prepare(selectedTab, transactionId, lineId, transactions, uncategorizedAccounts, vendorId, customerId, selectedAccount, selectedClassBase, lineEntity, recommendations, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) {
+            prepare(selectedTab, transactionId, lineId, transactions, uncategorizedAccounts, vendorId, customerId, selectedAccount, selectedClassBase, lineEntity, recommendations, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled, selectedProjectBase) {
                 return {
                     payload: {
                         selectedTab,
@@ -364,6 +372,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                         lineEntity,
                         selectedAccount,
                         selectedClassBase,
+                        selectedProjectBase,
                         recommendations,
                         uncategorizedAccounts,
                         isAccountingClassesEnabled,

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

@@ -6,6 +6,7 @@ import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { SupportedTransactionWithCOT } from '../../../entity/transaction/transactionState';
 import { UncategorizedAccounts } from '../../accountList/accountListSelector';
+import { ProjectListSelectorView } from '../../projectList/projectListSelector';
 import { TransactionReviewLocalData, TransactionsTab, TransactionsViewUIState } from '../types/transactionsViewState';
 export interface TransactionReviewLocalDataSelectorView {
     transactionId: ID;
@@ -18,7 +19,9 @@ export interface ExpenseAutomationTransactionViewSelector extends SelectorView {
     classList: ClassBase[];
     completionStatus: CompletionStatusType;
     fetchStateByTransactionTabs: Record<TransactionsTab, FetchStateAndError>;
+    isAccountingProjectsEnabled: boolean;
     markAsNotMiscategorizedStatus: FetchStateAndError;
+    projectList: ProjectListSelectorView;
     refreshStatus: FetchStateAndError;
     saveStatus: FetchStateAndError;
     selectedCheckBoxTransactionIds: ID[];

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

@@ -12,9 +12,10 @@ const transactionHelper_1 = require("../../../entity/transaction/transactionHelp
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
+const projectListSelector_1 = require("../../projectList/projectListSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 function getExpenseAutomationTransactionView(state) {
-    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
     const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
@@ -23,6 +24,8 @@ function getExpenseAutomationTransactionView(state) {
     const allClasses = classList.classes.map((classData) => {
         return (0, omit_1.default)(classData, ['accountIds', 'key']);
     });
+    const projectList = (0, projectListSelector_1.getProjectList)(projectState, projectListState);
+    const isAccountingProjectsEnabled = (0, tenantSelector_1.getIsAccountingProjectsEnabled)(state);
     const accountsHierarchyList = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList');
     const classHierarchyList = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -102,6 +105,8 @@ function getExpenseAutomationTransactionView(state) {
         classList: allClasses,
         accountsHierarchyList,
         classHierarchyList,
+        isAccountingProjectsEnabled,
+        projectList,
         transactionLocalData,
         uiState,
         refreshStatus,

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

@@ -7,6 +7,7 @@ import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { CustomerBase } from '../../../entity/customer/customerState';
+import { ProjectBase } from '../../../entity/project/projectState';
 import { Entity, EntityType } from '../../../entity/genericEntity/entity';
 import { TransactionID } from '../../../entity/transaction/stateTypes/transaction';
 import { BillableStatus, CategorizationStatusType, PlatformLineDetailType, ProductOrService, TransactionLineBase } from '../../../entity/transaction/stateTypes/transactionLine';
@@ -53,6 +54,7 @@ export interface TransactionCategorizationLineItemData extends TransactionLineBa
     lineTransactionType?: TransactionType;
     postingType?: TransactionCategory;
     postingTypeName?: string;
+    project?: ProjectBase;
     recommendationsWithCOT?: RecommendationWithCOT[];
     reviewPendingReasons?: string[];
     selectedEntityLine?: Entity;
@@ -110,6 +112,7 @@ export interface TransactionLineUpdates {
     class?: ClassBase;
     customer?: CustomerBase;
     lineDescription?: string;
+    project?: ProjectBase;
     recommendation?: Recommendation[];
     vendor?: VendorBase;
 }

package/lib/view/people/peopleTypes.d.ts

@@ -1,3 +1,3 @@
-declare const toPeopleSortKeyType: (v: string) => "role" | "manager" | "name" | "department" | "lastSeen";
+declare const toPeopleSortKeyType: (v: string) => "role" | "manager" | "department" | "name" | "lastSeen";
 export type PeopleViewSortKey = ReturnType<typeof toPeopleSortKeyType>;
 export {};

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.js

@@ -11,15 +11,13 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     if (approvalRuleId != null) {
         const approvalRule = (0, approvalRuleSelector_1.getApprovalRuleById)(state$.value.approvalRuleState, approvalRuleId);
         if (approvalRule != null) {
-            const criteria = approvalRule.criteria[0];
-            const range = criteria?.range;
             const billPaySetupApproverViewUpdateData = {
                 approvalRuleId,
                 steps: approvalRule.steps,
                 criteria: {
-                    rangeType: criteria?.rangeType,
-                    rangeEntity: criteria?.rangeEntity,
-                    range,
+                    amount: (0, approvalRuleSelector_1.getAmountCriteria)(approvalRule.criteria),
+                    vendor: (0, approvalRuleSelector_1.getVendorCriteria)(approvalRule.criteria),
+                    department: (0, approvalRuleSelector_1.getDepartmentCriteria)(approvalRule.criteria),
                 },
             };
             fetchActions.push((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewUpdateData));
@@ -28,7 +26,7 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     else {
         const billPaySetupApproverViewCreateData = {
             steps: [],
-            criteria: undefined,
+            criteria: {},
         };
         fetchActions.push((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewCreateData));
     }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.d.ts

@@ -14,7 +14,7 @@ interface ApproverViewStepPayload extends Omit<StepPayload, 'actors'> {
 }
 interface ApprovalUpdatableInfoPayload {
     approval_rule_id: ID;
-    criteria: CriteriaPayload[];
+    criteria: CriteriaPayload;
     is_applicable_on_pending_approval_entity: boolean;
     steps: ApproverViewStepPayload[];
 }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js

@@ -2,22 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toApprovalChangableInfoPayload = void 0;
 const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
-    let criteriaPayload = [];
+    // Form-side criteria is a structured object with optional slots for
+    // amount / vendor / department; flatten it into the wire format's
+    // `conditions[]` array.
+    let criteriaPayload;
     if (approverViewUpdateData.criteria != null) {
-        const criteria = approverViewUpdateData.criteria;
-        const { rangeType, rangeEntity, range } = criteria;
-        const { min, max } = range;
-        const { currencyCode, currencySymbol } = min;
-        criteriaPayload = [
-            {
-                type: rangeType,
-                range_entity: rangeEntity,
-                min: min.amount,
-                max: max?.amount ?? null,
-                currency_code: currencyCode,
-                currency_symbol: currencySymbol,
-            },
-        ];
+        const { amount, vendor, department } = approverViewUpdateData.criteria;
+        const conditions = [];
+        if (amount?.min != null) {
+            conditions.push({
+                field: 'amount',
+                type: 'gte',
+                value: amount.min.amount,
+            });
+        }
+        if (amount?.max != null) {
+            conditions.push({
+                field: 'amount',
+                type: 'lte',
+                value: amount.max.amount,
+            });
+        }
+        if (vendor != null && vendor.vendorIds.length > 0) {
+            conditions.push({
+                field: 'vendor_id',
+                type: vendor.operator === 'is_not' ? 'not_in' : 'in',
+                value: vendor.vendorIds,
+            });
+        }
+        if (department != null && department.departmentIds.length > 0) {
+            conditions.push({
+                field: 'department_id',
+                type: department.operator === 'is_not' ? 'not_in' : 'in',
+                value: department.departmentIds,
+            });
+        }
+        if (conditions.length > 0) {
+            const currency = amount?.min ?? amount?.max ?? null;
+            criteriaPayload = {
+                conditions,
+                criteria_operator: 'and',
+                currency_code: currency?.currencyCode ?? 'USD',
+                currency_symbol: currency?.currencySymbol ?? '$',
+            };
+        }
     }
     const steps = approverViewUpdateData.steps.map((step) => {
         return {
@@ -38,10 +66,12 @@ const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
     });
     const isUpdate = approverViewUpdateData.approvalRuleId != null;
     const payload = {
-        criteria: criteriaPayload,
         steps,
         is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
     };
+    if (criteriaPayload != null) {
+        payload.criteria = criteriaPayload;
+    }
     if (isUpdate) {
         payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
     }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts

@@ -1,19 +1,31 @@
 import { FetchStateAndError, ID } from '../../../../../commonStateTypes/common';
-import { Criteria, Step } from '../../../../../entity/approvalRule/approvalRuleState';
+import { AmountCriteria, DepartmentCriteria, Step, VendorCriteria } from '../../../../../entity/approvalRule/approvalRuleState';
 export type ApprovalUpdateActionType = 'approval_create' | 'approval_update';
 export interface ApproverViewUpdateData {
     type: ApprovalUpdateActionType;
     updateStatus: FetchStateAndError;
     data?: ApprovalRuleUpdateData | ApprovalRuleCreateData;
 }
+/**
+ * Form-side criteria shape used by the rule create/edit form.
+ *
+ * Each condition kind gets its own optional slot, mirroring how the UI
+ * edits them as distinct rows. At most one of each kind is present; this
+ * matches the design constraint that each condition type can be added once.
+ */
+export interface ApprovalRuleFormCriteria {
+    amount?: AmountCriteria;
+    department?: DepartmentCriteria;
+    vendor?: VendorCriteria;
+}
 export interface ApprovalRuleUpdateData {
     approvalRuleId: ID;
-    criteria: Criteria;
+    criteria: ApprovalRuleFormCriteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }
 export interface ApprovalRuleCreateData {
-    criteria: Criteria;
+    criteria: ApprovalRuleFormCriteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -9,6 +9,7 @@ exports.getPaymentSection = getPaymentSection;
 exports.toPaymentToOption = toPaymentToOption;
 const get_1 = __importDefault(require("lodash/get"));
 const has_1 = __importDefault(require("lodash/has"));
+const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const bankAccountSelector_1 = require("../../../../entity/bankAccount/bankAccountSelector");
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
@@ -698,9 +699,13 @@ exports.getDefaultWithdrawFromAccount = getDefaultWithdrawFromAccount;
 const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
     let isCreatorAlsoApprover = false;
     const approvalRule = approvalRules.find((rule) => {
-        const { max, min } = rule.criteria[0].range;
+        const amountCriteria = (0, approvalRuleSelector_1.getAmountCriteria)(rule.criteria);
+        if (amountCriteria?.min == null) {
+            return false;
+        }
+        const { min, max } = amountCriteria;
         return (billAmount > min.amount &&
-            (max?.amount != null ? billAmount <= max?.amount : true));
+            (max?.amount != null ? billAmount <= max.amount : true));
     });
     if (approvalRule != null) {
         const requireApprovalSteps = approvalRule.steps.filter((step) => step.action === 'require_approval');

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" | "accountType" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
+export declare const toChargeCardSortKeyType: (v: string) => "status" | "department" | "accountType" | "owner" | "cardName" | "limit" | "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/reimbursement/remiSetupApproverView/epic/initializeRemiSetupApproverViewUpdateDataEpic.js

@@ -11,15 +11,13 @@ const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => acti
     if (approvalRuleId != null) {
         const approvalRule = (0, approvalRuleSelector_1.getApprovalRuleById)(state$.value.approvalRuleState, approvalRuleId);
         if (approvalRule != null) {
-            const criteria = approvalRule.criteria[0];
-            const range = criteria?.range;
             const remiSetupApproverViewUpdateData = {
                 approvalRuleId,
                 steps: approvalRule.steps,
                 criteria: {
-                    rangeType: criteria?.rangeType,
-                    rangeEntity: criteria?.rangeEntity,
-                    range,
+                    amount: (0, approvalRuleSelector_1.getAmountCriteria)(approvalRule.criteria),
+                    vendor: (0, approvalRuleSelector_1.getVendorCriteria)(approvalRule.criteria),
+                    department: (0, approvalRuleSelector_1.getDepartmentCriteria)(approvalRule.criteria),
                 },
             };
             fetchActions.push((0, remiSetupApproverViewReducer_1.clearRemiSetupApproverViewUpdateData)(), (0, remiSetupApproverViewReducer_1.saveRemiSetupApproverViewUpdateData)(remiSetupApproverViewUpdateData));
@@ -28,7 +26,7 @@ const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => acti
     else {
         const remiSetupApproverViewCreateData = {
             steps: [],
-            criteria: undefined,
+            criteria: {},
         };
         fetchActions.push((0, remiSetupApproverViewReducer_1.clearRemiSetupApproverViewUpdateData)(), (0, remiSetupApproverViewReducer_1.saveRemiSetupApproverViewUpdateData)(remiSetupApproverViewCreateData));
     }

package/lib/view/taskManager/taskListView/taskList.d.ts

@@ -50,15 +50,15 @@ export interface TaskFilterCategory {
 }
 export type TaskListFilterCategoryField = 'status' | 'dueDate' | 'assignee' | 'creationDate' | 'priority' | 'tag';
 export declare const TASK_LIST_GROUP_BY_KEYS: readonly ["groupName", "status", "dueDate", "assignee", "priority", "tag"];
-export declare const toTaskListGroupByKeyType: (v: string) => "status" | "dueDate" | "groupName" | "tag" | "priority" | "assignee";
-export declare const toTaskListGroupByKeyTypeStrict: (v: string) => "status" | "dueDate" | "groupName" | "tag" | "priority" | "assignee" | undefined;
+export declare const toTaskListGroupByKeyType: (v: string) => "status" | "priority" | "dueDate" | "groupName" | "tag" | "assignee";
+export declare const toTaskListGroupByKeyTypeStrict: (v: string) => "status" | "priority" | "dueDate" | "groupName" | "tag" | "assignee" | undefined;
 export declare type TaskGroupKey = ReturnType<typeof toTaskListGroupByKeyType>;
 export interface TaskListUIState extends SpendManagementUIState {
     groupByKey: TaskGroupKey;
     searchText: string;
     sortKey: TaskListViewSortKey;
 }
-declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "dueDate" | "tag" | "priority" | "timeSpent" | "assignee" | "creationDate" | "visibility";
+declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "priority" | "dueDate" | "tag" | "timeSpent" | "assignee" | "creationDate" | "visibility";
 export declare type TaskListViewSortKey = ReturnType<typeof toTaskListSortKeyType>;
 export declare const TASK_LIST_FILTER_CATEGORIES: TaskListFilterCategoryOption[];
 interface TaskListFilterCategoryOption {

package/lib/view/transactionDetail/transactionDetailState.d.ts

@@ -4,7 +4,7 @@ import { AccountBase } from '../../entity/account/accountState';
 import { ClassBase } from '../../entity/class/classState';
 import { CustomerBase } from '../../entity/customer/customerState';
 import { EntityType } from '../../entity/genericEntity/entity';
-import { Project } from '../../entity/project/projectState';
+import { ProjectBase } from '../../entity/project/projectState';
 import { Transaction, TransactionID } from '../../entity/transaction/stateTypes/transaction';
 import { VendorBase } from '../../entity/vendor/vendorState';
 import { EntityRecommendationKey } from '../recommendation/recommendationState';
@@ -53,7 +53,7 @@ export interface TransactionLineUpdates {
     class?: ClassBase;
     customer?: CustomerBase;
     lineDescription?: string;
-    project?: Project;
+    project?: ProjectBase;
     recommendation?: Recommendation[];
     vendor?: VendorBase;
 }

package/lib/view/transactionDetail/transactionDetailTypes.d.ts

@@ -4,7 +4,7 @@ import { AccountBase, RecommendedAccountBase } from '../../entity/account/accoun
 import { ClassBase, RecommendedClassBase } from '../../entity/class/classState';
 import { CustomerBase } from '../../entity/customer/customerState';
 import { Entity } from '../../entity/genericEntity/entity';
-import { Project } from '../../entity/project/projectState';
+import { ProjectBase } from '../../entity/project/projectState';
 import { TransactionID } from '../../entity/transaction/stateTypes/transaction';
 import { BillableStatus, PlatformLineDetailType, ProductOrService, TransactionLineBase } from '../../entity/transaction/stateTypes/transactionLine';
 import { TransactionCategory, TransactionType } from '../../entity/transaction/stateTypes/transactionType';
@@ -30,7 +30,7 @@ export interface TransactionDetailLineItemData extends TransactionLineBase {
     linkedTransactions?: TransactionID[];
     postingType?: TransactionCategory;
     postingTypeName?: string;
-    project?: Project;
+    project?: ProjectBase;
     recommendationsWithCOT?: RecommendationWithCOT[];
     recommendedAccount?: RecommendedAccountBase;
     recommendedClass?: RecommendedClassBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.49",
+  "version": "5.0.50-betaAR1",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",