@zeniai/client-epic-state 4.13.3 → 4.13.4

package/lib/commonStateTypes/fileType.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toFileTypeStrict = exports.ALL_FILE_TYPES = void 0;
 const stringToUnion_1 = require("./stringToUnion");
-exports.ALL_FILE_TYPES = ['pdf', 'excel', "csv"];
+exports.ALL_FILE_TYPES = ['pdf', 'excel', 'csv'];
 const toFileTypeStrict = (v) => { var _a; return (0, stringToUnion_1.stringToUnionStrict)((_a = v === null || v === void 0 ? void 0 : v.toLocaleLowerCase()) !== null && _a !== void 0 ? _a : '', exports.ALL_FILE_TYPES); };
 exports.toFileTypeStrict = toFileTypeStrict;

package/lib/commonStateTypes/timePeriod.d.ts

@@ -22,11 +22,11 @@ export interface AbsoluteDay {
     year: number;
 }
 export interface MonthYearPeriod {
-    month: number;
+    month: Month;
     year: number;
 }
-export declare type MonthYearPeriodId = `${number}_${number}`;
-export declare type MonthYearPeriodQuery = `${number}-${number}`;
+export declare type MonthYearPeriodId = `${Month}_${number}`;
+export declare type MonthYearPeriodQuery = `${Month}-${number}`;
 export declare const toMonthYearPeriodQuery: (selectedPeriod: MonthYearPeriod) => MonthYearPeriodQuery;
 export declare const toMonthYearPeriodId: (selectedPeriod: MonthYearPeriod) => MonthYearPeriodId;
 /**

package/lib/entity/monthEndCloseChecks/monthEndCloseChecksPayload.js

@@ -27,13 +27,20 @@ const toMonthEndInsights = (monthEndStatisticsPayload) => {
     };
 };
 const toMonthYearPeriods = (historicMonthYearPayload) => {
-    return historicMonthYearPayload.map((monthYearString) => {
+    const historicMonthYears = historicMonthYearPayload.map((monthYearString) => {
         const parsedDate = (0, zeniDayJS_1.date)(monthYearString, formatZeniDateFY_1.MM_YYYY_FORMAT);
         return {
-            month: parsedDate.month() + 1,
+            month: (0, timePeriod_1.toMonth)(parsedDate.month() + 1),
             year: parsedDate.year(),
         };
     });
+    historicMonthYears.sort((a, b) => {
+        if (a.year !== b.year) {
+            return a.year - b.year; // Sort by year first
+        }
+        return a.month - b.month; // Then sort by month
+    });
+    return historicMonthYears;
 };
 const toMonthEndCloseChecksInfo = (payload, period) => ({
     id: (0, timePeriod_1.toMonthYearPeriodId)(period),

package/lib/entity/tenant/epic/fetchAllTenantsEpic.js

@@ -8,6 +8,7 @@ const responsePayload_1 = require("../../../responsePayload");
 const companyReducer_1 = require("../../company/companyReducer");
 const expenseAutomationViewReducer_1 = require("../../../view/expenseAutomationView/expenseAutomationViewReducer");
 const zeniDayJS_1 = require("../../../zeniDayJS");
+const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const fetchAllTenantsEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(tenantReducer_1.fetchAllTenants.match), (0, operators_1.switchMap)((action) => zeniAPI
     .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/users/${action.payload.userId}/tenants`, Object.assign({ 'zeni-user-id': action.payload.userId }, { 'zeni-tenant-id': '' }, action.payload.zeniSessionId != null
     ? { 'zeni-session-id': action.payload.zeniSessionId }
@@ -52,7 +53,7 @@ const fetchAllTenantsEpic = (actions$, state, zeniAPI) => actions$.pipe((0, oper
     JSON.stringify(error))))))));
 exports.fetchAllTenantsEpic = fetchAllTenantsEpic;
 const defaultMonthYearPeriod = {
-    month: (0, zeniDayJS_1.dateNow)().get('month') + 1,
+    month: (0, timePeriod_1.toMonth)((0, zeniDayJS_1.dateNow)().get('month') + 1),
     year: (0, zeniDayJS_1.dateNow)().get('year'),
 };
 const getDefaultSelectedPeriodsForTenants = (tenantsData) => {
@@ -67,7 +68,7 @@ const getDefaultSelectedPeriodsForTenants = (tenantsData) => {
 const getMonthYearPeriodFromBookCloseDate = (zeniBookCloseDate) => {
     return zeniBookCloseDate != null
         ? {
-            month: zeniBookCloseDate.add(1, 'month').get('month') + 1,
+            month: (0, timePeriod_1.toMonth)(zeniBookCloseDate.add(1, 'month').get('month') + 1),
             year: zeniBookCloseDate.add(1, 'month').get('year'),
         }
         : defaultMonthYearPeriod;

package/lib/entity/vendorExpense/vendorExpenseSelector.d.ts

@@ -4,7 +4,7 @@ import { VendorExpenseTrend } from './vendorExpenseTrend';
 import { TimeframeTick } from '../../commonStateTypes/timeframeTick';
 import { Month } from '../../commonStateTypes/timePeriod';
 export declare function getVendor(vendorExpenseState: VendorExpenseState, vendorId: ID, timePeriod: TimeframeTick | undefined, firstMonthOfFY?: Month, filter?: VendorSpendTrendFilterTabType): VendorExpenseTrend | undefined;
-declare const toVendorSpendTrendFilterTabsType: (v: string) => "last_month" | "last_30_days" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year";
-export declare const toVendorSpendTrendFilterTabsTypeStrict: (v: string) => "last_month" | "last_30_days" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year" | undefined;
+declare const toVendorSpendTrendFilterTabsType: (v: string) => "last_month" | "last_30_days" | "variance" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year";
+export declare const toVendorSpendTrendFilterTabsTypeStrict: (v: string) => "last_month" | "last_30_days" | "variance" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year" | undefined;
 export declare type VendorSpendTrendFilterTabType = ReturnType<typeof toVendorSpendTrendFilterTabsType>;
 export {};

package/lib/entity/vendorExpense/vendorExpenseSelector.js

@@ -22,6 +22,7 @@ function getVendor(vendorExpenseState, vendorId, timePeriod, firstMonthOfFY, fil
 exports.getVendor = getVendor;
 const VENDOR_SPEND_TREND_FILTER_TABS_TYPES = [
     'last_30_days',
+    'variance',
     'last_90_days',
     'YTD_spend',
     'last_month',

package/lib/view/commonVendorView/vendorView/epics/fetchVendorDetailsEpic.js

@@ -12,7 +12,7 @@ const vendorTypeListReducer_1 = require("../../../vendorTypeList/vendorTypeListR
 const fetchVendorDetailsEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(vendorViewReducer_1.fetchVendorDetails.match), (0, operators_1.switchMap)((action) => {
     const vendorActions = [];
     const state = state$.value;
-    if (action.payload.cacheOverride == true) {
+    if (action.payload.cacheOverride === true) {
         vendorActions.push((0, accountListReducer_1.fetchAccountList)('accountList', true));
         vendorActions.push((0, classListReducer_1.fetchClassList)());
         vendorActions.push((0, vendorTypeListReducer_1.fetchVendorTypeList)());

package/lib/view/commonVendorView/vendorView/vendorViewReducer.d.ts

@@ -5,8 +5,8 @@ import { VendorDetailLocalData, VendorViewState, VendorContactInfo } from './ven
 import { Recommendation } from '../../../commonStateTypes/recommendationBase';
 export declare const initialVendorDetailLocalData: VendorDetailLocalData;
 export declare const initialState: VendorViewState;
-export declare const fetchVendorDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, vendorId?: string | undefined, signal?: AbortSignal | undefined], {
-    cacheOverride: any;
+export declare const fetchVendorDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, vendorId?: string | undefined, signal?: AbortSignal | undefined], {
+    cacheOverride: boolean;
     vendorId: string | undefined;
     signal: AbortSignal | undefined;
 }, string, never, never>, fetchVendor: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[vendorId: string, isCreatable?: boolean | undefined, signal?: AbortSignal | undefined], {

package/lib/view/commonVendorView/vendorView/vendorViewReducer.js

@@ -100,7 +100,7 @@ const vendorView = (0, toolkit_1.createSlice)({
                         } });
                 }
             },
-            prepare(cacheOverride = false, vendorId, signal) {
+            prepare(cacheOverride, vendorId, signal) {
                 return { payload: { cacheOverride, vendorId, signal } };
             },
         },
@@ -125,7 +125,7 @@ const vendorView = (0, toolkit_1.createSlice)({
                     payload: {
                         vendorId,
                         isCreatable,
-                        signal
+                        signal,
                     },
                 };
             },

package/lib/view/commonVendorView/vendorsTabVendorView/vendorsTabVendorViewReducer.d.ts

@@ -36,8 +36,8 @@ export declare const fetchVendorsTabVendorDetails: import("@reduxjs/toolkit").Ac
 }, string, never, never>, updateVendorsTabVendorAllTransactionsTabData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     timePeriod: TimePeriod;
     numberOfQuartersFetched: number;
-}, string>, resetSelectedTabType: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateSelectedTabType: import("@reduxjs/toolkit").ActionCreatorWithPayload<"spend_transactions" | "all_transactions", string>, updateVendorSpendTrendFilterTabValue: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[vendorSpendTrendfilterTabValue: "last_month" | "last_30_days" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year"], {
-    vendorSpendTrendfilterTabValue: "last_month" | "last_30_days" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year";
+}, string>, resetSelectedTabType: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateSelectedTabType: import("@reduxjs/toolkit").ActionCreatorWithPayload<"spend_transactions" | "all_transactions", string>, updateVendorSpendTrendFilterTabValue: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[vendorSpendTrendfilterTabValue: "last_month" | "last_30_days" | "variance" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year"], {
+    vendorSpendTrendfilterTabValue: "last_month" | "last_30_days" | "variance" | "last_90_days" | "YTD_spend" | "last_3_months" | "last_6_months" | "last_12_months" | "last_year";
 }, string, never, never>, resetVendorsTabVendorAllTransactionsTabData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateContactsInVendorTabDetailLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     vendorId: ID;
     localData?: Partial<VendorsTabVendorDetailLocalData> | undefined;

package/lib/view/vendorFiling1099/__mock__/vendorFiling1099DownloadMock.js

@@ -90,5 +90,6 @@ exports.vendorFiling1099DownloadSuccessState = {
     hasValidState: vendorFiling1099ListReducer_1.initialState.hasValidState,
     lastRefreshSuccessTime: undefined,
     isVendor1099Populated: true,
+    // eslint-disable-next-line  @typescript-eslint/no-non-null-assertion
     vendorFiling1099DownloadData: exports.vendorFiling1099DownloadSuccessResponse.data,
 };

package/lib/view/vendorFiling1099/vendorFiling1099List/fetchVendorsFiling1099DownloadEpic.js

@@ -5,7 +5,6 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../responsePayload");
 const vendorFiling1099ListReducer_1 = require("./vendorFiling1099ListReducer");
-const vendorFiling1099ListReducer_2 = require("./vendorFiling1099ListReducer");
 const fetchVendorsFiling1099DownloadEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(vendorFiling1099ListReducer_1.fetchVendorsFiling1099Download.match), (0, operators_1.switchMap)((action) => {
     const type1099Download = action.payload.type1099;
     const queryParams = {
@@ -27,7 +26,7 @@ const fetchVendorsFiling1099DownloadEpic = (actions$, _state$, zeniAPI) => actio
         }
         else {
             return (0, rxjs_1.of)((0, vendorFiling1099ListReducer_1.updateVendorFiling1099DownloadData)({
-                response: vendorFiling1099ListReducer_2.initialState.vendorFiling1099DownloadData,
+                response: vendorFiling1099ListReducer_1.initialState.vendorFiling1099DownloadData,
                 downloadState: {
                     fetchState: 'Error',
                 },
@@ -35,7 +34,7 @@ const fetchVendorsFiling1099DownloadEpic = (actions$, _state$, zeniAPI) => actio
         }
     }), (0, operators_1.catchError)((err) => {
         return (0, rxjs_1.of)((0, vendorFiling1099ListReducer_1.updateVendorFiling1099DownloadData)({
-            response: vendorFiling1099ListReducer_2.initialState.vendorFiling1099DownloadData,
+            response: vendorFiling1099ListReducer_1.initialState.vendorFiling1099DownloadData,
             downloadState: {
                 fetchState: 'Error',
                 error: {

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

@@ -24,7 +24,7 @@ const saveVendorFirstReviewViewEpic = (actions$, state$, zeniAPI) => actions$.pi
     const { vendorId, markAsEmployee, markAsLocalContractor } = action.payload;
     const currentVendorLocalData = vendorFirstReviewViewState.vendorFirstReviewViewLocalDataById[vendorId]
         .vendorFirstReviewViewLocalData;
-    const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(state$.value.vendorState, vendorId);
+    const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorId);
     const { vendorName, selectedGlobalMerchant, recommendations, nonExistingRecommendations, } = getSaveVendorFirstReviewViewPayloadDetails(currentVendorLocalData, globalMerchantState, vendorState);
     const payload = Object.assign({}, prepareSaveVendorFirstReviewViewPayload(vendorName, recommendations, nonExistingRecommendations, markAsEmployee, markAsLocalContractor, currentVendor === null || currentVendor === void 0 ? void 0 : currentVendor.qboId, selectedGlobalMerchant));
     const queryParam = {
@@ -104,7 +104,7 @@ const saveVendorFirstReviewViewEpic = (actions$, state$, zeniAPI) => actions$.pi
                 actions.push((0, vendorFirstReviewViewReducer_1.updateRecentlySavedErroredVendorData)({
                     vendorId: action.payload.vendorId,
                     vendorNameSentForReview: vendorName,
-                    isQBOMergeError: true,
+                    isVendorMergeError: true,
                 }));
             }
             else if (response.status.details != null) {
@@ -122,13 +122,44 @@ const saveVendorFirstReviewViewEpic = (actions$, state$, zeniAPI) => actions$.pi
                 actions.push((0, vendorFirstReviewViewReducer_1.updateRecentlySavedErroredVendorData)({
                     vendorId: action.payload.vendorId,
                     vendorNameSentForReview: vendorName,
-                    isQBOMergeError: false,
+                    isVendorMergeError: false,
                     oldRecommendation,
                     newRecommendation,
                 }));
             }
             return (0, rxjs_1.from)(actions);
         }
+        else if (response.status.code === 400 &&
+            response.status.message.includes('There is already a vendor using that entity name.')) {
+            const actions = [];
+            actions.push((0, vendorFirstReviewViewReducer_1.updateSavedVendorFirstReviewViewLocalData)({
+                vendorId,
+                vendors: response.data && response.data.vendors
+                    ? response.data.vendors
+                    : [],
+            }));
+            actions.push((0, vendorFirstReviewViewReducer_1.saveVendorFirstReviewViewSuccessOrFailure)('Error', action.payload.vendorId, markAsEmployee, markAsLocalContractor, response.status));
+            actions.push((0, vendorReducer_1.updateVendors)((0, fetchVendorFirstReviewViewEpic_1.mapVendorsPayloadFromVendorFirstReviewViewResponse)(response.data && response.data.vendors
+                ? response.data.vendors
+                : [])), (0, userReducer_1.updateAllUsers)({
+                users: (0, fetchVendorFirstReviewViewEpic_1.mapUsersPayloadFromVendorFirstReviewViewResponse)(response.data && response.data.vendors
+                    ? response.data.vendors
+                    : []),
+                updateType: 'merge',
+            }), (0, globalMerchantReducer_1.updateGlobalMerchantsBase)({
+                globalMerchants: (0, fetchVendorFirstReviewViewEpic_1.mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse)(response.data && response.data.vendors
+                    ? response.data.vendors
+                    : []),
+            }));
+            if (response.status.details == null) {
+                actions.push((0, vendorFirstReviewViewReducer_1.updateRecentlySavedErroredVendorData)({
+                    vendorId: action.payload.vendorId,
+                    vendorNameSentForReview: vendorName,
+                    isVendorMergeError: true,
+                }));
+            }
+            return (0, rxjs_1.from)(actions);
+        }
         else {
             return (0, rxjs_1.of)((0, vendorFirstReviewViewReducer_1.saveVendorFirstReviewViewSuccessOrFailure)('Error', action.payload.vendorId, markAsEmployee, markAsLocalContractor, response.status), (0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'save_vendor_sent_for_review',

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

@@ -43,7 +43,7 @@ export declare const fetchVendorFirstReviewAttachments: import("@reduxjs/toolkit
 }, string>, updateRecentlySavedErroredVendorData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     vendorId: ID;
     vendorNameSentForReview: string;
-    isQBOMergeError: boolean;
+    isVendorMergeError: boolean;
     oldRecommendation?: RecommendedNonExistingGlobalMerchant | undefined;
     newRecommendation?: RecommendedNonExistingGlobalMerchant | undefined;
 }, string>, clearRecentlySavedErroredVendorData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, saveVendorFirstReviewViewSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchState: FetchState, vendorId: string, markAsEmployee: boolean, markAsLocalContractor: boolean, error?: ZeniAPIStatus<Record<string, unknown>> | undefined, reviewStatus?: ReviewStatusPayload | undefined], {

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

@@ -166,8 +166,8 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
             };
         },
         updateRecentlySavedErroredVendorData(draft, action) {
-            const { isQBOMergeError, vendorId, oldRecommendation, newRecommendation, vendorNameSentForReview, } = action.payload;
-            if (isQBOMergeError) {
+            const { isVendorMergeError, vendorId, oldRecommendation, newRecommendation, vendorNameSentForReview, } = action.payload;
+            if (isVendorMergeError) {
                 draft.recentlySavedErroredVendorData = {
                     vendorId,
                     vendorNameSentForReview,

package/package.json

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