From 0a3a664653067cab0729ab72dccd175b2c478c9f Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Thu, 9 Oct 2025 16:33:14 +0200 Subject: [PATCH] small fixes, set analysisView config defaults --- web/frontend/src/Analysis.root.svelte | 14 ++++---------- web/frontend/src/List.root.svelte | 2 +- web/frontend/src/Systems.root.svelte | 7 ------- web/frontend/src/generic/Filters.svelte | 5 +++-- web/frontend/src/generic/joblist/JobListRow.svelte | 2 +- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/web/frontend/src/Analysis.root.svelte b/web/frontend/src/Analysis.root.svelte index 4398831..8d9972a 100644 --- a/web/frontend/src/Analysis.root.svelte +++ b/web/frontend/src/Analysis.root.svelte @@ -82,27 +82,21 @@ let colWidth1 = $state(0); let colWidth2 = $state(0); let jobFilters = $state([]); - let metricsInHistograms = $state(ccconfig.analysisView_histogramMetrics) - let metricsInScatterplots = $state(ccconfig.analysisView_scatterPlotMetrics) + let metricsInHistograms = $state(ccconfig?.analysisView_histogramMetrics || []) + let metricsInScatterplots = $state(ccconfig?.analysisView_scatterPlotMetrics || []) let sortSelection = $state( sortOptions.find( (option) => option.key == ccconfig[`analysisView_selectedTopCategory:${filterPresets.cluster}`], - ) || - sortOptions.find( - (option) => option.key == ccconfig.analysisView_selectedTopCategory, - ) + ) || sortOptions[0] ); let groupSelection = $state( groupOptions.find( (option) => option.key == ccconfig[`analysisView_selectedTopEntity:${filterPresets.cluster}`], - ) || - groupOptions.find( - (option) => option.key == ccconfig.analysisView_selectedTopEntity, - ) + ) || groupOptions[0] ); /* Init Function */ diff --git a/web/frontend/src/List.root.svelte b/web/frontend/src/List.root.svelte index 9dc14ad..ec8f654 100644 --- a/web/frontend/src/List.root.svelte +++ b/web/frontend/src/List.root.svelte @@ -136,7 +136,7 @@ startTimeQuickSelect bind:this={filterComponent} {filterPresets} - menuText="Only {type.toLowerCase()}s with jobs that match the filters will show up" + menuText="Only {type.toLowerCase()}s with matching jobs will be displayed." applyFilters={(detail) => { jobFilters = detail.filters; }} diff --git a/web/frontend/src/Systems.root.svelte b/web/frontend/src/Systems.root.svelte index a8e2545..3c46adc 100644 --- a/web/frontend/src/Systems.root.svelte +++ b/web/frontend/src/Systems.root.svelte @@ -98,13 +98,6 @@ return [] }); - // $inspect('System', systemMetrics) - // $inspect('List', selectedMetrics) - // $inspect('Overview', selectedMetric) - // console.log('Config', ccconfig) - // console.log('Config List', ccconfig[`nodeOverview_selectedMetrics:${cluster}`], cluster) - // console.log('Config Overview', ccconfig[`nodeOverview_selectedMetric:${cluster}`], cluster) - /* Effects */ $effect(() => { if (displayNodeOverview) { diff --git a/web/frontend/src/generic/Filters.svelte b/web/frontend/src/generic/Filters.svelte index 44fc408..7bc877f 100644 --- a/web/frontend/src/generic/Filters.svelte +++ b/web/frontend/src/generic/Filters.svelte @@ -294,11 +294,12 @@ Filters - Manage Filters {#if menuText} + Note {menuText} {/if} + Manage Filters (isClusterOpen = true)}> Cluster/Partition @@ -325,7 +326,7 @@ {#if startTimeQuickSelect} - Start Time Quick Selection + Start Time Quick Selection {#each startTimeSelectOptions.filter((stso) => stso.range !== "") as { rangeLabel, range }} { diff --git a/web/frontend/src/generic/joblist/JobListRow.svelte b/web/frontend/src/generic/joblist/JobListRow.svelte index 28574d9..8019b96 100644 --- a/web/frontend/src/generic/joblist/JobListRow.svelte +++ b/web/frontend/src/generic/joblist/JobListRow.svelte @@ -170,7 +170,7 @@ - + {#if job.monitoringStatus == 0 || job.monitoringStatus == 2}