diff --git a/web/frontend/src/Analysis.root.svelte b/web/frontend/src/Analysis.root.svelte index 861c0ec..8b327a2 100644 --- a/web/frontend/src/Analysis.root.svelte +++ b/web/frontend/src/Analysis.root.svelte @@ -26,6 +26,8 @@ init, convert2uplot, binsFromFootprint, + scramble, + scrambleNames, } from "./generic/utils.js"; import PlotSelection from "./analysis/PlotSelection.svelte"; import Filters from "./generic/Filters.svelte"; @@ -395,7 +397,7 @@ quantities={$topQuery.data.topList.map( (t) => t[sortSelection.key], )} - entities={$topQuery.data.topList.map((t) => t.id)} + entities={$topQuery.data.topList.map((t) => scrambleNames ? scramble(t.id) : t.id)} /> {/if} {/key} @@ -428,21 +430,21 @@ {#if groupSelection.key == "user"} {te.id}{scrambleNames ? scramble(te.id) : te.id} {#if te?.name} {te.name}{scrambleNames ? scramble(te.name) : te.name} {/if} {:else} {te.id}{scrambleNames ? scramble(te.id) : te.id} {/if} diff --git a/web/frontend/src/Status.root.svelte b/web/frontend/src/Status.root.svelte index 5494f14..86170d1 100644 --- a/web/frontend/src/Status.root.svelte +++ b/web/frontend/src/Status.root.svelte @@ -31,6 +31,8 @@ init, convert2uplot, transformPerNodeDataForRoofline, + scramble, + scrambleNames, } from "./generic/utils.js"; import { scaleNumbers } from "./generic/units.js"; import PlotGrid from "./generic/PlotGrid.svelte"; @@ -486,7 +488,7 @@ quantities={$topUserQuery.data.topUser.map( (tu) => tu[topUserSelection.key], )} - entities={$topUserQuery.data.topUser.map((tu) => tu.id)} + entities={$topUserQuery.data.topUser.map((tu) => scrambleNames ? scramble(tu.id) : tu.id)} /> {/if} {/key} @@ -520,14 +522,14 @@ {tu.id}{scrambleNames ? scramble(tu.id) : tu.id} {#if tu?.name} {tu.name}{scrambleNames ? scramble(tu.name) : tu.name} {/if} {tu[topUserSelection.key]} @@ -553,7 +555,7 @@ quantities={$topProjectQuery.data.topProjects.map( (tp) => tp[topProjectSelection.key], )} - entities={$topProjectQuery.data.topProjects.map((tp) => tp.id)} + entities={$topProjectQuery.data.topProjects.map((tp) => scrambleNames ? scramble(tp.id) : tp.id)} /> {/if} {/key} @@ -586,7 +588,7 @@ {tp.id}{scrambleNames ? scramble(tp.id) : tp.id} {tp[topProjectSelection.key]} diff --git a/web/frontend/src/systems/nodelist/NodeInfo.svelte b/web/frontend/src/systems/nodelist/NodeInfo.svelte index 6b14656..1230ce7 100644 --- a/web/frontend/src/systems/nodelist/NodeInfo.svelte +++ b/web/frontend/src/systems/nodelist/NodeInfo.svelte @@ -17,6 +17,9 @@ Input, InputGroup, InputGroupText, } from "@sveltestrap/sveltestrap"; + import { + scramble, + scrambleNames, } from "../../generic/utils.js"; export let cluster; export let subCluster @@ -32,8 +35,8 @@ let userList; let projectList; $: if (nodeJobsData) { - userList = Array.from(new Set(nodeJobsData.jobs.items.map((j) => j.user))).sort((a, b) => a.localeCompare(b)); - projectList = Array.from(new Set(nodeJobsData.jobs.items.map((j) => j.project))).sort((a, b) => a.localeCompare(b)); + userList = Array.from(new Set(nodeJobsData.jobs.items.map((j) => scrambleNames ? scramble(j.user) : j.user))).sort((a, b) => a.localeCompare(b)); + projectList = Array.from(new Set(nodeJobsData.jobs.items.map((j) => scrambleNames ? scramble(j.project) : j.project))).sort((a, b) => a.localeCompare(b)); } diff --git a/web/frontend/src/systems/nodelist/NodeListRow.svelte b/web/frontend/src/systems/nodelist/NodeListRow.svelte index 5202573..ee8ef49 100644 --- a/web/frontend/src/systems/nodelist/NodeListRow.svelte +++ b/web/frontend/src/systems/nodelist/NodeListRow.svelte @@ -14,7 +14,7 @@ getContextClient, } from "@urql/svelte"; import { Card, CardBody, Spinner } from "@sveltestrap/sveltestrap"; - import { maxScope, checkMetricDisabled } from "../../generic/utils.js"; + import { maxScope, checkMetricDisabled, scramble, scrambleNames } from "../../generic/utils.js"; import MetricPlot from "../../generic/plots/MetricPlot.svelte"; import NodeInfo from "./NodeInfo.svelte"; @@ -110,9 +110,12 @@ extendedLegendData = {} for (const accId of accSet) { const matchJob = $nodeJobsData.data.jobs.items.find((i) => i.resources.find((r) => r.accelerators.includes(accId))) + const matchUser = matchJob?.user ? matchJob.user : null extendedLegendData[accId] = { - user: matchJob?.user ? matchJob?.user : '-', - job: matchJob?.jobId ? matchJob?.jobId : '-', + user: (scrambleNames && matchUser) + ? scramble(matchUser) + : (matchUser ? matchUser : '-'), + job: matchJob?.jobId ? matchJob.jobId : '-', } } // Theoretically extendable for hwthreadIDs