ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-03-04 14:05:56 +01:00
Code Issues Packages Releases Activity

Merge pull request #351 from ClusterCockpit/dev

Browse Source 
Dev
This commit is contained in:
Christoph Kluge 2025-03-03 17:34:33 +01:00 committed by GitHub
commit e86f6a8cbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/frontend/src/Job.root.svelte
View File

@ -130,7 +130,7 @@
const pendingMetrics = [ const pendingMetrics = [
...(ccconfig[`job_view_selectedMetrics:${job.cluster}`] || ...(ccconfig[`job_view_selectedMetrics:${job.cluster}`] ||
$initq.data.globalMetrics.reduce((names, gm) => { $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); names.push(gm.name);
} }
return names; return names;
@ -434,6 +434,7 @@
{#if $initq.data} {#if $initq.data}
<MetricSelection <MetricSelection
cluster={$initq.data.job.cluster} cluster={$initq.data.job.cluster}
subCluster={$initq.data.job.subCluster}
configName="job_view_selectedMetrics" configName="job_view_selectedMetrics"
bind:metrics={selectedMetrics} bind:metrics={selectedMetrics}
bind:isOpen={isMetricsSelectionOpen} bind:isOpen={isMetricsSelectionOpen}

7
web/frontend/src/generic/select/MetricSelection.svelte
View File

@ -28,6 +28,7 @@
export let configName; export let configName;
export let allMetrics = null; export let allMetrics = null;
export let cluster = null; export let cluster = null;
export let subCluster = null;
export let showFootprint = false; export let showFootprint = false;
export let footprintSelect = false; export let footprintSelect = false;
@ -51,7 +52,11 @@
} else { } else {
allMetrics.clear(); allMetrics.clear();
for (let gm of globalMetrics) { 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)); newMetricsOrder = [...allMetrics].filter((m) => !metrics.includes(m));

4
web/frontend/src/systems/nodelist/NodeListRow.svelte
View File

@ -102,8 +102,8 @@
if ($nodeJobsData.data.jobs.count >= 1) { // "&& !$nodeJobsData.data.jobs.items[0].exclusive)" if ($nodeJobsData.data.jobs.count >= 1) { // "&& !$nodeJobsData.data.jobs.items[0].exclusive)"
const accSet = Array.from(new Set($nodeJobsData.data.jobs.items const accSet = Array.from(new Set($nodeJobsData.data.jobs.items
.map((i) => i.resources .map((i) => i.resources
.filter((r) => r.hostname === nodeData.host) .filter((r) => (r.hostname === nodeData.host) && r?.accelerators)
.map((r) => r.accelerators) .map((r) => r?.accelerators)
) )
)).flat(2) )).flat(2)