Merge branch 'main' into style-panel-overflow

windmill-labs · Oct 11, 2023 · 3e98b2f · 3e98b2f
2 parents fd5e7c3 + c914ac6
commit 3e98b2f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
@@ -27,7 +27,9 @@
 				key: 'base_url',
 				fieldType: 'text',
 				placeholder: 'https://windmill.com',
-				storage: 'setting'
+				storage: 'setting',
+				isValid: (value: string | undefined) =>
+					value ? value?.startsWith('http') && !value?.endsWith('/') : true
 			},
 			{
 				label: 'Request Size Limit In MB',
@@ -288,11 +290,15 @@
 											<Tooltip>{setting.tooltip}</Tooltip>
 										{/if}
 										{#if values}
+											{@const hasError = setting.isValid && !setting.isValid(values[setting.key])}
 											{#if setting.fieldType == 'text'}
 												<input
 													disabled={setting.ee_only != undefined && !$enterpriseLicense}
 													type="text"
 													placeholder={setting.placeholder}
+													class={hasError
+														? 'border !border-red-700 !border-opacity-30 !focus:border-red-700 !focus:border-opacity-30 !bg-red-100'
+														: ''}
 													bind:value={values[setting.key]}
 												/>
 											{:else if setting.fieldType == 'textarea'}
@@ -353,6 +359,13 @@
 													<SecondsInput bind:seconds={values[setting.key]} />
 												</div>
 											{/if}
+
+											{#if hasError}
+												<span class="text-red-500 text-xs">
+													Base url must start with http:// or https:// and must not end with a
+													trailing slash.
+												</span>
+											{/if}
 										{:else}
 											<input disabled placeholder="Loading..." />
 										{/if}
@@ -491,6 +504,8 @@
 	on:click={async () => {
 		await saveSettings()
 		sendUserToast('Settings updated')
-	}}>Save</Button
+	}}
 >
+	Save
+</Button>
 <div class="pb-8" />
diff --git a/frontend/src/lib/components/SuperadminSettings.svelte b/frontend/src/lib/components/SuperadminSettings.svelte
@@ -139,7 +139,7 @@
 							</div>
 						</TabContent>
 						<TabContent value="settings">
-							<div class="h-full overflow-auto"> <InstanceSettings /> </div>
+							<div class="h-full"> <InstanceSettings /> </div>
 						</TabContent>
 					</svelte:fragment>
 				</Tabs>

diff --git a/frontend/src/lib/components/instanceSettings.ts b/frontend/src/lib/components/instanceSettings.ts
@@ -17,6 +17,7 @@ export interface Setting {
 		| 'email'
 		| 'license_key'
 	storage: SettingStorage
+	isValid?: (value: any) => boolean
 }
 
 export type SettingStorage = 'setting' | 'config'