@zeniai/client-epic-state 4.19.86-betaRD9 → 4.19.86-betaSS2

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -9,7 +9,6 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const classSelector_1 = require("../../../../entity/class/classSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
@@ -51,7 +50,7 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
         newApprovalRuleId,
     };
 });
-exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => (0, tenantSelector_1.getIsAccountingClassesEnabled)(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
+exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
@@ -99,9 +98,10 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: isAccountingClassesEnabled
-            ? (0, reduceFetchState_1.reduceAllFetchState)([approverListState.fetchStatus, classListState])
-            : approverListState.fetchStatus,
+        approverListFetchStatus: (0, reduceFetchState_1.reduceAllFetchState)([
+            approverListState.fetchStatus,
+            classListState,
+        ]),
         fetchState,
         allAccountingClasses,
         error,

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPayApproversDetailsEpic.js

@@ -3,28 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchBillPayApproversDetailsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const tenantSelector_1 = require("../../../../../entity/tenant/tenantSelector");
 const classListReducer_1 = require("../../../../classList/classListReducer");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPayApproversDetailsEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPayApproversDetails.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, includeUserRoles } = action.payload;
     const { billPaySetupApproverViewState, classListState } = state$.value;
     const { approverListState } = billPaySetupApproverViewState;
-    const isAccountingClassesEnabled = (0, tenantSelector_1.getIsAccountingClassesEnabled)(state$.value);
     const actions = [];
     if (cacheOverride === true) {
         actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(cacheOverride, includeUserRoles));
-        if (isAccountingClassesEnabled) {
-            actions.push((0, classListReducer_1.fetchClassList)());
-        }
+        actions.push((0, classListReducer_1.fetchClassList)());
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(true, includeUserRoles));
         }
-        if (isAccountingClassesEnabled &&
-            classListState.hasValidState() === false &&
+        if (classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push((0, classListReducer_1.fetchClassList)());
         }

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -33,7 +33,6 @@ const billPayConfigPayload_1 = require("../billPayConfig/billPayConfigPayload");
 const billPayConfigSelector_1 = require("../billPayConfig/billPayConfigSelector");
 const billPayConfigState_1 = require("../billPayConfig/billPayConfigState");
 const billPayReviewSelector_1 = require("../billPayReview/billPayReviewSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const billPaySetupApproverViewSelector_1 = require("../billPaySetupApproverView/billPaySetupApproverViewSelector");
 const previousBillsSelector_1 = require("../previousBills/previousBillsSelector");
 const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAccountsEnabled, billId) => {
@@ -182,15 +181,12 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
             billStage = billPayInfo?.stage.code ?? 'draft';
             if (billViewState != null) {
-                const fetchStateList = [
+                fetchState = (0, reduceFetchState_1.reduceFetchState)([
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
+                    classListState,
                     billPaySetupApproverViewState,
-                ];
-                if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-                    fetchStateList.push(classListState);
-                }
-                fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
+                ]).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = (0, billDetailViewSelector_1.getBillActivities)(state, billId, billPayInfo?.stage.code);
             }
@@ -204,14 +200,11 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         }
     }
     else {
-        const newBillFetchStateList = [
+        fetchState = (0, reduceFetchState_1.reduceFetchState)([
             accountListState.byReportId.billPayAccountList,
+            classListState,
             billPaySetupApproverViewState,
-        ];
-        if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-            newBillFetchStateList.push(classListState);
-        }
-        fetchState = (0, reduceFetchState_1.reduceFetchState)(newBillFetchStateList).fetchState;
+        ]).fetchState;
     }
     if (sourceBillDetail != null && fetchState == 'Completed') {
         const updatedRecord = sourceBillDetail.billDetailLocalData;

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

@@ -79,8 +79,7 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
                 Boolean(lineItem.class?.qboId) &&
-                    Boolean(accountLine.class?.qboId) &&
-                    lineItem.class?.qboId !== accountLine.class?.qboId;
+                    lineItem.class?.qboId !== accountLine.class.qboId;
             const recommendedAccountBase = (0, exports.toRecommendedAccountBase)(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = (0, exports.toRecommendedClassBase)(lineItem.amount.amount, lineItem.class);
             const latestRecommendedCategory = lineItem.recommendedAccount;

package/lib/view/transactionDetail/transactionDetailLocalDataHelper.js

@@ -144,13 +144,13 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                     record.isRetainedCategorySelected = false;
                 }
                 if (Boolean(recommendedClass?.qboId) &&
-                    recommendedClass?.qboId !== accountLine.class?.qboId) {
+                    recommendedClass?.qboId !== accountLine.class.qboId) {
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
                 }
                 if (accountLine.isClassMiscategorized &&
-                    Boolean(accountLine.class?.qboId) &&
+                    Boolean(accountLine.class.qboId) &&
                     Boolean(isVendorOrCustomerPresent)) {
                     record.retainedClass = accountLine.class;
                     record.isRetainedClassSelected = false;
@@ -342,14 +342,14 @@ const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionDetailLo
                         }
                     };
                     const updateClass = () => {
-                        if (recommendedClass?.qboId !== accountLine.class?.qboId &&
+                        if (recommendedClass?.qboId !== accountLine.class.qboId &&
                             Boolean(recommendedClass?.qboId)) {
                             record.class = accountLine.class;
                             record.isRecommendedClassSelected = false;
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class?.qboId) &&
+                                Boolean(accountLine.class.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = accountLine.class;
                                 record.isRetainedClassSelected = false;
@@ -362,7 +362,7 @@ const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionDetailLo
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class?.qboId) &&
+                                Boolean(accountLine.class.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = recommendedClass;
                                 record.isRetainedClassSelected = false;
@@ -659,13 +659,13 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                             record.isRetainedCategorySelected = false;
                         }
                     }
-                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId)) {
+                            Boolean(accountLine.class.qboId)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
                         }
@@ -673,12 +673,12 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                     else {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
-                        if (recommendedClass?.qboId === accountLine.class?.qboId) {
+                        if (recommendedClass?.qboId === accountLine.class.qboId) {
                             record.recommendedClass = undefined;
                         }
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId)) {
+                            Boolean(accountLine.class.qboId)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;
                         }
@@ -694,7 +694,7 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                         Boolean(recommendedAccount?.qboId) !== false) {
                         record.account = recommendedAccount;
                     }
-                    if (Boolean(record.class?.qboId) === false &&
+                    if (Boolean(record.class.qboId) === false &&
                         Boolean(recommendedClass?.qboId) !== false) {
                         record.class = recommendedClass;
                     }
@@ -817,8 +817,7 @@ const getChangedLineItemCountFromLocalData = (transaction, transactionLocalData)
                     accountLineLocal.account?.qboId !== accountLine.account.qboId &&
                         accountLineLocal.account?.accountId !== accountLine.account.accountId;
                 hasClassChanged =
-                    Boolean(accountLine.class?.qboId) &&
-                        accountLineLocal.class?.qboId !== accountLine.class?.qboId;
+                    accountLineLocal.class?.qboId !== accountLine.class.qboId;
             }
             hasDescriptionChanged =
                 transactionLocalData.lineItemById[lineId] != null
@@ -958,10 +957,10 @@ const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetailLocalDa
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
-                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId) &&
+                            Boolean(accountLine.class.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
@@ -974,7 +973,7 @@ const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetailLocalDa
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId) &&
+                            Boolean(accountLine.class.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;

package/package.json

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