Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: project creation and edit form validation using zod
Kyle Mendellee807feb2287
diff --git a/frontend/src/routes/compose/[projectId]/+page.svelte b/frontend/src/routes/compose/[projectId]/+page.svelteindex a12c23509..e5dc55d74 100644--- a/frontend/src/routes/compose/[projectId]/+page.svelte+++ b/frontend/src/routes/compose/[projectId]/+page.svelte@@ -29,6 +29,8 @@import { ArcaneButton } from '$lib/components/arcane-button/index.js';import LogViewer from '$lib/components/log-viewer.svelte';import { browser } from '$app/environment';+ import { z } from 'zod/v4';+ import { createForm } from '$lib/utils/form.utils';let { data }: { data: PageData } = $props();let { project, editorState, servicePorts, settings } = $derived(data);@@ -45,15 +47,32 @@saving: false});- let name = $derived(editorState.name);- let composeContent = $derived(editorState.composeContent);- let envContent = $derived(editorState.envContent || '');+ // Remove local name/composeContent/envContent state; use form inputs insteadlet originalName = $derived(editorState.originalName);let originalComposeContent = $derived(editorState.originalComposeContent);let originalEnvContent = $derived(editorState.originalEnvContent || '');+ const formSchema = z.object({+ name: z+ .string()+ .min(1, 'Project name is required')+ .regex(/^[a-z0-9-]+$/i, 'Only letters, numbers, and hyphens are allowed'),+ composeContent: z.string().min(1, 'Compose content is required'),+ envContent: z.string().optional().default('')+ });++ let formData = $derived({+ name: editorState.name,+ composeContent: editorState.composeContent,+ envContent: editorState.envContent || ''+ });++ let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));+let hasChanges = $derived(- name !== originalName || composeContent !== originalComposeContent || envContent !== originalEnvContent+ $inputs.name.value !== originalName ||+ $inputs.composeContent.value !== originalComposeContent ||+ $inputs.envContent.value !== originalEnvContent);const baseServerUrl = $derived(settings?.baseServerUrl || 'localhost');@@ -86,6 +105,11 @@async function handleSaveChanges() {if (!project || !hasChanges) return;+ const validated = form.validate();+ if (!validated) return;++ const { composeContent, envContent } = validated;+handleApiResultWithCallbacks({result: await tryCatch(environmentAPI.updateProject(project.id, composeContent, envContent)),message: 'Failed to Save Project',@@ -93,17 +117,13 @@onSuccess: async (updatedStack: Project) => {toast.success('Project updated successfully!');+ // Keep local "original" snapshots in sync so hasChanges resetsoriginalName = updatedStack.name;- originalComposeContent = composeContent;- originalEnvContent = envContent;+ originalComposeContent = $inputs.composeContent.value;+ originalEnvContent = $inputs.envContent.value;await new Promise((resolve) => setTimeout(resolve, 200));-- if (updatedStack && updatedStack.id !== project.id) {- await invalidateAll();- } else {- await invalidateAll();- }+ await invalidateAll();}});}@@ -505,11 +525,14 @@type="text"id="name"name="name"- bind:value={name}+ bind:value={$inputs.name.value}required- class="my-2"+ class="my-2 {$inputs.name.error ? 'border-destructive' : ''}"disabled={isLoading.saving || project?.status === 'running' || project?.status === 'partially running'}/>+ {#if $inputs.name.error}+ <p class="text-destructive mt-1 text-xs">{$inputs.name.error}</p>+ {/if}{#if project?.status === 'running' || project?.status === 'partially running'}<p class="text-muted-foreground mt-2 text-sm">Project name cannot be changed while running. Please stop the project first.@@ -523,8 +546,11 @@<div class="space-y-4"><h3 class="text-lg">Compose File</h3><div class="h-[590px] w-full min-w-0 overflow-hidden rounded-md">- <CodeEditor bind:value={composeContent} language="yaml" placeholder="Enter YAML..." />+ <CodeEditor bind:value={$inputs.composeContent.value} language="yaml" placeholder="Enter YAML..." /></div>+ {#if $inputs.composeContent.error}+ <p class="text-destructive mt-1 text-xs">{$inputs.composeContent.error}</p>+ {/if}</div></div>@@ -532,8 +558,15 @@<div class="space-y-4"><h3 class="text-lg font-semibold">Environment (.env)</h3><div class="h-[590px] w-full min-w-0 overflow-hidden rounded-md">- <CodeEditor bind:value={envContent} language="env" placeholder="Enter environment variables..." />+ <CodeEditor+ bind:value={$inputs.envContent.value}+ language="env"+ placeholder="Enter environment variables..."+ /></div>+ {#if $inputs.envContent.error}+ <p class="text-destructive mt-1 text-xs">{$inputs.envContent.error}</p>+ {/if}</div></div></div>diff --git a/frontend/src/routes/compose/new/+page.svelte b/frontend/src/routes/compose/new/+page.svelteindex ff0dc4bb5..67dc85980 100644--- a/frontend/src/routes/compose/new/+page.svelte+++ b/frontend/src/routes/compose/new/+page.svelte@@ -10,7 +10,7 @@import { goto, invalidateAll } from '$app/navigation';import { toast } from 'svelte-sonner';import CodeEditor from '$lib/components/editor.svelte';- import { preventDefault } from '$lib/utils/form.utils';+ import { preventDefault, createForm } from '$lib/utils/form.utils';import { tryCatch } from '$lib/utils/try-catch';import { handleApiResultWithCallbacks } from '$lib/utils/api.util';import { defaultComposeTemplate } from '$lib/constants';@@ -20,6 +20,7 @@import TemplateSelectionDialog from '$lib/components/dialogs/template-selection-dialog.svelte';import { environmentAPI, converterAPI } from '$lib/services/api';import type { Template } from '$lib/types/template.type';+ import { z } from 'zod/v4';let { data } = $props();@@ -29,9 +30,26 @@let showConverterDialog = $state(false);let isLoadingTemplateContent = $state(false);- let name = $state('');- let composeContent = $state(data.defaultTemplate || defaultComposeTemplate);- let envContent = $state(data.envTemplate);+ // Removed local name/compose/env variables in favor of form inputs++ // Form schema + initial values+ const formSchema = z.object({+ name: z+ .string()+ .min(1, 'Project name is required')+ .regex(/^[a-z0-9-]+$/i, 'Only letters, numbers, and hyphens are allowed'),+ composeContent: z.string().min(1, 'Compose content is required'),+ envContent: z.string().optional().default('')+ });++ let formData = $derived({+ name: '',+ composeContent: data.defaultTemplate || defaultComposeTemplate,+ envContent: data.envTemplate || ''+ });++ let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));+let dockerRunCommand = $state('');async function handleSubmit() {@@ -39,6 +57,11 @@}async function handleCreateProject() {+ const validated = form.validate();+ if (!validated) return;++ const { name, composeContent, envContent } = validated;+handleApiResultWithCallbacks({result: await tryCatch(environmentAPI.deployProject(name, composeContent, envContent)),message: 'Failed to Create Project',@@ -61,9 +84,9 @@message: 'Failed to Convert Docker Run Command',setLoadingState: (value) => (converting = value),onSuccess: (data) => {- composeContent = data.dockerCompose;- envContent = data.envVars;- name = data.serviceName;+ $inputs.composeContent.value = data.dockerCompose;+ $inputs.envContent.value = data.envVars;+ $inputs.name.value = data.serviceName;toast.success('Docker run command converted successfully!');dockerRunCommand = '';@@ -75,13 +98,13 @@async function handleTemplateSelect(template: Template) {showTemplateDialog = false;- composeContent = template.content;+ $inputs.composeContent.value = template.content;if (template.envContent) {- envContent = template.envContent;+ $inputs.envContent.value = template.envContent;}- if (!name.trim()) {- name = template.name.toLowerCase().replace(/[^a-z0-9-]/g, '-');+ if (!$inputs.name.value?.trim()) {+ $inputs.name.value = template.name.toLowerCase().replace(/[^a-z0-9-]/g, '-');}toast.success(`Template "${template.name}" loaded successfully!`);}@@ -178,7 +201,7 @@action="create"onclick={() => handleSubmit()}loading={saving}- disabled={!name || !composeContent || saving || converting || isLoadingTemplateContent}+ disabled={!$inputs.name.value || !$inputs.composeContent.value || saving || converting || isLoadingTemplateContent}/></div></div>@@ -195,11 +218,15 @@type="text"id="name"name="name"- bind:value={name}+ bind:value={$inputs.name.value}requiredplaceholder="e.g., my-web-app"disabled={saving || isLoadingTemplateContent}+ class={$inputs.name.error ? 'border-destructive' : ''}/>+ {#if $inputs.name.error}+ <p class="text-destructive mt-1 text-xs">{$inputs.name.error}</p>+ {/if}</div></div>@@ -209,12 +236,15 @@<h3 class="text-lg font-semibold">Docker Compose File</h3><div class="h-[590px] w-full overflow-hidden rounded-md"><CodeEditor- bind:value={composeContent}+ bind:value={$inputs.composeContent.value}language="yaml"placeholder="Enter YAML..."readOnly={saving || isLoadingTemplateContent}/></div>+ {#if $inputs.composeContent.error}+ <p class="text-destructive mt-1 text-xs">{$inputs.composeContent.error}</p>+ {/if}</div></div>@@ -223,12 +253,15 @@<h3 class="text-lg font-semibold">Environment (.env)</h3><div class="h-[590px] w-full overflow-hidden rounded-md"><CodeEditor- bind:value={envContent}+ bind:value={$inputs.envContent.value}language="env"placeholder="Enter environment variables..."readOnly={saving || isLoadingTemplateContent}/></div>+ {#if $inputs.envContent.error}+ <p class="text-destructive mt-1 text-xs">{$inputs.envContent.error}</p>+ {/if}</div></div></div>