@zeniai/client-epic-state 4.12.34 → 4.12.35

package/lib/view/vendorReviewView/common/state/commonTypes.d.ts

@@ -20,6 +20,7 @@ export declare type GlobalVendorReviewRowCurrentSelection = 'requested' | 'recom
  * Helpers
  */
 export declare const toNonExistingGlobalMerchantBase: (globalMerchantPayload: RecommendedNonExistingGlobalMerchantBasePayload) => RecommendedNonExistingGlobalMerchant;
+export declare const toNonExistingGlobalMerchantBasePayload: (globalMerchant: RecommendedNonExistingGlobalMerchant) => RecommendedNonExistingGlobalMerchantBasePayload;
 export declare const toAllRecommendationsFromPayload: (recommendationsPayload: VendorReviewViewAllRecommendationsPayload) => {
     recommendationIds: ID[];
     nonExistingRecommendations: RecommendedNonExistingGlobalMerchant[];

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toAllRecommendationsFromPayload = exports.toNonExistingGlobalMerchantBase = exports.toVendorFirstReviewViewStatusesTypeStrict = void 0;
+exports.toAllRecommendationsFromPayload = exports.toNonExistingGlobalMerchantBasePayload = exports.toNonExistingGlobalMerchantBase = exports.toVendorFirstReviewViewStatusesTypeStrict = void 0;
 const stringToUnion_1 = require("../../../../commonStateTypes/stringToUnion");
 const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globalMerchantPayload");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
 const zeniUrl_1 = require("../../../../zeniUrl");
 const globalMerchantAutoCompleteViewState_1 = require("../../../globalMerchantView/globalMerchantAutoCompleteView/globalMerchantAutoCompleteViewState");
+const formatZeniDateFY_1 = require("../../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const VENDOR_FIRST_REVIEW_VIEW_STATUSES = [
     'pending',
     'under_review',
@@ -45,6 +46,31 @@ const toNonExistingGlobalMerchantBase = (globalMerchantPayload) => {
     };
 };
 exports.toNonExistingGlobalMerchantBase = toNonExistingGlobalMerchantBase;
+const toNonExistingGlobalMerchantBasePayload = (globalMerchant) => {
+    var _a, _b, _c, _d, _e, _f;
+    const payload = {
+        global_merchant_name: globalMerchant.globalMerchantName,
+        global_merchant_type: (_a = globalMerchant.globalMerchantType) !== null && _a !== void 0 ? _a : 'vendor',
+        logo: {
+            url: (_b = globalMerchant.logo) === null || _b === void 0 ? void 0 : _b.toString(),
+            base64: null,
+        },
+        reason: (_c = globalMerchant.reason) !== null && _c !== void 0 ? _c : null,
+        website_url: (_e = (_d = globalMerchant.websiteUrl) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : null,
+        third_party_merchant_id: (_f = globalMerchant.thirdPartyMerchantId) !== null && _f !== void 0 ? _f : null,
+        update_time: globalMerchant.updateTime != null
+            ? globalMerchant.updateTime.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)
+            : null,
+        create_time: globalMerchant.createTime != null
+            ? globalMerchant.createTime.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)
+            : null,
+    };
+    if (globalMerchant.isActive != null) {
+        payload.is_active = globalMerchant.isActive;
+    }
+    return payload;
+};
+exports.toNonExistingGlobalMerchantBasePayload = toNonExistingGlobalMerchantBasePayload;
 const toAllRecommendationsFromPayload = (recommendationsPayload) => {
     var _a;
     const recommendations = [];

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

@@ -13,7 +13,8 @@ const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globa
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const globalMerchantSelector_1 = require("../../../../entity/globalMerchant/globalMerchantSelector");
 const globalMerchantState_1 = require("../../../../entity/globalMerchant/globalMerchantState");
-const commonTypes_1 = require("../../common/payload/commonTypes");
+const commonTypes_1 = require("../../common/state/commonTypes");
+const commonTypes_2 = require("../../common/payload/commonTypes");
 const approveVendorGlobalReviewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(vendorGlobalReviewViewReducer_1.approveVendorGlobalReview.match), (0, operators_1.mergeMap)((action) => {
     const { merchantId } = action.payload;
     const { globalMerchantState, vendorGlobalReviewViewState } = state$.value;
@@ -22,9 +23,31 @@ const approveVendorGlobalReviewEpic = (actions$, state$, zeniAPI) => actions$.pi
     const selectedMerchant = merchantData != null && merchantData.selectedMerchantId != null
         ? (0, globalMerchantSelector_1.getGlobalMerchantByMerchantId)(globalMerchantState, merchantData.selectedMerchantId)
         : undefined;
+    let selectedMerchantName = selectedMerchant === null || selectedMerchant === void 0 ? void 0 : selectedMerchant.globalMerchantName;
+    let selectedNonExistingGlobalMerchant;
     const tenantMerchant = (0, globalMerchantSelector_1.getTenantMerchantByMerchantKey)(globalMerchantState, (0, globalMerchantState_1.getTenantMerchantKey)(merchantData.tenantId, merchantId));
+    if (selectedMerchantName == null &&
+        (merchantData.currentSelection === 'recommendedFirst' ||
+            merchantData.currentSelection === 'recommendedSecond')) {
+        if (merchantData.currentSelection === 'recommendedFirst' &&
+            merchantData.recommendedNonExistingGlobalMerchants.length > 0) {
+            selectedMerchantName =
+                merchantData.recommendedNonExistingGlobalMerchants[0]
+                    .globalMerchantName;
+            selectedNonExistingGlobalMerchant =
+                merchantData.recommendedNonExistingGlobalMerchants[0];
+        }
+        else if (merchantData.currentSelection === 'recommendedSecond' &&
+            merchantData.recommendedNonExistingGlobalMerchants.length > 1) {
+            selectedMerchantName =
+                merchantData.recommendedNonExistingGlobalMerchants[1]
+                    .globalMerchantName;
+            selectedNonExistingGlobalMerchant =
+                merchantData.recommendedNonExistingGlobalMerchants[1];
+        }
+    }
     if (merchantData != null &&
-        selectedMerchant != null &&
+        selectedMerchantName != null &&
         tenantMerchant != null) {
         const recommendations = Array({
             globalMerchants: (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, merchantData.recommendationIds),
@@ -32,19 +55,18 @@ const approveVendorGlobalReviewEpic = (actions$, state$, zeniAPI) => actions$.pi
         const nonExistingRecommendations = Array({
             globalMerchants: merchantData.recommendedNonExistingGlobalMerchants,
         });
-        const allRecommendations = (0, commonTypes_1.toVendorReviewViewRecommendationPayload)(recommendations, nonExistingRecommendations);
-        const payload = Object.assign({}, toApproveVendorGlobalReviewQueryPayload(tenantMerchant, selectedMerchant, allRecommendations));
+        const allRecommendations = (0, commonTypes_2.toVendorReviewViewRecommendationPayload)(recommendations, nonExistingRecommendations);
+        const payload = Object.assign({}, toApproveVendorGlobalReviewQueryPayload(tenantMerchant, allRecommendations, selectedMerchantName, selectedMerchant, selectedNonExistingGlobalMerchant));
         return zeniAPI
             .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/reviews/global-merchant-list/${merchantId}`, payload)
             .pipe((0, operators_1.mergeMap)((response) => {
-            const isOriginalMerchant = tenantMerchant.tenantMerchantName ===
-                selectedMerchant.globalMerchantName;
-            if ((0, responsePayload_1.isSuccessStatus)(response)) {
+            const isOriginalMerchant = tenantMerchant.tenantMerchantName === selectedMerchantName;
+            if ((0, responsePayload_1.isSuccessStatus)(response) && selectedMerchantName != null) {
                 const variables = isOriginalMerchant
                     ? [
                         {
                             variableName: '_merchant_name_',
-                            variableValue: selectedMerchant.globalMerchantName,
+                            variableValue: selectedMerchantName,
                         },
                     ]
                     : [
@@ -54,7 +76,7 @@ const approveVendorGlobalReviewEpic = (actions$, state$, zeniAPI) => actions$.pi
                         },
                         {
                             variableName: '_approved_merchant_name_',
-                            variableValue: selectedMerchant.globalMerchantName,
+                            variableValue: selectedMerchantName,
                         },
                     ];
                 const actions = [
@@ -106,14 +128,21 @@ exports.approveVendorGlobalReviewEpic = approveVendorGlobalReviewEpic;
 /**
  * Helper
  */
-const toApproveVendorGlobalReviewQueryPayload = (tenantMerchant, selectedMerchant, allRecommendations) => {
+const toApproveVendorGlobalReviewQueryPayload = (tenantMerchant, allRecommendations, selectedMerchantName, selectedMerchant, selectedNonExistingMerchant) => {
     const payload = {
         tenant_name: tenantMerchant.tenantName,
         merchant_type: 'vendor',
         tenant_id: tenantMerchant.tenantId,
-        selected_global_merchant: (0, omit_1.default)((0, globalMerchantPayload_1.toGlobalMerchantBasePayload)(selectedMerchant), ['create_time', 'update_time']),
+        selected_global_merchant: selectedMerchant != null
+            ? (0, omit_1.default)((0, globalMerchantPayload_1.toGlobalMerchantBasePayload)(selectedMerchant), [
+                'create_time',
+                'update_time',
+            ])
+            : selectedNonExistingMerchant != null
+                ? (0, commonTypes_1.toNonExistingGlobalMerchantBasePayload)(selectedNonExistingMerchant)
+                : null,
         recommendations: allRecommendations,
-        merchant_name: selectedMerchant.globalMerchantName,
+        merchant_name: selectedMerchantName,
     };
     return payload;
 };

package/lib/view/vendorReviewView/vendorGlobalReviewView/vendorGlobalReviewViewPayload.d.ts

@@ -1,6 +1,6 @@
 import { GlobalMerchantBasePayload, TenantMerchantPayload } from '../../../entity/globalMerchant/globalMerchantPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
-import { VendorReviewViewAllRecommendationsPayload } from '../common/payload/commonTypes';
+import { RecommendedNonExistingGlobalMerchantBasePayload, VendorReviewViewAllRecommendationsPayload } from '../common/payload/commonTypes';
 export interface VendorGlobalReviewPayload extends TenantMerchantPayload {
     recommendations: VendorReviewViewAllRecommendationsPayload;
 }
@@ -30,7 +30,7 @@ export declare type VendorGlobalReviewViewResponse = ZeniAPIResponse<VendorGloba
 export interface ApproveVendorGlobalReviewQueryPayload {
     merchant_type: string;
     tenant_id: string;
-    selected_global_merchant: GlobalMerchantBasePayload | null;
+    selected_global_merchant: GlobalMerchantBasePayload | RecommendedNonExistingGlobalMerchantBasePayload | null;
     tenant_name: string;
     merchant_name: string;
     recommendations: VendorReviewViewAllRecommendationsPayload;

package/package.json

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