@zeniai/client-epic-state 4.8.9 → 4.8.10

package/lib/entity/jeSchedules/jeSchedulesPayload.js

@@ -98,7 +98,7 @@ function toJEClassPayload(payload, type) {
 exports.toJEClassPayload = toJEClassPayload;
 function getTransactionDetailKeyPayload(payload) {
     const transactionId = (0, transactionIDPayload_1.toTransactionID)(payload);
-    return (0, transactionDetailState_1.getTransactionDetailKey)(transactionId);
+    return (0, transactionDetailState_1.getZeniTransactionDetailKey)(transactionId);
 }
 exports.getTransactionDetailKeyPayload = getTransactionDetailKeyPayload;
 function toJEScheduledTransaction(payload) {

package/lib/entity/jeSchedules/jeSchedulesTypes.d.ts

@@ -1,5 +1,5 @@
-import { getTransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
-export declare type JEScheduleKey = ReturnType<typeof getTransactionDetailKey>;
+import { getZeniTransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
+export declare type JEScheduleKey = ReturnType<typeof getZeniTransactionDetailKey>;
 export declare const ALL_SCHEDULES_TYPES: readonly ["prepaid_expenses", "fixed_assets", "accured_expenses", "deferred_revenue"];
 export declare const toScheduleTypesType: (v: string) => "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
 export declare type SchedulesTypes = ReturnType<typeof toScheduleTypesType>;

package/lib/entity/transaction/transactionReducer.js

@@ -55,7 +55,7 @@ const transaction = (0, toolkit_1.createSlice)({
         updateScheduleTransactions: {
             reducer(draft, action) {
                 action.payload.transactionsPayload.forEach((value) => {
-                    const id = (0, transactionDetailState_1.getTransactionDetailKey)({
+                    const id = (0, transactionDetailState_1.getZeniTransactionDetailKey)({
                         id: value.transaction_id,
                         type: (0, transactionType_1.toTransactionType)(value.transaction_type),
                     });

package/lib/entity/transaction/transactionState.d.ts

@@ -1,5 +1,5 @@
 import { ID } from '../../commonStateTypes/common';
-import { TransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
+import { TransactionDetailKey, ZeniTransactionDetailKey } from '../../view/transactionDetail/transactionDetailState';
 import { CustomerTransactionPayload } from './payloadTypes/customerTransactionPayload';
 import { TransactionPayload } from './payloadTypes/transactionPayload';
 import { VendorTransactionPayload } from './payloadTypes/vendorTransactionPayload';
@@ -12,5 +12,5 @@ export declare type SupportedTransactionPayload = TransactionPayload | CustomerT
 export declare type AllSupportedTransactions = SupportedTransaction | undefined;
 export interface TransactionState {
     transactionById: Record<ID | TransactionDetailKey, SupportedTransaction | undefined>;
-    scheduleTransactionById: Record<TransactionDetailKey, ScheduleTransaction>;
+    scheduleTransactionById: Record<ZeniTransactionDetailKey, ScheduleTransaction>;
 }

package/lib/index.d.ts

@@ -310,8 +310,8 @@ import { CompanyDetailsLocalData, CompanyInfoLocalData, IncInfoLocalData, TaxDet
 import { CompanyOfficerLocalData, PrimaryContactLocalData, CompanyOfficerType } from './view/companyView/types/companyPassport/companyUsersLocalData';
 import { CompanyPassportLocalData, toCompanyPassportLocalData } from './view/companyView/types/companyPassport/companyPassportLocalData';
 export { CompanyInfoLocalData, IncInfoLocalData, TaxDetailsLocalData, CompanyDetailsLocalData, PrimaryContactLocalData, CompanyOfficerLocalData, CompanyOfficerType, CompanyPassportLocalData, toCompanyPassportLocalData, };
-import { AccountListSelectorView, getUncategorizedAccounts, getNestedAccountListHeirarchy } from './view/accountList/accountListSelector';
-export { getUncategorizedAccounts, getNestedAccountListHeirarchy };
+import { AccountListSelectorView, getUncategorizedAccounts, getNestedAccountListHeirarchy, UncategorizedAccounts } from './view/accountList/accountListSelector';
+export { getUncategorizedAccounts, UncategorizedAccounts, getNestedAccountListHeirarchy, };
 import { getBankAccount, BankAccountSelectorView } from './view/bankAccountView/bankAccountViewSelector';
 export { getBankAccount, BankAccountSelectorView };
 import { SubscriptionListUIState, SubscriptionUpdateData, SubscriptionCreateData, SubscriptionActionType } from './view/subscriptionView/subscriptionViewState';

package/lib/view/scheduleView/scheduleDetailView/epics/fetchScheduleDetailsEpic.js

@@ -28,7 +28,7 @@ const fetchScheduleDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const transactionData = response.data.je_schedules[0].base_transaction;
-                const selectedJEScheduleKey = (0, transactionDetailState_1.getTransactionDetailKey)({
+                const selectedJEScheduleKey = (0, transactionDetailState_1.getZeniTransactionDetailKey)({
                     id: transactionData.transaction_id,
                     type: (0, transactionType_1.toTransactionType)(transactionData.transaction_type),
                 });

package/lib/view/scheduleView/scheduleListView/scheduleListReducer.js

@@ -214,7 +214,7 @@ exports.default = scheduleListView.reducer;
 function doUpdateScheduleList(draft, payload, tab, selectedTimeframe, selectedCategoryId) {
     const jeScheduleTransactionKeys = payload.map((schedules) => {
         const transactionID = (0, transactionIDPayload_1.toTransactionID)(schedules.base_transaction);
-        return (0, transactionDetailState_1.getTransactionDetailKey)(transactionID);
+        return (0, transactionDetailState_1.getZeniTransactionDetailKey)(transactionID);
     });
     draft.selectedCategoryId = selectedCategoryId;
     draft.selectedTimeframe = selectedTimeframe;

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

@@ -10,6 +10,8 @@ import { EntityRecommendationKey } from '../recommendation/recommendationState';
 import { TransactionDetailLocalData } from './transactionDetailTypes';
 export declare const getTransactionDetailKey: (transactionId: TransactionID) => `${string}_expense` | `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_refund` | `${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}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_refund` | `${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;
 export declare function getAllLinkedTransactions(transaction: Transaction): TransactionID[];
 export interface SupportedTransactionDetail extends FetchedState {

package/lib/view/transactionDetail/transactionDetailState.js

@@ -1,12 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialSupportedTransactionDetail = exports.getAllLinkedTransactions = exports.getThirdPartyIdFromTransactionId = exports.getTransactionDetailKey = void 0;
+exports.initialSupportedTransactionDetail = exports.getAllLinkedTransactions = exports.getThirdPartyIdFromTransactionId = exports.getZeniTransactionDetailKey = exports.getTransactionDetailKey = void 0;
 // This transaction key only extracts the third party ID and uses that
 // for the ID
-const getTransactionDetailKey = (transactionId) => `${transactionId.id}_${transactionId.type}`;
+const getTransactionDetailKey = (transactionId) => `${getActualTransactionID(transactionId.id)}_${transactionId.type}`;
 exports.getTransactionDetailKey = getTransactionDetailKey;
+const getZeniTransactionDetailKey = (transactionId) => `${transactionId.id}_${transactionId.type}`;
+exports.getZeniTransactionDetailKey = getZeniTransactionDetailKey;
 const getThirdPartyIdFromTransactionId = (transactionId) => {
     const zeniGeneratedId = transactionId.id;
+    return getActualTransactionID(zeniGeneratedId);
+};
+exports.getThirdPartyIdFromTransactionId = getThirdPartyIdFromTransactionId;
+/**
+ * Returns actual QBO transaction ID.
+ * @param zeniGeneratedId zeni transaciton Id in the form of tran_<uuid>:<qbo_id>
+ * @returns retruns the actual QBO transaction Id.
+ * @note in case if the given transaction id itself is QBO id, the it just passes it back.
+ */
+const getActualTransactionID = (zeniGeneratedId) => {
     const splittedIds = zeniGeneratedId.trim().split(':');
     if (splittedIds.length === 1) {
         return splittedIds[0];
@@ -15,7 +27,6 @@ const getThirdPartyIdFromTransactionId = (transactionId) => {
         return splittedIds[1];
     }
 };
-exports.getThirdPartyIdFromTransactionId = getThirdPartyIdFromTransactionId;
 function getAllLinkedTransactions(transaction) {
     var _a, _b;
     const result = [];

package/lib/view/vendorReviewView/common/payload/commonTypes.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toGlobalMerchantsBasePayload = exports.toVendorReviewViewRecommendationPayload = exports.toNonExistingRecommendationGlobalMerchantBasePayload = exports.toUserPayload = void 0;
-const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globalMerchantPayload");
 /**
@@ -69,19 +68,25 @@ const toVendorReviewViewRecommendationPayload = (recommendations, nonExistingRec
             global_merchants: recommendationEntities,
         };
     });
-    const allRecommendations = recommendationsPayload.length > 0
-        ? recommendationsPayload
-        : nonExistingRecommendationsPayload;
+    const allRecommendations = [
+        {
+            global_merchants: [
+                ...recommendationsPayload[0].global_merchants,
+                ...nonExistingRecommendationsPayload[0].global_merchants,
+            ],
+        },
+    ];
     return allRecommendations;
 };
 exports.toVendorReviewViewRecommendationPayload = toVendorReviewViewRecommendationPayload;
 const toGlobalMerchantsBasePayload = (vendorsRecommendationsPayload) => {
-    var _a, _b;
-    let globalMerchantBasePayload = [];
-    if (((_b = (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        globalMerchantBasePayload = (0, flatMap_1.default)(vendorsRecommendationsPayload.map((vendorsRecoomendation) => vendorsRecoomendation
-            .global_merchants));
-    }
+    var _a;
+    const globalMerchantBasePayload = [];
+    (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalMerchantPayload) => {
+        if (globalMerchantPayload.global_merchant_id != null) {
+            globalMerchantBasePayload.push(globalMerchantPayload);
+        }
+    });
     return globalMerchantBasePayload;
 };
 exports.toGlobalMerchantsBasePayload = toGlobalMerchantsBasePayload;

package/lib/view/vendorReviewView/common/state/commonTypes.js

@@ -67,15 +67,17 @@ const toNonExistingGlobalMerchantBase = (globalMerchantPayload) => {
 };
 exports.toNonExistingGlobalMerchantBase = toNonExistingGlobalMerchantBase;
 const toAllRecommendationsFromPayload = (recommendationsPayload) => {
-    var _a, _b;
-    let recommendations = [];
-    let nonExistingRecommendations = [];
-    if (((_b = (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        recommendations = (0, exports.toRecommendationsFromPayload)(recommendationsPayload);
-    }
-    else {
-        nonExistingRecommendations = (0, exports.toNonExistingRecommendationsFromPayload)(recommendationsPayload);
-    }
+    var _a;
+    const recommendations = [];
+    const nonExistingRecommendations = [];
+    (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalmerchant) => {
+        if (globalmerchant.global_merchant_id != null) {
+            recommendations.push((0, globalMerchantPayload_1.toGlobalMerchantBase)(globalmerchant));
+        }
+        else {
+            nonExistingRecommendations.push((0, exports.toNonExistingGlobalMerchantBase)(globalmerchant));
+        }
+    });
     const recommendationIds = recommendations.map((recommendation) => recommendation.globalMerchantId);
     return {
         recommendationIds,

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

@@ -82,17 +82,13 @@ exports.mapUsersPayloadFromVendorFirstReviewViewResponse = mapUsersPayloadFromVe
 const mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = (vendorsResponse) => {
     const globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            mapVendorRecommendationsToGlobalMerchantBasePayload(vendor.recommendations, globalMerchantBasePayload);
-        }
+        var _a;
+        const existingMerchants = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.filter((merchant) => merchant.global_merchant_id != null);
+        mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(existingMerchants, globalMerchantBasePayload);
     });
     return globalMerchantBasePayload;
 };
 exports.mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse;
-const mapVendorRecommendationsToGlobalMerchantBasePayload = (recommendations, globalMerchantBasePayload) => {
-    recommendations.forEach((recommendation) => mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(recommendation.global_merchants, globalMerchantBasePayload));
-};
 const mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload = (entities, globalMerchantBasePayload) => {
     entities.forEach((entity) => globalMerchantBasePayload.push(entity));
 };

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

@@ -83,8 +83,9 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
                         const isRecommendationSelected = selectedGlobalMerchantId != null &&
                             (selectedGlobalMerchantId ===
                                 vendorLocalData.recommendationIds[0] ||
-                                selectedGlobalMerchantId ===
-                                    ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName));
+                                (vendorLocalData.recommendationIds.length === 0 &&
+                                    selectedGlobalMerchantId ===
+                                        ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName)));
                         const isRetainSelected = selectedGlobalMerchantId != null &&
                             selectedGlobalMerchantId === vendorLocalData.vendorId;
                         currentSelection =
@@ -244,7 +245,7 @@ const mapPayloadToVendorFirstReviewView = (payload) => {
         },
         currentSelection: null,
         recommendationIds,
-        recommendedNonExistingGlobalMerchants: recommendationIds.length === 0 ? nonExistingRecommendations : [],
+        recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
         lastUpdatedVendorNameByUserId: (_a = payload.last_updated_vendor_name_by_user) === null || _a === void 0 ? void 0 : _a.user_id,
     };
 };

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

@@ -19,10 +19,10 @@ const getVendorFirstReviewView = (state) => {
         const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.vendorId);
         const users = (0, userSelector_1.getUsersByUserIds)(userState, userIds);
         let recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, vendorLocalData.recommendationIds);
-        recommendations =
-            recommendations.length > 0
-                ? recommendations
-                : vendorLocalData.recommendedNonExistingGlobalMerchants;
+        recommendations = [
+            ...recommendations,
+            ...vendorLocalData.recommendedNonExistingGlobalMerchants,
+        ];
         let selectedVendor;
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.selectedVendorId);
         if (vendor != null) {

package/lib/view/vendorReviewView/vendorGlobalReviewView/epics/fetchVendorGlobalReviewViewEpic.js

@@ -71,15 +71,12 @@ exports.toUsersPayload = toUsersPayload;
 const mapGlobalReviewPayloadToGlobalMerchantsBasePayload = (vendorsResponse) => {
     let globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            globalMerchantBasePayload = [
-                ...new Set([
-                    ...globalMerchantBasePayload,
-                    ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
-                ]),
-            ];
-        }
+        globalMerchantBasePayload = [
+            ...new Set([
+                ...globalMerchantBasePayload,
+                ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
+            ]),
+        ];
     });
     return globalMerchantBasePayload;
 };

package/package.json

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