From d5394c9e92de8d04a186ac18db05838c1c732c70 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Fri, 28 Feb 2025 13:37:59 +0100
Subject: [PATCH] fix: analysis view top links fixed, add full name to topusers

---
 web/frontend/src/Analysis.root.svelte | 9 ++++++---
 web/frontend/src/Status.root.svelte   | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/web/frontend/src/Analysis.root.svelte b/web/frontend/src/Analysis.root.svelte
index 40757d3..1617ccd 100644
--- a/web/frontend/src/Analysis.root.svelte
+++ b/web/frontend/src/Analysis.root.svelte
@@ -70,6 +70,8 @@
     ...new Set([...metricsInHistograms, ...metricsInScatterplots.flat()]),
   ];
 
+  $: clusterName = cluster?.name ? cluster.name : cluster;
+
   const sortOptions = [
     { key: "totalWalltime", label: "Walltime" },
     { key: "totalNodeHours", label: "Node Hours" },
@@ -159,6 +161,7 @@
           groupBy: $groupBy
         ) {
           id
+          name
           totalWalltime
           totalNodeHours
           totalCoreHours
@@ -423,14 +426,14 @@
                 <td><Icon name="circle-fill" style="color: {colors[i]};" /></td>
                 {#if groupSelection.key == "user"}
                   <th scope="col"
-                    ><a href="/monitoring/user/{te.id}?cluster={cluster}"
-                      >{te.id}</a
+                    ><a href="/monitoring/user/{te.id}?cluster={clusterName}"
+                      >{te.id} {te?.name ? `(${te.name})` : ''}</a
                     ></th
                   >
                 {:else}
                   <th scope="col"
                     ><a
-                      href="/monitoring/jobs/?cluster={cluster}&project={te.id}&projectMatch=eq"
+                      href="/monitoring/jobs/?cluster={clusterName}&project={te.id}&projectMatch=eq"
                       >{te.id}</a
                     ></th
                   >
diff --git a/web/frontend/src/Status.root.svelte b/web/frontend/src/Status.root.svelte
index 63a69f5..1249e0c 100644
--- a/web/frontend/src/Status.root.svelte
+++ b/web/frontend/src/Status.root.svelte
@@ -177,6 +177,7 @@
           groupBy: USER
         ) {
           id
+          name
           totalJobs
           totalNodes
           totalCores
@@ -518,7 +519,7 @@
                 <th scope="col"
                   ><a
                     href="/monitoring/user/{tu.id}?cluster={cluster}&state=running"
-                    >{tu.id}</a
+                    >{tu.id} {tu?.name ? `(${tu.name})` : ''}</a
                   ></th
                 >
                 <td>{tu[topUserSelection.key]}</td>