Skip to content

Modern Docker Management, Designed for Everyone

fix: only show floating header after scrolling on compose page

Kyle Mendell6582e1e036b3
diff --git a/frontend/src/routes/compose/+page.svelte b/frontend/src/routes/compose/+page.svelte
index f20071fc8..9baf858e2 100644
--- a/frontend/src/routes/compose/+page.svelte
+++ b/frontend/src/routes/compose/+page.svelte
@@ -18,10 +18,10 @@
let { data }: { data: PageData } = $props();
- let stacks = $state<Stack[]>(Array.isArray(data.stacks) ? data.stacks : data.stacks.data || []);
+ let Compose = $state<Stack[]>(Array.isArray(data.stacks) ? data.stacks : data.stacks.data || []);
let error = $state<string | null>(null);
let selectedIds = $state<string[]>([]);
- let isLoadingStacks = $state(false);
+ let isLoadingCompose = $state(false);
let requestOptions = $state<SearchPaginationSortRequest>(data.stackRequestOptions);
let isLoading = $state({
@@ -29,43 +29,43 @@
refreshing: false
});
- const totalStacks = $derived(stacks.length);
- const runningStacks = $derived(stacks.filter((s) => s.status === 'running').length);
- const stoppedStacks = $derived(stacks.filter((s) => s.status === 'stopped').length);
+ const totalCompose = $derived(Compose.length);
+ const runningCompose = $derived(Compose.filter((s) => s.status === 'running').length);
+ const stoppedCompose = $derived(Compose.filter((s) => s.status === 'stopped').length);
- async function loadStacks() {
+ async function loadCompose() {
try {
- isLoadingStacks = true;
+ isLoadingCompose = true;
const response = await environmentAPI.getStacks(
requestOptions.pagination,
requestOptions.sort,
requestOptions.search,
requestOptions.filters
);
- stacks = Array.isArray(response) ? response : response.data || [];
+ Compose = Array.isArray(response) ? response : response.data || [];
error = null;
} catch (err) {
console.error('Failed to load compose page:', err);
- error = err instanceof Error ? err.message : 'Failed to load Docker Compose stacks';
- stacks = [];
+ error = err instanceof Error ? err.message : 'Failed to load Docker Compose Compose';
+ Compose = [];
} finally {
- isLoadingStacks = false;
+ isLoadingCompose = false;
}
}
onMount(() => {
- if (stacks.length === 0) {
- loadStacks();
+ if (Compose.length === 0) {
+ loadCompose();
}
});
- async function refreshStacks() {
+ async function refreshCompose() {
isLoading.refreshing = true;
try {
- await loadStacks();
+ await loadCompose();
} catch (error) {
- console.error('Failed to refresh stacks:', error);
- toast.error('Failed to refresh stacks');
+ console.error('Failed to refresh Compose:', error);
+ toast.error('Failed to refresh Compose');
} finally {
isLoading.refreshing = false;
}
@@ -79,19 +79,19 @@
setLoadingState: (value) => (isLoading.updating = value),
async onSuccess() {
toast.success('Compose Projects Updated Successfully.');
- await loadStacks();
+ await loadCompose();
}
});
}
async function onRefresh(options: SearchPaginationSortRequest) {
requestOptions = options;
- await loadStacks();
+ await loadCompose();
return {
- data: stacks,
+ data: Compose,
pagination: {
- totalPages: Math.ceil(stacks.length / (requestOptions.pagination?.limit || 20)),
- totalItems: stacks.length,
+ totalPages: Math.ceil(Compose.length / (requestOptions.pagination?.limit || 20)),
+ totalItems: Compose.length,
currentPage: requestOptions.pagination?.page || 1,
itemsPerPage: requestOptions.pagination?.limit || 20
}
@@ -108,7 +108,7 @@
<div class="flex items-center gap-2">
<ArcaneButton
action="restart"
- onClick={refreshStacks}
+ onClick={refreshCompose}
label="Refresh"
loading={isLoading.refreshing}
disabled={isLoading.refreshing}
@@ -129,7 +129,7 @@
</Alert.Root>
{/if}
- {#if isLoadingStacks}
+ {#if isLoadingCompose}
<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
{#each Array(3) as _}
<Card.Root>
@@ -168,21 +168,21 @@
<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
<StatCard
title="Total Compose Projects"
- value={totalStacks}
+ value={totalCompose}
icon={FileStack}
iconColor="text-amber-500"
class="border-l-4 border-l-amber-500"
/>
<StatCard
title="Running"
- value={runningStacks}
+ value={runningCompose}
icon={PlayCircle}
iconColor="text-green-500"
class="border-l-4 border-l-green-500"
/>
<StatCard
title="Stopped"
- value={stoppedStacks}
+ value={stoppedCompose}
icon={StopCircle}
iconColor="text-red-500"
class="border-l-4 border-l-red-500"
@@ -190,11 +190,11 @@
</div>
<StackTable
- {stacks}
+ {Compose}
bind:selectedIds
{requestOptions}
{onRefresh}
- onStacksChanged={loadStacks}
+ onComposeChanged={loadCompose}
onCheckForUpdates={handleCheckForUpdates}
/>
{/if}
diff --git a/frontend/src/routes/compose/[composeId]/+page.svelte b/frontend/src/routes/compose/[composeId]/+page.svelte
index 9545a9065..37e1e7dfe 100644
--- a/frontend/src/routes/compose/[composeId]/+page.svelte
+++ b/frontend/src/routes/compose/[composeId]/+page.svelte
@@ -226,6 +226,20 @@
{/if}
</div>
</div>
+ <div class="flex items-center gap-2">
+ <ActionButtons
+ id={stack.id}
+ type="stack"
+ itemState={stack.status}
+ loading={{
+ start: isLoading.deploying,
+ stop: isLoading.stopping,
+ restart: isLoading.restarting,
+ remove: isLoading.removing
+ }}
+ onActionComplete={() => invalidateAll()}
+ />
+ </div>
</div>
</div>
</div>
@@ -262,6 +276,7 @@
remove: isLoading.removing
}}
onActionComplete={() => invalidateAll()}
+ compact={true}
/>
</div>
</div>
@@ -278,7 +293,7 @@
</div>
{/if}
- <div class="flex">
+ <div class="flex min-h-0 overflow-hidden">
<div class="bg-background/50 w-16 shrink-0 border-r">
<div class="sticky top-16 p-2">
<nav class="space-y-1">
@@ -306,7 +321,7 @@
</div>
</div>
- <div class="flex-1" bind:this={mainContainer}>
+ <div class="flex-1 min-w-0 overflow-hidden">
<div class="max-w-none p-6">
<div class="space-y-8">
<section id="overview" class="scroll-mt-20">
@@ -543,11 +558,11 @@
</div>
</div>
- <div class="grid grid-cols-1 gap-6 lg:grid-cols-3">
- <div class="lg:col-span-2">
+ <div class="grid grid-cols-1 gap-6 lg:grid-cols-3 min-w-0 overflow-hidden">
+ <div class="lg:col-span-2 min-w-0 overflow-hidden">
<div class="space-y-4">
<h3 class="text-lg font-semibold">Docker Compose File</h3>
- <div class="h-[590px] w-full overflow-hidden rounded-md">
+ <div class="h-[590px] w-full min-w-0 overflow-hidden rounded-md">
<CodeEditor
bind:value={composeContent}
language="yaml"
@@ -557,10 +572,10 @@
</div>
</div>
- <div class="lg:col-span-1">
+ <div class="lg:col-span-1 min-w-0 overflow-hidden">
<div class="space-y-4">
<h3 class="text-lg font-semibold">Environment (.env)</h3>
- <div class="h-[590px] w-full overflow-hidden rounded-md">
+ <div class="h-[590px] w-full min-w-0 overflow-hidden rounded-md">
<CodeEditor
bind:value={envContent}
language="env"
@@ -617,21 +632,23 @@
</div>
</div>
- <Card.Root class="border">
- <Card.Content class="p-0">
- <LogViewer
- bind:this={stackLogViewer}
- bind:autoScroll={autoScrollStackLogs}
- stackId={stack?.id}
- type="stack"
- maxLines={500}
- showTimestamps={true}
- height="600px"
- onStart={handleStackLogStart}
- onStop={handleStackLogStop}
- onClear={handleStackLogClear}
- onToggleAutoScroll={handleToggleStackAutoScroll}
- />
+ <Card.Root class="border min-w-0 overflow-hidden">
+ <Card.Content class="p-0 min-w-0 overflow-hidden">
+ <div class="w-full min-w-0 overflow-hidden">
+ <LogViewer
+ bind:this={stackLogViewer}
+ bind:autoScroll={autoScrollStackLogs}
+ stackId={stack?.id}
+ type="stack"
+ maxLines={500}
+ showTimestamps={true}
+ height="600px"
+ onStart={handleStackLogStart}
+ onStop={handleStackLogStop}
+ onClear={handleStackLogClear}
+ onToggleAutoScroll={handleToggleStackAutoScroll}
+ />
+ </div>
</Card.Content>
</Card.Root>
</section>
diff --git a/frontend/src/routes/compose/compose-table.svelte b/frontend/src/routes/compose/compose-table.svelte
index b6aaf85b4..8cc7f8364 100644
--- a/frontend/src/routes/compose/compose-table.svelte
+++ b/frontend/src/routes/compose/compose-table.svelte
@@ -33,18 +33,18 @@
}
let {
- stacks,
+ Compose,
selectedIds = $bindable(),
requestOptions = $bindable(),
onRefresh,
- onStacksChanged,
+ onComposeChanged,
onCheckForUpdates
}: {
- stacks: Stack[];
+ Compose: Stack[];
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
onRefresh: (options: SearchPaginationSortRequest) => Promise<any>;
- onStacksChanged: () => Promise<void>;
+ onComposeChanged: () => Promise<void>;
onCheckForUpdates: () => Promise<void>;
} = $props();
@@ -58,18 +58,18 @@
updating: false
});
- const stacksWithId = $derived(
- stacks.map((stack) => ({
+ const ComposeWithId = $derived(
+ Compose.map((stack) => ({
...stack,
id: stack.id || stack.name
}))
);
- const paginatedStacks: Paginated<StackWithId> = $derived({
- data: stacksWithId,
+ const paginatedCompose: Paginated<StackWithId> = $derived({
+ data: ComposeWithId,
pagination: {
- totalPages: Math.ceil(stacksWithId.length / (requestOptions.pagination?.limit || 20)),
- totalItems: stacksWithId.length,
+ totalPages: Math.ceil(ComposeWithId.length / (requestOptions.pagination?.limit || 20)),
+ totalItems: ComposeWithId.length,
currentPage: requestOptions.pagination?.page || 1,
itemsPerPage: requestOptions.pagination?.limit || 20
}
@@ -86,7 +86,7 @@
setLoadingState: (value) => (isLoading.start = value),
onSuccess: async () => {
toast.success('Stack Started Successfully.');
- await onStacksChanged();
+ await onComposeChanged();
}
});
} else if (action === 'stop') {
@@ -96,7 +96,7 @@
setLoadingState: (value) => (isLoading.stop = value),
onSuccess: async () => {
toast.success('Stack Stopped Successfully.');
- await onStacksChanged();
+ await onComposeChanged();
}
});
} else if (action === 'restart') {
@@ -106,7 +106,7 @@
setLoadingState: (value) => (isLoading.restart = value),
onSuccess: async () => {
toast.success('Stack Restarted Successfully.');
- await onStacksChanged();
+ await onComposeChanged();
}
});
} else if (action === 'pull') {
@@ -116,7 +116,7 @@
setLoadingState: (value) => (isLoading.pull = value),
onSuccess: async () => {
toast.success('Stack Pulled successfully.');
- await onStacksChanged();
+ await onComposeChanged();
}
});
} else if (action === 'destroy') {
@@ -133,7 +133,7 @@
setLoadingState: (value) => (isLoading.destroy = value),
onSuccess: async () => {
toast.success('Stack Removed Successfully');
- await onStacksChanged();
+ await onComposeChanged();
}
});
}
@@ -150,7 +150,7 @@
const isAnyLoading = $derived(Object.values(isLoading).some((loading) => loading));
</script>
-{#if stacksWithId.length > 0}
+{#if ComposeWithId.length > 0}
<Card.Root class="border shadow-sm">
<Card.Header class="px-6">
<div class="flex items-center justify-between">
@@ -171,7 +171,7 @@
</Card.Header>
<Card.Content>
<ArcaneTable
- items={paginatedStacks}
+ items={paginatedCompose}
bind:requestOptions
bind:selectedIds
{onRefresh}