Skip to content

Modern Docker Management, Designed for Everyone

fix: text inputs not using correct string or number type for input boxes

Kyle Mendell215d8ed6e384
diff --git a/frontend/src/lib/components/form/labeled-switch.svelte b/frontend/src/lib/components/form/labeled-switch.svelte
index c82229e93..8f764904a 100644
--- a/frontend/src/lib/components/form/labeled-switch.svelte
+++ b/frontend/src/lib/components/form/labeled-switch.svelte
@@ -7,6 +7,7 @@
checked = $bindable(),
label,
description,
+ error,
disabled = false,
onCheckedChange
}: {
@@ -14,6 +15,7 @@
checked: boolean;
label: string;
description?: string;
+ error?: string | null;
disabled?: boolean;
onCheckedChange?: (checked: boolean) => void;
} = $props();
@@ -25,6 +27,11 @@
<Label for={id} class="mb-0 text-sm leading-none font-medium">
{label}
</Label>
+ {#if error}
+ <p class="text-destructive text-[0.8rem] font-medium">
+ {error}
+ </p>
+ {/if}
{#if description}
<p class="text-muted-foreground text-[0.8rem]">
{description}
diff --git a/frontend/src/lib/components/form/select-with-label.svelte b/frontend/src/lib/components/form/select-with-label.svelte
index 3b6a18892..f0323b987 100644
--- a/frontend/src/lib/components/form/select-with-label.svelte
+++ b/frontend/src/lib/components/form/select-with-label.svelte
@@ -9,6 +9,7 @@
value = $bindable<string>(),
label,
description,
+ error,
disabled = false,
placeholder = m.common_select_option(),
options = [],
@@ -20,6 +21,7 @@
value: string;
label: string;
description?: string;
+ error?: string | null;
disabled?: boolean;
placeholder?: string;
options: { label: string; value: string; description?: string }[];
@@ -36,7 +38,7 @@
</Label>
<Select.Root type="single" bind:value {name} {disabled} onValueChange={(v) => onValueChange?.(v)}>
- <Select.Trigger class="w-full" {id}>
+ <Select.Trigger class="w-full {error ? 'border-destructive' : ''}" {id}>
<span>{selectedLabel}</span>
</Select.Trigger>
@@ -70,6 +72,9 @@
</Select.Content>
</Select.Root>
+ {#if error}
+ <p class="text-destructive text-[0.8rem] font-medium">{error}</p>
+ {/if}
{#if description}
<p class="text-muted-foreground text-[0.8rem]">{description}</p>
{/if}
diff --git a/frontend/src/lib/components/form/text-input-with-label.svelte b/frontend/src/lib/components/form/text-input-with-label.svelte
index f4e10f6fa..c30944a5f 100644
--- a/frontend/src/lib/components/form/text-input-with-label.svelte
+++ b/frontend/src/lib/components/form/text-input-with-label.svelte
@@ -10,6 +10,7 @@
placeholder = '',
description,
helpText,
+ error,
disabled = false,
type = 'text',
autocomplete = 'off',
@@ -23,6 +24,7 @@
placeholder?: string;
description?: string;
helpText?: string;
+ error?: string | null;
disabled?: boolean;
type?: 'text' | 'email' | 'password' | 'number' | 'url';
autocomplete?: HTMLInputElement['autocomplete'];
@@ -32,8 +34,14 @@
function handleInput(e: Event) {
const target = e.target as HTMLInputElement;
- value = target.value;
- onChange?.(value);
+ if (type === 'number') {
+ const numValue = target.value === '' ? '' : Number(target.value);
+ value = numValue;
+ onChange?.(target.value);
+ } else {
+ value = target.value;
+ onChange?.(target.value);
+ }
}
</script>
@@ -42,8 +50,22 @@
{label}{#if required}<span class="text-destructive ml-0.5">*</span>{/if}
</Label>
- <Input {id} {name} bind:value {placeholder} {disabled} {type} {autocomplete} {required} oninput={handleInput} />
+ <Input
+ {id}
+ {name}
+ bind:value
+ {placeholder}
+ {disabled}
+ {type}
+ {autocomplete}
+ {required}
+ oninput={handleInput}
+ class={error ? 'border-destructive' : ''}
+ />
+ {#if error}
+ <p class="text-destructive text-[0.8rem] font-medium">{error}</p>
+ {/if}
{#if description}
<p class="text-muted-foreground text-[0.8rem]">{description}</p>
{/if}
diff --git a/frontend/src/routes/onboarding/docker/+page.svelte b/frontend/src/routes/onboarding/docker/+page.svelte
index eb22509c3..80b5f43e4 100644
--- a/frontend/src/routes/onboarding/docker/+page.svelte
+++ b/frontend/src/routes/onboarding/docker/+page.svelte
@@ -127,6 +127,7 @@
id="pollingEnabled"
label={m.docker_enable_polling_label()}
description={m.docker_enable_polling_description()}
+ error={$formInputs.pollingEnabled.error}
bind:checked={$formInputs.pollingEnabled.value}
/>
@@ -164,6 +165,7 @@
id="autoUpdateSwitch"
label={m.docker_auto_update_label()}
description={m.docker_auto_update_description()}
+ error={$formInputs.autoUpdate.error}
bind:checked={$formInputs.autoUpdate.value}
/>
@@ -194,6 +196,7 @@
id="dockerPruneMode"
name="pruneMode"
bind:value={$formInputs.dockerPruneMode.value}
+ error={$formInputs.dockerPruneMode.error}
label={m.docker_prune_action_label()}
description={pruneModeDescription}
placeholder={m.docker_prune_placeholder()}
diff --git a/frontend/src/routes/onboarding/security/+page.svelte b/frontend/src/routes/onboarding/security/+page.svelte
index 50b63d0b0..da1f11dbb 100644
--- a/frontend/src/routes/onboarding/security/+page.svelte
+++ b/frontend/src/routes/onboarding/security/+page.svelte
@@ -176,6 +176,7 @@
id="localAuthSwitch"
label={m.security_local_auth_label()}
description={m.security_local_auth_description()}
+ error={$formInputs.authLocalEnabled.error}
bind:checked={$formInputs.authLocalEnabled.value}
onCheckedChange={handleLocalSwitchChange}
/>
@@ -187,6 +188,7 @@
description={data.oidcStatus.envForced
? m.security_oidc_auth_description_forced()
: m.security_oidc_auth_description()}
+ error={$formInputs.authOidcEnabled.error}
disabled={data.oidcStatus.envForced}
checked={$formInputs.authOidcEnabled.value}
onCheckedChange={handleOidcSwitchChange}
diff --git a/frontend/src/routes/onboarding/settings/+page.svelte b/frontend/src/routes/onboarding/settings/+page.svelte
index 0e94cf9ed..0e48efac0 100644
--- a/frontend/src/routes/onboarding/settings/+page.svelte
+++ b/frontend/src/routes/onboarding/settings/+page.svelte
@@ -94,6 +94,7 @@
id="enableGravatar"
label={m.general_enable_gravatar_label()}
description={m.general_enable_gravatar_description()}
+ error={$formInputs.enableGravatar.error}
bind:checked={$formInputs.enableGravatar.value}
/>
</div>
diff --git a/frontend/src/routes/settings/docker/+page.svelte b/frontend/src/routes/settings/docker/+page.svelte
index cbca5aece..7fa0ab00d 100644
--- a/frontend/src/routes/settings/docker/+page.svelte
+++ b/frontend/src/routes/settings/docker/+page.svelte
@@ -206,6 +206,7 @@
id="pollingEnabled"
label={m.docker_enable_polling_label()}
description={m.docker_enable_polling_description()}
+ error={$formInputs.pollingEnabled.error}
bind:checked={$formInputs.pollingEnabled.value}
/>
@@ -223,6 +224,7 @@
{#if pollingIntervalMode === 'custom'}
<TextInputWithLabel
bind:value={$formInputs.pollingInterval.value}
+ error={$formInputs.pollingInterval.error}
label={m.custom_polling_interval()}
placeholder={m.docker_polling_interval_placeholder()}
helpText={m.docker_polling_interval_description()}
@@ -257,6 +259,7 @@
id="autoUpdateSwitch"
label={m.docker_auto_update_label()}
description={m.docker_auto_update_description()}
+ error={$formInputs.autoUpdate.error}
bind:checked={$formInputs.autoUpdate.value}
/>
@@ -264,6 +267,7 @@
<div class="border-primary/20 border-l-2 pl-3">
<TextInputWithLabel
bind:value={$formInputs.autoUpdateInterval.value}
+ error={$formInputs.autoUpdateInterval.error}
label={m.docker_auto_update_interval_label()}
placeholder={m.docker_auto_update_interval_placeholder()}
helpText={m.docker_auto_update_interval_description()}
@@ -288,6 +292,7 @@
id="dockerPruneMode"
name="pruneMode"
bind:value={$formInputs.dockerPruneMode.value}
+ error={$formInputs.dockerPruneMode.error}
label={m.docker_prune_action_label()}
description={pruneModeDescription}
placeholder={m.docker_prune_placeholder()}
@@ -323,6 +328,7 @@
<div class="border-primary/20 border-l-2 pl-3">
<TextInputWithLabel
bind:value={$formInputs.defaultShell.value}
+ error={$formInputs.defaultShell.error}
label={m.custom()}
placeholder={m.docker_shell_custom_path_placeholder()}
helpText={m.docker_shell_custom_path_help()}
diff --git a/frontend/src/routes/settings/general/+page.svelte b/frontend/src/routes/settings/general/+page.svelte
index 2186d1224..396c86f2b 100644
--- a/frontend/src/routes/settings/general/+page.svelte
+++ b/frontend/src/routes/settings/general/+page.svelte
@@ -121,6 +121,7 @@
<div class="space-y-3">
<TextInputWithLabel
bind:value={$formInputs.projectsDirectory.value}
+ error={$formInputs.projectsDirectory.error}
label={m.general_projects_directory_label()}
placeholder={m.general_projects_directory_placeholder()}
helpText={m.general_projects_directory_help()}
@@ -129,6 +130,7 @@
<TextInputWithLabel
bind:value={$formInputs.baseServerUrl.value}
+ error={$formInputs.baseServerUrl.error}
label={m.general_base_url_label()}
placeholder={m.general_base_url_placeholder()}
helpText={m.general_base_url_help()}
@@ -150,6 +152,7 @@
id="enableGravatar"
label={m.general_enable_gravatar_label()}
description={m.general_enable_gravatar_description()}
+ error={$formInputs.enableGravatar.error}
bind:checked={$formInputs.enableGravatar.value}
/>
</Card.Content>
diff --git a/frontend/src/routes/settings/security/+page.svelte b/frontend/src/routes/settings/security/+page.svelte
index 25ce83292..f2433a818 100644
--- a/frontend/src/routes/settings/security/+page.svelte
+++ b/frontend/src/routes/settings/security/+page.svelte
@@ -226,7 +226,6 @@
<Card.Header icon={LockIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>{m.security_authentication_heading()}</Card.Title>
- <Card.Description>Configure login methods for your application</Card.Description>
</div>
</Card.Header>
<Card.Content class="px-3 py-4 sm:px-6">
@@ -235,6 +234,7 @@
id="localAuthSwitch"
label={m.security_local_auth_label()}
description={m.security_local_auth_description()}
+ error={$formInputs.authLocalEnabled.error}
bind:checked={$formInputs.authLocalEnabled.value}
onCheckedChange={handleLocalSwitchChange}
/>
@@ -246,6 +246,7 @@
description={data.oidcStatus.envForced
? m.security_oidc_auth_description_forced()
: m.security_oidc_auth_description()}
+ error={$formInputs.authOidcEnabled.error}
disabled={data.oidcStatus.envForced}
bind:checked={$formInputs.authOidcEnabled.value}
onCheckedChange={handleOidcSwitchChange}
@@ -283,12 +284,12 @@
<Card.Header icon={ClockIcon} class="items-start">
<div class="flex flex-col space-y-1.5">
<Card.Title>{m.security_session_heading()}</Card.Title>
- <Card.Description>Configure session timeout and duration</Card.Description>
</div>
</Card.Header>
<Card.Content class="px-3 py-4 sm:px-6">
<TextInputWithLabel
bind:value={$formInputs.authSessionTimeout.value}
+ error={$formInputs.authSessionTimeout.error}
label={m.security_session_timeout_label()}
placeholder={m.security_session_timeout_placeholder()}
helpText={m.security_session_timeout_description()}