diff --git a/internal/routerConfig/routes.go b/internal/routerConfig/routes.go index e6a79095..88c38eb1 100644 --- a/internal/routerConfig/routes.go +++ b/internal/routerConfig/routes.go @@ -456,7 +456,7 @@ func HandleSearchBar(rw http.ResponseWriter, r *http.Request, buildInfo web.Buil http.Redirect(rw, r, "/monitoring/jobs/?startTime="+fromTime+"-"+untilTime+"&arrayJobId="+url.QueryEscape(strings.Trim(splitSearch[1], " ")), http.StatusFound) // All Users: Redirect to Tablequery case "username": if user.HasAnyRole([]schema.Role{schema.RoleAdmin, schema.RoleSupport, schema.RoleManager}) { - http.Redirect(rw, r, "/monitoring/users/?user="+url.QueryEscape(strings.Trim(splitSearch[1], " ")), http.StatusFound) + http.Redirect(rw, r, "/monitoring/users/?user="+url.QueryEscape(strings.Trim(splitSearch[1], " "))+"&startTime=last30d", http.StatusFound) } else { web.RenderTemplate(rw, "message.tmpl", &web.Page{Title: "Error", MsgType: "alert-danger", Message: "Missing Access Rights", User: *user, Roles: availableRoles, Build: buildInfo}) } @@ -464,10 +464,10 @@ func HandleSearchBar(rw http.ResponseWriter, r *http.Request, buildInfo web.Buil usernames, _ := repo.FindColumnValues(user, strings.Trim(splitSearch[1], " "), "user", "username", "name") if len(usernames) != 0 { joinedNames := strings.Join(usernames, "&user=") - http.Redirect(rw, r, "/monitoring/users/?user="+joinedNames, http.StatusFound) + http.Redirect(rw, r, "/monitoring/users/?user="+joinedNames+"&startTime=last30d", http.StatusFound) } else { if user.HasAnyRole([]schema.Role{schema.RoleAdmin, schema.RoleSupport, schema.RoleManager}) { - http.Redirect(rw, r, "/monitoring/users/?user=NoUserNameFound", http.StatusPermanentRedirect) + http.Redirect(rw, r, "/monitoring/users/?user=NoUserNameFound&startTime=last30d", http.StatusPermanentRedirect) } else { web.RenderTemplate(rw, "message.tmpl", &web.Page{Title: "Error", MsgType: "alert-danger", Message: "Missing Access Rights", User: *user, Roles: availableRoles, Build: buildInfo}) } diff --git a/web/frontend/src/List.root.svelte b/web/frontend/src/List.root.svelte index 0163cbce..108c42dd 100644 --- a/web/frontend/src/List.root.svelte +++ b/web/frontend/src/List.root.svelte @@ -95,19 +95,7 @@ } /* On Mount */ - onMount(() => { - // By default, look at the jobs of the last 30 days: - if (filterPresets?.startTime == null) { - if (filterPresets == null) filterPresets = {}; - - filterPresets.startTime = { - range: "last30d", - text: "Last 30 Days", - }; - }; - // Init Filter - filterComponent.updateFilters(); - }); + onMount(() => filterComponent.updateFilters()); diff --git a/web/frontend/src/generic/Filters.svelte b/web/frontend/src/generic/Filters.svelte index 8cb6e88a..adb865f3 100644 --- a/web/frontend/src/generic/Filters.svelte +++ b/web/frontend/src/generic/Filters.svelte @@ -91,38 +91,38 @@ /* State Init */ // svelte-ignore state_referenced_locally let filters = $state({ - dbId: filterPresets.dbId || [], - jobId: filterPresets.jobId || "", - jobIdMatch: filterPresets.jobIdMatch || "eq", - arrayJobId: filterPresets.arrayJobId || null, - jobName: filterPresets.jobName || "", - project: filterPresets.project || "", - projectMatch: filterPresets.projectMatch || "contains", - user: filterPresets.user || "", - userMatch: filterPresets.userMatch || "contains", - cluster: filterPresets.cluster || null, - partition: filterPresets.partition || null, + dbId: filterPresets?.dbId || [], + jobId: filterPresets?.jobId || "", + jobIdMatch: filterPresets?.jobIdMatch || "eq", + arrayJobId: filterPresets?.arrayJobId || null, + jobName: filterPresets?.jobName || "", + project: filterPresets?.project || "", + projectMatch: filterPresets?.projectMatch || "contains", + user: filterPresets?.user || "", + userMatch: filterPresets?.userMatch || "contains", + cluster: filterPresets?.cluster || null, + partition: filterPresets?.partition || null, states: - filterPresets.states || filterPresets.state + filterPresets?.states || filterPresets?.state ? [filterPresets.state].flat() : allJobStates, - shared: filterPresets.shared || "", - schedule: filterPresets.schedule || "", - startTime: filterPresets.startTime || { from: null, to: null, range: ""}, - duration: filterPresets.duration || { + shared: filterPresets?.shared || "", + schedule: filterPresets?.schedule || "", + startTime: filterPresets?.startTime || { from: null, to: null, range: ""}, + duration: filterPresets?.duration || { lessThan: null, moreThan: null, from: null, to: null, }, - tags: filterPresets.tags || [], - numNodes: filterPresets.numNodes || { from: null, to: null }, - numHWThreads: filterPresets.numHWThreads || { from: null, to: null }, - numAccelerators: filterPresets.numAccelerators || { from: null, to: null }, - node: filterPresets.node || null, - nodeMatch: filterPresets.nodeMatch || "eq", - energy: filterPresets.energy || { from: null, to: null }, - stats: filterPresets.stats || [], + tags: filterPresets?.tags || [], + numNodes: filterPresets?.numNodes || { from: null, to: null }, + numHWThreads: filterPresets?.numHWThreads || { from: null, to: null }, + numAccelerators: filterPresets?.numAccelerators || { from: null, to: null }, + node: filterPresets?.node || null, + nodeMatch: filterPresets?.nodeMatch || "eq", + energy: filterPresets?.energy || { from: null, to: null }, + stats: filterPresets?.stats || [], }); /* Opened States */ diff --git a/web/frontend/src/header/NavbarLinks.svelte b/web/frontend/src/header/NavbarLinks.svelte index ad0eb77e..bb6bd0f4 100644 --- a/web/frontend/src/header/NavbarLinks.svelte +++ b/web/frontend/src/header/NavbarLinks.svelte @@ -92,7 +92,7 @@ {/each} - {:else} + {:else} @@ -100,7 +100,7 @@ All Clusters @@ -112,12 +112,12 @@ All Jobs Running Jobs diff --git a/web/frontend/src/systems/nodelist/NodeInfo.svelte b/web/frontend/src/systems/nodelist/NodeInfo.svelte index de5ca14a..39716ca2 100644 --- a/web/frontend/src/systems/nodelist/NodeInfo.svelte +++ b/web/frontend/src/systems/nodelist/NodeInfo.svelte @@ -171,7 +171,7 @@ Users - + List @@ -192,7 +192,7 @@ Projects - + List