review user vinformation block, reorder reactive var in jobList

This commit is contained in:
Christoph Kluge
2026-02-05 10:33:20 +01:00
parent af73ce9c6d
commit 5616801f3e
3 changed files with 55 additions and 11 deletions

View File

@@ -19,7 +19,8 @@
Spinner, Spinner,
Input, Input,
InputGroup, InputGroup,
InputGroupText InputGroupText,
Tooltip
} from "@sveltestrap/sveltestrap"; } from "@sveltestrap/sveltestrap";
import { import {
queryStore, queryStore,
@@ -32,6 +33,10 @@
scramble, scramble,
scrambleNames, scrambleNames,
} from "./generic/utils.js"; } from "./generic/utils.js";
import {
formatNumber,
formatDurationTime
} from "./generic/units.js";
import JobList from "./generic/JobList.svelte"; import JobList from "./generic/JobList.svelte";
import JobCompare from "./generic/JobCompare.svelte"; import JobCompare from "./generic/JobCompare.svelte";
import Filters from "./generic/Filters.svelte"; import Filters from "./generic/Filters.svelte";
@@ -56,6 +61,7 @@
const durationBinOptions = ["1m","10m","1h","6h","12h"]; const durationBinOptions = ["1m","10m","1h","6h","12h"];
const metricBinOptions = [10, 20, 50, 100]; const metricBinOptions = [10, 20, 50, 100];
const matchedJobCompareLimit = 500; const matchedJobCompareLimit = 500;
const shortDuration = ccconfig.jobList_hideShortRunningJobs; // Always configured
/* State Init */ /* State Init */
// List & Control Vars // List & Control Vars
@@ -108,6 +114,7 @@
shortJobs shortJobs
totalWalltime totalWalltime
totalCoreHours totalCoreHours
totalAccHours
histDuration { histDuration {
count count
value value
@@ -133,6 +140,7 @@
variables: { jobFilters, selectedHistograms, numDurationBins, numMetricBins }, variables: { jobFilters, selectedHistograms, numDurationBins, numMetricBins },
}) })
); );
const hasAccHours = $derived($stats?.data?.jobsStatistics[0]?.totalAccHours != 0);
/* Functions */ /* Functions */
function resetJobSelection() { function resetJobSelection() {
@@ -290,20 +298,54 @@
{/if} {/if}
<tr> <tr>
<th scope="row">Total Jobs</th> <th scope="row">Total Jobs</th>
<td>{$stats.data.jobsStatistics[0].totalJobs}</td> <td>
<span style="cursor: help;" title="{$stats.data.jobsStatistics[0].totalJobs} Jobs">
{formatNumber($stats.data.jobsStatistics[0].totalJobs)} Jobs
</span>
</td>
</tr> </tr>
<tr> <tr>
<th scope="row">Short Jobs</th> <th scope="row">
<td>{$stats.data.jobsStatistics[0].shortJobs}</td> <span class="mr-1">
Short Jobs
<Icon name="info-circle" id="shortjobs-info" style="margin-left:5px; cursor:help;"/>
</span>
<Tooltip target={`shortjobs-info`} placement="right">
Job duration less than {formatDurationTime(shortDuration)}
</Tooltip>
</th>
<td>
<span style="cursor: help;" title="{$stats.data.jobsStatistics[0].shortJobs} Jobs">
{formatNumber($stats.data.jobsStatistics[0].shortJobs)} Jobs
</span>
</td>
</tr> </tr>
<tr> <tr>
<th scope="row">Total Walltime</th> <th scope="row">Total Walltime</th>
<td>{$stats.data.jobsStatistics[0].totalWalltime}</td> <td>
<span style="cursor: help;" title="{$stats.data.jobsStatistics[0].totalWalltime} Hours">
{formatNumber($stats.data.jobsStatistics[0].totalWalltime)} Hours
</span>
</td>
</tr> </tr>
<tr> <tr>
<th scope="row">Total Core Hours</th> <th scope="row">Total Core Hours</th>
<td>{$stats.data.jobsStatistics[0].totalCoreHours}</td> <td>
<span style="cursor: help;" title="{$stats.data.jobsStatistics[0].totalCoreHours} Hours">
{formatNumber($stats.data.jobsStatistics[0].totalCoreHours)} Hours
</span>
</td>
</tr> </tr>
{#if hasAccHours}
<tr>
<th scope="row">Total Accelerator Hours</th>
<td>
<span style="cursor: help;" title="{$stats.data.jobsStatistics[0].totalAccHours} Hours">
{formatNumber($stats.data.jobsStatistics[0].totalAccHours)} Hours
</span>
</td>
</tr>
{/if}
</tbody> </tbody>
</Table> </Table>
</Col> </Col>
@@ -316,6 +358,7 @@
xunit="Runtime" xunit="Runtime"
ylabel="Number of Jobs" ylabel="Number of Jobs"
yunit="Jobs" yunit="Jobs"
height={hasAccHours ? 290 : 250}
usesBins usesBins
xtime xtime
/> />
@@ -330,6 +373,7 @@
xunit="Nodes" xunit="Nodes"
ylabel="Number of Jobs" ylabel="Number of Jobs"
yunit="Jobs" yunit="Jobs"
height={hasAccHours ? 290 : 250}
/> />
{/key} {/key}
</Col> </Col>

View File

@@ -79,7 +79,6 @@
/* Derived */ /* Derived */
const jobId = $derived(job?.id); const jobId = $derived(job?.id);
const refinedData = $derived($metricsQuery?.data?.jobMetrics ? sortAndSelectScope($metricsQuery.data.jobMetrics) : []);
const scopes = $derived.by(() => { const scopes = $derived.by(() => {
if (job.numNodes == 1) { if (job.numNodes == 1) {
if (job.numAcc >= 1) return ["core", "accelerator"]; if (job.numAcc >= 1) return ["core", "accelerator"];
@@ -95,6 +94,7 @@
variables: { id: jobId, metrics, scopes, selectedResolution }, variables: { id: jobId, metrics, scopes, selectedResolution },
}) })
); );
const refinedData = $derived($metricsQuery?.data?.jobMetrics ? sortAndSelectScope($metricsQuery.data.jobMetrics) : []);
/* Effects */ /* Effects */
$effect(() => { $effect(() => {

View File

@@ -32,10 +32,6 @@ export function scaleNumber(x, p = '') {
} }
} }
export function roundTwoDigits(x) {
return Math.round(x * 100) / 100
}
export function scaleNumbers(x, y, p = '') { export function scaleNumbers(x, y, p = '') {
const oldPower = power[prefix.indexOf(p)] const oldPower = power[prefix.indexOf(p)]
const rawXValue = x * oldPower const rawXValue = x * oldPower
@@ -77,6 +73,10 @@ export function formatUnixTime(t, withDate = false) {
} }
} }
export function roundTwoDigits(x) {
return Math.round(x * 100) / 100
}
// const equalsCheck = (a, b) => { // const equalsCheck = (a, b) => {
// return JSON.stringify(a) === JSON.stringify(b); // return JSON.stringify(a) === JSON.stringify(b);
// } // }