mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-22 11:58:46 +00:00
feat(networks): implement network recreation functionality and enhance synchronization
- Added a new API endpoint for recreating Docker networks that have been removed, allowing users to restore networks directly from the Dokploy interface. - Updated the ShowNetworks and SyncNetworks components to include options for recreating networks, improving user management capabilities. - Enhanced the network synchronization process to better handle stale records, providing users with clear actions for network maintenance. - Refactored network creation logic to streamline the process and ensure consistency across network management operations.
This commit is contained in:
@@ -1,6 +1,25 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Loader2, Network, Trash2 } from "lucide-react";
|
import {
|
||||||
|
type ColumnDef,
|
||||||
|
flexRender,
|
||||||
|
getCoreRowModel,
|
||||||
|
getPaginationRowModel,
|
||||||
|
getSortedRowModel,
|
||||||
|
type PaginationState,
|
||||||
|
type SortingState,
|
||||||
|
useReactTable,
|
||||||
|
} from "@tanstack/react-table";
|
||||||
|
import type { inferRouterOutputs } from "@trpc/server";
|
||||||
|
import {
|
||||||
|
ArrowUpDown,
|
||||||
|
Loader2,
|
||||||
|
Network,
|
||||||
|
RotateCcw,
|
||||||
|
ShieldCheck,
|
||||||
|
Trash2,
|
||||||
|
} from "lucide-react";
|
||||||
|
import { useMemo, useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { HandleNetwork } from "@/components/dashboard/networks/handle-network";
|
import { HandleNetwork } from "@/components/dashboard/networks/handle-network";
|
||||||
import { ShowNetworkConfig } from "@/components/dashboard/networks/show-network-config";
|
import { ShowNetworkConfig } from "@/components/dashboard/networks/show-network-config";
|
||||||
@@ -16,6 +35,14 @@ import {
|
|||||||
CardHeader,
|
CardHeader,
|
||||||
CardTitle,
|
CardTitle,
|
||||||
} from "@/components/ui/card";
|
} from "@/components/ui/card";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "@/components/ui/select";
|
||||||
import {
|
import {
|
||||||
Table,
|
Table,
|
||||||
TableBody,
|
TableBody,
|
||||||
@@ -24,17 +51,294 @@ import {
|
|||||||
TableHeader,
|
TableHeader,
|
||||||
TableRow,
|
TableRow,
|
||||||
} from "@/components/ui/table";
|
} from "@/components/ui/table";
|
||||||
|
import type { AppRouter } from "@/server/api/root";
|
||||||
import { api } from "@/utils/api";
|
import { api } from "@/utils/api";
|
||||||
|
|
||||||
|
type NetworkRow = inferRouterOutputs<AppRouter>["network"]["all"][number];
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
/** Selected server; undefined shows the local Dokploy server */
|
/** Selected server; undefined shows the local Dokploy server */
|
||||||
serverId?: string;
|
serverId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getIpamEntries = (row: NetworkRow) =>
|
||||||
|
(row.ipam?.config ?? []).filter((c) => c.subnet || c.gateway || c.ipRange);
|
||||||
|
|
||||||
|
const SortableHeader = ({
|
||||||
|
column,
|
||||||
|
title,
|
||||||
|
}: {
|
||||||
|
column: {
|
||||||
|
getIsSorted: () => false | "asc" | "desc";
|
||||||
|
toggleSorting: (asc: boolean) => void;
|
||||||
|
};
|
||||||
|
title: string;
|
||||||
|
}) => (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
className="-ml-3 h-8"
|
||||||
|
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
|
||||||
|
>
|
||||||
|
{title}
|
||||||
|
<ArrowUpDown className="ml-2 size-4" />
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
|
||||||
export const ShowNetworks = ({ serverId }: Props) => {
|
export const ShowNetworks = ({ serverId }: Props) => {
|
||||||
const utils = api.useUtils();
|
const utils = api.useUtils();
|
||||||
|
const [verified, setVerified] = useState(false);
|
||||||
|
const [sorting, setSorting] = useState<SortingState>([
|
||||||
|
{ id: "createdAt", desc: true },
|
||||||
|
]);
|
||||||
|
const [globalFilter, setGlobalFilter] = useState("");
|
||||||
|
const [driverFilter, setDriverFilter] = useState<string>("all");
|
||||||
|
const [pagination, setPagination] = useState<PaginationState>({
|
||||||
|
pageIndex: 0,
|
||||||
|
pageSize: 10,
|
||||||
|
});
|
||||||
|
|
||||||
const { data: networks, isLoading } = api.network.all.useQuery({ serverId });
|
const { data: networks, isLoading } = api.network.all.useQuery({ serverId });
|
||||||
const { mutateAsync: removeNetwork } = api.network.remove.useMutation();
|
const { mutateAsync: removeNetwork } = api.network.remove.useMutation();
|
||||||
|
const recreateMutation = api.network.recreate.useMutation();
|
||||||
|
|
||||||
|
// Same query the Sync dialog uses; "missing" tells us which records
|
||||||
|
// no longer have a real network in Docker
|
||||||
|
const {
|
||||||
|
data: syncStatus,
|
||||||
|
isFetching: isVerifying,
|
||||||
|
refetch: refetchVerify,
|
||||||
|
} = api.network.networksToSync.useQuery({ serverId }, { enabled: verified });
|
||||||
|
|
||||||
|
const missingIds = useMemo(
|
||||||
|
() => new Set(syncStatus?.missing.map((m) => m.networkId) ?? []),
|
||||||
|
[syncStatus],
|
||||||
|
);
|
||||||
|
|
||||||
|
const onVerify = async () => {
|
||||||
|
setVerified(true);
|
||||||
|
const { data: result, error } = await refetchVerify();
|
||||||
|
if (error) {
|
||||||
|
toast.error("Error verifying networks", {
|
||||||
|
description: error.message,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!result) return;
|
||||||
|
if (result.missing.length === 0) {
|
||||||
|
toast.success("All networks exist in Docker");
|
||||||
|
} else {
|
||||||
|
toast.warning(
|
||||||
|
`${result.missing.length} network(s) no longer exist in Docker`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const filteredData = useMemo(() => {
|
||||||
|
let list = networks ?? [];
|
||||||
|
if (driverFilter !== "all") {
|
||||||
|
list = list.filter((n) => n.driver === driverFilter);
|
||||||
|
}
|
||||||
|
if (globalFilter.trim()) {
|
||||||
|
const query = globalFilter.toLowerCase();
|
||||||
|
list = list.filter(
|
||||||
|
(n) =>
|
||||||
|
n.name.toLowerCase().includes(query) ||
|
||||||
|
(n.ipam?.config ?? []).some(
|
||||||
|
(c) =>
|
||||||
|
c.subnet?.toLowerCase().includes(query) ||
|
||||||
|
c.gateway?.toLowerCase().includes(query) ||
|
||||||
|
c.ipRange?.toLowerCase().includes(query),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return list;
|
||||||
|
}, [networks, driverFilter, globalFilter]);
|
||||||
|
|
||||||
|
const columns = useMemo<ColumnDef<NetworkRow>[]>(
|
||||||
|
() => [
|
||||||
|
{
|
||||||
|
accessorKey: "name",
|
||||||
|
header: ({ column }) => <SortableHeader column={column} title="Name" />,
|
||||||
|
cell: ({ row }) => (
|
||||||
|
<div className="flex items-center gap-2 font-medium">
|
||||||
|
{row.original.name}
|
||||||
|
{verified &&
|
||||||
|
syncStatus &&
|
||||||
|
(missingIds.has(row.original.networkId) ? (
|
||||||
|
<>
|
||||||
|
<Badge variant="red">Missing in Docker</Badge>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="xs"
|
||||||
|
isLoading={recreateMutation.isPending}
|
||||||
|
onClick={async () => {
|
||||||
|
try {
|
||||||
|
await recreateMutation.mutateAsync({
|
||||||
|
networkId: row.original.networkId,
|
||||||
|
});
|
||||||
|
toast.success(
|
||||||
|
`Network "${row.original.name}" recreated in Docker`,
|
||||||
|
);
|
||||||
|
await utils.network.networksToSync.invalidate();
|
||||||
|
} catch (error) {
|
||||||
|
toast.error("Error recreating network", {
|
||||||
|
description:
|
||||||
|
error instanceof Error
|
||||||
|
? error.message
|
||||||
|
: "Unknown error",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<RotateCcw className="size-3.5" />
|
||||||
|
Recreate
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Badge variant="green">In sync</Badge>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: "driver",
|
||||||
|
header: ({ column }) => (
|
||||||
|
<SortableHeader column={column} title="Driver" />
|
||||||
|
),
|
||||||
|
cell: ({ row }) => (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Badge variant="outline">{row.original.driver}</Badge>
|
||||||
|
<span className="text-xs text-muted-foreground">
|
||||||
|
{row.original.driver === "overlay" ? "swarm" : "local"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "subnet",
|
||||||
|
accessorFn: (row) => getIpamEntries(row)[0]?.subnet ?? "",
|
||||||
|
header: ({ column }) => (
|
||||||
|
<SortableHeader column={column} title="Subnet" />
|
||||||
|
),
|
||||||
|
cell: ({ row }) => {
|
||||||
|
const ipamEntries = getIpamEntries(row.original);
|
||||||
|
if (ipamEntries.length === 0) {
|
||||||
|
return <span className="text-muted-foreground">Auto</span>;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
{ipamEntries.map((c, index) => (
|
||||||
|
<div
|
||||||
|
key={`${row.original.networkId}-ipam-${index}`}
|
||||||
|
className="flex flex-col"
|
||||||
|
>
|
||||||
|
<span>{c.subnet ?? "—"}</span>
|
||||||
|
{(c.gateway || c.ipRange) && (
|
||||||
|
<span className="text-xs text-muted-foreground">
|
||||||
|
{[
|
||||||
|
c.gateway && `gw ${c.gateway}`,
|
||||||
|
c.ipRange && `range ${c.ipRange}`,
|
||||||
|
]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join(" · ")}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: "internal",
|
||||||
|
header: ({ column }) => (
|
||||||
|
<SortableHeader column={column} title="Internal" />
|
||||||
|
),
|
||||||
|
cell: ({ row }) => (
|
||||||
|
<span className="text-muted-foreground">
|
||||||
|
{row.original.internal ? "Yes" : "No"}
|
||||||
|
</span>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: "attachable",
|
||||||
|
header: ({ column }) => (
|
||||||
|
<SortableHeader column={column} title="Attachable" />
|
||||||
|
),
|
||||||
|
cell: ({ row }) => (
|
||||||
|
<span className="text-muted-foreground">
|
||||||
|
{row.original.attachable ? "Yes" : "No"}
|
||||||
|
</span>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: "createdAt",
|
||||||
|
header: ({ column }) => (
|
||||||
|
<SortableHeader column={column} title="Created" />
|
||||||
|
),
|
||||||
|
cell: ({ row }) => (
|
||||||
|
<span className="text-muted-foreground whitespace-nowrap">
|
||||||
|
{new Date(row.original.createdAt).toLocaleDateString()}
|
||||||
|
</span>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "actions",
|
||||||
|
enableSorting: false,
|
||||||
|
header: () => <div className="text-right">Actions</div>,
|
||||||
|
cell: ({ row }) => (
|
||||||
|
<div className="flex items-center justify-end gap-3">
|
||||||
|
<ShowNetworkConfig
|
||||||
|
networkId={row.original.networkId}
|
||||||
|
networkName={row.original.name}
|
||||||
|
/>
|
||||||
|
<DialogAction
|
||||||
|
title="Delete network"
|
||||||
|
description={`The network "${row.original.name}" will be removed from Docker and Dokploy. This action cannot be undone.`}
|
||||||
|
onClick={async () => {
|
||||||
|
try {
|
||||||
|
await removeNetwork({
|
||||||
|
networkId: row.original.networkId,
|
||||||
|
});
|
||||||
|
toast.success("Network deleted");
|
||||||
|
await utils.network.all.invalidate();
|
||||||
|
await utils.network.networksToSync.invalidate();
|
||||||
|
} catch (error) {
|
||||||
|
toast.error("Error deleting network", {
|
||||||
|
description:
|
||||||
|
error instanceof Error ? error.message : "Unknown error",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon-sm"
|
||||||
|
aria-label="Delete network"
|
||||||
|
>
|
||||||
|
<Trash2 className="size-4 text-destructive" />
|
||||||
|
</Button>
|
||||||
|
</DialogAction>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[verified, syncStatus, missingIds, removeNetwork, recreateMutation, utils],
|
||||||
|
);
|
||||||
|
|
||||||
|
const table = useReactTable({
|
||||||
|
data: filteredData,
|
||||||
|
columns,
|
||||||
|
state: {
|
||||||
|
sorting,
|
||||||
|
pagination,
|
||||||
|
},
|
||||||
|
onSortingChange: setSorting,
|
||||||
|
onPaginationChange: setPagination,
|
||||||
|
getCoreRowModel: getCoreRowModel(),
|
||||||
|
getSortedRowModel: getSortedRowModel(),
|
||||||
|
getPaginationRowModel: getPaginationRowModel(),
|
||||||
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
@@ -50,6 +354,16 @@ export const ShowNetworks = ({ serverId }: Props) => {
|
|||||||
</CardDescription>
|
</CardDescription>
|
||||||
<CardAction className="self-center">
|
<CardAction className="self-center">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
|
{networks && networks.length > 0 && (
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
isLoading={isVerifying}
|
||||||
|
onClick={onVerify}
|
||||||
|
>
|
||||||
|
<ShieldCheck className="size-4" />
|
||||||
|
Verify
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
<SyncNetworks serverId={serverId} />
|
<SyncNetworks serverId={serverId} />
|
||||||
{networks && networks.length > 0 && (
|
{networks && networks.length > 0 && (
|
||||||
<HandleNetwork serverId={serverId} />
|
<HandleNetwork serverId={serverId} />
|
||||||
@@ -58,7 +372,7 @@ export const ShowNetworks = ({ serverId }: Props) => {
|
|||||||
</CardAction>
|
</CardAction>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
|
|
||||||
<CardContent className="space-y-2 py-8 border-t">
|
<CardContent className="space-y-4 py-8 border-t">
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground min-h-[45vh]">
|
<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground min-h-[45vh]">
|
||||||
<span>Loading...</span>
|
<span>Loading...</span>
|
||||||
@@ -80,118 +394,97 @@ export const ShowNetworks = ({ serverId }: Props) => {
|
|||||||
<HandleNetwork serverId={serverId} />
|
<HandleNetwork serverId={serverId} />
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="rounded-md border overflow-x-auto">
|
<>
|
||||||
<Table>
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
<TableHeader>
|
<Input
|
||||||
<TableRow>
|
placeholder="Search by name, subnet, gateway..."
|
||||||
<TableHead>Name</TableHead>
|
value={globalFilter}
|
||||||
<TableHead>Driver</TableHead>
|
onChange={(e) => setGlobalFilter(e.target.value)}
|
||||||
<TableHead>Subnet</TableHead>
|
className="max-w-xs"
|
||||||
<TableHead>Internal</TableHead>
|
/>
|
||||||
<TableHead>Attachable</TableHead>
|
<Select value={driverFilter} onValueChange={setDriverFilter}>
|
||||||
<TableHead>Created</TableHead>
|
<SelectTrigger className="w-[150px]">
|
||||||
<TableHead className="w-[100px] text-right">
|
<SelectValue placeholder="Driver" />
|
||||||
Actions
|
</SelectTrigger>
|
||||||
</TableHead>
|
<SelectContent>
|
||||||
</TableRow>
|
<SelectItem value="all">All drivers</SelectItem>
|
||||||
</TableHeader>
|
<SelectItem value="bridge">bridge</SelectItem>
|
||||||
<TableBody>
|
<SelectItem value="overlay">overlay</SelectItem>
|
||||||
{networks.map((n) => {
|
</SelectContent>
|
||||||
const ipamEntries = (n.ipam?.config ?? []).filter(
|
</Select>
|
||||||
(c) => c.subnet || c.gateway || c.ipRange,
|
</div>
|
||||||
);
|
<div className="rounded-md border overflow-x-auto">
|
||||||
return (
|
<Table>
|
||||||
<TableRow key={n.networkId}>
|
<TableHeader>
|
||||||
<TableCell className="font-medium">
|
{table.getHeaderGroups().map((headerGroup) => (
|
||||||
{n.name}
|
<TableRow key={headerGroup.id}>
|
||||||
</TableCell>
|
{headerGroup.headers.map((header) => (
|
||||||
<TableCell>
|
<TableHead key={header.id}>
|
||||||
<div className="flex items-center gap-2">
|
{header.isPlaceholder
|
||||||
<Badge variant="outline">{n.driver}</Badge>
|
? null
|
||||||
<span className="text-xs text-muted-foreground">
|
: flexRender(
|
||||||
{n.driver === "overlay" ? "swarm" : "local"}
|
header.column.columnDef.header,
|
||||||
</span>
|
header.getContext(),
|
||||||
</div>
|
)}
|
||||||
</TableCell>
|
</TableHead>
|
||||||
<TableCell>
|
))}
|
||||||
{ipamEntries.length > 0 ? (
|
</TableRow>
|
||||||
<div className="flex flex-col gap-1">
|
))}
|
||||||
{ipamEntries.map((c, index) => (
|
</TableHeader>
|
||||||
<div
|
<TableBody>
|
||||||
key={`${n.networkId}-ipam-${index}`}
|
{table.getRowModel().rows?.length ? (
|
||||||
className="flex flex-col"
|
table.getRowModel().rows.map((row) => (
|
||||||
>
|
<TableRow key={row.id}>
|
||||||
<span>{c.subnet ?? "—"}</span>
|
{row.getVisibleCells().map((cell) => (
|
||||||
{(c.gateway || c.ipRange) && (
|
<TableCell key={cell.id}>
|
||||||
<span className="text-xs text-muted-foreground">
|
{flexRender(
|
||||||
{[
|
cell.column.columnDef.cell,
|
||||||
c.gateway && `gw ${c.gateway}`,
|
cell.getContext(),
|
||||||
c.ipRange && `range ${c.ipRange}`,
|
)}
|
||||||
]
|
</TableCell>
|
||||||
.filter(Boolean)
|
))}
|
||||||
.join(" · ")}
|
</TableRow>
|
||||||
</span>
|
))
|
||||||
)}
|
) : (
|
||||||
</div>
|
<TableRow>
|
||||||
))}
|
<TableCell
|
||||||
</div>
|
colSpan={columns.length}
|
||||||
) : (
|
className="h-24 text-center text-muted-foreground"
|
||||||
<span className="text-muted-foreground">
|
>
|
||||||
Auto
|
No networks match your filters.
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell className="text-muted-foreground">
|
|
||||||
{n.internal ? "Yes" : "No"}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell className="text-muted-foreground">
|
|
||||||
{n.attachable ? "Yes" : "No"}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell className="text-muted-foreground">
|
|
||||||
{new Date(n.createdAt).toLocaleDateString()}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell>
|
|
||||||
<div className="flex items-center justify-end gap-3">
|
|
||||||
<ShowNetworkConfig
|
|
||||||
networkId={n.networkId}
|
|
||||||
networkName={n.name}
|
|
||||||
/>
|
|
||||||
<DialogAction
|
|
||||||
title="Delete network"
|
|
||||||
description={`The network "${n.name}" will be removed from Docker and Dokploy. This action cannot be undone.`}
|
|
||||||
onClick={async () => {
|
|
||||||
try {
|
|
||||||
await removeNetwork({
|
|
||||||
networkId: n.networkId,
|
|
||||||
});
|
|
||||||
toast.success("Network deleted");
|
|
||||||
await utils.network.all.invalidate();
|
|
||||||
} catch (error) {
|
|
||||||
toast.error("Error deleting network", {
|
|
||||||
description:
|
|
||||||
error instanceof Error
|
|
||||||
? error.message
|
|
||||||
: "Unknown error",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
variant="ghost"
|
|
||||||
size="icon-sm"
|
|
||||||
aria-label="Delete network"
|
|
||||||
>
|
|
||||||
<Trash2 className="size-4 text-destructive" />
|
|
||||||
</Button>
|
|
||||||
</DialogAction>
|
|
||||||
</div>
|
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
);
|
)}
|
||||||
})}
|
</TableBody>
|
||||||
</TableBody>
|
</Table>
|
||||||
</Table>
|
</div>
|
||||||
</div>
|
{table.getPageCount() > 1 && (
|
||||||
|
<div className="flex items-center justify-end gap-4">
|
||||||
|
<span className="text-sm text-muted-foreground">
|
||||||
|
Page {table.getState().pagination.pageIndex + 1} of{" "}
|
||||||
|
{table.getPageCount()}
|
||||||
|
</span>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => table.previousPage()}
|
||||||
|
disabled={!table.getCanPreviousPage()}
|
||||||
|
>
|
||||||
|
Previous
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => table.nextPage()}
|
||||||
|
disabled={!table.getCanNextPage()}
|
||||||
|
>
|
||||||
|
Next
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Loader2, RefreshCw, Trash2 } from "lucide-react";
|
import { Loader2, RefreshCw, RotateCcw, Trash2 } from "lucide-react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { AlertBlock } from "@/components/shared/alert-block";
|
import { AlertBlock } from "@/components/shared/alert-block";
|
||||||
@@ -20,13 +20,9 @@ import { Separator } from "@/components/ui/separator";
|
|||||||
import { api } from "@/utils/api";
|
import { api } from "@/utils/api";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
/** Target server; undefined syncs the local Dokploy server */
|
|
||||||
serverId?: string;
|
serverId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compares the Docker daemon's networks against Dokploy's records:
|
|
||||||
// networks that only exist in Docker can be imported, and records whose
|
|
||||||
// network no longer exists in Docker can be cleaned up.
|
|
||||||
export const SyncNetworks = ({ serverId }: Props) => {
|
export const SyncNetworks = ({ serverId }: Props) => {
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [selected, setSelected] = useState<Set<string>>(new Set());
|
const [selected, setSelected] = useState<Set<string>>(new Set());
|
||||||
@@ -37,6 +33,7 @@ export const SyncNetworks = ({ serverId }: Props) => {
|
|||||||
|
|
||||||
const importMutation = api.network.import.useMutation();
|
const importMutation = api.network.import.useMutation();
|
||||||
const removeMutation = api.network.remove.useMutation();
|
const removeMutation = api.network.remove.useMutation();
|
||||||
|
const recreateMutation = api.network.recreate.useMutation();
|
||||||
|
|
||||||
const toggleSelected = (name: string) => {
|
const toggleSelected = (name: string) => {
|
||||||
setSelected((prev) => {
|
setSelected((prev) => {
|
||||||
@@ -91,6 +88,20 @@ export const SyncNetworks = ({ serverId }: Props) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onRecreate = async (networkId: string, name: string) => {
|
||||||
|
try {
|
||||||
|
await recreateMutation.mutateAsync({ networkId });
|
||||||
|
toast.success(`Network "${name}" recreated in Docker`);
|
||||||
|
await utils.network.all.invalidate();
|
||||||
|
await utils.network.networksToSync.invalidate();
|
||||||
|
await refetch();
|
||||||
|
} catch (error) {
|
||||||
|
toast.error("Error recreating network", {
|
||||||
|
description: error instanceof Error ? error.message : "Unknown error",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog
|
<Dialog
|
||||||
open={open}
|
open={open}
|
||||||
@@ -183,17 +194,30 @@ export const SyncNetworks = ({ serverId }: Props) => {
|
|||||||
className="flex items-center justify-between gap-3 rounded-lg border border-dashed p-3"
|
className="flex items-center justify-between gap-3 rounded-lg border border-dashed p-3"
|
||||||
>
|
>
|
||||||
<span className="text-sm">{stale.name}</span>
|
<span className="text-sm">{stale.name}</span>
|
||||||
<Button
|
<div className="flex items-center gap-2">
|
||||||
variant="ghost"
|
<Button
|
||||||
size="icon-sm"
|
variant="outline"
|
||||||
aria-label={`Remove stale record ${stale.name}`}
|
size="xs"
|
||||||
isLoading={removeMutation.isPending}
|
isLoading={recreateMutation.isPending}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
onRemoveStale(stale.networkId, stale.name)
|
onRecreate(stale.networkId, stale.name)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Trash2 className="size-4 text-destructive" />
|
<RotateCcw className="size-3.5" />
|
||||||
</Button>
|
Recreate
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon-sm"
|
||||||
|
aria-label={`Remove stale record ${stale.name}`}
|
||||||
|
isLoading={removeMutation.isPending}
|
||||||
|
onClick={() =>
|
||||||
|
onRemoveStale(stale.networkId, stale.name)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<Trash2 className="size-4 text-destructive" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
findNetworksToSync,
|
findNetworksToSync,
|
||||||
importDockerNetworks,
|
importDockerNetworks,
|
||||||
inspectNetwork,
|
inspectNetwork,
|
||||||
|
recreateNetwork,
|
||||||
removeNetwork,
|
removeNetwork,
|
||||||
} from "@dokploy/server";
|
} from "@dokploy/server";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
@@ -88,6 +89,19 @@ export const networkRouter = createTRPCRouter({
|
|||||||
return inspectNetwork(input.networkId);
|
return inspectNetwork(input.networkId);
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
recreate: protectedProcedure
|
||||||
|
.input(apiFindOneNetwork)
|
||||||
|
.mutation(async ({ ctx, input }) => {
|
||||||
|
const network = await findNetworkById(input.networkId);
|
||||||
|
if (network.organizationId !== ctx.session.activeOrganizationId) {
|
||||||
|
throw new TRPCError({
|
||||||
|
code: "NOT_FOUND",
|
||||||
|
message: "Network not found",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return recreateNetwork(input.networkId);
|
||||||
|
}),
|
||||||
|
|
||||||
remove: protectedProcedure
|
remove: protectedProcedure
|
||||||
.input(apiRemoveNetwork)
|
.input(apiRemoveNetwork)
|
||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
|
|||||||
@@ -224,44 +224,7 @@ export const createNetwork = async (
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const ipam = row.ipam ?? {};
|
await createDockerNetworkFromRow(row);
|
||||||
const ipamConfig = (ipam.config ?? [])
|
|
||||||
.map((c) => {
|
|
||||||
const entry: Record<string, string> = {};
|
|
||||||
if (c.subnet) entry.Subnet = c.subnet;
|
|
||||||
if (c.gateway) entry.Gateway = c.gateway;
|
|
||||||
if (c.ipRange) entry.IPRange = c.ipRange;
|
|
||||||
return entry;
|
|
||||||
})
|
|
||||||
.filter((e) => Object.keys(e).length > 0);
|
|
||||||
|
|
||||||
const docker = await getRemoteDocker(input.serverId ?? null);
|
|
||||||
try {
|
|
||||||
await docker.createNetwork({
|
|
||||||
Name: row.name,
|
|
||||||
Driver: row.driver,
|
|
||||||
CheckDuplicate: true,
|
|
||||||
Internal: row.internal,
|
|
||||||
Attachable: row.attachable,
|
|
||||||
// EnableIPv4 is missing from dockerode's types but supported by
|
|
||||||
// the daemon (API >= 1.47); the body is sent as-is
|
|
||||||
EnableIPv4: row.enableIPv4,
|
|
||||||
EnableIPv6: row.enableIPv6,
|
|
||||||
IPAM: {
|
|
||||||
Driver: ipam.driver || "default",
|
|
||||||
Config: ipamConfig.length > 0 ? ipamConfig : undefined,
|
|
||||||
},
|
|
||||||
} as Parameters<typeof docker.createNetwork>[0]);
|
|
||||||
} catch (error) {
|
|
||||||
throw new TRPCError({
|
|
||||||
code: "BAD_REQUEST",
|
|
||||||
message:
|
|
||||||
error instanceof Error
|
|
||||||
? error.message
|
|
||||||
: "Failed to create Docker network",
|
|
||||||
cause: error,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return row;
|
return row;
|
||||||
});
|
});
|
||||||
@@ -269,6 +232,55 @@ export const createNetwork = async (
|
|||||||
return created;
|
return created;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const createDockerNetworkFromRow = async (row: typeof network.$inferSelect) => {
|
||||||
|
const ipam = row.ipam ?? {};
|
||||||
|
const ipamConfig = (ipam.config ?? [])
|
||||||
|
.map((c) => {
|
||||||
|
const entry: Record<string, string> = {};
|
||||||
|
if (c.subnet) entry.Subnet = c.subnet;
|
||||||
|
if (c.gateway) entry.Gateway = c.gateway;
|
||||||
|
if (c.ipRange) entry.IPRange = c.ipRange;
|
||||||
|
return entry;
|
||||||
|
})
|
||||||
|
.filter((e) => Object.keys(e).length > 0);
|
||||||
|
|
||||||
|
const docker = await getRemoteDocker(row.serverId ?? null);
|
||||||
|
try {
|
||||||
|
await docker.createNetwork({
|
||||||
|
Name: row.name,
|
||||||
|
Driver: row.driver,
|
||||||
|
CheckDuplicate: true,
|
||||||
|
Internal: row.internal,
|
||||||
|
Attachable: row.attachable,
|
||||||
|
// EnableIPv4 is missing from dockerode's types but supported by
|
||||||
|
// the daemon (API >= 1.47); the body is sent as-is
|
||||||
|
EnableIPv4: row.enableIPv4,
|
||||||
|
EnableIPv6: row.enableIPv6,
|
||||||
|
IPAM: {
|
||||||
|
Driver: ipam.driver || "default",
|
||||||
|
Config: ipamConfig.length > 0 ? ipamConfig : undefined,
|
||||||
|
},
|
||||||
|
} as Parameters<typeof docker.createNetwork>[0]);
|
||||||
|
} catch (error) {
|
||||||
|
throw new TRPCError({
|
||||||
|
code: "BAD_REQUEST",
|
||||||
|
message:
|
||||||
|
error instanceof Error
|
||||||
|
? error.message
|
||||||
|
: "Failed to create Docker network",
|
||||||
|
cause: error,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Re-creates the Docker network from the stored record, for records whose
|
||||||
|
// network was removed from Docker outside of Dokploy
|
||||||
|
export const recreateNetwork = async (networkId: string) => {
|
||||||
|
const row = await findNetworkById(networkId);
|
||||||
|
await createDockerNetworkFromRow(row);
|
||||||
|
return row;
|
||||||
|
};
|
||||||
|
|
||||||
export const inspectNetwork = async (networkId: string) => {
|
export const inspectNetwork = async (networkId: string) => {
|
||||||
const row = await findNetworkById(networkId);
|
const row = await findNetworkById(networkId);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user