@zeniai/client-epic-state 4.8.6 → 4.8.7

package/lib/view/scheduleView/scheduleListView/epics/fetchScheduleListEpic.js

@@ -24,7 +24,9 @@ const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
     const timePeriod = (0, timeframeTick_1.toTimePeriod)(timeframe);
     const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.tab, categoryId, timeframe);
     const draft = scheduleListState.byScheduleListKey[key];
-    if (draft != null && draft.fetchState === 'Completed') {
+    if (draft != null &&
+        draft.fetchState === 'Completed' &&
+        action.payload.cacheOverride === false) {
         return (0, rxjs_1.from)([]);
     }
     const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_1.getAccountsTypesForSchedulePayload)(scheduleListState.currentTab).allowedAccountList;

package/lib/view/vendorReviewView/common/payload/commonTypes.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toGlobalMerchantsBasePayload = exports.toVendorReviewViewRecommendationPayload = exports.toNonExistingRecommendationGlobalMerchantBasePayload = exports.toUserPayload = void 0;
+const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globalMerchantPayload");
 /**
@@ -75,13 +76,12 @@ const toVendorReviewViewRecommendationPayload = (recommendations, nonExistingRec
 };
 exports.toVendorReviewViewRecommendationPayload = toVendorReviewViewRecommendationPayload;
 const toGlobalMerchantsBasePayload = (vendorsRecommendationsPayload) => {
-    var _a;
-    const globalMerchantBasePayload = [];
-    (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalMerchantPayload) => {
-        if (globalMerchantPayload.global_merchant_id != null) {
-            globalMerchantBasePayload.push(globalMerchantPayload);
-        }
-    });
+    var _a, _b;
+    let globalMerchantBasePayload = [];
+    if (((_b = (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
+        globalMerchantBasePayload = (0, flatMap_1.default)(vendorsRecommendationsPayload.map((vendorsRecoomendation) => vendorsRecoomendation
+            .global_merchants));
+    }
     return globalMerchantBasePayload;
 };
 exports.toGlobalMerchantsBasePayload = toGlobalMerchantsBasePayload;

package/lib/view/vendorReviewView/common/state/commonTypes.js

@@ -67,17 +67,15 @@ const toNonExistingGlobalMerchantBase = (globalMerchantPayload) => {
 };
 exports.toNonExistingGlobalMerchantBase = toNonExistingGlobalMerchantBase;
 const toAllRecommendationsFromPayload = (recommendationsPayload) => {
-    var _a;
-    const recommendations = [];
-    const nonExistingRecommendations = [];
-    (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalmerchant) => {
-        if (globalmerchant.global_merchant_id != null) {
-            recommendations.push((0, globalMerchantPayload_1.toGlobalMerchantBase)(globalmerchant));
-        }
-        else {
-            nonExistingRecommendations.push((0, exports.toNonExistingGlobalMerchantBase)(globalmerchant));
-        }
-    });
+    var _a, _b;
+    let recommendations = [];
+    let nonExistingRecommendations = [];
+    if (((_b = (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
+        recommendations = (0, exports.toRecommendationsFromPayload)(recommendationsPayload);
+    }
+    else {
+        nonExistingRecommendations = (0, exports.toNonExistingRecommendationsFromPayload)(recommendationsPayload);
+    }
     const recommendationIds = recommendations.map((recommendation) => recommendation.globalMerchantId);
     return {
         recommendationIds,

package/lib/view/vendorReviewView/vendorFirstReviewView/epics/fetchVendorFirstReviewViewEpic.js

@@ -82,13 +82,17 @@ exports.mapUsersPayloadFromVendorFirstReviewViewResponse = mapUsersPayloadFromVe
 const mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = (vendorsResponse) => {
     const globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a;
-        const existingMerchants = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.filter((merchant) => merchant.global_merchant_id != null);
-        mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(existingMerchants, globalMerchantBasePayload);
+        var _a, _b;
+        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
+            mapVendorRecommendationsToGlobalMerchantBasePayload(vendor.recommendations, globalMerchantBasePayload);
+        }
     });
     return globalMerchantBasePayload;
 };
 exports.mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse;
+const mapVendorRecommendationsToGlobalMerchantBasePayload = (recommendations, globalMerchantBasePayload) => {
+    recommendations.forEach((recommendation) => mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(recommendation.global_merchants, globalMerchantBasePayload));
+};
 const mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload = (entities, globalMerchantBasePayload) => {
     entities.forEach((entity) => globalMerchantBasePayload.push(entity));
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewReducer.js

@@ -83,9 +83,8 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
                         const isRecommendationSelected = selectedGlobalMerchantId != null &&
                             (selectedGlobalMerchantId ===
                                 vendorLocalData.recommendationIds[0] ||
-                                (vendorLocalData.recommendationIds.length === 0 &&
-                                    selectedGlobalMerchantId ===
-                                        ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName)));
+                                selectedGlobalMerchantId ===
+                                    ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName));
                         const isRetainSelected = selectedGlobalMerchantId != null &&
                             selectedGlobalMerchantId === vendorLocalData.vendorId;
                         currentSelection =
@@ -245,7 +244,7 @@ const mapPayloadToVendorFirstReviewView = (payload) => {
         },
         currentSelection: null,
         recommendationIds,
-        recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
+        recommendedNonExistingGlobalMerchants: recommendationIds.length === 0 ? nonExistingRecommendations : [],
         lastUpdatedVendorNameByUserId: (_a = payload.last_updated_vendor_name_by_user) === null || _a === void 0 ? void 0 : _a.user_id,
     };
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewSelector.js

@@ -19,10 +19,10 @@ const getVendorFirstReviewView = (state) => {
         const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.vendorId);
         const users = (0, userSelector_1.getUsersByUserIds)(userState, userIds);
         let recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, vendorLocalData.recommendationIds);
-        recommendations = [
-            ...recommendations,
-            ...vendorLocalData.recommendedNonExistingGlobalMerchants,
-        ];
+        recommendations =
+            recommendations.length > 0
+                ? recommendations
+                : vendorLocalData.recommendedNonExistingGlobalMerchants;
         let selectedVendor;
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.selectedVendorId);
         if (vendor != null) {

package/lib/view/vendorReviewView/vendorGlobalReviewView/epics/fetchVendorGlobalReviewViewEpic.js

@@ -71,12 +71,15 @@ exports.toUsersPayload = toUsersPayload;
 const mapGlobalReviewPayloadToGlobalMerchantsBasePayload = (vendorsResponse) => {
     let globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        globalMerchantBasePayload = [
-            ...new Set([
-                ...globalMerchantBasePayload,
-                ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
-            ]),
-        ];
+        var _a, _b;
+        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
+            globalMerchantBasePayload = [
+                ...new Set([
+                    ...globalMerchantBasePayload,
+                    ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
+                ]),
+            ];
+        }
     });
     return globalMerchantBasePayload;
 };

package/package.json

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