ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-11-10 08:57:25 +01:00
Code Issues Packages Releases Activity

Merge pull request #150 from ClusterCockpit/hotfix

Browse Source 
Hotfix
This commit is contained in:
Jan Eitzinger 2023-06-16 20:17:23 +02:00 committed by GitHub
commit 984cf46bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/frontend/src/Job.root.svelte
View File

@ -1,5 +1,5 @@
<script>
import { init, groupByScope, fetchMetricsStore } from './utils.js'
import { init, groupByScope, fetchMetricsStore, checkMetricDisabled } from './utils.js'
import { Row, Col, Card, Spinner, TabContent, TabPane,
CardBody, CardHeader, CardTitle, Button, Icon } from 'sveltestrap'
import PlotTable from './PlotTable.svelte'
@ -95,7 +95,14 @@
somethingMissing = missingMetrics.length > 0 || missingHosts.length > 0
}
const orderAndMap = (grouped, selectedMetrics) => selectedMetrics.map(metric => ({ metric: metric, data: grouped.find((group) => group[0].name == metric) }))
const orderAndMap = (grouped, selectedMetrics) =>
selectedMetrics.map(metric => ({
metric: metric,
data: grouped.find((group) =>
group[0].name == metric
),
disabled: checkMetricDisabled(metric, $initq.data.job.cluster, $initq.data.job.subCluster)
}))
</script>
<div class="row" bind:clientWidth={fullWidth}></div>

5
web/frontend/src/PlotTable.svelte
View File

@ -24,14 +24,13 @@
else
row.push({ _is_placeholder: true, ri, ci })
}
rows.push(row)
}
return rows
}
$: rows = tile(items, itemsPerRow)
$: rows = tile(items.filter(item => item.disabled === false), itemsPerRow)
$: plotWidth = (tableWidth / itemsPerRow) - (padding * itemsPerRow)
</script>
@ -39,7 +38,7 @@
{#each rows as row}
<tr>
{#each row as item (item)}
<td>
<td style="vertical-align:top;"> <!-- For Aligning Notice Cards -->
{#if !isPlaceholder(item) && plotWidth > 0}
<slot item={item} width={plotWidth}></slot>
{/if}

2
web/frontend/src/Systems.root.svelte
View File

@ -144,7 +144,7 @@
{:else if item.removed == true && item.data == null}
<Card body color="info">Metric '{ selectedMetric }' disabled for subcluster '{ item.subCluster }'</Card>
{:else}
<Card body color="warning">Missing Data</Card>
<Card body color="warning">Missing Full Dataset</Card>
{/if}
</PlotTable>
{/if}

17
web/frontend/src/utils.js
View File

@ -296,3 +296,20 @@ export function stickyHeader(datatableHeaderSelector, updatePading) {
document.addEventListener("scroll", onscroll);
onDestroy(() => document.removeEventListener("scroll", onscroll));
}
export function checkMetricDisabled(m, c, s) { //[m]etric, [c]luster, [s]ubcluster
const mc = getContext("metrics");
const thisConfig = mc(c, m);
let thisSCIndex = -1;
if (thisConfig) {
thisSCIndex = thisConfig.subClusters.findIndex(
(subcluster) => subcluster.name == s
);
};
if (thisSCIndex >= 0) {
if (thisConfig.subClusters[thisSCIndex].remove == true) {
return true;
}
}
return false;
}