@zeniai/client-epic-state 4.12.20 → 4.12.21

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateVendorDetailsViewFailureOrSuccess = exports.saveVendorDetailsView = exports.updateReviewVendorDetailLocalData = exports.updateVendorDetailRecommendations = exports.updateVendorFirstReviewViewTransactionAttachmentsFailure = exports.updateVendorFirstReviewViewTransactionAttachments = exports.saveVendorFirstReviewViewSuccessOrFailure = exports.clearRecentlySavedErroredVendorData = exports.updateRecentlySavedErroredVendorData = exports.resetVendorFirstReviewLocalData = exports.updateVendorFirstReviewViewLocalData = exports.initializeVendorFirstReviewViewLocalData = exports.updateVendorFirstReviewSortUiState = exports.saveVendorFirstReviewView = exports.updateVendorFirstReviewViewPageToken = exports.updateVendorFirstReviewViewScrollYOffset = exports.clearVendorReviewView = exports.updateVendorFirstReviewViewFailure = exports.updateSavedVendorFirstReviewViewLocalData = exports.fetchVendorFirstReviewView = exports.fetchVendorFirstReviewAttachments = exports.initialState = void 0;
+exports.updateVendorFirstReviewViewTransactionAttachmentsFailure = exports.updateVendorFirstReviewViewTransactionAttachments = exports.saveVendorFirstReviewViewSuccessOrFailure = exports.clearRecentlySavedErroredVendorData = exports.updateRecentlySavedErroredVendorData = exports.resetVendorFirstReviewLocalData = exports.updateVendorFirstReviewViewLocalData = exports.initializeVendorFirstReviewViewLocalData = exports.updateVendorFirstReviewSortUiState = exports.saveVendorFirstReviewView = exports.updateVendorFirstReviewViewPageToken = exports.updateVendorFirstReviewViewScrollYOffset = exports.clearVendorReviewView = exports.updateVendorFirstReviewViewFailure = exports.updateSavedVendorFirstReviewViewLocalData = exports.fetchVendorFirstReviewView = exports.fetchVendorFirstReviewAttachments = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const commonTypes_1 = require("../common/state/commonTypes");
 const attachmentPayload_1 = require("../../../entity/transaction/payloadTypes/attachmentPayload");
@@ -22,7 +22,6 @@ exports.initialState = {
         fetchState: 'Not-Started',
         error: undefined,
     },
-    vendorLocalData: null,
     hasValidState() {
         return this.fetchState == 'Completed';
     },
@@ -74,7 +73,7 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
             },
         },
         updateVendorFirstReviewSortUiState(draft, action) {
-            draft.uiState = Object.assign(Object.assign({}, draft.uiState), { sortKey: action.payload.sortKey, sortOrder: action.payload.sortOrder });
+            draft.uiState = Object.assign(Object.assign({}, draft.uiState), { sortKey: action.payload.sortkey, sortOrder: action.payload.sortOrder });
         },
         updateVendorFirstReviewViewPageToken(draft, action) {
             draft.uiState = Object.assign(Object.assign({}, draft.uiState), { pageToken: action.payload.pageToken });
@@ -94,17 +93,48 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
             draft.uiState = Object.assign(Object.assign({}, draft.uiState), { pageToken: (_a = query === null || query === void 0 ? void 0 : query.page_token) !== null && _a !== void 0 ? _a : null, totalCount: total_count });
         },
         updateVendorFirstReviewViewLocalData(draft, action) {
+            var _a, _b, _c;
             const { vendorId, vendorRenamedText, selectedGlobalMerchantId, currentSelection, } = action.payload;
             if (draft.vendorFirstReviewViewLocalDataById[vendorId]
                 .vendorFirstReviewViewLocalData != null) {
                 const vendorLocalData = draft.vendorFirstReviewViewLocalDataById[vendorId]
                     .vendorFirstReviewViewLocalData;
-                if (vendorRenamedText != null) {
-                    draft.vendorFirstReviewViewLocalDataById[vendorId].vendorFirstReviewViewLocalData = Object.assign(Object.assign({}, vendorLocalData), { selectedVendorId: selectedGlobalMerchantId, currentSelection,
+                if (selectedGlobalMerchantId != null || vendorRenamedText != null) {
+                    let currentSelection = vendorRenamedText != null ? 'rename' : null;
+                    if (selectedGlobalMerchantId != null) {
+                        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)));
+                        const isRetainSelected = selectedGlobalMerchantId != null &&
+                            selectedGlobalMerchantId === vendorLocalData.vendorId;
+                        currentSelection =
+                            isRecommendationSelected === true
+                                ? 'update'
+                                : isRetainSelected === true
+                                    ? 'retain'
+                                    : 'custom_merchant';
+                    }
+                    draft.vendorFirstReviewViewLocalDataById[vendorId].vendorFirstReviewViewLocalData = Object.assign(Object.assign({}, vendorLocalData), { selectedVendorId: selectedGlobalMerchantId !== null && selectedGlobalMerchantId !== void 0 ? selectedGlobalMerchantId : vendorLocalData.vendorId, currentSelection,
                         vendorRenamedText });
                 }
                 else {
-                    draft.vendorFirstReviewViewLocalDataById[vendorId].vendorFirstReviewViewLocalData = Object.assign(Object.assign({}, vendorLocalData), { vendorRenamedText: undefined, selectedVendorId: selectedGlobalMerchantId, currentSelection });
+                    let updateSelectedGlobalMerchantId;
+                    const { isRetainSelected, isUpdateSelected, bothRetainAndUpdateUnSelected, } = getCurrentSelectionStatus(vendorLocalData.currentSelection, currentSelection);
+                    if (bothRetainAndUpdateUnSelected || isRetainSelected) {
+                        updateSelectedGlobalMerchantId = vendorLocalData.vendorId;
+                    }
+                    else {
+                        updateSelectedGlobalMerchantId =
+                            (_b = vendorLocalData.recommendationIds[0]) !== null && _b !== void 0 ? _b : (_c = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _c === void 0 ? void 0 : _c.globalMerchantName;
+                    }
+                    draft.vendorFirstReviewViewLocalDataById[vendorId].vendorFirstReviewViewLocalData = Object.assign(Object.assign({}, vendorLocalData), { vendorRenamedText: undefined, selectedVendorId: updateSelectedGlobalMerchantId, currentSelection: isRetainSelected
+                            ? 'retain'
+                            : isUpdateSelected
+                                ? 'update'
+                                : null });
                 }
             }
         },
@@ -182,52 +212,6 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
                 };
             }
         },
-        updateReviewVendorDetailLocalData(draft, action) {
-            const { vendorDetails } = action.payload;
-            const { id, qboId, websiteUrl, name, recommendationIds, recommendedNonExistingGlobalMerchants, } = vendorDetails;
-            draft.vendorLocalData = {
-                vendorDetails: {
-                    id,
-                    qboId,
-                    name,
-                    websiteUrl,
-                    recommendationIds,
-                    recommendedNonExistingGlobalMerchants,
-                },
-                saveStatus: { fetchState: 'Not-Started', error: undefined },
-            };
-        },
-        updateVendorDetailRecommendations(draft, action) {
-            const { recommendationIds, recommendedNonExistingGlobalMerchants } = action.payload;
-            if (draft.vendorLocalData != null) {
-                draft.vendorLocalData.vendorDetails.recommendationIds =
-                    recommendationIds;
-                draft.vendorLocalData.vendorDetails.recommendedNonExistingGlobalMerchants =
-                    recommendedNonExistingGlobalMerchants;
-            }
-        },
-        saveVendorDetailsView(draft) {
-            if (draft.vendorLocalData != null) {
-                draft.vendorLocalData = Object.assign(Object.assign({}, draft.vendorLocalData), { saveStatus: {
-                        fetchState: 'In-Progress',
-                        error: undefined,
-                    } });
-            }
-        },
-        updateVendorDetailsViewFailureOrSuccess(draft, action) {
-            const { vendorId, fetchState, error } = action.payload;
-            if (draft.vendorLocalData != null) {
-                draft.vendorLocalData.saveStatus = {
-                    fetchState: fetchState,
-                    error: error,
-                };
-            }
-            if (fetchState === 'Completed') {
-                const vendorReviewViewLocalData = draft.vendorFirstReviewViewLocalDataById[vendorId]
-                    .vendorFirstReviewViewLocalData;
-                draft.vendorFirstReviewViewLocalDataById[vendorId].vendorFirstReviewViewLocalData = Object.assign(Object.assign({}, vendorReviewViewLocalData), { isWebsiteUrlSaved: true });
-            }
-        },
         clearRecentlySavedErroredVendorData(draft) {
             draft.recentlySavedErroredVendorData = undefined;
         },
@@ -267,6 +251,16 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
         },
     },
 });
+const getCurrentSelectionStatus = (stateCurrentSelection, currentSelection) => {
+    const isRetainSelected = stateCurrentSelection !== 'retain' && currentSelection.retain;
+    const isUpdateSelected = stateCurrentSelection !== 'update' && currentSelection.update;
+    const bothRetainAndUpdateUnSelected = !currentSelection.retain && !currentSelection.update;
+    return {
+        isRetainSelected,
+        isUpdateSelected,
+        bothRetainAndUpdateUnSelected,
+    };
+};
 const toVendorReviewViewUpdatedVendorLocalData = (vendorId, vendorPayload) => {
     const vendorView = mapPayloadToVendorFirstReviewView(Object.assign(Object.assign({}, vendorPayload), { vendor_id: vendorId }));
     return vendorView;
@@ -299,17 +293,15 @@ const mapPayloadToVendorFirstReviewView = (payload) => {
         recommendationIds,
         recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
         lastUpdatedVendorNameByUserId: (_a = payload.last_updated_vendor_name_by_user) === null || _a === void 0 ? void 0 : _a.user_id,
-        /* merge_vendor_name can be an empty string from platform in cases other than `merge_in_qbo` status.
-           So, to avoid further string length checks, making this undefined.*/
         mergeVendorName: payload.merge_vendor_name != null && payload.merge_vendor_name.length > 0
             ? payload.merge_vendor_name
             : undefined,
         transactionAttachments: payload.transaction_attachments != null
             ? payload.transaction_attachments.map((attachmentPayload) => (0, attachmentPayload_1.toAttachment)(attachmentPayload))
             : [],
-        // initially set to false since we haven't saved the url from vendor detail slider, will be true once saved.
-        isWebsiteUrlSaved: false,
+        /* merge_vendor_name can be an empty string from platform in cases other than `merge_in_qbo` status.
+           So, to avoid further string length checks, making this undefined.*/
     };
 };
-_a = vendorFirstReviewView.actions, exports.fetchVendorFirstReviewAttachments = _a.fetchVendorFirstReviewAttachments, exports.fetchVendorFirstReviewView = _a.fetchVendorFirstReviewView, exports.updateSavedVendorFirstReviewViewLocalData = _a.updateSavedVendorFirstReviewViewLocalData, exports.updateVendorFirstReviewViewFailure = _a.updateVendorFirstReviewViewFailure, exports.clearVendorReviewView = _a.clearVendorReviewView, exports.updateVendorFirstReviewViewScrollYOffset = _a.updateVendorFirstReviewViewScrollYOffset, exports.updateVendorFirstReviewViewPageToken = _a.updateVendorFirstReviewViewPageToken, exports.saveVendorFirstReviewView = _a.saveVendorFirstReviewView, exports.updateVendorFirstReviewSortUiState = _a.updateVendorFirstReviewSortUiState, exports.initializeVendorFirstReviewViewLocalData = _a.initializeVendorFirstReviewViewLocalData, exports.updateVendorFirstReviewViewLocalData = _a.updateVendorFirstReviewViewLocalData, exports.resetVendorFirstReviewLocalData = _a.resetVendorFirstReviewLocalData, exports.updateRecentlySavedErroredVendorData = _a.updateRecentlySavedErroredVendorData, exports.clearRecentlySavedErroredVendorData = _a.clearRecentlySavedErroredVendorData, exports.saveVendorFirstReviewViewSuccessOrFailure = _a.saveVendorFirstReviewViewSuccessOrFailure, exports.updateVendorFirstReviewViewTransactionAttachments = _a.updateVendorFirstReviewViewTransactionAttachments, exports.updateVendorFirstReviewViewTransactionAttachmentsFailure = _a.updateVendorFirstReviewViewTransactionAttachmentsFailure, exports.updateVendorDetailRecommendations = _a.updateVendorDetailRecommendations, exports.updateReviewVendorDetailLocalData = _a.updateReviewVendorDetailLocalData, exports.saveVendorDetailsView = _a.saveVendorDetailsView, exports.updateVendorDetailsViewFailureOrSuccess = _a.updateVendorDetailsViewFailureOrSuccess;
+_a = vendorFirstReviewView.actions, exports.fetchVendorFirstReviewAttachments = _a.fetchVendorFirstReviewAttachments, exports.fetchVendorFirstReviewView = _a.fetchVendorFirstReviewView, exports.updateSavedVendorFirstReviewViewLocalData = _a.updateSavedVendorFirstReviewViewLocalData, exports.updateVendorFirstReviewViewFailure = _a.updateVendorFirstReviewViewFailure, exports.clearVendorReviewView = _a.clearVendorReviewView, exports.updateVendorFirstReviewViewScrollYOffset = _a.updateVendorFirstReviewViewScrollYOffset, exports.updateVendorFirstReviewViewPageToken = _a.updateVendorFirstReviewViewPageToken, exports.saveVendorFirstReviewView = _a.saveVendorFirstReviewView, exports.updateVendorFirstReviewSortUiState = _a.updateVendorFirstReviewSortUiState, exports.initializeVendorFirstReviewViewLocalData = _a.initializeVendorFirstReviewViewLocalData, exports.updateVendorFirstReviewViewLocalData = _a.updateVendorFirstReviewViewLocalData, exports.resetVendorFirstReviewLocalData = _a.resetVendorFirstReviewLocalData, exports.updateRecentlySavedErroredVendorData = _a.updateRecentlySavedErroredVendorData, exports.clearRecentlySavedErroredVendorData = _a.clearRecentlySavedErroredVendorData, exports.saveVendorFirstReviewViewSuccessOrFailure = _a.saveVendorFirstReviewViewSuccessOrFailure, exports.updateVendorFirstReviewViewTransactionAttachments = _a.updateVendorFirstReviewViewTransactionAttachments, exports.updateVendorFirstReviewViewTransactionAttachmentsFailure = _a.updateVendorFirstReviewViewTransactionAttachmentsFailure;
 exports.default = vendorFirstReviewView.reducer;

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

@@ -27,7 +27,6 @@ export interface VendorFirstReviewSelectorView {
     status: ReviewStatus;
     lastUpdatedVendorNameByUser?: User;
     mergeVendorName: string | undefined;
-    isWebsiteUrlSaved: boolean;
     saveStatus: FetchStateAndError;
     attachmentFetchStatus: FetchStateAndError;
     recommendations: RecommendedNonExistingGlobalMerchant[];
@@ -40,19 +39,10 @@ interface RecentlySavedErroredVendorView {
     oldRecommendedVendor?: RecommendedNonExistingGlobalMerchant;
     newRecommendedVendor?: RecommendedNonExistingGlobalMerchant;
 }
-export interface FirstReviewVendorDetailSelectorView {
-    id?: ID;
-    qboId?: ID;
-    name?: string;
-    websiteUrl?: ZeniUrl;
-    recommendations: RecommendedNonExistingGlobalMerchant[];
-    saveStatus: FetchStateAndError;
-}
 export declare const getVendorFirstReviewView: (state: RootState) => VendorFirstReviewViewSelectorView;
 export interface VendorFirstReviewSelectorAttachmentView {
     attachmentFetchStatus: FetchStateAndError;
     transactionAttachments: Attachment[];
 }
 export declare const getVendorFirstReviewAttachmentView: (state: RootState, vendorId: ID) => VendorFirstReviewSelectorAttachmentView | undefined;
-export declare const getVendorDetailSelectorView: (state: RootState) => FirstReviewVendorDetailSelectorView;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVendorDetailSelectorView = exports.getVendorFirstReviewAttachmentView = exports.getVendorFirstReviewView = void 0;
+exports.getVendorFirstReviewAttachmentView = exports.getVendorFirstReviewView = void 0;
 const globalMerchantSelector_1 = require("../../../entity/globalMerchant/globalMerchantSelector");
 const userSelector_1 = require("../../../entity/user/userSelector");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
@@ -63,7 +63,6 @@ const getVendorFirstReviewView = (state) => {
             recommendations,
             currentSelection: vendorLocalData.currentSelection,
             mergeVendorName: vendorLocalData.mergeVendorName,
-            isWebsiteUrlSaved: vendorLocalData.isWebsiteUrlSaved,
             transactionAttachments,
         };
     });
@@ -111,22 +110,3 @@ const getVendorFirstReviewAttachmentView = (state, vendorId) => {
     };
 };
 exports.getVendorFirstReviewAttachmentView = getVendorFirstReviewAttachmentView;
-const getVendorDetailSelectorView = (state) => {
-    var _a, _b, _c;
-    const { vendorFirstReviewViewState, globalMerchantState } = state;
-    const { vendorLocalData } = vendorFirstReviewViewState;
-    let recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, (_a = vendorLocalData === null || vendorLocalData === void 0 ? void 0 : vendorLocalData.vendorDetails.recommendationIds) !== null && _a !== void 0 ? _a : []);
-    recommendations = [
-        ...recommendations,
-        ...((_b = vendorLocalData === null || vendorLocalData === void 0 ? void 0 : vendorLocalData.vendorDetails.recommendedNonExistingGlobalMerchants) !== null && _b !== void 0 ? _b : []),
-    ];
-    return {
-        id: vendorLocalData === null || vendorLocalData === void 0 ? void 0 : vendorLocalData.vendorDetails.id,
-        qboId: vendorLocalData === null || vendorLocalData === void 0 ? void 0 : vendorLocalData.vendorDetails.qboId,
-        name: vendorLocalData === null || vendorLocalData === void 0 ? void 0 : vendorLocalData.vendorDetails.name,
-        websiteUrl: vendorLocalData === null || vendorLocalData === void 0 ? void 0 : vendorLocalData.vendorDetails.websiteUrl,
-        recommendations,
-        saveStatus: (_c = vendorLocalData === null || vendorLocalData === void 0 ? void 0 : vendorLocalData.saveStatus) !== null && _c !== void 0 ? _c : { fetchState: 'Not-Started' },
-    };
-};
-exports.getVendorDetailSelectorView = getVendorDetailSelectorView;

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

@@ -1,16 +1,12 @@
 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 FirstReviewPageCurrentSelectionByColumn {
+export interface CurrentSelectionByColumn {
     retain: boolean;
-    recommendedFirst: boolean;
-    recommendedSecond: boolean;
-    rename: boolean;
-    customMerchant: boolean;
+    update: boolean;
 }
 export declare const toVendorFirstReviewViewColumnKeyType: (v: string) => "action" | "status" | "vendor" | "retain" | "updateTo" | "ytd" | "viewTenantInvoice";
 export declare type VendorFirstReviewViewColumnKey = ReturnType<typeof toVendorFirstReviewViewColumnKeyType>;
@@ -36,7 +32,6 @@ export interface VendorFirstReviewViewLocalData {
     lastUpdatedVendorNameByUserId?: ID;
     mergeVendorName: string | undefined;
     transactionAttachments: Attachment[];
-    isWebsiteUrlSaved: boolean;
 }
 interface RecentlySavedErroredVendorData {
     vendorId: ID;
@@ -52,20 +47,7 @@ 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 'originalVendor':
-            return 'original_vendor';
-        case 'requestedVendor':
-            return 'requested_vendor';
+        case 'updatedFrom':
+            return 'old_merchant_name';
+        case 'vendors':
+            return 'merchant_name';
         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" | "original_vendor" | "requested_vendor" | "tenant_name";
+export declare const toVendorGlobalReviewSortByKeyType: (v: string) => "recommended_global_merchant_name" | "old_merchant_name" | "merchant_name" | "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 = [
-    'original_vendor',
-    'requested_vendor',
+    'old_merchant_name',
+    'merchant_name',
     'tenant_name',
     'recommended_global_merchant_name',
 ];

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

@@ -3,7 +3,6 @@ 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;
@@ -30,10 +29,6 @@ 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>, updateVendorGlobalReviewViewLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    merchantId: ID;
-    currentSelection: GlobalVendorReviewRowCurrentSelection;
-    customMerchantId?: string | undefined;
-}, string>;
+}, string>, rejectVendorGlobalReviewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, clearVendorGlobalReviewView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<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.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;
+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,17 +153,6 @@ 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;
@@ -200,7 +189,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, exports.updateVendorGlobalReviewViewLocalData = _a.updateVendorGlobalReviewViewLocalData;
+_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.default = vendorGlobalReviewView.reducer;
 /**
  * Helpers
@@ -231,15 +220,14 @@ const mapPayloadToVendorGlobalReviewView = (payload) => {
         tenantId: payload.tenant_id,
         recommendationIds,
         recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
-        currentSelection: null,
     };
 };
 const toVendorGlobalReviewColumnSortKey = (sortByKey) => {
     switch (sortByKey) {
-        case 'original_vendor':
-            return 'originalVendor';
-        case 'requested_vendor':
-            return 'requestedVendor';
+        case 'old_merchant_name':
+            return 'updatedFrom';
+        case 'merchant_name':
+            return 'vendors';
         case 'recommended_global_merchant_name':
             return 'recommended';
         case 'tenant_name':

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

@@ -5,14 +5,12 @@ 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;
-    recommendations: RecommendedNonExistingGlobalMerchant[];
-    currentSelection: GlobalVendorReviewRowCurrentSelection;
+    recommendedMerchant?: RecommendedNonExistingGlobalMerchant;
 }
 export interface VendorGlobalReviewViewSelectorView extends SelectorView {
     vendorGlobalReviewData: VendorGlobalReview[];

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

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

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

@@ -1,16 +1,9 @@
 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) => "recommended" | "originalVendor" | "tenants" | "requestedVendor";
+export declare const toVendorGlobalReviewColumnSortKeyType: (v: string) => "vendors" | "recommended" | "tenants" | "updatedFrom";
 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;
@@ -26,7 +19,6 @@ 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',
-    'originalVendor',
+    'vendors',
+    'updatedFrom',
     '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.20",
+  "version": "4.12.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",

package/lib/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardTransactionAttachmentsEpic.d.ts

@@ -1,10 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { RootState } from '../../../../reducer';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { fetchChargeCardTransactionAttachments, updateChargeCardTransactionAttachmentsInCardDetail, updateChargeCardTransactionAttachmentsFailure } from './chargeCardDetailReducer';
-export declare type ActionType = ReturnType<typeof fetchChargeCardTransactionAttachments> | ReturnType<typeof updateChargeCardTransactionAttachmentsInCardDetail> | ReturnType<typeof updateChargeCardTransactionAttachmentsFailure>;
-export declare const fetchChargeCardTransactionAttachmentsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
-export interface ChargeCardTransactionAttachmentQueryPayload {
-    attachment_ids: string[];
-}

package/lib/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardTransactionAttachmentsEpic.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchChargeCardTransactionAttachmentsEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const responsePayload_1 = require("../../../../responsePayload");
-const chargeCardDetailReducer_1 = require("./chargeCardDetailReducer");
-const fetchChargeCardTransactionAttachmentsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(chargeCardDetailReducer_1.fetchChargeCardTransactionAttachments.match), (0, operators_1.switchMap)((action) => {
-    const { transactionId, cardId, attachmentIds } = action.payload;
-    let apiUrl = `${zeniAPI.apiEndPoints.cardMicroServiceBaseUrl}/1.0/cards/transactions/${transactionId}/attachments`;
-    const queryParam = {
-        attachment_ids: attachmentIds,
-    };
-    apiUrl =
-        apiUrl + `?query=${encodeURIComponent(JSON.stringify(queryParam))}`;
-    return zeniAPI
-        .getJSON(apiUrl)
-        .pipe((0, operators_1.mergeMap)((response) => {
-        if ((0, responsePayload_1.isSuccessStatus)(response) && response.data != null) {
-            return (0, rxjs_1.of)((0, chargeCardDetailReducer_1.updateChargeCardTransactionAttachmentsInCardDetail)({
-                transactionId,
-                cardId,
-                transactionAttachments: response.data.attachments,
-            }));
-        }
-        else {
-            return (0, rxjs_1.of)((0, chargeCardDetailReducer_1.updateChargeCardTransactionAttachmentsFailure)({
-                cardId,
-                transactionId,
-                status: response.status,
-            }));
-        }
-    }), (0, operators_1.catchError)((error) => {
-        return (0, rxjs_1.of)((0, chargeCardDetailReducer_1.updateChargeCardTransactionAttachmentsFailure)({
-            cardId,
-            transactionId,
-            status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch charge card transaction attachments API call errored out' +
-                JSON.stringify(error)),
-        }));
-    }));
-}));
-exports.fetchChargeCardTransactionAttachmentsEpic = fetchChargeCardTransactionAttachmentsEpic;

package/lib/view/taskManager/taskListView/updateTaskFromListViewEpic.d.ts

@@ -1,8 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { RootState } from '../../../reducer';
-import { ZeniAPI } from '../../../zeniAPI';
-import { updateTaskFromListView, updateTasksListOnUpdateTaskSuccess, updateTasksListOnUpdateTaskFailure } from './taskListReducer';
-import { updateTasks } from '../../../entity/task/taskReducer';
-export declare type ActionType = ReturnType<typeof updateTaskFromListView> | ReturnType<typeof updateTasks> | ReturnType<typeof updateTasksListOnUpdateTaskFailure> | ReturnType<typeof updateTasksListOnUpdateTaskSuccess>;
-export declare const updateTaskFromListViewEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/taskManager/taskListView/updateTaskFromListViewEpic.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTaskFromListViewEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const responsePayload_1 = require("../../../responsePayload");
-const taskListReducer_1 = require("./taskListReducer");
-const taskReducer_1 = require("../../../entity/task/taskReducer");
-const bulkUpdateTaskListEpic_1 = require("./bulkUpdateTaskListEpic");
-const updateTaskFromListViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.updateTaskFromListView.match), (0, operators_1.switchMap)((action) => {
-    const state = state$.value;
-    const { task, updates } = action.payload;
-    const taskId = task.id;
-    const payload = {
-        tasks: (0, bulkUpdateTaskListEpic_1.getTasksListPayload)(state, [taskId], updates),
-    };
-    return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`, payload)
-        .pipe((0, operators_1.mergeMap)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-            return (0, rxjs_1.from)([
-                (0, taskReducer_1.updateTasks)(response.data.tasks),
-                (0, taskListReducer_1.updateTasksListOnUpdateTaskSuccess)(),
-            ]);
-        }
-        else {
-            return (0, rxjs_1.of)((0, taskListReducer_1.updateTasksListOnUpdateTaskFailure)({
-                error: response.status,
-            }));
-        }
-    }), (0, operators_1.catchError)((error) => {
-        return (0, rxjs_1.of)((0, taskListReducer_1.updateTasksListOnUpdateTaskFailure)({
-            error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'update task from list view REST API call errored out' +
-                JSON.stringify(error)),
-        }));
-    }));
-}));
-exports.updateTaskFromListViewEpic = updateTaskFromListViewEpic;

package/lib/view/vendorReviewView/vendorFirstReviewView/epics/saveVendorDetailsViewEpic.d.ts

@@ -1,8 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { RootState } from '../../../../reducer';
-import { saveVendorDetailsView, updateVendorDetailsViewFailureOrSuccess } from '../vendorFirstReviewViewReducer';
-import { updateVendors } from '../../../../entity/vendor/vendorReducer';
-import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-export declare type ActionType = ReturnType<typeof saveVendorDetailsView> | ReturnType<typeof updateVendors> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateVendorDetailsViewFailureOrSuccess>;
-export declare const saveVendorDetailsViewEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;