From 419bc2747b9e774b5404c34f59b17d3609fe5299 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Mon, 3 Mar 2025 16:53:19 +0100
Subject: [PATCH 1/3] fix nodeInfo null error

---
 web/frontend/src/systems/nodelist/NodeListRow.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/frontend/src/systems/nodelist/NodeListRow.svelte b/web/frontend/src/systems/nodelist/NodeListRow.svelte
index 07e5556..5e6e4ac 100644
--- a/web/frontend/src/systems/nodelist/NodeListRow.svelte
+++ b/web/frontend/src/systems/nodelist/NodeListRow.svelte
@@ -105,7 +105,7 @@
           .filter((r) => r.hostname === nodeData.host)
           .map((r) => r.accelerators)
         )
-      )).flat(2)
+      )).flat(2).filter(a => a) // Last filter(): Exclude Null, Undefined and empty Str
 
       extendedLegendData = {}
       for (const accId of accSet) {

From 5c9d4ffa9a1f70ea4ff3ad2c3185ef9c7cc87168 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Mon, 3 Mar 2025 17:00:33 +0100
Subject: [PATCH 2/3] clarify and simplyfy earlier change

---
 web/frontend/src/systems/nodelist/NodeListRow.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/frontend/src/systems/nodelist/NodeListRow.svelte b/web/frontend/src/systems/nodelist/NodeListRow.svelte
index 5e6e4ac..5202573 100644
--- a/web/frontend/src/systems/nodelist/NodeListRow.svelte
+++ b/web/frontend/src/systems/nodelist/NodeListRow.svelte
@@ -102,10 +102,10 @@
     if ($nodeJobsData.data.jobs.count >= 1) { // "&& !$nodeJobsData.data.jobs.items[0].exclusive)"
       const accSet = Array.from(new Set($nodeJobsData.data.jobs.items
         .map((i) => i.resources
-          .filter((r) => r.hostname === nodeData.host)
-          .map((r) => r.accelerators)
+          .filter((r) => (r.hostname === nodeData.host) && r?.accelerators)
+          .map((r) => r?.accelerators)
         )
-      )).flat(2).filter(a => a) // Last filter(): Exclude Null, Undefined and empty Str
+      )).flat(2)
 
       extendedLegendData = {}
       for (const accId of accSet) {

From fcc9e17664ecf5d05206bda34e054c6fc48abccb Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Mon, 3 Mar 2025 17:24:54 +0100
Subject: [PATCH 3/3] change: remove metrics from job view select if
 unavailable on subCLuster

---
 web/frontend/src/Job.root.svelte                       | 3 ++-
 web/frontend/src/generic/select/MetricSelection.svelte | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte
index b641a43..f2df916 100644
--- a/web/frontend/src/Job.root.svelte
+++ b/web/frontend/src/Job.root.svelte
@@ -130,7 +130,7 @@
     const pendingMetrics = [
       ...(ccconfig[`job_view_selectedMetrics:${job.cluster}`] ||
       $initq.data.globalMetrics.reduce((names, gm) => {
-          if (gm.availability.find((av) => av.cluster === job.cluster)) {
+          if (gm.availability.find((av) => av.cluster === job.cluster && av.subClusters.includes(job.subCluster))) {
             names.push(gm.name);
           }
           return names;
@@ -434,6 +434,7 @@
 {#if $initq.data}
   <MetricSelection
     cluster={$initq.data.job.cluster}
+    subCluster={$initq.data.job.subCluster}
     configName="job_view_selectedMetrics"
     bind:metrics={selectedMetrics}
     bind:isOpen={isMetricsSelectionOpen}
diff --git a/web/frontend/src/generic/select/MetricSelection.svelte b/web/frontend/src/generic/select/MetricSelection.svelte
index 71b42b8..8cbfc67 100644
--- a/web/frontend/src/generic/select/MetricSelection.svelte
+++ b/web/frontend/src/generic/select/MetricSelection.svelte
@@ -28,6 +28,7 @@
   export let configName;
   export let allMetrics = null;
   export let cluster = null;
+  export let subCluster = null;
   export let showFootprint = false;
   export let footprintSelect = false;
 
@@ -51,7 +52,11 @@
       } else {
         allMetrics.clear();
         for (let gm of globalMetrics) {
-          if (gm.availability.find((av) => av.cluster === cluster)) allMetrics.add(gm.name);
+          if (subCluster == null) {
+            if (gm.availability.find((av) => av.cluster === cluster)) allMetrics.add(gm.name);
+          } else {
+            if (gm.availability.find((av) => av.cluster === cluster && av.subClusters.includes(subCluster))) allMetrics.add(gm.name);
+          }
         }
       }
       newMetricsOrder = [...allMetrics].filter((m) => !metrics.includes(m));