@zeniai/client-epic-state 4.10.64 → 4.10.66

package/lib/view/companyHealthMetricView/companyHealthMetricViewSelector.js

@@ -50,7 +50,7 @@ exports.companyHealthMetricDropDownOptions = [
     { label: 'Very High', value: 'very_high' },
 ];
 const getCompanyHealthMetricView = (state) => {
-    const { companyHealthMetricViewState, companyHealthMetricState, companyState, userState, } = state;
+    const { companyViewState, companyHealthMetricViewState, companyHealthMetricState, companyState, userState, } = state;
     const { companyIds, companyHealthMetricUpdateStatusById, uiState, selectedCompanyId, } = companyHealthMetricViewState;
     const { sortKey, sortOrder, filterText, filters } = uiState;
     const companies = (0, companySelector_1.getCompanyByCompanyIds)(companyState, companyIds).map((company) => company.company);
@@ -60,8 +60,10 @@ const getCompanyHealthMetricView = (state) => {
     if (selectedCompanyId != null) {
         selectedCompanyDetail = companyDetailWithHealthMetric.find((company) => company.companyInfo.companyId === selectedCompanyId);
     }
-    companyDetailWithHealthMetric = sortAndFilterCompanies(sortKey, sortOrder, filterText, filters, companyDetailWithHealthMetric);
-    const zeniUsers = (0, userSelector_1.getUsersByUserIds)(state.userState, state.companyViewState.zeniUsers.ids);
+    companyDetailWithHealthMetric = sortAndFilterCompanies(sortKey, sortOrder, filterText, filters, companyDetailWithHealthMetric, userState);
+    const zeniUsers = companyViewState.zeniUsers.ids
+        .map((userId) => (0, userSelector_1.getUserByUserId)(userState, userId))
+        .filter((value) => value != null);
     const orderedZeniUsers = (0, orderBy_1.default)(zeniUsers, (user) => (0, userSelector_1.getUserName)(user), 'asc');
     return {
         uiState: uiState,
@@ -239,7 +241,7 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
         ? companiesWithCurrentFilter
         : filteredCompanies, index + 1);
 };
-const sortAndFilterCompanies = (sortKey, sortOrder, filterText, filters, companies) => {
+const sortAndFilterCompanies = (sortKey, sortOrder, filterText, filters, companies, userState) => {
     const sortOrderKey = (0, sortOrderPayload_1.getSortOrder)(sortOrder);
     let updatedCompanies = [];
     const trimmedFilterText = filterText.trim();
@@ -321,10 +323,20 @@ const sortAndFilterCompanies = (sortKey, sortOrder, filterText, filters, compani
                 }
                 break;
             case 'controller':
-                companiesWithSortKeyValues.push(company);
+                if (company.managegmentInfo.controllerUserIds[0] != null) {
+                    companiesWithSortKeyValues.push(company);
+                }
+                else {
+                    companiesWithNoSortKeyValues.push(company);
+                }
                 break;
             case 'customerSuccessManager':
-                companiesWithSortKeyValues.push(company);
+                if (company.managegmentInfo.customerSuccessManagerUserIds[0] != null) {
+                    companiesWithSortKeyValues.push(company);
+                }
+                else {
+                    companiesWithNoSortKeyValues.push(company);
+                }
                 break;
             case 'companyName':
                 companiesWithSortKeyValues.push(company);
@@ -359,9 +371,9 @@ const sortAndFilterCompanies = (sortKey, sortOrder, filterText, filters, compani
             case 'customerSatisfactionScore':
                 return (_g = company.companyHealthMetric.customerSatisfactionScore) !== null && _g !== void 0 ? _g : 0;
             case 'controller':
-                return company.managegmentInfo.controllerUserIds.length;
+                return (0, userSelector_1.getUserNameById)(userState, company.managegmentInfo.controllerUserIds[0]).toLowerCase();
             case 'customerSuccessManager':
-                return company.managegmentInfo.customerSuccessManagerUserIds.length;
+                return (0, userSelector_1.getUserNameById)(userState, company.managegmentInfo.customerSuccessManagerUserIds[0]).toLowerCase();
             default:
             case 'companyName':
                 return company.companyInfo.name;

package/package.json

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