Add bug fix for 404 page in cluster details view

trento-project · May 16, 2023 · f0c5e28 · f0c5e28
1 parent 6753c90
commit f0c5e28
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/assets/js/components/ExecutionResults/ExecutionResults.jsx b/assets/js/components/ExecutionResults/ExecutionResults.jsx
@@ -7,6 +7,7 @@ import HealthIcon from '@components/Health';
 import Modal from '@components/Modal';
 import PremiumPill from '@components/PremiumPill';
 import Table from '@components/Table';
+import LoadingBox from '@components/LoadingBox';
 import {
   getCatalogCategoryList,
   getCheckResults,
@@ -117,6 +118,10 @@ function ExecutionResults({
     }
   };
 
+  if (catalogLoading) {
+    return <LoadingBox text="Loading checks catalog" />;
+  }
+
   const checksResults = getCheckResults(executionData);
   const catalogCategoryList = getCatalogCategoryList(catalog, checksResults);
   const tableData = checksResults

diff --git a/assets/js/components/ExecutionResults/ExecutionResultsPage.jsx b/assets/js/components/ExecutionResults/ExecutionResultsPage.jsx
@@ -11,6 +11,7 @@ import {
   REQUESTED_EXECUTION_STATE,
   RUNNING_STATES,
 } from '@state/lastExecutions';
+import LoadingBox from '@components/LoadingBox';
 import ExecutionResults from './ExecutionResults';
 
 function ExecutionResultsPage() {
@@ -40,7 +41,7 @@ function ExecutionResultsPage() {
   }, [cloudProvider]);
 
   if (!cluster) {
-    return <div>Loading...</div>;
+    return <LoadingBox text="Loading ..." />;
   }
 
   return (

diff --git a/assets/js/components/ExecutionResults/checksUtils.js b/assets/js/components/ExecutionResults/checksUtils.js
@@ -44,9 +44,10 @@ export const getCatalogCategoryList = (catalog, checksResults = []) => {
   }
   return [
     ...new Set(
-      checksResults.map(
-        ({ check_id }) => catalog.find((check) => check.id === check_id).group
-      )
+      checksResults.map(({ check_id }) => {
+        const result = catalog.find((check) => check.id === check_id);
+        return !result ? '' : result.group;
+      })
     ),
   ].sort();
 };