@zeniai/client-epic-state 4.13.74 → 4.13.75

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.13.74",
+  "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",