ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-24 12:29:05 +01:00
Code Issues Packages Releases Activity

Fix UserOrProject functionality

Browse Source 
- fixed by restoring correct implementation of filters in frontend
This commit is contained in:
Christoph Kluge 2023-06-06 16:28:54 +02:00
parent 0d4935e244
commit 37d9b5172b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/frontend/src/Jobs.root.svelte
View File

@ -17,7 +17,7 @@
export let authlevel export let authlevel
export let roles export let roles
let filters = [] let filterComponent; // 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 jobList, matchedJobs = null let jobList, matchedJobs = null
let sorting = { field: 'startTime', order: 'DESC' }, isSortingOpen = false, isMetricsSelectionOpen = false let sorting = { field: 'startTime', order: 'DESC' }, isSortingOpen = false, isMetricsSelectionOpen = false
let metrics = filterPresets.cluster let metrics = filterPresets.cluster
@ -25,12 +25,10 @@
: ccconfig.plot_list_selectedMetrics : ccconfig.plot_list_selectedMetrics
let selectedCluster = filterPresets?.cluster ? filterPresets.cluster : null let selectedCluster = filterPresets?.cluster ? filterPresets.cluster : null
$: selectedCluster = filters[0]?.cluster ? filters[0].cluster.eq : null
// The filterPresets are handled by the Filters component, // The filterPresets are handled by the Filters component,
// so we need to wait for it to be ready before we can start a query. // so we need to wait for it to be ready before we can start a query.
// This is also why JobList component starts out with a paused query. // This is also why JobList component starts out with a paused query.
onMount(() => filters.update()) onMount(() => filterComponent.update())
</script> </script>
<Row> <Row>
@ -61,15 +59,16 @@
<Col xs="auto"> <Col xs="auto">
<Filters <Filters
filterPresets={filterPresets} filterPresets={filterPresets}
bind:this={filters} bind:this={filterComponent}
on:update={({ detail }) => { on:update={({ detail }) => {
filters = detail.filters selectedCluster = detail.filters[0]?.cluster ? detail.filters[0].cluster.eq : null
jobList.update(detail.filters)} jobList.update(detail.filters)
}
} /> } />
</Col> </Col>
<Col xs="3" style="margin-left: auto;"> <Col xs="3" style="margin-left: auto;">
<UserOrProject bind:authlevel={authlevel} bind:roles={roles} on:update={({ detail }) => filters.update(detail)}/> <UserOrProject bind:authlevel={authlevel} bind:roles={roles} on:update={({ detail }) => filterComponent.update(detail)}/>
</Col> </Col>
<Col xs="2"> <Col xs="2">
<Refresher on:reload={() => jobList.refresh()} /> <Refresher on:reload={() => jobList.refresh()} />