@zeniai/client-epic-state 4.13.15 → 4.13.17

package/lib/view/transactionDetail/transactionDetailState.d.ts

@@ -8,9 +8,9 @@ import { Transaction, TransactionID } from '../../entity/transaction/stateTypes/
 import { VendorBase } from '../../entity/vendor/vendorState';
 import { EntityRecommendationKey } from '../recommendation/recommendationState';
 import { TransactionDetailLocalData } from './transactionDetailTypes';
-export declare const getTransactionDetailKey: (transactionId: TransactionID) => `${string}_expense` | `${string}_refund` | `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_check` | `${string}_bill` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`;
+export declare const getTransactionDetailKey: (transactionId: TransactionID) => `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_refund` | `${string}_expense` | `${string}_check` | `${string}_bill` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`;
 export declare type TransactionDetailKey = ReturnType<typeof getTransactionDetailKey>;
-export declare const getZeniTransactionDetailKey: (transactionId: TransactionID) => `${string}_expense` | `${string}_refund` | `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_check` | `${string}_bill` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`;
+export declare const getZeniTransactionDetailKey: (transactionId: TransactionID) => `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_refund` | `${string}_expense` | `${string}_check` | `${string}_bill` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`;
 export declare type ZeniTransactionDetailKey = ReturnType<typeof getTransactionDetailKey>;
 export declare const getThirdPartyIdFromTransactionId: (transactionId: TransactionID) => string;
 /**

package/lib/view/userListView/fetchUserListByTypeEpic.js

@@ -46,7 +46,10 @@ const getQueryParam = (userType, isZeniTenant) => {
         case 'manager':
             return { is_manager_candidate: true };
         case 'cardHolderCandidate':
-            return { is_card_holder_candidate: true };
+            return {
+                is_card_holder_candidate: true,
+                is_include_active_cards_count: true,
+            };
         case 'taskManagerCandidate':
             return { is_task_manager_candidate: true };
         case 'cardAdmin':

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

@@ -149,7 +149,7 @@ exports.vendorFiling1099ListFailureState = {
 exports.rootStateWithVendorFiling1099List = Object.assign({}, reducer_1.initialRootState, {
     vendorState: {
         vendorByID: {
-            'vendor_j12jh1g2g12jg3jh12:12': vendorStateMocks_1.vendorStateMock7,
+            'vendor_j12jh1g2g12jg3jh12:12': vendorStateMocks_1.vendorStateMock8,
         },
     },
     vendorFiling1099ListState: {

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

@@ -6,7 +6,7 @@ exports.vendorFiling1099ListSelectorMock = {
     fetchState: 'Completed',
     error: undefined,
     version: 0,
-    vendors: [Object.assign({}, vendorStateMocks_1.vendorStateMock7)],
+    vendors: [Object.assign({}, vendorStateMocks_1.vendorStateMock8)],
     lastRefreshSuccessTime: undefined,
     uiState: {
         sortKey: 'total',

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

@@ -2,7 +2,7 @@ import { GlobalMerchantBase } from '../../../../entity/globalMerchant/globalMerc
 import { ID } from '../../../../commonStateTypes/common';
 import { RecommendedNonExistingGlobalMerchant } from '../../vendorFirstReviewView/vendorFirstReviewViewState';
 import { RecommendedNonExistingGlobalMerchantBasePayload, VendorReviewViewAllRecommendationsPayload } from '../payload/commonTypes';
-export declare const toVendorFirstReviewViewStatusesTypeStrict: (v: string) => "pending" | "under_review" | "merge_in_qbo" | "reviewed" | "review_rejected" | undefined;
+export declare const toVendorFirstReviewViewStatusesTypeStrict: (v: string) => "pending" | "reviewed" | "under_review" | "merge_in_qbo" | "review_rejected" | undefined;
 declare type VendorFirstReviewViewStatusesKey = ReturnType<typeof toVendorFirstReviewViewStatusesTypeStrict>;
 export declare type ReviewStatus = {
     code: VendorFirstReviewViewStatusesKey;

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/lib/view/zeniAccStatementList/zeniAccStatementList.d.ts

@@ -1,4 +1,5 @@
 import { FetchedState, ID } from '../../commonStateTypes/common';
+import { MonthYearPeriod } from '../../commonStateTypes/timePeriod';
 export interface ZeniAccStatementListState {
     byDepositId: Record<ID, StatementState>;
 }
@@ -7,11 +8,7 @@ interface StatementState extends FetchedState {
 }
 export interface Statement {
     id: ID;
-    title: StatementTitle;
-}
-interface StatementTitle {
-    month: number;
-    year: number;
+    title: MonthYearPeriod;
 }
 export declare const initialStatements: StatementState;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.13.15",
+  "version": "4.13.17",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -85,7 +85,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "find-dead-code": "ts-prune | grep -v '(used in module)'",
     "find-unused-exports": "ts-unused-exports ./tsconfig.json",
-    "build": "concurrently --kill-others-on-fail \"eslint . --ext .js,.jsx,.ts,.tsx\" \"tsc\"",
+    "build": "concurrently --kill-others-on-fail \"eslint . --ext .js,.jsx,.ts,.tsx\" \"tsc\" \"jest --config jest.config.json\"",
     "onlybuild": "concurrently --kill-others-on-fail \"eslint . --ext .js,.jsx,.ts,.tsx\" \"tsc\"",
     "format": "prettier --write --ignore-unknown \"src/**/*\"",
     "format-watch": "(git diff --name-only --diff-filter=ACM && git ls-files --others --exclude-standard) | grep -E '\\.(ts|tsx)$' | xargs prettier --write",

package/lib/commonPayloadTypes/v2/getSumOfBalancesGroupedByPeriod.js

@@ -1 +0,0 @@
-"use strict";

package/lib/commonStateTypes/selectorTypes/pickAndMergeForecastSectionWithAcOnly.js

@@ -1 +0,0 @@
-"use strict";