mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2025-03-04 14:05:56 +01:00
fix: analysis view top links fixed, add full name to topusers
This commit is contained in:
parent
42135fd26c
commit
d5394c9e92
@ -70,6 +70,8 @@
|
|||||||
...new Set([...metricsInHistograms, ...metricsInScatterplots.flat()]),
|
...new Set([...metricsInHistograms, ...metricsInScatterplots.flat()]),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$: clusterName = cluster?.name ? cluster.name : cluster;
|
||||||
|
|
||||||
const sortOptions = [
|
const sortOptions = [
|
||||||
{ key: "totalWalltime", label: "Walltime" },
|
{ key: "totalWalltime", label: "Walltime" },
|
||||||
{ key: "totalNodeHours", label: "Node Hours" },
|
{ key: "totalNodeHours", label: "Node Hours" },
|
||||||
@ -159,6 +161,7 @@
|
|||||||
groupBy: $groupBy
|
groupBy: $groupBy
|
||||||
) {
|
) {
|
||||||
id
|
id
|
||||||
|
name
|
||||||
totalWalltime
|
totalWalltime
|
||||||
totalNodeHours
|
totalNodeHours
|
||||||
totalCoreHours
|
totalCoreHours
|
||||||
@ -423,14 +426,14 @@
|
|||||||
<td><Icon name="circle-fill" style="color: {colors[i]};" /></td>
|
<td><Icon name="circle-fill" style="color: {colors[i]};" /></td>
|
||||||
{#if groupSelection.key == "user"}
|
{#if groupSelection.key == "user"}
|
||||||
<th scope="col"
|
<th scope="col"
|
||||||
><a href="/monitoring/user/{te.id}?cluster={cluster}"
|
><a href="/monitoring/user/{te.id}?cluster={clusterName}"
|
||||||
>{te.id}</a
|
>{te.id} {te?.name ? `(${te.name})` : ''}</a
|
||||||
></th
|
></th
|
||||||
>
|
>
|
||||||
{:else}
|
{:else}
|
||||||
<th scope="col"
|
<th scope="col"
|
||||||
><a
|
><a
|
||||||
href="/monitoring/jobs/?cluster={cluster}&project={te.id}&projectMatch=eq"
|
href="/monitoring/jobs/?cluster={clusterName}&project={te.id}&projectMatch=eq"
|
||||||
>{te.id}</a
|
>{te.id}</a
|
||||||
></th
|
></th
|
||||||
>
|
>
|
||||||
|
@ -177,6 +177,7 @@
|
|||||||
groupBy: USER
|
groupBy: USER
|
||||||
) {
|
) {
|
||||||
id
|
id
|
||||||
|
name
|
||||||
totalJobs
|
totalJobs
|
||||||
totalNodes
|
totalNodes
|
||||||
totalCores
|
totalCores
|
||||||
@ -518,7 +519,7 @@
|
|||||||
<th scope="col"
|
<th scope="col"
|
||||||
><a
|
><a
|
||||||
href="/monitoring/user/{tu.id}?cluster={cluster}&state=running"
|
href="/monitoring/user/{tu.id}?cluster={cluster}&state=running"
|
||||||
>{tu.id}</a
|
>{tu.id} {tu?.name ? `(${tu.name})` : ''}</a
|
||||||
></th
|
></th
|
||||||
>
|
>
|
||||||
<td>{tu[topUserSelection.key]}</td>
|
<td>{tu[topUserSelection.key]}</td>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user