@zeniai/client-epic-state 4.20.0 → 4.20.1-beta10ND

package/lib/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enrichProfitAndLossByClassHorizontalReport = enrichProfitAndLossByClassHorizontalReport;
 const currencyHelper_1 = require("../../commonStateTypes/currencyHelper");
+const horizontalSectionEmptyBalancesSlice_1 = require("./horizontalSectionEmptyBalancesSlice");
 const profitAndLossClassesByClassHorizontalSelectorTypes_1 = require("./profitAndLossClassesByClassHorizontalSelectorTypes");
 /**
  * Populates `sectionHeaderBalancesSlice`, and per-account `accountReportData`, so the
@@ -28,30 +29,31 @@ function enrichHorizontalSection(report, section) {
         return total?.balance.amount ?? 0;
     });
     section.sectionHeaderBalancesSlice = buildHorizontalClassColumnBalancesSlice(report, classAmounts, section.sectionTotal.amount);
-    const childrenRowIndicesByParent = buildHorizontalAccountChildIndicesByParent(section.accounts);
+    const parentIndices = computeHorizontalAccountParentIndices(section.accounts);
+    const childrenRowIndicesByParent = buildHorizontalAccountChildIndicesByParent(parentIndices);
     const childrenRecord = {};
     childrenRowIndicesByParent.forEach((childIndices, parentIndex) => {
         childrenRecord[parentIndex] = childIndices;
     });
     section.treeLayout = {
         rootAccountRowIndices: section.accounts
-            .map((_, i) => findHorizontalAccountParentIndex(section.accounts, i) === -1 ? i : -1)
+            .map((_, i) => (parentIndices[i] === -1 ? i : -1))
             .filter((i) => i >= 0),
         childrenRowIndicesByParent: childrenRecord,
     };
-    for (let i = 0; i < section.accounts.length; i++) {
-        const row = section.accounts[i];
-        const classRowAmounts = report.classColumns.map((col) => {
-            const cb = row.classBalances.find((b) => b.classId === col.classId);
-            return cb?.balance.amount ?? 0;
-        });
+    const siblingsPerRow = buildSiblingIndicesPerRow(section.accounts, parentIndices);
+    const hasChildFlags = computeHorizontalHasChildFlags(parentIndices);
+    for (let accountIndex = 0; accountIndex < section.accounts.length; accountIndex++) {
+        const row = section.accounts[accountIndex];
+        // Same column order as `report.classColumns` (see `pivotSectionToHorizontal`).
+        const classRowAmounts = row.classBalances.map((classBalance) => classBalance.balance.amount);
         row.accountReportData = {
             accountId: row.accountId,
             accountName: row.accountName,
             accountType: row.accountType,
             depth: row.depth,
             balancesInTimeframe: buildHorizontalClassColumnBalancesSlice(report, classRowAmounts, row.rowTotal.amount),
-            horizontalTreeView: buildHorizontalTreeView(section.accounts, i),
+            horizontalTreeView: buildHorizontalTreeViewFromPrecomputed(section.accounts, accountIndex, parentIndices, siblingsPerRow, hasChildFlags),
         };
     }
 }
@@ -69,23 +71,14 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
     const currencyCode = firstHeader?.balance.currencyCode ?? fallback.currencyCode;
     const currencySymbol = firstHeader?.balance.currencySymbol ?? fallback.currencySymbol;
     const timeframe = firstHeader?.balanceTimeFrame ?? 'month';
-    const emptySlice = {
-        balances: [],
-        additionalBalances: [],
-        filter: {
-            firstMonthOfFY: report.firstMonthOfFY,
-            timeframe,
-            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
-            additionalBalances: [],
-        },
-    };
+    const emptySlice = (0, horizontalSectionEmptyBalancesSlice_1.getEmptyHorizontalSectionBalancesSlice)(report.firstMonthOfFY, timeframe);
     if (report.selectedPeriod == null) {
         return emptySlice;
     }
     const { startDate, endDate } = report.selectedPeriod;
-    const balances = report.classColumns.map((col, i) => ({
+    const balances = report.classColumns.map((col, columnIndex) => ({
         balance: {
-            amount: classAmounts[i] ?? 0,
+            amount: classAmounts[columnIndex] ?? 0,
             currencyCode,
             currencySymbol,
         },
@@ -123,64 +116,143 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
         },
     };
 }
-function findHorizontalAccountParentIndex(dfsOrderedAccountRows, childRowIndex) {
-    const childDepth = dfsOrderedAccountRows[childRowIndex].depth;
-    if (childDepth <= 2) {
-        return -1;
-    }
-    for (let earlierRowIndex = childRowIndex - 1; earlierRowIndex >= 0; earlierRowIndex--) {
-        const earlierDepth = dfsOrderedAccountRows[earlierRowIndex].depth;
-        if (earlierDepth < childDepth) {
-            if (earlierDepth === childDepth - 1) {
-                return earlierRowIndex;
+/**
+ * Parent index per DFS row — O(n). Matches the scan in the former
+ * `findHorizontalAccountParentIndex` (depth &lt;= 2 rows have no parent).
+ */
+function computeHorizontalAccountParentIndices(rows) {
+    const accountRowCount = rows.length;
+    const parentIndex = new Array(accountRowCount).fill(-1);
+    const stack = [];
+    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
+        const accountRow = rows[rowIndex];
+        if (accountRow == null) {
+            continue;
+        }
+        const depth = accountRow.depth;
+        while (stack.length > 0) {
+            const topRow = rows[stack[stack.length - 1]];
+            if (topRow == null) {
+                stack.pop();
+                continue;
+            }
+            if (topRow.depth < depth) {
+                break;
+            }
+            stack.pop();
+        }
+        if (depth > 2 && stack.length > 0) {
+            const peek = stack[stack.length - 1];
+            const parentRow = rows[peek];
+            if (parentRow != null && parentRow.depth === depth - 1) {
+                parentIndex[rowIndex] = peek;
             }
-            return -1;
         }
+        stack.push(rowIndex);
     }
-    return -1;
+    return parentIndex;
 }
-function getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, rowIndex) {
-    const parentRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex);
-    const rowDepth = dfsOrderedAccountRows[rowIndex].depth;
-    const siblings = [];
-    for (let i = 0; i < dfsOrderedAccountRows.length; i++) {
-        if (dfsOrderedAccountRows[i].depth === rowDepth &&
-            findHorizontalAccountParentIndex(dfsOrderedAccountRows, i) ===
-                parentRowIndex) {
-            siblings.push(i);
+/** Sibling row indices (same parent + depth), in traversal order — O(n). */
+function buildSiblingIndicesPerRow(rows, parentIndices) {
+    const accountRowCount = rows.length;
+    const keyToIndices = new Map();
+    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        const accountRow = rows[rowIndex];
+        if (parentRowIndex == null || accountRow == null) {
+            continue;
+        }
+        const key = `${parentRowIndex}:${accountRow.depth}`;
+        let siblingGroup = keyToIndices.get(key);
+        if (siblingGroup == null) {
+            siblingGroup = [];
+            keyToIndices.set(key, siblingGroup);
+        }
+        siblingGroup.push(rowIndex);
+    }
+    const siblingsPerRow = new Array(accountRowCount);
+    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        const accountRow = rows[rowIndex];
+        if (parentRowIndex == null || accountRow == null) {
+            siblingsPerRow[rowIndex] = [rowIndex];
+            continue;
         }
+        const key = `${parentRowIndex}:${accountRow.depth}`;
+        const group = keyToIndices.get(key);
+        siblingsPerRow[rowIndex] = group != null ? group : [rowIndex];
     }
-    return siblings;
+    return siblingsPerRow;
 }
-function horizontalAccountHasChildRows(dfsOrderedAccountRows, parentRowIndex) {
-    return dfsOrderedAccountRows.some((_, rowIndex) => findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex) ===
-        parentRowIndex);
+function computeHorizontalHasChildFlags(parentIndices) {
+    const rowCount = parentIndices.length;
+    const flags = new Array(rowCount).fill(false);
+    for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        if (parentRowIndex != null &&
+            parentRowIndex >= 0 &&
+            parentRowIndex < rowCount) {
+            flags[parentRowIndex] = true;
+        }
+    }
+    return flags;
 }
-function buildHorizontalSubAccountAncestorMetadata(dfsOrderedAccountRows, currentRowIndex) {
-    const ancestorRowIndicesRootToLeaf = [];
+function buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags) {
+    const chain = [];
     let walkRowIndex = currentRowIndex;
     while (walkRowIndex >= 0) {
-        ancestorRowIndicesRootToLeaf.unshift(walkRowIndex);
-        walkRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, walkRowIndex);
+        chain.unshift(walkRowIndex);
+        const parentRowIndex = parentIndices[walkRowIndex];
+        if (parentRowIndex == null) {
+            break;
+        }
+        walkRowIndex = parentRowIndex;
     }
-    return ancestorRowIndicesRootToLeaf.map((rowIndex) => {
-        const siblingIndices = getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, rowIndex);
+    return chain.map((rowIndex) => {
+        const accountRow = dfsOrderedAccountRows[rowIndex];
+        const siblingIndices = siblingsPerRow[rowIndex];
+        const hasChild = hasChildFlags[rowIndex];
+        if (accountRow == null || siblingIndices == null) {
+            return {
+                depth: 0,
+                hasSibling: false,
+                hasChildren: hasChild === true,
+                isLastNode: true,
+                name: '',
+            };
+        }
         return {
-            depth: dfsOrderedAccountRows[rowIndex].depth - 2,
+            depth: accountRow.depth - 2,
             hasSibling: siblingIndices.length > 1,
-            hasChildren: horizontalAccountHasChildRows(dfsOrderedAccountRows, rowIndex),
+            hasChildren: hasChild === true,
             isLastNode: rowIndex === siblingIndices[siblingIndices.length - 1],
-            name: dfsOrderedAccountRows[rowIndex].accountName,
+            name: accountRow.accountName,
         };
     });
 }
-function buildHorizontalAccountChildIndicesByParent(dfsOrderedAccountRows) {
+function buildHorizontalTreeViewFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags) {
+    const siblingIndices = siblingsPerRow[currentRowIndex];
+    const accountRow = dfsOrderedAccountRows[currentRowIndex];
+    const hasChildrenFlag = hasChildFlags[currentRowIndex];
+    const treeDepth = accountRow != null ? Math.max(0, accountRow.depth - 2) : 0;
+    const hasChildren = hasChildrenFlag === true;
+    const siblings = siblingIndices ?? [currentRowIndex];
+    return {
+        subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags),
+        treeDepth,
+        hasChildren,
+        hasSiblings: siblings.length > 1,
+        isLeaf: !hasChildren,
+        isLastNode: currentRowIndex === siblings[siblings.length - 1],
+    };
+}
+function buildHorizontalAccountChildIndicesByParent(parentIndices) {
     const childIndicesByParentRowIndex = new Map();
-    for (let rowIndex = 0; rowIndex < dfsOrderedAccountRows.length; rowIndex++) {
-        const parentRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex);
-        if (parentRowIndex >= 0) {
+    for (let rowIndex = 0; rowIndex < parentIndices.length; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        if (parentRowIndex != null && parentRowIndex >= 0) {
             let childRowIndices = childIndicesByParentRowIndex.get(parentRowIndex);
-            if (childRowIndices === undefined) {
+            if (childRowIndices == null) {
                 childRowIndices = [];
                 childIndicesByParentRowIndex.set(parentRowIndex, childRowIndices);
             }
@@ -189,16 +261,3 @@ function buildHorizontalAccountChildIndicesByParent(dfsOrderedAccountRows) {
     }
     return childIndicesByParentRowIndex;
 }
-function buildHorizontalTreeView(dfsOrderedAccountRows, currentRowIndex) {
-    const treeDepth = Math.max(0, dfsOrderedAccountRows[currentRowIndex].depth - 2);
-    const siblingIndices = getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, currentRowIndex);
-    const hasChildren = horizontalAccountHasChildRows(dfsOrderedAccountRows, currentRowIndex);
-    return {
-        subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadata(dfsOrderedAccountRows, currentRowIndex),
-        treeDepth,
-        hasChildren,
-        hasSiblings: siblingIndices.length > 1,
-        isLeaf: !hasChildren,
-        isLastNode: currentRowIndex === siblingIndices[siblingIndices.length - 1],
-    };
-}

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/billPay/billPayReview/billPayReviewSelector.js

@@ -8,6 +8,7 @@ const get_1 = __importDefault(require("lodash/get"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
 const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const vendorSelector_1 = require("../../../../entity/vendor/vendorSelector");
 const accountListSelector_1 = require("../../../accountList/accountListSelector");
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
@@ -80,11 +81,14 @@ const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)([
+            const fetchStateList = [
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-                classListState,
-            ]).fetchState;
+            ];
+            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
+                fetchStateList.push(classListState);
+            }
+            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
         }
     }
     else {

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -9,6 +9,7 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const classSelector_1 = require("../../../../entity/class/classSelector");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
@@ -50,7 +51,7 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
         newApprovalRuleId,
     };
 });
-exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
+exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => (0, tenantSelector_1.getIsAccountingClassesEnabled)(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
@@ -98,10 +99,9 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: (0, reduceFetchState_1.reduceAllFetchState)([
-            approverListState.fetchStatus,
-            classListState,
-        ]),
+        approverListFetchStatus: isAccountingClassesEnabled
+            ? (0, reduceFetchState_1.reduceAllFetchState)([approverListState.fetchStatus, classListState])
+            : approverListState.fetchStatus,
         fetchState,
         allAccountingClasses,
         error,

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

@@ -3,23 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchBillPayApproversDetailsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const tenantSelector_1 = require("../../../../../entity/tenant/tenantSelector");
 const classListReducer_1 = require("../../../../classList/classListReducer");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPayApproversDetailsEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPayApproversDetails.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, includeUserRoles } = action.payload;
     const { billPaySetupApproverViewState, classListState } = state$.value;
     const { approverListState } = billPaySetupApproverViewState;
+    const isAccountingClassesEnabled = (0, tenantSelector_1.getIsAccountingClassesEnabled)(state$.value);
     const actions = [];
     if (cacheOverride === true) {
         actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(cacheOverride, includeUserRoles));
-        actions.push((0, classListReducer_1.fetchClassList)());
+        if (isAccountingClassesEnabled) {
+            actions.push((0, classListReducer_1.fetchClassList)());
+        }
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(true, includeUserRoles));
         }
-        if (classListState.hasValidState() === false &&
+        if (isAccountingClassesEnabled &&
+            classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push((0, classListReducer_1.fetchClassList)());
         }

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

@@ -16,6 +16,7 @@ const companySelector_1 = require("../../../../entity/company/companySelector");
 const depositAccountSelector_1 = require("../../../../entity/depositAccount/depositAccountSelector");
 const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
 const paymentInstrumentSelector_1 = require("../../../../entity/paymentInstrument/paymentInstrumentSelector");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const vendorSelector_1 = require("../../../../entity/vendor/vendorSelector");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
@@ -181,12 +182,15 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
             billStage = billPayInfo?.stage.code ?? 'draft';
             if (billViewState != null) {
-                fetchState = (0, reduceFetchState_1.reduceFetchState)([
+                const fetchStateList = [
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
-                    classListState,
                     billPaySetupApproverViewState,
-                ]).fetchState;
+                ];
+                if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
+                    fetchStateList.push(classListState);
+                }
+                fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = (0, billDetailViewSelector_1.getBillActivities)(state, billId, billPayInfo?.stage.code);
             }
@@ -200,11 +204,14 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         }
     }
     else {
-        fetchState = (0, reduceFetchState_1.reduceFetchState)([
+        const newBillFetchStateList = [
             accountListState.byReportId.billPayAccountList,
-            classListState,
             billPaySetupApproverViewState,
-        ]).fetchState;
+        ];
+        if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
+            newBillFetchStateList.push(classListState);
+        }
+        fetchState = (0, reduceFetchState_1.reduceFetchState)(newBillFetchStateList).fetchState;
     }
     if (sourceBillDetail != null && fetchState == 'Completed') {
         const updatedRecord = sourceBillDetail.billDetailLocalData;

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/editRemiView/editRemiViewSelector.js

@@ -69,13 +69,16 @@ const getEditRemiDetail = (state, reimbursementId) => {
             paymentTo: reimbursementInfo?.toAccount.billAccountId,
         };
         if (sourceRemiDetail != null) {
-            fetchState = (0, reduceFetchState_1.reduceFetchState)([
+            const fetchStateList = [
                 sourceRemiDetail.fetchStatus,
                 accountListState.byReportId.reimbursementAccountList,
-                classListState,
                 merchantListState,
                 reimbursementConfigState,
-            ]).fetchState;
+            ];
+            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
+                fetchStateList.push(classListState);
+            }
+            fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
             remiStage = reimbursementInfo?.stage.code ?? 'draft';
             createdBy = (0, userSelector_1.getUserByUserId)(userState, reimbursement?.createdBy ?? '');
             createTime = reimbursement?.createTime;

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;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -51,6 +51,7 @@ const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
         return {
             ...reimbursement,
             submittedBy: (0, userSelector_1.getUserByUserId)(userState, reimbursement.reimburseeUserId),
+            createdByUser: (0, userSelector_1.getUserByUserId)(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -423,6 +424,14 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                     reimbursementsWithNoSortKeyValue.push(reimbursement);
                 }
                 break;
+            case 'createdBy':
+                if (reimbursement.createdByUser != null) {
+                    reimbursementsWithSortKeyValue.push(reimbursement);
+                }
+                else {
+                    reimbursementsWithNoSortKeyValue.push(reimbursement);
+                }
+                break;
         }
     });
     const getColumnWiseSortOrder = (sortOrder) => {
@@ -430,6 +439,7 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
             case 'reportName':
             case 'type':
             case 'status':
+            case 'createdBy':
                 return sortOrder === 'ascending' ? 'asc' : 'desc';
             default:
                 return sortOrder === 'ascending' ? 'desc' : 'asc';
@@ -449,6 +459,8 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                 return getStatusPerTab(reimbursement);
             case 'amount':
                 return reimbursement.amount.amount ?? 0;
+            case 'createdBy':
+                return `${reimbursement.createdByUser?.firstName ?? ''} ${reimbursement.createdByUser?.lastName ?? ''}`.toLowerCase();
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

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

@@ -38,7 +38,7 @@ export declare const toRemiSubTabTypeStrict: (v: string) => "rejected" | "failed
 export type RemiSubTabType = ReturnType<typeof toRemiSubTabType>;
 export declare const toRemiSubTabUnderScoreType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "my_drafts" | "awaiting_all_approval";
 export type RemiSubTabUnderScoreType = ReturnType<typeof toRemiSubTabUnderScoreType>;
-declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "submittedOn" | "reportName";
+declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "createdBy" | "submittedOn" | "reportName";
 export type ReimbursementViewSortKey = ReturnType<typeof toReimbursementSortKeyType>;
 export interface ReimbursementFilters {
     categories: ReimbursementFilterCategory[];

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.js

@@ -64,6 +64,7 @@ exports.toRemiSubTabUnderScoreType = toRemiSubTabUnderScoreType;
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
+    'createdBy',
     'type',
     'status',
     'amount',

package/lib/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -98,11 +98,11 @@ exports.allTaskStatus = [
     },
     {
         code: 'done',
-        name: 'Done',
+        name: 'In Review',
     },
     {
         code: 'resolved',
-        name: 'Resolved',
+        name: 'Complete',
     },
 ];
 exports.allTaskPriority = [

package/lib/view/transactionDetail/epics/saveTransactionHelper.js

@@ -78,8 +78,8 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
                 lineItem.account?.qboId !== accountLine.account.qboId &&
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
-                Boolean(lineItem.class?.qboId) &&
-                    lineItem.class?.qboId !== accountLine.class.qboId;
+                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
+                    lineItem.class?.qboId !== accountLine.class?.qboId;
             const recommendedAccountBase = (0, exports.toRecommendedAccountBase)(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = (0, exports.toRecommendedClassBase)(lineItem.amount.amount, lineItem.class);
             const latestRecommendedCategory = lineItem.recommendedAccount;