Merge branch 'main' into database_triggers

windmill-labs · Dec 26, 2024 · 8d46b20 · 8d46b20
2 parents e431b28 + 9bdf0e6
commit 8d46b20
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/lib/components/InstanceSetting.svelte b/frontend/src/lib/components/InstanceSetting.svelte
@@ -184,7 +184,7 @@
 				<SimpleEditor
 					autoHeight
 					class="editor"
-					lang={setting.codeAreaLang ?? "txt"}
+					lang={setting.codeAreaLang ?? 'txt'}
 					bind:code={$values[setting.key]}
 					fixedOverflowWidgets={false}
 				/>

diff --git a/frontend/src/lib/components/Login.svelte b/frontend/src/lib/components/Login.svelte
@@ -155,6 +155,7 @@
 				displayName: login.display_name || login.type
 			}))
 			saml = allLogins.saml
+
 			showPassword = (logins.length == 0 && !saml) || (email != undefined && email.length > 0)
 		} catch (e) {
 			logins = []

diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -1464,7 +1464,7 @@
 											<FlowProgressBar {job} class="py-4" />
 											<div class="w-full mt-10 mb-20">
 												<FlowStatusViewer
-													jobId={job?.id ?? ""}
+													jobId={job?.id ?? ''}
 													on:jobsLoaded={({ detail }) => {
 														job = detail
 													}}

diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -912,7 +912,7 @@
 			/>
 			<div class="w-full mt-10">
 				<FlowStatusViewer
-					jobId={job?.id ?? ""}
+					jobId={job?.id ?? ''}
 					on:jobsLoaded={({ detail }) => {
 						job = detail
 					}}