Fix 404 page when wrong filtered catalog is being used in execution r…

…esults page (#1414) * Add bug fix for 404 page in cluster details view
trento-project · May 16, 2023 · dff15cd · dff15cd
1 parent 6753c90
commit dff15cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 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 {
   getCatalogCategoryList,
   getCheckResults,
@@ -116,7 +117,6 @@ function ExecutionResults({
       onLastExecutionUpdate();
     }
   };
-
   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
@@ -45,7 +45,8 @@ export const getCatalogCategoryList = (catalog, checksResults = []) => {
   return [
     ...new Set(
       checksResults.map(
-        ({ check_id }) => catalog.find((check) => check.id === check_id).group
+        ({ check_id }) =>
+          catalog.find((check) => check.id === check_id)?.group || ''
       )
     ),
   ].sort();