ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-06-08 00:23:48 +02:00
Code Issues Packages Releases Activity

Fix compareTable sorting

Browse Source
This commit is contained in:
Christoph Kluge 2025-06-04 17:02:02 +02:00
parent d806cf76c4
commit 9e87974eb1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/frontend/src/generic/JobCompare.svelte
View File

@ -133,6 +133,7 @@
} }
compareTableSorting = { ...compareTableSorting }; compareTableSorting = { ...compareTableSorting };
let pendingCompareData;
if (key == 'resources') { if (key == 'resources') {
let longField = ""; let longField = "";
switch (field) { switch (field) {
@ -148,12 +149,13 @@
default: default:
console.log("Unknown Res Field", field) console.log("Unknown Res Field", field)
} }
compareTableData = compareTableData.sort((j1, j2) => {
pendingCompareData = compareTableData.sort((j1, j2) => {
if (j1[longField] == null || j2[longField] == null) return -1; if (j1[longField] == null || j2[longField] == null) return -1;
return s.dir != "up" ? j1[longField] - j2[longField] : j2[longField] - j1[longField]; return s.dir != "up" ? j1[longField] - j2[longField] : j2[longField] - j1[longField];
}); });
} else if (key == 'meta') { } else if (key == 'meta') {
compareTableData = compareTableData.sort((j1, j2) => { pendingCompareData = compareTableData.sort((j1, j2) => {
if (j1[field] == null || j2[field] == null) return -1; if (j1[field] == null || j2[field] == null) return -1;
if (field == 'cluster') { if (field == 'cluster') {
let c1 = `${j1.cluster} (${j1.subCluster})` let c1 = `${j1.cluster} (${j1.subCluster})`
@ -164,13 +166,15 @@
} }
}); });
} else { } else {
compareTableData = compareTableData.sort((j1, j2) => { pendingCompareData = compareTableData.sort((j1, j2) => {
let s1 = j1.stats.find((m) => m.name == key)?.data; let s1 = j1.stats.find((m) => m.name == key)?.data;
let s2 = j2.stats.find((m) => m.name == key)?.data; let s2 = j2.stats.find((m) => m.name == key)?.data;
if (s1 == null || s2 == null) return -1; if (s1 == null || s2 == null) return -1;
return s.dir != "up" ? s1[field] - s2[field] : s2[field] - s1[field]; return s.dir != "up" ? s1[field] - s2[field] : s2[field] - s1[field];
}); });
} }
compareTableData = [...pendingCompareData]
} }
function jobs2uplot(jobs, metrics) { function jobs2uplot(jobs, metrics) {