@zeniai/client-epic-state 4.11.21 → 4.11.23

package/lib/view/companyHealthMetricView/companyHealthMetricViewSelector.js

@@ -237,7 +237,10 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
         : filteredCompanies, index + 1);
 };
 const sortAndFilterCompanies = (sortKey, sortOrder, filterText, filters, companies, userState) => {
-    const sortOrderKey = (0, sortOrderPayload_1.getSortOrder)(sortOrder);
+    let sortOrderKey = (0, sortOrderPayload_1.getSortOrder)(sortOrder);
+    if (sortKey === 'lastReportSent') {
+        sortOrderKey = sortOrderKey === 'asc' ? 'desc' : 'asc';
+    }
     let updatedCompanies = [];
     const trimmedFilterText = filterText.trim();
     if (trimmedFilterText) {

package/lib/view/reviewCompanyView/reviewCompanyViewSelector.js

@@ -10,6 +10,7 @@ const values_1 = __importDefault(require("lodash/values"));
 const userSelector_1 = require("../../entity/user/userSelector");
 const companySelector_1 = require("../../entity/company/companySelector");
 const userAndRole_1 = require("../companyView/types/userAndRole");
+const sortOrderPayload_1 = require("../../commonPayloadTypes/sortOrderPayload");
 exports.getReviewCompanySelectorView = (0, toolkit_1.createSelector)((state) => state, (rootState) => {
     const { filterText, sortKey, sortOrder } = rootState.reviewCompanyViewState.uiState;
     const companies = (0, values_1.default)(rootState.reviewCompanyViewState.reviewCompanyById)
@@ -36,7 +37,38 @@ exports.getReviewCompanySelectorView = (0, toolkit_1.createSelector)((state) =>
         .map((userId) => (0, userSelector_1.getUserByUserId)(rootState.userState, userId))
         .filter((value) => value != null);
     const orderedZeniUsers = (0, orderBy_1.default)(zeniUsers, (user) => (0, userSelector_1.getUserName)(user), 'asc');
-    const sortedCompanies = (0, orderBy_1.default)(companies, (company) => {
+    const companiesWithSortKeyValues = [];
+    const companiesWithNoSortKeyValues = [];
+    companies.forEach((company) => {
+        switch (sortKey) {
+            case 'uncategorized':
+                if (company.uncategorizedTransactions.income ||
+                    company.uncategorizedTransactions.expense) {
+                    companiesWithSortKeyValues.push(company);
+                }
+                else {
+                    companiesWithNoSortKeyValues.push(company);
+                }
+                break;
+            case 'miscategorized':
+                if (company.miscategorizedTransactions.income ||
+                    company.miscategorizedTransactions.expense) {
+                    companiesWithSortKeyValues.push(company);
+                }
+                else {
+                    companiesWithNoSortKeyValues.push(company);
+                }
+                break;
+            case 'notes':
+            case 'warnings':
+            case 'auditScore':
+            case 'reviewVendor':
+            case 'companyName':
+                companiesWithSortKeyValues.push(company);
+                break;
+        }
+    });
+    const sortedCompaniesWithSortKeyValue = (0, orderBy_1.default)(companiesWithSortKeyValues, (company) => {
         var _a;
         const warningCount = (0, exports.getAuditWarningsCount)(company);
         let primarySortValue;
@@ -47,14 +79,14 @@ exports.getReviewCompanySelectorView = (0, toolkit_1.createSelector)((state) =>
                 primarySortValue = (_a = company.note) === null || _a === void 0 ? void 0 : _a.toLowerCase();
                 break;
             case 'uncategorized':
-                primarySortValue =
-                    (company.uncategorizedTransactions.income ? 1 : 0) +
-                        (company.uncategorizedTransactions.expense ? 1 : 0);
+                isSecondarySortApplicable = true;
+                primarySortValue = company.uncategorizedTransactions.income ? 1 : 0;
+                secondarySortValue = company.uncategorizedTransactions.expense ? 1 : 0;
                 break;
             case 'miscategorized':
-                primarySortValue =
-                    (company.miscategorizedTransactions.income ? 1 : 0) +
-                        (company.miscategorizedTransactions.expense ? 1 : 0);
+                isSecondarySortApplicable = true;
+                primarySortValue = company.miscategorizedTransactions.income ? 1 : 0;
+                secondarySortValue = company.miscategorizedTransactions.expense ? 1 : 0;
                 break;
             case 'warnings':
                 primarySortValue = warningCount;
@@ -75,9 +107,9 @@ exports.getReviewCompanySelectorView = (0, toolkit_1.createSelector)((state) =>
         return isSecondarySortApplicable === true
             ? [primarySortValue, secondarySortValue]
             : primarySortValue;
-    }, sortOrder === 'ascending' ? 'asc' : 'desc');
+    }, (0, sortOrderPayload_1.getSortOrder)(sortOrder));
     return {
-        companies: sortedCompanies,
+        companies: [...sortedCompaniesWithSortKeyValue, ...companiesWithNoSortKeyValues],
         fetchState: rootState.reviewCompanyViewState.fetchState,
         error: rootState.reviewCompanyViewState.error,
         uiState: rootState.reviewCompanyViewState.uiState,

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

@@ -4,6 +4,7 @@ exports.toTransactionUpdatesFromTransactionDetailLocalData = void 0;
 const recommendationBase_1 = require("../../../commonStateTypes/recommendationBase");
 const entity_1 = require("../../../entity/genericEntity/entity");
 const customerTransaction_1 = require("../../../entity/transaction/stateTypes/customerTransaction");
+const transactionType_1 = require("../../../entity/transaction/stateTypes/transactionType");
 const vendorTransaction_1 = require("../../../entity/transaction/stateTypes/vendorTransaction");
 const recommendationState_1 = require("../../recommendation/recommendationState");
 // This function will extract the data that will determine which all APIs need to be called
@@ -259,8 +260,12 @@ const isTransactionMiscategorized = (transaction) => {
             const lineItem = line;
             if (lineItem.isCategoryMiscategorized ||
                 lineItem.isClassMiscategorized ||
-                (lineItem.vendor == null && lineItem.customer == null) // This ensures that neither vendor or customer is present at line level, safe to say miscat line due to vendor/customer
-            ) {
+                // This ensures that neither vendor or customer is present at line level, safe to say miscat line due to vendor/customer
+                ((0, transactionType_1.toVendorTransactionTypeStrict)(transaction.type) &&
+                    transaction.vendor == null) ||
+                ((0, transactionType_1.toJEAndDepositTransactionTypeStrict)(transaction.type) &&
+                    lineItem.vendor == null &&
+                    lineItem.customer == null)) {
                 isTransactionMisCategorized = true;
             }
         }

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

@@ -68,7 +68,8 @@ const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe
             if ((0, transactionType_1.toVendorTransactionTypeStrict)(response.data.transaction.transaction_type) != null ||
                 (0, transactionType_1.toJEAndDepositTransactionTypeStrict)(response.data.transaction.transaction_type) != null) {
                 const isAnyClassMissing = checkIfClassMissingForAnyLineItem(response.data.transaction);
-                const isVendorOrCustomerMissingInAnyLine = checkIfVendorOrCustomerMissingForAnyLineItem(response.data.transaction);
+                const isVendorOrCustomerMissingInAnyLine = (0, transactionType_1.toJEAndDepositTransactionTypeStrict)(response.data.transaction.transaction_type) != null &&
+                    checkIfVendorOrCustomerMissingForAnyLineItem(response.data.transaction);
                 if (((vendorUpdates === null || vendorUpdates === void 0 ? void 0 : vendorUpdates.id) == null &&
                     isVendorOrCustomerMissingInAnyLine == true) ||
                     isAnyClassMissing == true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.11.21",
+  "version": "4.11.23",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@reduxjs/toolkit": "^1.6.2",
-    "@stripe/stripe-js": "4.2.0",
+    "@stripe/stripe-js": "^4.1.0",
     "cross-fetch": "^3.1.2",
     "date-holidays": "^3.23.8",
     "dayjs": "^1.10.7",