From 120567269d7e87bfc396ce7af425196dfd31f067 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 3 Jul 2023 09:01:28 +0200 Subject: [PATCH] Make state filter array --- web/frontend/src/Node.root.svelte | 195 +++++++++++++++++++----------- 1 file changed, 126 insertions(+), 69 deletions(-) diff --git a/web/frontend/src/Node.root.svelte b/web/frontend/src/Node.root.svelte index f5715c9..e9e5f96 100644 --- a/web/frontend/src/Node.root.svelte +++ b/web/frontend/src/Node.root.svelte @@ -1,46 +1,68 @@ {#if $initq.error} {$initq.error.message} {:else if $initq.fetching} - + {:else} - + {hostname} ({cluster}) - {#if $nodeJobsData.fetching } - + {#if $nodeJobsData.fetching} + + {:else if $nodeJobsData.data} + Currently running jobs on this node: {$nodeJobsData.data.jobs + .count} + [ + View in Job List ] {:else} - {#if $nodeJobsData.data} - Currently running jobs on this node: { $nodeJobsData.data.jobs.count } - [ View in Job List ] - {:else} - No currently running jobs. - {/if} + No currently running jobs. {/if} - + {/if} -
+
{#if $nodeMetricsData.error} {$nodeMetricsData.error.message} {:else if $nodeMetricsData.fetching || $initq.fetching} - + {:else} ({ ...m, disabled: checkMetricDisabled(m.name, cluster, $nodeMetricsData.data.nodeMetrics[0].subCluster)})) - .sort((a, b) => a.name.localeCompare(b.name))}> - -

{item.name} {metricUnits[item.name]}

+ .map((m) => ({ + ...m, + disabled: checkMetricDisabled( + m.name, + cluster, + $nodeMetricsData.data.nodeMetrics[0].subCluster + ), + })) + .sort((a, b) => a.name.localeCompare(b.name))} + > +

+ {item.name} + {metricUnits[item.name]} +

{#if item.disabled === false && item.metric} c.name == cluster)} subCluster={$nodeMetricsData.data.nodeMetrics[0].subCluster} - series={item.metric.series} /> + {width} + height={300} + metric={item.name} + timestep={item.metric.timestep} + cluster={clusters.find((c) => c.name == cluster)} + subCluster={$nodeMetricsData.data.nodeMetrics[0] + .subCluster} + series={item.metric.series} + /> {:else if item.disabled === true && item.metric} - Metric disabled for subcluster {item.name}:{$nodeMetricsData.data.nodeMetrics[0].subCluster} + Metric disabled for subcluster {item.name}:{$nodeMetricsData.data.nodeMetrics[0] + .subCluster} {:else} - No dataset returned for {item.name} + No dataset returned for {item.name} {/if}
{/if}