From 110bef0a6e76615c7b371c5c0f5bc1f4e7a73a64 Mon Sep 17 00:00:00 2001
From: "windmill-internal-app[bot]"
 <217088191+windmill-internal-app[bot]@users.noreply.github.com>
Date: Wed, 13 May 2026 15:12:11 +0000
Subject: [PATCH] fix: Allow devops role to use all_workspaces runs filter in
 admins workspace (#9153)

Co-authored-by: windmill-internal-app[bot] <1429786+windmill-internal-app[bot]@users.noreply.github.com>
---
 frontend/src/lib/components/RunsPage.svelte    |  6 +++---
 frontend/src/lib/components/runs/runsFilter.ts | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/lib/components/RunsPage.svelte b/frontend/src/lib/components/RunsPage.svelte
index 86b7588099..360eb9276d 100644
--- a/frontend/src/lib/components/RunsPage.svelte
+++ b/frontend/src/lib/components/RunsPage.svelte
@@ -10,7 +10,7 @@
 	} from '$lib/gen'
 
 	import { sendUserToast } from '$lib/toast'
-	import { userStore, workspaceStore, userWorkspaces, superadmin } from '$lib/stores'
+	import { userStore, workspaceStore, userWorkspaces, superadmin, devopsRole } from '$lib/stores'
 	import {
 		Button,
 		ButtonType,
@@ -82,7 +82,7 @@
 			usernames,
 			folders,
 			jobTriggerKinds,
-			isSuperAdmin: !!$superadmin,
+			isSuperAdminOrDevops: !!$superadmin || !!$devopsRole,
 			isAdminsWorkspace: $workspaceStore === 'admins'
 		})
 	)
@@ -750,7 +750,7 @@
 				)}
 				schema={runsFilterSearchbarSchema}
 				presets={buildRunsFilterPresets({
-					isSuperadmin: !!$superadmin,
+					isSuperAdminOrDevops: !!$superadmin || !!$devopsRole,
 					isAdminsWorkspace: $workspaceStore === 'admins'
 				})}
 				bind:value={filters.val}
diff --git a/frontend/src/lib/components/runs/runsFilter.ts b/frontend/src/lib/components/runs/runsFilter.ts
index cbece7aefb..9d0b85dd75 100644
--- a/frontend/src/lib/components/runs/runsFilter.ts
+++ b/frontend/src/lib/components/runs/runsFilter.ts
@@ -23,14 +23,14 @@ export function buildRunsFilterSearchbarSchema({
 	usernames,
 	folders,
 	jobTriggerKinds,
-	isSuperAdmin,
+	isSuperAdminOrDevops,
 	isAdminsWorkspace
 }: {
 	paths: string[]
 	usernames: string[]
 	folders: string[]
 	jobTriggerKinds: JobTriggerKind[]
-	isSuperAdmin: boolean
+	isSuperAdminOrDevops: boolean
 	isAdminsWorkspace: boolean
 }) {
 	return {
@@ -206,12 +206,12 @@ export function buildRunsFilterSearchbarSchema({
 			label: 'Show future jobs (Default: true)',
 			description: 'Include jobs that are planned later'
 		},
-		...(isSuperAdmin &&
+		...(isSuperAdminOrDevops &&
 			isAdminsWorkspace && {
 				all_workspaces: {
 					type: 'boolean' as const,
 					label: 'All workspaces',
-					description: 'Show jobs of all workspaces (superadmin only)'
+					description: 'Show jobs of all workspaces (superadmin or devops only)'
 				}
 			})
 	} satisfies FilterSchemaRec
@@ -230,16 +230,16 @@ export function allowWildcards(filters: Partial<RunsFilterInstance> | undefined)
 }
 
 export const buildRunsFilterPresets = ({
-	isSuperadmin,
+	isSuperAdminOrDevops,
 	isAdminsWorkspace
 }: {
-	isSuperadmin: boolean
+	isSuperAdminOrDevops: boolean
 	isAdminsWorkspace: boolean
 }) => [
 	{ name: 'Hide schedules', value: 'job_trigger_kind:\\ !schedule' },
 	{ name: 'Hide future jobs', value: 'show_future_jobs:\\ false' },
 	{ name: 'Show skipped', value: 'show_skipped:\\ true' },
-	...(isSuperadmin && isAdminsWorkspace
+	...(isSuperAdminOrDevops && isAdminsWorkspace
 		? [{ name: 'All workspaces', value: 'all_workspaces:\\ true' }]
 		: [])
 ]