Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: deploy to agent dropdown button (#244)
Kyle Mendell6092c4f67900
diff --git a/src/lib/components/ui/dropdown-button/dropdown-button-content.svelte b/src/lib/components/ui/dropdown-button/dropdown-button-content.sveltenew file mode 100644index 000000000..92999a739--- /dev/null+++ b/src/lib/components/ui/dropdown-button/dropdown-button-content.svelte@@ -0,0 +1,30 @@+<script lang="ts" module>+ import { cn, type WithElementRef } from '$lib/utils.js';+ import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';++ export type DropdownButtonContentProps = DropdownMenuPrimitive.ContentProps;+</script>++<script lang="ts">+ let {+ ref = $bindable(null),+ sideOffset = 4,+ portalProps,+ class: className,+ ...restProps+ }: DropdownMenuPrimitive.ContentProps & {+ portalProps?: DropdownMenuPrimitive.PortalProps;+ } = $props();+</script>++<DropdownMenuPrimitive.Portal {...portalProps}>+ <DropdownMenuPrimitive.Content+ bind:ref+ {sideOffset}+ class={cn(+ 'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-32 overflow-hidden rounded-md border p-1 shadow-md outline-none',+ className+ )}+ {...restProps}+ />+</DropdownMenuPrimitive.Portal>diff --git a/src/lib/components/ui/dropdown-button/dropdown-button-item.svelte b/src/lib/components/ui/dropdown-button/dropdown-button-item.sveltenew file mode 100644index 000000000..a5ea6fa2a--- /dev/null+++ b/src/lib/components/ui/dropdown-button/dropdown-button-item.svelte@@ -0,0 +1,8 @@+<script lang="ts">+ import { cn } from '$lib/utils.js';+ import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';++ let { ref = $bindable(null), class: className, ...restProps }: DropdownMenuPrimitive.ItemProps = $props();+</script>++<DropdownMenuPrimitive.Item bind:ref class={cn('data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0', className)} {...restProps} />diff --git a/src/lib/components/ui/dropdown-button/dropdown-button-main.svelte b/src/lib/components/ui/dropdown-button/dropdown-button-main.sveltenew file mode 100644index 000000000..be84e5143--- /dev/null+++ b/src/lib/components/ui/dropdown-button/dropdown-button-main.svelte@@ -0,0 +1,18 @@+<script lang="ts" module>+ import { cn, type WithElementRef } from '$lib/utils.js';+ import type { HTMLButtonAttributes } from 'svelte/elements';+ import { buttonVariants, type ButtonVariant, type ButtonSize } from '$lib/components/ui/button/button.svelte';++ export type DropdownButtonMainProps = WithElementRef<HTMLButtonAttributes> & {+ variant?: ButtonVariant;+ size?: ButtonSize;+ };+</script>++<script lang="ts">+ let { class: className, variant = 'default', size = 'default', ref = $bindable(null), type = 'button', disabled, children, ...restProps }: DropdownButtonMainProps = $props();+</script>++<button bind:this={ref} data-slot="dropdown-button-main" class={cn(buttonVariants({ variant, size }), 'rounded-r-none border-r-0', className)} {type} {disabled} {...restProps}>+ {@render children?.()}+</button>diff --git a/src/lib/components/ui/dropdown-button/dropdown-button-separator.svelte b/src/lib/components/ui/dropdown-button/dropdown-button-separator.sveltenew file mode 100644index 000000000..a80137d96--- /dev/null+++ b/src/lib/components/ui/dropdown-button/dropdown-button-separator.svelte@@ -0,0 +1,13 @@+<script lang="ts" module>+ import { cn, type WithElementRef } from '$lib/utils.js';++ export type DropdownButtonSeparatorProps = DropdownMenuPrimitive.SeparatorProps;+</script>++<script lang="ts">+ import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';++ let { ref = $bindable(null), class: className, ...restProps }: DropdownMenuPrimitive.SeparatorProps = $props();+</script>++<DropdownMenuPrimitive.Separator bind:ref class={cn('bg-muted -mx-1 my-1 h-px', className)} {...restProps} />diff --git a/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte b/src/lib/components/ui/dropdown-button/dropdown-button-trigger.sveltenew file mode 100644index 000000000..55864c663--- /dev/null+++ b/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte@@ -0,0 +1,25 @@+<script lang="ts" module>+ import { cn, type WithElementRef } from '$lib/utils.js';+ import type { HTMLButtonAttributes } from 'svelte/elements';+ import { buttonVariants, type ButtonVariant, type ButtonSize } from '$lib/components/ui/button/button.svelte';++ export type DropdownButtonTriggerProps = WithElementRef<HTMLButtonAttributes> & {+ variant?: ButtonVariant;+ size?: ButtonSize;+ builders?: any[];+ };+</script>++<script lang="ts">+ import { ChevronDown } from '@lucide/svelte';++ let { class: className, variant = 'default', size = 'default', ref = $bindable(null), type = 'button', disabled, builders = [], children, ...restProps }: DropdownButtonTriggerProps = $props();+</script>++<button bind:this={ref} use:builders[0] data-slot="dropdown-button-trigger" class={cn(buttonVariants({ variant, size }), 'rounded-l-none px-2 border-l border-l-background/20', className)} {type} {disabled} {...restProps}>+ {#if children}+ {@render children()}+ {:else}+ <ChevronDown class="size-4" />+ {/if}+</button>diff --git a/src/lib/components/ui/dropdown-button/dropdown-button.svelte b/src/lib/components/ui/dropdown-button/dropdown-button.sveltenew file mode 100644index 000000000..de378a57d--- /dev/null+++ b/src/lib/components/ui/dropdown-button/dropdown-button.svelte@@ -0,0 +1,14 @@+<script lang="ts" module>+ import { cn, type WithElementRef } from '$lib/utils.js';+ import type { HTMLAttributes } from 'svelte/elements';++ export type DropdownButtonProps = WithElementRef<HTMLAttributes<HTMLDivElement>>;+</script>++<script lang="ts">+ let { class: className, ref = $bindable(null), children, ...restProps }: DropdownButtonProps = $props();+</script>++<div bind:this={ref} data-slot="dropdown-button" class={cn('flex', className)} {...restProps}>+ {@render children?.()}+</div>diff --git a/src/lib/components/ui/dropdown-button/index.ts b/src/lib/components/ui/dropdown-button/index.tsnew file mode 100644index 000000000..3898acffa--- /dev/null+++ b/src/lib/components/ui/dropdown-button/index.ts@@ -0,0 +1,30 @@+import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';+import Root from './dropdown-button.svelte';+import Main from './dropdown-button-main.svelte';+import Trigger from './dropdown-button-trigger.svelte';+import Content from './dropdown-button-content.svelte';+import Item from './dropdown-button-item.svelte';+import Separator from './dropdown-button-separator.svelte';++const DropdownRoot = DropdownMenuPrimitive.Root;+const DropdownTrigger = DropdownMenuPrimitive.Trigger;++export {+ Root,+ Main,+ Trigger,+ Content,+ Item,+ Separator,+ DropdownRoot,+ DropdownTrigger,+ //+ Root as DropdownButton,+ Main as DropdownButtonMain,+ Trigger as DropdownButtonTrigger,+ Content as DropdownButtonContent,+ Item as DropdownButtonItem,+ Separator as DropdownButtonSeparator,+ DropdownRoot as DropdownButtonRoot,+ DropdownTrigger as DropdownButtonPrimitiveTrigger+};diff --git a/src/routes/compose/new/+page.svelte b/src/routes/compose/new/+page.svelteindex 9704ef89c..2e9b4a9dc 100644--- a/src/routes/compose/new/+page.svelte+++ b/src/routes/compose/new/+page.svelte@@ -19,10 +19,9 @@import DropdownCard from '$lib/components/dropdown-card.svelte';import * as Resizable from '$lib/components/ui/resizable/index.js';import TemplateSelectionDialog from '$lib/components/template-selection-dialog.svelte';+ import * as DropdownButton from '$lib/components/ui/dropdown-button/index.js';import type { ComposeTemplate } from '$lib/services/template-service';import type { PageData } from './$types';- import * as Select from '$lib/components/ui/select/index.js';- import type { Agent } from '$lib/types/agent.type';let { data }: { data: PageData } = $props();@@ -30,31 +29,33 @@let saving = $state(false);let converting = $state(false);let showTemplateDialog = $state(false);- let deployToAgent = $state(false);let selectedAgentId = $state('');- let selectedAgent: Agent | undefined = $state();let name = $state('');let composeContent = $state(defaultComposeTemplate);let envContent = $state(data.envTemplate || defaultEnvTemplate);let dockerRunCommand = $state('');- // Get online agents for deploymentconst onlineAgents = $derived(data.agents || []);- // Initialize with default template if available++ const agentOptions = $derived(+ onlineAgents.map((agent) => ({+ id: agent.id,+ label: `${agent.hostname} (${agent.platform})`,+ disabled: false+ }))+ );++ const selectedAgent = $derived(onlineAgents.find((agent) => agent.id === selectedAgentId));+$effect(() => {if (data.defaultTemplate && !composeContent) {composeContent = data.defaultTemplate;}});- // Update selectedAgentId when selectedAgent changes- $effect(() => {- selectedAgentId = selectedAgent?.id || '';- });-async function handleSubmit() {- if (deployToAgent && selectedAgentId) {+ if (selectedAgentId) {await handleDeployToAgent();} else {await handleCreateStack();@@ -80,8 +81,8 @@return;}- const selectedAgent = onlineAgents.find((agent) => agent.id === selectedAgentId);- if (!selectedAgent) {+ const agent = onlineAgents.find((agent) => agent.id === selectedAgentId);+ if (!agent) {toast.error('Selected agent not found or offline');return;}@@ -105,7 +106,7 @@}const result = await response.json();- toast.success(`Compose Project "${name}" deployed to agent ${selectedAgent.hostname}!`);+ toast.success(`Compose Project "${name}" deployed to agent ${agent.hostname}!`);goto(`/agents/${selectedAgentId}`);} catch (error) {console.error('Deploy error:', error);@@ -115,6 +116,14 @@}}+ function handleDeployButtonClick() {+ handleSubmit();+ }++ function handleAgentSelect(option: { id: string; label: string }) {+ selectedAgentId = option.id;+ }+async function handleConvertDockerRun() {if (!dockerRunCommand.trim()) {toast.error('Please enter a docker run command');@@ -137,7 +146,6 @@}toast.success('Docker run command converted successfully!');- // Clear the command after successful conversiondockerRunCommand = '';}});@@ -146,12 +154,10 @@function handleTemplateSelect(template: ComposeTemplate) {composeContent = template.content;- // If template has environment content, use itif (template.envContent) {envContent = template.envContent;}- // Auto-populate name if emptyif (!name.trim()) {name = template.name.toLowerCase().replace(/[^a-z0-9-]/g, '-');}@@ -176,11 +182,11 @@</Breadcrumb.Item><Breadcrumb.Separator /><Breadcrumb.Item>- <Breadcrumb.Link href="/compose">Compose Project</Breadcrumb.Link>+ <Breadcrumb.Link href="/compose">Compose</Breadcrumb.Link></Breadcrumb.Item><Breadcrumb.Separator /><Breadcrumb.Item>- <Breadcrumb.Page>New Stack</Breadcrumb.Page>+ <Breadcrumb.Page>New Project</Breadcrumb.Page></Breadcrumb.Item></Breadcrumb.List></Breadcrumb.Root>@@ -237,40 +243,38 @@</div></div><div class="flex items-center gap-2">- <!-- Agent Selection moved here -->+ <ArcaneButton action="template" onClick={() => (showTemplateDialog = true)} loading={saving} disabled={saving || converting} />+{#if onlineAgents.length > 0}- <div class="flex items-center gap-2">- <input type="checkbox" id="deployToAgent" bind:checked={deployToAgent} disabled={saving} class="rounded border-gray-300" />- <Label for="deployToAgent" class="text-sm font-medium whitespace-nowrap">Deploy to Agent</Label>- {#if deployToAgent}- <Select.Root type="single" bind:value={selectedAgentId} disabled={saving}>- <Select.Trigger class="w-[180px]">- <span class="text-sm">- {onlineAgents.find((agent) => agent.id === selectedAgentId)?.hostname || 'Select agent...'}- </span>- </Select.Trigger>- <Select.Content>- {#each onlineAgents as agent}- <Select.Item value={agent.id}>- {agent.hostname} ({agent.platform})- </Select.Item>- {/each}- </Select.Content>- </Select.Root>- {/if}- </div>- {/if}+ <DropdownButton.DropdownRoot>+ <DropdownButton.Root>+ <DropdownButton.Main variant="default" disabled={!name || !composeContent || saving} onclick={handleDeployButtonClick}>+ {#if saving}+ <Loader2 class="size-4 mr-2 animate-spin" />+ {:else}+ <Send class="size-4 mr-2" />+ {/if}+ {selectedAgent ? `Deploy to ${selectedAgent.hostname}` : 'Deploy Locally'}+ </DropdownButton.Main>- <ArcaneButton action="template" onClick={() => (showTemplateDialog = true)} loading={saving} disabled={saving || converting} />- {#if deployToAgent}- <Button type="submit" disabled={!name || !composeContent || !selectedAgentId || saving}>- {#if saving}- <Loader2 class="size-4 mr-2 animate-spin" />- {:else}- <Send class="size-4 mr-2" />- {/if}- Deploy to Agent- </Button>+ <DropdownButton.DropdownTrigger>+ <DropdownButton.Trigger variant="default" disabled={!name || !composeContent || saving} />+ </DropdownButton.DropdownTrigger>+ </DropdownButton.Root>++ <DropdownButton.Content align="end" class="min-w-[200px]">+ <DropdownButton.Item onclick={() => handleAgentSelect({ id: '', label: 'Deploy Locally' })}>Deploy Locally</DropdownButton.Item>++ {#if agentOptions.length > 0}+ <DropdownButton.Separator />+ {#each agentOptions as option}+ <DropdownButton.Item onclick={() => handleAgentSelect(option)}>+ {option.label}+ </DropdownButton.Item>+ {/each}+ {/if}+ </DropdownButton.Content>+ </DropdownButton.DropdownRoot>{:else}<ArcaneButton action="create" onClick={handleSubmit} loading={saving} disabled={!name || !composeContent} />{/if}