diff --git a/web/frontend/src/Jobs.root.svelte b/web/frontend/src/Jobs.root.svelte index 1e7f96d..1c13777 100644 --- a/web/frontend/src/Jobs.root.svelte +++ b/web/frontend/src/Jobs.root.svelte @@ -8,7 +8,7 @@ --> @@ -85,13 +100,13 @@ - (isSortingOpen = true)} disabled={showCompare}> + (isSortingOpen = true)} disabled={showCompare}> Sorting (isMetricsSelectionOpen = true)} + onclick={() => (isMetricsSelectionOpen = true)} > Metrics @@ -99,11 +114,11 @@ { + {filterPresets} + showFilter={!showCompare} + matchedJobs={showCompare? matchedCompareJobs: matchedListJobs} + applyFilters={(detail) => { selectedCluster = detail.filters[0]?.cluster ? detail.filters[0].cluster.eq : null; @@ -122,13 +137,13 @@ {presetProject} bind:authlevel bind:roles - on:set-filter={({ detail }) => filterComponent.updateFilters(detail)} + setFilter={(filter) => filterComponent.updateFilters(filter)} /> {/if} {#if !showCompare} - { + { jobList.refreshJobs() jobList.refreshAllMetrics() }} /> @@ -136,7 +151,7 @@ - = 500 && !(selectedJobs.length != 0)} on:click={() => { + = 500 && !(selectedJobs.length != 0)} onclick={() => { if (selectedJobs.length != 0) filterComponent.updateFilters({dbId: selectedJobs}, true) showCompare = !showCompare }} > @@ -144,7 +159,7 @@ 'Compare Jobs' + (selectedJobs.length != 0 ? ` (${selectedJobs.length} selected)` : matchedListJobs >= 500 ? ` (Too Many)` : ``)} {#if !showCompare && selectedJobs.length != 0} - { + { selectedJobs = [] // Only empty array, filters handled by reactive reset }}> Clear diff --git a/web/frontend/src/generic/Filters.svelte b/web/frontend/src/generic/Filters.svelte index ee7f327..d56bb84 100644 --- a/web/frontend/src/generic/Filters.svelte +++ b/web/frontend/src/generic/Filters.svelte @@ -16,7 +16,6 @@ -->