refactor: simplify SwarmMonitorCard logic and update dashboard structure

- Refactored SwarmMonitorCard to use optional chaining for node data handling.
- Consolidated loading and error states into a single conditional rendering block.
- Updated dashboard layout to include tabs for containers and swarm, enhancing navigation.
- Removed deprecated network-related code from the dashboard.
This commit is contained in:
Mauricio Siu
2026-08-09 12:28:22 -06:00
parent 4791863ff9
commit 8637acb56c
5 changed files with 201 additions and 317 deletions
@@ -27,50 +27,16 @@ export default function SwarmMonitorCard({ serverId }: Props) {
serverId, serverId,
}); });
if (isPending) { const totalNodes = nodes?.length ?? 0;
return ( const activeNodes = nodes?.filter((node) => node.Status === "Ready") ?? [];
<div className="w-full max-w-7xl mx-auto"> const managerNodes =
<div className="mb-6 border min-h-[55vh] flex rounded-lg h-full items-center justify-center text-muted-foreground"> nodes?.filter(
{/* <div className="flex items-center justify-center h-full text-muted-foreground"> */} (node) =>
node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable",
<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground min-h-[55vh]"> ) ?? [];
<span>Loading...</span>
<Loader2 className="animate-spin size-4" />
</div>
{/* </div> */}
</div>
</div>
);
}
if (!nodes) {
return (
<div className="w-full max-w-7xl mx-auto">
<div className="mb-6 border min-h-[55vh] flex justify-center items-center rounded-lg h-full">
<div className="flex items-center justify-center h-full text-destructive">
<span>Failed to load data</span>
</div>
</div>
</div>
);
}
const totalNodes = nodes.length;
const activeNodesCount = nodes.filter(
(node) => node.Status === "Ready",
).length;
const managerNodesCount = nodes.filter(
(node) =>
node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable",
).length;
const activeNodes = nodes.filter((node) => node.Status === "Ready");
const managerNodes = nodes.filter(
(node) =>
node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable",
);
return ( return (
<Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full"> <Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full">
<div className="rounded-xl bg-background shadow-md p-6 flex flex-col gap-4"> <div className="rounded-xl bg-background shadow-md p-6 flex flex-col gap-4">
<header className="flex items-center flex-wrap gap-4 justify-between"> <header className="flex items-center flex-wrap gap-4 justify-between">
<div className="space-y-1"> <div className="space-y-1">
@@ -94,93 +60,114 @@ export default function SwarmMonitorCard({ serverId }: Props) {
)} )}
</header> </header>
<div className="grid gap-6 lg:grid-cols-3"> {isPending ? (
<Card className="bg-background"> <div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground min-h-[45vh]">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> <span>Loading...</span>
<CardTitle className="text-sm font-medium">Total Nodes</CardTitle> <Loader2 className="animate-spin size-4" />
<div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md"> </div>
<Server className="h-4 w-4 text-muted-foreground dark:text-emerald-600" /> ) : !nodes ? (
</div> <div className="flex items-center justify-center min-h-[45vh] text-destructive">
</CardHeader> <span>Failed to load data</span>
<CardContent> </div>
<div className="text-2xl font-bold">{totalNodes}</div> ) : (
</CardContent> <>
</Card> <div className="grid gap-6 lg:grid-cols-3">
<Card className="bg-background">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">
Total Nodes
</CardTitle>
<div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
<Server className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
</div>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{totalNodes}</div>
</CardContent>
</Card>
<Card className="bg-background"> <Card className="bg-background">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<CardTitle className="text-sm font-medium"> <CardTitle className="text-sm font-medium">
Active Nodes Active Nodes
</CardTitle> </CardTitle>
<Badge variant="green">Online</Badge> <Badge variant="green">Online</Badge>
</div> </div>
<div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md"> <div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
<Activity className="h-4 w-4 text-muted-foreground dark:text-emerald-600" /> <Activity className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
</div> </div>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
<TooltipProvider> <TooltipProvider>
<Tooltip> <Tooltip>
<TooltipTrigger> <TooltipTrigger>
<div className="text-2xl font-bold"> <div className="text-2xl font-bold">
{activeNodesCount} / {totalNodes} {activeNodes.length} / {totalNodes}
</div>
</TooltipTrigger>
<TooltipContent>
<div className="max-h-48 overflow-y-auto">
{activeNodes.map((node) => (
<div key={node.ID} className="flex items-center gap-2">
{node.Hostname}
</div> </div>
))} </TooltipTrigger>
</div> <TooltipContent>
</TooltipContent> <div className="max-h-48 overflow-y-auto">
</Tooltip> {activeNodes.map((node) => (
</TooltipProvider> <div
</CardContent> key={node.ID}
</Card> className="flex items-center gap-2"
>
<Card className="bg-background"> {node.Hostname}
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> </div>
<div className="flex items-center gap-2"> ))}
<CardTitle className="text-sm font-medium">
Manager Nodes
</CardTitle>
<Badge variant="green">Online</Badge>
</div>
<div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
<Monitor className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
</div>
</CardHeader>
<CardContent>
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
<div className="text-2xl font-bold">
{managerNodesCount} / {totalNodes}
</div>
</TooltipTrigger>
<TooltipContent>
<div className="max-h-48 overflow-y-auto">
{managerNodes.map((node) => (
<div key={node.ID} className="flex items-center gap-2">
{node.Hostname}
</div> </div>
))} </TooltipContent>
</div> </Tooltip>
</TooltipContent> </TooltipProvider>
</Tooltip> </CardContent>
</TooltipProvider> </Card>
</CardContent>
</Card>
</div>
<div className="grid grid-cols-1 xl:grid-cols-2 2xl:grid-cols-3 gap-4"> <Card className="bg-background">
{nodes.map((node) => ( <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<NodeCard key={node.ID} node={node} serverId={serverId} /> <div className="flex items-center gap-2">
))} <CardTitle className="text-sm font-medium">
</div> Manager Nodes
</CardTitle>
<Badge variant="green">Online</Badge>
</div>
<div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
<Monitor className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
</div>
</CardHeader>
<CardContent>
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
<div className="text-2xl font-bold">
{managerNodes.length} / {totalNodes}
</div>
</TooltipTrigger>
<TooltipContent>
<div className="max-h-48 overflow-y-auto">
{managerNodes.map((node) => (
<div
key={node.ID}
className="flex items-center gap-2"
>
{node.Hostname}
</div>
))}
</div>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</CardContent>
</Card>
</div>
<div className="grid grid-cols-1 xl:grid-cols-2 2xl:grid-cols-3 gap-4">
{nodes.map((node) => (
<NodeCard key={node.ID} node={node} serverId={serverId} />
))}
</div>
</>
)}
</div> </div>
</Card> </Card>
); );
-24
View File
@@ -25,10 +25,8 @@ import {
Loader2, Loader2,
LogIn, LogIn,
type LucideIcon, type LucideIcon,
Network,
Package, Package,
Palette, Palette,
PieChart,
Rocket, Rocket,
Server, Server,
ShieldCheck, ShieldCheck,
@@ -202,28 +200,6 @@ const MENU: Menu = {
// Only enabled for users with access to Docker // Only enabled for users with access to Docker
isEnabled: ({ permissions }) => !!permissions?.docker.read, isEnabled: ({ permissions }) => !!permissions?.docker.read,
}, },
{
isSingle: true,
title: "Swarm",
url: "/dashboard/swarm",
icon: PieChart,
// Only enabled for users with access to Docker
isEnabled: ({ permissions }) => !!permissions?.docker.read,
},
{
isSingle: true,
title: "Networks",
url: "/dashboard/networks",
icon: Network,
// Only enabled for admins and users with access to Docker in non-cloud environments
isEnabled: ({ auth, isCloud }) =>
!!(
(auth?.role === "owner" ||
auth?.role === "admin" ||
auth?.canAccessToDocker) &&
!isCloud
),
},
{ {
isSingle: true, isSingle: true,
title: "Requests", title: "Requests",
+63 -1
View File
@@ -1,17 +1,79 @@
import { validateRequest } from "@dokploy/server/lib/auth"; import { validateRequest } from "@dokploy/server/lib/auth";
import { createServerSideHelpers } from "@trpc/react-query/server"; import { createServerSideHelpers } from "@trpc/react-query/server";
import type { GetServerSidePropsContext } from "next"; import type { GetServerSidePropsContext } from "next";
import { useRouter } from "next/router";
import type { ReactElement } from "react"; import type { ReactElement } from "react";
import superjson from "superjson"; import superjson from "superjson";
import { ShowContainers } from "@/components/dashboard/docker/show/show-containers"; import { ShowContainers } from "@/components/dashboard/docker/show/show-containers";
import { ShowNetworks } from "@/components/dashboard/networks/show-networks";
import { ShowSwarmContainers } from "@/components/dashboard/swarm/containers/show-swarm-containers";
import SwarmMonitorCard from "@/components/dashboard/swarm/monitoring-card";
import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { ServerFilter } from "@/components/shared/server-filter"; import { ServerFilter } from "@/components/shared/server-filter";
import { Card } from "@/components/ui/card";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { appRouter } from "@/server/api/root"; import { appRouter } from "@/server/api/root";
import { api } from "@/utils/api";
const DEFAULT_TAB = "containers";
const Dashboard = () => { const Dashboard = () => {
const router = useRouter();
const { data: isCloud } = api.settings.isCloud.useQuery();
const queryTab =
typeof router.query.tab === "string" ? router.query.tab : DEFAULT_TAB;
const activeTab = isCloud && queryTab === "networks" ? DEFAULT_TAB : queryTab;
const setTab = (value: string) => {
const { tab: _current, ...query } = router.query;
router.replace(
{
pathname: router.pathname,
query: value === DEFAULT_TAB ? query : { ...query, tab: value },
},
undefined,
{ shallow: true },
);
};
return ( return (
<ServerFilter> <ServerFilter>
{(serverId) => <ShowContainers serverId={serverId} />} {(serverId) => (
<Tabs value={activeTab} onValueChange={setTab}>
<TabsList>
<TabsTrigger value="containers">Containers</TabsTrigger>
<TabsTrigger value="swarm">Swarm</TabsTrigger>
{!isCloud && <TabsTrigger value="networks">Networks</TabsTrigger>}
</TabsList>
<TabsContent value="containers">
<ShowContainers serverId={serverId} />
</TabsContent>
<TabsContent value="swarm">
<Tabs defaultValue="overview">
<TabsList>
<TabsTrigger value="overview">Overview</TabsTrigger>
<TabsTrigger value="containers">Containers</TabsTrigger>
</TabsList>
<TabsContent value="overview">
<SwarmMonitorCard serverId={serverId} />
</TabsContent>
<TabsContent value="containers">
<Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full">
<div className="rounded-xl bg-background shadow-md p-6">
<ShowSwarmContainers serverId={serverId} />
</div>
</Card>
</TabsContent>
</Tabs>
</TabsContent>
{!isCloud && (
<TabsContent value="networks">
<ShowNetworks serverId={serverId} />
</TabsContent>
)}
</Tabs>
)}
</ServerFilter> </ServerFilter>
); );
}; };
+13 -81
View File
@@ -1,89 +1,21 @@
import { IS_CLOUD } from "@dokploy/server/constants";
import { validateRequest } from "@dokploy/server/lib/auth";
import { createServerSideHelpers } from "@trpc/react-query/server";
import type { GetServerSidePropsContext } from "next"; import type { GetServerSidePropsContext } from "next";
import type { ReactElement } from "react";
import superjson from "superjson";
import { ShowNetworks } from "@/components/dashboard/networks/show-networks";
import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { ServerFilter } from "@/components/shared/server-filter";
import { appRouter } from "@/server/api/root";
const Dashboard = () => { const Networks = () => {
return ( return null;
<ServerFilter>
{(serverId) => <ShowNetworks serverId={serverId} />}
</ServerFilter>
);
}; };
export default Dashboard; export default Networks;
Dashboard.getLayout = (page: ReactElement) => { export async function getServerSideProps(ctx: GetServerSidePropsContext) {
return <DashboardLayout>{page}</DashboardLayout>; const serverId =
}; typeof ctx.query.serverId === "string" ? ctx.query.serverId : undefined;
export async function getServerSideProps( return {
ctx: GetServerSidePropsContext<{ serviceId: string }>, redirect: {
) { permanent: false,
if (IS_CLOUD) { destination: `/dashboard/docker?tab=networks${
return { serverId ? `&serverId=${encodeURIComponent(serverId)}` : ""
redirect: { }`,
permanent: true,
destination: "/dashboard/projects",
},
};
}
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
permanent: true,
destination: "/",
},
};
}
const { req } = ctx;
const helpers = createServerSideHelpers({
router: appRouter,
ctx: {
req: req as any,
res: ctx.res as any,
db: null as any,
session: session as any,
user: user as any,
}, },
transformer: superjson, };
});
try {
await helpers.project.all.prefetch();
if (user.role === "member") {
const userR = await helpers.user.one.fetch({
userId: user.id,
});
if (!userR?.canAccessToDocker) {
return {
redirect: {
permanent: true,
destination: "/",
},
};
}
}
await helpers.network.all.prefetch({});
return {
props: {
trpcState: helpers.dehydrate(),
},
};
} catch {
return {
props: {},
};
}
} }
+13 -86
View File
@@ -1,94 +1,21 @@
import { validateRequest } from "@dokploy/server/lib/auth";
import { createServerSideHelpers } from "@trpc/react-query/server";
import type { GetServerSidePropsContext } from "next"; import type { GetServerSidePropsContext } from "next";
import type { ReactElement } from "react";
import superjson from "superjson";
import { ShowSwarmContainers } from "@/components/dashboard/swarm/containers/show-swarm-containers";
import SwarmMonitorCard from "@/components/dashboard/swarm/monitoring-card";
import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { ServerFilter } from "@/components/shared/server-filter";
import { Card } from "@/components/ui/card";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { appRouter } from "@/server/api/root";
const Dashboard = () => { const Swarm = () => {
return ( return null;
<ServerFilter>
{(serverId) => (
<div className="space-y-4">
<Tabs defaultValue="overview">
<TabsList>
<TabsTrigger value="overview">Overview</TabsTrigger>
<TabsTrigger value="containers">Containers</TabsTrigger>
</TabsList>
<TabsContent value="overview">
<SwarmMonitorCard serverId={serverId} />
</TabsContent>
<TabsContent value="containers">
<Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full">
<div className="rounded-xl bg-background shadow-md p-6">
<ShowSwarmContainers serverId={serverId} />
</div>
</Card>
</TabsContent>
</Tabs>
</div>
)}
</ServerFilter>
);
}; };
export default Dashboard; export default Swarm;
Dashboard.getLayout = (page: ReactElement) => { export async function getServerSideProps(ctx: GetServerSidePropsContext) {
return <DashboardLayout>{page}</DashboardLayout>; const serverId =
}; typeof ctx.query.serverId === "string" ? ctx.query.serverId : undefined;
export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
permanent: false,
destination: "/",
},
};
}
const { req, res } = ctx;
const helpers = createServerSideHelpers({ return {
router: appRouter, redirect: {
ctx: { permanent: false,
req: req as any, destination: `/dashboard/docker?tab=swarm${
res: res as any, serverId ? `&serverId=${encodeURIComponent(serverId)}` : ""
db: null as any, }`,
session: session as any,
user: user as any,
}, },
transformer: superjson, };
});
try {
await helpers.project.all.prefetch();
const userPermissions = await helpers.user.getPermissions.fetch();
if (!userPermissions?.docker.read) {
return {
redirect: {
permanent: false,
destination: "/",
},
};
}
return {
props: {
trpcState: helpers.dehydrate(),
},
};
} catch {
return {
props: {},
};
}
} }