@zeniai/client-epic-state 4.17.59 → 4.17.60

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

@@ -8,7 +8,7 @@ import { JournalEntryTransactionLine, TransactionWithAccountAndClassLine } from
 import { SupportedTransaction } from '../../entity/transaction/transactionState';
 import { UncategorizedAccounts } from '../accountList/accountListSelector';
 import { TransactionDetailLineItemData, TransactionDetailLocalData } from './transactionDetailTypes';
-export declare const toTransactionDetailLocalData: (transaction: SupportedTransaction, vendorId: ID | undefined, uncategorizedIncomeExpense: UncategorizedAccounts) => TransactionDetailLocalData;
+export declare const toTransactionDetailLocalData: (transaction: SupportedTransaction, defaultVendorId: ID | undefined, uncategorizedIncomeExpense: UncategorizedAccounts) => TransactionDetailLocalData;
 export declare const toLineEntity: (lineRecord: JournalEntryTransactionLine | TransactionWithAccountAndClassLine) => {
     type: "vendor" | "customer" | "merchant";
     zeniId: string;

package/lib/view/transactionDetail/transactionDetailLocalDataHelper.js

@@ -17,29 +17,30 @@ const customerTransaction_1 = require("../../entity/transaction/stateTypes/custo
 const vendorTransaction_1 = require("../../entity/transaction/stateTypes/vendorTransaction");
 const transactionHelper_1 = require("../../entity/transaction/transactionHelper");
 const transactionDetailState_1 = require("./transactionDetailState");
-const toTransactionDetailLocalData = (transaction, vendorId, uncategorizedIncomeExpense) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+const toTransactionDetailLocalData = (transaction, defaultVendorId, uncategorizedIncomeExpense) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const transactionLocal = Object.assign({}, transactionDetailState_1.initialSupportedTransactionDetail.transactionDetailLocalData);
     const customerId = (_a = transaction.customer) === null || _a === void 0 ? void 0 : _a.id;
+    const vendorId = defaultVendorId !== null && defaultVendorId !== void 0 ? defaultVendorId : (_b = transaction.vendor) === null || _b === void 0 ? void 0 : _b.id;
     transactionLocal.memo = transaction.memo;
     transactionLocal.vendorUpdates =
         (0, vendorTransaction_1.isVendorTransaction)(transaction) && vendorId != null
             ? {
                 id: vendorId,
-                name: (_c = (_b = transaction.vendor) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : '',
-                qboId: (_d = transaction.vendor) === null || _d === void 0 ? void 0 : _d.id,
+                name: (_d = (_c = transaction.vendor) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : '',
+                qboId: (_e = transaction.vendor) === null || _e === void 0 ? void 0 : _e.id,
             }
             : undefined;
     transactionLocal.customerUpdates =
         (0, vendorTransaction_1.isVendorTransactionWithCustomer)(transaction) && Boolean(customerId)
             ? {
                 id: customerId,
-                name: (_f = (_e = transaction.customer) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : '',
-                qboId: (_h = (_g = transaction.customer) === null || _g === void 0 ? void 0 : _g.id) !== null && _h !== void 0 ? _h : '',
+                name: (_g = (_f = transaction.customer) === null || _f === void 0 ? void 0 : _f.name) !== null && _g !== void 0 ? _g : '',
+                qboId: (_j = (_h = transaction.customer) === null || _h === void 0 ? void 0 : _h.id) !== null && _j !== void 0 ? _j : '',
             }
             : undefined;
-    const vendorName = (_k = (_j = transaction.vendor) === null || _j === void 0 ? void 0 : _j.name) !== null && _k !== void 0 ? _k : '';
-    const customerName = (_m = (_l = transaction.customer) === null || _l === void 0 ? void 0 : _l.name) !== null && _m !== void 0 ? _m : '';
+    const vendorName = (_l = (_k = transaction.vendor) === null || _k === void 0 ? void 0 : _k.name) !== null && _l !== void 0 ? _l : '';
+    const customerName = (_o = (_m = transaction.customer) === null || _m === void 0 ? void 0 : _m.name) !== null && _o !== void 0 ? _o : '';
     if ((0, vendorTransaction_1.isVendorTransactionWithCustomer)(transaction) === true &&
         Boolean(customerId) &&
         Boolean(customerName)) {
@@ -93,6 +94,30 @@ const toTransactionDetailLocalData = (transaction, vendorId, uncategorizedIncome
     else {
         transactionLocal.customerDetails = undefined;
     }
+    if (transactionLocal.selectedEntity == null) {
+        const firstLine = (_p = transaction.lines) === null || _p === void 0 ? void 0 : _p[0];
+        const recommendations = (firstLine === null || firstLine === void 0 ? void 0 : firstLine.id) != null
+            ? (_q = transaction.recommendations) === null || _q === void 0 ? void 0 : _q[firstLine.id]
+            : undefined;
+        const vendor = (_r = recommendations === null || recommendations === void 0 ? void 0 : recommendations[0]) === null || _r === void 0 ? void 0 : _r.vendor;
+        if (vendor != null && Boolean(vendor.id)) {
+            const vendorId = vendor.id;
+            transactionLocal.selectedEntity = {
+                id: vendorId,
+                name: vendor.name,
+                type: 'vendor',
+                qboId: (_s = vendor.qboId) !== null && _s !== void 0 ? _s : vendorId,
+                zeniId: vendorId,
+                logo: vendor.logo,
+                isPreFilled: true,
+            };
+            transactionLocal.vendorDetails = {
+                id: vendorId,
+                name: vendor.name,
+                qboId: vendorId,
+            };
+        }
+    }
     // Convert transaction to COT format
     const transactionWithCOT = (0, transactionHelper_1.getTransactionWithCOT)(transaction);
     transactionLocal.lineItemById =
@@ -108,7 +133,7 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
     const isJEOrBankDepositTransaction = (0, vendorTransaction_1.isVendorTransaction)(transaction) === false &&
         (0, customerTransaction_1.isCustomerTransaction)(transaction) === false;
     lines === null || lines === void 0 ? void 0 : lines.forEach((line) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         if (line.type === 'transaction_with_account_and_class_line' ||
             line.type === 'transaction_with_product_or_service_line' ||
             line.type === 'journal_entry_transaction_line') {
@@ -127,9 +152,9 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
             record.customer = accountLine.customer;
             record.billable = accountLine.billable;
             if (recommendationsWithCOT != null) {
-                record.recommendationsWithCOT = recommendationsWithCOT[lineId];
-                const recommendation = recommendationsWithCOT[lineId];
-                const { recommendedAccount, recommendedClass } = (0, exports.getRecommendedCategoryClass)((_c = accountLine.isCategoryMiscategorized) !== null && _c !== void 0 ? _c : false, (_d = accountLine.isClassMiscategorized) !== null && _d !== void 0 ? _d : false, recommendation, accountLine.account, accountLine.class, uncategorizedIncomeExpense);
+                const recommendations = recommendationsWithCOT[lineId];
+                record.recommendationsWithCOT = recommendations;
+                const { recommendedAccount, recommendedClass } = (0, exports.getRecommendedCategoryClass)((_c = accountLine.isCategoryMiscategorized) !== null && _c !== void 0 ? _c : false, (_d = accountLine.isClassMiscategorized) !== null && _d !== void 0 ? _d : false, recommendations, accountLine.account, accountLine.class, uncategorizedIncomeExpense);
                 // TODO: comparing with qboId because backend temporarily required us to compare
                 // class and account based on qbo id. This should ideally be based on accountId/ClassId
                 if (Boolean(recommendedAccount === null || recommendedAccount === void 0 ? void 0 : recommendedAccount.qboId) &&
@@ -137,6 +162,9 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                     record.isRecommendedCategorySelected = false;
                     record.recommendedAccount = recommendedAccount;
                     record.isCategoryUpdateSelected = false;
+                    const _g = recommendedAccount || {}, { accountNameConfidence } = _g, recommendedAccountWithoutCOT = __rest(_g, ["accountNameConfidence"]);
+                    void accountNameConfidence;
+                    record.account = Object.assign(Object.assign({}, recommendedAccountWithoutCOT), { isPreFilled: true });
                 }
                 if (accountLine.isCategoryMiscategorized &&
                     Boolean(accountLine.account.qboId) &&
@@ -152,6 +180,9 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
+                    const _h = recommendedClass || {}, { accountingClassNameConfidence } = _h, recommendedClassWithoutCOT = __rest(_h, ["accountingClassNameConfidence"]);
+                    void accountingClassNameConfidence;
+                    record.class = Object.assign(Object.assign({}, recommendedClassWithoutCOT), { isPreFilled: true });
                 }
                 if (accountLine.isClassMiscategorized &&
                     Boolean(accountLine.class.qboId) &&
@@ -175,6 +206,15 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                 record.postingTypeName = lineRecord.postingTypeName;
                 record.lineEntity = (0, exports.toLineEntity)(lineRecord);
             }
+            if (record.lineEntity == null) {
+                const recommendedVendor = (_f = (_e = recommendationsWithCOT === null || recommendationsWithCOT === void 0 ? void 0 : recommendationsWithCOT[lineId]) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.vendor;
+                if (recommendedVendor != null) {
+                    const { cot, reasoning } = recommendedVendor, recommendedVendorWithoutCOT = __rest(recommendedVendor, ["cot", "reasoning"]);
+                    void cot;
+                    void reasoning;
+                    record.lineEntity = (0, exports.toLineEntity)(Object.assign(Object.assign({}, line), { vendor: recommendedVendorWithoutCOT }));
+                }
+            }
             lineItemData[line.id] = record;
         }
         if (line.type === 'linked_transaction_line') {
@@ -621,6 +661,15 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                     if (recommendedClass == null) {
                         record.recommendedClass = recommendedClass;
                     }
+                    if ((Boolean(record.account.qboId) === false ||
+                        (0, exports.isAccountUncategorized)(uncategorizedIncomeExpense, record.account.qboId)) &&
+                        Boolean(recommendedAccount === null || recommendedAccount === void 0 ? void 0 : recommendedAccount.qboId) !== false) {
+                        record.account = recommendedAccount;
+                    }
+                    if (Boolean(record.class.qboId) === false &&
+                        Boolean(recommendedClass === null || recommendedClass === void 0 ? void 0 : recommendedClass.qboId) !== false) {
+                        record.class = recommendedClass;
+                    }
                     newLineItems[line.id] = record;
                 }
             }

package/package.json

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