Merge pull request #728 from utmstack/bugfix/10.5.1/727-In-some-clients-all-charts-don't-load

Fixed: In some clients all charts don't load and the page isn't functioning

Author: c3s4rfred

frontend/src/app/shared/util/elastic-health.util.ts

@@ -1,26 +1,23 @@
 import {ElasticHealthStatsType} from '../types/elasticsearch/elastic-health-stats.type';
-
 export function getElasticClusterHealth(clusterHealth: ElasticHealthStatsType,
                                         connection: 'UP' | 'DOWN'): 'CRITIC' | 'MEDIUM' | 'UP' | 'DOWN' {
   if (clusterHealth) {
-    if (clusterHealth.diskUsedPercent > 84) {
-      return 'CRITIC';
-    }
-    if (clusterHealth.heapPercent > 85) {
+    const { diskUsedPercent, heapPercent } = clusterHealth;
+
+    if (diskUsedPercent > 84 || heapPercent > 85) {
       return 'CRITIC';
     }
-    if (clusterHealth.diskUsedPercent > 75 && this.clusterHealth.diskUsedPercent <= 85) {
+
+    if ((diskUsedPercent > 75 && diskUsedPercent <= 85) || (heapPercent >= 50 && heapPercent <= 85)) {
       return 'MEDIUM';
-    } else if (clusterHealth.diskUsedPercent <= 50) {
-      return 'UP';
     }
-    if (clusterHealth.heapPercent >= 50 && this.clusterHealth.heapPercent <= 85) {
-      return 'MEDIUM';
-    } else if (clusterHealth.heapPercent < 50) {
+
+    if (diskUsedPercent <= 50 && heapPercent < 50) {
       return 'UP';
-    } else {
-      return connection;
     }
+
+    return connection;
+
   } else {
     return connection;
   }