mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2025-06-08 00:23:48 +02:00
fix: fix issues after updated dev branch merge
This commit is contained in:
parent
d50dfa5867
commit
f946e7e6ab
@ -31,7 +31,8 @@ func (r *clusterResolver) Partitions(ctx context.Context, obj *schema.Cluster) (
|
||||
|
||||
// StartTime is the resolver for the startTime field.
|
||||
func (r *jobResolver) StartTime(ctx context.Context, obj *schema.Job) (*time.Time, error) {
|
||||
panic(fmt.Errorf("not implemented: StartTime - startTime"))
|
||||
timestamp := time.Unix(obj.StartTime, 0)
|
||||
return ×tamp, nil
|
||||
}
|
||||
|
||||
// Tags is the resolver for the tags field.
|
||||
|
@ -55,8 +55,6 @@
|
||||
/* Const Init */
|
||||
const { query: initq } = init();
|
||||
const client = getContextClient();
|
||||
const initialized = getContext("initialized");
|
||||
const globalMetrics = getContext("globalMetrics");
|
||||
const ccconfig = getContext("cc-config");
|
||||
const sortOptions = [
|
||||
{ key: "totalWalltime", label: "Walltime" },
|
||||
@ -73,13 +71,12 @@
|
||||
let metricUnits = {};
|
||||
let metricScopes = {};
|
||||
let numBins = 50;
|
||||
let maxY = -1;
|
||||
|
||||
/* State Init */
|
||||
let filterComponent = $state(); // see why here: https://stackoverflow.com/questions/58287729/how-can-i-export-a-function-from-a-svelte-component-that-changes-a-value-in-the
|
||||
let cluster = $state("");
|
||||
let availableMetrics = $state([]);
|
||||
let cluster = $state(filterPresets?.cluster);
|
||||
let rooflineMaxY = $state(0);
|
||||
let maxY = $state(-1);
|
||||
let colWidth1 = $state(0);
|
||||
let colWidth2 = $state(0);
|
||||
let jobFilters = $state([]);
|
||||
@ -124,8 +121,9 @@
|
||||
});
|
||||
|
||||
/* Derived Vars */
|
||||
let clusterName = $derived(cluster?.name ? cluster.name : cluster);
|
||||
let metrics = $derived(
|
||||
const clusterName = $derived(cluster?.name ? cluster.name : cluster);
|
||||
const availableMetrics = $derived(loadAvailable($initq?.data?.globalMetrics, clusterName));
|
||||
const metrics = $derived(
|
||||
[...new Set([...metricsInHistograms, ...metricsInScatterplots.flat()])]
|
||||
);
|
||||
|
||||
@ -251,7 +249,7 @@
|
||||
|
||||
/* Reactive Effects */
|
||||
$effect(() => {
|
||||
loadMetrics($initialized)
|
||||
loadUnitsAndScopes(availableMetrics.length, availableMetrics);
|
||||
});
|
||||
$effect(() => {
|
||||
updateEntityConfiguration(groupSelection.key);
|
||||
@ -313,12 +311,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
function loadMetrics(isInitialized) {
|
||||
if (!isInitialized) return
|
||||
availableMetrics = [...globalMetrics.filter((gm) => gm?.availability.find((av) => av.cluster == cluster.name))]
|
||||
for (let sm of availableMetrics) {
|
||||
metricUnits[sm.name] = (sm?.unit?.prefix ? sm.unit.prefix : "") + (sm?.unit?.base ? sm.unit.base : "")
|
||||
metricScopes[sm.name] = sm?.scope
|
||||
function loadAvailable(globals, name) {
|
||||
const availableMetrics = new Set();
|
||||
if (globals && globals.length > 0) {
|
||||
for (let gm of globals) {
|
||||
if (gm.availability.find((av) => av.cluster == name)) {
|
||||
availableMetrics.add({name: gm.name, scope: gm.scope, unit: gm.unit});
|
||||
};
|
||||
}
|
||||
}
|
||||
return [...availableMetrics]
|
||||
};
|
||||
|
||||
function loadUnitsAndScopes(length, available) {
|
||||
for (let am of available) {
|
||||
metricUnits[am.name] = (am?.unit?.prefix ? am.unit.prefix : "") + (am?.unit?.base ? am.unit.base : "")
|
||||
metricScopes[am.name] = am?.scope
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -290,7 +290,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
{:else}
|
||||
{#each jobs as job (job)}
|
||||
{#each jobs as job (job.id)}
|
||||
<JobListRow bind:triggerMetricRefresh {job} {metrics} {plotWidth} {showFootprint} previousSelect={selectedJobs.includes(job.id)}
|
||||
on:select-job={({detail}) => selectedJobs = [...selectedJobs, detail]}
|
||||
on:unselect-job={({detail}) => selectedJobs = selectedJobs.filter(item => item !== detail)}
|
||||
|
@ -72,7 +72,7 @@
|
||||
</script>
|
||||
|
||||
<div>
|
||||
<p class="mb-2">
|
||||
<p class="mb-2 text-truncate">
|
||||
<span class="d-flex justify-content-between">
|
||||
<span class="align-self-center fw-bold mr-2">
|
||||
<a href="/monitoring/job/{job.id}" target="_blank">{job.jobId}</a>
|
||||
@ -113,11 +113,10 @@
|
||||
</span>
|
||||
</span>
|
||||
{#if job.metaData?.jobName}
|
||||
{#if job.metaData?.jobName.length <= 25}
|
||||
{#if job.metaData?.jobName.length <= 20}
|
||||
<span>{job.metaData.jobName}</span>
|
||||
{:else}
|
||||
<span
|
||||
class="truncate"
|
||||
style="cursor:help;"
|
||||
title={job.metaData.jobName}
|
||||
>
|
||||
@ -207,11 +206,3 @@
|
||||
</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.truncate {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
|
Loading…
x
Reference in New Issue
Block a user