Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: use dropdown card component for group by project
Kyle Mendellb26f87347697
diff --git a/frontend/src/app.css b/frontend/src/app.cssindex fe751f218..e4bf05021 100644--- a/frontend/src/app.css+++ b/frontend/src/app.css@@ -201,7 +201,12 @@/* Glass effect toggle: disable all glass/blur/gradients when .glass-disabled */body:not(.glass-enabled) {--card: var(--bg-surface);+ --card-foreground: var(--foreground);--sidebar: var(--bg-surface);+ --popover: var(--bg-surface);+ --muted: var(--bg-surface);+ --secondary: var(--bg-surface);+ --accent: var(--bg-surface);&::before {display: none;@@ -219,13 +224,13 @@ body:not(.glass-enabled) {.glass-subtle {-webkit-backdrop-filter: none !important;backdrop-filter: none !important;- background: var(--card) !important;+ background: var(--bg-surface) !important;border-color: var(--border) !important;box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05) !important;}.bubble {- background: var(--card) !important;+ background: var(--bg-surface) !important;box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05) !important;}@@ -239,7 +244,7 @@ body:not(.glass-enabled) {}.bubble-outline {- background: var(--card) !important;+ background: var(--bg-surface) !important;border: 1px solid var(--border) !important;}@@ -276,7 +281,7 @@ body:not(.glass-enabled) {[data-slot='dialog-content'],[data-slot='sheet-content'],[data-slot='popover-content'] {- background: var(--card) !important;+ background: var(--bg-surface) !important;}[class*='bg-background/'],@@ -285,11 +290,11 @@ body:not(.glass-enabled) {[class*='bg-muted/'],[class*='bg-secondary/'],[class*='bg-accent/'] {- background-color: var(--card) !important;+ background-color: var(--bg-surface) !important;}.glass-medium {- background: var(--card) !important;+ background: var(--bg-surface) !important;backdrop-filter: none !important;-webkit-backdrop-filter: none !important;}diff --git a/frontend/src/routes/containers/container-table.svelte b/frontend/src/routes/containers/container-table.svelteindex bfe2627f8..373f01f6c 100644--- a/frontend/src/routes/containers/container-table.svelte+++ b/frontend/src/routes/containers/container-table.svelte@@ -29,14 +29,12 @@import NetworkIcon from '@lucide/svelte/icons/network';import ClockIcon from '@lucide/svelte/icons/clock';import { containerService } from '$lib/services/container-service';- import * as Collapsible from '$lib/components/ui/collapsible/index.js';- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';- import { Badge } from '$lib/components/ui/badge/index.js';+ import DropdownCard from '$lib/components/dropdown-card.svelte';+ import FolderIcon from '@lucide/svelte/icons/folder';import type { Table as TableType } from '@tanstack/table-core';import * as Table from '$lib/components/ui/table/index.js';import FlexRender from '$lib/components/ui/data-table/flex-render.svelte';- import { PersistedState } from 'runed';+ import { DataTableViewOptions } from '$lib/components/arcane-table/index.js';let {containers = $bindable(),@@ -167,16 +165,6 @@customSettings = { ...customSettings, groupByProject: value };}- const projectOpenStates = new PersistedState<Record<string, boolean>>(- 'arcane-container-groups-collapsed',- {},- { syncTabs: false }- );-- function toggleProjectState(projectName: string, isOpen: boolean) {- projectOpenStates.current = { ...projectOpenStates.current, [projectName]: isOpen };- }-function getProjectName(container: ContainerSummaryDto): string {const projectLabel = container.labels?.['com.docker.compose.project'];return projectLabel || 'No Project';@@ -201,7 +189,7 @@return a.localeCompare(b);});- return sortedGroups;+ return sortedGroups.length > 0 ? sortedGroups : null;});</script>@@ -408,80 +396,69 @@{/snippet}{#snippet GroupedTableView({ table }: { table: TableType<ContainerSummaryDto> })}- <div class="space-y-4">+ <div class="mb-4 flex items-center justify-end border-b px-6 py-4">+ <DataTableViewOptions {table} customViewOptions={CustomViewOptions} />+ </div>+ <div class="space-y-4 px-6 pb-6">{#each groupedContainers() ?? [] as [projectName, projectContainers] (projectName)}{@const projectContainerIds = new Set(projectContainers.map((c) => c.id))}{@const projectRows = table.getRowModel().rows.filter((row) => projectContainerIds.has((row.original as ContainerSummaryDto).id))}- <Collapsible.Root- class="isolate overflow-hidden overflow-y-hidden rounded-[--radius-xl] border-[1.5px] border-[color-mix(in_oklch,var(--border)_70%,color-mix(in_oklch,var(--foreground)_8%,transparent))] bg-[radial-gradient(140%_100%_at_50%_0%,color-mix(in_oklch,var(--glass-tint,var(--primary))_4%,transparent)_0%,transparent_70%),color-mix(in_oklch,var(--glass-base,var(--bg-surface))_var(--glass-medium-alpha),transparent)] shadow-[0_8px_32px_-8px_var(--glass-shadow-color),0_0_0_1px_color-mix(in_oklch,var(--glass-stroke-outer)_60%,transparent)_inset,0_2px_8px_-2px_color-mix(in_oklch,var(--glass-tint,var(--primary))_8%,transparent)_inset] backdrop-blur-[--glass-blur-md] backdrop-saturate-[--glass-saturation]"- open={projectOpenStates.current[projectName] ?? false}- onOpenChange={(open) => toggleProjectState(projectName, open)}+ <DropdownCard+ id={`container-project-${projectName}`}+ title={projectName}+ description={`${projectContainers.length} ${projectContainers.length === 1 ? 'container' : 'containers'}`}+ icon={FolderIcon}>- <Collapsible.Trigger- class="hover:bg-accent/50 flex w-full items-center justify-between border-b-[1.5px] border-[color-mix(in_oklch,var(--border)_60%,color-mix(in_oklch,var(--foreground)_12%,transparent))] bg-[linear-gradient(to_bottom,color-mix(in_oklch,var(--glass-tint,var(--primary))_6%,transparent),color-mix(in_oklch,var(--glass-base,var(--bg-surface))_var(--glass-light-alpha),transparent))] px-6 py-4 text-left backdrop-blur-[--glass-blur-sm] transition-colors"- >- <div class="flex items-center gap-2">- {#if projectOpenStates.current[projectName] ?? false}- <ChevronDownIcon class="size-4 transition-transform" />- {:else}- <ChevronRightIcon class="size-4 transition-transform" />- {/if}- <span class="font-semibold">{projectName}</span>- <Badge variant="secondary" class="ml-2">{projectContainers.length}</Badge>- </div>- </Collapsible.Trigger>- <Collapsible.Content>- <div class="hidden md:block">- <Table.Root- class="**:data-[slot='table-container']:rounded-none **:data-[slot='table-container']:border-0 **:data-[slot='table-container']:bg-transparent **:data-[slot='table-container']:shadow-none **:data-[slot='table-container']:backdrop-filter-none"- >- <Table.Header class="border-border/40 border-t">- {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}- <Table.Row>- {#each headerGroup.headers as header (header.id)}- <Table.Head colspan={header.colSpan}>- {#if !header.isPlaceholder}- <FlexRender content={header.column.columnDef.header} context={header.getContext()} />- {/if}- </Table.Head>- {/each}- </Table.Row>- {/each}- </Table.Header>- <Table.Body>- {#each projectRows as row (row.id)}- <Table.Row data-state={(selectedIds ?? []).includes((row.original as ContainerSummaryDto).id) && 'selected'}>- {#each row.getVisibleCells() as cell (cell.id)}- <Table.Cell>- <FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />- </Table.Cell>- {/each}- </Table.Row>- {:else}- <Table.Row>- <Table.Cell colspan={table.getAllColumns().length} class="h-24 text-center"- >{m.common_no_results_found()}</Table.Cell- >- </Table.Row>- {/each}- </Table.Body>- </Table.Root>- </div>+ <div class="hidden md:block">+ <Table.Root+ class="**:data-[slot='table-container']:rounded-none **:data-[slot='table-container']:border-0 **:data-[slot='table-container']:bg-transparent **:data-[slot='table-container']:shadow-none **:data-[slot='table-container']:backdrop-filter-none"+ >+ <Table.Header class="border-border/40 border-t">+ {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}+ <Table.Row>+ {#each headerGroup.headers as header (header.id)}+ <Table.Head colspan={header.colSpan}>+ {#if !header.isPlaceholder}+ <FlexRender content={header.column.columnDef.header} context={header.getContext()} />+ {/if}+ </Table.Head>+ {/each}+ </Table.Row>+ {/each}+ </Table.Header>+ <Table.Body>+ {#each projectRows as row (row.id)}+ <Table.Row data-state={(selectedIds ?? []).includes((row.original as ContainerSummaryDto).id) && 'selected'}>+ {#each row.getVisibleCells() as cell (cell.id)}+ <Table.Cell>+ <FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />+ </Table.Cell>+ {/each}+ </Table.Row>+ {:else}+ <Table.Row>+ <Table.Cell colspan={table.getAllColumns().length} class="h-24 text-center"+ >{m.common_no_results_found()}</Table.Cell+ >+ </Table.Row>+ {/each}+ </Table.Body>+ </Table.Root>+ </div>- <div class="space-y-3 p-4 md:hidden">- {#each projectRows as row (row.id)}- {@render ContainerMobileCardSnippet({ row, item: row.original as ContainerSummaryDto, mobileFieldVisibility })}- {:else}- <div class="h-24 flex items-center justify-center text-center text-muted-foreground">- {m.common_no_results_found()}- </div>- {/each}- </div>- </Collapsible.Content>- </Collapsible.Root>+ <div class="space-y-3 md:hidden">+ {#each projectRows as row (row.id)}+ {@render ContainerMobileCardSnippet({ row, item: row.original as ContainerSummaryDto, mobileFieldVisibility })}+ {:else}+ <div class="h-24 flex items-center justify-center text-center text-muted-foreground">+ {m.common_no_results_found()}+ </div>+ {/each}+ </div>+ </DropdownCard>{/each}</div>{/snippet}