@zeniai/client-epic-state 4.13.20 → 4.13.21

package/lib/view/spendManagement/chargeCards/issueChargeCard/fetchIssueCardPageEpic.js

@@ -4,6 +4,7 @@ exports.fetchIssueCardPageEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const userListViewReducer_1 = require("../../../userListView/userListViewReducer");
+const classListReducer_1 = require("../../../classList/classListReducer");
 const chargeCardConfigReducer_1 = require("../chargeCardConfig/chargeCardConfigReducer");
 const issueChargeCardReducer_1 = require("./issueChargeCardReducer");
 const chargeCardListReducer_1 = require("../chargeCardList/chargeCardListReducer");
@@ -16,6 +17,8 @@ const fetchIssueCardPageEpic = (actions$, state$) => actions$.pipe((0, operators
         issueCardPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
         issueCardPageAction.push((0, userListViewReducer_1.fetchUserListByType)('cardHolderCandidate', true));
         issueCardPageAction.push((0, userListViewReducer_1.fetchUserListByType)('cardAdmin', true));
+        issueCardPageAction.push((0, classListReducer_1.fetchClassList)());
+        issueCardPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());
     }
     else {
         const chargeCardConfig = state.chargeCardConfigState;
@@ -28,6 +31,10 @@ const fetchIssueCardPageEpic = (actions$, state$) => actions$.pipe((0, operators
             chargeCardList.creditAccount.fetchState !== 'In-Progress') {
             issueCardPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
         }
+        if (chargeCardList.fetchState !== 'Completed' &&
+            chargeCardList.fetchState !== 'In-Progress') {
+            issueCardPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());
+        }
         const userList = state.userListViewState.userListByType.cardHolderCandidate;
         if (userList.fetchState !== 'In-Progress' &&
             userList.hasValidState() === false) {
@@ -38,6 +45,11 @@ const fetchIssueCardPageEpic = (actions$, state$) => actions$.pipe((0, operators
             userAdminList.hasValidState() === false) {
             issueCardPageAction.push((0, userListViewReducer_1.fetchUserListByType)('cardAdmin', false));
         }
+        const classList = state.classListState;
+        if (classList.fetchState !== 'In-Progress' &&
+            classList.hasValidState() === false) {
+            issueCardPageAction.push((0, classListReducer_1.fetchClassList)());
+        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(issueCardPageAction));
 }));

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardEpic.js

@@ -18,8 +18,8 @@ const issueChargeCardEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
         var _a, _b, _c, _d, _e, _f, _g, _h;
         if (data.cardType === 'business_physical_credit_card') {
             return {
-                card_holder_user_ids: data.physicalCard.userIds != null
-                    ? [data.physicalCard.userIds]
+                card_holder_user_ids: data.physicalCard.userId != null
+                    ? [data.physicalCard.userId]
                     : [],
                 card_name: data.physicalCard.cardName,
                 credit_limit: (_b = (_a = data.physicalCard.amount) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0,

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardSelector.js

@@ -4,12 +4,12 @@ exports.getIssueChargeCardView = void 0;
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const addressSelector_1 = require("../../../../entity/address/addressSelector");
 const addressViewSelector_1 = require("../../../addressView/addressViewSelector");
-const getCompanyView_1 = require("../../../companyView/selectorHelpers/getCompanyView");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const classSelector_1 = require("../../../../entity/class/classSelector");
 const userListViewSelector_1 = require("../../../userListView/userListViewSelector");
 const getIssueChargeCardView = (state) => {
-    var _a, _b;
-    const { issueChargeCardState, userState, userRoleState, userListViewState, chargeCardConfigState, chargeCardListState, tenantState, addressState, classState, classListState, } = state;
+    var _a;
+    const { issueChargeCardState, userState, userRoleState, userListViewState, chargeCardConfigState, chargeCardListState, addressState, classState, classListState, } = state;
     const userListSelectorView = (0, userListViewSelector_1.getUserList)(userState, userRoleState, userListViewState, 'cardHolderCandidate');
     const userList = userListSelectorView.users;
     let selectedUserAddress = {};
@@ -20,12 +20,9 @@ const getIssueChargeCardView = (state) => {
             selectedUserAddress = Object.assign(Object.assign({}, selectedUserAddress), { [user.userId]: userAddress });
         }
     });
-    const { currentTenantId } = tenantState;
-    const companyId = currentTenantId != null
-        ? (_b = (_a = tenantState.tenantsById) === null || _a === void 0 ? void 0 : _a[currentTenantId]) === null || _b === void 0 ? void 0 : _b.companyId
-        : '';
-    const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
-    const companyAddress = companyView === null || companyView === void 0 ? void 0 : companyView.companyAddress;
+    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
+    const companyAddressId = (_a = currentTenant === null || currentTenant === void 0 ? void 0 : currentTenant.company) === null || _a === void 0 ? void 0 : _a.managegmentInfo.companyAddressId;
+    const companyAddress = (0, addressSelector_1.getAddressByAddressId)(addressState, companyAddressId !== null && companyAddressId !== void 0 ? companyAddressId : '');
     let customAddressStatus = {};
     let customAddress = {};
     const defaultFetchState = {
@@ -48,17 +45,19 @@ const getIssueChargeCardView = (state) => {
             }
         }
     });
-    const issueCardPageFetchState = (0, reduceFetchState_1.reduceFetchState)([
-        chargeCardConfigState,
-        userListSelectorView,
-        chargeCardListState.creditAccount,
-        tenantState,
-    ]);
     const { classIds } = classListState;
     const allAccountingClasses = (0, classSelector_1.getClassesByIds)(classState, {
         classIds: classIds,
         reportId: 'class_list',
     });
+    const issueCardPageFetchState = (0, reduceFetchState_1.reduceFetchState)([
+        chargeCardConfigState,
+        userListViewState.userListByType.cardHolderCandidate,
+        userListSelectorView,
+        chargeCardListState.creditAccount,
+        classListState,
+        chargeCardListState,
+    ]);
     return {
         fetchState: issueCardPageFetchState.fetchState,
         error: issueCardPageFetchState.error,

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardState.d.ts

@@ -11,7 +11,7 @@ export interface PhysicalCardData {
     frequency: CreditLimitFrequencyCodeType;
     addressId?: ID;
     amount?: Amount;
-    userIds?: ID;
+    userId?: ID;
 }
 export interface VirtualCardData {
     userIds: ID[];

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardState.js

@@ -11,7 +11,7 @@ exports.initialIssueChargeCardLocalData = [
             frequency: 'monthly',
             addressId: undefined,
             amount: undefined,
-            userIds: undefined,
+            userId: undefined,
         },
         virtualCard: {
             userIds: [],

package/package.json

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