@zeniai/client-epic-state 4.19.97 → 4.19.99-beta0ND

package/lib/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.js

@@ -0,0 +1,204 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enrichProfitAndLossByClassHorizontalReport = enrichProfitAndLossByClassHorizontalReport;
+const currencyHelper_1 = require("../../commonStateTypes/currencyHelper");
+const profitAndLossClassesByClassHorizontalSelectorTypes_1 = require("./profitAndLossClassesByClassHorizontalSelectorTypes");
+/**
+ * Populates `sectionHeaderBalancesSlice`, and per-account `accountReportData`, so the
+ * web layer only maps selector output to tree nodes.
+ */
+function enrichProfitAndLossByClassHorizontalReport(report) {
+    if (report.fetchState !== 'Completed' || report.selectedPeriod == null) {
+        return;
+    }
+    for (const section of Object.values(report.sections)) {
+        if (section != null) {
+            enrichHorizontalSection(report, section);
+        }
+    }
+    for (const calc of Object.values(report.calculatedSections)) {
+        if (calc != null) {
+            enrichHorizontalCalculatedSection(report, calc);
+        }
+    }
+}
+function enrichHorizontalSection(report, section) {
+    const classAmounts = report.classColumns.map((col) => {
+        const total = section.classTotals.find((ct) => ct.classId === col.classId);
+        return total?.balance.amount ?? 0;
+    });
+    section.sectionHeaderBalancesSlice = buildHorizontalClassColumnBalancesSlice(report, classAmounts, section.sectionTotal.amount);
+    const childrenRowIndicesByParent = buildHorizontalAccountChildIndicesByParent(section.accounts);
+    const childrenRecord = {};
+    childrenRowIndicesByParent.forEach((childIndices, parentIndex) => {
+        childrenRecord[parentIndex] = childIndices;
+    });
+    section.treeLayout = {
+        rootAccountRowIndices: section.accounts
+            .map((_, i) => findHorizontalAccountParentIndex(section.accounts, 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;
+        });
+        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),
+        };
+    }
+}
+function enrichHorizontalCalculatedSection(report, calcSection) {
+    const classAmounts = report.classColumns.map((col) => {
+        const total = calcSection.classTotals.find((ct) => ct.classId === col.classId);
+        return total?.balance.amount ?? 0;
+    });
+    calcSection.sectionHeaderBalancesSlice =
+        buildHorizontalClassColumnBalancesSlice(report, classAmounts, calcSection.sectionTotal.amount);
+}
+function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmount) {
+    const fallback = currencyHelper_1.defaultCustomerCurrency;
+    const firstHeader = report.headerBalances[0];
+    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: [],
+        },
+    };
+    if (report.selectedPeriod == null) {
+        return emptySlice;
+    }
+    const { startDate, endDate } = report.selectedPeriod;
+    const balances = report.classColumns.map((col, i) => ({
+        balance: {
+            amount: classAmounts[i] ?? 0,
+            currencyCode,
+            currencySymbol,
+        },
+        balanceTimeFrame: timeframe,
+        startDate,
+        endDate,
+        type: 'default',
+        id: col.classId,
+        label: col.className,
+    }));
+    balances.push({
+        balance: {
+            amount: totalAmount,
+            currencyCode,
+            currencySymbol,
+        },
+        balanceTimeFrame: timeframe,
+        startDate,
+        endDate,
+        type: 'default',
+        id: profitAndLossClassesByClassHorizontalSelectorTypes_1.HORIZONTAL_CLASS_TOTAL_BALANCE_ID,
+        label: 'Total',
+    });
+    return {
+        balances,
+        additionalBalances: [],
+        filter: {
+            firstMonthOfFY: report.firstMonthOfFY,
+            timeframe,
+            balancesRange: {
+                numberOfPeriods: balances.length,
+                orderBy: 'ascending_date',
+            },
+            additionalBalances: [],
+        },
+    };
+}
+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;
+            }
+            return -1;
+        }
+    }
+    return -1;
+}
+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);
+        }
+    }
+    return siblings;
+}
+function horizontalAccountHasChildRows(dfsOrderedAccountRows, parentRowIndex) {
+    return dfsOrderedAccountRows.some((_, rowIndex) => findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex) ===
+        parentRowIndex);
+}
+function buildHorizontalSubAccountAncestorMetadata(dfsOrderedAccountRows, currentRowIndex) {
+    const ancestorRowIndicesRootToLeaf = [];
+    let walkRowIndex = currentRowIndex;
+    while (walkRowIndex >= 0) {
+        ancestorRowIndicesRootToLeaf.unshift(walkRowIndex);
+        walkRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, walkRowIndex);
+    }
+    return ancestorRowIndicesRootToLeaf.map((rowIndex) => {
+        const siblingIndices = getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, rowIndex);
+        return {
+            depth: dfsOrderedAccountRows[rowIndex].depth - 2,
+            hasSibling: siblingIndices.length > 1,
+            hasChildren: horizontalAccountHasChildRows(dfsOrderedAccountRows, rowIndex),
+            isLastNode: rowIndex === siblingIndices[siblingIndices.length - 1],
+            name: dfsOrderedAccountRows[rowIndex].accountName,
+        };
+    });
+}
+function buildHorizontalAccountChildIndicesByParent(dfsOrderedAccountRows) {
+    const childIndicesByParentRowIndex = new Map();
+    for (let rowIndex = 0; rowIndex < dfsOrderedAccountRows.length; rowIndex++) {
+        const parentRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex);
+        if (parentRowIndex >= 0) {
+            let childRowIndices = childIndicesByParentRowIndex.get(parentRowIndex);
+            if (childRowIndices === undefined) {
+                childRowIndices = [];
+                childIndicesByParentRowIndex.set(parentRowIndex, childRowIndices);
+            }
+            childRowIndices.push(rowIndex);
+        }
+    }
+    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/reportUIOptions/updateReportUIOptionCOABalancesRangeEpic.js

@@ -11,9 +11,13 @@ const opExReducer_1 = require("../opEx/opExReducer");
 const revenueReducer_1 = require("../revenue/revenueReducer");
 const reportUIOptionsReducer_1 = require("./reportUIOptionsReducer");
 const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(reportUIOptionsReducer_1.updateReportUIOptionCOABalancesRange.match), (0, operators_1.switchMap)((action) => {
-    const thisPeriod = action.payload.selectedCOABalancesRange.thisPeriod;
-    const orderBy = action.payload.selectedCOABalancesRange.orderBy;
-    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true ? 4 : 1;
+    const selectedRange = action.payload.selectedCOABalancesRange;
+    const thisPeriod = selectedRange.thisPeriod;
+    const orderBy = selectedRange.orderBy;
+    const numberOfPeriodsFromSelection = selectedRange.numberOfPeriods;
+    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true
+        ? numberOfPeriodsFromSelection
+        : 1;
     const highlightedCOABalancesRange = action.payload.highlightedCOABalancesRange == null && thisPeriod != null
         ? {
             numberOfPeriods: highlightedNoOfPeriods,
@@ -65,9 +69,7 @@ const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.
         thisPeriod: action.payload.highlightedCOABalancesRange != null
             ? action.payload.highlightedCOABalancesRange.thisPeriod
             : thisPeriod,
-        numberOfPeriods: state$.value.reportUIOptionsState.isCompareModeOn === true
-            ? 4
-            : financeStatementReducer_1.initialFinanceStatementState.maxNumOfPeriodsToHighlight,
+        numberOfPeriods: numberOfPeriodsFromSelection,
         orderBy,
     }));
 }));

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 = [
@@ -116,7 +116,7 @@ exports.allTaskPriority = [
     },
     {
         code: 'medium',
-        name: 'Normal',
+        name: 'Medium',
     },
     {
         code: 'low',

package/lib/view/taskManager/taskListView/epics/bulkUpdateTaskListEpic.d.ts

@@ -16,6 +16,7 @@ interface UpdateTaskPayload {
     description: string;
     due_date: string | null;
     file_ids: ID[];
+    group_assignees: string[];
     name: string;
     priority: string;
     recurring_end_date: string | null;

package/lib/view/taskManager/taskListView/epics/bulkUpdateTaskListEpic.js

@@ -79,6 +79,7 @@ const toTaskPayload = (state, task) => {
         name: task.name,
         assignees: task.assignees,
         description: task.description,
+        group_assignees: task.groupAssignees,
         due_date: task.dueDate != null ? task.dueDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT) : null,
         priority: task.priority.code,
         status: task.status.code,

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

@@ -8,6 +8,7 @@ import { UserState } from '../../../entity/user/userState';
 import { UserRoleState } from '../../../entity/userRole/userRoleState';
 import { RootState } from '../../../reducer';
 import { UserAndRole } from '../../companyView/types/userAndRole';
+import { UserGroupListSelectorView } from '../../userGroupListView/userGroupListViewSelector';
 import { UserListSelectorView } from '../../userListView/userListViewSelector';
 import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
@@ -30,6 +31,7 @@ export interface TaskListSelectorView extends SelectorView {
     taskGroupUpdateStatus: FetchStateAndError;
     uiState: TaskListUIState;
     updateTasksFetchState: FetchStateAndError;
+    userGroupList: UserGroupListSelectorView;
     userList: UserListSelectorView;
 }
 export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {

package/lib/view/taskManager/taskListView/taskListSelector.js

@@ -17,6 +17,7 @@ const taskGroupTemplateSelector_1 = require("../../../entity/taskGroupTemplate/t
 const userSelector_1 = require("../../../entity/user/userSelector");
 const userAndRole_1 = require("../../companyView/types/userAndRole");
 const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
+const userGroupListViewSelector_1 = require("../../userGroupListView/userGroupListViewSelector");
 const userListViewSelector_1 = require("../../userListView/userListViewSelector");
 const taskDetailSelector_1 = require("../taskDetailView/taskDetailSelector");
 const taskList_1 = require("./taskList");
@@ -316,7 +317,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         tagState,
     });
 };
-exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, isTaskTemplatesEnabled) => {
+exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (state) => state.userGroupsState, (state) => state.userGroupListViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, userGroupsState, userGroupListViewState, isTaskTemplatesEnabled) => {
     const { localData } = taskListState;
     const taskGroupsWithTasksList = getTaskGroupsWithTaskList({
         taskListState,
@@ -344,6 +345,7 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
         taskGroupTemplates,
         fetchState: fetchState,
         userList: (0, userListViewSelector_1.getUserList)(userState, userRoleState, userListViewState, 'taskManagerCandidate'),
+        userGroupList: (0, userGroupListViewSelector_1.getUserGroupList)(userGroupsState, userGroupListViewState, 'taskManagerCandidate'),
         error: error,
         version: 0,
         taskGroupsWithTasksList,