@zeniai/client-epic-state 4.13.73 → 4.13.75

package/lib/view/commonVendorView/transactionVendorView/epics/saveTransactionVendorEpic.js

@@ -61,6 +61,7 @@ const saveTransactionVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                 action.payload.transactionId != null) {
                 actions.push((0, transactionDetailReducer_1.saveTransactionDetail)({
                     transactionId: action.payload.transactionId,
+                    isExpenseAutomationEnabled: action.payload.isExpenseAutomationEnabled,
                 }));
             }
             return (0, rxjs_1.from)(actions);

package/lib/view/commonVendorView/transactionVendorView/transactionVendorViewReducer.d.ts

@@ -6,10 +6,11 @@ export declare const initialVendorDetailLocalData: TransactionVendorLocalData;
 export declare const initialState: TransactionVendorViewState;
 export declare const updateVendorSaveStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     vendorId?: string | undefined;
-}, string>, saveTransactionVendor: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId?: TransactionID | undefined, vendorId?: string | undefined, saveTransaction?: boolean | undefined], {
+}, string>, saveTransactionVendor: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId?: TransactionID | undefined, vendorId?: string | undefined, saveTransaction?: boolean | undefined, isExpenseAutomationEnabled?: any], {
     vendorId: string | undefined;
     transactionId: TransactionID | undefined;
     saveTransaction: boolean | undefined;
+    isExpenseAutomationEnabled: any;
 }, string, never, never>, saveTransactionVendorSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchState: FetchState, vendorId?: string | undefined, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
     fetchState: FetchState;
     vendorId: string | undefined;

package/lib/view/commonVendorView/transactionVendorView/transactionVendorViewReducer.js

@@ -45,12 +45,13 @@ const transactionVendorView = (0, toolkit_1.createSlice)({
                     draft.newVendorState.saveStatus.error = undefined;
                 }
             },
-            prepare(transactionId, vendorId, saveTransaction) {
+            prepare(transactionId, vendorId, saveTransaction, isExpenseAutomationEnabled = false) {
                 return {
                     payload: {
                         vendorId,
                         transactionId,
                         saveTransaction,
+                        isExpenseAutomationEnabled,
                     },
                 };
             },

package/lib/view/expenseAutomationView/helpers/saveTransactionHelper.js

@@ -16,7 +16,7 @@ const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionC
     };
     const updatesByLineId = {};
     const entityUpdates = {};
-    const isTransactionMisCategorized = (0, saveTransactionHelper_1.isTransactionMiscategorized)(transaction);
+    const isTransactionMisCategorized = (0, saveTransactionHelper_1.isTransactionMiscategorized)(transaction, true);
     const isTransactionUnCategorized = (0, saveTransactionHelper_1.isTransactionUncategorized)(transaction, uncategorizedIncomeExpense);
     updates.memo = transactionCategorizationLocalData.memo;
     if ((0, vendorTransaction_1.isVendorTransaction)(transaction) === true) {

package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts

@@ -10,5 +10,5 @@ export declare const INCOME_QBOID = "30";
 export declare const EXPENSE_QBOID = "31";
 export declare const toTransactionDetailLocalData: (transaction: SupportedTransaction) => TransactionReviewLocalData;
 export declare const toSetAllLineItemsToCategoryClass: (draft: TransactionsTabViewState, transaction: SupportedTransaction, transactionId: ID, transactionLineId: ID, transactionDetailLocalData: TransactionReviewLocalData, vendorId?: string | undefined, selectedAccount?: AccountBase | undefined, selectedClassBase?: ClassBase | undefined) => TransactionReviewLocalData;
-export declare const setEntityRecommendationForLineIdInLocalData: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionReviewLocalData, entity: Entity, recommendationLineIds: ID[], recommendationByLineId?: RecommendationByLineId | undefined) => TransactionReviewLocalData;
+export declare const setEntityRecommendationForLineIdInLocalData: (draft: TransactionsTabViewState, transaction: SupportedTransaction, transactionDetailLocalData: TransactionReviewLocalData, entity: Entity, recommendationLineIds: ID[], recommendationByLineId?: RecommendationByLineId | undefined) => TransactionReviewLocalData;
 export declare const checkIfAllLineItemsAreCategoryClassFilled: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionReviewLocalData) => boolean;

package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -102,8 +102,12 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
                 // if the line is the one that is being updated, then set the account and class
                 if (transactionId === record.transactionId &&
                     transactionLineId === lineId) {
-                    record.account = selectedAccount;
-                    record.class = selectedClassBase;
+                    if (selectedAccount != null) {
+                        record.account = selectedAccount;
+                    }
+                    if (selectedClassBase != null) {
+                        record.class = selectedClassBase;
+                    }
                     if (record.class != null && record.account != null) {
                         if (selectedCheckBoxTransactionIds.length < exports.MAX_SELECTION_LIMIT &&
                             selectedCheckBoxTransactionIds.includes(transaction.id) === false) {
@@ -122,9 +126,10 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
                         transactionDetailLocalData.vendor.id === vendorId) ||
                         (record.vendor != null && record.vendor.id === vendorId)) {
                         // if the vendor is same, then set the account and class with the selected ones and add the transaction to the selected list
-                        if (((_a = record.account) === null || _a === void 0 ? void 0 : _a.qboId) == null ||
-                            ((_b = record.account) === null || _b === void 0 ? void 0 : _b.qboId) === exports.EXPENSE_QBOID ||
-                            ((_c = record.account) === null || _c === void 0 ? void 0 : _c.qboId) === exports.INCOME_QBOID) {
+                        if (selectedAccount != null &&
+                            (((_a = record.account) === null || _a === void 0 ? void 0 : _a.qboId) == null ||
+                                ((_b = record.account) === null || _b === void 0 ? void 0 : _b.qboId) === exports.EXPENSE_QBOID ||
+                                ((_c = record.account) === null || _c === void 0 ? void 0 : _c.qboId) === exports.INCOME_QBOID)) {
                             record.account = selectedAccount;
                             if (record.class != null &&
                                 selectedCheckBoxTransactionIds.length < exports.MAX_SELECTION_LIMIT &&
@@ -133,7 +138,7 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
                                 selectedCheckBoxTransactionIds.push(transaction.id);
                             }
                         }
-                        if (((_d = record.class) === null || _d === void 0 ? void 0 : _d.qboId) == null) {
+                        if (selectedClassBase != null && ((_d = record.class) === null || _d === void 0 ? void 0 : _d.qboId) == null) {
                             record.class = selectedClassBase;
                             if (record.account != null &&
                                 selectedCheckBoxTransactionIds.length < exports.MAX_SELECTION_LIMIT &&
@@ -171,10 +176,11 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
     return newLocalData;
 };
 exports.toSetAllLineItemsToCategoryClass = toSetAllLineItemsToCategoryClass;
-const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDetailLocalData, entity, recommendationLineIds, recommendationByLineId) => {
+const setEntityRecommendationForLineIdInLocalData = (draft, transaction, transactionDetailLocalData, entity, recommendationLineIds, recommendationByLineId) => {
     const newLineItems = {};
     let matchingEntityLineId = undefined;
     const checkIfNotJEAndDeposit = !(0, vendorTransaction_1.isVendorTransaction)(transaction);
+    let selectedCheckBoxTransactionIds = draft.selectedCheckBoxTransactionIds;
     if (transaction.lines != null) {
         // always preserving the order of the line items. hence iterating over this
         transaction.lines.forEach((line) => {
@@ -207,7 +213,15 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                 if ((0, transactionDetailLocalDataHelper_1.isEntityMatching)(entity, oldRecord)) {
                     matchingEntityLineId = lineId;
                 }
-                newLineItems[lineId] = oldRecord;
+                const record = Object.assign({}, oldRecord);
+                if (checkIfNotJEAndDeposit === false) {
+                    const recommendations = (0, transactionDetailLocalDataHelper_1.mergeTransactionAndEntityRecommendations)(oldRecord.recommendations, recommendationByLineId === null || recommendationByLineId === void 0 ? void 0 : recommendationByLineId[lineId]);
+                    const accountLine = line;
+                    record.account = accountLine.account;
+                    record.class = accountLine.class;
+                    record.recommendations = recommendations;
+                }
+                newLineItems[lineId] = record;
             }
         });
     }
@@ -219,6 +233,10 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
         newLineItems[matchingEntityLineId] = Object.assign(Object.assign({}, newLineItem), { class: matchingRecord.class, account: matchingRecord.account, lineEntity: matchingRecord.lineEntity });
     }
     const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendorUpdates: transactionDetailLocalData.vendorUpdates, vendorDetails: transactionDetailLocalData.vendorDetails, vendor: transactionDetailLocalData.vendor });
+    if (!(0, exports.checkIfAllLineItemsAreCategoryClassFilled)(transaction, newLocalData)) {
+        selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
+    }
+    draft.selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds;
     return newLocalData;
 };
 exports.setEntityRecommendationForLineIdInLocalData = setEntityRecommendationForLineIdInLocalData;

package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js

@@ -219,7 +219,13 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 const { vendorId, selectedAccount, selectedClassBase, transactions, transactionId, lineId, selectedTab, } = action.payload;
                 const transactionLocalData = (0, get_1.default)(draft[selectedTab].transactionReviewLocalDataById, transactionId, undefined);
                 if (transactionLocalData != null) {
-                    const newTransactionLocalData = Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById), { [lineId]: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById[lineId]), { account: selectedAccount, class: selectedClassBase }) }) });
+                    const newTransactionLocalData = Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById), { [lineId]: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById[lineId]), { account: selectedAccount != null
+                                    ? selectedAccount
+                                    : transactionLocalData.transactionReviewLocalData
+                                        .lineItemById[lineId].account, class: selectedClassBase != null
+                                    ? selectedClassBase
+                                    : transactionLocalData.transactionReviewLocalData
+                                        .lineItemById[lineId].class }) }) });
                     draft[selectedTab].transactionReviewLocalDataById[transactionId] = {
                         transactionReviewLocalData: newTransactionLocalData,
                         transactionId,
@@ -284,7 +290,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 if (transactionLocalData != null) {
                     draft[selectedTab].transactionReviewLocalDataById[transaction.id] = {
                         transactionId: transaction.id,
-                        transactionReviewLocalData: (0, transactionCategorizationLocalDataHelper_1.setEntityRecommendationForLineIdInLocalData)(transaction, transactionLocalData.transactionReviewLocalData, entity, lineIds, action.payload.recommendationByLineId),
+                        transactionReviewLocalData: (0, transactionCategorizationLocalDataHelper_1.setEntityRecommendationForLineIdInLocalData)(draft[selectedTab], transaction, transactionLocalData.transactionReviewLocalData, entity, lineIds, action.payload.recommendationByLineId),
                     };
                 }
             },

package/lib/view/transactionDetail/epics/saveTransactionDetailEpic.js

@@ -14,6 +14,7 @@ const accountListSelector_1 = require("../../accountList/accountListSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const saveTransactionDetailEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionDetailReducer_1.saveTransactionDetail.match), (0, operators_1.mergeMap)((action) => {
     const transactionId = action.payload.transactionId;
+    const isExpenseAutomationEnabled = action.payload.isExpenseAutomationEnabled;
     const fetchActions = [];
     const transactionDetailState = state$.value.transactionDetailState;
     const transactionState = state$.value.transactionState;
@@ -23,7 +24,7 @@ const saveTransactionDetailEpic = (actions$, state$) => actions$.pipe((0, operat
     if (detail != null && transaction != null) {
         const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(state$.value.accountState, state$.value.accountListState, 'accountList');
         const localData = detail.transactionDetailLocalData;
-        const transactionSaveUpdates = (0, saveTransactionHelper_1.toTransactionUpdatesFromTransactionDetailLocalData)(localData, transaction, uncategorizedIncomeExpense);
+        const transactionSaveUpdates = (0, saveTransactionHelper_1.toTransactionUpdatesFromTransactionDetailLocalData)(localData, transaction, uncategorizedIncomeExpense, isExpenseAutomationEnabled);
         fetchActions.push((0, transactionDetailReducer_1.updateTransactionDetail)(transactionId, transactionSaveUpdates));
         return (0, rxjs_1.from)(fetchActions);
     }

package/lib/view/transactionDetail/epics/saveTransactionHelper.d.ts

@@ -21,9 +21,9 @@ import { TransactionDetailLocalData } from '../transactionDetailTypes';
  * 4. Only difference between this and Miscategorized will be that we will
  * additionally fire “Mark as not miscat” for every point above.
  */
-export declare const toTransactionUpdatesFromTransactionDetailLocalData: (transactionDetailLocalData: TransactionDetailLocalData, transaction: SupportedTransaction, uncategorizedIncomeExpense: UncategorizedAccounts) => TransactionSaveUpdates;
+export declare const toTransactionUpdatesFromTransactionDetailLocalData: (transactionDetailLocalData: TransactionDetailLocalData, transaction: SupportedTransaction, uncategorizedIncomeExpense: UncategorizedAccounts, isExpenseAutomationEnabled: boolean) => TransactionSaveUpdates;
 export declare const toRecommendedAccountBase: (amountValue: number, accountBase?: AccountBase | undefined, recommendationBase?: RecommendationBase | undefined) => RecommendedAccountBase | undefined;
 export declare const toRecommendedClassBase: (amountValue: number, classBase?: ClassBase | undefined, recommendationBase?: RecommendationBase | undefined) => RecommendedClassBase | undefined;
-export declare const isTransactionMiscategorized: (transaction: SupportedTransaction) => boolean;
+export declare const isTransactionMiscategorized: (transaction: SupportedTransaction, isExpenseAutomationEnabled: boolean) => boolean;
 export declare const isTransactionUncategorized: (transaction: SupportedTransaction, uncategorizedIncomeExpense: UncategorizedAccounts) => boolean;
 export declare const isAccountUncategorized: (uncategorizedIncomeExpense: UncategorizedAccounts, lineQboId?: string | undefined) => boolean;

package/lib/view/transactionDetail/epics/saveTransactionHelper.js

@@ -24,14 +24,14 @@ const recommendationState_1 = require("../../recommendation/recommendationState"
  * 4. Only difference between this and Miscategorized will be that we will
  * additionally fire “Mark as not miscat” for every point above.
  */
-const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLocalData, transaction, uncategorizedIncomeExpense) => {
+const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLocalData, transaction, uncategorizedIncomeExpense, isExpenseAutomationEnabled) => {
     var _a, _b, _c;
     const updates = {
         updatesByLineId: {},
     };
     const updatesByLineId = {};
     const entityUpdates = {};
-    const isTransactionMisCategorized = (0, exports.isTransactionMiscategorized)(transaction);
+    const isTransactionMisCategorized = (0, exports.isTransactionMiscategorized)(transaction, isExpenseAutomationEnabled);
     const isTransactionUnCategorized = (0, exports.isTransactionUncategorized)(transaction, uncategorizedIncomeExpense);
     updates.memo = transactionDetailLocalData.memo;
     const updatedEntityId = transactionDetailLocalData.updatePreviousTransactionsWithUpdatedVendor ===
@@ -252,8 +252,11 @@ const getEntityDetails = (entity, lineItemLocalData, vendorUpdates) => {
     }
     return undefined;
 };
-const isTransactionMiscategorized = (transaction) => {
+const isTransactionMiscategorized = (transaction, isExpenseAutomationEnabled) => {
     const lines = transaction.lines;
+    if (isExpenseAutomationEnabled === true && (0, vendorTransaction_1.isVendorTransaction)(transaction)) {
+        return true;
+    }
     let isTransactionMisCategorized = false;
     lines === null || lines === void 0 ? void 0 : lines.forEach((line) => {
         if (line.type === 'transaction_with_account_and_class_line' ||

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

@@ -44,6 +44,7 @@ export declare const fetchTransactionDetail: import("@reduxjs/toolkit").ActionCr
     transactionId: TransactionID;
 }, string>, saveTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     transactionId: TransactionID;
+    isExpenseAutomationEnabled: boolean;
 }, string>, initializeTransactionDetailLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     transactionId: TransactionID;
     vendorId?: string | undefined;

package/package.json

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