refactor(add-domain): remove debug log statement from AddDomain component

CONTRIBUTING.md

@@ -52,7 +52,7 @@ feat: add new feature
 
 Before you start, please make the clone based on the `canary` branch, since the `main` branch is the source of truth and should always reflect the latest stable release, also the PRs will be merged to the `canary` branch.
 
-We use Node v20.9.0 and recommend this specific version. If you have nvm installed, you can run `nvm install 20.9.0 && nvm use` in the root directory.
+We use Node v20.9.0
 
 ```bash
 git clone https://github.com/dokploy/dokploy.git
@@ -87,8 +87,6 @@ pnpm run dokploy:dev
 
 Go to http://localhost:3000 to see the development server
 
-Note: this project uses Biome. If your editor is configured to use another formatter such as Prettier, it's recommended to either change it to use Biome or turn it off.
-
 ## Build
 
 ```bash
@@ -147,9 +145,11 @@ curl -sSL https://railpack.com/install.sh | sh
 
 ```bash
 # Install Buildpacks
-curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.35.0/pack-v0.35.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
+curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.32.1-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
 ```
 
+
+
 ## Pull Request
 
 - The `main` branch is the source of truth and should always reflect the latest stable release.
@@ -167,6 +167,7 @@ Thank you for your contribution!
 
 To add a new template, go to `https://github.com/Dokploy/templates` repository and read the README.md file.
 
+
 ### Recommendations
 
 - Use the same name of the folder as the id of the template.

Dockerfile

@@ -49,7 +49,7 @@ RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm
 # Install Nixpacks and tsx
 # | VERBOSE=1 VERSION=1.21.0 bash
 
-ARG NIXPACKS_VERSION=1.35.0
+ARG NIXPACKS_VERSION=1.29.1
 RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
     && chmod +x install.sh \
     && ./install.sh \

apps/dokploy/__test__/drop/drop.test.test.ts

@@ -34,9 +34,7 @@ const baseApp: ApplicationNested = {
 	giteaRepository: "",
 	cleanCache: false,
 	watchPaths: [],
-	enableSubmodules: false,
 	applicationStatus: "done",
-	triggerType: "push",
 	appName: "",
 	autoDeploy: true,
 	serverId: "",

apps/dokploy/__test__/templates/config.template.test.ts

@@ -51,35 +51,6 @@ describe("processTemplate", () => {
 			expect(result.domains).toHaveLength(0);
 			expect(result.mounts).toHaveLength(0);
 		});
-
-		it("should allow creation of real jwt secret", () => {
-			const template: CompleteTemplate = {
-				metadata: {} as any,
-				variables: {
-					jwt_secret: "cQsdycq1hDLopQonF6jUTqgQc5WEZTwWLL02J6XJ",
-					anon_payload: JSON.stringify({
-						role: "tester",
-						iss: "dockploy",
-						iat: "${timestamps:2025-01-01T00:00:00Z}",
-						exp: "${timestamps:2030-01-01T00:00:00Z}",
-					}),
-					anon_key: "${jwt:jwt_secret:anon_payload}",
-				},
-				config: {
-					domains: [],
-					env: {
-						ANON_KEY: "${anon_key}",
-					},
-				},
-			};
-			const result = processTemplate(template, mockSchema);
-			expect(result.envs).toHaveLength(1);
-			expect(result.envs).toContain(
-				"ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOiIxNzM1Njg5NjAwIiwiZXhwIjoiMTg5MzQ1NjAwMCIsInJvbGUiOiJ0ZXN0ZXIiLCJpc3MiOiJkb2NrcGxveSJ9.BG5JoxL2_NaTFbPgyZdm3kRWenf_O3su_HIRKGCJ_kY",
-			);
-			expect(result.mounts).toHaveLength(0);
-			expect(result.domains).toHaveLength(0);
-		});
 	});
 
 	describe("domains processing", () => {

apps/dokploy/__test__/templates/helpers.template.test.ts

@@ -1,232 +0,0 @@
-import type { Schema } from "@dokploy/server/templates";
-import { processValue } from "@dokploy/server/templates/processors";
-import { describe, expect, it } from "vitest";
-
-describe("helpers functions", () => {
-	// Mock schema for testing
-	const mockSchema: Schema = {
-		projectName: "test",
-		serverIp: "127.0.0.1",
-	};
-	// some helpers to test jwt
-	type JWTParts = [string, string, string];
-	const jwtMatchExp = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+$/;
-	const jwtBase64Decode = (str: string) => {
-		const base64 = str.replace(/-/g, "+").replace(/_/g, "/");
-		const padding = "=".repeat((4 - (base64.length % 4)) % 4);
-		const decoded = Buffer.from(base64 + padding, "base64").toString("utf-8");
-		return JSON.parse(decoded);
-	};
-	const jwtCheckHeader = (jwtHeader: string) => {
-		const decodedHeader = jwtBase64Decode(jwtHeader);
-		expect(decodedHeader).toHaveProperty("alg");
-		expect(decodedHeader).toHaveProperty("typ");
-		expect(decodedHeader.alg).toEqual("HS256");
-		expect(decodedHeader.typ).toEqual("JWT");
-	};
-
-	describe("${domain}", () => {
-		it("should generate a random domain", () => {
-			const domain = processValue("${domain}", {}, mockSchema);
-			expect(domain.startsWith(`${mockSchema.projectName}-`)).toBeTruthy();
-			expect(
-				domain.endsWith(
-					`${mockSchema.serverIp.replaceAll(".", "-")}.traefik.me`,
-				),
-			).toBeTruthy();
-		});
-	});
-
-	describe("${base64}", () => {
-		it("should generate a base64 string", () => {
-			const base64 = processValue("${base64}", {}, mockSchema);
-			expect(base64).toMatch(/^[A-Za-z0-9+=/]+={0,2}$/);
-		});
-		it.each([
-			[4, 8],
-			[8, 12],
-			[16, 24],
-			[32, 44],
-			[64, 88],
-			[128, 172],
-		])(
-			"should generate a base64 string from parameter %d bytes length",
-			(length, finalLength) => {
-				const base64 = processValue(`\${base64:${length}}`, {}, mockSchema);
-				expect(base64).toMatch(/^[A-Za-z0-9+=/]+={0,2}$/);
-				expect(base64.length).toBe(finalLength);
-			},
-		);
-	});
-
-	describe("${password}", () => {
-		it("should generate a password string", () => {
-			const password = processValue("${password}", {}, mockSchema);
-			expect(password).toMatch(/^[A-Za-z0-9]+$/);
-		});
-		it.each([6, 8, 12, 16, 32])(
-			"should generate a password string respecting parameter %d length",
-			(length) => {
-				const password = processValue(`\${password:${length}}`, {}, mockSchema);
-				expect(password).toMatch(/^[A-Za-z0-9]+$/);
-				expect(password.length).toBe(length);
-			},
-		);
-	});
-
-	describe("${hash}", () => {
-		it("should generate a hash string", () => {
-			const hash = processValue("${hash}", {}, mockSchema);
-			expect(hash).toMatch(/^[A-Za-z0-9]+$/);
-		});
-		it.each([6, 8, 12, 16, 32])(
-			"should generate a hash string respecting parameter %d length",
-			(length) => {
-				const hash = processValue(`\${hash:${length}}`, {}, mockSchema);
-				expect(hash).toMatch(/^[A-Za-z0-9]+$/);
-				expect(hash.length).toBe(length);
-			},
-		);
-	});
-
-	describe("${uuid}", () => {
-		it("should generate a UUID string", () => {
-			const uuid = processValue("${uuid}", {}, mockSchema);
-			expect(uuid).toMatch(
-				/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
-			);
-		});
-	});
-
-	describe("${timestamp}", () => {
-		it("should generate a timestamp string in milliseconds", () => {
-			const timestamp = processValue("${timestamp}", {}, mockSchema);
-			const nowLength = Math.floor(Date.now()).toString().length;
-			expect(timestamp).toMatch(/^\d+$/);
-			expect(timestamp.length).toBe(nowLength);
-		});
-	});
-	describe("${timestampms}", () => {
-		it("should generate a timestamp string in milliseconds", () => {
-			const timestamp = processValue("${timestampms}", {}, mockSchema);
-			const nowLength = Date.now().toString().length;
-			expect(timestamp).toMatch(/^\d+$/);
-			expect(timestamp.length).toBe(nowLength);
-		});
-		it("should generate a timestamp string in milliseconds from parameter", () => {
-			const timestamp = processValue(
-				"${timestampms:2025-01-01}",
-				{},
-				mockSchema,
-			);
-			expect(timestamp).toEqual("1735689600000");
-		});
-	});
-	describe("${timestamps}", () => {
-		it("should generate a timestamp string in seconds", () => {
-			const timestamps = processValue("${timestamps}", {}, mockSchema);
-			const nowLength = Math.floor(Date.now() / 1000).toString().length;
-			expect(timestamps).toMatch(/^\d+$/);
-			expect(timestamps.length).toBe(nowLength);
-		});
-		it("should generate a timestamp string in seconds from parameter", () => {
-			const timestamps = processValue(
-				"${timestamps:2025-01-01}",
-				{},
-				mockSchema,
-			);
-			expect(timestamps).toEqual("1735689600");
-		});
-	});
-
-	describe("${randomPort}", () => {
-		it("should generate a random port string", () => {
-			const randomPort = processValue("${randomPort}", {}, mockSchema);
-			expect(randomPort).toMatch(/^\d+$/);
-			expect(Number(randomPort)).toBeLessThan(65536);
-		});
-	});
-
-	describe("${username}", () => {
-		it("should generate a username string", () => {
-			const username = processValue("${username}", {}, mockSchema);
-			expect(username).toMatch(/^[a-zA-Z0-9._-]{3,}$/);
-		});
-	});
-
-	describe("${email}", () => {
-		it("should generate an email string", () => {
-			const email = processValue("${email}", {}, mockSchema);
-			expect(email).toMatch(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/);
-		});
-	});
-
-	describe("${jwt}", () => {
-		it("should generate a JWT string", () => {
-			const jwt = processValue("${jwt}", {}, mockSchema);
-			expect(jwt).toMatch(jwtMatchExp);
-			const parts = jwt.split(".") as JWTParts;
-			const decodedPayload = jwtBase64Decode(parts[1]);
-			jwtCheckHeader(parts[0]);
-			expect(decodedPayload).toHaveProperty("iat");
-			expect(decodedPayload).toHaveProperty("iss");
-			expect(decodedPayload).toHaveProperty("exp");
-			expect(decodedPayload.iss).toEqual("dokploy");
-		});
-		it.each([6, 8, 12, 16, 32])(
-			"should generate a random hex string from parameter %d byte length",
-			(length) => {
-				const jwt = processValue(`\${jwt:${length}}`, {}, mockSchema);
-				expect(jwt).toMatch(/^[A-Za-z0-9-_.]+$/);
-				expect(jwt.length).toBeGreaterThanOrEqual(length); // bytes translated to hex can take up to 2x the length
-				expect(jwt.length).toBeLessThanOrEqual(length * 2);
-			},
-		);
-	});
-	describe("${jwt:secret}", () => {
-		it("should generate a JWT string respecting parameter secret from variable", () => {
-			const jwt = processValue(
-				"${jwt:secret}",
-				{ secret: "mysecret" },
-				mockSchema,
-			);
-			expect(jwt).toMatch(jwtMatchExp);
-			const parts = jwt.split(".") as JWTParts;
-			const decodedPayload = jwtBase64Decode(parts[1]);
-			jwtCheckHeader(parts[0]);
-			expect(decodedPayload).toHaveProperty("iat");
-			expect(decodedPayload).toHaveProperty("iss");
-			expect(decodedPayload).toHaveProperty("exp");
-			expect(decodedPayload.iss).toEqual("dokploy");
-		});
-	});
-	describe("${jwt:secret:payload}", () => {
-		it("should generate a JWT string respecting parameters secret and payload from variables", () => {
-			const iat = Math.floor(new Date("2025-01-01T00:00:00Z").getTime() / 1000);
-			const expiry = iat + 3600;
-			const jwt = processValue(
-				"${jwt:secret:payload}",
-				{
-					secret: "mysecret",
-					payload: `{"iss": "test-issuer", "iat": ${iat}, "exp": ${expiry}, "customprop": "customvalue"}`,
-				},
-				mockSchema,
-			);
-			expect(jwt).toMatch(jwtMatchExp);
-			const parts = jwt.split(".") as JWTParts;
-			jwtCheckHeader(parts[0]);
-			const decodedPayload = jwtBase64Decode(parts[1]);
-			expect(decodedPayload).toHaveProperty("iat");
-			expect(decodedPayload.iat).toEqual(iat);
-			expect(decodedPayload).toHaveProperty("iss");
-			expect(decodedPayload.iss).toEqual("test-issuer");
-			expect(decodedPayload).toHaveProperty("exp");
-			expect(decodedPayload.exp).toEqual(expiry);
-			expect(decodedPayload).toHaveProperty("customprop");
-			expect(decodedPayload.customprop).toEqual("customvalue");
-			expect(jwt).toEqual(
-				"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE3MzU2ODk2MDAsImV4cCI6MTczNTY5MzIwMCwiaXNzIjoidGVzdC1pc3N1ZXIiLCJjdXN0b21wcm9wIjoiY3VzdG9tdmFsdWUifQ.m42U7PZSUSCf7gBOJrxJir0rQmyPq4rA59Dydr_QahI",
-			);
-		});
-	});
-});

apps/dokploy/__test__/traefik/traefik.test.ts

@@ -16,7 +16,6 @@ const baseApp: ApplicationNested = {
 	applicationStatus: "done",
 	appName: "",
 	autoDeploy: true,
-	enableSubmodules: false,
 	serverId: "",
 	branch: null,
 	dockerBuildStage: "",
@@ -25,7 +24,6 @@ const baseApp: ApplicationNested = {
 	buildArgs: null,
 	isPreviewDeploymentsActive: false,
 	previewBuildArgs: null,
-	triggerType: "push",
 	previewCertificateType: "none",
 	previewEnv: null,
 	previewHttps: false,

apps/dokploy/components/dashboard/application/domains/add-domain.tsx

@@ -274,11 +274,6 @@ export const AddDomain = ({
 										return (
 											<FormItem>
 												<FormLabel>Container Port</FormLabel>
-												<FormDescription>
-													The port where your application is running inside the
-													container (e.g., 3000 for Node.js, 80 for Nginx, 8080
-													for Java)
-												</FormDescription>
 												<FormControl>
 													<NumberInput placeholder={"3000"} {...field} />
 												</FormControl>

apps/dokploy/components/dashboard/application/domains/show-domains.tsx

@@ -8,49 +8,16 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { api } from "@/utils/api";
-import {
-	CheckCircle2,
-	ExternalLink,
-	GlobeIcon,
-	InfoIcon,
-	Loader2,
-	PenBoxIcon,
-	RefreshCw,
-	Trash2,
-	XCircle,
-} from "lucide-react";
+import { ExternalLink, GlobeIcon, PenBoxIcon, Trash2 } from "lucide-react";
 import Link from "next/link";
 import { toast } from "sonner";
 import { AddDomain } from "./add-domain";
-import { useState } from "react";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
-import type { ValidationStates } from "../../compose/domains/show-domains";
-import { DnsHelperModal } from "../../compose/domains/dns-helper-modal";
-import { Badge } from "@/components/ui/badge";
 
 interface Props {
 	applicationId: string;
 }
 
 export const ShowDomains = ({ applicationId }: Props) => {
-	const { data: application } = api.application.one.useQuery(
-		{
-			applicationId,
-		},
-		{
-			enabled: !!applicationId,
-		},
-	);
-	const [validationStates, setValidationStates] = useState<ValidationStates>(
-		{},
-	);
-	const { data: ip } = api.settings.getIp.useQuery();
-
 	const { data, refetch } = api.domain.byApplicationId.useQuery(
 		{
 			applicationId,
@@ -59,47 +26,10 @@ export const ShowDomains = ({ applicationId }: Props) => {
 			enabled: !!applicationId,
 		},
 	);
-	const { mutateAsync: validateDomain } =
-		api.domain.validateDomain.useMutation();
+
 	const { mutateAsync: deleteDomain, isLoading: isRemoving } =
 		api.domain.delete.useMutation();
 
-	const handleValidateDomain = async (host: string) => {
-		setValidationStates((prev) => ({
-			...prev,
-			[host]: { isLoading: true },
-		}));
-
-		try {
-			const result = await validateDomain({
-				domain: host,
-				serverIp:
-					application?.server?.ipAddress?.toString() || ip?.toString() || "",
-			});
-
-			setValidationStates((prev) => ({
-				...prev,
-				[host]: {
-					isLoading: false,
-					isValid: result.isValid,
-					error: result.error,
-					resolvedIp: result.resolvedIp,
-					message: result.error && result.isValid ? result.error : undefined,
-				},
-			}));
-		} catch (err) {
-			const error = err as Error;
-			setValidationStates((prev) => ({
-				...prev,
-				[host]: {
-					isLoading: false,
-					isValid: false,
-					error: error.message || "Failed to validate domain",
-				},
-			}));
-		}
-	};
-
 	return (
 		<div className="flex w-full flex-col gap-5 ">
 			<Card className="bg-background">
@@ -138,208 +68,73 @@ export const ShowDomains = ({ applicationId }: Props) => {
 							</div>
 						</div>
 					) : (
-						<div className="grid grid-cols-1 gap-4 xl:grid-cols-2 w-full">
+						<div className="flex w-full flex-col gap-4">
 							{data?.map((item) => {
-								const validationState = validationStates[item.host];
 								return (
-									<Card
+									<div
 										key={item.domainId}
-										className="relative overflow-hidden w-full border bg-card transition-all hover:shadow-md bg-transparent"
+										className="flex w-full items-center justify-between gap-4 border p-4 md:px-6 rounded-lg flex-wrap"
 									>
-										<CardContent className="p-6">
-											<div className="flex flex-col gap-4">
-												{/* Service & Domain Info */}
-												<div className="flex items-start justify-between">
-													<div className="flex flex-col gap-2">
-														<Link
-															className="flex items-center gap-2 text-base font-medium hover:underline"
-															target="_blank"
-															href={`${item.https ? "https" : "http"}://${item.host}${item.path}`}
-														>
-															{item.host}
-															<ExternalLink className="size-4" />
-														</Link>
-													</div>
-													<div className="flex gap-2">
-														{!item.host.includes("traefik.me") && (
-															<DnsHelperModal
-																domain={{
-																	host: item.host,
-																	https: item.https,
-																	path: item.path || undefined,
-																}}
-																serverIp={
-																	application?.server?.ipAddress?.toString() ||
-																	ip?.toString()
-																}
-															/>
-														)}
-														<AddDomain
-															applicationId={applicationId}
-															domainId={item.domainId}
-														>
-															<Button
-																variant="ghost"
-																size="icon"
-																className="group hover:bg-blue-500/10"
-															>
-																<PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" />
-															</Button>
-														</AddDomain>
-														<DialogAction
-															title="Delete Domain"
-															description="Are you sure you want to delete this domain?"
-															type="destructive"
-															onClick={async () => {
-																await deleteDomain({
-																	domainId: item.domainId,
-																})
-																	.then((_data) => {
-																		refetch();
-																		toast.success(
-																			"Domain deleted successfully",
-																		);
-																	})
-																	.catch(() => {
-																		toast.error("Error deleting domain");
-																	});
-															}}
-														>
-															<Button
-																variant="ghost"
-																size="icon"
-																className="group hover:bg-red-500/10"
-																isLoading={isRemoving}
-															>
-																<Trash2 className="size-4 text-primary group-hover:text-red-500" />
-															</Button>
-														</DialogAction>
-													</div>
-												</div>
+										<Link
+											className="md:basis-1/2 flex gap-2  items-center hover:underline transition-all w-full"
+											target="_blank"
+											href={`${item.https ? "https" : "http"}://${item.host}${item.path}`}
+										>
+											<span className="truncate max-w-full text-sm">
+												{item.host}
+											</span>
+											<ExternalLink className="size-4 min-w-4" />
+										</Link>
 
-												{/* Domain Details */}
-												<div className="flex flex-wrap gap-3">
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge variant="secondary">
-																	<InfoIcon className="size-3 mr-1" />
-																	Path: {item.path || "/"}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent>
-																<p>URL path for this service</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge variant="secondary">
-																	<InfoIcon className="size-3 mr-1" />
-																	Port: {item.port}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent>
-																<p>Container port exposed</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge
-																	variant={item.https ? "outline" : "secondary"}
-																>
-																	{item.https ? "HTTPS" : "HTTP"}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent>
-																<p>
-																	{item.https
-																		? "Secure HTTPS connection"
-																		: "Standard HTTP connection"}
-																</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-
-													{item.certificateType && (
-														<TooltipProvider>
-															<Tooltip>
-																<TooltipTrigger asChild>
-																	<Badge variant="outline">
-																		Cert: {item.certificateType}
-																	</Badge>
-																</TooltipTrigger>
-																<TooltipContent>
-																	<p>SSL Certificate Provider</p>
-																</TooltipContent>
-															</Tooltip>
-														</TooltipProvider>
-													)}
-
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge
-																	variant="outline"
-																	className={
-																		validationState?.isValid
-																			? "bg-green-500/10 text-green-500 cursor-pointer"
-																			: validationState?.error
-																				? "bg-red-500/10 text-red-500 cursor-pointer"
-																				: "bg-yellow-500/10 text-yellow-500 cursor-pointer"
-																	}
-																	onClick={() =>
-																		handleValidateDomain(item.host)
-																	}
-																>
-																	{validationState?.isLoading ? (
-																		<>
-																			<Loader2 className="size-3 mr-1 animate-spin" />
-																			Checking DNS...
-																		</>
-																	) : validationState?.isValid ? (
-																		<>
-																			<CheckCircle2 className="size-3 mr-1" />
-																			{validationState.message
-																				? "Behind Cloudflare"
-																				: "DNS Valid"}
-																		</>
-																	) : validationState?.error ? (
-																		<>
-																			<XCircle className="size-3 mr-1" />
-																			{validationState.error}
-																		</>
-																	) : (
-																		<>
-																			<RefreshCw className="size-3 mr-1" />
-																			Validate DNS
-																		</>
-																	)}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent className="max-w-xs">
-																{validationState?.error ? (
-																	<div className="flex flex-col gap-1">
-																		<p className="font-medium text-red-500">
-																			Error:
-																		</p>
-																		<p>{validationState.error}</p>
-																	</div>
-																) : (
-																	"Click to validate DNS configuration"
-																)}
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-												</div>
+										<div className="flex gap-8">
+											<div className="flex gap-8 opacity-50 items-center h-10 text-center text-sm font-medium">
+												<span>{item.path}</span>
+												<span>{item.port}</span>
+												<span>{item.https ? "HTTPS" : "HTTP"}</span>
 											</div>
-										</CardContent>
-									</Card>
+
+											<div className="flex gap-2">
+												<AddDomain
+													applicationId={applicationId}
+													domainId={item.domainId}
+												>
+													<Button
+														variant="ghost"
+														size="icon"
+														className="group hover:bg-blue-500/10 "
+													>
+														<PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" />
+													</Button>
+												</AddDomain>
+												<DialogAction
+													title="Delete Domain"
+													description="Are you sure you want to delete this domain?"
+													type="destructive"
+													onClick={async () => {
+														await deleteDomain({
+															domainId: item.domainId,
+														})
+															.then(() => {
+																refetch();
+																toast.success("Domain deleted successfully");
+															})
+															.catch(() => {
+																toast.error("Error deleting domain");
+															});
+													}}
+												>
+													<Button
+														variant="ghost"
+														size="icon"
+														className="group hover:bg-red-500/10"
+														isLoading={isRemoving}
+													>
+														<Trash2 className="size-4 text-primary group-hover:text-red-500" />
+													</Button>
+												</DialogAction>
+											</div>
+										</div>
+									</div>
 								);
 							})}
 						</div>

apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx

@@ -31,7 +31,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -59,7 +58,6 @@ const BitbucketProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	bitbucketId: z.string().min(1, "Bitbucket Provider is required"),
 	watchPaths: z.array(z.string()).optional(),
-	enableSubmodules: z.boolean().optional(),
 });
 
 type BitbucketProvider = z.infer<typeof BitbucketProviderSchema>;
@@ -86,7 +84,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 			bitbucketId: "",
 			branch: "",
 			watchPaths: [],
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(BitbucketProviderSchema),
 	});
@@ -133,7 +130,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 				buildPath: data.bitbucketBuildPath || "/",
 				bitbucketId: data.bitbucketId || "",
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules || false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -147,7 +143,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 			bitbucketId: data.bitbucketId,
 			applicationId,
 			watchPaths: data.watchPaths || [],
-			enableSubmodules: data.enableSubmodules || false,
 		})
 			.then(async () => {
 				toast.success("Service Provided Saved");
@@ -472,21 +467,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-								</FormItem>
-							)}
-						/>
 					</div>
 					<div className="flex w-full justify-end">
 						<Button

apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx

@@ -23,7 +23,6 @@ import {
 	TooltipProvider,
 	TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { KeyRoundIcon, LockIcon, X } from "lucide-react";
@@ -45,7 +44,6 @@ const GitProviderSchema = z.object({
 	branch: z.string().min(1, "Branch required"),
 	sshKey: z.string().optional(),
 	watchPaths: z.array(z.string()).optional(),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type GitProvider = z.infer<typeof GitProviderSchema>;
@@ -69,7 +67,6 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
 			repositoryURL: "",
 			sshKey: undefined,
 			watchPaths: [],
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GitProviderSchema),
 	});
@@ -82,7 +79,6 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
 				buildPath: data.customGitBuildPath || "/",
 				repositoryURL: data.customGitUrl || "",
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -95,7 +91,6 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
 			customGitSSHKeyId: values.sshKey === "none" ? null : values.sshKey,
 			applicationId,
 			watchPaths: values.watchPaths || [],
-			enableSubmodules: values.enableSubmodules,
 		})
 			.then(async () => {
 				toast.success("Git Provider Saved");
@@ -299,22 +294,6 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
 							</FormItem>
 						)}
 					/>
-
-					<FormField
-						control={form.control}
-						name="enableSubmodules"
-						render={({ field }) => (
-							<FormItem className="flex items-center space-x-2">
-								<FormControl>
-									<Switch
-										checked={field.value}
-										onCheckedChange={field.onChange}
-									/>
-								</FormControl>
-								<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-							</FormItem>
-						)}
-					/>
 				</div>
 
 				<div className="flex flex-row justify-end">

apps/dokploy/components/dashboard/application/general/generic/save-gitea-provider.tsx

@@ -31,7 +31,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -75,7 +74,6 @@ const GiteaProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	giteaId: z.string().min(1, "Gitea Provider is required"),
 	watchPaths: z.array(z.string()).default([]),
-	enableSubmodules: z.boolean().optional(),
 });
 
 type GiteaProvider = z.infer<typeof GiteaProviderSchema>;
@@ -101,7 +99,6 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 			giteaId: "",
 			branch: "",
 			watchPaths: [],
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GiteaProviderSchema),
 	});
@@ -155,7 +152,6 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 				buildPath: data.giteaBuildPath || "/",
 				giteaId: data.giteaId || "",
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules || false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -169,7 +165,6 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 			giteaId: data.giteaId,
 			applicationId,
 			watchPaths: data.watchPaths,
-			enableSubmodules: data.enableSubmodules || false,
 		})
 			.then(async () => {
 				toast.success("Service Provider Saved");
@@ -503,21 +498,6 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-								</FormItem>
-							)}
-						/>
 					</div>
 					<div className="flex w-full justify-end">
 						<Button

apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx

@@ -30,7 +30,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -58,8 +57,6 @@ const GithubProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	githubId: z.string().min(1, "Github Provider is required"),
 	watchPaths: z.array(z.string()).optional(),
-	triggerType: z.enum(["push", "tag"]).default("push"),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type GithubProvider = z.infer<typeof GithubProviderSchema>;
@@ -84,15 +81,12 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 			},
 			githubId: "",
 			branch: "",
-			triggerType: "push",
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GithubProviderSchema),
 	});
 
 	const repository = form.watch("repository");
 	const githubId = form.watch("githubId");
-	const triggerType = form.watch("triggerType");
 
 	const { data: repositories, isLoading: isLoadingRepositories } =
 		api.github.getGithubRepositories.useQuery(
@@ -130,8 +124,6 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 				buildPath: data.buildPath || "/",
 				githubId: data.githubId || "",
 				watchPaths: data.watchPaths || [],
-				triggerType: data.triggerType || "push",
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -145,8 +137,6 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 			buildPath: data.buildPath,
 			githubId: data.githubId,
 			watchPaths: data.watchPaths || [],
-			triggerType: data.triggerType,
-			enableSubmodules: data.enableSubmodules,
 		})
 			.then(async () => {
 				toast.success("Service Provided Saved");
@@ -391,11 +381,11 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 						/>
 						<FormField
 							control={form.control}
-							name="triggerType"
+							name="watchPaths"
 							render={({ field }) => (
 								<FormItem className="md:col-span-2">
-									<div className="flex items-center gap-2 ">
-										<FormLabel>Trigger Type</FormLabel>
+									<div className="flex items-center gap-2">
+										<FormLabel>Watch Paths</FormLabel>
 										<TooltipProvider>
 											<Tooltip>
 												<TooltipTrigger asChild>
@@ -403,127 +393,68 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 												</TooltipTrigger>
 												<TooltipContent>
 													<p>
-														Choose when to trigger deployments: on push to the
-														selected branch or when a new tag is created.
+														Add paths to watch for changes. When files in these
+														paths change, a new deployment will be triggered.
 													</p>
 												</TooltipContent>
 											</Tooltip>
 										</TooltipProvider>
 									</div>
-									<Select
-										onValueChange={field.onChange}
-										defaultValue={field.value}
-										value={field.value}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a trigger type" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											<SelectItem value="push">On Push</SelectItem>
-											<SelectItem value="tag">On Tag</SelectItem>
-										</SelectContent>
-									</Select>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-						{triggerType === "push" && (
-							<FormField
-								control={form.control}
-								name="watchPaths"
-								render={({ field }) => (
-									<FormItem className="md:col-span-2">
-										<div className="flex items-center gap-2">
-											<FormLabel>Watch Paths</FormLabel>
-											<TooltipProvider>
-												<Tooltip>
-													<TooltipTrigger asChild>
-														<HelpCircle className="size-4 text-muted-foreground hover:text-foreground transition-colors cursor-pointer" />
-													</TooltipTrigger>
-													<TooltipContent>
-														<p>
-															Add paths to watch for changes. When files in
-															these paths change, a new deployment will be
-															triggered.
-														</p>
-													</TooltipContent>
-												</Tooltip>
-											</TooltipProvider>
-										</div>
-										<div className="flex flex-wrap gap-2 mb-2">
-											{field.value?.map((path, index) => (
-												<Badge
-													key={index}
-													variant="secondary"
-													className="flex items-center gap-1"
-												>
-													{path}
-													<X
-														className="size-3 cursor-pointer hover:text-destructive"
-														onClick={() => {
-															const newPaths = [...(field.value || [])];
-															newPaths.splice(index, 1);
-															field.onChange(newPaths);
-														}}
-													/>
-												</Badge>
-											))}
-										</div>
-										<div className="flex gap-2">
-											<FormControl>
-												<Input
-													placeholder="Enter a path to watch (e.g., src/*, dist/*)"
-													onKeyDown={(e) => {
-														if (e.key === "Enter") {
-															e.preventDefault();
-															const input = e.currentTarget;
-															const path = input.value.trim();
-															if (path) {
-																field.onChange([...(field.value || []), path]);
-																input.value = "";
-															}
-														}
+									<div className="flex flex-wrap gap-2 mb-2">
+										{field.value?.map((path, index) => (
+											<Badge
+												key={index}
+												variant="secondary"
+												className="flex items-center gap-1"
+											>
+												{path}
+												<X
+													className="size-3 cursor-pointer hover:text-destructive"
+													onClick={() => {
+														const newPaths = [...(field.value || [])];
+														newPaths.splice(index, 1);
+														field.onChange(newPaths);
 													}}
 												/>
-											</FormControl>
-											<Button
-												type="button"
-												variant="outline"
-												size="icon"
-												onClick={() => {
-													const input = document.querySelector(
-														'input[placeholder*="Enter a path"]',
-													) as HTMLInputElement;
-													const path = input.value.trim();
-													if (path) {
-														field.onChange([...(field.value || []), path]);
-														input.value = "";
+											</Badge>
+										))}
+									</div>
+									<div className="flex gap-2">
+										<FormControl>
+											<Input
+												placeholder="Enter a path to watch (e.g., src/*, dist/*)"
+												onKeyDown={(e) => {
+													if (e.key === "Enter") {
+														e.preventDefault();
+														const input = e.currentTarget;
+														const path = input.value.trim();
+														if (path) {
+															field.onChange([...(field.value || []), path]);
+															input.value = "";
+														}
 													}
 												}}
-											>
-												<Plus className="size-4" />
-											</Button>
-										</div>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
+											/>
+										</FormControl>
+										<Button
+											type="button"
+											variant="outline"
+											size="icon"
+											onClick={() => {
+												const input = document.querySelector(
+													'input[placeholder*="Enter a path"]',
+												) as HTMLInputElement;
+												const path = input.value.trim();
+												if (path) {
+													field.onChange([...(field.value || []), path]);
+													input.value = "";
+												}
+											}}
+										>
+											<Plus className="size-4" />
+										</Button>
+									</div>
+									<FormMessage />
 								</FormItem>
 							)}
 						/>

apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx

@@ -31,7 +31,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -61,7 +60,6 @@ const GitlabProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	gitlabId: z.string().min(1, "Gitlab Provider is required"),
 	watchPaths: z.array(z.string()).optional(),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type GitlabProvider = z.infer<typeof GitlabProviderSchema>;
@@ -88,7 +86,6 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 			},
 			gitlabId: "",
 			branch: "",
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GitlabProviderSchema),
 	});
@@ -138,7 +135,6 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 				buildPath: data.gitlabBuildPath || "/",
 				gitlabId: data.gitlabId || "",
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -154,7 +150,6 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 			gitlabProjectId: data.repository.id,
 			gitlabPathNamespace: data.repository.gitlabPathNamespace,
 			watchPaths: data.watchPaths || [],
-			enableSubmodules: data.enableSubmodules,
 		})
 			.then(async () => {
 				toast.success("Service Provided Saved");
@@ -488,21 +483,6 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-								</FormItem>
-							)}
-						/>
 					</div>
 					<div className="flex w-full justify-end">
 						<Button

apps/dokploy/components/dashboard/application/general/generic/show.tsx

@@ -65,7 +65,7 @@ export const ShowProviderForm = ({ applicationId }: Props) => {
 						setSab(e as TabState);
 					}}
 				>
-					<div className="flex flex-row items-center justify-between w-full gap-4">
+					<div className="flex flex-row items-center justify-between  w-full gap-4">
 						<TabsList className="md:grid md:w-fit md:grid-cols-7 max-md:overflow-x-scroll justify-start bg-transparent overflow-y-hidden">
 							<TabsTrigger
 								value="github"

apps/dokploy/components/dashboard/application/preview-deployments/show-preview-settings.tsx

@@ -298,11 +298,7 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 												})
 													.then(() => {
 														refetch();
-														toast.success(
-															checked
-																? "Preview deployments enabled"
-																: "Preview deployments disabled",
-														);
+														toast.success("Preview deployments enabled");
 													})
 													.catch((error) => {
 														toast.error(error.message);

apps/dokploy/components/dashboard/compose/domains/add-domain.tsx

@@ -401,11 +401,6 @@ export const AddDomainCompose = ({
 										return (
 											<FormItem>
 												<FormLabel>Container Port</FormLabel>
-												<FormDescription>
-													The port where your application is running inside the
-													container (e.g., 3000 for Node.js, 80 for Nginx, 8080
-													for Java)
-												</FormDescription>
 												<FormControl>
 													<NumberInput placeholder={"3000"} {...field} />
 												</FormControl>

apps/dokploy/components/dashboard/compose/domains/dns-helper-modal.tsx

@@ -1,109 +0,0 @@
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import { Button } from "@/components/ui/button";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Copy, HelpCircle, Server } from "lucide-react";
-import { toast } from "sonner";
-
-interface Props {
-	domain: {
-		host: string;
-		https: boolean;
-		path?: string;
-	};
-	serverIp?: string;
-}
-
-export const DnsHelperModal = ({ domain, serverIp }: Props) => {
-	const copyToClipboard = (text: string) => {
-		navigator.clipboard.writeText(text);
-		toast.success("Copied to clipboard!");
-	};
-
-	return (
-		<Dialog>
-			<DialogTrigger>
-				<Button variant="ghost" size="icon" className="group">
-					<HelpCircle className="size-4" />
-				</Button>
-			</DialogTrigger>
-			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-2xl">
-				<DialogHeader>
-					<DialogTitle className="flex items-center gap-2">
-						<Server className="size-5" />
-						DNS Configuration Guide
-					</DialogTitle>
-					<DialogDescription>
-						Follow these steps to configure your DNS records for {domain.host}
-					</DialogDescription>
-				</DialogHeader>
-
-				<div className="flex flex-col gap-4">
-					<AlertBlock type="info">
-						To make your domain accessible, you need to configure your DNS
-						records with your domain provider (e.g., Cloudflare, GoDaddy,
-						NameCheap).
-					</AlertBlock>
-
-					<div className="flex flex-col gap-6">
-						<div className="rounded-lg border p-4">
-							<h3 className="font-medium mb-2">1. Add A Record</h3>
-							<div className="flex flex-col gap-3">
-								<p className="text-sm text-muted-foreground">
-									Create an A record that points your domain to the server's IP
-									address:
-								</p>
-								<div className="flex flex-col gap-2">
-									<div className="flex items-center justify-between gap-2 bg-muted p-3 rounded-md">
-										<div>
-											<p className="text-sm font-medium">Type: A</p>
-											<p className="text-sm">
-												Name: @ or {domain.host.split(".")[0]}
-											</p>
-											<p className="text-sm">
-												Value: {serverIp || "Your server IP"}
-											</p>
-										</div>
-										<Button
-											variant="ghost"
-											size="icon"
-											onClick={() => copyToClipboard(serverIp || "")}
-											disabled={!serverIp}
-										>
-											<Copy className="size-4" />
-										</Button>
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div className="rounded-lg border p-4">
-							<h3 className="font-medium mb-2">2. Verify Configuration</h3>
-							<div className="flex flex-col gap-3">
-								<p className="text-sm text-muted-foreground">
-									After configuring your DNS records:
-								</p>
-								<ul className="list-disc list-inside space-y-1 text-sm">
-									<li>Wait for DNS propagation (usually 15-30 minutes)</li>
-									<li>
-										Test your domain by visiting:{" "}
-										{domain.https ? "https://" : "http://"}
-										{domain.host}
-										{domain.path || "/"}
-									</li>
-									<li>Use a DNS lookup tool to verify your records</li>
-								</ul>
-							</div>
-						</div>
-					</div>
-				</div>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/compose/domains/show-domains.tsx

@@ -7,55 +7,17 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
-import {
-	ExternalLink,
-	GlobeIcon,
-	PenBoxIcon,
-	Trash2,
-	InfoIcon,
-	Server,
-	CheckCircle2,
-	XCircle,
-	Loader2,
-	RefreshCw,
-} from "lucide-react";
+import { ExternalLink, GlobeIcon, PenBoxIcon, Trash2 } from "lucide-react";
 import Link from "next/link";
 import { toast } from "sonner";
 import { AddDomainCompose } from "./add-domain";
-import { Badge } from "@/components/ui/badge";
-import { DnsHelperModal } from "./dns-helper-modal";
-import { useState } from "react";
 
 interface Props {
 	composeId: string;
 }
 
-export type ValidationState = {
-	isLoading: boolean;
-	isValid?: boolean;
-	error?: string;
-	resolvedIp?: string;
-	message?: string;
-};
-
-export type ValidationStates = {
-	[key: string]: ValidationState;
-};
-
 export const ShowDomainsCompose = ({ composeId }: Props) => {
-	const [validationStates, setValidationStates] = useState<ValidationStates>(
-		{},
-	);
-
-	const { data: ip } = api.settings.getIp.useQuery();
-
 	const { data, refetch } = api.domain.byComposeId.useQuery(
 		{
 			composeId,
@@ -65,58 +27,11 @@ export const ShowDomainsCompose = ({ composeId }: Props) => {
 		},
 	);
 
-	const { data: compose } = api.compose.one.useQuery(
-		{
-			composeId,
-		},
-		{
-			enabled: !!composeId,
-		},
-	);
-
-	const { mutateAsync: validateDomain } =
-		api.domain.validateDomain.useMutation();
 	const { mutateAsync: deleteDomain, isLoading: isRemoving } =
 		api.domain.delete.useMutation();
 
-	const handleValidateDomain = async (host: string) => {
-		setValidationStates((prev) => ({
-			...prev,
-			[host]: { isLoading: true },
-		}));
-
-		try {
-			const result = await validateDomain({
-				domain: host,
-				serverIp:
-					compose?.server?.ipAddress?.toString() || ip?.toString() || "",
-			});
-
-			setValidationStates((prev) => ({
-				...prev,
-				[host]: {
-					isLoading: false,
-					isValid: result.isValid,
-					error: result.error,
-					resolvedIp: result.resolvedIp,
-					message: result.error && result.isValid ? result.error : undefined,
-				},
-			}));
-		} catch (err) {
-			const error = err as Error;
-			setValidationStates((prev) => ({
-				...prev,
-				[host]: {
-					isLoading: false,
-					isValid: false,
-					error: error.message || "Failed to validate domain",
-				},
-			}));
-		}
-	};
-
 	return (
-		<div className="flex w-full flex-col gap-5">
+		<div className="flex w-full flex-col gap-5 ">
 			<Card className="bg-background">
 				<CardHeader className="flex flex-row items-center flex-wrap gap-4 justify-between">
 					<div className="flex flex-col gap-1">
@@ -130,248 +45,100 @@ export const ShowDomainsCompose = ({ composeId }: Props) => {
 						{data && data?.length > 0 && (
 							<AddDomainCompose composeId={composeId}>
 								<Button>
-									<GlobeIcon className="size-4 mr-2" /> Add Domain
+									<GlobeIcon className="size-4" /> Add Domain
 								</Button>
 							</AddDomainCompose>
 						)}
 					</div>
 				</CardHeader>
-				<CardContent>
+				<CardContent className="flex w-full flex-row gap-4">
 					{data?.length === 0 ? (
-						<div className="flex w-full flex-col items-center justify-center gap-3 py-8">
+						<div className="flex w-full flex-col items-center justify-center gap-3">
 							<GlobeIcon className="size-8 text-muted-foreground" />
-							<span className="text-base text-muted-foreground text-center">
+							<span className="text-base text-muted-foreground">
 								To access to the application it is required to set at least 1
 								domain
 							</span>
 							<div className="flex flex-row gap-4 flex-wrap">
 								<AddDomainCompose composeId={composeId}>
 									<Button>
-										<GlobeIcon className="size-4 mr-2" /> Add Domain
+										<GlobeIcon className="size-4" /> Add Domain
 									</Button>
 								</AddDomainCompose>
 							</div>
 						</div>
 					) : (
-						<div className="grid grid-cols-1 gap-4 xl:grid-cols-2">
+						<div className="flex w-full flex-col gap-4">
 							{data?.map((item) => {
-								const validationState = validationStates[item.host];
 								return (
-									<Card
+									<div
 										key={item.domainId}
-										className="relative overflow-hidden border bg-card transition-all hover:shadow-md bg-transparent"
+										className="flex w-full items-center justify-between gap-4 border p-4 md:px-6 rounded-lg flex-wrap"
 									>
-										<CardContent className="p-6">
-											<div className="flex flex-col gap-4">
-												{/* Service & Domain Info */}
-												<div className="flex items-start justify-between">
-													<div className="flex flex-col gap-2">
-														<Badge variant="outline" className="w-fit">
-															<Server className="size-3 mr-1" />
-															{item.serviceName}
-														</Badge>
-														<Link
-															className="flex items-center gap-2 text-base font-medium hover:underline"
-															target="_blank"
-															href={`${item.https ? "https" : "http"}://${item.host}${item.path}`}
-														>
-															{item.host}
-															<ExternalLink className="size-4" />
-														</Link>
-													</div>
-													<div className="flex gap-2">
-														{!item.host.includes("traefik.me") && (
-															<DnsHelperModal
-																domain={{
-																	host: item.host,
-																	https: item.https,
-																	path: item.path || undefined,
-																}}
-																serverIp={
-																	compose?.server?.ipAddress?.toString() ||
-																	ip?.toString()
-																}
-															/>
-														)}
-														<AddDomainCompose
-															composeId={composeId}
-															domainId={item.domainId}
-														>
-															<Button
-																variant="ghost"
-																size="icon"
-																className="group hover:bg-blue-500/10"
-															>
-																<PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" />
-															</Button>
-														</AddDomainCompose>
-														<DialogAction
-															title="Delete Domain"
-															description="Are you sure you want to delete this domain?"
-															type="destructive"
-															onClick={async () => {
-																await deleteDomain({
-																	domainId: item.domainId,
-																})
-																	.then((_data) => {
-																		refetch();
-																		toast.success(
-																			"Domain deleted successfully",
-																		);
-																	})
-																	.catch(() => {
-																		toast.error("Error deleting domain");
-																	});
-															}}
-														>
-															<Button
-																variant="ghost"
-																size="icon"
-																className="group hover:bg-red-500/10"
-																isLoading={isRemoving}
-															>
-																<Trash2 className="size-4 text-primary group-hover:text-red-500" />
-															</Button>
-														</DialogAction>
-													</div>
-												</div>
+										<div className="md:basis-1/2 flex gap-6 w-full items-center">
+											<span className="opacity-50 text-center font-medium text-sm whitespace-nowrap">
+												{item.serviceName}
+											</span>
 
-												{/* Domain Details */}
-												<div className="flex flex-wrap gap-3">
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge variant="secondary">
-																	<InfoIcon className="size-3 mr-1" />
-																	Path: {item.path || "/"}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent>
-																<p>URL path for this service</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
+											<Link
+												className="flex gap-2 items-center hover:underline transition-all w-full max-w-[calc(100%-4rem)]"
+												target="_blank"
+												href={`${item.https ? "https" : "http"}://${item.host}${item.path}`}
+											>
+												<span className="truncate  text-sm">{item.host}</span>
+												<ExternalLink className="size-4 min-w-4" />
+											</Link>
+										</div>
 
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge variant="secondary">
-																	<InfoIcon className="size-3 mr-1" />
-																	Port: {item.port}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent>
-																<p>Container port exposed</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge
-																	variant={item.https ? "outline" : "secondary"}
-																>
-																	{item.https ? "HTTPS" : "HTTP"}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent>
-																<p>
-																	{item.https
-																		? "Secure HTTPS connection"
-																		: "Standard HTTP connection"}
-																</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-
-													{item.certificateType && (
-														<TooltipProvider>
-															<Tooltip>
-																<TooltipTrigger asChild>
-																	<Badge variant="outline">
-																		Cert: {item.certificateType}
-																	</Badge>
-																</TooltipTrigger>
-																<TooltipContent>
-																	<p>SSL Certificate Provider</p>
-																</TooltipContent>
-															</Tooltip>
-														</TooltipProvider>
-													)}
-
-													<TooltipProvider>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Badge
-																	variant="outline"
-																	className={
-																		validationState?.isValid
-																			? "bg-green-500/10 text-green-500 cursor-pointer"
-																			: validationState?.error
-																				? "bg-red-500/10 text-red-500 cursor-pointer"
-																				: "bg-yellow-500/10 text-yellow-500 cursor-pointer"
-																	}
-																	onClick={() =>
-																		handleValidateDomain(item.host)
-																	}
-																>
-																	{validationState?.isLoading ? (
-																		<>
-																			<Loader2 className="size-3 mr-1 animate-spin" />
-																			Checking DNS...
-																		</>
-																	) : validationState?.isValid ? (
-																		<>
-																			<CheckCircle2 className="size-3 mr-1" />
-																			{validationState.message
-																				? "Behind Cloudflare"
-																				: "DNS Valid"}
-																		</>
-																	) : validationState?.error ? (
-																		<>
-																			<XCircle className="size-3 mr-1" />
-																			{validationState.error}
-																		</>
-																	) : (
-																		<>
-																			<RefreshCw className="size-3 mr-1" />
-																			Validate DNS
-																		</>
-																	)}
-																</Badge>
-															</TooltipTrigger>
-															<TooltipContent className="max-w-xs">
-																{validationState?.error &&
-																!validationState.isValid ? (
-																	<div className="flex flex-col gap-1">
-																		<p className="font-medium text-red-500">
-																			Error:
-																		</p>
-																		<p>{validationState.error}</p>
-																	</div>
-																) : validationState?.isValid ? (
-																	<div className="flex flex-col gap-1">
-																		<p className="font-medium text-green-500">
-																			{validationState.message
-																				? "Info:"
-																				: "Valid Configuration:"}
-																		</p>
-																		<p>
-																			{validationState.message ||
-																				`Domain points to ${validationState.resolvedIp}`}
-																		</p>
-																	</div>
-																) : (
-																	"Click to validate DNS configuration"
-																)}
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-												</div>
+										<div className="flex gap-8">
+											<div className="flex gap-8 opacity-50 items-center h-10 text-center text-sm font-medium">
+												<span>{item.path}</span>
+												<span>{item.port}</span>
+												<span>{item.https ? "HTTPS" : "HTTP"}</span>
 											</div>
-										</CardContent>
-									</Card>
+
+											<div className="flex gap-2">
+												<AddDomainCompose
+													composeId={composeId}
+													domainId={item.domainId}
+												>
+													<Button
+														variant="ghost"
+														size="icon"
+														className="group hover:bg-blue-500/10 "
+													>
+														<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
+													</Button>
+												</AddDomainCompose>
+												<DialogAction
+													title="Delete Domain"
+													description="Are you sure you want to delete this domain?"
+													type="destructive"
+													onClick={async () => {
+														await deleteDomain({
+															domainId: item.domainId,
+														})
+															.then((_data) => {
+																refetch();
+																toast.success("Domain deleted successfully");
+															})
+															.catch(() => {
+																toast.error("Error deleting domain");
+															});
+													}}
+												>
+													<Button
+														variant="ghost"
+														size="icon"
+														className="group hover:bg-red-500/10"
+														isLoading={isRemoving}
+													>
+														<Trash2 className="size-4 text-primary group-hover:text-red-500" />
+													</Button>
+												</DialogAction>
+											</div>
+										</div>
+									</div>
 								);
 							})}
 						</div>

apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx

@@ -79,22 +79,6 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 				toast.error("Error updating the Compose config");
 			});
 	};
-
-	// Add keyboard shortcut for Ctrl+S/Cmd+S
-	useEffect(() => {
-		const handleKeyDown = (e: KeyboardEvent) => {
-			if ((e.ctrlKey || e.metaKey) && e.key === "s" && !isLoading) {
-				e.preventDefault();
-				form.handleSubmit(onSubmit)();
-			}
-		};
-
-		document.addEventListener("keydown", handleKeyDown);
-		return () => {
-			document.removeEventListener("keydown", handleKeyDown);
-		};
-	}, [form, onSubmit, isLoading]);
-
 	return (
 		<>
 			<div className="w-full flex flex-col gap-4 ">

apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx

@@ -31,7 +31,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -59,7 +58,6 @@ const BitbucketProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	bitbucketId: z.string().min(1, "Bitbucket Provider is required"),
 	watchPaths: z.array(z.string()).optional(),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type BitbucketProvider = z.infer<typeof BitbucketProviderSchema>;
@@ -86,7 +84,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 			bitbucketId: "",
 			branch: "",
 			watchPaths: [],
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(BitbucketProviderSchema),
 	});
@@ -133,7 +130,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 				composePath: data.composePath,
 				bitbucketId: data.bitbucketId || "",
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -149,7 +145,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 			sourceType: "bitbucket",
 			composeStatus: "idle",
 			watchPaths: data.watchPaths,
-			enableSubmodules: data.enableSubmodules,
 		})
 			.then(async () => {
 				toast.success("Service Provided Saved");
@@ -474,21 +469,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-								</FormItem>
-							)}
-						/>
 					</div>
 					<div className="flex w-full justify-end">
 						<Button

apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx

@@ -19,7 +19,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -44,7 +43,6 @@ const GitProviderSchema = z.object({
 	branch: z.string().min(1, "Branch required"),
 	sshKey: z.string().optional(),
 	watchPaths: z.array(z.string()).optional(),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type GitProvider = z.infer<typeof GitProviderSchema>;
@@ -67,7 +65,6 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => {
 			composePath: "./docker-compose.yml",
 			sshKey: undefined,
 			watchPaths: [],
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GitProviderSchema),
 	});
@@ -80,7 +77,6 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => {
 				repositoryURL: data.customGitUrl || "",
 				composePath: data.composePath,
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -95,7 +91,6 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => {
 			composePath: values.composePath,
 			composeStatus: "idle",
 			watchPaths: values.watchPaths || [],
-			enableSubmodules: values.enableSubmodules,
 		})
 			.then(async () => {
 				toast.success("Git Provider Saved");
@@ -300,21 +295,6 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => {
 							</FormItem>
 						)}
 					/>
-					<FormField
-						control={form.control}
-						name="enableSubmodules"
-						render={({ field }) => (
-							<FormItem className="flex items-center space-x-2">
-								<FormControl>
-									<Switch
-										checked={field.value}
-										onCheckedChange={field.onChange}
-									/>
-								</FormControl>
-								<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-							</FormItem>
-						)}
-					/>
 				</div>
 
 				<div className="flex flex-row justify-end">

apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx

@@ -31,7 +31,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -60,7 +59,6 @@ const GiteaProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	giteaId: z.string().min(1, "Gitea Provider is required"),
 	watchPaths: z.array(z.string()).optional(),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type GiteaProvider = z.infer<typeof GiteaProviderSchema>;
@@ -85,7 +83,6 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 			giteaId: "",
 			branch: "",
 			watchPaths: [],
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GiteaProviderSchema),
 	});
@@ -139,7 +136,6 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 				composePath: data.composePath || "./docker-compose.yml",
 				giteaId: data.giteaId || "",
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -155,7 +151,6 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 			sourceType: "gitea",
 			composeStatus: "idle",
 			watchPaths: data.watchPaths,
-			enableSubmodules: data.enableSubmodules,
 		} as any)
 			.then(async () => {
 				toast.success("Service Provider Saved");
@@ -474,21 +469,6 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-								</FormItem>
-							)}
-						/>
 					</div>
 
 					<div className="flex justify-end">

apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx

@@ -30,7 +30,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -40,7 +39,7 @@ import {
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { CheckIcon, ChevronsUpDown, HelpCircle, X } from "lucide-react";
+import { CheckIcon, ChevronsUpDown, X } from "lucide-react";
 import Link from "next/link";
 import { useEffect } from "react";
 import { useForm } from "react-hook-form";
@@ -58,8 +57,6 @@ const GithubProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	githubId: z.string().min(1, "Github Provider is required"),
 	watchPaths: z.array(z.string()).optional(),
-	triggerType: z.enum(["push", "tag"]).default("push"),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type GithubProvider = z.infer<typeof GithubProviderSchema>;
@@ -85,15 +82,13 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 			githubId: "",
 			branch: "",
 			watchPaths: [],
-			triggerType: "push",
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GithubProviderSchema),
 	});
 
 	const repository = form.watch("repository");
 	const githubId = form.watch("githubId");
-	const triggerType = form.watch("triggerType");
+
 	const { data: repositories, isLoading: isLoadingRepositories } =
 		api.github.getGithubRepositories.useQuery(
 			{
@@ -130,8 +125,6 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 				composePath: data.composePath,
 				githubId: data.githubId || "",
 				watchPaths: data.watchPaths || [],
-				triggerType: data.triggerType || "push",
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -147,8 +140,6 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 			sourceType: "github",
 			composeStatus: "idle",
 			watchPaths: data.watchPaths,
-			enableSubmodules: data.enableSubmodules,
-			triggerType: data.triggerType,
 		})
 			.then(async () => {
 				toast.success("Service Provided Saved");
@@ -393,140 +384,79 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 						/>
 						<FormField
 							control={form.control}
-							name="triggerType"
+							name="watchPaths"
 							render={({ field }) => (
 								<FormItem className="md:col-span-2">
 									<div className="flex items-center gap-2">
-										<FormLabel>Trigger Type</FormLabel>
+										<FormLabel>Watch Paths</FormLabel>
 										<TooltipProvider>
 											<Tooltip>
-												<TooltipTrigger asChild>
-													<HelpCircle className="size-4 text-muted-foreground hover:text-foreground transition-colors cursor-pointer" />
+												<TooltipTrigger>
+													<div className="size-4 rounded-full bg-muted flex items-center justify-center text-[10px] font-bold">
+														?
+													</div>
 												</TooltipTrigger>
 												<TooltipContent>
 													<p>
-														Choose when to trigger deployments: on push to the
-														selected branch or when a new tag is created.
+														Add paths to watch for changes. When files in these
+														paths change, a new deployment will be triggered.
 													</p>
 												</TooltipContent>
 											</Tooltip>
 										</TooltipProvider>
 									</div>
-									<Select
-										onValueChange={field.onChange}
-										defaultValue={field.value}
-										value={field.value}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a trigger type" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											<SelectItem value="push">On Push</SelectItem>
-											<SelectItem value="tag">On Tag</SelectItem>
-										</SelectContent>
-									</Select>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-						{triggerType === "push" && (
-							<FormField
-								control={form.control}
-								name="watchPaths"
-								render={({ field }) => (
-									<FormItem className="md:col-span-2">
-										<div className="flex items-center gap-2">
-											<FormLabel>Watch Paths</FormLabel>
-											<TooltipProvider>
-												<Tooltip>
-													<TooltipTrigger>
-														<div className="size-4 rounded-full bg-muted flex items-center justify-center text-[10px] font-bold">
-															?
-														</div>
-													</TooltipTrigger>
-													<TooltipContent>
-														<p>
-															Add paths to watch for changes. When files in
-															these paths change, a new deployment will be
-															triggered.
-														</p>
-													</TooltipContent>
-												</Tooltip>
-											</TooltipProvider>
-										</div>
-										<div className="flex flex-wrap gap-2 mb-2">
-											{field.value?.map((path, index) => (
-												<Badge key={index} variant="secondary">
-													{path}
-													<X
-														className="ml-1 size-3 cursor-pointer"
-														onClick={() => {
-															const newPaths = [...(field.value || [])];
-															newPaths.splice(index, 1);
-															form.setValue("watchPaths", newPaths);
-														}}
-													/>
-												</Badge>
-											))}
-										</div>
-										<FormControl>
-											<div className="flex gap-2">
-												<Input
-													placeholder="Enter a path to watch (e.g., src/*, dist/*)"
-													onKeyDown={(e) => {
-														if (e.key === "Enter") {
-															e.preventDefault();
-															const input = e.currentTarget;
-															const value = input.value.trim();
-															if (value) {
-																const newPaths = [
-																	...(field.value || []),
-																	value,
-																];
-																form.setValue("watchPaths", newPaths);
-																input.value = "";
-															}
-														}
+									<div className="flex flex-wrap gap-2 mb-2">
+										{field.value?.map((path, index) => (
+											<Badge key={index} variant="secondary">
+												{path}
+												<X
+													className="ml-1 size-3 cursor-pointer"
+													onClick={() => {
+														const newPaths = [...(field.value || [])];
+														newPaths.splice(index, 1);
+														form.setValue("watchPaths", newPaths);
 													}}
 												/>
-												<Button
-													type="button"
-													variant="secondary"
-													onClick={() => {
-														const input = document.querySelector(
-															'input[placeholder="Enter a path to watch (e.g., src/*, dist/*)"]',
-														) as HTMLInputElement;
+											</Badge>
+										))}
+									</div>
+									<FormControl>
+										<div className="flex gap-2">
+											<Input
+												placeholder="Enter a path to watch (e.g., src/*, dist/*)"
+												onKeyDown={(e) => {
+													if (e.key === "Enter") {
+														e.preventDefault();
+														const input = e.currentTarget;
 														const value = input.value.trim();
 														if (value) {
 															const newPaths = [...(field.value || []), value];
 															form.setValue("watchPaths", newPaths);
 															input.value = "";
 														}
-													}}
-												>
-													Add
-												</Button>
-											</div>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
+													}
+												}}
+											/>
+											<Button
+												type="button"
+												variant="secondary"
+												onClick={() => {
+													const input = document.querySelector(
+														'input[placeholder="Enter a path to watch (e.g., src/*, dist/*)"]',
+													) as HTMLInputElement;
+													const value = input.value.trim();
+													if (value) {
+														const newPaths = [...(field.value || []), value];
+														form.setValue("watchPaths", newPaths);
+														input.value = "";
+													}
+												}}
+											>
+												Add
+											</Button>
+										</div>
 									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
+									<FormMessage />
 								</FormItem>
 							)}
 						/>

apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx

@@ -31,7 +31,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
@@ -61,7 +60,6 @@ const GitlabProviderSchema = z.object({
 	branch: z.string().min(1, "Branch is required"),
 	gitlabId: z.string().min(1, "Gitlab Provider is required"),
 	watchPaths: z.array(z.string()).optional(),
-	enableSubmodules: z.boolean().default(false),
 });
 
 type GitlabProvider = z.infer<typeof GitlabProviderSchema>;
@@ -89,7 +87,6 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 			gitlabId: "",
 			branch: "",
 			watchPaths: [],
-			enableSubmodules: false,
 		},
 		resolver: zodResolver(GitlabProviderSchema),
 	});
@@ -139,7 +136,6 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 				composePath: data.composePath,
 				gitlabId: data.gitlabId || "",
 				watchPaths: data.watchPaths || [],
-				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
 	}, [form.reset, data, form]);
@@ -157,7 +153,6 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 			sourceType: "gitlab",
 			composeStatus: "idle",
 			watchPaths: data.watchPaths,
-			enableSubmodules: data.enableSubmodules,
 		})
 			.then(async () => {
 				toast.success("Service Provided Saved");
@@ -490,21 +485,6 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="enableSubmodules"
-							render={({ field }) => (
-								<FormItem className="flex items-center space-x-2">
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<FormLabel className="!mt-0">Enable Submodules</FormLabel>
-								</FormItem>
-							)}
-						/>
 					</div>
 					<div className="flex w-full justify-end">
 						<Button

apps/dokploy/components/dashboard/database/backups/add-backup.tsx

@@ -0,0 +1,347 @@
+import { Button } from "@/components/ui/button";
+import {
+	Command,
+	CommandEmpty,
+	CommandGroup,
+	CommandInput,
+	CommandItem,
+} from "@/components/ui/command";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+	Popover,
+	PopoverContent,
+	PopoverTrigger,
+} from "@/components/ui/popover";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import { Switch } from "@/components/ui/switch";
+import { cn } from "@/lib/utils";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { PlusIcon } from "lucide-react";
+import { CheckIcon, ChevronsUpDown } from "lucide-react";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+
+const AddPostgresBackup1Schema = z.object({
+	destinationId: z.string().min(1, "Destination required"),
+	schedule: z.string().min(1, "Schedule (Cron) required"),
+	// .regex(
+	//   new RegExp(
+	//     /^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$/,
+	//   ),
+	//   "Invalid Cron",
+	// ),
+	prefix: z.string().min(1, "Prefix required"),
+	enabled: z.boolean(),
+	database: z.string().min(1, "Database required"),
+	keepLatestCount: z.coerce.number().optional(),
+});
+
+type AddPostgresBackup = z.infer<typeof AddPostgresBackup1Schema>;
+
+interface Props {
+	databaseId: string;
+	databaseType: "postgres" | "mariadb" | "mysql" | "mongo" | "web-server";
+	refetch: () => void;
+}
+
+export const AddBackup = ({ databaseId, databaseType, refetch }: Props) => {
+	const { data, isLoading } = api.destination.all.useQuery();
+
+	const { mutateAsync: createBackup, isLoading: isCreatingPostgresBackup } =
+		api.backup.create.useMutation();
+
+	const form = useForm<AddPostgresBackup>({
+		defaultValues: {
+			database: "",
+			destinationId: "",
+			enabled: true,
+			prefix: "/",
+			schedule: "",
+			keepLatestCount: undefined,
+		},
+		resolver: zodResolver(AddPostgresBackup1Schema),
+	});
+
+	useEffect(() => {
+		form.reset({
+			database: databaseType === "web-server" ? "dokploy" : "",
+			destinationId: "",
+			enabled: true,
+			prefix: "/",
+			schedule: "",
+			keepLatestCount: undefined,
+		});
+	}, [form, form.reset, form.formState.isSubmitSuccessful]);
+
+	const onSubmit = async (data: AddPostgresBackup) => {
+		const getDatabaseId =
+			databaseType === "postgres"
+				? {
+						postgresId: databaseId,
+					}
+				: databaseType === "mariadb"
+					? {
+							mariadbId: databaseId,
+						}
+					: databaseType === "mysql"
+						? {
+								mysqlId: databaseId,
+							}
+						: databaseType === "mongo"
+							? {
+									mongoId: databaseId,
+								}
+							: databaseType === "web-server"
+								? {
+										userId: databaseId,
+									}
+								: undefined;
+
+		await createBackup({
+			destinationId: data.destinationId,
+			prefix: data.prefix,
+			schedule: data.schedule,
+			enabled: data.enabled,
+			database: data.database,
+			keepLatestCount: data.keepLatestCount,
+			databaseType,
+			...getDatabaseId,
+		})
+			.then(async () => {
+				toast.success("Backup Created");
+				refetch();
+			})
+			.catch(() => {
+				toast.error("Error creating a backup");
+			});
+	};
+	return (
+		<Dialog>
+			<DialogTrigger asChild>
+				<Button>
+					<PlusIcon className="h-4 w-4" />
+					Create Backup
+				</Button>
+			</DialogTrigger>
+			<DialogContent className="sm:max-w-lg max-h-screen overflow-y-auto">
+				<DialogHeader>
+					<DialogTitle>Create a backup</DialogTitle>
+					<DialogDescription>Add a new backup</DialogDescription>
+				</DialogHeader>
+
+				<Form {...form}>
+					<form
+						id="hook-form-add-backup"
+						onSubmit={form.handleSubmit(onSubmit)}
+						className="grid w-full gap-4"
+					>
+						<div className="grid grid-cols-1 gap-4">
+							<FormField
+								control={form.control}
+								name="destinationId"
+								render={({ field }) => (
+									<FormItem className="">
+										<FormLabel>Destination</FormLabel>
+										<Popover>
+											<PopoverTrigger asChild>
+												<FormControl>
+													<Button
+														variant="outline"
+														className={cn(
+															"w-full justify-between !bg-input",
+															!field.value && "text-muted-foreground",
+														)}
+													>
+														{isLoading
+															? "Loading...."
+															: field.value
+																? data?.find(
+																		(destination) =>
+																			destination.destinationId === field.value,
+																	)?.name
+																: "Select Destination"}
+
+														<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+													</Button>
+												</FormControl>
+											</PopoverTrigger>
+											<PopoverContent className="p-0" align="start">
+												<Command>
+													<CommandInput
+														placeholder="Search Destination..."
+														className="h-9"
+													/>
+													{isLoading && (
+														<span className="py-6 text-center text-sm">
+															Loading Destinations....
+														</span>
+													)}
+													<CommandEmpty>No destinations found.</CommandEmpty>
+													<ScrollArea className="h-64">
+														<CommandGroup>
+															{data?.map((destination) => (
+																<CommandItem
+																	value={destination.destinationId}
+																	key={destination.destinationId}
+																	onSelect={() => {
+																		form.setValue(
+																			"destinationId",
+																			destination.destinationId,
+																		);
+																	}}
+																>
+																	{destination.name}
+																	<CheckIcon
+																		className={cn(
+																			"ml-auto h-4 w-4",
+																			destination.destinationId === field.value
+																				? "opacity-100"
+																				: "opacity-0",
+																		)}
+																	/>
+																</CommandItem>
+															))}
+														</CommandGroup>
+													</ScrollArea>
+												</Command>
+											</PopoverContent>
+										</Popover>
+
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+							<FormField
+								control={form.control}
+								name="database"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Database</FormLabel>
+											<FormControl>
+												<Input
+													disabled={databaseType === "web-server"}
+													placeholder={"dokploy"}
+													{...field}
+												/>
+											</FormControl>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="schedule"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Schedule (Cron)</FormLabel>
+											<FormControl>
+												<Input placeholder={"0 0 * * *"} {...field} />
+											</FormControl>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="prefix"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Prefix Destination</FormLabel>
+											<FormControl>
+												<Input placeholder={"dokploy/"} {...field} />
+											</FormControl>
+											<FormDescription>
+												Use if you want to back up in a specific path of your
+												destination/bucket
+											</FormDescription>
+
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="keepLatestCount"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Keep the latest</FormLabel>
+											<FormControl>
+												<Input
+													type="number"
+													placeholder={"keeps all the backups if left empty"}
+													{...field}
+												/>
+											</FormControl>
+											<FormDescription>
+												Optional. If provided, only keeps the latest N backups
+												in the cloud.
+											</FormDescription>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="enabled"
+								render={({ field }) => (
+									<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 ">
+										<div className="space-y-0.5">
+											<FormLabel>Enabled</FormLabel>
+											<FormDescription>
+												Enable or disable the backup
+											</FormDescription>
+										</div>
+										<FormControl>
+											<Switch
+												checked={field.value}
+												onCheckedChange={field.onChange}
+											/>
+										</FormControl>
+									</FormItem>
+								)}
+							/>
+						</div>
+						<DialogFooter>
+							<Button
+								isLoading={isCreatingPostgresBackup}
+								form="hook-form-add-backup"
+								type="submit"
+							>
+								Create
+							</Button>
+						</DialogFooter>
+					</form>
+				</Form>
+			</DialogContent>
+		</Dialog>
+	);
+};

apps/dokploy/components/dashboard/database/backups/handle-backup.tsx

@@ -1,767 +0,0 @@
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandGroup,
-	CommandInput,
-	CommandItem,
-} from "@/components/ui/command";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Popover,
-	PopoverContent,
-	PopoverTrigger,
-} from "@/components/ui/popover";
-import { ScrollArea } from "@/components/ui/scroll-area";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { DatabaseZap, PenBoxIcon, PlusIcon, RefreshCw } from "lucide-react";
-import { CheckIcon, ChevronsUpDown } from "lucide-react";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-
-type CacheType = "cache" | "fetch";
-
-type DatabaseType = "postgres" | "mariadb" | "mysql" | "mongo" | "web-server";
-
-const Schema = z
-	.object({
-		destinationId: z.string().min(1, "Destination required"),
-		schedule: z.string().min(1, "Schedule (Cron) required"),
-		prefix: z.string().min(1, "Prefix required"),
-		enabled: z.boolean(),
-		database: z.string().min(1, "Database required"),
-		keepLatestCount: z.coerce.number().optional(),
-		serviceName: z.string().nullable(),
-		databaseType: z
-			.enum(["postgres", "mariadb", "mysql", "mongo", "web-server"])
-			.optional(),
-		backupType: z.enum(["database", "compose"]),
-		metadata: z
-			.object({
-				postgres: z
-					.object({
-						databaseUser: z.string(),
-					})
-					.optional(),
-				mariadb: z
-					.object({
-						databaseUser: z.string(),
-						databasePassword: z.string(),
-					})
-					.optional(),
-				mongo: z
-					.object({
-						databaseUser: z.string(),
-						databasePassword: z.string(),
-					})
-					.optional(),
-				mysql: z
-					.object({
-						databaseRootPassword: z.string(),
-					})
-					.optional(),
-			})
-			.optional(),
-	})
-	.superRefine((data, ctx) => {
-		if (data.backupType === "compose" && !data.databaseType) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				message: "Database type is required for compose backups",
-				path: ["databaseType"],
-			});
-		}
-		if (data.backupType === "compose" && data.databaseType) {
-			if (data.databaseType === "postgres") {
-				if (!data.metadata?.postgres?.databaseUser) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database user is required for PostgreSQL",
-						path: ["metadata", "postgres", "databaseUser"],
-					});
-				}
-			} else if (data.databaseType === "mariadb") {
-				if (!data.metadata?.mariadb?.databaseUser) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database user is required for MariaDB",
-						path: ["metadata", "mariadb", "databaseUser"],
-					});
-				}
-				if (!data.metadata?.mariadb?.databasePassword) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database password is required for MariaDB",
-						path: ["metadata", "mariadb", "databasePassword"],
-					});
-				}
-			} else if (data.databaseType === "mongo") {
-				if (!data.metadata?.mongo?.databaseUser) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database user is required for MongoDB",
-						path: ["metadata", "mongo", "databaseUser"],
-					});
-				}
-				if (!data.metadata?.mongo?.databasePassword) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database password is required for MongoDB",
-						path: ["metadata", "mongo", "databasePassword"],
-					});
-				}
-			} else if (data.databaseType === "mysql") {
-				if (!data.metadata?.mysql?.databaseRootPassword) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Root password is required for MySQL",
-						path: ["metadata", "mysql", "databaseRootPassword"],
-					});
-				}
-			}
-		}
-	});
-
-interface Props {
-	id?: string;
-	backupId?: string;
-	databaseType?: DatabaseType;
-	refetch: () => void;
-	backupType: "database" | "compose";
-}
-
-export const HandleBackup = ({
-	id,
-	backupId,
-	databaseType = "postgres",
-	refetch,
-	backupType = "database",
-}: Props) => {
-	const [isOpen, setIsOpen] = useState(false);
-
-	const { data, isLoading } = api.destination.all.useQuery();
-	const { data: backup } = api.backup.one.useQuery(
-		{
-			backupId: backupId ?? "",
-		},
-		{
-			enabled: !!backupId,
-		},
-	);
-	const [cacheType, setCacheType] = useState<CacheType>("cache");
-	const { mutateAsync: createBackup, isLoading: isCreatingPostgresBackup } =
-		backupId
-			? api.backup.update.useMutation()
-			: api.backup.create.useMutation();
-
-	const form = useForm<z.infer<typeof Schema>>({
-		defaultValues: {
-			database: databaseType === "web-server" ? "dokploy" : "",
-			destinationId: "",
-			enabled: true,
-			prefix: "/",
-			schedule: "",
-			keepLatestCount: undefined,
-			serviceName: null,
-			databaseType: backupType === "compose" ? undefined : databaseType,
-			backupType: backupType,
-			metadata: {},
-		},
-		resolver: zodResolver(Schema),
-	});
-
-	const {
-		data: services,
-		isFetching: isLoadingServices,
-		error: errorServices,
-		refetch: refetchServices,
-	} = api.compose.loadServices.useQuery(
-		{
-			composeId: backup?.composeId ?? id ?? "",
-			type: cacheType,
-		},
-		{
-			retry: false,
-			refetchOnWindowFocus: false,
-			enabled: backupType === "compose" && !!backup?.composeId && !!id,
-		},
-	);
-
-	useEffect(() => {
-		form.reset({
-			database: backup?.database
-				? backup?.database
-				: databaseType === "web-server"
-					? "dokploy"
-					: "",
-			destinationId: backup?.destinationId ?? "",
-			enabled: backup?.enabled ?? true,
-			prefix: backup?.prefix ?? "/",
-			schedule: backup?.schedule ?? "",
-			keepLatestCount: backup?.keepLatestCount ?? undefined,
-			serviceName: backup?.serviceName ?? null,
-			databaseType: backup?.databaseType ?? databaseType,
-			backupType: backup?.backupType ?? backupType,
-			metadata: backup?.metadata ?? {},
-		});
-	}, [form, form.reset, backupId, backup]);
-
-	const onSubmit = async (data: z.infer<typeof Schema>) => {
-		const getDatabaseId =
-			backupType === "compose"
-				? {
-						composeId: id,
-					}
-				: databaseType === "postgres"
-					? {
-							postgresId: id,
-						}
-					: databaseType === "mariadb"
-						? {
-								mariadbId: id,
-							}
-						: databaseType === "mysql"
-							? {
-									mysqlId: id,
-								}
-							: databaseType === "mongo"
-								? {
-										mongoId: id,
-									}
-								: databaseType === "web-server"
-									? {
-											userId: id,
-										}
-									: undefined;
-
-		await createBackup({
-			destinationId: data.destinationId,
-			prefix: data.prefix,
-			schedule: data.schedule,
-			enabled: data.enabled,
-			database: data.database,
-			keepLatestCount: data.keepLatestCount ?? null,
-			databaseType: data.databaseType || databaseType,
-			serviceName: data.serviceName,
-			...getDatabaseId,
-			backupId: backupId ?? "",
-			backupType,
-			metadata: data.metadata,
-		})
-			.then(async () => {
-				toast.success(`Backup ${backupId ? "Updated" : "Created"}`);
-				refetch();
-				setIsOpen(false);
-			})
-			.catch(() => {
-				toast.error(`Error ${backupId ? "updating" : "creating"} a backup`);
-			});
-	};
-
-	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
-				{backupId ? (
-					<Button
-						variant="ghost"
-						size="icon"
-						className="group hover:bg-blue-500/10 size-8"
-					>
-						<PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" />
-					</Button>
-				) : (
-					<Button>
-						<PlusIcon className="h-4 w-4" />
-						{backupId ? "Update Backup" : "Create Backup"}
-					</Button>
-				)}
-			</DialogTrigger>
-			<DialogContent className="sm:max-w-2xl max-h-screen overflow-y-auto">
-				<DialogHeader>
-					<DialogTitle>
-						{backupId ? "Update Backup" : "Create Backup"}
-					</DialogTitle>
-					<DialogDescription>
-						{backupId ? "Update a backup" : "Add a new backup"}
-					</DialogDescription>
-				</DialogHeader>
-
-				<Form {...form}>
-					<form
-						id="hook-form-add-backup"
-						onSubmit={form.handleSubmit(onSubmit)}
-						className="grid w-full gap-4"
-					>
-						<div className="grid grid-cols-1 gap-4">
-							{errorServices && (
-								<AlertBlock type="warning" className="[overflow-wrap:anywhere]">
-									{errorServices?.message}
-								</AlertBlock>
-							)}
-							{backupType === "compose" && (
-								<FormField
-									control={form.control}
-									name="databaseType"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Database Type</FormLabel>
-											<Select
-												value={field.value}
-												onValueChange={(value) => {
-													field.onChange(value as DatabaseType);
-													form.setValue("metadata", {});
-												}}
-											>
-												<SelectTrigger className="w-full">
-													<SelectValue placeholder="Select a database type" />
-												</SelectTrigger>
-												<SelectContent>
-													<SelectItem value="postgres">PostgreSQL</SelectItem>
-													<SelectItem value="mariadb">MariaDB</SelectItem>
-													<SelectItem value="mysql">MySQL</SelectItem>
-													<SelectItem value="mongo">MongoDB</SelectItem>
-												</SelectContent>
-											</Select>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-							)}
-							<FormField
-								control={form.control}
-								name="destinationId"
-								render={({ field }) => (
-									<FormItem className="">
-										<FormLabel>Destination</FormLabel>
-										<Popover>
-											<PopoverTrigger asChild>
-												<FormControl>
-													<Button
-														variant="outline"
-														className={cn(
-															"w-full justify-between !bg-input",
-															!field.value && "text-muted-foreground",
-														)}
-													>
-														{isLoading
-															? "Loading...."
-															: field.value
-																? data?.find(
-																		(destination) =>
-																			destination.destinationId === field.value,
-																	)?.name
-																: "Select Destination"}
-
-														<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-													</Button>
-												</FormControl>
-											</PopoverTrigger>
-											<PopoverContent className="p-0" align="start">
-												<Command>
-													<CommandInput
-														placeholder="Search Destination..."
-														className="h-9"
-													/>
-													{isLoading && (
-														<span className="py-6 text-center text-sm">
-															Loading Destinations....
-														</span>
-													)}
-													<CommandEmpty>No destinations found.</CommandEmpty>
-													<ScrollArea className="h-64">
-														<CommandGroup>
-															{data?.map((destination) => (
-																<CommandItem
-																	value={destination.destinationId}
-																	key={destination.destinationId}
-																	onSelect={() => {
-																		form.setValue(
-																			"destinationId",
-																			destination.destinationId,
-																		);
-																	}}
-																>
-																	{destination.name}
-																	<CheckIcon
-																		className={cn(
-																			"ml-auto h-4 w-4",
-																			destination.destinationId === field.value
-																				? "opacity-100"
-																				: "opacity-0",
-																		)}
-																	/>
-																</CommandItem>
-															))}
-														</CommandGroup>
-													</ScrollArea>
-												</Command>
-											</PopoverContent>
-										</Popover>
-
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							{backupType === "compose" && (
-								<div className="flex flex-row items-end w-full gap-4">
-									<FormField
-										control={form.control}
-										name="serviceName"
-										render={({ field }) => (
-											<FormItem className="w-full">
-												<FormLabel>Service Name</FormLabel>
-												<div className="flex gap-2">
-													<Select
-														onValueChange={field.onChange}
-														value={field.value || undefined}
-													>
-														<FormControl>
-															<SelectTrigger>
-																<SelectValue placeholder="Select a service name" />
-															</SelectTrigger>
-														</FormControl>
-
-														<SelectContent>
-															{services?.map((service, index) => (
-																<SelectItem
-																	value={service}
-																	key={`${service}-${index}`}
-																>
-																	{service}
-																</SelectItem>
-															))}
-															{(!services || services.length === 0) && (
-																<SelectItem value="none" disabled>
-																	Empty
-																</SelectItem>
-															)}
-														</SelectContent>
-													</Select>
-													<TooltipProvider delayDuration={0}>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Button
-																	variant="secondary"
-																	type="button"
-																	isLoading={isLoadingServices}
-																	onClick={() => {
-																		if (cacheType === "fetch") {
-																			refetchServices();
-																		} else {
-																			setCacheType("fetch");
-																		}
-																	}}
-																>
-																	<RefreshCw className="size-4 text-muted-foreground" />
-																</Button>
-															</TooltipTrigger>
-															<TooltipContent
-																side="left"
-																sideOffset={5}
-																className="max-w-[10rem]"
-															>
-																<p>
-																	Fetch: Will clone the repository and load the
-																	services
-																</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-													<TooltipProvider delayDuration={0}>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Button
-																	variant="secondary"
-																	type="button"
-																	isLoading={isLoadingServices}
-																	onClick={() => {
-																		if (cacheType === "cache") {
-																			refetchServices();
-																		} else {
-																			setCacheType("cache");
-																		}
-																	}}
-																>
-																	<DatabaseZap className="size-4 text-muted-foreground" />
-																</Button>
-															</TooltipTrigger>
-															<TooltipContent
-																side="left"
-																sideOffset={5}
-																className="max-w-[10rem]"
-															>
-																<p>
-																	Cache: If you previously deployed this
-																	compose, it will read the services from the
-																	last deployment/fetch from the repository
-																</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-												</div>
-
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								</div>
-							)}
-							<FormField
-								control={form.control}
-								name="database"
-								render={({ field }) => {
-									return (
-										<FormItem>
-											<FormLabel>Database</FormLabel>
-											<FormControl>
-												<Input
-													disabled={databaseType === "web-server"}
-													placeholder={"dokploy"}
-													{...field}
-												/>
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									);
-								}}
-							/>
-							<FormField
-								control={form.control}
-								name="schedule"
-								render={({ field }) => {
-									return (
-										<FormItem>
-											<FormLabel>Schedule (Cron)</FormLabel>
-											<FormControl>
-												<Input placeholder={"0 0 * * *"} {...field} />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									);
-								}}
-							/>
-							<FormField
-								control={form.control}
-								name="prefix"
-								render={({ field }) => {
-									return (
-										<FormItem>
-											<FormLabel>Prefix Destination</FormLabel>
-											<FormControl>
-												<Input placeholder={"dokploy/"} {...field} />
-											</FormControl>
-											<FormDescription>
-												Use if you want to back up in a specific path of your
-												destination/bucket
-											</FormDescription>
-
-											<FormMessage />
-										</FormItem>
-									);
-								}}
-							/>
-							<FormField
-								control={form.control}
-								name="keepLatestCount"
-								render={({ field }) => {
-									return (
-										<FormItem>
-											<FormLabel>Keep the latest</FormLabel>
-											<FormControl>
-												<Input
-													type="number"
-													placeholder={"keeps all the backups if left empty"}
-													{...field}
-												/>
-											</FormControl>
-											<FormDescription>
-												Optional. If provided, only keeps the latest N backups
-												in the cloud.
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									);
-								}}
-							/>
-							<FormField
-								control={form.control}
-								name="enabled"
-								render={({ field }) => (
-									<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 ">
-										<div className="space-y-0.5">
-											<FormLabel>Enabled</FormLabel>
-											<FormDescription>
-												Enable or disable the backup
-											</FormDescription>
-										</div>
-										<FormControl>
-											<Switch
-												checked={field.value}
-												onCheckedChange={field.onChange}
-											/>
-										</FormControl>
-									</FormItem>
-								)}
-							/>
-							{backupType === "compose" && (
-								<>
-									{form.watch("databaseType") === "postgres" && (
-										<FormField
-											control={form.control}
-											name="metadata.postgres.databaseUser"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Database User</FormLabel>
-													<FormControl>
-														<Input placeholder="postgres" {...field} />
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-									)}
-
-									{form.watch("databaseType") === "mariadb" && (
-										<>
-											<FormField
-												control={form.control}
-												name="metadata.mariadb.databaseUser"
-												render={({ field }) => (
-													<FormItem>
-														<FormLabel>Database User</FormLabel>
-														<FormControl>
-															<Input placeholder="mariadb" {...field} />
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<FormField
-												control={form.control}
-												name="metadata.mariadb.databasePassword"
-												render={({ field }) => (
-													<FormItem>
-														<FormLabel>Database Password</FormLabel>
-														<FormControl>
-															<Input
-																type="password"
-																placeholder="••••••••"
-																{...field}
-															/>
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-										</>
-									)}
-
-									{form.watch("databaseType") === "mongo" && (
-										<>
-											<FormField
-												control={form.control}
-												name="metadata.mongo.databaseUser"
-												render={({ field }) => (
-													<FormItem>
-														<FormLabel>Database User</FormLabel>
-														<FormControl>
-															<Input placeholder="mongo" {...field} />
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<FormField
-												control={form.control}
-												name="metadata.mongo.databasePassword"
-												render={({ field }) => (
-													<FormItem>
-														<FormLabel>Database Password</FormLabel>
-														<FormControl>
-															<Input
-																type="password"
-																placeholder="••••••••"
-																{...field}
-															/>
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-										</>
-									)}
-
-									{form.watch("databaseType") === "mysql" && (
-										<FormField
-											control={form.control}
-											name="metadata.mysql.databaseRootPassword"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Root Password</FormLabel>
-													<FormControl>
-														<Input
-															type="password"
-															placeholder="••••••••"
-															{...field}
-														/>
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-									)}
-								</>
-							)}
-						</div>
-						<DialogFooter>
-							<Button
-								isLoading={isCreatingPostgresBackup}
-								form="hook-form-add-backup"
-								type="submit"
-							>
-								{backupId ? "Update" : "Create"}
-							</Button>
-						</DialogFooter>
-					</form>
-				</Form>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/database/backups/restore-backup.tsx

@@ -32,213 +32,80 @@ import {
 	PopoverTrigger,
 } from "@/components/ui/popover";
 import { ScrollArea } from "@/components/ui/scroll-area";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import copy from "copy-to-clipboard";
 import { debounce } from "lodash";
-import {
-	CheckIcon,
-	ChevronsUpDown,
-	Copy,
-	RotateCcw,
-	RefreshCw,
-	DatabaseZap,
-} from "lucide-react";
+import { CheckIcon, ChevronsUpDown, Copy, RotateCcw } from "lucide-react";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import type { ServiceType } from "../../application/advanced/show-resources";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
-
-type DatabaseType =
-	| Exclude<ServiceType, "application" | "redis">
-	| "web-server";
 
 interface Props {
-	id: string;
-	databaseType?: DatabaseType;
+	databaseId: string;
+	databaseType: Exclude<ServiceType, "application" | "redis"> | "web-server";
 	serverId?: string | null;
-	backupType?: "database" | "compose";
 }
 
-const RestoreBackupSchema = z
-	.object({
-		destinationId: z
-			.string({
-				required_error: "Please select a destination",
-			})
-			.min(1, {
-				message: "Destination is required",
-			}),
-		backupFile: z
-			.string({
-				required_error: "Please select a backup file",
-			})
-			.min(1, {
-				message: "Backup file is required",
-			}),
-		databaseName: z
-			.string({
-				required_error: "Please enter a database name",
-			})
-			.min(1, {
-				message: "Database name is required",
-			}),
-		databaseType: z
-			.enum(["postgres", "mariadb", "mysql", "mongo", "web-server"])
-			.optional(),
-		backupType: z.enum(["database", "compose"]).default("database"),
-		serviceName: z.string().nullable().optional(),
-		metadata: z
-			.object({
-				postgres: z
-					.object({
-						databaseUser: z.string(),
-					})
-					.optional(),
-				mariadb: z
-					.object({
-						databaseUser: z.string(),
-						databasePassword: z.string(),
-					})
-					.optional(),
-				mongo: z
-					.object({
-						databaseUser: z.string(),
-						databasePassword: z.string(),
-					})
-					.optional(),
-				mysql: z
-					.object({
-						databaseRootPassword: z.string(),
-					})
-					.optional(),
-			})
-			.optional(),
-	})
-	.superRefine((data, ctx) => {
-		if (data.backupType === "compose" && !data.databaseType) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				message: "Database type is required for compose backups",
-				path: ["databaseType"],
-			});
-		}
-		if (data.backupType === "compose" && data.databaseType) {
-			if (data.databaseType === "postgres") {
-				if (!data.metadata?.postgres?.databaseUser) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database user is required for PostgreSQL",
-						path: ["metadata", "postgres", "databaseUser"],
-					});
-				}
-			} else if (data.databaseType === "mariadb") {
-				if (!data.metadata?.mariadb?.databaseUser) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database user is required for MariaDB",
-						path: ["metadata", "mariadb", "databaseUser"],
-					});
-				}
-				if (!data.metadata?.mariadb?.databasePassword) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database password is required for MariaDB",
-						path: ["metadata", "mariadb", "databasePassword"],
-					});
-				}
-			} else if (data.databaseType === "mongo") {
-				if (!data.metadata?.mongo?.databaseUser) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database user is required for MongoDB",
-						path: ["metadata", "mongo", "databaseUser"],
-					});
-				}
-				if (!data.metadata?.mongo?.databasePassword) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Database password is required for MongoDB",
-						path: ["metadata", "mongo", "databasePassword"],
-					});
-				}
-			} else if (data.databaseType === "mysql") {
-				if (!data.metadata?.mysql?.databaseRootPassword) {
-					ctx.addIssue({
-						code: z.ZodIssueCode.custom,
-						message: "Root password is required for MySQL",
-						path: ["metadata", "mysql", "databaseRootPassword"],
-					});
-				}
-			}
-		}
-	});
+const RestoreBackupSchema = z.object({
+	destinationId: z
+		.string({
+			required_error: "Please select a destination",
+		})
+		.min(1, {
+			message: "Destination is required",
+		}),
+	backupFile: z
+		.string({
+			required_error: "Please select a backup file",
+		})
+		.min(1, {
+			message: "Backup file is required",
+		}),
+	databaseName: z
+		.string({
+			required_error: "Please enter a database name",
+		})
+		.min(1, {
+			message: "Database name is required",
+		}),
+});
 
-const formatBytes = (bytes: number): string => {
-	if (bytes === 0) return "0 Bytes";
-	const k = 1024;
-	const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
-	const i = Math.floor(Math.log(bytes) / Math.log(k));
-	return `${Number.parseFloat((bytes / k ** i).toFixed(2))} ${sizes[i]}`;
-};
+type RestoreBackup = z.infer<typeof RestoreBackupSchema>;
 
 export const RestoreBackup = ({
-	id,
+	databaseId,
 	databaseType,
 	serverId,
-	backupType = "database",
 }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const [search, setSearch] = useState("");
-	const [debouncedSearchTerm, setDebouncedSearchTerm] = useState("");
 
 	const { data: destinations = [] } = api.destination.all.useQuery();
 
-	const form = useForm<z.infer<typeof RestoreBackupSchema>>({
+	const form = useForm<RestoreBackup>({
 		defaultValues: {
 			destinationId: "",
 			backupFile: "",
 			databaseName: databaseType === "web-server" ? "dokploy" : "",
-			databaseType:
-				backupType === "compose" ? ("postgres" as DatabaseType) : databaseType,
-			metadata: {},
 		},
 		resolver: zodResolver(RestoreBackupSchema),
 	});
 
 	const destionationId = form.watch("destinationId");
-	const currentDatabaseType = form.watch("databaseType");
-	const metadata = form.watch("metadata");
 
 	const debouncedSetSearch = debounce((value: string) => {
-		setDebouncedSearchTerm(value);
-	}, 350);
-
-	const handleSearchChange = (value: string) => {
 		setSearch(value);
-		debouncedSetSearch(value);
-	};
+	}, 300);
 
 	const { data: files = [], isLoading } = api.backup.listBackupFiles.useQuery(
 		{
 			destinationId: destionationId,
-			search: debouncedSearchTerm,
+			search,
 			serverId: serverId ?? "",
 		},
 		{
@@ -250,15 +117,16 @@ export const RestoreBackup = ({
 	const [filteredLogs, setFilteredLogs] = useState<LogLine[]>([]);
 	const [isDeploying, setIsDeploying] = useState(false);
 
+	// const { mutateAsync: restore, isLoading: isRestoring } =
+	// 	api.backup.restoreBackup.useMutation();
+
 	api.backup.restoreBackupWithLogs.useSubscription(
 		{
-			databaseId: id,
-			databaseType: currentDatabaseType as DatabaseType,
+			databaseId,
+			databaseType,
 			databaseName: form.watch("databaseName"),
 			backupFile: form.watch("backupFile"),
 			destinationId: form.watch("destinationId"),
-			backupType: backupType,
-			metadata: metadata,
 		},
 		{
 			enabled: isDeploying,
@@ -280,32 +148,10 @@ export const RestoreBackup = ({
 		},
 	);
 
-	const onSubmit = async (data: z.infer<typeof RestoreBackupSchema>) => {
-		if (backupType === "compose" && !data.databaseType) {
-			toast.error("Please select a database type");
-			return;
-		}
-		console.log({ data });
+	const onSubmit = async (_data: RestoreBackup) => {
 		setIsDeploying(true);
 	};
 
-	const [cacheType, setCacheType] = useState<"fetch" | "cache">("cache");
-	const {
-		data: services = [],
-		isLoading: isLoadingServices,
-		refetch: refetchServices,
-	} = api.compose.loadServices.useQuery(
-		{
-			composeId: id,
-			type: cacheType,
-		},
-		{
-			retry: false,
-			refetchOnWindowFocus: false,
-			enabled: backupType === "compose",
-		},
-	);
-
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogTrigger asChild>
@@ -314,7 +160,7 @@ export const RestoreBackup = ({
 					Restore Backup
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
+			<DialogContent className="sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle className="flex items-center">
 						<RotateCcw className="mr-2 size-4" />
@@ -419,7 +265,7 @@ export const RestoreBackup = ({
 											</Badge>
 										)}
 									</FormLabel>
-									<Popover modal>
+									<Popover>
 										<PopoverTrigger asChild>
 											<FormControl>
 												<Button
@@ -438,8 +284,7 @@ export const RestoreBackup = ({
 											<Command>
 												<CommandInput
 													placeholder="Search backup files..."
-													value={search}
-													onValueChange={handleSearchChange}
+													onValueChange={debouncedSetSearch}
 													className="h-9"
 												/>
 												{isLoading ? (
@@ -456,51 +301,26 @@ export const RestoreBackup = ({
 													</div>
 												) : (
 													<ScrollArea className="h-64">
-														<CommandGroup className="w-96">
-															{files?.map((file) => (
+														<CommandGroup>
+															{files.map((file) => (
 																<CommandItem
-																	value={file.Path}
-																	key={file.Path}
+																	value={file}
+																	key={file}
 																	onSelect={() => {
-																		form.setValue("backupFile", file.Path);
-																		if (file.IsDir) {
-																			setSearch(`${file.Path}/`);
-																			setDebouncedSearchTerm(`${file.Path}/`);
-																		} else {
-																			setSearch(file.Path);
-																			setDebouncedSearchTerm(file.Path);
-																		}
+																		form.setValue("backupFile", file);
 																	}}
 																>
-																	<div className="flex w-full flex-col gap-1">
-																		<div className="flex w-full justify-between">
-																			<span className="font-medium">
-																				{file.Path}
-																			</span>
-
-																			<CheckIcon
-																				className={cn(
-																					"ml-auto h-4 w-4",
-																					file.Path === field.value
-																						? "opacity-100"
-																						: "opacity-0",
-																				)}
-																			/>
-																		</div>
-																		<div className="flex items-center gap-4 text-xs text-muted-foreground">
-																			<span>
-																				Size: {formatBytes(file.Size)}
-																			</span>
-																			{file.IsDir && (
-																				<span className="text-blue-500">
-																					Directory
-																				</span>
-																			)}
-																			{file.Hashes?.MD5 && (
-																				<span>MD5: {file.Hashes.MD5}</span>
-																			)}
-																		</div>
+																	<div className="flex w-full justify-between">
+																		<span>{file}</span>
 																	</div>
+																	<CheckIcon
+																		className={cn(
+																			"ml-auto h-4 w-4",
+																			file === field.value
+																				? "opacity-100"
+																				: "opacity-0",
+																		)}
+																	/>
 																</CommandItem>
 															))}
 														</CommandGroup>
@@ -517,270 +337,25 @@ export const RestoreBackup = ({
 							control={form.control}
 							name="databaseName"
 							render={({ field }) => (
-								<FormItem>
+								<FormItem className="">
 									<FormLabel>Database Name</FormLabel>
 									<FormControl>
-										<Input placeholder="Enter database name" {...field} />
+										<Input
+											disabled={databaseType === "web-server"}
+											{...field}
+											placeholder="Enter database name"
+										/>
 									</FormControl>
 									<FormMessage />
 								</FormItem>
 							)}
 						/>
-
-						{backupType === "compose" && (
-							<>
-								<FormField
-									control={form.control}
-									name="databaseType"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Database Type</FormLabel>
-											<Select
-												value={field.value}
-												onValueChange={(value: DatabaseType) => {
-													field.onChange(value);
-													form.setValue("metadata", {});
-												}}
-											>
-												<SelectTrigger>
-													<SelectValue placeholder="Select database type" />
-												</SelectTrigger>
-												<SelectContent>
-													<SelectItem value="postgres">PostgreSQL</SelectItem>
-													<SelectItem value="mariadb">MariaDB</SelectItem>
-													<SelectItem value="mongo">MongoDB</SelectItem>
-													<SelectItem value="mysql">MySQL</SelectItem>
-												</SelectContent>
-											</Select>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
-								<FormField
-									control={form.control}
-									name="serviceName"
-									render={({ field }) => (
-										<FormItem className="w-full">
-											<FormLabel>Service Name</FormLabel>
-											<div className="flex gap-2">
-												<Select
-													onValueChange={field.onChange}
-													value={field.value || undefined}
-												>
-													<FormControl>
-														<SelectTrigger>
-															<SelectValue placeholder="Select a service name" />
-														</SelectTrigger>
-													</FormControl>
-
-													<SelectContent>
-														{services?.map((service, index) => (
-															<SelectItem
-																value={service}
-																key={`${service}-${index}`}
-															>
-																{service}
-															</SelectItem>
-														))}
-														{(!services || services.length === 0) && (
-															<SelectItem value="none" disabled>
-																Empty
-															</SelectItem>
-														)}
-													</SelectContent>
-												</Select>
-												<TooltipProvider delayDuration={0}>
-													<Tooltip>
-														<TooltipTrigger asChild>
-															<Button
-																variant="secondary"
-																type="button"
-																isLoading={isLoadingServices}
-																onClick={() => {
-																	if (cacheType === "fetch") {
-																		refetchServices();
-																	} else {
-																		setCacheType("fetch");
-																	}
-																}}
-															>
-																<RefreshCw className="size-4 text-muted-foreground" />
-															</Button>
-														</TooltipTrigger>
-														<TooltipContent
-															side="left"
-															sideOffset={5}
-															className="max-w-[10rem]"
-														>
-															<p>
-																Fetch: Will clone the repository and load the
-																services
-															</p>
-														</TooltipContent>
-													</Tooltip>
-												</TooltipProvider>
-												<TooltipProvider delayDuration={0}>
-													<Tooltip>
-														<TooltipTrigger asChild>
-															<Button
-																variant="secondary"
-																type="button"
-																isLoading={isLoadingServices}
-																onClick={() => {
-																	if (cacheType === "cache") {
-																		refetchServices();
-																	} else {
-																		setCacheType("cache");
-																	}
-																}}
-															>
-																<DatabaseZap className="size-4 text-muted-foreground" />
-															</Button>
-														</TooltipTrigger>
-														<TooltipContent
-															side="left"
-															sideOffset={5}
-															className="max-w-[10rem]"
-														>
-															<p>
-																Cache: If you previously deployed this compose,
-																it will read the services from the last
-																deployment/fetch from the repository
-															</p>
-														</TooltipContent>
-													</Tooltip>
-												</TooltipProvider>
-											</div>
-
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
-								{currentDatabaseType === "postgres" && (
-									<FormField
-										control={form.control}
-										name="metadata.postgres.databaseUser"
-										render={({ field }) => (
-											<FormItem>
-												<FormLabel>Database User</FormLabel>
-												<FormControl>
-													<Input placeholder="Enter database user" {...field} />
-												</FormControl>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								)}
-
-								{currentDatabaseType === "mariadb" && (
-									<>
-										<FormField
-											control={form.control}
-											name="metadata.mariadb.databaseUser"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Database User</FormLabel>
-													<FormControl>
-														<Input
-															placeholder="Enter database user"
-															{...field}
-														/>
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-										<FormField
-											control={form.control}
-											name="metadata.mariadb.databasePassword"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Database Password</FormLabel>
-													<FormControl>
-														<Input
-															type="password"
-															placeholder="Enter database password"
-															{...field}
-														/>
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-									</>
-								)}
-
-								{currentDatabaseType === "mongo" && (
-									<>
-										<FormField
-											control={form.control}
-											name="metadata.mongo.databaseUser"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Database User</FormLabel>
-													<FormControl>
-														<Input
-															placeholder="Enter database user"
-															{...field}
-														/>
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-										<FormField
-											control={form.control}
-											name="metadata.mongo.databasePassword"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Database Password</FormLabel>
-													<FormControl>
-														<Input
-															type="password"
-															placeholder="Enter database password"
-															{...field}
-														/>
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-									</>
-								)}
-
-								{currentDatabaseType === "mysql" && (
-									<FormField
-										control={form.control}
-										name="metadata.mysql.databaseRootPassword"
-										render={({ field }) => (
-											<FormItem>
-												<FormLabel>Root Password</FormLabel>
-												<FormControl>
-													<Input
-														type="password"
-														placeholder="Enter root password"
-														{...field}
-													/>
-												</FormControl>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								)}
-							</>
-						)}
-
 						<DialogFooter>
 							<Button
 								isLoading={isDeploying}
 								form="hook-form-restore-backup"
 								type="submit"
-								disabled={
-									!form.watch("backupFile") ||
-									(backupType === "compose" && !form.watch("databaseType"))
-								}
+								disabled={!form.watch("backupFile")}
 							>
 								Restore
 							</Button>

apps/dokploy/components/dashboard/database/backups/show-backups.tsx

@@ -19,71 +19,44 @@ import Link from "next/link";
 import { useState } from "react";
 import { toast } from "sonner";
 import type { ServiceType } from "../../application/advanced/show-resources";
+import { AddBackup } from "./add-backup";
 import { RestoreBackup } from "./restore-backup";
-import { HandleBackup } from "./handle-backup";
-import { cn } from "@/lib/utils";
-import {
-	MariadbIcon,
-	MongodbIcon,
-	MysqlIcon,
-	PostgresqlIcon,
-} from "@/components/icons/data-tools-icons";
-import { AlertBlock } from "@/components/shared/alert-block";
+import { UpdateBackup } from "./update-backup";
 
 interface Props {
 	id: string;
-	databaseType?: Exclude<ServiceType, "application" | "redis"> | "web-server";
-	backupType?: "database" | "compose";
+	type: Exclude<ServiceType, "application" | "redis"> | "web-server";
 }
-export const ShowBackups = ({
-	id,
-	databaseType,
-	backupType = "database",
-}: Props) => {
+export const ShowBackups = ({ id, type }: Props) => {
 	const [activeManualBackup, setActiveManualBackup] = useState<
 		string | undefined
 	>();
-	const queryMap =
-		backupType === "database"
-			? {
-					postgres: () =>
-						api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-					mysql: () =>
-						api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-					mariadb: () =>
-						api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-					mongo: () =>
-						api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-					"web-server": () => api.user.getBackups.useQuery(),
-				}
-			: {
-					compose: () =>
-						api.compose.one.useQuery({ composeId: id }, { enabled: !!id }),
-				};
+	const queryMap = {
+		postgres: () =>
+			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
+		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
+		mariadb: () =>
+			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
+		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
+		"web-server": () => api.user.getBackups.useQuery(),
+	};
 	const { data } = api.destination.all.useQuery();
-	const key = backupType === "database" ? databaseType : "compose";
-	const query = queryMap[key as keyof typeof queryMap];
-	const { data: postgres, refetch } = query
-		? query()
+	const { data: postgres, refetch } = queryMap[type]
+		? queryMap[type]()
 		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
 
-	const mutationMap =
-		backupType === "database"
-			? {
-					postgres: api.backup.manualBackupPostgres.useMutation(),
-					mysql: api.backup.manualBackupMySql.useMutation(),
-					mariadb: api.backup.manualBackupMariadb.useMutation(),
-					mongo: api.backup.manualBackupMongo.useMutation(),
-					"web-server": api.backup.manualBackupWebServer.useMutation(),
-				}
-			: {
-					compose: api.backup.manualBackupCompose.useMutation(),
-				};
+	const mutationMap = {
+		postgres: () => api.backup.manualBackupPostgres.useMutation(),
+		mysql: () => api.backup.manualBackupMySql.useMutation(),
+		mariadb: () => api.backup.manualBackupMariadb.useMutation(),
+		mongo: () => api.backup.manualBackupMongo.useMutation(),
+		"web-server": () => api.backup.manualBackupWebServer.useMutation(),
+	};
 
-	const mutation = mutationMap[key as keyof typeof mutationMap];
-
-	const { mutateAsync: manualBackup, isLoading: isManualBackup } = mutation
-		? mutation
+	const { mutateAsync: manualBackup, isLoading: isManualBackup } = mutationMap[
+		type
+	]
+		? mutationMap[type]()
 		: api.backup.manualBackupMongo.useMutation();
 
 	const { mutateAsync: deleteBackup, isLoading: isRemoving } =
@@ -105,18 +78,16 @@ export const ShowBackups = ({
 
 				{postgres && postgres?.backups?.length > 0 && (
 					<div className="flex flex-col lg:flex-row gap-4 w-full lg:w-auto">
-						{databaseType !== "web-server" && (
-							<HandleBackup
-								id={id}
-								databaseType={databaseType}
-								backupType={backupType}
+						{type !== "web-server" && (
+							<AddBackup
+								databaseId={id}
+								databaseType={type}
 								refetch={refetch}
 							/>
 						)}
 						<RestoreBackup
-							id={id}
-							databaseType={databaseType}
-							backupType={backupType}
+							databaseId={id}
+							databaseType={type}
 							serverId={"serverId" in postgres ? postgres.serverId : undefined}
 						/>
 					</div>
@@ -139,7 +110,7 @@ export const ShowBackups = ({
 						</span>
 					</div>
 				) : (
-					<div className="flex flex-col gap-4 w-full">
+					<div>
 						{postgres?.backups.length === 0 ? (
 							<div className="flex w-full flex-col items-center justify-center gap-3 pt-10">
 								<DatabaseBackup className="size-8 text-muted-foreground" />
@@ -147,15 +118,14 @@ export const ShowBackups = ({
 									No backups configured
 								</span>
 								<div className="flex flex-col sm:flex-row gap-4 w-full sm:w-auto">
-									<HandleBackup
-										id={id}
-										databaseType={databaseType}
-										backupType={backupType}
+									<AddBackup
+										databaseId={id}
+										databaseType={type}
 										refetch={refetch}
 									/>
 									<RestoreBackup
-										id={id}
-										databaseType={databaseType}
+										databaseId={id}
+										databaseType={type}
 										serverId={
 											"serverId" in postgres ? postgres.serverId : undefined
 										}
@@ -163,118 +133,56 @@ export const ShowBackups = ({
 								</div>
 							</div>
 						) : (
-							<div className="flex flex-col pt-2 gap-4">
-								{backupType === "compose" && (
-									<AlertBlock title="Compose Backups">
-										Make sure the compose is running before creating a backup.
-									</AlertBlock>
-								)}
+							<div className="flex flex-col pt-2">
 								<div className="flex flex-col gap-6">
 									{postgres?.backups.map((backup) => (
 										<div key={backup.backupId}>
-											<div className="flex w-full flex-col md:flex-row md:items-start justify-between gap-4 border rounded-lg p-4 hover:bg-muted/50 transition-colors">
-												<div className="flex flex-col w-full gap-4">
-													<div className="flex items-center gap-3">
-														{backup.backupType === "compose" && (
-															<div className="flex items-center justify-center size-10 rounded-lg">
-																{backup.databaseType === "postgres" && (
-																	<PostgresqlIcon className="size-7" />
-																)}
-																{backup.databaseType === "mysql" && (
-																	<MysqlIcon className="size-7" />
-																)}
-																{backup.databaseType === "mariadb" && (
-																	<MariadbIcon className="size-7" />
-																)}
-																{backup.databaseType === "mongo" && (
-																	<MongodbIcon className="size-7" />
-																)}
-															</div>
-														)}
-														<div className="flex flex-col gap-1">
-															{backup.backupType === "compose" && (
-																<div className="flex items-center gap-2">
-																	<h3 className="font-medium">
-																		{backup.serviceName}
-																	</h3>
-																	<span className="px-1.5 py-0.5 rounded-full bg-muted text-xs font-medium capitalize">
-																		{backup.databaseType}
-																	</span>
-																</div>
-															)}
-															<div className="flex items-center gap-2">
-																<div
-																	className={cn(
-																		"size-1.5 rounded-full",
-																		backup.enabled
-																			? "bg-green-500"
-																			: "bg-red-500",
-																	)}
-																/>
-																<span className="text-xs text-muted-foreground">
-																	{backup.enabled ? "Active" : "Inactive"}
-																</span>
-															</div>
-														</div>
+											<div className="flex w-full flex-col md:flex-row md:items-center justify-between gap-4 md:gap-10 border rounded-lg p-4">
+												<div className="grid grid-cols-1 md:grid-cols-3 xl:grid-cols-6 flex-col gap-8">
+													<div className="flex flex-col gap-1">
+														<span className="font-medium">Destination</span>
+														<span className="text-sm text-muted-foreground">
+															{backup.destination.name}
+														</span>
 													</div>
-
-													<div className="flex flex-wrap gap-x-8 gap-y-2">
-														<div className="min-w-[200px]">
-															<span className="text-sm font-medium text-muted-foreground">
-																Destination
-															</span>
-															<p className="font-medium text-sm mt-0.5">
-																{backup.destination.name}
-															</p>
-														</div>
-
-														<div className="min-w-[150px]">
-															<span className="text-sm font-medium text-muted-foreground">
-																Database
-															</span>
-															<p className="font-medium text-sm mt-0.5">
-																{backup.database}
-															</p>
-														</div>
-
-														<div className="min-w-[120px]">
-															<span className="text-sm font-medium text-muted-foreground">
-																Schedule
-															</span>
-															<p className="font-medium text-sm mt-0.5">
-																{backup.schedule}
-															</p>
-														</div>
-
-														<div className="min-w-[150px]">
-															<span className="text-sm font-medium text-muted-foreground">
-																Prefix Storage
-															</span>
-															<p className="font-medium text-sm mt-0.5">
-																{backup.prefix}
-															</p>
-														</div>
-
-														<div className="min-w-[100px]">
-															<span className="text-sm font-medium text-muted-foreground">
-																Keep Latest
-															</span>
-															<p className="font-medium text-sm mt-0.5">
-																{backup.keepLatestCount || "All"}
-															</p>
-														</div>
+													<div className="flex flex-col gap-1">
+														<span className="font-medium">Database</span>
+														<span className="text-sm text-muted-foreground">
+															{backup.database}
+														</span>
+													</div>
+													<div className="flex flex-col gap-1">
+														<span className="font-medium">Scheduled</span>
+														<span className="text-sm text-muted-foreground">
+															{backup.schedule}
+														</span>
+													</div>
+													<div className="flex flex-col gap-1">
+														<span className="font-medium">Prefix Storage</span>
+														<span className="text-sm text-muted-foreground">
+															{backup.prefix}
+														</span>
+													</div>
+													<div className="flex flex-col gap-1">
+														<span className="font-medium">Enabled</span>
+														<span className="text-sm text-muted-foreground">
+															{backup.enabled ? "Yes" : "No"}
+														</span>
+													</div>
+													<div className="flex flex-col gap-1">
+														<span className="font-medium">Keep Latest</span>
+														<span className="text-sm text-muted-foreground">
+															{backup.keepLatestCount || "All"}
+														</span>
 													</div>
 												</div>
-
-												<div className="flex flex-row md:flex-col gap-1.5">
+												<div className="flex flex-row gap-4">
 													<TooltipProvider delayDuration={0}>
 														<Tooltip>
 															<TooltipTrigger asChild>
 																<Button
 																	type="button"
 																	variant="ghost"
-																	size="icon"
-																	className="size-8"
 																	isLoading={
 																		isManualBackup &&
 																		activeManualBackup === backup.backupId
@@ -297,15 +205,14 @@ export const ShowBackups = ({
 																		setActiveManualBackup(undefined);
 																	}}
 																>
-																	<Play className="size-4 " />
+																	<Play className="size-5  text-muted-foreground" />
 																</Button>
 															</TooltipTrigger>
 															<TooltipContent>Run Manual Backup</TooltipContent>
 														</Tooltip>
 													</TooltipProvider>
 
-													<HandleBackup
-														backupType={backup.backupType}
+													<UpdateBackup
 														backupId={backup.backupId}
 														refetch={refetch}
 													/>
@@ -329,7 +236,7 @@ export const ShowBackups = ({
 														<Button
 															variant="ghost"
 															size="icon"
-															className="group hover:bg-red-500/10 size-8"
+															className="group hover:bg-red-500/10"
 															isLoading={isRemoving}
 														>
 															<Trash2 className="size-4 text-primary group-hover:text-red-500" />

apps/dokploy/components/dashboard/database/backups/update-backup.tsx

@@ -0,0 +1,329 @@
+import { Button } from "@/components/ui/button";
+import {
+	Command,
+	CommandEmpty,
+	CommandGroup,
+	CommandInput,
+	CommandItem,
+} from "@/components/ui/command";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+	Popover,
+	PopoverContent,
+	PopoverTrigger,
+} from "@/components/ui/popover";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import { Switch } from "@/components/ui/switch";
+import { cn } from "@/lib/utils";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { CheckIcon, ChevronsUpDown, PenBoxIcon } from "lucide-react";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+
+const UpdateBackupSchema = z.object({
+	destinationId: z.string().min(1, "Destination required"),
+	schedule: z.string().min(1, "Schedule (Cron) required"),
+	prefix: z.string().min(1, "Prefix required"),
+	enabled: z.boolean(),
+	database: z.string().min(1, "Database required"),
+	keepLatestCount: z.coerce.number().optional(),
+});
+
+type UpdateBackup = z.infer<typeof UpdateBackupSchema>;
+
+interface Props {
+	backupId: string;
+	refetch: () => void;
+}
+
+export const UpdateBackup = ({ backupId, refetch }: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
+	const { data, isLoading } = api.destination.all.useQuery();
+	const { data: backup } = api.backup.one.useQuery(
+		{
+			backupId,
+		},
+		{
+			enabled: !!backupId,
+		},
+	);
+
+	const { mutateAsync, isLoading: isLoadingUpdate } =
+		api.backup.update.useMutation();
+
+	const form = useForm<UpdateBackup>({
+		defaultValues: {
+			database: "",
+			destinationId: "",
+			enabled: true,
+			prefix: "/",
+			schedule: "",
+			keepLatestCount: undefined,
+		},
+		resolver: zodResolver(UpdateBackupSchema),
+	});
+
+	useEffect(() => {
+		if (backup) {
+			form.reset({
+				database: backup.database,
+				destinationId: backup.destinationId,
+				enabled: backup.enabled || false,
+				prefix: backup.prefix,
+				schedule: backup.schedule,
+				keepLatestCount: backup.keepLatestCount
+					? Number(backup.keepLatestCount)
+					: undefined,
+			});
+		}
+	}, [form, form.reset, backup]);
+
+	const onSubmit = async (data: UpdateBackup) => {
+		await mutateAsync({
+			backupId,
+			destinationId: data.destinationId,
+			prefix: data.prefix,
+			schedule: data.schedule,
+			enabled: data.enabled,
+			database: data.database,
+			keepLatestCount: data.keepLatestCount as number | null,
+		})
+			.then(async () => {
+				toast.success("Backup Updated");
+				refetch();
+				setIsOpen(false);
+			})
+			.catch(() => {
+				toast.error("Error updating the Backup");
+			});
+	};
+
+	return (
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+			<DialogTrigger asChild>
+				<Button
+					variant="ghost"
+					size="icon"
+					className="group hover:bg-blue-500/10 "
+				>
+					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
+				</Button>
+			</DialogTrigger>
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-lg">
+				<DialogHeader>
+					<DialogTitle>Update Backup</DialogTitle>
+					<DialogDescription>Update the backup</DialogDescription>
+				</DialogHeader>
+
+				<Form {...form}>
+					<form
+						id="hook-form-update-backup"
+						onSubmit={form.handleSubmit(onSubmit)}
+						className="grid w-full gap-4"
+					>
+						<div className="grid grid-cols-1 gap-4">
+							<FormField
+								control={form.control}
+								name="destinationId"
+								render={({ field }) => (
+									<FormItem className="">
+										<FormLabel>Destination</FormLabel>
+										<Popover>
+											<PopoverTrigger asChild>
+												<FormControl>
+													<Button
+														variant="outline"
+														className={cn(
+															"w-full justify-between !bg-input",
+															!field.value && "text-muted-foreground",
+														)}
+													>
+														{isLoading
+															? "Loading...."
+															: field.value
+																? data?.find(
+																		(destination) =>
+																			destination.destinationId === field.value,
+																	)?.name
+																: "Select Destination"}
+
+														<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+													</Button>
+												</FormControl>
+											</PopoverTrigger>
+											<PopoverContent className="p-0" align="start">
+												<Command>
+													<CommandInput
+														placeholder="Search Destination..."
+														className="h-9"
+													/>
+													{isLoading && (
+														<span className="py-6 text-center text-sm">
+															Loading Destinations....
+														</span>
+													)}
+													<CommandEmpty>No destinations found.</CommandEmpty>
+													<ScrollArea className="h-64">
+														<CommandGroup>
+															{data?.map((destination) => (
+																<CommandItem
+																	value={destination.destinationId}
+																	key={destination.destinationId}
+																	onSelect={() => {
+																		form.setValue(
+																			"destinationId",
+																			destination.destinationId,
+																		);
+																	}}
+																>
+																	{destination.name}
+																	<CheckIcon
+																		className={cn(
+																			"ml-auto h-4 w-4",
+																			destination.destinationId === field.value
+																				? "opacity-100"
+																				: "opacity-0",
+																		)}
+																	/>
+																</CommandItem>
+															))}
+														</CommandGroup>
+													</ScrollArea>
+												</Command>
+											</PopoverContent>
+										</Popover>
+
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+							<FormField
+								control={form.control}
+								name="database"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Database</FormLabel>
+											<FormControl>
+												<Input placeholder={"dokploy"} {...field} />
+											</FormControl>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="schedule"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Schedule (Cron)</FormLabel>
+											<FormControl>
+												<Input placeholder={"0 0 * * *"} {...field} />
+											</FormControl>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="prefix"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Prefix Destination</FormLabel>
+											<FormControl>
+												<Input placeholder={"dokploy/"} {...field} />
+											</FormControl>
+											<FormDescription>
+												Use if you want to back up in a specific path of your
+												destination/bucket
+											</FormDescription>
+
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="keepLatestCount"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel>Keep the latest</FormLabel>
+											<FormControl>
+												<Input
+													type="number"
+													placeholder={"keeps all the backups if left empty"}
+													{...field}
+												/>
+											</FormControl>
+											<FormDescription>
+												Optional. If provided, only keeps the latest N backups
+												in the cloud.
+											</FormDescription>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
+							<FormField
+								control={form.control}
+								name="enabled"
+								render={({ field }) => (
+									<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 ">
+										<div className="space-y-0.5">
+											<FormLabel>Enabled</FormLabel>
+											<FormDescription>
+												Enable or disable the backup
+											</FormDescription>
+										</div>
+										<FormControl>
+											<Switch
+												checked={field.value}
+												onCheckedChange={field.onChange}
+											/>
+										</FormControl>
+									</FormItem>
+								)}
+							/>
+						</div>
+						<DialogFooter>
+							<Button
+								isLoading={isLoadingUpdate}
+								form="hook-form-update-backup"
+								type="submit"
+							>
+								Update
+							</Button>
+						</DialogFooter>
+					</form>
+				</Form>
+			</DialogContent>
+		</Dialog>
+	);
+};

apps/dokploy/components/dashboard/settings/ai-form.tsx

@@ -55,7 +55,7 @@ export const AiForm = () => {
 												key={config.aiId}
 												className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
 											>
-												<div className="flex items-center justify-between p-3.5 rounded-lg bg-background border  w-full">
+												<div className="flex items-center justify-between  p-3.5 rounded-lg bg-background border  w-full">
 													<div>
 														<span className="text-sm font-medium">
 															{config.name}

apps/dokploy/components/dashboard/settings/certificates/show-certificates.tsx

@@ -70,7 +70,7 @@ export const ShowCertificates = () => {
 														key={certificate.certificateId}
 														className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
 													>
-														<div className="flex items-center justify-between p-3.5 rounded-lg bg-background border  w-full">
+														<div className="flex items-center justify-between  p-3.5 rounded-lg bg-background border  w-full">
 															<div className="flex items-center justify-between">
 																<div className="flex gap-2 flex-col">
 																	<span className="text-sm font-medium">

apps/dokploy/components/dashboard/settings/certificates/utils.ts

@@ -13,65 +13,53 @@ export const extractExpirationDate = (certData: string): Date | null => {
 			bytes[i] = binaryStr.charCodeAt(i);
 		}
 
-		// ASN.1 tag for UTCTime is 0x17, GeneralizedTime is 0x18
-		// We need to find the second occurrence of either tag as it's the "not after" (expiration) date
-		let dateFound = false;
+		let dateFound = 0;
 		for (let i = 0; i < bytes.length - 2; i++) {
-			// Look for sequence containing validity period (0x30)
-			if (bytes[i] === 0x30) {
-				// Check next bytes for UTCTime or GeneralizedTime
-				let j = i + 1;
-				while (j < bytes.length - 2) {
-					if (bytes[j] === 0x17 || bytes[j] === 0x18) {
-						const dateType = bytes[j];
-						const dateLength = bytes[j + 1];
-						if (typeof dateLength === "undefined") break;
+			if (bytes[i] === 0x17 || bytes[i] === 0x18) {
+				const dateType = bytes[i];
+				const dateLength = bytes[i + 1];
+				if (typeof dateLength === "undefined") continue;
 
-						if (!dateFound) {
-							// Skip "not before" date
-							dateFound = true;
-							j += dateLength + 2;
-							continue;
-						}
-
-						// Found "not after" date
-						let dateStr = "";
-						for (let k = 0; k < dateLength; k++) {
-							const charCode = bytes[j + 2 + k];
-							if (typeof charCode === "undefined") continue;
-							dateStr += String.fromCharCode(charCode);
-						}
-
-						if (dateType === 0x17) {
-							// UTCTime (YYMMDDhhmmssZ)
-							const year = Number.parseInt(dateStr.slice(0, 2));
-							const fullYear = year >= 50 ? 1900 + year : 2000 + year;
-							return new Date(
-								Date.UTC(
-									fullYear,
-									Number.parseInt(dateStr.slice(2, 4)) - 1,
-									Number.parseInt(dateStr.slice(4, 6)),
-									Number.parseInt(dateStr.slice(6, 8)),
-									Number.parseInt(dateStr.slice(8, 10)),
-									Number.parseInt(dateStr.slice(10, 12)),
-								),
-							);
-						}
-
-						// GeneralizedTime (YYYYMMDDhhmmssZ)
-						return new Date(
-							Date.UTC(
-								Number.parseInt(dateStr.slice(0, 4)),
-								Number.parseInt(dateStr.slice(4, 6)) - 1,
-								Number.parseInt(dateStr.slice(6, 8)),
-								Number.parseInt(dateStr.slice(8, 10)),
-								Number.parseInt(dateStr.slice(10, 12)),
-								Number.parseInt(dateStr.slice(12, 14)),
-							),
-						);
-					}
-					j++;
+				if (dateFound === 0) {
+					dateFound++;
+					i += dateLength + 1;
+					continue;
 				}
+
+				let dateStr = "";
+				for (let j = 0; j < dateLength; j++) {
+					const charCode = bytes[i + 2 + j];
+					if (typeof charCode === "undefined") continue;
+					dateStr += String.fromCharCode(charCode);
+				}
+
+				if (dateType === 0x17) {
+					// UTCTime (YYMMDDhhmmssZ)
+					const year = Number.parseInt(dateStr.slice(0, 2));
+					const fullYear = year >= 50 ? 1900 + year : 2000 + year;
+					return new Date(
+						Date.UTC(
+							fullYear,
+							Number.parseInt(dateStr.slice(2, 4)) - 1,
+							Number.parseInt(dateStr.slice(4, 6)),
+							Number.parseInt(dateStr.slice(6, 8)),
+							Number.parseInt(dateStr.slice(8, 10)),
+							Number.parseInt(dateStr.slice(10, 12)),
+						),
+					);
+				}
+
+				// GeneralizedTime (YYYYMMDDhhmmssZ)
+				return new Date(
+					Date.UTC(
+						Number.parseInt(dateStr.slice(0, 4)),
+						Number.parseInt(dateStr.slice(4, 6)) - 1,
+						Number.parseInt(dateStr.slice(6, 8)),
+						Number.parseInt(dateStr.slice(8, 10)),
+						Number.parseInt(dateStr.slice(10, 12)),
+						Number.parseInt(dateStr.slice(12, 14)),
+					),
+				);
 			}
 		}
 		return null;

apps/dokploy/components/dashboard/settings/cluster/registry/show-registry.tsx

@@ -54,7 +54,7 @@ export const ShowRegistry = () => {
 													key={registry.registryId}
 													className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
 												>
-													<div className="flex items-center justify-between p-3.5 rounded-lg bg-background border  w-full">
+													<div className="flex items-center justify-between  p-3.5 rounded-lg bg-background border  w-full">
 														<div className="flex items-center justify-between">
 															<div className="flex gap-2 flex-col">
 																<span className="text-sm font-medium">

apps/dokploy/components/dashboard/settings/destination/show-destinations.tsx

@@ -55,7 +55,7 @@ export const ShowDestinations = () => {
 													key={destination.destinationId}
 													className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
 												>
-													<div className="flex items-center justify-between p-3.5 rounded-lg bg-background border  w-full">
+													<div className="flex items-center justify-between  p-3.5 rounded-lg bg-background border  w-full">
 														<div className="flex flex-col gap-1">
 															<span className="text-sm">
 																{index + 1}. {destination.name}

apps/dokploy/components/dashboard/settings/enable-paid-features.tsx

@@ -1,191 +0,0 @@
-import { Card } from "@/components/ui/card";
-import {
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import { SparklesIcon } from "lucide-react";
-import { Switch } from "@/components/ui/switch";
-import { toast } from "sonner";
-import { api } from "@/utils/api";
-import { SetupMonitoring } from "./servers/setup-monitoring";
-import { Input } from "@/components/ui/input";
-import { Button } from "@/components/ui/button";
-import { useState, useEffect } from "react";
-
-export const EnablePaidFeatures = () => {
-	const { data, refetch } = api.user.get.useQuery();
-	const [isLoading, setIsLoading] = useState(false);
-	const { mutateAsync: saveLicense } = api.user.saveLicense.useMutation();
-	const { mutateAsync: deactivateLicense } =
-		api.user.deactivateLicense.useMutation();
-	const { mutateAsync: validateLicense } =
-		api.user.validateLicense.useMutation();
-	const { mutateAsync: update } = api.user.update.useMutation();
-	const [licenseKey, setLicenseKey] = useState("");
-
-	useEffect(() => {
-		if (data?.user?.enablePaidFeatures) {
-			setLicenseKey(data.user.licenseKey || "");
-		}
-	}, [data?.user?.enablePaidFeatures]);
-
-	const handleSaveLicense = async () => {
-		if (!licenseKey) {
-			toast.error("Please enter a license key");
-			return;
-		}
-		setIsLoading(true);
-		await saveLicense({
-			licenseKey,
-		})
-			.then(() => {
-				toast.success("License validated successfully");
-			})
-			.catch((e) => {
-				toast.error("Error validating license", {
-					description: e.message,
-				});
-			})
-			.finally(() => {
-				setIsLoading(false);
-			});
-
-		refetch();
-	};
-
-	const handleValidateLicense = async () => {
-		if (!licenseKey) {
-			toast.error("Please enter a license key");
-			return;
-		}
-		setIsLoading(true);
-		await validateLicense({
-			licenseKey,
-		})
-			.then(() => {
-				toast.success("License validated successfully");
-			})
-			.catch((e) => {
-				toast.error("Error validating license", {
-					description: e.message,
-				});
-			})
-			.finally(() => {
-				setIsLoading(false);
-			});
-	};
-
-	return (
-		<Card className="h-full bg-sidebar p-2.5 rounded-xl">
-			<div className="rounded-xl bg-background shadow-md">
-				<CardHeader>
-					<CardTitle className="text-xl flex flex-row items-center gap-3">
-						<div className="p-2 rounded-lg bg-primary/10">
-							<SparklesIcon className="size-5 text-primary" />
-						</div>
-						Paid Features
-					</CardTitle>
-					<CardDescription className="mt-2">
-						Unlock advanced capabilities like monitoring and enhanced
-						performance tracking
-					</CardDescription>
-				</CardHeader>
-				<CardContent className="space-y-6">
-					<div className="flex flex-col gap-6">
-						<div className="flex flex-row items-center justify-between p-4 border rounded-lg bg-card/50 hover:bg-card/80 transition-colors">
-							<div className="space-y-1">
-								<h3 className="font-medium">Enable Premium Features</h3>
-								<p className="text-sm text-muted-foreground">
-									Access advanced monitoring tools and premium capabilities
-								</p>
-							</div>
-							<Switch
-								className="ml-4"
-								checked={data?.user?.enablePaidFeatures}
-								onCheckedChange={() => {
-									update({
-										enablePaidFeatures: !data?.user?.enablePaidFeatures,
-									})
-										.then(() => {
-											toast.success(
-												`Premium features ${
-													data?.user?.enablePaidFeatures
-														? "disabled"
-														: "enabled"
-												} successfully`,
-											);
-											refetch();
-										})
-										.catch(() => {
-											toast.error("Error updating premium features");
-										});
-								}}
-							/>
-						</div>
-
-						{data?.user?.enablePaidFeatures && (
-							<div className="flex flex-row items-center gap-4 p-4 border rounded-lg bg-card/50">
-								<div className="flex-grow">
-									<Input
-										placeholder="Enter your license key"
-										value={licenseKey}
-										disabled={data?.user?.licenseKey !== null}
-										onChange={(e) => setLicenseKey(e.target.value)}
-										className="w-full"
-									/>
-								</div>
-								{!data?.user?.licenseKey ? (
-									<Button
-										onClick={handleSaveLicense}
-										variant="secondary"
-										disabled={isLoading}
-									>
-										{isLoading ? "Saving..." : "Save License"}
-									</Button>
-								) : (
-									<div className="flex gap-2">
-										<Button
-											onClick={handleValidateLicense}
-											variant="secondary"
-											disabled={isLoading}
-										>
-											{isLoading ? "Validating..." : "Validate"}
-										</Button>
-										<Button
-											onClick={() => {
-												setIsLoading(true);
-												deactivateLicense({
-													licenseKey,
-												})
-													.then(() => {
-														setLicenseKey("");
-														toast.success("License removed successfully");
-														refetch();
-													})
-													.catch((e) => {
-														toast.error("Error removing license", {
-															description: e.message,
-														});
-													})
-													.finally(() => {
-														setIsLoading(false);
-													});
-											}}
-											variant="destructive"
-											disabled={isLoading}
-										>
-											Remove
-										</Button>
-									</div>
-								)}
-							</div>
-						)}
-					</div>
-				</CardContent>
-				{data?.user?.enablePaidFeatures && <SetupMonitoring />}
-			</div>
-		</Card>
-	);
-};

apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx

@@ -248,9 +248,7 @@ export const AddGitlabProvider = () => {
 									name="groupName"
 									render={({ field }) => (
 										<FormItem>
-											<FormLabel>
-												Group Name (Optional, Comma-Separated List)
-											</FormLabel>
+											<FormLabel>Group Name (Optional)</FormLabel>
 											<FormControl>
 												<Input
 													placeholder="For organization/group access use the slugish name of the group eg: my-org"

apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx

@@ -156,9 +156,7 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => {
 									name="groupName"
 									render={({ field }) => (
 										<FormItem>
-											<FormLabel>
-												Group Name (Optional, Comma-Separated List)
-											</FormLabel>
+											<FormLabel>Group Name (Optional)</FormLabel>
 											<FormControl>
 												<Input
 													placeholder="For organization/group access use the slugish name of the group eg: my-org"

apps/dokploy/components/dashboard/settings/notifications/show-notifications.tsx

@@ -61,7 +61,7 @@ export const ShowNotifications = () => {
 													key={notification.notificationId}
 													className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
 												>
-													<div className="flex items-center justify-between p-3.5 rounded-lg bg-background border  w-full">
+													<div className="flex items-center justify-between  p-3.5 rounded-lg bg-background border  w-full">
 														<span className="text-sm flex flex-row items-center gap-4">
 															{notification.notificationType === "slack" && (
 																<div className="flex  items-center justify-center rounded-lg">

apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx

@@ -36,7 +36,6 @@ const PasswordSchema = z.object({
 	password: z.string().min(8, {
 		message: "Password is required",
 	}),
-	issuer: z.string().optional(),
 });
 
 const PinSchema = z.object({
@@ -61,86 +60,12 @@ export const Enable2FA = () => {
 	const [isDialogOpen, setIsDialogOpen] = useState(false);
 	const [step, setStep] = useState<"password" | "verify">("password");
 	const [isPasswordLoading, setIsPasswordLoading] = useState(false);
-	const [otpValue, setOtpValue] = useState("");
-
-	const handleVerifySubmit = async (e: React.FormEvent) => {
-		e.preventDefault();
-		try {
-			const result = await authClient.twoFactor.verifyTotp({
-				code: otpValue,
-			});
-
-			if (result.error) {
-				if (result.error.code === "INVALID_TWO_FACTOR_AUTHENTICATION") {
-					toast.error("Invalid verification code");
-					return;
-				}
-
-				throw result.error;
-			}
-
-			if (!result.data) {
-				throw new Error("No response received from server");
-			}
-
-			toast.success("2FA configured successfully");
-			utils.user.get.invalidate();
-			setIsDialogOpen(false);
-		} catch (error) {
-			if (error instanceof Error) {
-				const errorMessage =
-					error.message === "Failed to fetch"
-						? "Connection error. Please check your internet connection."
-						: error.message;
-
-				toast.error(errorMessage);
-			} else {
-				toast.error("Error verifying 2FA code", {
-					description: error instanceof Error ? error.message : "Unknown error",
-				});
-			}
-		}
-	};
-
-	const passwordForm = useForm<PasswordForm>({
-		resolver: zodResolver(PasswordSchema),
-		defaultValues: {
-			password: "",
-		},
-	});
-
-	const pinForm = useForm<PinForm>({
-		resolver: zodResolver(PinSchema),
-		defaultValues: {
-			pin: "",
-		},
-	});
-
-	useEffect(() => {
-		if (!isDialogOpen) {
-			setStep("password");
-			setData(null);
-			setBackupCodes([]);
-			setOtpValue("");
-			passwordForm.reset({
-				password: "",
-				issuer: "",
-			});
-		}
-	}, [isDialogOpen, passwordForm]);
-
-	useEffect(() => {
-		if (step === "verify") {
-			setOtpValue("");
-		}
-	}, [step]);
 
 	const handlePasswordSubmit = async (formData: PasswordForm) => {
 		setIsPasswordLoading(true);
 		try {
 			const { data: enableData, error } = await authClient.twoFactor.enable({
 				password: formData.password,
-				issuer: formData.issuer,
 			});
 
 			if (!enableData) {
@@ -178,6 +103,75 @@ export const Enable2FA = () => {
 		}
 	};
 
+	const handleVerifySubmit = async (formData: PinForm) => {
+		try {
+			const result = await authClient.twoFactor.verifyTotp({
+				code: formData.pin,
+			});
+
+			if (result.error) {
+				if (result.error.code === "INVALID_TWO_FACTOR_AUTHENTICATION") {
+					pinForm.setError("pin", {
+						message: "Invalid code. Please try again.",
+					});
+					toast.error("Invalid verification code");
+					return;
+				}
+
+				throw result.error;
+			}
+
+			if (!result.data) {
+				throw new Error("No response received from server");
+			}
+
+			toast.success("2FA configured successfully");
+			utils.user.get.invalidate();
+			setIsDialogOpen(false);
+		} catch (error) {
+			if (error instanceof Error) {
+				const errorMessage =
+					error.message === "Failed to fetch"
+						? "Connection error. Please check your internet connection."
+						: error.message;
+
+				pinForm.setError("pin", {
+					message: errorMessage,
+				});
+				toast.error(errorMessage);
+			} else {
+				pinForm.setError("pin", {
+					message: "Error verifying code",
+				});
+				toast.error("Error verifying 2FA code");
+			}
+		}
+	};
+
+	const passwordForm = useForm<PasswordForm>({
+		resolver: zodResolver(PasswordSchema),
+		defaultValues: {
+			password: "",
+		},
+	});
+
+	const pinForm = useForm<PinForm>({
+		resolver: zodResolver(PinSchema),
+		defaultValues: {
+			pin: "",
+		},
+	});
+
+	useEffect(() => {
+		if (!isDialogOpen) {
+			setStep("password");
+			setData(null);
+			setBackupCodes([]);
+			passwordForm.reset();
+			pinForm.reset();
+		}
+	}, [isDialogOpen, passwordForm, pinForm]);
+
 	return (
 		<Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
 			<DialogTrigger asChild>
@@ -223,27 +217,6 @@ export const Enable2FA = () => {
 									</FormItem>
 								)}
 							/>
-							<FormField
-								control={passwordForm.control}
-								name="issuer"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Issuer</FormLabel>
-										<FormControl>
-											<Input
-												type="text"
-												placeholder="Enter your issuer"
-												{...field}
-											/>
-										</FormControl>
-										<FormDescription>
-											Use a custom issuer to identify the service you're
-											authenticating with.
-										</FormDescription>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
 							<Button
 								type="submit"
 								className="w-full"
@@ -255,7 +228,11 @@ export const Enable2FA = () => {
 					</Form>
 				) : (
 					<Form {...pinForm}>
-						<form onSubmit={handleVerifySubmit} className="space-y-6">
+						<form
+							id="pin-form"
+							onSubmit={pinForm.handleSubmit(handleVerifySubmit)}
+							className="space-y-6"
+						>
 							<div className="flex flex-col gap-6 justify-center items-center">
 								{data?.qrCodeUrl ? (
 									<>
@@ -307,33 +284,36 @@ export const Enable2FA = () => {
 								)}
 							</div>
 
-							<div className="flex flex-col justify-center items-center">
-								<FormLabel>Verification Code</FormLabel>
-								<InputOTP
-									maxLength={6}
-									value={otpValue}
-									onChange={setOtpValue}
-									autoComplete="off"
-								>
-									<InputOTPGroup>
-										<InputOTPSlot index={0} />
-										<InputOTPSlot index={1} />
-										<InputOTPSlot index={2} />
-										<InputOTPSlot index={3} />
-										<InputOTPSlot index={4} />
-										<InputOTPSlot index={5} />
-									</InputOTPGroup>
-								</InputOTP>
-								<FormDescription>
-									Enter the 6-digit code from your authenticator app
-								</FormDescription>
-							</div>
+							<FormField
+								control={pinForm.control}
+								name="pin"
+								render={({ field }) => (
+									<FormItem className="flex flex-col justify-center items-center">
+										<FormLabel>Verification Code</FormLabel>
+										<FormControl>
+											<InputOTP maxLength={6} {...field}>
+												<InputOTPGroup>
+													<InputOTPSlot index={0} />
+													<InputOTPSlot index={1} />
+													<InputOTPSlot index={2} />
+													<InputOTPSlot index={3} />
+													<InputOTPSlot index={4} />
+													<InputOTPSlot index={5} />
+												</InputOTPGroup>
+											</InputOTP>
+										</FormControl>
+										<FormDescription>
+											Enter the 6-digit code from your authenticator app
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
 
 							<Button
 								type="submit"
 								className="w-full"
 								isLoading={isPasswordLoading}
-								disabled={otpValue.length !== 6}
 							>
 								Enable 2FA
 							</Button>

apps/dokploy/components/dashboard/settings/profile/profile-form.tsx

@@ -56,7 +56,6 @@ const randomImages = [
 export const ProfileForm = () => {
 	const _utils = api.useUtils();
 	const { data, refetch, isLoading } = api.user.get.useQuery();
-
 	const {
 		mutateAsync,
 		isLoading: isUpdating,
@@ -85,17 +84,12 @@ export const ProfileForm = () => {
 
 	useEffect(() => {
 		if (data) {
-			form.reset(
-				{
-					email: data?.user?.email || "",
-					password: form.getValues("password") || "",
-					image: data?.user?.image || "",
-					currentPassword: form.getValues("currentPassword") || "",
-				},
-				{
-					keepValues: true,
-				},
-			);
+			form.reset({
+				email: data?.user?.email || "",
+				password: "",
+				image: data?.user?.image || "",
+				currentPassword: "",
+			});
 
 			if (data.user.email) {
 				generateSHA256Hash(data.user.email).then((hash) => {
@@ -103,7 +97,8 @@ export const ProfileForm = () => {
 				});
 			}
 		}
-	}, [form, data]);
+		form.reset();
+	}, [form, form.reset, data]);
 
 	const onSubmit = async (values: Profile) => {
 		await mutateAsync({
@@ -115,12 +110,7 @@ export const ProfileForm = () => {
 			.then(async () => {
 				await refetch();
 				toast.success("Profile Updated");
-				form.reset({
-					email: values.email,
-					password: "",
-					image: values.image,
-					currentPassword: "",
-				});
+				form.reset();
 			})
 			.catch(() => {
 				toast.error("Error updating the profile");

apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx

@@ -22,9 +22,6 @@ export const ShowDokployActions = () => {
 	const { mutateAsync: reloadServer, isLoading } =
 		api.settings.reloadServer.useMutation();
 
-	const { mutateAsync: cleanRedis } = api.settings.cleanRedis.useMutation();
-	const { mutateAsync: reloadRedis } = api.settings.reloadRedis.useMutation();
-
 	return (
 		<DropdownMenu>
 			<DropdownMenuTrigger asChild disabled={isLoading}>
@@ -72,36 +69,6 @@ export const ShowDokployActions = () => {
 							{t("settings.server.webServer.updateServerIp")}
 						</DropdownMenuItem>
 					</UpdateServerIp>
-
-					<DropdownMenuItem
-						className="cursor-pointer"
-						onClick={async () => {
-							await cleanRedis()
-								.then(async () => {
-									toast.success("Redis cleaned");
-								})
-								.catch(() => {
-									toast.error("Error cleaning Redis");
-								});
-						}}
-					>
-						Clean Redis
-					</DropdownMenuItem>
-
-					<DropdownMenuItem
-						className="cursor-pointer"
-						onClick={async () => {
-							await reloadRedis()
-								.then(async () => {
-									toast.success("Redis reloaded");
-								})
-								.catch(() => {
-									toast.error("Error reloading Redis");
-								});
-						}}
-					>
-						Reload Redis
-					</DropdownMenuItem>
 				</DropdownMenuGroup>
 			</DropdownMenuContent>
 		</DropdownMenu>

apps/dokploy/components/dashboard/settings/servers/setup-monitoring.tsx

@@ -202,7 +202,7 @@ export const SetupMonitoring = ({ serverId }: Props) => {
 
 	const { mutateAsync } = serverId
 		? api.server.setupMonitoring.useMutation()
-		: api.user.setupMonitoring.useMutation();
+		: api.admin.setupMonitoring.useMutation();
 
 	const generateToken = () => {
 		const array = new Uint8Array(64);

apps/dokploy/components/dashboard/settings/ssh-keys/show-ssh-keys.tsx

@@ -56,7 +56,7 @@ export const ShowDestinations = () => {
 													key={sshKey.sshKeyId}
 													className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
 												>
-													<div className="flex items-center justify-between p-3.5 rounded-lg bg-background border  w-full">
+													<div className="flex items-center justify-between  p-3.5 rounded-lg bg-background border  w-full">
 														<div className="flex items-center justify-between">
 															<div className="flex flex-col">
 																<span className="text-sm font-medium">

apps/dokploy/components/dashboard/settings/users/show-invitations.tsx

@@ -36,9 +36,6 @@ export const ShowInvitations = () => {
 	const { data, isLoading, refetch } =
 		api.organization.allInvitations.useQuery();
 
-	const { mutateAsync: removeInvitation } =
-		api.organization.removeInvitation.useMutation();
-
 	return (
 		<div className="w-full">
 			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
@@ -185,22 +182,6 @@ export const ShowInvitations = () => {
 																						Cancel Invitation
 																					</DropdownMenuItem>
 																				)}
-
-																				<DropdownMenuItem
-																					className="w-full cursor-pointer"
-																					onSelect={async (_e) => {
-																						await removeInvitation({
-																							invitationId: invitation.id,
-																						}).then(() => {
-																							refetch();
-																							toast.success(
-																								"Invitation removed",
-																							);
-																						});
-																					}}
-																				>
-																					Remove Invitation
-																				</DropdownMenuItem>
 																			</>
 																		)}
 																	</DropdownMenuContent>

apps/dokploy/components/layouts/user-nav.tsx

@@ -133,6 +133,17 @@ export const UserNav = () => {
 									Servers
 								</DropdownMenuItem>
 							)}
+
+							{data?.role === "owner" && (
+								<DropdownMenuItem
+									className="cursor-pointer"
+									onClick={() => {
+										router.push("/dashboard/settings");
+									}}
+								>
+									Settings
+								</DropdownMenuItem>
+							)}
 						</>
 					)}
 				</DropdownMenuGroup>

apps/dokploy/components/shared/code-editor.tsx

@@ -26,20 +26,15 @@ const dockerComposeServices = [
 	{ label: "secrets", type: "keyword", info: "Define secrets" },
 ].map((opt) => ({
 	...opt,
-	apply: (
-		view: EditorView,
-		completion: Completion,
-		from: number,
-		to: number,
-	) => {
+	apply: (view: EditorView, completion: Completion) => {
 		const insert = `${completion.label}:`;
 		view.dispatch({
 			changes: {
-				from,
-				to,
+				from: view.state.selection.main.from,
+				to: view.state.selection.main.to,
 				insert,
 			},
-			selection: { anchor: from + insert.length },
+			selection: { anchor: view.state.selection.main.from + insert.length },
 		});
 	},
 }));
@@ -79,20 +74,15 @@ const dockerComposeServiceOptions = [
 	{ label: "networks", type: "keyword", info: "Networks to join" },
 ].map((opt) => ({
 	...opt,
-	apply: (
-		view: EditorView,
-		completion: Completion,
-		from: number,
-		to: number,
-	) => {
+	apply: (view: EditorView, completion: Completion) => {
 		const insert = `${completion.label}: `;
 		view.dispatch({
 			changes: {
-				from,
-				to,
+				from: view.state.selection.main.from,
+				to: view.state.selection.main.to,
 				insert,
 			},
-			selection: { anchor: from + insert.length },
+			selection: { anchor: view.state.selection.main.from + insert.length },
 		});
 	},
 }));
@@ -109,7 +99,6 @@ function dockerComposeComplete(
 	const line = context.state.doc.lineAt(context.pos);
 	const indentation = /^\s*/.exec(line.text)?.[0].length || 0;
 
-	// If we're at the root level
 	if (indentation === 0) {
 		return {
 			from: word.from,

apps/dokploy/drizzle/0085_equal_captain_stacy.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "application" ADD COLUMN "enableSubmodules" boolean DEFAULT false;--> statement-breakpoint
-ALTER TABLE "compose" ADD COLUMN "enableSubmodules" boolean DEFAULT false;

apps/dokploy/drizzle/0086_rainy_gertrude_yorkes.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "application" ALTER COLUMN "enableSubmodules" SET NOT NULL;--> statement-breakpoint
-ALTER TABLE "compose" ALTER COLUMN "enableSubmodules" SET NOT NULL;

apps/dokploy/drizzle/0087_lively_risque.sql

@@ -1,3 +0,0 @@
-CREATE TYPE "public"."triggerType" AS ENUM('push', 'tag');--> statement-breakpoint
-ALTER TABLE "application" ADD COLUMN "triggerType" "triggerType" DEFAULT 'push';--> statement-breakpoint
-ALTER TABLE "compose" ADD COLUMN "triggerType" "triggerType" DEFAULT 'push';

apps/dokploy/drizzle/0088_same_ezekiel.sql

@@ -1,5 +0,0 @@
-CREATE TYPE "public"."backupType" AS ENUM('database', 'compose');--> statement-breakpoint
-ALTER TABLE "backup" ADD COLUMN "serviceName" text;--> statement-breakpoint
-ALTER TABLE "backup" ADD COLUMN "backupType" "backupType" DEFAULT 'database' NOT NULL;--> statement-breakpoint
-ALTER TABLE "backup" ADD COLUMN "composeId" text;--> statement-breakpoint
-ALTER TABLE "backup" ADD CONSTRAINT "backup_composeId_compose_composeId_fk" FOREIGN KEY ("composeId") REFERENCES "public"."compose"("composeId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0089_dazzling_marrow.sql

@@ -1 +0,0 @@
-ALTER TABLE "backup" ADD COLUMN "metadata" jsonb;

apps/dokploy/drizzle/0090_tiny_phil_sheldon.sql

@@ -1 +0,0 @@
-ALTER TABLE "user_temp" ADD COLUMN "licenseKey" text;

apps/dokploy/drizzle/meta/_journal.json

@@ -596,48 +596,6 @@
       "when": 1743923992280,
       "tag": "0084_thin_iron_lad",
       "breakpoints": true
-    },
-    {
-      "idx": 85,
-      "version": "7",
-      "when": 1745705609181,
-      "tag": "0085_equal_captain_stacy",
-      "breakpoints": true
-    },
-    {
-      "idx": 86,
-      "version": "7",
-      "when": 1745706676004,
-      "tag": "0086_rainy_gertrude_yorkes",
-      "breakpoints": true
-    },
-    {
-      "idx": 87,
-      "version": "7",
-      "when": 1745723563822,
-      "tag": "0087_lively_risque",
-      "breakpoints": true
-    },
-    {
-      "idx": 88,
-      "version": "7",
-      "when": 1745801614194,
-      "tag": "0088_same_ezekiel",
-      "breakpoints": true
-    },
-    {
-      "idx": 89,
-      "version": "7",
-      "when": 1745812150155,
-      "tag": "0089_dazzling_marrow",
-      "breakpoints": true
-    },
-    {
-      "idx": 90,
-      "version": "7",
-      "when": 1746156076450,
-      "tag": "0090_tiny_phil_sheldon",
-      "breakpoints": true
     }
   ]
 }

apps/dokploy/lib/languages.ts

@@ -1,27 +1,23 @@
-/**
- * Sorted list based off of population of the country / speakers of the language.
- */
 export const Languages = {
 	english: { code: "en", name: "English" },
-	spanish: { code: "es", name: "Español" },
-	chineseSimplified: { code: "zh-Hans", name: "简体中文" },
-	chineseTraditional: { code: "zh-Hant", name: "繁體中文" },
-	portuguese: { code: "pt-br", name: "Português" },
-	russian: { code: "ru", name: "Русский" },
-	japanese: { code: "ja", name: "日本語" },
-	german: { code: "de", name: "Deutsch" },
-	korean: { code: "ko", name: "한국어" },
-	french: { code: "fr", name: "Français" },
-	turkish: { code: "tr", name: "Türkçe" },
-	italian: { code: "it", name: "Italiano" },
 	polish: { code: "pl", name: "Polski" },
 	ukrainian: { code: "uk", name: "Українська" },
-	persian: { code: "fa", name: "فارسی" },
-	dutch: { code: "nl", name: "Nederlands" },
-	indonesian: { code: "id", name: "Bahasa Indonesia" },
+	russian: { code: "ru", name: "Русский" },
+	french: { code: "fr", name: "Français" },
+	german: { code: "de", name: "Deutsch" },
+	chineseTraditional: { code: "zh-Hant", name: "繁體中文" },
+	chineseSimplified: { code: "zh-Hans", name: "简体中文" },
+	turkish: { code: "tr", name: "Türkçe" },
 	kazakh: { code: "kz", name: "Қазақ" },
+	persian: { code: "fa", name: "فارسی" },
+	korean: { code: "ko", name: "한국어" },
+	portuguese: { code: "pt-br", name: "Português" },
+	italian: { code: "it", name: "Italiano" },
+	japanese: { code: "ja", name: "日本語" },
+	spanish: { code: "es", name: "Español" },
 	norwegian: { code: "no", name: "Norsk" },
 	azerbaijani: { code: "az", name: "Azərbaycan" },
+	indonesian: { code: "id", name: "Bahasa Indonesia" },
 	malayalam: { code: "ml", name: "മലയാളം" },
 };
 

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.21.8",
+	"version": "v0.21.3",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",
@@ -92,7 +92,7 @@
 		"adm-zip": "^0.5.14",
 		"ai": "^4.0.23",
 		"bcrypt": "5.1.1",
-		"better-auth": "1.2.6",
+		"better-auth": "1.2.4",
 		"bl": "6.0.11",
 		"boxen": "^7.1.1",
 		"bullmq": "5.4.2",

apps/dokploy/pages/api/deploy/github.ts

@@ -89,115 +89,6 @@ export default async function handler(
 		return;
 	}
 
-	// Handle tag creation event
-	if (
-		req.headers["x-github-event"] === "push" &&
-		githubBody?.ref?.startsWith("refs/tags/")
-	) {
-		try {
-			const tagName = githubBody?.ref.replace("refs/tags/", "");
-			const repository = githubBody?.repository?.name;
-			const owner = githubBody?.repository?.owner?.name;
-			const deploymentTitle = `Tag created: ${tagName}`;
-			const deploymentHash = extractHash(req.headers, githubBody);
-
-			// Find applications configured to deploy on tag
-			const apps = await db.query.applications.findMany({
-				where: and(
-					eq(applications.sourceType, "github"),
-					eq(applications.autoDeploy, true),
-					eq(applications.triggerType, "tag"),
-					eq(applications.repository, repository),
-					eq(applications.owner, owner),
-					eq(applications.githubId, githubResult.githubId),
-				),
-			});
-
-			for (const app of apps) {
-				const jobData: DeploymentJob = {
-					applicationId: app.applicationId as string,
-					titleLog: deploymentTitle,
-					descriptionLog: `Hash: ${deploymentHash}`,
-					type: "deploy",
-					applicationType: "application",
-					server: !!app.serverId,
-				};
-
-				if (IS_CLOUD && app.serverId) {
-					jobData.serverId = app.serverId;
-					await deploy(jobData);
-					continue;
-				}
-				await myQueue.add(
-					"deployments",
-					{ ...jobData },
-					{
-						removeOnComplete: true,
-						removeOnFail: true,
-					},
-				);
-			}
-
-			// Find compose apps configured to deploy on tag
-			const composeApps = await db.query.compose.findMany({
-				where: and(
-					eq(compose.sourceType, "github"),
-					eq(compose.autoDeploy, true),
-					eq(compose.triggerType, "tag"),
-					eq(compose.repository, repository),
-					eq(compose.owner, owner),
-					eq(compose.githubId, githubResult.githubId),
-				),
-			});
-
-			for (const composeApp of composeApps) {
-				const jobData: DeploymentJob = {
-					composeId: composeApp.composeId as string,
-					titleLog: deploymentTitle,
-					type: "deploy",
-					applicationType: "compose",
-					descriptionLog: `Hash: ${deploymentHash}`,
-					server: !!composeApp.serverId,
-				};
-
-				if (IS_CLOUD && composeApp.serverId) {
-					jobData.serverId = composeApp.serverId;
-					await deploy(jobData);
-					continue;
-				}
-
-				await myQueue.add(
-					"deployments",
-					{ ...jobData },
-					{
-						removeOnComplete: true,
-						removeOnFail: true,
-					},
-				);
-			}
-
-			const totalApps = apps.length + composeApps.length;
-
-			if (totalApps === 0) {
-				res
-					.status(200)
-					.json({ message: "No apps configured to deploy on tag" });
-				return;
-			}
-
-			res.status(200).json({
-				message: `Deployed ${totalApps} apps based on tag ${tagName}`,
-			});
-			return;
-		} catch (error) {
-			console.error("Error deploying applications on tag:", error);
-			res
-				.status(400)
-				.json({ message: "Error deploying applications on tag", error });
-			return;
-		}
-	}
-
 	if (req.headers["x-github-event"] === "push") {
 		try {
 			const branchName = githubBody?.ref?.replace("refs/heads/", "");
@@ -214,7 +105,6 @@ export default async function handler(
 				where: and(
 					eq(applications.sourceType, "github"),
 					eq(applications.autoDeploy, true),
-					eq(applications.triggerType, "push"),
 					eq(applications.branch, branchName),
 					eq(applications.repository, repository),
 					eq(applications.owner, owner),
@@ -260,7 +150,6 @@ export default async function handler(
 				where: and(
 					eq(compose.sourceType, "github"),
 					eq(compose.autoDeploy, true),
-					eq(compose.triggerType, "push"),
 					eq(compose.branch, branchName),
 					eq(compose.repository, repository),
 					eq(compose.owner, owner),

apps/dokploy/pages/dashboard/monitoring.tsx

@@ -1,10 +1,7 @@
 import { ContainerFreeMonitoring } from "@/components/dashboard/monitoring/free/container/show-free-container-monitoring";
 import { ShowPaidMonitoring } from "@/components/dashboard/monitoring/paid/servers/show-paid-monitoring";
 import { DashboardLayout } from "@/components/layouts/dashboard-layout";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { Card } from "@/components/ui/card";
-import { Switch } from "@/components/ui/switch";
-import { Label } from "@/components/ui/label";
 import { useLocalStorage } from "@/hooks/useLocalStorage";
 import { api } from "@/utils/api";
 import { IS_CLOUD } from "@dokploy/server/constants";
@@ -26,7 +23,7 @@ const Dashboard = () => {
 	const { data: monitoring, isLoading } = api.user.getMetricsToken.useQuery();
 	return (
 		<div className="space-y-4 pb-10">
-			<AlertBlock>
+			{/* <AlertBlock>
 				You are watching the <strong>Free</strong> plan.{" "}
 				<a
 					href="https://dokploy.com#pricing"
@@ -37,7 +34,7 @@ const Dashboard = () => {
 					Upgrade
 				</a>{" "}
 				to get more features.
-			</AlertBlock>
+			</AlertBlock> */}
 			{isLoading ? (
 				<Card className="bg-sidebar  p-2.5 rounded-xl  mx-auto  items-center">
 					<div className="rounded-xl bg-background flex shadow-md px-4 min-h-[50vh] justify-center items-center text-muted-foreground">
@@ -47,15 +44,15 @@ const Dashboard = () => {
 				</Card>
 			) : (
 				<>
-					{monitoring?.enabledFeatures && (
+					{/* {monitoring?.enabledFeatures && (
 						<div className="flex flex-row border w-fit p-4 rounded-lg items-center gap-2">
 							<Label className="text-muted-foreground">Change Monitoring</Label>
 							<Switch
 								checked={toggleMonitoring}
-								onCheckedChange={_setToggleMonitoring}
+								onCheckedChange={setToggleMonitoring}
 							/>
 						</div>
-					)}
+					)} */}
 					{toggleMonitoring ? (
 						<Card className="bg-sidebar  p-2.5 rounded-xl  mx-auto">
 							<div className="rounded-xl bg-background shadow-md">

apps/dokploy/pages/dashboard/project/[projectId].tsx

@@ -365,9 +365,7 @@ const Project = (
 
 				switch (service.type) {
 					case "application":
-						await applicationActions.start.mutateAsync({
-							applicationId: serviceId,
-						});
+						await applicationActions.start.mutateAsync({ applicationId: serviceId });
 						break;
 					case "compose":
 						await composeActions.start.mutateAsync({ composeId: serviceId });
@@ -412,9 +410,7 @@ const Project = (
 
 				switch (service.type) {
 					case "application":
-						await applicationActions.stop.mutateAsync({
-							applicationId: serviceId,
-						});
+						await applicationActions.stop.mutateAsync({ applicationId: serviceId });
 						break;
 					case "compose":
 						await composeActions.stop.mutateAsync({ composeId: serviceId });

apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx

@@ -28,7 +28,6 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import {
 	Tooltip,
@@ -66,7 +65,7 @@ type TabState =
 const Service = (
 	props: InferGetServerSidePropsType<typeof getServerSideProps>,
 ) => {
-	const [_toggleMonitoring, _setToggleMonitoring] = useState(true);
+	const [_toggleMonitoring, _setToggleMonitoring] = useState(false);
 	const { applicationId, activeTab } = props;
 	const router = useRouter();
 	const { projectId } = router.query;
@@ -87,7 +86,6 @@ const Service = (
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data: auth } = api.user.get.useQuery();
-	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 
 	return (
 		<div className="pb-10">
@@ -217,7 +215,7 @@ const Service = (
 										router.push(newPath);
 									}}
 								>
-									<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+									<div className="flex flex-row items-center justify-between  w-full gap-4">
 										<TabsList
 											className={cn(
 												"flex gap-8 justify-start max-xl:overflow-x-scroll overflow-y-hidden",
@@ -267,19 +265,21 @@ const Service = (
 													/>
 												) : (
 													<>
-														{monitoring?.enabledFeatures && (
-															<div className="flex flex-row border w-fit p-4 rounded-lg items-center gap-2">
-																<Label className="text-muted-foreground">
-																	Change Monitoring
-																</Label>
-																<Switch
-																	checked={_toggleMonitoring}
-																	onCheckedChange={_setToggleMonitoring}
-																/>
-															</div>
-														)}
+														{/* {monitoring?.enabledFeatures &&
+															isCloud &&
+															data?.serverId && (
+																<div className="flex flex-row border w-fit p-4 rounded-lg items-center gap-2">
+																	<Label className="text-muted-foreground">
+																		Change Monitoring
+																	</Label>
+																	<Switch
+																		checked={toggleMonitoring}
+																		onCheckedChange={setToggleMonitoring}
+																	/>
+																</div>
+															)} */}
 
-														{_toggleMonitoring ? (
+														{/* {toggleMonitoring ? (
 															<ContainerPaidMonitoring
 																appName={data?.appName || ""}
 																baseUrl={`http://${monitoring?.serverIp}:${monitoring?.metricsConfig?.server?.port}`}
@@ -287,13 +287,13 @@ const Service = (
 																	monitoring?.metricsConfig?.server?.token || ""
 																}
 															/>
-														) : (
-															<div>
-																<ContainerFreeMonitoring
-																	appName={data?.appName || ""}
-																/>
-															</div>
-														)}
+														) : ( */}
+														<div>
+															<ContainerFreeMonitoring
+																appName={data?.appName || ""}
+															/>
+														</div>
+														{/* )} */}
 													</>
 												)}
 											</div>

apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx

@@ -9,7 +9,6 @@ import { ShowGeneralCompose } from "@/components/dashboard/compose/general/show"
 import { ShowDockerLogsCompose } from "@/components/dashboard/compose/logs/show";
 import { ShowDockerLogsStack } from "@/components/dashboard/compose/logs/show-stack";
 import { UpdateCompose } from "@/components/dashboard/compose/update-compose";
-import { ShowBackups } from "@/components/dashboard/database/backups/show-backups";
 import { ComposeFreeMonitoring } from "@/components/dashboard/monitoring/free/container/show-free-compose-monitoring";
 import { ComposePaidMonitoring } from "@/components/dashboard/monitoring/paid/container/show-paid-compose-monitoring";
 import { ProjectLayout } from "@/components/layouts/project-layout";
@@ -213,22 +212,21 @@ const Service = (
 										router.push(newPath);
 									}}
 								>
-									<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+									<div className="flex flex-row items-center justify-between  w-full gap-4">
 										<TabsList
 											className={cn(
-												"lg:grid lg:w-fit max-md:overflow-y-scroll justify-start",
+												"md:grid md:w-fit max-md:overflow-y-scroll justify-start",
 												isCloud && data?.serverId
-													? "lg:grid-cols-8"
+													? "md:grid-cols-7"
 													: data?.serverId
-														? "lg:grid-cols-7"
-														: "lg:grid-cols-8",
+														? "md:grid-cols-6"
+														: "md:grid-cols-7",
 											)}
 										>
 											<TabsTrigger value="general">General</TabsTrigger>
 											<TabsTrigger value="environment">Environment</TabsTrigger>
 											<TabsTrigger value="domains">Domains</TabsTrigger>
 											<TabsTrigger value="deployments">Deployments</TabsTrigger>
-											<TabsTrigger value="backups">Backups</TabsTrigger>
 											<TabsTrigger value="logs">Logs</TabsTrigger>
 											{((data?.serverId && isCloud) || !data?.server) && (
 												<TabsTrigger value="monitoring">Monitoring</TabsTrigger>
@@ -247,11 +245,6 @@ const Service = (
 											<ShowEnvironment id={composeId} type="compose" />
 										</div>
 									</TabsContent>
-									<TabsContent value="backups">
-										<div className="flex flex-col gap-4 pt-2.5">
-											<ShowBackups id={composeId} backupType="compose" />
-										</div>
-									</TabsContent>
 
 									<TabsContent value="monitoring">
 										<div className="pt-2.5">

apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx

@@ -182,7 +182,7 @@ const Mariadb = (
 										router.push(newPath, undefined, { shallow: true });
 									}}
 								>
-									<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+									<div className="flex flex-row items-center justify-between  w-full gap-4">
 										<TabsList
 											className={cn(
 												"md:grid md:w-fit max-md:overflow-y-scroll justify-start",
@@ -271,7 +271,7 @@ const Mariadb = (
 									</TabsContent>
 									<TabsContent value="backups">
 										<div className="flex flex-col gap-4 pt-2.5">
-											<ShowBackups id={mariadbId} databaseType="mariadb" />
+											<ShowBackups id={mariadbId} type="mariadb" />
 										</div>
 									</TabsContent>
 									<TabsContent value="advanced">

apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx

@@ -183,7 +183,7 @@ const Mongo = (
 										router.push(newPath, undefined, { shallow: true });
 									}}
 								>
-									<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+									<div className="flex flex-row items-center justify-between  w-full gap-4">
 										<TabsList
 											className={cn(
 												"md:grid md:w-fit max-md:overflow-y-scroll justify-start",
@@ -272,11 +272,7 @@ const Mongo = (
 									</TabsContent>
 									<TabsContent value="backups">
 										<div className="flex flex-col gap-4 pt-2.5">
-											<ShowBackups
-												id={mongoId}
-												databaseType="mongo"
-												backupType="database"
-											/>
+											<ShowBackups id={mongoId} type="mongo" />
 										</div>
 									</TabsContent>
 									<TabsContent value="advanced">

apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx

@@ -183,7 +183,7 @@ const MySql = (
 											router.push(newPath, undefined, { shallow: true });
 										}}
 									>
-										<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+										<div className="flex flex-row items-center justify-between  w-full gap-4">
 											<TabsList
 												className={cn(
 													"md:grid md:w-fit max-md:overflow-y-scroll justify-start ",
@@ -252,11 +252,7 @@ const MySql = (
 										</TabsContent>
 										<TabsContent value="backups">
 											<div className="flex flex-col gap-4 pt-2.5">
-												<ShowBackups
-													id={mysqlId}
-													databaseType="mysql"
-													backupType="database"
-												/>
+												<ShowBackups id={mysqlId} type="mysql" />
 											</div>
 										</TabsContent>
 										<TabsContent value="advanced">

apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx

@@ -182,7 +182,7 @@ const Postgresql = (
 										router.push(newPath, undefined, { shallow: true });
 									}}
 								>
-									<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+									<div className="flex flex-row items-center justify-between  w-full gap-4">
 										<TabsList
 											className={cn(
 												"md:grid md:w-fit max-md:overflow-y-scroll justify-start",
@@ -251,11 +251,7 @@ const Postgresql = (
 									</TabsContent>
 									<TabsContent value="backups">
 										<div className="flex flex-col gap-4 pt-2.5">
-											<ShowBackups
-												id={postgresId}
-												databaseType="postgres"
-												backupType="database"
-											/>
+											<ShowBackups id={postgresId} type="postgres" />
 										</div>
 									</TabsContent>
 									<TabsContent value="advanced">

apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx

@@ -182,7 +182,7 @@ const Redis = (
 										router.push(newPath, undefined, { shallow: true });
 									}}
 								>
-									<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+									<div className="flex flex-row items-center justify-between  w-full gap-4">
 										<TabsList
 											className={cn(
 												"md:grid md:w-fit max-md:overflow-y-scroll justify-start",

apps/dokploy/pages/dashboard/settings/server.tsx

@@ -1,6 +1,5 @@
 import { WebDomain } from "@/components/dashboard/settings/web-domain";
 import { WebServer } from "@/components/dashboard/settings/web-server";
-import { EnablePaidFeatures } from "@/components/dashboard/settings/enable-paid-features";
 import { DashboardLayout } from "@/components/layouts/dashboard-layout";
 import { appRouter } from "@/server/api/root";
 import { getLocale, serverSideTranslations } from "@/utils/i18n";
@@ -13,7 +12,6 @@ import { api } from "@/utils/api";
 import { ShowBackups } from "@/components/dashboard/database/backups/show-backups";
 import { Card } from "@/components/ui/card";
 const Page = () => {
-	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data: user } = api.user.get.useQuery();
 	return (
 		<div className="w-full">
@@ -22,14 +20,9 @@ const Page = () => {
 				<WebServer />
 				<div className="w-full flex flex-col gap-4">
 					<Card className="h-full bg-sidebar  p-2.5 rounded-xl  mx-auto w-full">
-						<ShowBackups
-							id={user?.userId ?? ""}
-							databaseType="web-server"
-							backupType="database"
-						/>
+						<ShowBackups id={user?.userId ?? ""} type="web-server" />
 					</Card>
 				</div>
-				{!isCloud && <EnablePaidFeatures />}
 			</div>
 		</div>
 	);

apps/dokploy/public/locales/nl/common.json

@@ -1 +0,0 @@
-{}

apps/dokploy/public/locales/nl/settings.json

@@ -1,58 +0,0 @@
-{
-	"settings.common.save": "Opslaan",
-	"settings.common.enterTerminal": "Terminal",
-	"settings.server.domain.title": "Server Domein",
-	"settings.server.domain.description": "Voeg een domein toe aan jouw server applicatie.",
-	"settings.server.domain.form.domain": "Domein",
-	"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt Email",
-	"settings.server.domain.form.certificate.label": "Certificaat Aanbieder",
-	"settings.server.domain.form.certificate.placeholder": "Select een certificaat",
-	"settings.server.domain.form.certificateOptions.none": "Geen",
-	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt",
-
-	"settings.server.webServer.title": "Web Server",
-	"settings.server.webServer.description": "Herlaad of maak de web server schoon.",
-	"settings.server.webServer.actions": "Acties",
-	"settings.server.webServer.reload": "Herladen",
-	"settings.server.webServer.watchLogs": "Bekijk Logs",
-	"settings.server.webServer.updateServerIp": "Update de Server IP",
-	"settings.server.webServer.server.label": "Server",
-	"settings.server.webServer.traefik.label": "Traefik",
-	"settings.server.webServer.traefik.modifyEnv": "Bewerk Omgeving",
-	"settings.server.webServer.traefik.managePorts": "Extra Poort Mappings",
-	"settings.server.webServer.traefik.managePortsDescription": "Bewerk extra Poorten voor Traefik",
-	"settings.server.webServer.traefik.targetPort": "Doel Poort",
-	"settings.server.webServer.traefik.publishedPort": "Gepubliceerde Poort",
-	"settings.server.webServer.traefik.addPort": "Voeg Poort toe",
-	"settings.server.webServer.traefik.portsUpdated": "Poorten succesvol aangepast",
-	"settings.server.webServer.traefik.portsUpdateError": "Poorten niet succesvol aangepast",
-	"settings.server.webServer.traefik.publishMode": "Publiceer Mode",
-	"settings.server.webServer.storage.label": "Opslag",
-	"settings.server.webServer.storage.cleanUnusedImages": "Maak ongebruikte images schoon",
-	"settings.server.webServer.storage.cleanUnusedVolumes": "Maak ongebruikte volumes schoon",
-	"settings.server.webServer.storage.cleanStoppedContainers": "Maak gestopte containers schoon",
-	"settings.server.webServer.storage.cleanDockerBuilder": "Maak Docker Builder & Systeem schoon",
-	"settings.server.webServer.storage.cleanMonitoring": "Maak monitoor schoon",
-	"settings.server.webServer.storage.cleanAll": "Maak alles schoon",
-
-	"settings.profile.title": "Account",
-	"settings.profile.description": "Veramder details van account.",
-	"settings.profile.email": "Email",
-	"settings.profile.password": "Wachtwoord",
-	"settings.profile.avatar": "Profiel Icoon",
-
-	"settings.appearance.title": "Uiterlijk",
-	"settings.appearance.description": "Verander het thema van je dashboard.",
-	"settings.appearance.theme": "Thema",
-	"settings.appearance.themeDescription": "Selecteer een thema voor je dashboard.",
-	"settings.appearance.themes.light": "Licht",
-	"settings.appearance.themes.dark": "Donker",
-	"settings.appearance.themes.system": "Systeem",
-	"settings.appearance.language": "Taal",
-	"settings.appearance.languageDescription": "Selecteer een taal voor je dashboard.",
-
-	"settings.terminal.connectionSettings": "Verbindings instellingen",
-	"settings.terminal.ipAddress": "IP Address",
-	"settings.terminal.port": "Poort",
-	"settings.terminal.username": "Gebruikersnaam"
-}

apps/dokploy/public/locales/zh-Hans/common.json

@@ -1,78 +1 @@
-{
-	"dashboard.title": "仪表盘",
-	"dashboard.overview": "概览",
-	"dashboard.projects": "项目",
-	"dashboard.servers": "服务器",
-	"dashboard.docker": "Docker",
-	"dashboard.monitoring": "监控",
-	"dashboard.settings": "设置",
-	"dashboard.logout": "退出登录",
-	"dashboard.profile": "个人资料",
-	"dashboard.terminal": "终端",
-	"dashboard.containers": "容器",
-	"dashboard.images": "镜像",
-	"dashboard.volumes": "卷",
-	"dashboard.networks": "网络",
-	"button.create": "创建",
-	"button.edit": "编辑",
-	"button.delete": "删除",
-	"button.cancel": "取消",
-	"button.save": "保存",
-	"button.confirm": "确认",
-	"button.back": "返回",
-	"button.next": "下一步",
-	"button.finish": "完成",
-	"status.running": "运行中",
-	"status.stopped": "已停止",
-	"status.error": "错误",
-	"status.pending": "等待中",
-	"status.success": "成功",
-	"status.failed": "失败",
-	"form.required": "必填",
-	"form.invalid": "无效",
-	"form.submit": "提交",
-	"form.reset": "重置",
-	"notification.success": "操作成功",
-	"notification.error": "操作失败",
-	"notification.warning": "警告",
-	"notification.info": "信息",
-	"time.now": "刚刚",
-	"time.minutes": "分钟前",
-	"time.hours": "小时前",
-	"time.days": "天前",
-	"filter.all": "全部",
-	"filter.active": "活跃",
-	"filter.inactive": "不活跃",
-	"sort.asc": "升序",
-	"sort.desc": "降序",
-	"search.placeholder": "搜索...",
-	"search.noResults": "无结果",
-	"pagination.prev": "上一页",
-	"pagination.next": "下一页",
-	"pagination.of": "共 {0} 页",
-	"error.notFound": "未找到",
-	"error.serverError": "服务器错误",
-	"error.unauthorized": "未授权",
-	"error.forbidden": "禁止访问",
-	"loading": "加载中...",
-	"empty": "暂无数据",
-	"more": "更多",
-	"less": "收起",
-	"project.create": "创建项目",
-	"project.edit": "编辑项目",
-	"project.delete": "删除项目",
-	"project.name": "项目名称",
-	"project.description": "项目描述",
-	"service.create": "创建服务",
-	"service.edit": "编辑服务",
-	"service.delete": "删除服务",
-	"service.name": "服务名称",
-	"service.type": "服务类型",
-	"domain.add": "添加域名",
-	"domain.remove": "移除域名",
-	"environment.variables": "环境变量",
-	"environment.add": "添加环境变量",
-	"environment.edit": "编辑环境变量",
-	"environment.name": "变量名",
-	"environment.value": "变量值"
-}
+{}

apps/dokploy/public/locales/zh-Hans/settings.json

@@ -1,16 +1,17 @@
 {
 	"settings.common.save": "保存",
-	"settings.common.enterTerminal": "终端",
-	"settings.server.domain.title": "服务器域名",
-	"settings.server.domain.description": "为您的服务器应用添加域名。",
+	"settings.common.enterTerminal": "进入终端",
+	"settings.server.domain.title": "域名设置",
+	"settings.server.domain.description": "添加域名到服务器",
 	"settings.server.domain.form.domain": "域名",
 	"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt 邮箱",
-	"settings.server.domain.form.certificate.label": "证书提供商",
-	"settings.server.domain.form.certificate.placeholder": "选择证书",
+	"settings.server.domain.form.certificate.label": "证书",
+	"settings.server.domain.form.certificate.placeholder": "选择一个证书",
 	"settings.server.domain.form.certificateOptions.none": "无",
 	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt",
-	"settings.server.webServer.title": "Web 服务器",
-	"settings.server.webServer.description": "重载或清理 Web 服务器。",
+
+	"settings.server.webServer.title": "服务器设置",
+	"settings.server.webServer.description": "管理服务器",
 	"settings.server.webServer.actions": "操作",
 	"settings.server.webServer.reload": "重新加载",
 	"settings.server.webServer.watchLogs": "查看日志",
@@ -18,50 +19,40 @@
 	"settings.server.webServer.server.label": "服务器",
 	"settings.server.webServer.traefik.label": "Traefik",
 	"settings.server.webServer.traefik.modifyEnv": "修改环境变量",
-	"settings.server.webServer.traefik.managePorts": "额外端口映射",
-	"settings.server.webServer.traefik.managePortsDescription": "为 Traefik 添加或删除额外端口",
+	"settings.server.webServer.traefik.managePorts": "端口转发",
+	"settings.server.webServer.traefik.managePortsDescription": "添加或删除 Traefik 的其他端口",
 	"settings.server.webServer.traefik.targetPort": "目标端口",
-	"settings.server.webServer.traefik.publishedPort": "发布端口",
+	"settings.server.webServer.traefik.publishedPort": "对外端口",
 	"settings.server.webServer.traefik.addPort": "添加端口",
 	"settings.server.webServer.traefik.portsUpdated": "端口更新成功",
 	"settings.server.webServer.traefik.portsUpdateError": "端口更新失败",
-	"settings.server.webServer.traefik.publishMode": "发布模式",
+	"settings.server.webServer.traefik.publishMode": "端口映射",
 	"settings.server.webServer.storage.label": "存储空间",
 	"settings.server.webServer.storage.cleanUnusedImages": "清理未使用的镜像",
 	"settings.server.webServer.storage.cleanUnusedVolumes": "清理未使用的卷",
 	"settings.server.webServer.storage.cleanStoppedContainers": "清理已停止的容器",
-	"settings.server.webServer.storage.cleanDockerBuilder": "清理 Docker Builder 和系统",
+	"settings.server.webServer.storage.cleanDockerBuilder": "清理 Docker Builder 与 系统缓存",
 	"settings.server.webServer.storage.cleanMonitoring": "清理监控数据",
 	"settings.server.webServer.storage.cleanAll": "清理所有内容",
+
 	"settings.profile.title": "账户",
-	"settings.profile.description": "在此更改您的个人资料详情。",
+	"settings.profile.description": "更改您的个人资料",
 	"settings.profile.email": "邮箱",
 	"settings.profile.password": "密码",
 	"settings.profile.avatar": "头像",
+
 	"settings.appearance.title": "外观",
-	"settings.appearance.description": "自定义您的仪表盘主题。",
+	"settings.appearance.description": "自定义面板主题",
 	"settings.appearance.theme": "主题",
-	"settings.appearance.themeDescription": "为您的仪表盘选择主题",
+	"settings.appearance.themeDescription": "选择面板主题",
 	"settings.appearance.themes.light": "明亮",
-	"settings.appearance.themes.dark": "暗黑",
-	"settings.appearance.themes.system": "跟随系统",
+	"settings.appearance.themes.dark": "黑暗",
+	"settings.appearance.themes.system": "系统主题",
 	"settings.appearance.language": "语言",
-	"settings.appearance.languageDescription": "为您的仪表盘选择语言",
-	"settings.terminal.connectionSettings": "连接设置",
-	"settings.terminal.ipAddress": "IP 地址",
+	"settings.appearance.languageDescription": "选择面板语言",
+
+	"settings.terminal.connectionSettings": "终端设置",
+	"settings.terminal.ipAddress": "IP",
 	"settings.terminal.port": "端口",
-	"settings.terminal.username": "用户名",
-	"settings.settings": "设置",
-	"settings.general": "通用设置",
-	"settings.security": "安全",
-	"settings.users": "用户管理",
-	"settings.roles": "角色管理",
-	"settings.permissions": "权限",
-	"settings.api": "API设置",
-	"settings.certificates": "证书管理",
-	"settings.ssh": "SSH密钥",
-	"settings.backups": "备份",
-	"settings.logs": "日志",
-	"settings.updates": "更新",
-	"settings.network": "网络"
+	"settings.terminal.username": "用户名"
 }

apps/dokploy/server/api/root.ts

@@ -1,4 +1,5 @@
 import { createTRPCRouter } from "../api/trpc";
+import { adminRouter } from "./routers/admin";
 import { aiRouter } from "./routers/ai";
 import { applicationRouter } from "./routers/application";
 import { backupRouter } from "./routers/backup";
@@ -41,6 +42,7 @@ import { userRouter } from "./routers/user";
  */
 
 export const appRouter = createTRPCRouter({
+	admin: adminRouter,
 	docker: dockerRouter,
 	project: projectRouter,
 	application: applicationRouter,

apps/dokploy/server/api/routers/admin.ts

@@ -0,0 +1,61 @@
+import { apiUpdateWebServerMonitoring } from "@/server/db/schema";
+import {
+	IS_CLOUD,
+	findUserById,
+	setupWebMonitoring,
+	updateUser,
+} from "@dokploy/server";
+import { TRPCError } from "@trpc/server";
+import { adminProcedure, createTRPCRouter } from "../trpc";
+
+export const adminRouter = createTRPCRouter({
+	setupMonitoring: adminProcedure
+		.input(apiUpdateWebServerMonitoring)
+		.mutation(async ({ input, ctx }) => {
+			try {
+				if (IS_CLOUD) {
+					throw new TRPCError({
+						code: "UNAUTHORIZED",
+						message: "Feature disabled on cloud",
+					});
+				}
+				const user = await findUserById(ctx.user.ownerId);
+				if (user.id !== ctx.user.ownerId) {
+					throw new TRPCError({
+						code: "UNAUTHORIZED",
+						message: "You are not authorized to setup the monitoring",
+					});
+				}
+
+				await updateUser(user.id, {
+					metricsConfig: {
+						server: {
+							type: "Dokploy",
+							refreshRate: input.metricsConfig.server.refreshRate,
+							port: input.metricsConfig.server.port,
+							token: input.metricsConfig.server.token,
+							cronJob: input.metricsConfig.server.cronJob,
+							urlCallback: input.metricsConfig.server.urlCallback,
+							retentionDays: input.metricsConfig.server.retentionDays,
+							thresholds: {
+								cpu: input.metricsConfig.server.thresholds.cpu,
+								memory: input.metricsConfig.server.thresholds.memory,
+							},
+						},
+						containers: {
+							refreshRate: input.metricsConfig.containers.refreshRate,
+							services: {
+								include: input.metricsConfig.containers.services.include || [],
+								exclude: input.metricsConfig.containers.services.exclude || [],
+							},
+						},
+					},
+				});
+
+				const currentServer = await setupWebMonitoring(user.id);
+				return currentServer;
+			} catch (error) {
+				throw error;
+			}
+		}),
+});

apps/dokploy/server/api/routers/application.ts

@@ -355,8 +355,6 @@ export const applicationRouter = createTRPCRouter({
 				applicationStatus: "idle",
 				githubId: input.githubId,
 				watchPaths: input.watchPaths,
-				triggerType: input.triggerType,
-				enableSubmodules: input.enableSubmodules,
 			});
 
 			return true;
@@ -384,7 +382,6 @@ export const applicationRouter = createTRPCRouter({
 				gitlabProjectId: input.gitlabProjectId,
 				gitlabPathNamespace: input.gitlabPathNamespace,
 				watchPaths: input.watchPaths,
-				enableSubmodules: input.enableSubmodules,
 			});
 
 			return true;
@@ -410,7 +407,6 @@ export const applicationRouter = createTRPCRouter({
 				applicationStatus: "idle",
 				bitbucketId: input.bitbucketId,
 				watchPaths: input.watchPaths,
-				enableSubmodules: input.enableSubmodules,
 			});
 
 			return true;
@@ -436,7 +432,6 @@ export const applicationRouter = createTRPCRouter({
 				applicationStatus: "idle",
 				giteaId: input.giteaId,
 				watchPaths: input.watchPaths,
-				enableSubmodules: input.enableSubmodules,
 			});
 
 			return true;
@@ -484,7 +479,6 @@ export const applicationRouter = createTRPCRouter({
 				sourceType: "git",
 				applicationStatus: "idle",
 				watchPaths: input.watchPaths,
-				enableSubmodules: input.enableSubmodules,
 			});
 
 			return true;

apps/dokploy/server/api/routers/backup.ts

@@ -10,8 +10,6 @@ import {
 	IS_CLOUD,
 	createBackup,
 	findBackupById,
-	findComposeByBackupId,
-	findComposeById,
 	findMariadbByBackupId,
 	findMariadbById,
 	findMongoByBackupId,
@@ -33,7 +31,6 @@ import {
 } from "@dokploy/server";
 
 import { findDestinationById } from "@dokploy/server/services/destination";
-import { runComposeBackup } from "@dokploy/server/utils/backups/compose";
 import {
 	getS3Credentials,
 	normalizeS3Path,
@@ -43,7 +40,6 @@ import {
 	execAsyncRemote,
 } from "@dokploy/server/utils/process/execAsync";
 import {
-	restoreComposeBackup,
 	restoreMariadbBackup,
 	restoreMongoBackup,
 	restoreMySqlBackup,
@@ -54,18 +50,6 @@ import { TRPCError } from "@trpc/server";
 import { observable } from "@trpc/server/observable";
 import { z } from "zod";
 
-interface RcloneFile {
-	Path: string;
-	Name: string;
-	Size: number;
-	IsDir: boolean;
-	Tier?: string;
-	Hashes?: {
-		MD5?: string;
-		SHA1?: string;
-	};
-}
-
 export const backupRouter = createTRPCRouter({
 	create: protectedProcedure
 		.input(apiCreateBackup)
@@ -86,11 +70,6 @@ export const backupRouter = createTRPCRouter({
 						serverId = backup.mongo.serverId;
 					} else if (databaseType === "mariadb" && backup.mariadb?.serverId) {
 						serverId = backup.mariadb.serverId;
-					} else if (
-						backup.backupType === "compose" &&
-						backup.compose?.serverId
-					) {
-						serverId = backup.compose.serverId;
 					}
 					const server = await findServerById(serverId);
 
@@ -241,22 +220,6 @@ export const backupRouter = createTRPCRouter({
 				});
 			}
 		}),
-	manualBackupCompose: protectedProcedure
-		.input(apiFindOneBackup)
-		.mutation(async ({ input }) => {
-			try {
-				const backup = await findBackupById(input.backupId);
-				const compose = await findComposeByBackupId(backup.backupId);
-				await runComposeBackup(compose, backup);
-				return true;
-			} catch (error) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message: "Error running manual Compose backup ",
-					cause: error,
-				});
-			}
-		}),
 	manualBackupMongo: protectedProcedure
 		.input(apiFindOneBackup)
 		.mutation(async ({ input }) => {
@@ -305,7 +268,7 @@ export const backupRouter = createTRPCRouter({
 						: input.search;
 
 				const searchPath = baseDir ? `${bucketPath}/${baseDir}` : bucketPath;
-				const listCommand = `rclone lsjson ${rcloneFlags.join(" ")} "${searchPath}" --no-mimetype --no-modtime 2>/dev/null`;
+				const listCommand = `rclone lsf ${rcloneFlags.join(" ")} "${searchPath}" | head -n 100`;
 
 				let stdout = "";
 
@@ -317,35 +280,20 @@ export const backupRouter = createTRPCRouter({
 					stdout = result.stdout;
 				}
 
-				let files: RcloneFile[] = [];
-				try {
-					files = JSON.parse(stdout) as RcloneFile[];
-				} catch (error) {
-					console.error("Error parsing JSON response:", error);
-					console.error("Raw stdout:", stdout);
-					throw new Error("Failed to parse backup files list");
-				}
-
-				// Limit to first 100 files
+				const files = stdout.split("\n").filter(Boolean);
 
 				const results = baseDir
-					? files.map((file) => ({
-							...file,
-							Path: `${baseDir}${file.Path}`,
-						}))
+					? files.map((file) => `${baseDir}${file}`)
 					: files;
 
 				if (searchTerm) {
-					return results
-						.filter((file) =>
-							file.Path.toLowerCase().includes(searchTerm.toLowerCase()),
-						)
-						.slice(0, 100);
+					return results.filter((file) =>
+						file.toLowerCase().includes(searchTerm.toLowerCase()),
+					);
 				}
 
-				return results.slice(0, 100);
+				return results;
 			} catch (error) {
-				console.error("Error in listBackupFiles:", error);
 				throw new TRPCError({
 					code: "BAD_REQUEST",
 					message:
@@ -376,96 +324,78 @@ export const backupRouter = createTRPCRouter({
 					"mongo",
 					"web-server",
 				]),
-				backupType: z.enum(["database", "compose"]),
 				databaseName: z.string().min(1),
 				backupFile: z.string().min(1),
 				destinationId: z.string().min(1),
-				metadata: z.any(),
 			}),
 		)
 		.subscription(async ({ input }) => {
 			const destination = await findDestinationById(input.destinationId);
-			if (input.backupType === "database") {
-				if (input.databaseType === "postgres") {
-					const postgres = await findPostgresById(input.databaseId);
+			if (input.databaseType === "postgres") {
+				const postgres = await findPostgresById(input.databaseId);
 
-					return observable<string>((emit) => {
-						restorePostgresBackup(
-							postgres,
-							destination,
-							input.databaseName,
-							input.backupFile,
-							(log) => {
-								emit.next(log);
-							},
-						);
-					});
-				}
-				if (input.databaseType === "mysql") {
-					const mysql = await findMySqlById(input.databaseId);
-					return observable<string>((emit) => {
-						restoreMySqlBackup(
-							mysql,
-							destination,
-							input.databaseName,
-							input.backupFile,
-							(log) => {
-								emit.next(log);
-							},
-						);
-					});
-				}
-				if (input.databaseType === "mariadb") {
-					const mariadb = await findMariadbById(input.databaseId);
-					return observable<string>((emit) => {
-						restoreMariadbBackup(
-							mariadb,
-							destination,
-							input.databaseName,
-							input.backupFile,
-							(log) => {
-								emit.next(log);
-							},
-						);
-					});
-				}
-				if (input.databaseType === "mongo") {
-					const mongo = await findMongoById(input.databaseId);
-					return observable<string>((emit) => {
-						restoreMongoBackup(
-							mongo,
-							destination,
-							input.databaseName,
-							input.backupFile,
-							(log) => {
-								emit.next(log);
-							},
-						);
-					});
-				}
-				if (input.databaseType === "web-server") {
-					return observable<string>((emit) => {
-						restoreWebServerBackup(destination, input.backupFile, (log) => {
-							emit.next(log);
-						});
-					});
-				}
-			}
-			if (input.backupType === "compose") {
-				const compose = await findComposeById(input.databaseId);
 				return observable<string>((emit) => {
-					restoreComposeBackup(
-						compose,
+					restorePostgresBackup(
+						postgres,
 						destination,
 						input.databaseName,
 						input.backupFile,
-						input.metadata,
 						(log) => {
 							emit.next(log);
 						},
 					);
 				});
 			}
+			if (input.databaseType === "mysql") {
+				const mysql = await findMySqlById(input.databaseId);
+				return observable<string>((emit) => {
+					restoreMySqlBackup(
+						mysql,
+						destination,
+						input.databaseName,
+						input.backupFile,
+						(log) => {
+							emit.next(log);
+						},
+					);
+				});
+			}
+			if (input.databaseType === "mariadb") {
+				const mariadb = await findMariadbById(input.databaseId);
+				return observable<string>((emit) => {
+					restoreMariadbBackup(
+						mariadb,
+						destination,
+						input.databaseName,
+						input.backupFile,
+						(log) => {
+							emit.next(log);
+						},
+					);
+				});
+			}
+			if (input.databaseType === "mongo") {
+				const mongo = await findMongoById(input.databaseId);
+				return observable<string>((emit) => {
+					restoreMongoBackup(
+						mongo,
+						destination,
+						input.databaseName,
+						input.backupFile,
+						(log) => {
+							emit.next(log);
+						},
+					);
+				});
+			}
+			if (input.databaseType === "web-server") {
+				return observable<string>((emit) => {
+					restoreWebServerBackup(destination, input.backupFile, (log) => {
+						emit.next(log);
+					});
+				});
+			}
+
 			return true;
 		}),
 });

apps/dokploy/server/api/routers/domain.ts

@@ -21,7 +21,6 @@ import {
 	removeDomain,
 	removeDomainById,
 	updateDomainById,
-	validateDomain,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
@@ -225,15 +224,4 @@ export const domainRouter = createTRPCRouter({
 
 			return result;
 		}),
-
-	validateDomain: protectedProcedure
-		.input(
-			z.object({
-				domain: z.string(),
-				serverIp: z.string().optional(),
-			}),
-		)
-		.mutation(async ({ input }) => {
-			return validateDomain(input.domain, input.serverIp);
-		}),
 });

apps/dokploy/server/api/routers/mount.ts

@@ -31,6 +31,7 @@ export const mountRouter = createTRPCRouter({
 	update: protectedProcedure
 		.input(apiUpdateMount)
 		.mutation(async ({ input }) => {
-			return await updateMount(input.mountId, input);
+			await updateMount(input.mountId, input);
+			return true;
 		}),
 });

apps/dokploy/server/api/routers/organization.ts

@@ -157,31 +157,4 @@ export const organizationRouter = createTRPCRouter({
 			orderBy: [desc(invitation.status), desc(invitation.expiresAt)],
 		});
 	}),
-	removeInvitation: adminProcedure
-		.input(z.object({ invitationId: z.string() }))
-		.mutation(async ({ ctx, input }) => {
-			const invitationResult = await db.query.invitation.findFirst({
-				where: eq(invitation.id, input.invitationId),
-			});
-
-			if (!invitationResult) {
-				throw new TRPCError({
-					code: "NOT_FOUND",
-					message: "Invitation not found",
-				});
-			}
-
-			if (
-				invitationResult?.organizationId !== ctx.session.activeOrganizationId
-			) {
-				throw new TRPCError({
-					code: "FORBIDDEN",
-					message: "You are not allowed to remove this invitation",
-				});
-			}
-
-			return await db
-				.delete(invitation)
-				.where(eq(invitation.id, input.invitationId));
-		}),
 });

apps/dokploy/server/api/routers/settings.ts

@@ -79,33 +79,6 @@ export const settingsRouter = createTRPCRouter({
 		await execAsync(`docker service update --force ${stdout.trim()}`);
 		return true;
 	}),
-	cleanRedis: adminProcedure.mutation(async () => {
-		if (IS_CLOUD) {
-			return true;
-		}
-
-		const { stdout: containerId } = await execAsync(
-			`docker ps --filter "name=dokploy-redis" --filter "status=running" -q | head -n 1`,
-		);
-
-		if (!containerId) {
-			throw new Error("Redis container not found");
-		}
-
-		const redisContainerId = containerId.trim();
-
-		await execAsync(`docker exec -i ${redisContainerId} redis-cli flushall`);
-		return true;
-	}),
-	reloadRedis: adminProcedure.mutation(async () => {
-		if (IS_CLOUD) {
-			return true;
-		}
-
-		await execAsync("docker service scale dokploy-redis=0");
-		await execAsync("docker service scale dokploy-redis=1");
-		return true;
-	}),
 	reloadTraefik: adminProcedure
 		.input(apiServerSchema)
 		.mutation(async ({ input }) => {

apps/dokploy/server/api/routers/user.ts

@@ -5,7 +5,6 @@ import {
 	findUserById,
 	getUserByToken,
 	removeUserById,
-	setupWebMonitoring,
 	updateUser,
 } from "@dokploy/server";
 import { db } from "@dokploy/server/db";
@@ -14,7 +13,6 @@ import {
 	apiAssignPermissions,
 	apiFindOneToken,
 	apiUpdateUser,
-	apiUpdateWebServerMonitoring,
 	apikey,
 	invitation,
 	member,
@@ -29,11 +27,7 @@ import {
 	protectedProcedure,
 	publicProcedure,
 } from "../trpc";
-import {
-	validateLicense,
-	activateLicense,
-	deactivateLicense,
-} from "@/server/utils/validate-license";
+
 const apiCreateApiKey = z.object({
 	name: z.string().min(1),
 	prefix: z.string().optional(),
@@ -166,73 +160,6 @@ export const userRouter = createTRPCRouter({
 			}
 			return await updateUser(ctx.user.id, input);
 		}),
-	saveLicense: adminProcedure
-		.input(
-			z.object({
-				licenseKey: z.string(),
-			}),
-		)
-		.mutation(async ({ input, ctx }) => {
-			const owner = await findUserById(ctx.user.ownerId);
-
-			const result = await activateLicense(
-				input.licenseKey,
-				owner?.serverIp || "",
-			);
-
-			if (!result.success) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message: result.error,
-				});
-			}
-
-			await updateUser(ctx.user.id, {
-				licenseKey: input.licenseKey,
-			});
-
-			return result;
-		}),
-	deactivateLicense: adminProcedure
-		.input(z.object({ licenseKey: z.string().min(1) }))
-		.mutation(async ({ input, ctx }) => {
-			const owner = await findUserById(ctx.user.ownerId);
-			const result = await deactivateLicense(
-				input.licenseKey,
-				owner?.serverIp || "",
-			);
-
-			if (!result.success) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message: result.error,
-				});
-			}
-
-			await updateUser(ctx.user.id, {
-				licenseKey: null,
-			});
-
-			return result;
-		}),
-	validateLicense: adminProcedure
-		.input(z.object({ licenseKey: z.string().min(1) }))
-		.mutation(async ({ input, ctx }) => {
-			const owner = await findUserById(ctx.user.ownerId);
-			const result = await validateLicense(
-				input.licenseKey,
-				owner?.serverIp || "",
-			);
-
-			if (!result.success) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message: result.error,
-				});
-			}
-
-			return result;
-		}),
 	getUserByToken: publicProcedure
 		.input(apiFindOneToken)
 		.query(async ({ input }) => {
@@ -422,62 +349,4 @@ export const userRouter = createTRPCRouter({
 
 			return organizations.length;
 		}),
-
-	setupMonitoring: adminProcedure
-		.input(apiUpdateWebServerMonitoring)
-		.mutation(async ({ input, ctx }) => {
-			try {
-				if (IS_CLOUD) {
-					throw new TRPCError({
-						code: "UNAUTHORIZED",
-						message: "Feature disabled on cloud",
-					});
-				}
-
-				const user = await findUserById(ctx.user.id);
-
-				if (!validateLicense(user?.licenseKey || "", user?.serverIp || "")) {
-					throw new TRPCError({
-						code: "UNAUTHORIZED",
-						message: "Invalid license key",
-					});
-				}
-				if (user.id !== ctx.user.ownerId) {
-					throw new TRPCError({
-						code: "UNAUTHORIZED",
-						message: "You are not authorized to setup the monitoring",
-					});
-				}
-
-				await updateUser(user.id, {
-					metricsConfig: {
-						server: {
-							type: "Dokploy",
-							refreshRate: input.metricsConfig.server.refreshRate,
-							port: input.metricsConfig.server.port,
-							token: input.metricsConfig.server.token,
-							cronJob: input.metricsConfig.server.cronJob,
-							urlCallback: input.metricsConfig.server.urlCallback,
-							retentionDays: input.metricsConfig.server.retentionDays,
-							thresholds: {
-								cpu: input.metricsConfig.server.thresholds.cpu,
-								memory: input.metricsConfig.server.thresholds.memory,
-							},
-						},
-						containers: {
-							refreshRate: input.metricsConfig.containers.refreshRate,
-							services: {
-								include: input.metricsConfig.containers.services.include || [],
-								exclude: input.metricsConfig.containers.services.exclude || [],
-							},
-						},
-					},
-				});
-
-				const currentServer = await setupWebMonitoring(user.id);
-				return currentServer;
-			} catch (error) {
-				throw error;
-			}
-		}),
 });

apps/dokploy/server/server.ts

@@ -21,7 +21,6 @@ import { setupTerminalWebSocketServer } from "./wss/terminal";
 
 config({ path: ".env" });
 const PORT = Number.parseInt(process.env.PORT || "3000", 10);
-const HOST = process.env.HOST || "0.0.0.0";
 const dev = process.env.NODE_ENV !== "production";
 const app = next({ dev, turbopack: process.env.TURBOPACK === "1" });
 const handle = app.getRequestHandler();
@@ -56,8 +55,8 @@ void app.prepare().then(async () => {
 			await migration();
 		}
 
-		server.listen(PORT, HOST);
-		console.log(`Server Started on: http://${HOST}:${PORT}`);
+		server.listen(PORT);
+		console.log("Server Started:", PORT);
 		if (!IS_CLOUD) {
 			console.log("Starting Deployment Worker");
 			const { deploymentWorker } = await import("./queues/deployments-queue");

apps/dokploy/server/utils/validate-license.ts

@@ -1,47 +0,0 @@
-const licensesUrl = process.env.LICENSES_URL || "http://localhost:4002";
-
-export const validateLicense = async (licenseKey: string, serverIp: string) => {
-	const response = await fetch(`${licensesUrl}/api/license/validate`, {
-		method: "POST",
-		headers: {
-			"Content-Type": "application/json",
-		},
-		body: JSON.stringify({ licenseKey, serverIp }),
-	});
-	const data = await response.json();
-
-	if (!response.ok && data.error?.issues) {
-		console.log("Validation errors:", data.error.issues);
-	}
-
-	return data;
-};
-
-export const activateLicense = async (licenseKey: string, serverIp: string) => {
-	const response = await fetch(`${licensesUrl}/api/license/activate`, {
-		method: "POST",
-		headers: {
-			"Content-Type": "application/json",
-		},
-		body: JSON.stringify({ licenseKey, serverIp }),
-	});
-	const data = await response.json();
-
-	return data;
-};
-
-export const deactivateLicense = async (
-	licenseKey: string,
-	serverIp: string,
-) => {
-	const response = await fetch(`${licensesUrl}/api/license/deactivate`, {
-		method: "POST",
-		headers: {
-			"Content-Type": "application/json",
-		},
-		body: JSON.stringify({ licenseKey, serverIp }),
-	});
-	const data = await response.json();
-
-	return data;
-};

apps/licenses/.env.example

@@ -1,2 +0,0 @@
-LEMON_SQUEEZY_API_KEY=""
-LEMON_SQUEEZY_STORE_ID=""

apps/licenses/.gitignore

@@ -1,28 +0,0 @@
-# dev
-.yarn/
-!.yarn/releases
-.vscode/*
-!.vscode/launch.json
-!.vscode/*.code-snippets
-.idea/workspace.xml
-.idea/usage.statistics.xml
-.idea/shelf
-
-# deps
-node_modules/
-
-# env
-.env
-.env.production
-
-# logs
-logs/
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-# misc
-.DS_Store

apps/licenses/README.md

@@ -1,8 +0,0 @@
-```
-npm install
-npm run dev
-```
-
-```
-open http://localhost:4002/api/health
-```

apps/licenses/drizzle.config.ts

@@ -1,15 +0,0 @@
-import type { Config } from "drizzle-kit";
-import "dotenv/config";
-
-const connectionString = process.env.DATABASE_URL!;
-
-export default {
-	schema: "./src/schema.ts",
-	out: "./drizzle",
-	dialect: "postgresql",
-	dbCredentials: {
-		url: connectionString,
-	},
-	verbose: true,
-	strict: true,
-} satisfies Config;

apps/licenses/drizzle/0000_famous_vermin.sql

@@ -1,28 +0,0 @@
-CREATE TABLE "licenses" (
-	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	"product_id" text NOT NULL,
-	"license_key" text NOT NULL,
-	"server_ips" text[],
-	"activated_at" timestamp,
-	"last_verified_at" timestamp,
-	"stripeCustomerId" text NOT NULL,
-	"stripeSubscriptionId" text NOT NULL,
-	"created_at" timestamp DEFAULT CURRENT_TIMESTAMP,
-	"updated_at" timestamp DEFAULT CURRENT_TIMESTAMP,
-	"metadata" text,
-	"user_id" uuid,
-	CONSTRAINT "licenses_license_key_unique" UNIQUE("license_key")
-);
---> statement-breakpoint
-CREATE TABLE "user" (
-	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	"email" text NOT NULL,
-	"created_at" timestamp DEFAULT CURRENT_TIMESTAMP,
-	"updated_at" timestamp DEFAULT CURRENT_TIMESTAMP,
-	"otp_code" text,
-	"otp_code_expires_at" timestamp,
-	"temporal_id" uuid DEFAULT gen_random_uuid(),
-	CONSTRAINT "user_email_unique" UNIQUE("email")
-);
---> statement-breakpoint
-ALTER TABLE "licenses" ADD CONSTRAINT "licenses_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;

apps/licenses/drizzle/meta/0000_snapshot.json

@@ -1,196 +0,0 @@
-{
-  "id": "553c7c08-f9c6-4090-8372-8d27a389eaa7",
-  "prevId": "00000000-0000-0000-0000-000000000000",
-  "version": "7",
-  "dialect": "postgresql",
-  "tables": {
-    "public.licenses": {
-      "name": "licenses",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "uuid",
-          "primaryKey": true,
-          "notNull": true,
-          "default": "gen_random_uuid()"
-        },
-        "product_id": {
-          "name": "product_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "license_key": {
-          "name": "license_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "server_ips": {
-          "name": "server_ips",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "activated_at": {
-          "name": "activated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "last_verified_at": {
-          "name": "last_verified_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "stripeCustomerId": {
-          "name": "stripeCustomerId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "stripeSubscriptionId": {
-          "name": "stripeSubscriptionId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "uuid",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "licenses_user_id_user_id_fk": {
-          "name": "licenses_user_id_user_id_fk",
-          "tableFrom": "licenses",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "licenses_license_key_unique": {
-          "name": "licenses_license_key_unique",
-          "nullsNotDistinct": false,
-          "columns": [
-            "license_key"
-          ]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.user": {
-      "name": "user",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "uuid",
-          "primaryKey": true,
-          "notNull": true,
-          "default": "gen_random_uuid()"
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "otp_code": {
-          "name": "otp_code",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "otp_code_expires_at": {
-          "name": "otp_code_expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "temporal_id": {
-          "name": "temporal_id",
-          "type": "uuid",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "gen_random_uuid()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "user_email_unique": {
-          "name": "user_email_unique",
-          "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    }
-  },
-  "enums": {},
-  "schemas": {},
-  "sequences": {},
-  "roles": {},
-  "policies": {},
-  "views": {},
-  "_meta": {
-    "columns": {},
-    "schemas": {},
-    "tables": {}
-  }
-}

apps/licenses/drizzle/meta/_journal.json

@@ -1,13 +0,0 @@
-{
-  "version": "7",
-  "dialect": "postgresql",
-  "entries": [
-    {
-      "idx": 0,
-      "version": "7",
-      "when": 1742773711509,
-      "tag": "0000_famous_vermin",
-      "breakpoints": true
-    }
-  ]
-}

apps/licenses/migrate.ts

@@ -1,22 +0,0 @@
-import { drizzle } from "drizzle-orm/postgres-js";
-import { migrate } from "drizzle-orm/postgres-js/migrator";
-import postgres from "postgres";
-import "dotenv/config";
-import * as schema from "./src/schema";
-
-const connectionString = process.env.DATABASE_URL!;
-const sql = postgres(connectionString, { max: 1 });
-const db = drizzle(sql, { schema });
-
-await migrate(db, { migrationsFolder: "drizzle" })
-	.then(() => {
-		console.log("Migration complete");
-		sql.end();
-	})
-	.catch((error) => {
-		console.error("Migration failed", error);
-		process.exit(1);
-	})
-	.finally(() => {
-		sql.end();
-	});

apps/licenses/package.json

@@ -1,48 +0,0 @@
-{
-	"name": "@dokploy/licenses",
-	"version": "0.0.1",
-	"type": "module",
-	"scripts": {
-		"dev": "PORT=4002 tsx watch -r dotenv/config src/index.ts",
-		"build": "tsc --project tsconfig.json",
-		"start": "node dist/index.js",
-		"typecheck": "tsc --noEmit",
-		"generate": "drizzle-kit generate",
-		"drop": "drizzle-kit drop",
-		"push": "drizzle-kit push",
-		"migrate": "tsx ./migrate.ts",
-		"truncate": "tsx ./truncate.ts",
-		"reset:all": "tsx ./truncate.ts && tsx ./migrate.ts",
-		"studio": "drizzle-kit studio"
-	},
-	"dependencies": {
-		"nanoid": "5.1.5",
-		"@react-email/components": "^0.0.21",
-		"@hono/node-server": "^1.12.1",
-		"@hono/zod-validator": "0.3.0",
-		"@react-email/render": "^1.0.5",
-		"@types/pg": "^8.11.11",
-		"dotenv": "^16.3.1",
-		"drizzle-orm": "^0.39.1",
-		"hono": "^4.5.8",
-		"nodemailer": "6.9.14",
-		"pg": "^8.14.1",
-		"pino": "9.4.0",
-		"pino-pretty": "11.2.2",
-		"postgres": "3.4.4",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
-		"stripe": "17.2.0",
-		"zod": "^3.23.4"
-	},
-	"devDependencies": {
-		"@types/node": "^20.11.17",
-		"@types/nodemailer": "^6.4.16",
-		"@types/react": "^18.2.37",
-		"@types/react-dom": "^18.2.15",
-		"drizzle-kit": "^0.30.4",
-		"tsx": "^4.7.1",
-		"typescript": "^5.4.2"
-	},
-	"packageManager": "pnpm@9.5.0"
-}

apps/licenses/src/api/license.ts

@@ -1,265 +0,0 @@
-import { zValidator } from "@hono/zod-validator";
-import { Hono } from "hono";
-import { z } from "zod";
-import {
-	activateLicense,
-	deactivateLicense,
-	validateLicense,
-	cleanLicense,
-} from "../utils/license";
-import { logger } from "../logger";
-import { eq, desc } from "drizzle-orm";
-import { users, licenses } from "../schema";
-import { db } from "../db";
-import { transporter } from "../email";
-import { nanoid } from "nanoid";
-import { stripe } from "../stripe";
-import type Stripe from "stripe";
-import { getLicenseTypeFromPriceId } from "../utils";
-const validateSchema = z.object({
-	licenseKey: z.string(),
-	serverIp: z.string(),
-});
-
-export const licenseRouter = new Hono();
-
-licenseRouter.post(
-	"/validate",
-	zValidator("json", validateSchema),
-	async (c) => {
-		const { licenseKey, serverIp } = c.req.valid("json");
-
-		try {
-			const result = await validateLicense(licenseKey, serverIp);
-			return c.json(result);
-		} catch (error) {
-			logger.error("Error validating license:", { error });
-			return c.json({ success: false, error: "Error validating license" }, 500);
-		}
-	},
-);
-
-licenseRouter.post(
-	"/activate",
-	zValidator("json", validateSchema),
-	async (c) => {
-		const { licenseKey, serverIp } = c.req.valid("json");
-
-		try {
-			const license = await activateLicense(licenseKey, serverIp);
-			return c.json({ success: true, license });
-		} catch (error) {
-			logger.error("Error activating license:", error);
-			if (error instanceof Error) {
-				return c.json({ success: false, error: error.message }, 400);
-			}
-			return c.json({ success: false, error: "Unknown error occurred" }, 400);
-		}
-	},
-);
-
-licenseRouter.post(
-	"/deactivate",
-	zValidator("json", validateSchema),
-	async (c) => {
-		const { licenseKey, serverIp } = c.req.valid("json");
-
-		try {
-			const license = await deactivateLicense(licenseKey, serverIp);
-			return c.json({ success: true, license });
-		} catch (error) {
-			logger.error("Error deactivating license:", error);
-			return c.json(
-				{ success: false, error: "Error deactivating license" },
-				500,
-			);
-		}
-	},
-);
-
-licenseRouter.post(
-	"/remove-server",
-	zValidator(
-		"json",
-		z.object({ licenseKey: z.string().min(1), serverIp: z.string().min(1) }),
-	),
-	async (c) => {
-		const { licenseKey, serverIp } = c.req.valid("json");
-
-		try {
-			const license = await cleanLicense(licenseKey, serverIp);
-			return c.json({ success: true, license });
-		} catch (error) {
-			logger.error("Error cleaning license:", error);
-			return c.json({ success: false, error: "Error cleaning license" }, 500);
-		}
-	},
-);
-// router.post("/resend-license", zValidator("json", resendSchema), async (c) => {
-// 	const { licenseKey } = c.req.valid("json");
-
-// 	try {
-// 		const license = await db.query.licenses.findFirst({
-// 			where: eq(licenses.licenseKey, licenseKey),
-// 		});
-
-// 		if (!license) {
-// 			return c.json({ success: false, error: "License not found" }, 404);
-// 		}
-
-// 		const suscription = await stripe.subscriptions.retrieve(
-// 			license.stripeSubscriptionId,
-// 		);
-
-// 		const priceId = suscription.items.data[0].price.id;
-// 		const { type } = getLicenseTypeFromPriceId(priceId);
-
-// 		const emailHtml = await render(
-// 			ResendLicenseEmail({
-// 				licenseKey: license.licenseKey,
-// 				productName: `Dokploy Self Hosted ${type}`,
-// 				requestDate: new Date(),
-// 				customerName: license.email,
-// 			}),
-// 		);
-
-// 		await transporter.sendMail({
-// 			from: process.env.SMTP_FROM_ADDRESS,
-// 			to: license.email,
-// 			subject: "Your Dokploy License Key",
-// 			html: emailHtml,
-// 		});
-
-// 		return c.json({ success: true });
-// 	} catch (error) {
-// 		logger.error("Error resending license:", error);
-// 		return c.json({ success: false, error: "Error resending license" }, 500);
-// 	}
-// });
-
-licenseRouter.post(
-	"/send-otp",
-	zValidator("json", z.object({ email: z.string().email() })),
-	async (c) => {
-		const { email } = c.req.valid("json");
-
-		const user = await db.query.users.findFirst({
-			where: eq(users.email, email.toLowerCase()),
-		});
-
-		if (!user) {
-			return c.json({ success: false, error: "User not found" }, 404);
-		}
-
-		const generateOtpCode = Math.floor(100000 + Math.random() * 900000);
-		const otpCodeExpiresAt = new Date(Date.now() + 10 * 60 * 1000);
-
-		await db
-			.update(users)
-			.set({ otpCode: generateOtpCode.toString(), otpCodeExpiresAt })
-			.where(eq(users.id, user.id));
-
-		await transporter.sendMail({
-			from: process.env.SMTP_FROM_ADDRESS,
-			to: user.email,
-			subject: "Your Dokploy License Key ",
-			html: `Your OTP code is ${generateOtpCode}, it will expire in 10 minutes`,
-		});
-
-		return c.json({ success: true });
-	},
-);
-
-licenseRouter.post(
-	"/verify-otp",
-	zValidator(
-		"json",
-		z.object({ email: z.string().email(), otpCode: z.string().length(6) }),
-	),
-	async (c) => {
-		const { email, otpCode } = c.req.valid("json");
-
-		const user = await db.query.users.findFirst({
-			where: eq(users.email, email.toLowerCase()),
-		});
-
-		if (!user) {
-			return c.json({ success: false, error: "User not found" }, 404);
-		}
-
-		if (user.otpCode !== otpCode) {
-			return c.json({ success: false, error: "Invalid code" }, 400);
-		}
-
-		if (user.otpCodeExpiresAt && user.otpCodeExpiresAt < new Date()) {
-			return c.json({ success: false, error: "Code expired" }, 400);
-		}
-
-		const result = await db
-			.update(users)
-			.set({
-				otpCode: null,
-				otpCodeExpiresAt: null,
-				temporalId: nanoid(),
-				temporalIdExpiresAt: new Date(Date.now() + 20 * 60 * 1000),
-			})
-			.where(eq(users.id, user.id))
-			.returning();
-
-		return c.json({ success: true, temporalId: result[0].temporalId });
-	},
-);
-
-licenseRouter.get(
-	"/all",
-	zValidator("query", z.object({ temporalId: z.string() })),
-	async (c) => {
-		const { temporalId } = c.req.valid("query");
-
-		const user = await db.query.users.findFirst({
-			where: eq(users.temporalId, temporalId),
-			with: {
-				licenses: true,
-			},
-			orderBy: desc(licenses.createdAt),
-		});
-
-		if (!user) {
-			return c.json({ success: false, error: "User not found" }, 404);
-		}
-
-		if (user.temporalIdExpiresAt && user.temporalIdExpiresAt < new Date()) {
-			return c.json({ success: false, error: "Session expired" }, 400);
-		}
-
-		const suscriptions: Stripe.Subscription[] = [];
-		for (const license of user.licenses) {
-			const suscription = await stripe.subscriptions.retrieve(
-				license.stripeSubscriptionId,
-			);
-
-			suscriptions.push(suscription);
-		}
-
-		const formated = user.licenses.map((license) => {
-			const suscription = suscriptions.find(
-				(suscription) => suscription.id === license.stripeSubscriptionId,
-			);
-
-			const { type } = getLicenseTypeFromPriceId(
-				suscription?.items.data[0].price.id || "",
-			);
-
-			return {
-				license: license,
-				stripeSuscription: {
-					quantity: suscription?.items.data[0].quantity,
-					billingType: suscription?.items.data[0].price.recurring?.interval,
-					type: type,
-				},
-			};
-		});
-
-		return c.json({ success: true, licenses: formated });
-	},
-);

apps/licenses/src/api/stripe.ts

@@ -1,220 +0,0 @@
-import { zValidator } from "@hono/zod-validator";
-import { Hono } from "hono";
-import { createCheckoutSessionSchema } from "../validators/stripe";
-import { getStripeItems } from "../utils/license";
-import { stripe } from "../stripe";
-import { WEBSITE_URL } from "../constants";
-import { logger } from "../logger";
-import { eq } from "drizzle-orm";
-import { licenses } from "../schema";
-import { db } from "../db";
-import { getLicenseFeatures, getLicenseTypeFromPriceId } from "../utils";
-import { z } from "zod";
-import type Stripe from "stripe";
-import { createLicense } from "../utils/license";
-import { render } from "@react-email/render";
-import { LicenseEmail } from "../../templates/emails/license-email";
-import { transporter } from "../email";
-
-export const stripeRouter = new Hono();
-
-stripeRouter.post(
-	"/create-checkout-session",
-	zValidator("json", createCheckoutSessionSchema),
-	async (c) => {
-		const { type, serverQuantity, isAnnual } = c.req.valid("json");
-
-		const items = getStripeItems(type, serverQuantity, isAnnual);
-		const session = await stripe.checkout.sessions.create({
-			mode: "subscription",
-			line_items: items,
-			allow_promotion_codes: true,
-			success_url: `${WEBSITE_URL}/license/success?session_id={CHECKOUT_SESSION_ID}`,
-			cancel_url: `${WEBSITE_URL}#pricing`,
-		});
-
-		return c.json({ sessionId: session.id });
-	},
-);
-
-stripeRouter.get(
-	"/get-license-from-session",
-	zValidator("query", z.object({ sessionId: z.string().min(1) })),
-	async (c) => {
-		const { sessionId } = c.req.valid("query");
-		console.log("Session ID", sessionId);
-
-		if (!sessionId) {
-			return c.json({ error: "Session ID is required" }, 400);
-		}
-
-		try {
-			const session = await stripe.checkout.sessions.retrieve(sessionId);
-			if (session.status !== "complete") {
-				return c.json({ error: "Session is not complete" }, 400);
-			}
-
-			const subscription = await stripe.subscriptions.retrieve(
-				session.subscription as string,
-			);
-
-			const license = await db.query.licenses.findFirst({
-				where: eq(licenses.stripeSubscriptionId, subscription.id),
-			});
-
-			const priceId = subscription.items.data[0].price.id;
-			const { type, billingType } = getLicenseTypeFromPriceId(priceId);
-
-			return c.json({ type, billingType, key: license?.licenseKey });
-		} catch (error) {
-			logger.error("Error retrieving session:", error);
-			return c.json({ error: "Error retrieving session" }, 400);
-		}
-	},
-);
-
-stripeRouter.post("/webhook", async (c) => {
-	const rawBody = await c.req.raw.text();
-	const sig = c.req.header("stripe-signature");
-
-	let event: Stripe.Event;
-
-	try {
-		event = stripe.webhooks.constructEvent(
-			rawBody,
-			sig!,
-			process.env.STRIPE_WEBHOOK_SECRET!,
-		);
-	} catch (err) {
-		logger.error("Webhook signature verification failed:", err);
-		return c.json({ error: "Webhook signature verification failed" }, 400);
-	}
-
-	const allowedEvents = ["invoice.paid"];
-
-	if (!allowedEvents.includes(event.type)) {
-		return c.json({ error: "Event not allowed" }, 400);
-	}
-
-	try {
-		switch (event.type) {
-			case "invoice.paid": {
-				const invoice = event.data.object as Stripe.Invoice;
-
-				if (!invoice.subscription) break;
-
-				if (invoice.billing_reason === "subscription_create") {
-					const customerResponse = await stripe.customers.retrieve(
-						invoice.customer as string,
-					);
-
-					if (customerResponse.deleted) {
-						throw new Error("Customer was deleted");
-					}
-
-					const subscriptionId = invoice.subscription as string;
-					const subscription =
-						await stripe.subscriptions.retrieve(subscriptionId);
-					const priceId = subscription.items.data[0].price.id;
-					const { type } = getLicenseTypeFromPriceId(priceId);
-
-					const { license, user } = await createLicense({
-						productId: subscriptionId,
-						email: customerResponse.email!.toLowerCase(),
-						stripeCustomerId: customerResponse.id,
-						stripeSubscriptionId: subscriptionId,
-					});
-
-					const features = getLicenseFeatures(type);
-					const emailHtml = await render(
-						LicenseEmail({
-							customerName: customerResponse.name || "Customer",
-							licenseKey: license.licenseKey,
-							productName: `Dokploy Self Hosted ${type}`,
-							features: features,
-						}),
-					);
-
-					await transporter.sendMail({
-						from: process.env.SMTP_FROM_ADDRESS,
-						to: user.email,
-						subject: "Your Dokploy License Key ",
-						html: emailHtml,
-					});
-				}
-
-				break;
-			}
-		}
-
-		return c.json({ received: true });
-	} catch (error) {
-		console.error("Error processing webhook:", error);
-		if (error instanceof Error) {
-			return c.json({ error: error.message }, 500);
-		}
-		return c.json({ error: "Unknown error occurred" }, 500);
-	}
-});
-
-stripeRouter.post(
-	"/create-customer-portal-session",
-	zValidator("json", z.object({ customerId: z.string().min(1) })),
-	async (c) => {
-		try {
-			const { customerId } = c.req.valid("json");
-
-			const session = await stripe.billingPortal.sessions.create({
-				customer: customerId,
-				configuration: process.env.STRIPE_PORTAL_CONFIGURATION_ID,
-				return_url: `${WEBSITE_URL}/dashboard/settings/billing`,
-			});
-
-			return c.json({ url: session.url });
-		} catch (error) {
-			logger.error("Error creating customer portal session:", error);
-			return c.json({ error: "Error creating customer portal session" }, 500);
-		}
-	},
-);
-// Execute 1 time to create the configuration
-// const configuration = await stripe.billingPortal.configurations.create({
-// 	business_profile: {
-// 		headline: "Manage your Dokploy subscription",
-// 	},
-// 	features: {
-// 		subscription_update: {
-// 			enabled: true,
-// 			products: [
-// 				{
-// 					product: "prod_RxSOzNrwlfVWmv",
-// 					prices: [
-// 						"price_1R3XTqF3cxQuHeOzZjgaG262",
-// 						"price_1R3XmmF3cxQuHeOzCEjz0HFz",
-// 					],
-// 				},
-// 				{
-// 					product: "prod_RxSVDolGpUy97g",
-// 					prices: [
-// 						"price_1R3XanF3cxQuHeOzh7VdbbUs",
-// 						"price_1R3Xp4F3cxQuHeOzUTNYDC9I",
-// 					],
-// 				},
-// 				{
-// 					product: "prod_RxSaEQpbsiPFgv",
-// 					prices: [
-// 						"price_1R3XfOF3cxQuHeOzYFUa0eNy",
-// 						"price_1R3XptF3cxQuHeOzZEBGMsEm",
-// 					],
-// 				},
-// 			],
-// 			default_allowed_updates: ["price", "quantity"],
-// 		},
-// 		subscription_cancel: {
-// 			enabled: true,
-// 		},
-// 		payment_method_update: {
-// 			enabled: true,
-// 		},
-// 	},
-// });

apps/licenses/src/constants.ts

@@ -1,4 +0,0 @@
-export const WEBSITE_URL =
-	process.env.NODE_ENV === "development"
-		? "http://localhost:3001"
-		: process.env.SITE_URL;

apps/licenses/src/db.ts

@@ -1,20 +0,0 @@
-import { type PostgresJsDatabase, drizzle } from "drizzle-orm/postgres-js";
-import postgres from "postgres";
-import * as schema from "./schema";
-declare global {
-	var db: PostgresJsDatabase<typeof schema> | undefined;
-}
-
-export let db: PostgresJsDatabase<typeof schema>;
-if (process.env.NODE_ENV === "production") {
-	db = drizzle(postgres(process.env.DATABASE_URL!), {
-		schema,
-	});
-} else {
-	if (!global.db)
-		global.db = drizzle(postgres(process.env.DATABASE_URL!), {
-			schema,
-		});
-
-	db = global.db;
-}