From 08041a20616c8ae94d53b88d5a49ce7bb5db9e09 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 24 Feb 2025 14:43:23 +0100
Subject: [PATCH] nit saml

---
 backend/src/main.rs                           |  5 ++-
 .../lib/components/InstanceSettings.svelte    |  2 +-
 frontend/src/lib/components/Login.svelte      |  4 +-
 .../src/lib/components/instanceSettings.ts    | 40 +++++++++----------
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/backend/src/main.rs b/backend/src/main.rs
index afd7ea08f4..afbf38f967 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -1119,9 +1119,12 @@ pub async fn run_workers(
 
 async fn send_delayed_killpill(
     tx: &tokio::sync::broadcast::Sender<()>,
-    max_delay_secs: u64,
+    mut max_delay_secs: u64,
     context: &str,
 ) {
+    if max_delay_secs == 0 {
+        max_delay_secs = 1;
+    }
     // Random delay to avoid all servers/workers shutting down simultaneously
     let rd_delay = rand::rng().random_range(0..max_delay_secs);
     tracing::info!("Scheduling {context} shutdown in {rd_delay}s");
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 293fab4e40..4d84922d3c 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -303,7 +303,7 @@
 								size="xs">Send usage</Button
 							>
 						{/if}
-					{:else if category == 'Auth/OAuth'}
+					{:else if category == 'Auth/OAuth/SAML'}
 						<AuthSettings
 							bind:oauths
 							bind:snowflakeAccountIdentifier
diff --git a/frontend/src/lib/components/Login.svelte b/frontend/src/lib/components/Login.svelte
index 3046afd53c..73dab2a3eb 100644
--- a/frontend/src/lib/components/Login.svelte
+++ b/frontend/src/lib/components/Login.svelte
@@ -277,7 +277,7 @@
 				<Button
 					color="dark"
 					variant="border"
-					btnClasses="mt-2 w-full !border-gray-300"
+					btnClasses="mt-2 w-full"
 					on:click={() => storeRedirect(login.type)}
 				>
 					{login.displayName}
@@ -288,7 +288,7 @@
 			<Button
 				color="dark"
 				variant="border"
-				btnClasses="mt-2 w-full !border-gray-300"
+				btnClasses="mt-2 w-full"
 				on:click={() => {
 					if (saml) {
 						window.location.href = saml
diff --git a/frontend/src/lib/components/instanceSettings.ts b/frontend/src/lib/components/instanceSettings.ts
index b94ba7a19a..bc67ff020c 100644
--- a/frontend/src/lib/components/instanceSettings.ts
+++ b/frontend/src/lib/components/instanceSettings.ts
@@ -14,22 +14,22 @@ export interface Setting {
 		value?: any
 	}[]
 	fieldType:
-		| 'text'
-		| 'number'
-		| 'boolean'
-		| 'password'
-		| 'select'
-		| 'textarea'
-		| 'codearea'
-		| 'seconds'
-		| 'email'
-		| 'license_key'
-		| 'object_store_config'
-		| 'critical_error_channels'
-		| 'slack_connect'
-		| 'smtp_connect'
-		| 'indexer_rates'
-		| 'otel'
+	| 'text'
+	| 'number'
+	| 'boolean'
+	| 'password'
+	| 'select'
+	| 'textarea'
+	| 'codearea'
+	| 'seconds'
+	| 'email'
+	| 'license_key'
+	| 'object_store_config'
+	| 'critical_error_channels'
+	| 'slack_connect'
+	| 'smtp_connect'
+	| 'indexer_rates'
+	| 'otel'
 	storage: SettingStorage
 	advancedToggle?: {
 		label: string
@@ -81,9 +81,9 @@ export const settings: Record<string, Setting[]> = {
 			isValid: (value: string | undefined) =>
 				value
 					? value?.startsWith('http') &&
-					  value.includes('://') &&
-					  !value?.endsWith('/') &&
-					  !value?.endsWith(' ')
+					value.includes('://') &&
+					!value?.endsWith('/') &&
+					!value?.endsWith(' ')
 					: false
 		},
 		{
@@ -224,7 +224,7 @@ export const settings: Record<string, Setting[]> = {
 			requiresReloadOnChange: true
 		}
 	],
-	'Auth/OAuth': [],
+	'Auth/OAuth/SAML': [],
 	Registries: [
 		{
 			label: 'Instance Python Version',