@zeniai/client-epic-state 4.12.18 → 4.12.20

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

@@ -289,7 +289,9 @@ const taskList = (0, toolkit_1.createSlice)({
                 const priorityKey = (0, taskState_1.toPriorityCodeType)(currentTaskState.priority.code);
                 const statusKey = (0, taskState_1.toTaskStatusCodeType)(currentTaskState.status.code);
                 const assigneeKey = getAssigneesGroupKey(currentTaskState.assignees);
-                const tagsKey = currentTaskState.tagIds.join();
+                const tagIds = [...currentTaskState.tagIds];
+                tagIds.sort();
+                const tagsKey = tagIds.join();
                 const dueDateKey = currentTaskState.dueDate != null
                     ? getDueDateGroupKey(currentTaskState.dueDate.toString())
                     : 'upcoming';
@@ -350,22 +352,25 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.localData.existingTaskGroupNamesByGroupId = Object.assign(Object.assign({}, draft.localData.existingTaskGroupNamesByGroupId), { [taskGroupId]: taskGroupName });
         },
         updateTaskFromListView(draft, action) {
-            const { updates, prevGroupId, taskId } = action.payload;
+            var _a;
+            const { updates, task } = action.payload;
+            const taskId = task.id;
             draft.updateTasksFetchState.fetchState = 'In-Progress';
             draft.updateTasksFetchState.error = undefined;
             if (updates.priority != null) {
-                const prevPriorityCode = (0, taskState_1.toPriorityCodeType)(prevGroupId);
+                const prevPriorityCode = (0, taskState_1.toPriorityCodeType)(task.priority.code);
                 draft.taskIdsByPriority[prevPriorityCode] = draft.taskIdsByPriority[prevPriorityCode].filter((id) => id != taskId);
                 const newPriorityCode = (0, taskState_1.toPriorityCodeType)(updates.priority.code);
                 draft.taskIdsByPriority[newPriorityCode].push(taskId);
             }
             if (updates.status != null) {
-                const prevStatusCode = (0, taskState_1.toTaskStatusCodeType)(prevGroupId);
+                const prevStatusCode = (0, taskState_1.toTaskStatusCodeType)(task.status.code);
                 draft.taskIdsByStatus[prevStatusCode] = draft.taskIdsByStatus[prevStatusCode].filter((id) => id != taskId);
                 const newStatusCode = (0, taskState_1.toTaskStatusCodeType)(updates.status.code);
                 draft.taskIdsByStatus[newStatusCode].push(taskId);
             }
             if (updates.assignees != null) {
+                const prevGroupId = getAssigneesGroupKey(task.assignees);
                 draft.taskIdsByAssignees[prevGroupId] = draft.taskIdsByAssignees[prevGroupId].filter((id) => id != taskId);
                 const newGroupId = updates.assignees.join(',');
                 if (draft.taskIdsByAssignees[newGroupId] != null) {
@@ -376,12 +381,17 @@ const taskList = (0, toolkit_1.createSlice)({
                 }
             }
             if (updates.dueDate != null) {
-                const prevDueDateKey = (0, taskList_1.toDueDateGroupKeyType)(prevGroupId);
+                const prevDueDateKey = task.dueDate != null
+                    ? (0, taskList_1.toDueDateGroupKeyType)((_a = task.dueDate) === null || _a === void 0 ? void 0 : _a.toString())
+                    : 'upcoming';
                 draft.taskIdsByDueDate[prevDueDateKey] = draft.taskIdsByDueDate[prevDueDateKey].filter((id) => id != taskId);
                 const newDueDateKey = getDueDateGroupKey(updates.dueDate.toString());
                 draft.taskIdsByDueDate[newDueDateKey].push(taskId);
             }
             if (updates.tagIds != null) {
+                const tagIds = [...task.tagIds];
+                tagIds.sort();
+                const prevGroupId = tagIds.join(',');
                 draft.taskIdsByTags[prevGroupId] = draft.taskIdsByTags[prevGroupId].filter((id) => id != taskId);
                 const newGroupId = updates.tagIds.join(',');
                 if (draft.taskIdsByTags[newGroupId] != null) {

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

@@ -9,7 +9,8 @@ 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 { taskId, updates } = action.payload;
+    const { task, updates } = action.payload;
+    const taskId = task.id;
     const payload = {
         tasks: (0, bulkUpdateTaskListEpic_1.getTasksListPayload)(state, [taskId], updates),
     };

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

@@ -14,7 +14,8 @@ export interface VendorReviewRecommendationViewState {
 export interface VendorReviewNonExistingRecommendationViewState {
     globalMerchants: RecommendedNonExistingGlobalMerchant[];
 }
-export declare type VendorReviewRowCurrentSelection = 'retain' | 'update' | 'custom_merchant' | 'rename' | null;
+export declare type VendorReviewRowCurrentSelection = 'retain' | 'recommendedFirst' | 'recommendedSecond' | 'customMerchant' | 'rename' | null;
+export declare type GlobalVendorReviewRowCurrentSelection = 'requested' | 'recommendedFirst' | 'recommendedSecond' | 'originalVendor' | null;
 /**
  * Helpers
  */

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

@@ -49,12 +49,12 @@ 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));
+    (_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));
+            nonExistingRecommendations.push((0, exports.toNonExistingGlobalMerchantBase)(globalMerchant));
         }
     });
     const recommendationIds = recommendations.map((recommendation) => recommendation.globalMerchantId);

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

@@ -0,0 +1,8 @@
+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>;

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

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveVendorDetailsViewEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const responsePayload_1 = require("../../../../responsePayload");
+const vendorFirstReviewViewReducer_1 = require("../vendorFirstReviewViewReducer");
+const vendorReducer_1 = require("../../../../entity/vendor/vendorReducer");
+const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
+const vendorFirstReviewViewPayload_1 = require("../vendorFirstReviewViewPayload");
+const saveVendorDetailsViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(vendorFirstReviewViewReducer_1.saveVendorDetailsView.match), (0, operators_1.mergeMap)(() => {
+    var _a, _b;
+    const { vendorFirstReviewViewState } = state$.value;
+    const vendorDetails = (_a = vendorFirstReviewViewState.vendorLocalData) === null || _a === void 0 ? void 0 : _a.vendorDetails;
+    const payload = (0, vendorFirstReviewViewPayload_1.prepareVendorPayload)(vendorDetails);
+    const vendorId = (_b = vendorFirstReviewViewState.vendorLocalData) === null || _b === void 0 ? void 0 : _b.vendorDetails.id;
+    if (vendorId != null) {
+        const saveVendorApi = zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/vendors/${vendorId}`, payload);
+        return saveVendorApi.pipe((0, operators_1.mergeMap)((response) => {
+            if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+                const actions = [
+                    (0, vendorReducer_1.updateVendors)(response.data.vendors),
+                ];
+                actions.push((0, vendorFirstReviewViewReducer_1.updateVendorDetailsViewFailureOrSuccess)({
+                    vendorId,
+                    fetchState: 'Completed',
+                }));
+                return (0, rxjs_1.from)(actions);
+            }
+            else {
+                const actions = [];
+                // Note: We need to skip snackbar when error code is 409, which is Vendor already exists error code.
+                // We show inline error message in this case instead of snackbar
+                if (response.status.code !== 409) {
+                    actions.push((0, vendorFirstReviewViewReducer_1.updateVendorDetailsViewFailureOrSuccess)({
+                        vendorId,
+                        fetchState: 'Error',
+                    }));
+                    actions.push((0, snackbarReducer_1.openSnackbar)({
+                        messageSection: 'update_vendor',
+                        messageText: 'failed',
+                        type: 'error',
+                        variables: [
+                            {
+                                variableName: '_api-error_',
+                                variableValue: response.status.message,
+                            },
+                        ],
+                    }));
+                }
+                return (0, rxjs_1.from)(actions);
+            }
+        }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, vendorFirstReviewViewReducer_1.updateVendorDetailsViewFailureOrSuccess)({
+            vendorId,
+            fetchState: 'Error',
+            error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Vendor Save on First Review View REST API call errored out ' +
+                JSON.stringify(error)),
+        }))));
+    }
+    return (0, rxjs_1.from)([]);
+}));
+exports.saveVendorDetailsViewEpic = saveVendorDetailsViewEpic;

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

@@ -4,7 +4,7 @@ import { UserBasePayload } from '../../../entity/user/userPayload';
 import { VendorPayload } from '../../../entity/vendor/vendorPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { AllGlobalMerchantBasePayload, VendorReviewViewAllRecommendationsPayload, VendorReviewViewRecommendationsPayload } from '../common/payload/commonTypes';
-import { VendorFirstReviewViewColumnKey } from './vendorFirstReviewViewState';
+import { VendorFirstReviewViewColumnKey, VendorViewLocalData } from './vendorFirstReviewViewState';
 export interface VendorTransactionAttachment {
     attachmentEndpoint: string;
     vendorId: ID;
@@ -71,4 +71,10 @@ export declare type SaveVendorFirstReviewResponse = ZeniAPIResponse<SaveVendorFi
  *  helpers
  */
 export declare const toVendorFirstReviewViewColumnKeyPayload: (key: VendorFirstReviewViewColumnKey) => string;
+export interface VendorWebsiteUrlUpdatePayload {
+    qbo_id: string;
+    vendor_name: string;
+    website_url: string;
+}
+export declare const prepareVendorPayload: (vendorDetailLocalData?: VendorViewLocalData | undefined) => Partial<VendorWebsiteUrlUpdatePayload>;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toVendorFirstReviewViewColumnKeyPayload = void 0;
+exports.prepareVendorPayload = exports.toVendorFirstReviewViewColumnKeyPayload = void 0;
 /**
  *  helpers
  */
@@ -18,3 +18,13 @@ const toVendorFirstReviewViewColumnKeyPayload = (key) => {
     }
 };
 exports.toVendorFirstReviewViewColumnKeyPayload = toVendorFirstReviewViewColumnKeyPayload;
+const prepareVendorPayload = (vendorDetailLocalData) => {
+    const payload = {};
+    payload.vendor_name = vendorDetailLocalData === null || vendorDetailLocalData === void 0 ? void 0 : vendorDetailLocalData.name;
+    payload.qbo_id = vendorDetailLocalData === null || vendorDetailLocalData === void 0 ? void 0 : vendorDetailLocalData.qboId;
+    if ((vendorDetailLocalData === null || vendorDetailLocalData === void 0 ? void 0 : vendorDetailLocalData.websiteUrl) != null) {
+        payload.website_url = vendorDetailLocalData.websiteUrl.toString();
+    }
+    return payload;
+};
+exports.prepareVendorPayload = prepareVendorPayload;

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

@@ -2,8 +2,9 @@ import { FetchState, ID } from '../../../commonStateTypes/common';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { SaveVendorFirstReviewViewPayload, ReviewStatusPayload, VendorFirstReviewPayload } from './vendorFirstReviewViewPayload';
-import { VendorFirstReviewViewColumnKey, VendorFirstReviewViewState, RecommendedNonExistingGlobalMerchant, CurrentSelectionByColumn } from './vendorFirstReviewViewState';
+import { VendorFirstReviewViewColumnKey, VendorFirstReviewViewState, RecommendedNonExistingGlobalMerchant, VendorViewLocalData } from './vendorFirstReviewViewState';
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
+import { VendorReviewRowCurrentSelection } from '../common/state/commonTypes';
 import { AttachmentPayload } from '../../../entity/transaction/payloadTypes/attachmentPayload';
 export declare const initialState: VendorFirstReviewViewState;
 export declare const fetchVendorFirstReviewAttachments: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[vendorId: string, attachmentIds: string[]], {
@@ -28,14 +29,14 @@ export declare const fetchVendorFirstReviewAttachments: import("@reduxjs/toolkit
     markAsLocalContractor: any;
 }, string, never, never>, updateVendorFirstReviewSortUiState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     sortOrder: SortOrder;
-    sortkey: VendorFirstReviewViewColumnKey;
+    sortKey: VendorFirstReviewViewColumnKey;
 }, string>, initializeVendorFirstReviewViewLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     response: VendorFirstReviewPayload;
     keepExistingListItems?: boolean | undefined;
 }, string>, updateVendorFirstReviewViewLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     vendorId: ID;
-    currentSelection: CurrentSelectionByColumn;
-    selectedGlobalMerchantId?: string | undefined;
+    currentSelection: VendorReviewRowCurrentSelection;
+    selectedGlobalMerchantId: ID;
     vendorRenamedText?: string | undefined;
 }, string>, resetVendorFirstReviewLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     vendorId: ID;
@@ -57,6 +58,15 @@ export declare const fetchVendorFirstReviewAttachments: import("@reduxjs/toolkit
     transactionAttachments: AttachmentPayload[];
 }, string>, updateVendorFirstReviewViewTransactionAttachmentsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: ZeniAPIStatus;
+}, string>, updateVendorDetailRecommendations: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    recommendationIds: ID[];
+    recommendedNonExistingGlobalMerchants: RecommendedNonExistingGlobalMerchant[];
+}, string>, updateReviewVendorDetailLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    vendorDetails: VendorViewLocalData;
+}, string>, saveVendorDetailsView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateVendorDetailsViewFailureOrSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    vendorId: ID;
+    fetchState: FetchState;
+    error?: ZeniAPIStatus<Record<string, unknown>> | undefined;
 }, string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<VendorFirstReviewViewState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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;
 const toolkit_1 = require("@reduxjs/toolkit");
 const commonTypes_1 = require("../common/state/commonTypes");
 const attachmentPayload_1 = require("../../../entity/transaction/payloadTypes/attachmentPayload");
@@ -22,6 +22,7 @@ exports.initialState = {
         fetchState: 'Not-Started',
         error: undefined,
     },
+    vendorLocalData: null,
     hasValidState() {
         return this.fetchState == 'Completed';
     },
@@ -73,7 +74,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 });
@@ -93,48 +94,17 @@ 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 (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,
+                if (vendorRenamedText != null) {
+                    draft.vendorFirstReviewViewLocalDataById[vendorId].vendorFirstReviewViewLocalData = Object.assign(Object.assign({}, vendorLocalData), { selectedVendorId: selectedGlobalMerchantId, currentSelection,
                         vendorRenamedText });
                 }
                 else {
-                    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 });
+                    draft.vendorFirstReviewViewLocalDataById[vendorId].vendorFirstReviewViewLocalData = Object.assign(Object.assign({}, vendorLocalData), { vendorRenamedText: undefined, selectedVendorId: selectedGlobalMerchantId, currentSelection });
                 }
             }
         },
@@ -212,6 +182,52 @@ 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;
         },
@@ -251,16 +267,6 @@ 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;
@@ -293,15 +299,17 @@ 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))
             : [],
-        /* 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.*/
+        // initially set to false since we haven't saved the url from vendor detail slider, will be true once saved.
+        isWebsiteUrlSaved: false,
     };
 };
-_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;
+_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;
 exports.default = vendorFirstReviewView.reducer;

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

@@ -27,6 +27,7 @@ export interface VendorFirstReviewSelectorView {
     status: ReviewStatus;
     lastUpdatedVendorNameByUser?: User;
     mergeVendorName: string | undefined;
+    isWebsiteUrlSaved: boolean;
     saveStatus: FetchStateAndError;
     attachmentFetchStatus: FetchStateAndError;
     recommendations: RecommendedNonExistingGlobalMerchant[];
@@ -39,10 +40,19 @@ 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.getVendorFirstReviewAttachmentView = exports.getVendorFirstReviewView = void 0;
+exports.getVendorDetailSelectorView = 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,6 +63,7 @@ const getVendorFirstReviewView = (state) => {
             recommendations,
             currentSelection: vendorLocalData.currentSelection,
             mergeVendorName: vendorLocalData.mergeVendorName,
+            isWebsiteUrlSaved: vendorLocalData.isWebsiteUrlSaved,
             transactionAttachments,
         };
     });
@@ -110,3 +111,22 @@ 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,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;