mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2024-12-26 05:19:05 +01:00
feat: change to resolution increase on zoom
This commit is contained in:
Christoph Kluge
parent
54f3a261c5
commit
7602641909
@ -32,12 +32,14 @@
|
||||
? ["core", "accelerator"]
|
||||
: ["core"]
|
||||
: ["node"];
|
||||
let selectedResolution = 600;
|
||||
let zoomStates = {};
|
||||
|
||||
const cluster = getContext("clusters").find((c) => c.name == job.cluster);
|
||||
const client = getContextClient();
|
||||
const query = gql`
|
||||
query ($id: ID!, $metrics: [String!]!, $scopes: [MetricScope!]!) {
|
||||
jobMetrics(id: $id, metrics: $metrics, scopes: $scopes) {
|
||||
query ($id: ID!, $metrics: [String!]!, $scopes: [MetricScope!]!, $selectedResolution: Int) {
|
||||
jobMetrics(id: $id, metrics: $metrics, scopes: $scopes, resolution: $selectedResolution) {
|
||||
name
|
||||
scope
|
||||
metric {
|
||||
@ -66,17 +68,30 @@
|
||||
}
|
||||
`;
|
||||
|
||||
function handleZoom(detail, metric) {
|
||||
if (
|
||||
(zoomStates[metric]?.x?.min !== detail?.lastZoomState?.x?.min) &&
|
||||
(zoomStates[metric]?.y?.max !== detail?.lastZoomState?.y?.max)
|
||||
) {
|
||||
zoomStates[metric] = {...detail.lastZoomState}
|
||||
}
|
||||
|
||||
if (detail?.newRes) { // Triggers GQL
|
||||
selectedResolution = detail.newRes
|
||||
}
|
||||
}
|
||||
|
||||
$: metricsQuery = queryStore({
|
||||
client: client,
|
||||
query: query,
|
||||
variables: { id, metrics, scopes },
|
||||
variables: { id, metrics, scopes, selectedResolution },
|
||||
});
|
||||
|
||||
function refreshMetrics() {
|
||||
metricsQuery = queryStore({
|
||||
client: client,
|
||||
query: query,
|
||||
variables: { id, metrics, scopes },
|
||||
variables: { id, metrics, scopes, selectedResolution },
|
||||
// requestPolicy: 'network-only' // use default cache-first for refresh
|
||||
});
|
||||
}
|
||||
@ -159,10 +174,7 @@
|
||||
<!-- Subluster Metricconfig remove keyword for jobtables (joblist main, user joblist, project joblist) to be used here as toplevel case-->
|
||||
{#if metric.disabled == false && metric.data}
|
||||
<MetricPlot
|
||||
on:zoom-in={({ detail }) => {
|
||||
// filterComponent.updateFilters(detail)
|
||||
console.log("Upstream New Res:", detail)
|
||||
}}
|
||||
on:zoom={({detail}) => { handleZoom(detail, metric.data.name) }}
|
||||
width={plotWidth}
|
||||
height={plotHeight}
|
||||
timestep={metric.data.metric.timestep}
|
||||
@ -175,6 +187,7 @@
|
||||
isShared={job.exclusive != 1}
|
||||
numhwthreads={job.numHWThreads}
|
||||
numaccs={job.numAcc}
|
||||
zoomState={zoomStates[metric.data.name]}
|
||||
/>
|
||||
{:else if metric.disabled == true && metric.data}
|
||||
<Card body color="info"
|
||||
|
||||
@ -129,6 +129,9 @@
|
||||
export let forNode = false;
|
||||
export let numhwthreads = 0;
|
||||
export let numaccs = 0;
|
||||
export let zoomState = null;
|
||||
|
||||
// $: console.log('Changed ZoomState for', metric, zoomState)
|
||||
|
||||
if (useStatsSeries == null) useStatsSeries = statisticsSeries != null;
|
||||
|
||||
@ -393,6 +396,19 @@
|
||||
bands: plotBands,
|
||||
padding: [5, 10, -20, 0],
|
||||
hooks: {
|
||||
init: [
|
||||
(u) => {
|
||||
u.over.addEventListener("dblclick", (e) => {
|
||||
console.log('Dispatch Reset')
|
||||
dispatch('zoom', {
|
||||
lastZoomState: {
|
||||
x: { time: false },
|
||||
y: { auto: true }
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
],
|
||||
draw: [
|
||||
(u) => {
|
||||
// Draw plot type label:
|
||||
@ -437,17 +453,26 @@
|
||||
setScale: [
|
||||
(u, key) => {
|
||||
if (key === 'x') {
|
||||
// Start
|
||||
console.log('setScale X', key);
|
||||
|
||||
// Decide which resolution to request
|
||||
|
||||
// Dispatch request
|
||||
const res = 1337;
|
||||
dispatch('zoom-in', {
|
||||
newres: res,
|
||||
const numX = (u.series[0].idxs[1] - u.series[0].idxs[0])
|
||||
if (numX <= 20 && timestep !== 60) { // Zoom IN if not at MAX
|
||||
console.log('Dispatch Zoom')
|
||||
if (timestep == 600) {
|
||||
dispatch('zoom', {
|
||||
newRes: 240,
|
||||
lastZoomState: u?.scales
|
||||
});
|
||||
|
||||
} else if (timestep === 240) {
|
||||
dispatch('zoom', {
|
||||
newRes: 60,
|
||||
lastZoomState: u?.scales
|
||||
});
|
||||
}
|
||||
} else {
|
||||
console.log('Dispatch Update')
|
||||
dispatch('zoom', {
|
||||
lastZoomState: u?.scales
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -481,6 +506,10 @@
|
||||
if (!uplot) {
|
||||
opts.width = width;
|
||||
opts.height = height;
|
||||
if (zoomState) {
|
||||
// console.log('Use last state for uPlot init:', metric, scope, zoomState)
|
||||
opts.scales = {...zoomState}
|
||||
}
|
||||
uplot = new uPlot(opts, plotData, plotWrapper);
|
||||
} else {
|
||||
uplot.setSize({ width, height });
|
||||
@ -489,7 +518,6 @@
|
||||
|
||||
function onSizeChange() {
|
||||
if (!uplot) return;
|
||||
|
||||
if (timeoutId != null) clearTimeout(timeoutId);
|
||||
|
||||
timeoutId = setTimeout(() => {
|
||||
|
||||
@ -27,7 +27,9 @@
|
||||
Spinner,
|
||||
Card,
|
||||
} from "@sveltestrap/sveltestrap";
|
||||
import { minScope } from "../generic/utils.js";
|
||||
import {
|
||||
minScope,
|
||||
} from "../generic/utils.js";
|
||||
import Timeseries from "../generic/plots/MetricPlot.svelte";
|
||||
|
||||
export let job;
|
||||
@ -39,9 +41,8 @@
|
||||
export let rawData;
|
||||
export let isShared = false;
|
||||
|
||||
let selectedHost = null,
|
||||
plot,
|
||||
error = null;
|
||||
let selectedHost = null;
|
||||
let error = null;
|
||||
let selectedScope = minScope(scopes);
|
||||
let selectedResolution;
|
||||
let pendingResolution = 600;
|
||||
@ -49,11 +50,12 @@
|
||||
let patternMatches = false;
|
||||
let nodeOnly = false; // If, after load-all, still only node scope returned
|
||||
let statsSeries = rawData.map((data) => data?.statisticsSeries ? data.statisticsSeries : null);
|
||||
let zoomState = null;
|
||||
let pendingZoomState = null;
|
||||
|
||||
const dispatch = createEventDispatcher();
|
||||
const statsPattern = /(.*)-stat$/;
|
||||
const unit = (metricUnit?.prefix ? metricUnit.prefix : "") + (metricUnit?.base ? metricUnit.base : "");
|
||||
const resolutions = [600, 240, 60] // DEV: Make configable
|
||||
const client = getContextClient();
|
||||
const subQuery = gql`
|
||||
query ($dbid: ID!, $selectedMetrics: [String!]!, $selectedScopes: [MetricScope!]!, $selectedResolution: Int) {
|
||||
@ -86,6 +88,19 @@
|
||||
}
|
||||
`;
|
||||
|
||||
function handleZoom(detail) {
|
||||
if ( // States have to differ, causes deathloop if just set
|
||||
(pendingZoomState?.x?.min !== detail?.lastZoomState?.x?.min) &&
|
||||
(pendingZoomState?.y?.max !== detail?.lastZoomState?.y?.max)
|
||||
) {
|
||||
pendingZoomState = {...detail.lastZoomState}
|
||||
}
|
||||
|
||||
if (detail?.newRes) { // Triggers GQL
|
||||
pendingResolution = detail.newRes
|
||||
}
|
||||
}
|
||||
|
||||
let metricData;
|
||||
let selectedScopes = [...scopes]
|
||||
const dbid = job.id;
|
||||
@ -119,11 +134,15 @@
|
||||
});
|
||||
|
||||
if ($metricData && !$metricData.fetching) {
|
||||
|
||||
rawData = $metricData.data.singleUpdate.map((x) => x.metric)
|
||||
scopes = $metricData.data.singleUpdate.map((x) => x.scope)
|
||||
statsSeries = rawData.map((data) => data?.statisticsSeries ? data.statisticsSeries : null)
|
||||
|
||||
// Keep Zoomlevel if ResChange By Zoom
|
||||
if (pendingZoomState) {
|
||||
zoomState = {...pendingZoomState}
|
||||
}
|
||||
|
||||
// Set selected scope to min of returned scopes
|
||||
if (selectedScope == "load-all") {
|
||||
selectedScope = minScope(scopes)
|
||||
@ -176,11 +195,6 @@
|
||||
{/each}
|
||||
</select>
|
||||
{/if}
|
||||
<select class="form-select" bind:value={pendingResolution}>
|
||||
{#each resolutions as res}
|
||||
<option value={res}>Timestep: {res}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</InputGroup>
|
||||
{#key series}
|
||||
{#if $metricData?.fetching == true}
|
||||
@ -189,11 +203,7 @@
|
||||
<Card body color="danger">{error.message}</Card>
|
||||
{:else if series != null && !patternMatches}
|
||||
<Timeseries
|
||||
bind:this={plot}
|
||||
on:zoom-in={({ detail }) => {
|
||||
// filterComponent.updateFilters(detail)
|
||||
console.log("Upstream New Res:", detail)
|
||||
}}
|
||||
on:zoom={({detail}) => { handleZoom(detail) }}
|
||||
{width}
|
||||
height={300}
|
||||
cluster={job.cluster}
|
||||
@ -203,14 +213,11 @@
|
||||
metric={metricName}
|
||||
{series}
|
||||
{isShared}
|
||||
{zoomState}
|
||||
/>
|
||||
{:else if statsSeries[selectedScopeIndex] != null && patternMatches}
|
||||
<Timeseries
|
||||
bind:this={plot}
|
||||
on:zoom-in={({ detail }) => {
|
||||
// filterComponent.updateFilters(detail)
|
||||
console.log("Upstream New Res:", detail)
|
||||
}}
|
||||
on:zoom={({detail}) => { handleZoom(detail) }}
|
||||
{width}
|
||||
height={300}
|
||||
cluster={job.cluster}
|
||||
@ -220,6 +227,7 @@
|
||||
metric={metricName}
|
||||
{series}
|
||||
{isShared}
|
||||
{zoomState}
|
||||
statisticsSeries={statsSeries[selectedScopeIndex]}
|
||||
useStatsSeries={!!statsSeries[selectedScopeIndex]}
|
||||
/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user