add subcluster reactivity to jobList

This commit is contained in:
Christoph Kluge
2026-01-16 12:35:17 +01:00
parent 1d62ee1e22
commit b81d9b05ac

View File

@@ -54,9 +54,11 @@
/* Derived */ /* Derived */
const presetProject = $derived(filterPresets?.project ? filterPresets.project : ""); const presetProject = $derived(filterPresets?.project ? filterPresets.project : "");
let selectedCluster = $derived(filterPresets?.cluster ? filterPresets.cluster : null); let selectedCluster = $derived(filterPresets?.cluster ? filterPresets.cluster : null);
let selectedSubCluster = $derived(filterPresets?.partition ? filterPresets.partition : null);
let metrics = $derived(filterPresets.cluster let metrics = $derived(filterPresets.cluster
? ccconfig[`metricConfig_jobListMetrics:${filterPresets.cluster}`] || ? filterPresets.partition
ccconfig.metricConfig_jobListMetrics ? ccconfig[`metricConfig_jobListMetrics:${filterPresets.cluster}:${filterPresets.partition}`]
: ccconfig[`metricConfig_jobListMetrics:${filterPresets.cluster}`] || ccconfig.metricConfig_jobListMetrics
: ccconfig.metricConfig_jobListMetrics : ccconfig.metricConfig_jobListMetrics
); );
let showFootprint = $derived(filterPresets.cluster let showFootprint = $derived(filterPresets.cluster
@@ -86,6 +88,11 @@
metrics = selectedCluster ? ccconfig[`metricConfig_jobListMetrics:${selectedCluster}`] : ccconfig.metricConfig_jobListMetrics metrics = selectedCluster ? ccconfig[`metricConfig_jobListMetrics:${selectedCluster}`] : ccconfig.metricConfig_jobListMetrics
}); });
$effect(() => {
// Load Metric-Selection for last selected cluster
metrics = selectedSubCluster ? ccconfig[`metricConfig_jobListMetrics:${selectedCluster}:${selectedSubCluster}`] : ccconfig[`metricConfig_jobListMetrics:${selectedCluster}`]
});
/* On Mount */ /* On Mount */
// The filterPresets are handled by the Filters component, // The filterPresets are handled by the Filters component,
// so we need to wait for it to be ready before we can start a query. // so we need to wait for it to be ready before we can start a query.
@@ -134,6 +141,9 @@
selectedCluster = detail.filters[0]?.cluster selectedCluster = detail.filters[0]?.cluster
? detail.filters[0].cluster.eq ? detail.filters[0].cluster.eq
: null; : null;
selectedSubCluster = detail.filters[1]?.partition
? detail.filters[1].partition.eq
: null;
filterBuffer = [...detail.filters] filterBuffer = [...detail.filters]
if (showCompare) { if (showCompare) {
jobCompare.queryJobs(detail.filters); jobCompare.queryJobs(detail.filters);
@@ -220,6 +230,7 @@
bind:showFootprint bind:showFootprint
presetMetrics={metrics} presetMetrics={metrics}
cluster={selectedCluster} cluster={selectedCluster}
subCluster={selectedSubCluster}
configName="metricConfig_jobListMetrics" configName="metricConfig_jobListMetrics"
footprintSelect footprintSelect
applyMetrics={(newMetrics) => applyMetrics={(newMetrics) =>