mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2024-12-26 13:29:05 +01:00
feat: add jobname filter to joblist textfilter
- allows combination of filters now including jobname - rename component
This commit is contained in:
parent
061c9f0979
commit
575753038b
@ -14,7 +14,7 @@
|
||||
import Refresher from "./joblist/Refresher.svelte";
|
||||
import Sorting from "./joblist/SortSelection.svelte";
|
||||
import MetricSelection from "./MetricSelection.svelte";
|
||||
import UserOrProject from "./filters/UserOrProject.svelte";
|
||||
import TextFilter from "./filters/TextFilter.svelte";
|
||||
|
||||
const { query: initq } = init();
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
</Col>
|
||||
|
||||
<Col xs="3" style="margin-left: auto;">
|
||||
<UserOrProject
|
||||
<TextFilter
|
||||
bind:authlevel
|
||||
bind:roles
|
||||
on:update={({ detail }) => filterComponent.update(detail)}
|
||||
|
@ -4,21 +4,25 @@
|
||||
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
export let user = "";
|
||||
export let project = "";
|
||||
export let authlevel;
|
||||
export let roles;
|
||||
let mode = "user",
|
||||
term = "";
|
||||
let mode = "user";
|
||||
let term = "";
|
||||
let user = "";
|
||||
let project = "";
|
||||
let jobName = "";
|
||||
const throttle = 500;
|
||||
|
||||
function modeChanged() {
|
||||
if (mode == "user") {
|
||||
project = term;
|
||||
term = user;
|
||||
} else {
|
||||
} else if (mode == "project") {
|
||||
user = term;
|
||||
term = project;
|
||||
} else {
|
||||
jobName = term;
|
||||
term = jobName;
|
||||
}
|
||||
termChanged(0);
|
||||
}
|
||||
@ -28,7 +32,8 @@
|
||||
function termChanged(sleep = throttle) {
|
||||
if (authlevel >= roles.manager) {
|
||||
if (mode == "user") user = term;
|
||||
else project = term;
|
||||
else if (mode == "project") project = term;
|
||||
else jobName = term;
|
||||
|
||||
if (timeoutId != null) clearTimeout(timeoutId);
|
||||
|
||||
@ -36,49 +41,44 @@
|
||||
dispatch("update", {
|
||||
user,
|
||||
project,
|
||||
jobName
|
||||
});
|
||||
}, sleep);
|
||||
} else {
|
||||
project = term;
|
||||
if (mode == "project") project = term;
|
||||
else jobName = term;
|
||||
|
||||
if (timeoutId != null) clearTimeout(timeoutId);
|
||||
|
||||
timeoutId = setTimeout(() => {
|
||||
dispatch("update", {
|
||||
project,
|
||||
jobName
|
||||
});
|
||||
}, sleep);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if authlevel >= roles.manager}
|
||||
<InputGroup>
|
||||
<select
|
||||
style="max-width: 175px;"
|
||||
class="form-select"
|
||||
bind:value={mode}
|
||||
on:change={modeChanged}
|
||||
>
|
||||
<InputGroup>
|
||||
<select
|
||||
style="max-width: 175px;"
|
||||
class="form-select"
|
||||
bind:value={mode}
|
||||
on:change={modeChanged}
|
||||
>
|
||||
{#if authlevel >= roles.manager}
|
||||
<option value={"user"}>Search User</option>
|
||||
<option value={"project"}>Search Project</option>
|
||||
</select>
|
||||
<Input
|
||||
type="text"
|
||||
bind:value={term}
|
||||
on:change={() => termChanged()}
|
||||
on:keyup={(event) => termChanged(event.key == "Enter" ? 0 : throttle)}
|
||||
placeholder={mode == "user" ? "filter username..." : "filter project..."}
|
||||
/>
|
||||
</InputGroup>
|
||||
{:else}
|
||||
<!-- Compatibility: Handle "user role" and "no role" identically-->
|
||||
<InputGroup>
|
||||
<Input
|
||||
type="text"
|
||||
bind:value={term}
|
||||
on:change={() => termChanged()}
|
||||
on:keyup={(event) => termChanged(event.key == "Enter" ? 0 : throttle)}
|
||||
placeholder="filter project..."
|
||||
/>
|
||||
</InputGroup>
|
||||
{/if}
|
||||
{/if}
|
||||
<option value={"project"}>Search Project</option>
|
||||
<option value={"jobName"}>Search Jobname</option>
|
||||
</select>
|
||||
<Input
|
||||
type="text"
|
||||
bind:value={term}
|
||||
on:change={() => termChanged()}
|
||||
on:keyup={(event) => termChanged(event.key == "Enter" ? 0 : throttle)}
|
||||
placeholder={`filter ${mode}...`}
|
||||
/>
|
||||
</InputGroup>
|
||||
|
Loading…
Reference in New Issue
Block a user