@zeniai/client-epic-state 4.19.8-betaRR3 → 4.19.8-betaRR5

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

@@ -3,14 +3,19 @@ import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAnd
 import { ChargeCardRepayment } from '../../../../entity/chargeCardRepayment/chargeCardRepayment';
 import { User } from '../../../../entity/user/userState';
 import { RootState } from '../../../../reducer';
+import { FundingAccount } from '../../commonSetup/setupViewSelector';
 import { PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
+export interface ChargeCardRepaymentWithUser extends ChargeCardRepayment {
+    paidByUser?: User;
+}
 export interface ChargeCardPaymentHistorySelectorView extends SelectorView {
     creditAccountId: ID;
     currencyCode: string;
     currencySymbol: string;
     filters: PaymentHistoryFilters;
     isAutoPayEnabled: boolean;
-    repaymentHistory: ChargeCardRepayment[];
+    repaymentHistory: ChargeCardRepaymentWithUser[];
+    repaymentHistoryFundingAccounts: FundingAccount[];
     repaymentHistoryIds: ID[];
     repaymentHistoryUsers: User[];
     searchText: string;

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

@@ -5,9 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (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) {
@@ -32,45 +36,81 @@ const sortPaymentHistory = (repayments, sortKey, sortOrder, accountInfoMap) => {
     return (0, orderBy_1.default)(repayments, (repayment) => getPaymentHistorySortValue(repayment, sortKey, accountInfoMap), [order]);
 };
 const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
-    const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState } = state;
+    const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, } = state;
     const { creditAccountId, currencyCode, currencySymbol, filters, isAutoPayEnabled, repaymentHistoryIds, repaymentHistoryUserIds, searchText, totalRepayments, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
     // Get the full repayment details from the entity state
-    let repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
+    const repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
+    // Get users first to enrich repayments
+    const repaymentHistoryUsers = (0, userSelector_1.getUsersByUserIds)(userState, repaymentHistoryUserIds);
+    // Create a map of userId -> User for quick lookup
+    const userMap = new Map();
+    repaymentHistoryUsers.forEach((user) => {
+        userMap.set(user.userId, user);
+    });
+    // Enrich repayments with paidByUser details
+    let repaymentHistoryWithUsers = repaymentHistory.map((repayment) => (Object.assign(Object.assign({}, repayment), { paidByUser: userMap.get(repayment.paidById) })));
     // Apply filters
-    repaymentHistory = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repaymentHistory, 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) {
-        repaymentHistory = repaymentHistory.filter((repayment) => {
+        repaymentHistoryWithUsers = repaymentHistoryWithUsers.filter((repayment) => {
             var _a, _b;
             const amountString = repayment.amount.amount.toString();
             const statusString = repayment.status.toLowerCase();
-            const initiatedByString = repayment.isAutoPayEnabled === true ? 'autopay' : 'manual';
+            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.includes(loweredSearchText) ||
+                initiatedByString.toLowerCase().includes(loweredSearchText) ||
                 accountNameString.includes(loweredSearchText));
         });
     }
     // Apply sorting
-    repaymentHistory = sortPaymentHistory(repaymentHistory, uiState.sortKey, uiState.sortOrder, accountInfoMap);
-    const repaymentHistoryUsers = (0, userSelector_1.getUsersByUserIds)(userState, repaymentHistoryUserIds);
+    repaymentHistoryWithUsers = sortPaymentHistory(repaymentHistoryWithUsers, uiState.sortKey, uiState.sortOrder, accountInfoMap);
+    // Extract unique funding account IDs from repayment history
+    const repaymentHistoryFundingAccountIds = Array.from(new Set(repaymentHistoryWithUsers
+        .map((repayment) => repayment.providerDepositAccountId)
+        .filter((id) => id !== undefined && id !== null)));
+    // Get deposit and payment accounts views for fetch state reduction
+    const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
+    const paymentAccountsView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
+    // Get funding accounts linked to payments
+    let repaymentHistoryFundingAccounts = [];
+    if (repaymentHistoryFundingAccountIds.length > 0 &&
+        depositAccountsView.fetchState === 'Completed' &&
+        paymentAccountsView.fetchState === 'Completed') {
+        // Filter deposit accounts that match providerDepositAccountIds (by id)
+        const matchingDepositAccounts = depositAccountsView.depositAccounts.filter((depositAccount) => repaymentHistoryFundingAccountIds.includes(depositAccount.id));
+        // Filter payment accounts that match providerDepositAccountIds (by providerAccountId)
+        const matchingPaymentAccounts = paymentAccountsView.paymentAccounts.filter((paymentAccount) => repaymentHistoryFundingAccountIds.includes(paymentAccount.providerAccountId));
+        // Convert to FundingAccount[] format
+        repaymentHistoryFundingAccounts = (0, setupViewSelector_1.getAllFundingAccounts)(matchingDepositAccounts, matchingPaymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus, false);
+    }
+    const reducedFetchState = (0, reduceFetchState_1.reduceAllFetchState)([
+        { fetchState, error },
+        depositAccountsView,
+        paymentAccountsView,
+        ...Object.values(paymentAccountListState.paymentAccountBalanceFetchStatus),
+    ]);
     return {
         creditAccountId,
         currencyCode,
         currencySymbol,
         filters,
         isAutoPayEnabled,
-        repaymentHistory,
+        repaymentHistory: repaymentHistoryWithUsers,
+        repaymentHistoryFundingAccounts,
         repaymentHistoryIds,
         repaymentHistoryUsers,
         searchText,
         totalRepayments,
         uiState,
-        fetchState,
-        error,
+        fetchState: reducedFetchState.fetchState,
+        error: reducedFetchState.error,
         version: 0,
     };
 };

package/package.json

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