Skip to content

Modern Docker Management, Designed for Everyone

fix: project -> service back button not returning to project page

Kyle Mendellcbb6faa9129c
diff --git a/frontend/src/routes/containers/[containerId]/+page.svelte b/frontend/src/routes/containers/[containerId]/+page.svelte
index e3f758bbd..ec2df9867 100644
--- a/frontend/src/routes/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/containers/[containerId]/+page.svelte
@@ -16,6 +16,7 @@
import { format } from 'date-fns';
import bytes from 'bytes';
import { onDestroy, untrack } from 'svelte';
+ import { page } from '$app/state';
import type {
ContainerDetailsDto,
ContainerNetworkSettings,
@@ -259,10 +260,21 @@
const baseServerUrl = $derived(
(data?.settings as any)?.serverBaseUrl ?? (data?.settings as any)?.baseServerUrl ?? (data?.settings as any)?.baseUrl ?? ''
);
+
+ const backUrl = $derived.by(() => {
+ const from = page.url.searchParams.get('from');
+ const projectId = page.url.searchParams.get('projectId');
+
+ if (from === 'project' && projectId) {
+ return `/projects/${projectId}`;
+ }
+
+ return '/containers';
+ });
</script>
{#if container}
- <TabbedPageLayout backUrl="/containers" backLabel={m.common_back()} {tabItems} {selectedTab} {onTabChange}>
+ <TabbedPageLayout {backUrl} backLabel={m.common_back()} {tabItems} {selectedTab} {onTabChange}>
{#snippet headerInfo()}
<div class="flex items-center gap-2">
<h1 class="max-w-[300px] truncate text-lg font-semibold" title={containerDisplayName}>
diff --git a/frontend/src/routes/projects/[projectId]/+page.svelte b/frontend/src/routes/projects/[projectId]/+page.svelte
index d838ccd9c..30cc231fe 100644
--- a/frontend/src/routes/projects/[projectId]/+page.svelte
+++ b/frontend/src/routes/projects/[projectId]/+page.svelte
@@ -244,7 +244,7 @@
{#snippet tabContent()}
<Tabs.Content value="services" class="h-full">
- <ServicesGrid services={project.services} />
+ <ServicesGrid services={project.services} {projectId} />
</Tabs.Content>
<Tabs.Content value="compose" class="h-full">
diff --git a/frontend/src/routes/projects/components/ServicesGrid.svelte b/frontend/src/routes/projects/components/ServicesGrid.svelte
index e45a6b431..539fe9f5f 100644
--- a/frontend/src/routes/projects/components/ServicesGrid.svelte
+++ b/frontend/src/routes/projects/components/ServicesGrid.svelte
@@ -14,7 +14,7 @@
health?: string;
};
- let { services }: { services?: Service[] } = $props();
+ let { services, projectId }: { services?: Service[]; projectId?: string } = $props();
function getHealthVariant(health: string | undefined): 'green' | 'red' | 'amber' {
if (!health) return 'amber';
@@ -42,9 +42,12 @@
{#each services as service (service.container_id || service.name)}
{@const status = service.status || 'unknown'}
{@const variant = getStatusVariant(status)}
+ {@const containerUrl = projectId
+ ? `/containers/${service.container_id}?from=project&projectId=${projectId}`
+ : `/containers/${service.container_id}`}
{#if service.container_id}
- <a href={`/containers/${service.container_id}`} class="group">
+ <a href={containerUrl} class="group">
<Card.Root
variant="subtle"
class="group-hover:border-border/60 group-hover:bg-muted/50 flex h-full cursor-pointer transition-all duration-200"