Merge pull request #237 from ClusterCockpit/hotfix

Fix pageload block due to missing nullsafe
ClusterCockpit · Feb 9, 2024 · be6c63e · be6c63e
2 parents 63f3dc9 + a2af9c1
commit be6c63e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/web/frontend/src/Status.root.svelte b/web/frontend/src/Status.root.svelte
@@ -67,7 +67,7 @@
         );
 
     let isHistogramSelectionOpen = false
-    $: metricsInHistograms = cluster ? ccconfig[`user_view_histogramMetrics:${cluster}`] : (ccconfig.user_view_histogramMetrics || [])
+    $: metricsInHistograms = cluster ? (ccconfig[`user_view_histogramMetrics:${cluster}`] || []) : (ccconfig.user_view_histogramMetrics || [])
 
     const client = getContextClient();
     $: mainQuery = queryStore({

diff --git a/web/frontend/src/User.root.svelte b/web/frontend/src/User.root.svelte
@@ -31,7 +31,7 @@
         ? !!ccconfig[`plot_list_showFootprint:${filterPresets.cluster}`]
         : !!ccconfig.plot_list_showFootprint
 
-    $: metricsInHistograms = selectedCluster ? ccconfig[`user_view_histogramMetrics:${selectedCluster}`] : (ccconfig.user_view_histogramMetrics || [])
+    $: metricsInHistograms = selectedCluster ? (ccconfig[`user_view_histogramMetrics:${selectedCluster}`] || []) : (ccconfig.user_view_histogramMetrics || [])
 
     const client = getContextClient();
     $: stats = queryStore({