@zeniai/client-epic-state 4.19.90-beta3ND → 4.19.90-betaML1

package/lib/entity/reimbursement/reimbursementPayload.d.ts

@@ -1,7 +1,6 @@
 import { URLPayload } from '../../commonPayloadTypes/urlPayload';
 import { SegregatedReimbursementLineWithRecommendation } from '../../view/spendManagement/reimbursement/editRemiView/editRemiViewState';
 import { AccountBasePayload } from '../account/accountPayload';
-import { CustomerBasePayload } from '../customer/customerPayload';
 import { BillAccountPayload, BillPaymentMethodPayload, BillPaymentStatusPayload, BillStagePayload, BillStatusPayload, BulkOperationDetailPayload, DeletionInfoPayload } from '../billPay/billTransaction/billTransactionPayload';
 import { ClassBasePayload } from '../class/classPayload';
 import { MerchantBasePayload } from '../merchant/merchantPayload';
@@ -69,7 +68,6 @@ interface ReimbursementTypePayload {
 export interface LineDetailPayload {
     class: ClassBasePayload;
     account?: AccountBasePayload;
-    customer?: CustomerBasePayload;
 }
 interface ReimbursementInfoPayload {
     actual_deposit_date: string | null;

package/lib/entity/reimbursement/reimbursementPayload.js

@@ -6,7 +6,6 @@ const amount_1 = require("../../commonStateTypes/amount");
 const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const accountPayload_1 = require("../account/accountPayload");
-const customerPayload_1 = require("../customer/customerPayload");
 const billTransactionPayload_1 = require("../billPay/billTransaction/billTransactionPayload");
 const classPayload_1 = require("../class/classPayload");
 const merchantPayload_1 = require("../merchant/merchantPayload");
@@ -172,9 +171,6 @@ const toLineDetailPayload = (lineDetail) => ({
     account: lineDetail.account != null
         ? (0, accountPayload_1.toAccountPayload)(lineDetail.account)
         : undefined,
-    customer: lineDetail.customer != null
-        ? (0, customerPayload_1.toCustomerBasePayload)(undefined, lineDetail.customer)
-        : undefined,
 });
 exports.toLineDetailPayload = toLineDetailPayload;
 const toLineDetail = (payload) => ({
@@ -184,9 +180,6 @@ const toLineDetail = (payload) => ({
     account: payload.account?.account_id != null
         ? (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(payload.account)
         : undefined,
-    customer: payload.customer?.customer_id != null
-        ? (0, customerPayload_1.toCustomerBase)(payload.customer, false)
-        : undefined,
 });
 const toDistanceMilage = (payload) => ({
     unit: payload.unit,

package/lib/entity/reimbursement/reimbursementState.d.ts

@@ -6,7 +6,6 @@ import { ZeniUrl as Url } from '../../zeniUrl';
 import { AccountBase } from '../account/accountState';
 import { BillPaymentStatus, BillStage, BillStatus, BulkProcessingDetail, DeletionInfo } from '../billPay/billTransaction/billTransactionState';
 import { ClassBase } from '../class/classState';
-import { CustomerBase } from '../customer/customerState';
 import { MerchantBase } from '../merchant/merchant';
 import { Attachment } from '../transaction/stateTypes/attachment';
 import { ReimbursementTransactionType } from './reimbursementPayload';
@@ -59,7 +58,6 @@ export interface DistanceMilage {
 export interface LineDetail {
     account?: AccountBase;
     class?: ClassBase;
-    customer?: CustomerBase;
 }
 export interface ReimbursementInfo {
     billPaymentMethodType: RemiPaymentMethod;

package/lib/entity/transaction/payloadTypes/transactionPayload.d.ts

@@ -33,6 +33,9 @@ export interface TransactionPayload extends TransactionIDPayload, AccountBasePay
     recipient_total_amount?: number;
     recommendations?: RecommendationPayload[];
     sync_token?: string;
+    target_account_id?: string | null;
+    target_account_integration_id?: string | null;
+    target_account_name?: string | null;
     total_amount?: number;
     transaction_type_name?: string;
     transaction_update_time?: string;

package/lib/entity/transaction/payloadTypes/transactionPayload.js

@@ -65,6 +65,17 @@ const toTransaction = (payload) => {
         ...(payload.customer_name !== null && payload.customer_name !== ''
             ? { customerName: payload.customer_name }
             : {}),
+        ...(payload.target_account_id !== null && payload.target_account_id !== ''
+            ? { targetAccountId: payload.target_account_id }
+            : {}),
+        ...(payload.target_account_integration_id !== null &&
+            payload.target_account_integration_id !== ''
+            ? { targetAccountIntegrationId: payload.target_account_integration_id }
+            : {}),
+        ...(payload.target_account_name !== null &&
+            payload.target_account_name !== ''
+            ? { targetAccountName: payload.target_account_name }
+            : {}),
         linkedTransactions: payload.linked_transactions?.map((transactionIDPayload) => (0, transactionIDPayload_1.toTransactionID)(transactionIDPayload)),
         lines: payload?.lines?.map((linePayload) => (0, transactionLinePayload_1.toLine)(linePayload, amount, recipientAmount)),
         account: payloadHasAccountInfo(payload)

package/lib/entity/transaction/stateTypes/transaction.d.ts

@@ -40,6 +40,9 @@ export interface Transaction extends BaseTransaction {
     qboId?: string;
     recommendations?: RecommendationByLineId;
     syncToken?: string;
+    targetAccountId?: ID;
+    targetAccountIntegrationId?: string;
+    targetAccountName?: string;
     updateTime?: ZeniDate;
     vendorId?: ID;
     vendorName?: string;

package/lib/esm/entity/reimbursement/reimbursementPayload.js

@@ -3,7 +3,6 @@ import { toAmount } from '../../commonStateTypes/amount';
 import { stringToUnion } from '../../commonStateTypes/stringToUnion';
 import { date, dateNow } from '../../zeniDayJS';
 import { mapAccountBasePayloadToAccountBase, toAccountPayload, } from '../account/accountPayload';
-import { toCustomerBase, toCustomerBasePayload, } from '../customer/customerPayload';
 import { toBillPaymentMethod, toBillPaymentStatus, toBillStage, toBillStatus, toBulkProcessingDetail, toDeletionInfo, } from '../billPay/billTransaction/billTransactionPayload';
 import { mapClassBasePayloadToClassBase, toClassBasePayload, } from '../class/classPayload';
 import { mapMerchantBasePayloadToMerchantBase, toMerchantBasePayload, } from '../merchant/merchantPayload';
@@ -167,9 +166,6 @@ export const toLineDetailPayload = (lineDetail) => ({
     account: lineDetail.account != null
         ? toAccountPayload(lineDetail.account)
         : undefined,
-    customer: lineDetail.customer != null
-        ? toCustomerBasePayload(undefined, lineDetail.customer)
-        : undefined,
 });
 const toLineDetail = (payload) => ({
     class: payload.class.accounting_class_id != null
@@ -178,9 +174,6 @@ const toLineDetail = (payload) => ({
     account: payload.account?.account_id != null
         ? mapAccountBasePayloadToAccountBase(payload.account)
         : undefined,
-    customer: payload.customer?.customer_id != null
-        ? toCustomerBase(payload.customer, false)
-        : undefined,
 });
 const toDistanceMilage = (payload) => ({
     unit: payload.unit,

package/lib/esm/entity/transaction/payloadTypes/transactionPayload.js

@@ -61,6 +61,17 @@ export const toTransaction = (payload) => {
         ...(payload.customer_name !== null && payload.customer_name !== ''
             ? { customerName: payload.customer_name }
             : {}),
+        ...(payload.target_account_id !== null && payload.target_account_id !== ''
+            ? { targetAccountId: payload.target_account_id }
+            : {}),
+        ...(payload.target_account_integration_id !== null &&
+            payload.target_account_integration_id !== ''
+            ? { targetAccountIntegrationId: payload.target_account_integration_id }
+            : {}),
+        ...(payload.target_account_name !== null &&
+            payload.target_account_name !== ''
+            ? { targetAccountName: payload.target_account_name }
+            : {}),
         linkedTransactions: payload.linked_transactions?.map((transactionIDPayload) => toTransactionID(transactionIDPayload)),
         lines: payload?.lines?.map((linePayload) => toLine(linePayload, amount, recipientAmount)),
         account: payloadHasAccountInfo(payload)

package/lib/esm/index.js

@@ -217,8 +217,7 @@ import { changeZeniPersonRoles, deletePerson, fetchAllPeopleRequiredViews, fetch
 import { getPeople, getPeopleLocalData } from './view/people/peopleSelector';
 import { fetchProfitAndLoss, fetchProfitAndLossForTimeframe, resetProfitAndLossNodeCollapseState, updateProfitAndLossUIState, } from './view/profitAndLoss/profitAndLossReducer';
 import { getPandLReportFetchState, getProfitAndLossReport, } from './view/profitAndLoss/profitAndLossSelector';
-import { fetchProfitAndLossClassesView, resetProfitAndLossClassesNodeCollapseState, updateAccountViewMode as updateProfitAndLossAccountViewMode, updateClassesToFilterOut as updateProfitAndLossClassesToFilterOut, updateClassViewLayout, updateProfitAndLossClassesViewUIState, } from './view/profitAndLossClassesView/profitAndLossClassesViewReducer';
-import { getProfitAndLossClassesHorizontalView } from './view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
+import { fetchProfitAndLossClassesView, resetProfitAndLossClassesNodeCollapseState, updateAccountViewMode as updateProfitAndLossAccountViewMode, updateClassesToFilterOut as updateProfitAndLossClassesToFilterOut, updateProfitAndLossClassesViewUIState, } from './view/profitAndLossClassesView/profitAndLossClassesViewReducer';
 import { getProfitAndLossClassesView } from './view/profitAndLossClassesView/profitAndLossClassesViewSelector';
 import { isPandLReportViewCalculatedSectionID, isPandLReportViewSectionID, } from './view/profitAndLossClassesView/profitAndLossClassesViewSelectorTypes';
 import { fetchEntityRecommendationsByTransactionId, fetchRecommendationByEntityId, fetchRecommendationByEntityName, } from './view/recommendation/recommendationReducer';
@@ -452,7 +451,7 @@ export { fetchDashboard, getDashboard, updateTreasuryVideoClosed, };
 export { updateDashboardLayout };
 export { getPandLWithForecast, } from './view/profitAndLoss/pAndLWithForecast/pAndLWithForecastSelector';
 export { fetchProfitAndLoss, resetProfitAndLossNodeCollapseState, updateProfitAndLossUIState, getProfitAndLossReport, getPandLReportFetchState, fetchProfitAndLossForTimeframe, };
-export { fetchProfitAndLossClassesView, updateProfitAndLossClassesToFilterOut, resetProfitAndLossClassesNodeCollapseState, updateProfitAndLossClassesViewUIState, updateProfitAndLossAccountViewMode, updateClassViewLayout, getProfitAndLossClassesView, getProfitAndLossClassesHorizontalView, isPandLReportViewCalculatedSectionID, isPandLReportViewSectionID, };
+export { fetchProfitAndLossClassesView, updateProfitAndLossClassesToFilterOut, resetProfitAndLossClassesNodeCollapseState, updateProfitAndLossClassesViewUIState, updateProfitAndLossAccountViewMode, getProfitAndLossClassesView, isPandLReportViewCalculatedSectionID, isPandLReportViewSectionID, };
 export { getAccountingProviderAttachment };
 export { fetchUserListByType, getUserList };
 export { fetchAllPeopleRequiredViews, fetchPeoplePage, fetchPeople, deletePerson, resendInvite, changeZeniPersonRoles, invitePeople, inviteZeniPeople, updatePeopleUIState, peopleSaveUpdates, resetUpdateErrorMessage, peopleSaveDataInLocalStore, peopleClearDataInLocalStore, getPeople, getPeopleLocalData, initializeEditPerson, };

package/lib/esm/view/financeStatement/financeStatementReducer.js

@@ -44,20 +44,19 @@ const financeStatement = createSlice({
         updateFinanceStatementThisPeriod(draft, action) {
             const { firstMonthOfFY, coaBalances, maxNumOfPeriodsToHighlight } = action.payload;
             const { timeframe, selectedCOABalancesRange } = draft;
-            const safeCoaBalances = coaBalances ?? [];
-            if (safeCoaBalances.length > 0) {
-                const prevThisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
+            if (coaBalances.length > 0) {
+                const prevThisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (prevThisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
                         thisPeriod: prevThisPeriod,
                     };
-                    const newThisPeriod = getMatchingThisPeriod(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, safeCoaBalances);
+                    const newThisPeriod = getMatchingThisPeriod(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, coaBalances);
                     if (newThisPeriod != null) {
                         const selectionRanges = getSelectedAndHighlightedRangesForThisPeriod({
                             firstMonthOfFY,
                             thisPeriod: newThisPeriod,
-                            coaBalances: safeCoaBalances,
+                            coaBalances,
                             timeframe,
                             maxNumOfPeriodsToSelect: maxNumOfPeriodsToHighlight,
                             currentSelection: {
@@ -76,9 +75,7 @@ const financeStatement = createSlice({
             draft.selectedReportId = action.payload;
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
-            const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
-            const safeCoaBalances = coaBalances ?? [];
-            const additionalBalances = additionalBalancesPayload ?? [];
+            const { firstMonthOfFY, additionalBalances, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||
                 additionalBalances.includes('this_period_vs_last_period_percent')) {
@@ -94,8 +91,8 @@ const financeStatement = createSlice({
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
             const { timeframe, selectedCOABalancesRange } = draft;
-            if (safeCoaBalances.length > 0) {
-                const thisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
+            if (coaBalances.length > 0) {
+                const thisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
@@ -104,7 +101,7 @@ const financeStatement = createSlice({
                     const selectionRanges = getSelectedAndHighlightedRangesForThisPeriod({
                         firstMonthOfFY,
                         thisPeriod: thisPeriod,
-                        coaBalances: safeCoaBalances,
+                        coaBalances,
                         timeframe,
                         maxNumOfPeriodsToHighlight: maxNumOfPeriodsToHighlight,
                         currentSelection: {

package/lib/esm/view/financeStatement/financeStatementSelector.js

@@ -8,7 +8,6 @@ import { extractThisPeriod } from '../../commonStateTypes/viewAndReport/thisPeri
 import { getBalanceSheet } from '../balanceSheet/balanceSheetSelector';
 import { getCashFlow } from '../cashFlow/cashFlowSelector';
 import { getProfitAndLossReport, } from '../profitAndLoss/profitAndLossSelector';
-import { getProfitAndLossClassesHorizontalView } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
 import { getProfitAndLossClassesView } from '../profitAndLossClassesView/profitAndLossClassesViewSelector';
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
@@ -43,15 +42,11 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
     if (dataAvailable != null) {
         const noFilter = newBalancesFilterForDateRange(firstMonthOfFY, financeStatementState.timeframe, dataAvailable, 'ascending_date', []);
         const profitAndLossForTimeframeTicks = getProfitAndLossReport(noFilter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
-        const expensesSection = profitAndLossForTimeframeTicks.sections.expenses;
-        const incomeSection = profitAndLossForTimeframeTicks.sections.income;
-        const expensesBalances = expensesSection?.balances;
-        const incomeBalances = incomeSection?.balances;
-        if (expensesSection != null) {
+        if (profitAndLossForTimeframeTicks.sections.expenses != null) {
             balancesInTimeframe =
-                (expensesBalances?.length ?? 0) > 0
-                    ? expensesBalances ?? []
-                    : incomeBalances ?? [];
+                profitAndLossForTimeframeTicks.sections.expenses.balances.length > 0
+                    ? profitAndLossForTimeframeTicks.sections['expenses'].balances
+                    : profitAndLossForTimeframeTicks.sections['income'].balances;
             allTimeframeTicks = balancesInTimeframe.map((balance) => toTimeframeTick(balance));
         }
     }
@@ -65,9 +60,6 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
     const profitAndLossReport = getProfitAndLossReport(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = newBalancesFilterClassesView(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = getProfitAndLossClassesView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
-    const profitAndLossByClassHorizontalReport = profitAndLossClassesViewState.uiState.classViewLayout === 'horizontal'
-        ? getProfitAndLossClassesHorizontalView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, thisPeriod)
-        : getProfitAndLossClassesHorizontalView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, undefined);
     const balanceSheetReport = getBalanceSheet(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = getCashFlow(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
@@ -115,7 +107,6 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
         dataAvailable,
         profitAndLossReport,
         profitAndLossByClassReport,
-        profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         cashFlowReport,
         filter,

package/lib/esm/view/profitAndLossClassesView/profitAndLossClassesViewReducer.js

@@ -23,7 +23,6 @@ export const initialState = {
         nodeCollapseState: {},
         scrollPosition: undefined,
         accountViewMode: 'account_group',
-        classViewLayout: 'vertical',
         classesToFilterOut: [],
     },
     firstMonthOfFY: 1,
@@ -95,9 +94,6 @@ const profitAndLossClassesView = createSlice({
         updateAccountViewMode(draft, action) {
             draft.uiState.accountViewMode = action.payload.viewMode;
         },
-        updateClassViewLayout(draft, action) {
-            draft.uiState.classViewLayout = action.payload.classViewLayout;
-        },
         resetProfitAndLossClassesNodeCollapseState(draft) {
             draft.uiState.nodeCollapseState = {};
         },
@@ -106,7 +102,7 @@ const profitAndLossClassesView = createSlice({
         },
     },
 });
-export const { fetchProfitAndLossClassesView, fetchProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesViewFailure, updateClassesToFilterOut, updateProfitAndLossClassesViewUIState, updateAccountViewMode, updateClassViewLayout, resetProfitAndLossClassesNodeCollapseState, clearProfitAndLossClassesView, } = profitAndLossClassesView.actions;
+export const { fetchProfitAndLossClassesView, fetchProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesViewFailure, updateClassesToFilterOut, updateProfitAndLossClassesViewUIState, updateAccountViewMode, resetProfitAndLossClassesNodeCollapseState, clearProfitAndLossClassesView, } = profitAndLossClassesView.actions;
 export default profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = mapReportPayloadV2ToReportV2(pandLReport.report);

package/lib/esm/view/reportUIOptions/updateReportUIOptionCOABalancesRangeEpic.js

@@ -2,13 +2,14 @@ import { of } from 'rxjs';
 import { filter, switchMap } from 'rxjs/operators';
 import { updateCashInCashOutCOABalancesRange } from '../cashInCashOut/cashInCashOutReducer';
 import { updateCashPositionCOABalancesRange } from '../cashPosition/cashPositionReducer';
-import { updateCOABalancesRange } from '../financeStatement/financeStatementReducer';
+import { initialFinanceStatementState, updateCOABalancesRange, } from '../financeStatement/financeStatementReducer';
 import { updateNetBurnOrIncomeCOABalancesRange } from '../netBurnOrIncome/netBurnOrIncomeReducer';
 import { updateOpExCOABalancesRange } from '../opEx/opExReducer';
 import { updateRevenueCOABalancesRange } from '../revenue/revenueReducer';
 import { updateReportUIOptionCOABalancesRange } from './reportUIOptionsReducer';
 export const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.pipe(filter(updateReportUIOptionCOABalancesRange.match), switchMap((action) => {
-    const { thisPeriod, orderBy, numberOfPeriods: selectedNumberOfPeriods, } = action.payload.selectedCOABalancesRange;
+    const thisPeriod = action.payload.selectedCOABalancesRange.thisPeriod;
+    const orderBy = action.payload.selectedCOABalancesRange.orderBy;
     const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true ? 4 : 1;
     const highlightedCOABalancesRange = action.payload.highlightedCOABalancesRange == null && thisPeriod != null
         ? {
@@ -62,8 +63,8 @@ export const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => ac
             ? action.payload.highlightedCOABalancesRange.thisPeriod
             : thisPeriod,
         numberOfPeriods: state$.value.reportUIOptionsState.isCompareModeOn === true
-            ? Math.max(4, selectedNumberOfPeriods)
-            : selectedNumberOfPeriods,
+            ? 4
+            : initialFinanceStatementState.maxNumOfPeriodsToHighlight,
         orderBy,
     }));
 }));

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

@@ -416,6 +416,14 @@ export 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) {
@@ -518,6 +526,8 @@ export 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/esm/view/spendManagement/billPay/billList/billListState.js

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

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

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

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

@@ -219,6 +219,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/esm/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -45,6 +45,7 @@ export const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled
         return {
             ...reimbursement,
             submittedBy: getUserByUserId(userState, reimbursement.reimburseeUserId),
+            createdByUser: getUserByUserId(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -415,6 +416,14 @@ export 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) => {
@@ -422,6 +431,7 @@ export 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';
@@ -441,6 +451,8 @@ export 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/esm/view/spendManagement/reimbursement/remiListView/remiListState.js

@@ -55,6 +55,7 @@ export const toRemiSubTabUnderScoreType = (v) => stringToUnion(v, REMI_SUB_TAB_U
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
+    'createdBy',
     'type',
     'status',
     'amount',

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

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

package/lib/index.d.ts

@@ -346,12 +346,10 @@ import { PeopleViewSortKey } from './view/people/peopleTypes';
 import { fetchProfitAndLoss, fetchProfitAndLossForTimeframe, resetProfitAndLossNodeCollapseState, updateProfitAndLossUIState } from './view/profitAndLoss/profitAndLossReducer';
 import { ProfitAndLossReport, getPandLReportFetchState, getProfitAndLossReport } from './view/profitAndLoss/profitAndLossSelector';
 import { ProfitAndLossState, ProfitAndLossUIState } from './view/profitAndLoss/profitAndLossState';
-import { fetchProfitAndLossClassesView, resetProfitAndLossClassesNodeCollapseState, updateAccountViewMode as updateProfitAndLossAccountViewMode, updateClassesToFilterOut as updateProfitAndLossClassesToFilterOut, updateClassViewLayout, updateProfitAndLossClassesViewUIState } from './view/profitAndLossClassesView/profitAndLossClassesViewReducer';
-import { getProfitAndLossClassesHorizontalView } from './view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
-import { ClassColumnDefinition, HorizontalAccountRow, HorizontalCalculatedSection, HorizontalClassBalance, HorizontalSectionReport, ProfitAndLossByClassHorizontalReport } from './view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes';
+import { fetchProfitAndLossClassesView, resetProfitAndLossClassesNodeCollapseState, updateAccountViewMode as updateProfitAndLossAccountViewMode, updateClassesToFilterOut as updateProfitAndLossClassesToFilterOut, updateProfitAndLossClassesViewUIState } from './view/profitAndLossClassesView/profitAndLossClassesViewReducer';
 import { getProfitAndLossClassesView } from './view/profitAndLossClassesView/profitAndLossClassesViewSelector';
 import { PandLReportViewCalculatedSectionID, PandLReportViewSectionID, ProfitAndLossClassesViewReport, isPandLReportViewCalculatedSectionID, isPandLReportViewSectionID } from './view/profitAndLossClassesView/profitAndLossClassesViewSelectorTypes';
-import { ClassViewLayout, ProfitAndLossClassesViewUIState } from './view/profitAndLossClassesView/profitAndLossClassesViewState';
+import { ProfitAndLossClassesViewUIState } from './view/profitAndLossClassesView/profitAndLossClassesViewState';
 import { fetchEntityRecommendationsByTransactionId, fetchRecommendationByEntityId, fetchRecommendationByEntityName } from './view/recommendation/recommendationReducer';
 import { clearReferrals, fetchReferrals, fetchRewardsPlan, resendReferralInvite, saveReferralFormDataInLocalStore, sendReferralInvite, updateReferViewed, updateReferralListSortUiState } from './view/referralView/referralReducer';
 import { ReferralListSelectorView, RewardsPlanCardReport, getInviteFormView, getReferralListView, getRewardsPlanCard } from './view/referralView/referralSelector';
@@ -666,7 +664,7 @@ export { fetchDashboard, getDashboard, DashboardReport, updateTreasuryVideoClose
 export { updateDashboardLayout };
 export { PandLWithForecastView, getPandLWithForecast, } from './view/profitAndLoss/pAndLWithForecast/pAndLWithForecastSelector';
 export { fetchProfitAndLoss, resetProfitAndLossNodeCollapseState, updateProfitAndLossUIState, ProfitAndLossState, ProfitAndLossUIState, getProfitAndLossReport, ProfitAndLossReport, getPandLReportFetchState, fetchProfitAndLossForTimeframe, };
-export { fetchProfitAndLossClassesView, updateProfitAndLossClassesToFilterOut, resetProfitAndLossClassesNodeCollapseState, updateProfitAndLossClassesViewUIState, updateProfitAndLossAccountViewMode, updateClassViewLayout, ProfitAndLossClassesViewUIState, ProfitAndLossClassesViewReport, getProfitAndLossClassesView, getProfitAndLossClassesHorizontalView, PandLReportViewSectionID, PandLReportViewCalculatedSectionID, isPandLReportViewCalculatedSectionID, isPandLReportViewSectionID, ClassViewLayout, ProfitAndLossByClassHorizontalReport, ClassColumnDefinition, HorizontalAccountRow, HorizontalClassBalance, HorizontalSectionReport, HorizontalCalculatedSection, };
+export { fetchProfitAndLossClassesView, updateProfitAndLossClassesToFilterOut, resetProfitAndLossClassesNodeCollapseState, updateProfitAndLossClassesViewUIState, updateProfitAndLossAccountViewMode, ProfitAndLossClassesViewUIState, ProfitAndLossClassesViewReport, getProfitAndLossClassesView, PandLReportViewSectionID, PandLReportViewCalculatedSectionID, isPandLReportViewCalculatedSectionID, isPandLReportViewSectionID, };
 export { AccountingProviderAttachmentSelector, getAccountingProviderAttachment };
 export { fetchUserListByType, getUserList, UserListSelectorView };
 export { fetchAllPeopleRequiredViews, fetchPeoplePage, fetchPeople, deletePerson, resendInvite, changeZeniPersonRoles, invitePeople, inviteZeniPeople, updatePeopleUIState, peopleSaveUpdates, resetUpdateErrorMessage, peopleSaveDataInLocalStore, peopleClearDataInLocalStore, PeopleSelectorView, PeopleLocalDataView, Person, getPeople, getPeopleLocalData, PeopleState, PersonUpdateType, PeoplePageMode, ZeniPersonUserRoleType, PeopleUIState, PeopleLocalData, initializeEditPerson, };