@zeniai/client-epic-state 4.19.24-betaRR4 → 4.19.24-betaRR5

package/lib/entity/chargeCardRepayment/chargeCardRepayment.d.ts

@@ -22,6 +22,7 @@ export interface ChargeCardRepayment {
     updateTime: ZeniDate;
     zeniCreditAccountId: ID;
     isAutoPayEnabled?: boolean;
+    paymentAccountName?: string;
     providerCounterpartyAccountId?: ID;
     providerCounterpartyId?: ID;
     thirdPartyTransactionId?: string;

package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.d.ts

@@ -25,6 +25,7 @@ export interface ChargeCardRepaymentPayload {
     is_auto_pay_enabled?: boolean;
     is_deleted?: boolean;
     paid_by_user?: UserPayload | null;
+    payment_account_name?: string | null;
     provider_counterparty_account_id?: string | null;
     provider_counterparty_id?: string;
 }

package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.js

@@ -5,7 +5,7 @@ const amount_1 = require("../../commonStateTypes/amount");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const chargeCardRepayment_1 = require("./chargeCardRepayment");
 const mapChargeCardRepaymentPayloadToChargeCardRepayment = (payload) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     return ({
         amount: (0, amount_1.toAmount)(payload.amount, payload.currency_code, payload.currency_symbol),
         cardRepaymentId: payload.card_repayment_id,
@@ -16,7 +16,8 @@ const mapChargeCardRepaymentPayloadToChargeCardRepayment = (payload) => {
         isAutoPayEnabled: payload.is_auto_pay_enabled,
         paidById: payload.paid_by_user_id,
         paymentMethod: payload.payment_method,
-        providerCounterpartyId: (_b = payload.provider_counterparty_id) !== null && _b !== void 0 ? _b : undefined,
+        paymentAccountName: (_b = payload.payment_account_name) !== null && _b !== void 0 ? _b : undefined,
+        providerCounterpartyId: (_c = payload.provider_counterparty_id) !== null && _c !== void 0 ? _c : undefined,
         providerCreditAccountId: payload.provider_credit_account_id,
         providerDepositAccountId: payload.provider_deposit_account_id,
         providerId: payload.provider_id,
@@ -28,8 +29,8 @@ const mapChargeCardRepaymentPayloadToChargeCardRepayment = (payload) => {
         updateTime: (0, zeniDayJS_1.date)(payload.update_time),
         zeniCreditAccountId: payload.zeni_credit_account_id,
         repaymentType: (0, chargeCardRepayment_1.toChargeCardRepaymentType)(payload.repayment_type),
-        providerCounterpartyAccountId: (_c = payload.provider_counterparty_account_id) !== null && _c !== void 0 ? _c : undefined,
-        thirdPartyTransactionId: (_d = payload.third_party_transaction_id) !== null && _d !== void 0 ? _d : undefined,
+        providerCounterpartyAccountId: (_d = payload.provider_counterparty_account_id) !== null && _d !== void 0 ? _d : undefined,
+        thirdPartyTransactionId: (_e = payload.third_party_transaction_id) !== null && _e !== void 0 ? _e : undefined,
     });
 };
 exports.mapChargeCardRepaymentPayloadToChargeCardRepayment = mapChargeCardRepaymentPayloadToChargeCardRepayment;

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.d.ts

@@ -1,14 +1,8 @@
-import { ID } from '../../../../commonStateTypes/common';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
 import { RootState } from '../../../../reducer';
 import { ChargeCardRepaymentWithUser } from './chargeCardPaymentHistorySelector';
 export interface ChargeCardPaymentHistoryDownloadReport extends SelectorView {
-    accountInfoMap: Map<ID, {
-        depositAccountName?: string;
-    }>;
     reportTitle: string;
     transactions: ChargeCardRepaymentWithUser[];
 }
-export declare const getChargeCardPaymentHistoryDownloadReport: (state: RootState, accountInfoMap?: Map<ID, {
-    depositAccountName?: string;
-}>) => ChargeCardPaymentHistoryDownloadReport;
+export declare const getChargeCardPaymentHistoryDownloadReport: (state: RootState) => ChargeCardPaymentHistoryDownloadReport;

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.js

@@ -1,28 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChargeCardPaymentHistoryDownloadReport = void 0;
-const chargeCardPaymentHistorySelector_1 = require("./chargeCardPaymentHistorySelector");
-const getChargeCardPaymentHistoryDownloadReport = (state, accountInfoMap) => {
-    const view = (0, chargeCardPaymentHistorySelector_1.getChargeCardPaymentHistoryView)(state, accountInfoMap);
-    const reportAccountInfoMap = accountInfoMap !== null && accountInfoMap !== void 0 ? accountInfoMap : new Map();
-    if (accountInfoMap == null &&
-        view.repaymentHistoryFundingAccounts.length > 0) {
-        view.repaymentHistoryFundingAccounts.forEach((account) => {
-            var _a, _b;
-            const accountId = (_b = (_a = account.providerAccountId) !== null && _a !== void 0 ? _a : account.id) !== null && _b !== void 0 ? _b : account.zeniAccountId;
-            if (accountId != null) {
-                reportAccountInfoMap.set(accountId, {
-                    depositAccountName: account.label,
-                });
-            }
-        });
-    }
+const chargeCardRepaymentSelector_1 = require("../../../../entity/chargeCardRepayment/chargeCardRepaymentSelector");
+const userSelector_1 = require("../../../../entity/user/userSelector");
+const chargeCardPaymentHistoryHelpers_1 = require("./chargeCardPaymentHistoryHelpers");
+const getChargeCardPaymentHistoryDownloadReport = (state) => {
+    const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, } = state;
+    const { filters, repaymentHistoryIds, repaymentHistoryUserIds, searchText, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
+    const repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
+    const repaymentHistoryUsers = (0, userSelector_1.getUsersByUserIds)(userState, repaymentHistoryUserIds);
+    const userMap = new Map(repaymentHistoryUsers.map((user) => [user.userId, user]));
+    const repaymentHistoryWithUsers = repaymentHistory.map((repayment) => (Object.assign(Object.assign({}, repayment), { paidByUser: userMap.get(repayment.paidById) })));
+    const transactions = (0, chargeCardPaymentHistoryHelpers_1.applyPaymentHistoryFiltersSearchAndSort)(repaymentHistoryWithUsers, filters, searchText, uiState);
     return {
         reportTitle: 'Card Payment History',
-        fetchState: view.fetchState,
-        error: view.error,
-        transactions: view.repaymentHistory,
-        accountInfoMap: reportAccountInfoMap,
+        fetchState,
+        error,
+        transactions,
     };
 };
 exports.getChargeCardPaymentHistoryDownloadReport = getChargeCardPaymentHistoryDownloadReport;

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.d.ts

@@ -0,0 +1,9 @@
+import { ID } from '../../../../commonStateTypes/common';
+import type { ChargeCardRepaymentWithUser } from './chargeCardPaymentHistorySelector';
+import { PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
+export declare function getPaymentHistorySourceAccountName(repayment: ChargeCardRepaymentWithUser, accountInfoMap?: Map<ID, {
+    depositAccountName?: string;
+}>): string;
+export declare function applyPaymentHistoryFiltersSearchAndSort(repayments: ChargeCardRepaymentWithUser[], filters: PaymentHistoryFilters, searchText: string, uiState: PaymentHistoryUIState, accountInfoMap?: Map<ID, {
+    depositAccountName?: string;
+}>): ChargeCardRepaymentWithUser[];

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPaymentHistorySourceAccountName = getPaymentHistorySourceAccountName;
+exports.applyPaymentHistoryFiltersSearchAndSort = applyPaymentHistoryFiltersSearchAndSort;
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const userSelector_1 = require("../../../../entity/user/userSelector");
+const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
+function getPaymentHistorySourceAccountName(repayment, accountInfoMap) {
+    var _a, _b, _c;
+    return ((_c = (_b = (_a = accountInfoMap === null || accountInfoMap === void 0 ? void 0 : accountInfoMap.get(repayment.providerDepositAccountId)) === null || _a === void 0 ? void 0 : _a.depositAccountName) !== null && _b !== void 0 ? _b : repayment.paymentAccountName) !== null && _c !== void 0 ? _c : '');
+}
+function getPaymentHistorySortValue(repayment, sortKey, accountInfoMap) {
+    switch (sortKey) {
+        case 'paymentDate':
+            return repayment.repaymentDate.valueOf();
+        case 'amount':
+            return repayment.amount.amount;
+        case 'paymentStatus':
+            return repayment.status;
+        case 'initiatedBy':
+            return repayment.repaymentType === 'scheduled'
+                ? 'autopay'
+                : (0, userSelector_1.getUserName)(repayment.paidByUser);
+        case 'sourceAccount':
+            return getPaymentHistorySourceAccountName(repayment, accountInfoMap);
+        default:
+            return '';
+    }
+}
+function sortPaymentHistory(repayments, sortKey, sortOrder, accountInfoMap) {
+    const order = sortOrder === 'ascending' ? 'asc' : 'desc';
+    return (0, orderBy_1.default)(repayments, (repayment) => getPaymentHistorySortValue(repayment, sortKey, accountInfoMap), [order]);
+}
+function filterPaymentHistoryBySearchText(repayments, searchText, accountInfoMap) {
+    const loweredSearchText = searchText.trim().toLowerCase();
+    if (loweredSearchText.length === 0) {
+        return repayments;
+    }
+    return repayments.filter((repayment) => {
+        const amountString = repayment.amount.amount.toString();
+        const statusString = repayment.status.toLowerCase();
+        const initiatedByString = repayment.repaymentType === 'scheduled'
+            ? 'autopay'
+            : (0, userSelector_1.getUserName)(repayment.paidByUser);
+        const accountNameString = getPaymentHistorySourceAccountName(repayment, accountInfoMap).toLowerCase();
+        return (amountString.includes(loweredSearchText) ||
+            statusString.includes(loweredSearchText) ||
+            initiatedByString.toLowerCase().includes(loweredSearchText) ||
+            accountNameString.includes(loweredSearchText));
+    });
+}
+function applyPaymentHistoryFiltersSearchAndSort(repayments, filters, searchText, uiState, accountInfoMap) {
+    let result = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repayments, filters);
+    result = filterPaymentHistoryBySearchText(result, searchText, accountInfoMap);
+    result = sortPaymentHistory(result, uiState.sortKey, uiState.sortOrder, accountInfoMap);
+    return result;
+}

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.js

@@ -1,42 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChargeCardPaymentHistoryView = void 0;
-const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const chargeCardRepaymentSelector_1 = require("../../../../entity/chargeCardRepayment/chargeCardRepaymentSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
-const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
 const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
 const paymentAccountListSelector_1 = require("../../zeniAccounts/paymentAccountList/paymentAccountListSelector");
-const getPaymentHistorySortValue = (repayment, sortKey, accountInfoMap) => {
-    var _a;
-    switch (sortKey) {
-        case 'paymentDate':
-            return repayment.repaymentDate.valueOf();
-        case 'amount':
-            return repayment.amount.amount;
-        case 'paymentStatus':
-            return repayment.status;
-        case 'initiatedBy':
-            return repayment.repaymentType === 'scheduled'
-                ? 'autopay'
-                : (0, userSelector_1.getUserName)(repayment.paidByUser);
-        case 'sourceAccount': {
-            const accountInfo = accountInfoMap === null || accountInfoMap === void 0 ? void 0 : accountInfoMap.get(repayment.providerDepositAccountId);
-            return (_a = accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.depositAccountName) !== null && _a !== void 0 ? _a : '';
-        }
-        default:
-            return '';
-    }
-};
-const sortPaymentHistory = (repayments, sortKey, sortOrder, accountInfoMap) => {
-    const order = sortOrder === 'ascending' ? 'asc' : 'desc';
-    return (0, orderBy_1.default)(repayments, (repayment) => getPaymentHistorySortValue(repayment, sortKey, accountInfoMap), [order]);
-};
+const chargeCardPaymentHistoryHelpers_1 = require("./chargeCardPaymentHistoryHelpers");
 const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
     const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, } = state;
     const { creditAccountId, currencyCode, currencySymbol, filters, isAutoPayEnabled, repaymentHistoryIds, repaymentHistoryUserIds, searchText, totalRepayments, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
@@ -51,28 +22,7 @@ const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
     });
     // Enrich repayments with paidByUser details
     let repaymentHistoryWithUsers = repaymentHistory.map((repayment) => (Object.assign(Object.assign({}, repayment), { paidByUser: userMap.get(repayment.paidById) })));
-    // Apply filters
-    repaymentHistoryWithUsers = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repaymentHistoryWithUsers, filters);
-    // Apply search text filtering
-    const loweredSearchText = searchText.trim().toLowerCase();
-    if (loweredSearchText.length > 0) {
-        repaymentHistoryWithUsers = repaymentHistoryWithUsers.filter((repayment) => {
-            var _a, _b;
-            const amountString = repayment.amount.amount.toString();
-            const statusString = repayment.status.toLowerCase();
-            const initiatedByString = repayment.repaymentType === 'scheduled'
-                ? 'autopay'
-                : (0, userSelector_1.getUserName)(repayment.paidByUser);
-            const accountInfo = accountInfoMap === null || accountInfoMap === void 0 ? void 0 : accountInfoMap.get(repayment.providerDepositAccountId);
-            const accountNameString = (_b = (_a = accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.depositAccountName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
-            return (amountString.includes(loweredSearchText) ||
-                statusString.includes(loweredSearchText) ||
-                initiatedByString.toLowerCase().includes(loweredSearchText) ||
-                accountNameString.includes(loweredSearchText));
-        });
-    }
-    // Apply sorting
-    repaymentHistoryWithUsers = sortPaymentHistory(repaymentHistoryWithUsers, uiState.sortKey, uiState.sortOrder, accountInfoMap);
+    repaymentHistoryWithUsers = (0, chargeCardPaymentHistoryHelpers_1.applyPaymentHistoryFiltersSearchAndSort)(repaymentHistoryWithUsers, filters, searchText, uiState, accountInfoMap);
     // Extract unique funding account IDs from repayment history
     const repaymentHistoryFundingAccountIds = Array.from(new Set(repaymentHistoryWithUsers
         .map((repayment) => repayment.providerDepositAccountId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.24-betaRR4",
+  "version": "4.19.24-betaRR5",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",