Skip to content

Commit 95b1afc

Browse files
committed
fix: correct log-tail server resolution, drop unrelated Networks gating
- Log tail for failed-deployment classification now checks the app's current buildServer before falling back to its server, matching the buildServerId-then-serverId precedence used everywhere else in the codebase (application.ts, drop.ts, directory.ts, patch-repo.ts). - Removes a stale !isCloud gate on the Networks tab that this branch had reintroduced from before Mauricio removed it in daba2d7 (Networks is intentionally shown in cloud now) — unrelated to this PR's scope, docker.tsx's Networks tab/content now matches canary.
1 parent c741ff3 commit 95b1afc

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

‎apps/dokploy/pages/dashboard/docker.tsx‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,14 @@ const DEFAULT_SWARM_TAB = "overview";
2626

2727
const Dashboard = () => {
2828
const router = useRouter();
29-
const { data: isCloud } = api.settings.isCloud.useQuery();
3029
const { data: permissions } = api.user.getPermissions.useQuery();
3130
// Host-level diagnostics, so this needs server.read on top of docker.read.
3231
const canSeeHealth = !!permissions?.docker.read && !!permissions?.server.read;
3332

3433
const queryTab =
3534
typeof router.query.tab === "string" ? router.query.tab : DEFAULT_TAB;
3635
const activeTab =
37-
(isCloud && queryTab === "networks") ||
38-
(queryTab === "health" && !canSeeHealth)
39-
? DEFAULT_TAB
40-
: queryTab;
36+
queryTab === "health" && !canSeeHealth ? DEFAULT_TAB : queryTab;
4137

4238
const activeSwarmTab =
4339
typeof router.query.subtab === "string"
@@ -78,7 +74,7 @@ const Dashboard = () => {
7874
<TabsTrigger value="swarm">Swarm</TabsTrigger>
7975
<TabsTrigger value="images">Images</TabsTrigger>
8076
<TabsTrigger value="volumes">Volumes</TabsTrigger>
81-
{!isCloud && <TabsTrigger value="networks">Networks</TabsTrigger>}
77+
<TabsTrigger value="networks">Networks</TabsTrigger>
8278
<TabsTrigger value="events">Events</TabsTrigger>
8379
<TabsTrigger value="disk-usage">Disk Usage</TabsTrigger>
8480
{canSeeHealth && <TabsTrigger value="health">Health</TabsTrigger>}
@@ -114,11 +110,9 @@ const Dashboard = () => {
114110
<TabsContent value="volumes">
115111
<ShowVolumes serverId={serverId} />
116112
</TabsContent>
117-
{!isCloud && (
118-
<TabsContent value="networks">
119-
<ShowNetworks serverId={serverId} />
120-
</TabsContent>
121-
)}
113+
<TabsContent value="networks">
114+
<ShowNetworks serverId={serverId} />
115+
</TabsContent>
122116
<TabsContent value="events">
123117
<ShowDockerEvents serverId={serverId} />
124118
</TabsContent>

‎packages/server/src/services/deployment.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,10 @@ export const findFailedDeploymentsCentralized = async (
10961096
failed,
10971097
LOG_TAIL_CONCURRENCY,
10981098
async (deployment) => {
1099+
// Same buildServerId-then-serverId precedence used app-wide (application.ts, drop.ts, etc.)
10991100
const serverId =
11001101
deployment.buildServer?.serverId ||
1102+
deployment.application?.buildServer?.serverId ||
11011103
deployment.server?.serverId ||
11021104
deployment.application?.server?.serverId ||
11031105
deployment.compose?.server?.serverId ||

0 commit comments

Comments
 (0)