Merge branch 'main' into alp/teams_scripts

backend/ee-repo-ref.txt

@@ -1 +1 @@
-15ddca63acd769e4e7355269a239639c50989def
+eec544f334523171a3143ce382090d8bd80a23a7

backend/windmill-api/src/workspaces.rs

@@ -1221,7 +1221,7 @@ async fn get_encryption_key(
     Extension(db): Extension<DB>,
     Path(w_id): Path<String>,
 ) -> JsonResult<GetEncryptionKeyResponse> {
-    require_super_admin(&db, &authed.email).await?;
+    require_admin(authed.is_admin, &authed.username)?;
 
     let encryption_key_opt = sqlx::query_scalar!(
         "SELECT key FROM workspace_key WHERE workspace_id = $1",

frontend/src/lib/components/ArrayTypeNarrowing.svelte

@@ -124,7 +124,7 @@
 				</div>
 			{/each}
 		</div>
-		{#if canEditResourceType || originalType == 'string[]'}
+		{#if canEditResourceType || originalType == 'string[]' || originalType == 'object[]'}
 			<div class="flex flex-row mb-1 mt-2">
 				<Button
 					color="light"

frontend/src/lib/inferArgSig.ts

@@ -103,7 +103,6 @@ export function argSigToJsonSchemaType(
 		newS.format = `dynselect-${t.dynselect}`
 	} else if (typeof t !== 'string' && `list` in t) {
 		newS.type = 'array'
-		console.log(t.list)
 		if (t.list === 'int' || t.list === 'float') {
 			newS.items = { type: 'number' }
 			newS.originalType = 'number[]'
@@ -111,7 +110,6 @@ export function argSigToJsonSchemaType(
 			newS.items = { type: 'string', contentEncoding: 'base64' }
 			newS.originalType = 'bytes[]'
 		} else if (t.list && typeof t.list == 'object' && 'str' in t.list && t.list.str) {
-			console.log('str', t.list.str)
 			newS.items = { type: 'string', enum: t.list.str }
 			newS.originalType = 'enum[]'
 		} else if (t.list == 'string' || (t.list && typeof t.list == 'object' && 'str' in t.list)) {