@zeniai/client-epic-state 4.11.6 → 4.11.7

package/lib/view/companyView/selector/companyManagementViewSelector.js

@@ -339,6 +339,7 @@ const sortAndFilterCompanies = (sortKey, sortOrder, filterText, companies, userS
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
             let primarySortValue;
             let secondarySortValue;
+            let isSecondarySortApplicable;
             const managegmentInfo = company.company.company.managegmentInfo;
             switch (sortKey) {
                 case 'companyName':
@@ -390,25 +391,27 @@ const sortAndFilterCompanies = (sortKey, sortOrder, filterText, companies, userS
                     primarySortValue = (_m = managegmentInfo.note) === null || _m === void 0 ? void 0 : _m.length;
                     break;
                 case 'satisfaction':
-                    primarySortValue =
-                        (((_o = managegmentInfo.customerSatisfaction) === null || _o === void 0 ? void 0 : _o.teamRating) != null
+                    isSecondarySortApplicable = true;
+                    primarySortValue = (((_o = managegmentInfo.customerSatisfaction) === null || _o === void 0 ? void 0 : _o.customerRating) != null
+                        ? customerSatisfactionState_1.customerRatingValues[managegmentInfo.customerSatisfaction.customerRating]
+                        : 0);
+                    secondarySortValue =
+                        (((_p = managegmentInfo.customerSatisfaction) === null || _p === void 0 ? void 0 : _p.teamRating) != null
                             ? customerSatisfactionState_1.teamRatingValues[managegmentInfo.customerSatisfaction.teamRating]
-                            : 0) +
-                            (((_p = managegmentInfo.customerSatisfaction) === null || _p === void 0 ? void 0 : _p.customerRating) != null
-                                ? customerSatisfactionState_1.customerRatingValues[managegmentInfo.customerSatisfaction.customerRating]
-                                : 0);
+                            : 0);
                     break;
                 case 'bookCloseDate':
                     primarySortValue = ((_q = company.company.company.companyInfo.bookCloseDate) !== null && _q !== void 0 ? _q : (0, zeniDayJS_1.date)('1970-01-01T00:00:00.000Z')).valueOf();
                     break;
                 case 'status':
                 default:
+                    isSecondarySortApplicable = true;
                     primarySortValue = cockpitTypes_1.MANAGEMENT_STATUS_CODES.indexOf((_r = managegmentInfo.statusCode) === null || _r === void 0 ? void 0 : _r.toLowerCase());
                     secondarySortValue = (_s = managegmentInfo.companyGroupId) === null || _s === void 0 ? void 0 : _s.toLowerCase();
             }
-            return [primarySortValue, secondarySortValue];
+            return isSecondarySortApplicable ? [primarySortValue, secondarySortValue] : primarySortValue;
         },
-    ], sortOrder === 'ascending' ? ['asc', 'asc'] : ['desc', 'asc']);
+    ], sortOrder === 'ascending' ? ['asc', 'asc'] : ['desc', 'desc']);
     return [...sortedCompaniesWithSortKeyValue, ...companiesWithNoSortKeyValue];
 };
 const getTotalRecurringRevenue = (companies) => companies.reduce((prev, curr) => {

package/lib/view/companyView/selector/companyPortfolioViewSelector.js

@@ -157,12 +157,7 @@ const getCompanyPortfolioOnSortAndFitler = (sortKey, sortOrder, filterText, filt
         updatedCompanies = [...companies];
     }
     updatedCompanies = applyAdvancedFiltersOnCompaniesList(updatedCompanies, filters);
-    if (sortOrder === 'ascending') {
-        portfolioSortOrder = sortKey === 'runway' ? 'desc' : 'asc';
-    }
-    else {
-        portfolioSortOrder = sortKey === 'runway' ? 'asc' : 'desc';
-    }
+    portfolioSortOrder = sortOrder === 'ascending' ? 'asc' : 'desc';
     const companiesWithSortKeyValue = [];
     const companiesWithNoSortKeyValue = [];
     updatedCompanies.forEach((company) => {

package/lib/view/reviewCompanyView/reviewCompanyViewSelector.js

@@ -39,25 +39,38 @@ exports.getReviewCompanySelectorView = (0, toolkit_1.createSelector)((state) =>
     const sortedCompanies = (0, orderBy_1.default)(companies, (company) => {
         var _a;
         const warningCount = (0, exports.getAuditWarningsCount)(company);
+        let primarySortValue;
+        let secondarySortValue;
+        let isSecondarySortApplicable;
         switch (sortKey) {
             case 'notes':
-                return (_a = company.note) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                primarySortValue = (_a = company.note) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                break;
             case 'uncategorized':
-                return ((company.uncategorizedTransactions.income ? 1 : 0) +
+                primarySortValue = ((company.uncategorizedTransactions.income ? 1 : 0) +
                     (company.uncategorizedTransactions.expense ? 1 : 0));
+                break;
             case 'miscategorized':
-                return ((company.miscategorizedTransactions.income ? 1 : 0) +
+                primarySortValue = ((company.miscategorizedTransactions.income ? 1 : 0) +
                     (company.miscategorizedTransactions.expense ? 1 : 0));
+                break;
             case 'warnings':
-                return warningCount;
+                primarySortValue = warningCount;
+                break;
             case 'auditScore':
-                return company.auditSummary.fixesRequired;
+                isSecondarySortApplicable = true;
+                primarySortValue = company.auditSummary.auditScorePercentage;
+                secondarySortValue = company.auditSummary.fixesRequired;
+                break;
             case 'reviewVendor':
-                return company.isVendorReviewReqiured;
+                primarySortValue = company.isVendorReviewReqiured;
+                break;
             case 'companyName':
             default:
-                return company.name.toLowerCase();
+                primarySortValue = company.name.toLowerCase();
+                break;
         }
+        return isSecondarySortApplicable ? [primarySortValue, secondarySortValue] : primarySortValue;
     }, sortOrder === 'ascending' ? 'asc' : 'desc');
     return {
         companies: sortedCompanies,

package/lib/view/subscriptionView/subscriptionViewSelector.js

@@ -370,6 +370,7 @@ const getSubscriptionListOnSortAndFitler = (sortKey, sortOrder, filterText, filt
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
             let primarySortValue;
             let secondarySortValue;
+            let isSecondarySortApplicable;
             const subscription = (_a = company.primarySubscription) === null || _a === void 0 ? void 0 : _a.subscription;
             const summary = (_b = company.primarySubscription) === null || _b === void 0 ? void 0 : _b.summary;
             switch (sortKey) {
@@ -418,11 +419,12 @@ const getSubscriptionListOnSortAndFitler = (sortKey, sortOrder, filterText, filt
                     break;
                 case 'status':
                 default:
+                    isSecondarySortApplicable = true;
                     primarySortValue = subscriptionTypes_1.SUBSCRIPTION_STATUS_CODES.indexOf((_u = (_t = subscription === null || subscription === void 0 ? void 0 : subscription.subscription) === null || _t === void 0 ? void 0 : _t.subscription.status.code) === null || _u === void 0 ? void 0 : _u.toLowerCase());
                     secondarySortValue =
                         (_v = summary === null || summary === void 0 ? void 0 : summary.summary.recommendedActionCode.toLowerCase()) !== null && _v !== void 0 ? _v : '';
             }
-            return [primarySortValue, secondarySortValue];
+            return isSecondarySortApplicable ? [primarySortValue, secondarySortValue] : primarySortValue;
         },
     ], subscriptionSortOrder === 'asc' ? ['asc', 'asc'] : ['desc', 'asc']);
     return [...sortedCompaniesWithSortKeyValue, ...companiesWithNoSortKeyValue];

package/package.json

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