@zeniai/client-epic-state 5.0.54 → 5.0.55-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/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/spendManagement/zeniAccounts/depositAccountDetail/depositAccountDetailSelector.js

@@ -34,7 +34,7 @@ const getDepositAccountDetail = (state, depositAccountId) => {
     const zeniAccountDetail = zeniAccountDetailState.depositAccountDetailById[depositAccountId];
     const depositAccount = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, depositAccountId);
     const zeniAccountsConfig = (0, zeniAccountsConfigSelector_1.getZeniAccountsConfigDetail)(state);
-    const transactionListView = (0, depositAccountTransactionListSelector_1.getDepositAccountTransactionList)(state, depositAccountId, 5);
+    const transactionListView = (0, depositAccountTransactionListSelector_1.getDepositAccountTransactionList)(state, depositAccountId);
     let accountUpdateStatus = {
         editName: {
             fetchState: 'Not-Started',

package/lib/view/spendManagement/zeniAccounts/depositAccountDetail/fetchDepositAccountDetailEpic.js

@@ -19,7 +19,7 @@ const fetchDepositAccountDetailEpic = (actions$, state$) => actions$.pipe((0, op
         zeniAccountActions.push((0, paymentAccountListReducer_1.fetchPaymentAccountList)());
         zeniAccountActions.push((0, zeniAccountsConfigReducer_1.fetchZeniAccountsConfig)());
         zeniAccountActions.push((0, depositAccountDetailReducer_1.fetchDepositAccount)(depositAccountId));
-        zeniAccountActions.push((0, depositAccountTransactionListReducer_1.fetchDepositAccountTransactionList)(depositAccountId, true, 5));
+        zeniAccountActions.push((0, depositAccountTransactionListReducer_1.fetchDepositAccountTransactionList)(depositAccountId, true));
         zeniAccountActions.push((0, depositAccountDetailReducer_1.fetchAccountHistory)(depositAccountId));
     }
     else {
@@ -40,7 +40,12 @@ const fetchDepositAccountDetailEpic = (actions$, state$) => actions$.pipe((0, op
                 targetZeniAccountAccount.fetchState !== 'In-Progress')) {
             zeniAccountActions.push((0, depositAccountDetailReducer_1.fetchDepositAccount)(depositAccountId));
         }
-        zeniAccountActions.push((0, depositAccountTransactionListReducer_1.fetchDepositAccountTransactionList)(depositAccountId, false, 5));
+        const transactionList = state.depositAccountTransactionListState.byDepositId[depositAccountId];
+        if (transactionList == null ||
+            (transactionList.fetchState !== 'Completed' &&
+                transactionList.fetchState !== 'In-Progress')) {
+            zeniAccountActions.push((0, depositAccountTransactionListReducer_1.fetchDepositAccountTransactionList)(depositAccountId, false));
+        }
         const zeniAccountsConfig = state.zeniAccountsConfigState;
         if (zeniAccountsConfig.hasValidState() === false &&
             zeniAccountsConfig.fetchState !== 'In-Progress') {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.54",
+  "version": "5.0.55-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",