From a0566cdbd777f0d3e14052b18d1800196bbd6687 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <siumauricio@icloud.com>
Date: Sat, 21 Feb 2026 14:59:50 -0600
Subject: [PATCH] refactor: remove unused server value and update network
 handling logic

- Eliminated the unused DOKPLOY_SERVER_VALUE constant from the network handling component.
- Updated the default serverId to undefined in the network form values and adjusted related logic to ensure compatibility with cloud environments.
- Enhanced server validation in the createNetwork function to require a serverId when in cloud mode, improving error handling for network creation.
---
 .../dashboard/networks/handle-network.tsx     | 13 +++++--------
 packages/server/src/services/network.ts       | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/apps/dokploy/components/dashboard/networks/handle-network.tsx b/apps/dokploy/components/dashboard/networks/handle-network.tsx
index 8af7db795..86d328b8e 100644
--- a/apps/dokploy/components/dashboard/networks/handle-network.tsx
+++ b/apps/dokploy/components/dashboard/networks/handle-network.tsx
@@ -48,9 +48,6 @@ const networkDriverEnum = [
 /** Sentinel for "no scope" */
 const SCOPE_EMPTY = "__scope_none__";
 
-/** Value for "Dokploy server" (local / no specific server). Not used in cloud. */
-const DOKPLOY_SERVER_VALUE = "__dokploy_server__";
-
 const ipamConfigEntrySchema = z.object({
 	subnet: z.string().optional(),
 	ipRange: z.string().optional(),
@@ -78,7 +75,7 @@ const defaultValues: NetworkFormValues = {
 	name: "",
 	driver: "bridge",
 	scope: SCOPE_EMPTY,
-	serverId: DOKPLOY_SERVER_VALUE,
+	serverId: undefined,
 	internal: false,
 	attachable: false,
 	ingress: false,
@@ -134,7 +131,7 @@ export const HandleNetwork = ({ networkId, children }: HandleNetworkProps) => {
 				name: network.name,
 				driver: network.driver,
 				scope: network.scope ?? SCOPE_EMPTY,
-				serverId: network.serverId ?? DOKPLOY_SERVER_VALUE,
+				serverId: network.serverId || undefined,
 				internal: network.internal,
 				attachable: network.attachable,
 				enableIPv4: network.enableIPv4,
@@ -157,7 +154,7 @@ export const HandleNetwork = ({ networkId, children }: HandleNetworkProps) => {
 				name: data.name,
 				driver: data.driver,
 				scope,
-				serverId: data.serverId ?? undefined,
+				serverId: data.serverId || undefined,
 				internal: data.internal,
 				attachable: data.attachable,
 				ingress: data.ingress,
@@ -268,7 +265,7 @@ export const HandleNetwork = ({ networkId, children }: HandleNetworkProps) => {
 										<FormLabel>Server</FormLabel>
 										<Select
 											onValueChange={field.onChange}
-											value={field.value ?? DOKPLOY_SERVER_VALUE}
+											value={field.value ?? undefined}
 										>
 											<FormControl>
 												<SelectTrigger>
@@ -277,7 +274,7 @@ export const HandleNetwork = ({ networkId, children }: HandleNetworkProps) => {
 											</FormControl>
 											<SelectContent>
 												{!isCloud && (
-													<SelectItem value={DOKPLOY_SERVER_VALUE}>
+													<SelectItem value={undefined}>
 														Dokploy server
 													</SelectItem>
 												)}
diff --git a/packages/server/src/services/network.ts b/packages/server/src/services/network.ts
index a6879bed9..a5a515e1e 100644
--- a/packages/server/src/services/network.ts
+++ b/packages/server/src/services/network.ts
@@ -6,6 +6,7 @@ import {
 } from "@dokploy/server/db/schema";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
+import { IS_CLOUD } from "../constants";
 import { getRemoteDocker } from "../utils/servers/remote-docker";
 
 export const findNetworkById = async (networkId: string) => {
@@ -29,6 +30,13 @@ export const createNetwork = async (
 	input: typeof apiCreateNetwork._type,
 	organizationId: string,
 ) => {
+	if (IS_CLOUD)
+		if (!input.serverId) {
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				message: "Server is required",
+			});
+		}
 	const created = await db.transaction(async (tx) => {
 		const [row] = await tx
 			.insert(network)
@@ -64,13 +72,10 @@ export const createNetwork = async (
 			Attachable: row.attachable,
 			Ingress: row.ingress,
 			EnableIPv6: row.enableIPv6,
-			IPAM:
-				ipamConfig.length > 0 || ipam.driver
-					? {
-							Driver: ipam.driver ?? "default",
-							Config: ipamConfig.length > 0 ? ipamConfig : undefined,
-						}
-					: undefined,
+			IPAM: {
+				Driver: ipam.driver ?? "default",
+				Config: ipamConfig.length > 0 ? ipamConfig : undefined,
+			},
 		});
 
 		return row;