@zeniai/client-epic-state 4.12.17 → 4.12.19

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewState.d.ts

@@ -1,12 +1,16 @@
 import { FetchedState, FetchStateAndError, ID } from '../../../commonStateTypes/common';
+import ZeniUrl from '../../../zeniUrl';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { GlobalMerchant } from '../../../entity/globalMerchant/globalMerchantState';
 import { Attachment } from '../../../entity/transaction/stateTypes/attachment';
 import { VendorReviewRowCurrentSelection, ReviewStatus } from '../common/state/commonTypes';
-export interface CurrentSelectionByColumn {
+export interface FirstReviewPageCurrentSelectionByColumn {
     retain: boolean;
-    update: boolean;
+    recommendedFirst: boolean;
+    recommendedSecond: boolean;
+    rename: boolean;
+    customMerchant: boolean;
 }
 export declare const toVendorFirstReviewViewColumnKeyType: (v: string) => "action" | "status" | "vendor" | "retain" | "updateTo" | "ytd" | "viewTenantInvoice";
 export declare type VendorFirstReviewViewColumnKey = ReturnType<typeof toVendorFirstReviewViewColumnKeyType>;
@@ -32,6 +36,7 @@ export interface VendorFirstReviewViewLocalData {
     lastUpdatedVendorNameByUserId?: ID;
     mergeVendorName: string | undefined;
     transactionAttachments: Attachment[];
+    isWebsiteUrlSaved: boolean;
 }
 interface RecentlySavedErroredVendorData {
     vendorId: ID;
@@ -47,7 +52,20 @@ export interface VendorFirstReviewViewState extends FetchedState {
     vendorFirstReviewViewLocalDataById: Record<ID, VendorFirstReviewView>;
     recentlySavedErroredVendorData?: RecentlySavedErroredVendorData;
     uiState: VendorFirstReviewViewUIState;
+    vendorLocalData: ReviewVendorViewLocalData | null;
     attachmentFetchStatus: FetchStateAndError;
     transactionAttachmentsByVendorId: Record<ID, Attachment[]>;
 }
+export interface VendorViewLocalData {
+    id: ID;
+    qboId: ID;
+    name: string;
+    websiteUrl?: ZeniUrl;
+    recommendationIds: ID[];
+    recommendedNonExistingGlobalMerchants: RecommendedNonExistingGlobalMerchant[];
+}
+export interface ReviewVendorViewLocalData {
+    vendorDetails: VendorViewLocalData;
+    saveStatus: FetchStateAndError;
+}
 export {};

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

@@ -83,10 +83,10 @@ const mapGlobalReviewPayloadToGlobalMerchantsBasePayload = (vendorsResponse) =>
 exports.mapGlobalReviewPayloadToGlobalMerchantsBasePayload = mapGlobalReviewPayloadToGlobalMerchantsBasePayload;
 const toVendorGlobalReviewSortByKey = (columnKey) => {
     switch (columnKey) {
-        case 'updatedFrom':
-            return 'old_merchant_name';
-        case 'vendors':
-            return 'merchant_name';
+        case 'originalVendor':
+            return 'original_vendor';
+        case 'requestedVendor':
+            return 'requested_vendor';
         case 'recommended':
             return 'recommended_global_merchant_name';
         case 'tenants':

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

@@ -4,7 +4,7 @@ import { VendorReviewViewAllRecommendationsPayload } from '../common/payload/com
 export interface VendorGlobalReviewPayload extends TenantMerchantPayload {
     recommendations: VendorReviewViewAllRecommendationsPayload;
 }
-export declare const toVendorGlobalReviewSortByKeyType: (v: string) => "recommended_global_merchant_name" | "old_merchant_name" | "merchant_name" | "tenant_name";
+export declare const toVendorGlobalReviewSortByKeyType: (v: string) => "recommended_global_merchant_name" | "original_vendor" | "requested_vendor" | "tenant_name";
 export declare type VendorGlobalReviewViewSortByKey = ReturnType<typeof toVendorGlobalReviewSortByKeyType>;
 export interface VendorGlobalReviewViewQueryPayload {
     entity_type: string;

package/lib/view/vendorReviewView/vendorGlobalReviewView/vendorGlobalReviewViewPayload.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toVendorGlobalReviewSortByKeyType = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const VENDOR_GLOBAL_REVIEW_SORT_BY_KEYS = [
-    'old_merchant_name',
-    'merchant_name',
+    'original_vendor',
+    'requested_vendor',
     'tenant_name',
     'recommended_global_merchant_name',
 ];

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

@@ -3,6 +3,7 @@ import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { VendorGlobalReviewPayload, VendorGlobalReviewViewQueryPayload } from './vendorGlobalReviewViewPayload';
 import { VendorGlobalReviewViewState, VendorGlobalReviewViewUIState } from './vendorGlobalReviewViewState';
+import { GlobalVendorReviewRowCurrentSelection } from '../common/state/commonTypes';
 export declare const initialState: VendorGlobalReviewViewState;
 export declare const fetchVendorGlobalReviewView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[searchString?: string | undefined, keepExistingListItems?: any, pageToken?: PageToken | undefined], {
     searchString: string | undefined;
@@ -29,6 +30,10 @@ export declare const fetchVendorGlobalReviewView: import("@reduxjs/toolkit").Act
 }, string>, rejectVendorGlobalReviewFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     merchantId: ID;
     status: ZeniAPIStatus;
-}, string>, rejectVendorGlobalReviewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, clearVendorGlobalReviewView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+}, string>, rejectVendorGlobalReviewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, clearVendorGlobalReviewView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateVendorGlobalReviewViewLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    merchantId: ID;
+    currentSelection: GlobalVendorReviewRowCurrentSelection;
+    customMerchantId?: string | undefined;
+}, string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<VendorGlobalReviewViewState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

package/lib/view/vendorReviewView/vendorGlobalReviewView/vendorGlobalReviewViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearVendorGlobalReviewView = exports.rejectVendorGlobalReviewSuccess = exports.rejectVendorGlobalReviewFailure = exports.approveVendorGlobalReviewFailure = exports.approveVendorGlobalReviewSuccess = exports.rejectVendorGlobalReview = exports.approveVendorGlobalReview = exports.updateSelectedGlobalMerchant = exports.updateVendorGlobalReviewViewUIState = exports.initializeVendorGlobalReviewViewLocalData = exports.fetchVendorGlobalReviewViewFailure = exports.fetchVendorGlobalReviewViewSuccess = exports.fetchVendorGlobalReviewView = exports.initialState = void 0;
+exports.updateVendorGlobalReviewViewLocalData = exports.clearVendorGlobalReviewView = exports.rejectVendorGlobalReviewSuccess = exports.rejectVendorGlobalReviewFailure = exports.approveVendorGlobalReviewFailure = exports.approveVendorGlobalReviewSuccess = exports.rejectVendorGlobalReview = exports.approveVendorGlobalReview = exports.updateSelectedGlobalMerchant = exports.updateVendorGlobalReviewViewUIState = exports.initializeVendorGlobalReviewViewLocalData = exports.fetchVendorGlobalReviewViewFailure = exports.fetchVendorGlobalReviewViewSuccess = exports.fetchVendorGlobalReviewView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const vendorGlobalReviewViewPayload_1 = require("./vendorGlobalReviewViewPayload");
 const commonTypes_1 = require("../common/state/commonTypes");
@@ -153,6 +153,17 @@ const vendorGlobalReviewView = (0, toolkit_1.createSlice)({
                 error: status,
             };
         },
+        updateVendorGlobalReviewViewLocalData(draft, action) {
+            const { merchantId, customMerchantId, currentSelection } = action.payload;
+            if (draft.vendorGlobalByMerchantId[merchantId]
+                .vendorGlobalReviewViewLocalData != null) {
+                const vendorLocalData = draft.vendorGlobalByMerchantId[merchantId]
+                    .vendorGlobalReviewViewLocalData;
+                draft.vendorGlobalByMerchantId[merchantId].vendorGlobalReviewViewLocalData = Object.assign(Object.assign({}, vendorLocalData), { selectedMerchantId: customMerchantId != null
+                        ? customMerchantId
+                        : vendorLocalData.merchantId, currentSelection: currentSelection });
+            }
+        },
         rejectVendorGlobalReview: {
             reducer(draft, action) {
                 const { merchantId } = action.payload;
@@ -189,7 +200,7 @@ const vendorGlobalReviewView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = vendorGlobalReviewView.actions, exports.fetchVendorGlobalReviewView = _a.fetchVendorGlobalReviewView, exports.fetchVendorGlobalReviewViewSuccess = _a.fetchVendorGlobalReviewViewSuccess, exports.fetchVendorGlobalReviewViewFailure = _a.fetchVendorGlobalReviewViewFailure, exports.initializeVendorGlobalReviewViewLocalData = _a.initializeVendorGlobalReviewViewLocalData, exports.updateVendorGlobalReviewViewUIState = _a.updateVendorGlobalReviewViewUIState, exports.updateSelectedGlobalMerchant = _a.updateSelectedGlobalMerchant, exports.approveVendorGlobalReview = _a.approveVendorGlobalReview, exports.rejectVendorGlobalReview = _a.rejectVendorGlobalReview, exports.approveVendorGlobalReviewSuccess = _a.approveVendorGlobalReviewSuccess, exports.approveVendorGlobalReviewFailure = _a.approveVendorGlobalReviewFailure, exports.rejectVendorGlobalReviewFailure = _a.rejectVendorGlobalReviewFailure, exports.rejectVendorGlobalReviewSuccess = _a.rejectVendorGlobalReviewSuccess, exports.clearVendorGlobalReviewView = _a.clearVendorGlobalReviewView;
+_a = vendorGlobalReviewView.actions, exports.fetchVendorGlobalReviewView = _a.fetchVendorGlobalReviewView, exports.fetchVendorGlobalReviewViewSuccess = _a.fetchVendorGlobalReviewViewSuccess, exports.fetchVendorGlobalReviewViewFailure = _a.fetchVendorGlobalReviewViewFailure, exports.initializeVendorGlobalReviewViewLocalData = _a.initializeVendorGlobalReviewViewLocalData, exports.updateVendorGlobalReviewViewUIState = _a.updateVendorGlobalReviewViewUIState, exports.updateSelectedGlobalMerchant = _a.updateSelectedGlobalMerchant, exports.approveVendorGlobalReview = _a.approveVendorGlobalReview, exports.rejectVendorGlobalReview = _a.rejectVendorGlobalReview, exports.approveVendorGlobalReviewSuccess = _a.approveVendorGlobalReviewSuccess, exports.approveVendorGlobalReviewFailure = _a.approveVendorGlobalReviewFailure, exports.rejectVendorGlobalReviewFailure = _a.rejectVendorGlobalReviewFailure, exports.rejectVendorGlobalReviewSuccess = _a.rejectVendorGlobalReviewSuccess, exports.clearVendorGlobalReviewView = _a.clearVendorGlobalReviewView, exports.updateVendorGlobalReviewViewLocalData = _a.updateVendorGlobalReviewViewLocalData;
 exports.default = vendorGlobalReviewView.reducer;
 /**
  * Helpers
@@ -220,14 +231,15 @@ const mapPayloadToVendorGlobalReviewView = (payload) => {
         tenantId: payload.tenant_id,
         recommendationIds,
         recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
+        currentSelection: null,
     };
 };
 const toVendorGlobalReviewColumnSortKey = (sortByKey) => {
     switch (sortByKey) {
-        case 'old_merchant_name':
-            return 'updatedFrom';
-        case 'merchant_name':
-            return 'vendors';
+        case 'original_vendor':
+            return 'originalVendor';
+        case 'requested_vendor':
+            return 'requestedVendor';
         case 'recommended_global_merchant_name':
             return 'recommended';
         case 'tenant_name':

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

@@ -5,12 +5,14 @@ import { GlobalMerchantAutoCompleteView } from '../../globalMerchantView/globalM
 import { RootState } from '../../../reducer';
 import { VendorGlobalReviewViewUIState } from './vendorGlobalReviewViewState';
 import { RecommendedNonExistingGlobalMerchant } from '../vendorFirstReviewView/vendorFirstReviewViewState';
+import { GlobalVendorReviewRowCurrentSelection } from '../common/state/commonTypes';
 export interface VendorGlobalReview {
     merchant: TenantMerchant;
     selectedMerchantId: ID;
     approveStatus: FetchStateAndError;
     rejectStatus: FetchStateAndError;
-    recommendedMerchant?: RecommendedNonExistingGlobalMerchant;
+    recommendations: RecommendedNonExistingGlobalMerchant[];
+    currentSelection: GlobalVendorReviewRowCurrentSelection;
 }
 export interface VendorGlobalReviewViewSelectorView extends SelectorView {
     vendorGlobalReviewData: VendorGlobalReview[];

package/lib/view/vendorReviewView/vendorGlobalReviewView/vendorGlobalReviewViewSelector.js

@@ -15,16 +15,18 @@ exports.getVendorGlobalReviewView = (0, toolkit_1.createSelector)((state) => sta
         .map((merchantData) => {
         const { vendorGlobalReviewViewLocalData: vendorLocalData, approveStatus, rejectStatus, } = merchantData;
         const { tenantId, merchantId, selectedMerchantId, recommendationIds, recommendedNonExistingGlobalMerchants, } = vendorLocalData;
-        const recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, recommendationIds);
+        let recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, recommendationIds);
         const merchant = (0, globalMerchantSelector_1.getTenantMerchantByMerchantKey)(globalMerchantState, (0, globalMerchantState_1.getTenantMerchantKey)(tenantId, merchantId));
         if (merchant != null) {
-            const recommendedMerchant = recommendations.length > 0
-                ? recommendations[0]
-                : recommendedNonExistingGlobalMerchants[0];
+            recommendations = [
+                ...recommendations,
+                ...recommendedNonExistingGlobalMerchants,
+            ];
             return {
                 merchant,
                 selectedMerchantId,
-                recommendedMerchant,
+                recommendations,
+                currentSelection: merchantData.vendorGlobalReviewViewLocalData.currentSelection,
                 approveStatus,
                 rejectStatus,
             };

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

@@ -1,9 +1,16 @@
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
+import { GlobalVendorReviewRowCurrentSelection } from '../common/state/commonTypes';
 import { RecommendedNonExistingGlobalMerchant } from '../vendorFirstReviewView/vendorFirstReviewViewState';
-export declare const toVendorGlobalReviewColumnSortKeyType: (v: string) => "vendors" | "recommended" | "tenants" | "updatedFrom";
+export declare const toVendorGlobalReviewColumnSortKeyType: (v: string) => "recommended" | "originalVendor" | "tenants" | "requestedVendor";
 export declare type VendorGlobalReviewViewColumnSortKey = ReturnType<typeof toVendorGlobalReviewColumnSortKeyType>;
+export interface GlobalReviewPageCurrentSelectionByColumn {
+    requested: boolean;
+    recommendedFirst: boolean;
+    recommendedSecond: boolean;
+    originalVendor: boolean;
+}
 export interface VendorGlobalReviewViewUIState {
     searchText: string;
     sortKey: VendorGlobalReviewViewColumnSortKey;
@@ -19,6 +26,7 @@ export interface VendorGlobalReviewViewLocalData {
     tenantId: ID;
     recommendationIds: ID[];
     recommendedNonExistingGlobalMerchants: RecommendedNonExistingGlobalMerchant[];
+    currentSelection: GlobalVendorReviewRowCurrentSelection;
 }
 export interface VendorGlobalReviewView {
     vendorGlobalReviewViewLocalData: VendorGlobalReviewViewLocalData;

package/lib/view/vendorReviewView/vendorGlobalReviewView/vendorGlobalReviewViewState.js

@@ -4,9 +4,9 @@ exports.toVendorGlobalReviewColumnSortKeyType = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const VENDOR_GLOBAL_REVIEW_COLUMN_SORT_KEYS = [
     'tenants',
-    'vendors',
-    'updatedFrom',
+    'originalVendor',
     'recommended',
+    'requestedVendor',
 ];
 const toVendorGlobalReviewColumnSortKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, VENDOR_GLOBAL_REVIEW_COLUMN_SORT_KEYS);
 exports.toVendorGlobalReviewColumnSortKeyType = toVendorGlobalReviewColumnSortKeyType;

package/package.json

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