fix: generate release notes ourselves for hotfix releases

Hotfixes land on main via git cherry-pick (hotfix-cherry-pick.yml),
not a PR merged into main, so GitHub's generate_release_notes can't
associate any PR with those commits and the release body comes back
empty (see v0.30.1).

Build the "What's Changed" list from the cherry-picked
"Merge pull request #N ..." commit messages instead, resolving each
PR's title/author via gh.

.claude/settings.json

@@ -1,22 +0,0 @@
-{
-	"worktree": {
-		"baseRef": "fresh"
-	},
-	"hooks": {
-		"PostToolUse": [
-			{
-				"matcher": "EnterWorktree",
-				"hooks": [
-					{
-						"type": "command",
-						"command": "\"$CLAUDE_PROJECT_DIR/scripts/install-worktree-deps.sh\""
-					},
-					{
-						"type": "command",
-						"command": "\"$CLAUDE_PROJECT_DIR/scripts/assign-worktree-port.sh\""
-					}
-				]
-			}
-		]
-	}
-}

.claude/skills/fix-issue/SKILL.md

@@ -1,55 +0,0 @@
----
-name: fix-issue
-description: Implement a GitHub issue with reproduction and verification
-allowed-tools: Bash, Edit, Write, Read, Glob, Grep, mcp__playwright__*, mcp__dokploy__*
----
-
-The issue number is passed as $1.
-
-## Instance
-
-No instance is running yet — start your own, isolated to this worktree:
-
-1. Check `apps/dokploy/.env` for `PORT` (assigned per-worktree already).
-2. If nothing is listening on that port, start it: `pnpm dokploy:dev` in the
-   background, then poll `curl -s -o /dev/null -w '%{http_code}' http://localhost:$PORT`
-   until it answers (usually ~10-15s).
-3. Use `http://localhost:$PORT` as the base URL for Playwright navigation.
-
-Note: `mcp__dokploy__*` resolves its URL from
-`$DOKPLOY_BASE_URL` once, at session startup — it cannot pick up a port
-discovered mid-session. If those tools are unavailable or point at the wrong
-instance, fall back to `curl`/`gh api` for API-level checks, or ask the user
-to relaunch with `DOKPLOY_BASE_URL` exported first.
-
-## Tools
-
-- `mcp__dokploy__*` — the Dokploy API of the running instance. Use it to set up
-  state (create a project, an app, an env var) and to verify backend behavior.
-  Search for the tool you need; they are not all loaded upfront.
-- `mcp__playwright__*` — the browser at $DOKPLOY_BASE_URL. Use it for anything
-  a user would see or click.
-
-Pick by where the bug lives, not by convenience:
-
-- Bug in the UI (rendering, forms, navigation, state) → reproduce in Playwright.
-  The API returning correct data proves nothing here.
-- Bug in the API, deploy logic, or data → reproduce with the Dokploy MCP.
-  A green screenshot proves nothing here.
-- Unclear → do both.
-
-Use the MCP to reach the state you need quickly, then verify in the UI. Do not
-click through ten screens to create a project the API can create in one call.
-
-## Steps
-
-1. Run `gh issue view $1` and read the full issue, including comments.
-2. Reproduce the bug with the appropriate tool. If you cannot reproduce it,
-   comment on the issue explaining what you tried and STOP.
-   Do not implement anything.
-3. Implement the fix. Keep the change minimal and scoped to the issue.
-4. Run `pnpm test`, then re-run the same reproduction from step 2.
-5. Only if both pass: commit and run `gh pr create`. The PR description must
-   include the before/after reproduction steps and reference the issue.
-
-Never skip step 2. A fix you cannot reproduce and then verify is not a fix.

.github/workflows/dokploy.yml

@@ -162,13 +162,44 @@ jobs:
           { head -1 install.sh; echo "DOKPLOY_VERSION=\"\${DOKPLOY_VERSION:-${{ steps.get_version.outputs.version }}}\""; tail -n +2 install.sh; } > install-pinned.sh
           mv install-pinned.sh install.sh
 
+      - name: Generate release notes
+        # Hotfixes land on main via `git cherry-pick` (hotfix-cherry-pick.yml),
+        # not a PR merged into main, so GitHub's own generate_release_notes
+        # can't associate any PR with these commits and comes back empty.
+        # Build the "What's Changed" list ourselves from the cherry-picked
+        # "Merge pull request #N ..." commit messages instead.
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          RANGE="HEAD"
+          [ -n "$PREV_TAG" ] && RANGE="${PREV_TAG}..HEAD"
+
+          {
+            echo "## What's Changed"
+            git log "$RANGE" --reverse --format='%s' \
+              | grep -oE '^Merge pull request #[0-9]+' \
+              | grep -oE '[0-9]+' \
+              | while read -r PR; do
+                gh pr view "$PR" --repo "${{ github.repository }}" \
+                  --json title,author -q '"* \(.title) by @\(.author.login) in #'"$PR"'"' \
+                  2>/dev/null || true
+              done
+            if [ -n "$PREV_TAG" ]; then
+              echo ""
+              echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${PREV_TAG}...${{ steps.get_version.outputs.version }}"
+            fi
+          } > release-notes.md
+
+          cat release-notes.md
+
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.get_version.outputs.version }}
           target_commitish: ${{ github.sha }}
           name: ${{ steps.get_version.outputs.version }}
-          generate_release_notes: true
+          body_path: release-notes.md
           draft: false
           prerelease: false
           files: install.sh

.worktreeinclude

@@ -1,2 +0,0 @@
-.env
-.env.local

CLAUDE.md

@@ -1,6 +0,0 @@
-## Code style
-- Don't write comments that restate what the code already says.
-- Comment only the "why" when something isn't obvious: workarounds,
-  counterintuitive decisions, constraints from an external API.
-- No section-divider comments like `// --- Helpers ---`.
-- Don't leave comments describing the change you just made.

CONTRIBUTING.md

@@ -120,20 +120,12 @@ pnpm run docker:push
 
 ## Password Reset
 
-In the case you lost your password, you can reset the owner's password using the following command
+In the case you lost your password, you can reset it using the following command
 
 ```bash
-pnpm --filter=dokploy run reset-password
+pnpm run reset-password
 ```
 
-To reset the password of a specific user instead, pass their email as an argument
-
-```bash
-pnpm --filter=dokploy run reset-password user@example.com
-```
-
-Both commands print the new randomly generated password to the console.
-
 If you want to test the webhooks on development mode using localtunnel, make sure to install [`localtunnel`](https://localtunnel.app/)
 
 ```bash

apps/api/README.md

@@ -6,13 +6,3 @@ npm run dev
 ```
 open http://localhost:3000
 ```
-
-## Inngest
-
-This service uses Inngest to queue deployments. Run the local dev server in a separate terminal:
-
-```
-npm run dev:inngest
-```
-
-It syncs with the app at `http://localhost:4000/api/inngest` and serves its dashboard at `http://localhost:8288`.

apps/api/package.json

@@ -4,7 +4,6 @@
 	"type": "module",
 	"scripts": {
 		"dev": "PORT=4000 tsx watch src/index.ts",
-		"dev:inngest": "npx --yes inngest-cli@1.9.0 dev -u http://localhost:4000/api/inngest --no-discovery",
 		"build": "rimraf dist && tsc --project tsconfig.json",
 		"start": "node dist/index.js",
 		"typecheck": "tsc --noEmit"

apps/dokploy/__test__/backups/volume-backup-restart.test.ts

@@ -1,82 +0,0 @@
-import { spawnSync } from "node:child_process";
-import { createRestartSafeBackupCommand } from "@dokploy/server/utils/volume-backups/backup";
-import { describe, expect, it } from "vitest";
-
-const runCommand = (command: string) =>
-	spawnSync("bash", ["-c", command], {
-		encoding: "utf8",
-	});
-
-const outputLines = (stdout: string) =>
-	stdout
-		.trim()
-		.split("\n")
-		.filter((line) => line.length > 0);
-
-describe("createRestartSafeBackupCommand", () => {
-	it("restarts the service and preserves the backup error status", () => {
-		const result = runCommand(
-			createRestartSafeBackupCommand({
-				stopCommand: 'echo "stop"',
-				backupCommand: 'echo "backup"; exit 23',
-				startCommand: 'echo "start"',
-				uploadCommand: 'echo "upload"',
-			}),
-		);
-
-		expect(result.status).toBe(23);
-		expect(outputLines(result.stdout)).toEqual(["stop", "backup", "start"]);
-	});
-
-	it("preserves the backup error status when the restart also fails", () => {
-		const result = runCommand(
-			createRestartSafeBackupCommand({
-				stopCommand: 'echo "stop"',
-				backupCommand: 'echo "backup"; exit 23',
-				startCommand: 'echo "start"; exit 17',
-				uploadCommand: 'echo "upload"',
-			}),
-		);
-
-		expect(result.status).toBe(23);
-		expect(outputLines(result.stdout)).toEqual([
-			"stop",
-			"backup",
-			"start",
-			"Service restart also failed with exit code 17",
-		]);
-	});
-
-	it("returns the restart error status when the backup succeeds", () => {
-		const result = runCommand(
-			createRestartSafeBackupCommand({
-				stopCommand: 'echo "stop"',
-				backupCommand: 'echo "backup"',
-				startCommand: 'echo "start"; exit 17',
-				uploadCommand: 'echo "upload"',
-			}),
-		);
-
-		expect(result.status).toBe(17);
-		expect(outputLines(result.stdout)).toEqual(["stop", "backup", "start"]);
-	});
-
-	it("uploads only after a successful backup and service restart", () => {
-		const result = runCommand(
-			createRestartSafeBackupCommand({
-				stopCommand: 'echo "stop"',
-				backupCommand: 'echo "backup"',
-				startCommand: 'echo "start"',
-				uploadCommand: 'echo "upload"',
-			}),
-		);
-
-		expect(result.status).toBe(0);
-		expect(outputLines(result.stdout)).toEqual([
-			"stop",
-			"backup",
-			"start",
-			"upload",
-		]);
-	});
-});

apps/dokploy/__test__/compose/compose-project-directory.test.ts

@@ -1,123 +0,0 @@
-import { createCommand } from "@dokploy/server/utils/builders/compose";
-import { describe, expect, it } from "vitest";
-
-const base = {
-	composeType: "docker-compose" as const,
-	appName: "compose-app",
-	sourceType: "github" as const,
-	command: "",
-};
-
-describe("compose createCommand --project-directory", () => {
-	it("pins --project-directory to the code dir when composePath is nested", () => {
-		const cmd = createCommand(
-			{ ...base, composePath: "./deploy/docker-compose.yml" } as any,
-			"/etc/dokploy/compose/compose-app/code",
-		);
-
-		expect(cmd).toContain(
-			"--project-directory /etc/dokploy/compose/compose-app/code",
-		);
-		expect(cmd).toContain("-f ./deploy/docker-compose.yml");
-	});
-
-	it("omits --project-directory when no projectPath is passed", () => {
-		const cmd = createCommand({
-			...base,
-			composePath: "./deploy/docker-compose.yml",
-		} as any);
-
-		expect(cmd).not.toContain("--project-directory");
-	});
-
-	it("does not add --project-directory to stack deploy (unsupported flag)", () => {
-		const cmd = createCommand(
-			{
-				...base,
-				composeType: "stack",
-				composePath: "./deploy/docker-compose.yml",
-			} as any,
-			"/etc/dokploy/compose/compose-app/code",
-		);
-
-		expect(cmd).not.toContain("--project-directory");
-		expect(cmd.startsWith("stack deploy")).toBe(true);
-	});
-
-	it("keeps raw sourceType resolving from the code dir (root docker-compose.yml)", () => {
-		const cmd = createCommand(
-			{ ...base, sourceType: "raw", composePath: "docker-compose.yml" } as any,
-			"/etc/dokploy/compose/compose-app/code",
-		);
-
-		expect(cmd).toContain(
-			"--project-directory /etc/dokploy/compose/compose-app/code",
-		);
-		expect(cmd).toContain("-f docker-compose.yml");
-	});
-
-	it("resolves build.context against the compose file's own directory when there are no mounts", () => {
-		const cmd = createCommand({
-			...base,
-			composePath: "./backend/docker-compose.yml",
-		} as any);
-
-		expect(cmd).not.toContain("--project-directory");
-		expect(cmd).toContain("-f ./backend/docker-compose.yml");
-	});
-});
-
-describe("compose createCommand --env-file", () => {
-	it("points --env-file at the generated .env next to a nested compose file", () => {
-		const cmd = createCommand(
-			{
-				...base,
-				composePath: "./deploy/docker-compose.yml",
-				createEnvFile: true,
-			} as any,
-			"/etc/dokploy/compose/compose-app/code",
-		);
-
-		expect(cmd).toContain("--env-file deploy/.env");
-		expect(cmd).toContain(
-			"--project-directory /etc/dokploy/compose/compose-app/code",
-		);
-	});
-
-	it("omits --env-file when createEnvFile is disabled", () => {
-		const cmd = createCommand(
-			{ ...base, composePath: "./deploy/docker-compose.yml" } as any,
-			"/etc/dokploy/compose/compose-app/code",
-		);
-
-		expect(cmd).not.toContain("--env-file");
-	});
-
-	it("uses the code-root .env for raw sourceType", () => {
-		const cmd = createCommand(
-			{
-				...base,
-				sourceType: "raw",
-				composePath: "docker-compose.yml",
-				createEnvFile: true,
-			} as any,
-			"/etc/dokploy/compose/compose-app/code",
-		);
-
-		expect(cmd).toContain("--env-file .env");
-	});
-
-	it("does not add --env-file to stack deploy (unsupported flag)", () => {
-		const cmd = createCommand(
-			{
-				...base,
-				composeType: "stack",
-				composePath: "./deploy/docker-compose.yml",
-				createEnvFile: true,
-			} as any,
-			"/etc/dokploy/compose/compose-app/code",
-		);
-
-		expect(cmd).not.toContain("--env-file");
-	});
-});

apps/dokploy/__test__/compose/compose-pull-images.test.ts

@@ -1,44 +0,0 @@
-import { createCommand } from "@dokploy/server/utils/builders/compose";
-import { describe, expect, it } from "vitest";
-
-const base = {
-	composeType: "docker-compose" as const,
-	appName: "compose-app",
-	sourceType: "github" as const,
-	composePath: "./docker-compose.yml",
-	command: "",
-};
-
-describe("compose createCommand --pull always", () => {
-	it("adds --pull always when pullImages is enabled", () => {
-		const cmd = createCommand({ ...base, pullImages: true } as any);
-
-		expect(cmd).toContain("up -d --build --remove-orphans --pull always");
-	});
-
-	it("omits --pull when pullImages is disabled", () => {
-		const cmd = createCommand({ ...base, pullImages: false } as any);
-
-		expect(cmd).not.toContain("--pull");
-	});
-
-	it("does not add --pull to stack deploy", () => {
-		const cmd = createCommand({
-			...base,
-			composeType: "stack",
-			pullImages: true,
-		} as any);
-
-		expect(cmd).not.toContain("--pull");
-	});
-
-	it("leaves a custom command untouched", () => {
-		const cmd = createCommand({
-			...base,
-			command: "compose -p compose-app up -d",
-			pullImages: true,
-		} as any);
-
-		expect(cmd).toBe("compose -p compose-app up -d");
-	});
-});

apps/dokploy/__test__/compose/env-file-literals.test.ts

@@ -32,9 +32,6 @@ const cases: Record<string, string> = {
 	APOSTROPHE: "it's a test",
 	UNICODE: "héllo wörld 日本語 🚀",
 	MULTILINE_PEM: "-----BEGIN KEY-----\nabc123\n-----END KEY-----",
-	APP_URL: "https://example.com",
-	ASSET_URL: "https://example.com",
-	DB_HOST: "localhost",
 };
 
 // How each value must be typed in the UI so the (unchanged) dotenv input
@@ -49,21 +46,9 @@ const inputEncoding: Record<string, string> = {
 	APOSTROPHE: "it's a test",
 	UNICODE: "héllo wörld 日本語 🚀",
 	MULTILINE_PEM: '"-----BEGIN KEY-----\nabc123\n-----END KEY-----"',
-	APP_URL: "https://example.com",
-	ASSET_URL: '"${APP_URL}"',
-	DB_HOST: '"${UNDEFINED_HOST:-localhost}"',
 };
 
-const hasDocker = () => {
-	try {
-		execFileSync("docker", ["info"], { stdio: "ignore" });
-		return true;
-	} catch {
-		return false;
-	}
-};
-
-describe.skipIf(!hasDocker())("getCreateEnvFileCommand", () => {
+describe("getCreateEnvFileCommand", () => {
 	it("writes special environment values that Docker Compose reads back literally", () => {
 		mkdirSync(codePath, { recursive: true });
 

apps/dokploy/__test__/deploy/railpack.command.test.ts

@@ -50,15 +50,6 @@ describe("getRailpackCommand", () => {
 		expect(command).toContain("--build-arg cache-key=");
 	});
 
-	it("installs Railpack through sudo for non-root users", () => {
-		const command = getRailpackCommand(createApplication());
-
-		expect(command).toContain(
-			'$SUDO_CMD bash -c "$(curl -fsSL https://railpack.com/install.sh)"',
-		);
-		expect(command).toContain("sudo -n true 2>/dev/null");
-	});
-
 	it("changes secrets-hash when an environment value changes", () => {
 		const firstCommand = getRailpackCommand(
 			createApplication({

apps/dokploy/__test__/deploy/should-deploy.test.ts

@@ -16,30 +16,6 @@ describe("shouldDeploy", () => {
 		expect(shouldDeploy(["src/**"], ["docs/readme.md"])).toBe(false);
 	});
 
-	it("should apply multiple negated watch paths as one pattern set", () => {
-		const watchPaths = ["!CHANGELOG.md", "!VERSION", "!tests/**"];
-
-		expect(shouldDeploy(watchPaths, ["CHANGELOG.md"])).toBe(false);
-		expect(shouldDeploy(watchPaths, ["VERSION"])).toBe(false);
-		expect(shouldDeploy(watchPaths, ["tests/unit/example.test.ts"])).toBe(
-			false,
-		);
-	});
-
-	it("should deploy when a changed file remains after exclusions", () => {
-		const watchPaths = ["!CHANGELOG.md", "!VERSION", "!tests/**"];
-
-		expect(shouldDeploy(watchPaths, ["VERSION", "src/index.ts"])).toBe(true);
-	});
-
-	it("should combine positive and negated watch paths", () => {
-		const watchPaths = ["src/**", "!src/**/*.test.ts"];
-
-		expect(shouldDeploy(watchPaths, ["src/index.ts"])).toBe(true);
-		expect(shouldDeploy(watchPaths, ["src/index.test.ts"])).toBe(false);
-		expect(shouldDeploy(watchPaths, ["docs/readme.md"])).toBe(false);
-	});
-
 	it("should not throw when modified files contain non-string values", () => {
 		expect(() =>
 			shouldDeploy(["src/**"], ["src/index.ts", undefined, null] as any),

apps/dokploy/__test__/dns/cloudflare.test.ts

@@ -87,224 +87,6 @@ describe("cloudflareClient.listRecords", () => {
 	});
 });
 
-describe("cloudflareClient MX priority", () => {
-	it("inlines the priority into the content when listing", async () => {
-		mockFetch.mockResolvedValue(
-			cfSuccess([
-				{
-					id: "mx-1",
-					type: "MX",
-					name: "example.com",
-					content: "mail.example.com",
-					ttl: 300,
-					priority: 20,
-				},
-			]),
-		);
-
-		const records = await cloudflareClient.listRecords(config, "zone-1");
-
-		expect(records[0]?.content).toBe("20 mail.example.com");
-	});
-
-	it("splits the priority back out when writing", async () => {
-		mockFetch
-			.mockResolvedValueOnce(cfSuccess([]))
-			.mockResolvedValueOnce(cfSuccess({ id: "mx-1" }));
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "MX",
-			name: "example.com",
-			content: "20 mail.example.com",
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		expect(JSON.parse(init.body as string)).toMatchObject({
-			content: "mail.example.com",
-			priority: 20,
-		});
-	});
-
-	it("falls back to priority 10 when the content has no leading number", async () => {
-		mockFetch
-			.mockResolvedValueOnce(cfSuccess([]))
-			.mockResolvedValueOnce(cfSuccess({ id: "mx-1" }));
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "MX",
-			name: "example.com",
-			content: "mail.example.com",
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		expect(JSON.parse(init.body as string)).toMatchObject({
-			content: "mail.example.com",
-			priority: 10,
-		});
-	});
-
-	it("leaves non-MX content untouched", async () => {
-		mockFetch
-			.mockResolvedValueOnce(cfSuccess([]))
-			.mockResolvedValueOnce(cfSuccess({ id: "txt-1" }));
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "TXT",
-			name: "example.com",
-			content: "10 not-a-priority",
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		const body = JSON.parse(init.body as string);
-		expect(body.content).toBe("10 not-a-priority");
-		expect(body.priority).toBeUndefined();
-	});
-});
-
-describe("cloudflareClient structured records", () => {
-	const stubCreate = () =>
-		mockFetch
-			.mockResolvedValueOnce(cfSuccess([]))
-			.mockResolvedValueOnce(cfSuccess({ id: "rec-1" }));
-
-	it("sends SRV values as structured data", async () => {
-		stubCreate();
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "SRV",
-			name: "_sip._tcp.example.com",
-			content: "1 10 5269 talk.example.com",
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		const body = JSON.parse(init.body as string);
-		expect(body.data).toEqual({
-			priority: 1,
-			weight: 10,
-			port: 5269,
-			target: "talk.example.com",
-		});
-		expect(body.content).toBeUndefined();
-	});
-
-	it("sends CAA values as structured data and drops the quotes", async () => {
-		stubCreate();
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "CAA",
-			name: "example.com",
-			content: '0 issue "letsencrypt.org"',
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		const body = JSON.parse(init.body as string);
-		expect(body.data).toEqual({
-			flags: 0,
-			tag: "issue",
-			value: "letsencrypt.org",
-		});
-		expect(body.content).toBeUndefined();
-	});
-
-	it("rejects an SRV value that is missing a part", async () => {
-		await expect(
-			cloudflareClient.upsertRecord(config, {
-				zoneId: "zone-1",
-				type: "SRV",
-				name: "_sip._tcp.example.com",
-				content: "1 10 5269",
-			}),
-		).rejects.toThrow(/SRV value/);
-	});
-
-	it("rejects a CAA value that has no tag", async () => {
-		await expect(
-			cloudflareClient.upsertRecord(config, {
-				zoneId: "zone-1",
-				type: "CAA",
-				name: "example.com",
-				content: "0",
-			}),
-		).rejects.toThrow(/CAA value/);
-	});
-});
-
-describe("cloudflareClient proxy status", () => {
-	it("sends the proxy status for proxiable types", async () => {
-		mockFetch
-			.mockResolvedValueOnce(cfSuccess([]))
-			.mockResolvedValueOnce(cfSuccess({ id: "a-1" }));
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-			proxied: true,
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		expect(JSON.parse(init.body as string).proxied).toBe(true);
-	});
-
-	it("omits the proxy status for types Cloudflare cannot proxy", async () => {
-		mockFetch
-			.mockResolvedValueOnce(cfSuccess([]))
-			.mockResolvedValueOnce(cfSuccess({ id: "txt-1" }));
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "TXT",
-			name: "example.com",
-			content: "hello",
-			proxied: true,
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		expect(JSON.parse(init.body as string).proxied).toBeUndefined();
-	});
-
-	it("leaves the proxy status untouched when the caller does not set it", async () => {
-		mockFetch
-			.mockResolvedValueOnce(cfSuccess([]))
-			.mockResolvedValueOnce(cfSuccess({ id: "a-1" }));
-
-		await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		const [, init] = mockFetch.mock.calls[1] as [string, RequestInit];
-		expect("proxied" in JSON.parse(init.body as string)).toBe(false);
-	});
-
-	it("returns the proxy status when listing records", async () => {
-		mockFetch.mockResolvedValue(
-			cfSuccess([
-				{
-					id: "a-1",
-					type: "A",
-					name: "app.example.com",
-					content: "1.2.3.4",
-					ttl: 1,
-					proxied: true,
-				},
-			]),
-		);
-
-		const records = await cloudflareClient.listRecords(config, "zone-1");
-
-		expect(records[0]?.proxied).toBe(true);
-	});
-});
-
 describe("cloudflareClient.upsertRecord", () => {
 	it("creates a record when none exists for the name/type", async () => {
 		mockFetch
@@ -323,11 +105,9 @@ describe("cloudflareClient.upsertRecord", () => {
 		expect(createInit.method).toBe("POST");
 	});
 
-	it("updates the existing record when content matches", async () => {
+	it("updates the existing record instead of creating a duplicate", async () => {
 		mockFetch
-			.mockResolvedValueOnce(
-				cfSuccess([{ id: "existing-1", type: "A", content: "5.6.7.8" }]),
-			)
+			.mockResolvedValueOnce(cfSuccess([{ id: "existing-1" }]))
 			.mockResolvedValueOnce(cfSuccess({ id: "existing-1" }));
 
 		const result = await cloudflareClient.upsertRecord(config, {
@@ -346,25 +126,6 @@ describe("cloudflareClient.upsertRecord", () => {
 		expect(updateInit.method).toBe("PUT");
 	});
 
-	it("creates a new record when content differs from existing", async () => {
-		mockFetch
-			.mockResolvedValueOnce(
-				cfSuccess([{ id: "existing-1", type: "A", content: "1.1.1.1" }]),
-			)
-			.mockResolvedValueOnce(cfSuccess({ id: "new-2" }));
-
-		const result = await cloudflareClient.upsertRecord(config, {
-			zoneId: "zone-1",
-			type: "A",
-			name: "app.example.com",
-			content: "5.6.7.8",
-		});
-
-		expect(result).toEqual({ id: "new-2" });
-		const [, createInit] = mockFetch.mock.calls[1] as [string, RequestInit];
-		expect(createInit.method).toBe("POST");
-	});
-
 	it("defaults ttl to 1 (automatic) when not provided", async () => {
 		mockFetch
 			.mockResolvedValueOnce(cfSuccess([]))

apps/dokploy/__test__/dns/infomaniak.test.ts

@@ -1,486 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const mockFetch = vi.fn();
-global.fetch = mockFetch as typeof fetch;
-
-import { infomaniakClient } from "@dokploy/server/utils/dns/infomaniak";
-
-const jsonResponse = (body: unknown, ok = true, status = 200) =>
-	({
-		ok,
-		status,
-		json: async () => body,
-	}) as Response;
-
-const ikSuccess = (data: unknown) => jsonResponse({ result: "success", data });
-
-const ikPage = (data: unknown, page: number, pages: number) =>
-	jsonResponse({ result: "success", data, page, pages });
-
-const ikError = (description: string, status = 400) =>
-	jsonResponse(
-		{ result: "error", error: { code: "not_authorized", description } },
-		false,
-		status,
-	);
-
-const config = {
-	providerType: "infomaniak" as const,
-	apiToken: "ik_test_token",
-};
-
-const lastCall = () =>
-	mockFetch.mock.calls.at(-1) as [string, RequestInit & { method?: string }];
-
-const lastBody = () => JSON.parse(lastCall()[1].body as string);
-
-beforeEach(() => {
-	mockFetch.mockReset();
-});
-
-describe("infomaniakClient.listZones", () => {
-	it("exposes each domain product as a zone keyed by its name", async () => {
-		mockFetch.mockResolvedValue(
-			ikPage(
-				[
-					{ id: 1, customer_name: "example.com" },
-					{ id: 2, customer_name: "example.ch" },
-				],
-				1,
-				1,
-			),
-		);
-
-		const zones = await infomaniakClient.listZones(config);
-
-		expect(zones).toEqual([
-			{ id: "example.com", name: "example.com" },
-			{ id: "example.ch", name: "example.ch" },
-		]);
-		const [url, init] = lastCall();
-		// The documented endpoint is the plural one; the singular is legacy and
-		// returns no pagination metadata at all.
-		expect(url).toContain("/1/products?service_name=domain");
-		expect(url).toContain("page=1");
-		expect(init.headers).toMatchObject({
-			Authorization: "Bearer ik_test_token",
-		});
-	});
-
-	it("walks every page so accounts with many domains keep all their zones", async () => {
-		mockFetch
-			.mockResolvedValueOnce(ikPage([{ id: 1, customer_name: "a.com" }], 1, 3))
-			.mockResolvedValueOnce(ikPage([{ id: 2, customer_name: "b.com" }], 2, 3))
-			.mockResolvedValueOnce(ikPage([{ id: 3, customer_name: "c.com" }], 3, 3));
-
-		const zones = await infomaniakClient.listZones(config);
-
-		expect(zones.map((zone) => zone.name)).toEqual(["a.com", "b.com", "c.com"]);
-		expect(mockFetch).toHaveBeenCalledTimes(3);
-		expect((mockFetch.mock.calls[2] as [string])[0]).toContain("page=3");
-	});
-
-	it("stops after a single page when the response has no pagination", async () => {
-		mockFetch.mockResolvedValue(ikSuccess([{ id: 1, customer_name: "a.com" }]));
-
-		const zones = await infomaniakClient.listZones(config);
-
-		expect(zones).toEqual([{ id: "a.com", name: "a.com" }]);
-		expect(mockFetch).toHaveBeenCalledTimes(1);
-	});
-
-	it("propagates the API error description", async () => {
-		mockFetch.mockResolvedValue(ikError("Authorization required", 401));
-
-		await expect(infomaniakClient.listZones(config)).rejects.toThrow(
-			"Authorization required",
-		);
-	});
-});
-
-describe("infomaniakClient.listRecords", () => {
-	it("rebuilds the fqdn from the relative source", async () => {
-		mockFetch.mockResolvedValue(
-			ikSuccess([
-				{ id: 10, type: "A", source: "app", target: "1.2.3.4", ttl: 300 },
-				{ id: 11, type: "A", source: "", target: "5.6.7.8", ttl: 600 },
-			]),
-		);
-
-		const records = await infomaniakClient.listRecords(config, "example.com");
-
-		expect(records).toEqual([
-			{
-				id: "10",
-				type: "A",
-				name: "app.example.com",
-				content: "1.2.3.4",
-				ttl: 300,
-			},
-			{
-				id: "11",
-				type: "A",
-				name: "example.com",
-				content: "5.6.7.8",
-				ttl: 600,
-			},
-		]);
-		expect(lastCall()[0]).toBe(
-			"https://api.infomaniak.com/2/zones/example.com/records?with=records_description",
-		);
-	});
-
-	it.each([".", "", "@"])("treats a %s source as the apex", async (source) => {
-		mockFetch.mockResolvedValue(
-			ikSuccess([{ id: 12, type: "A", source, target: "1.2.3.4", ttl: 300 }]),
-		);
-
-		const records = await infomaniakClient.listRecords(config, "example.com");
-
-		expect(records[0]?.name).toBe("example.com");
-	});
-
-	it("unquotes TXT targets", async () => {
-		mockFetch.mockResolvedValue(
-			ikSuccess([
-				{
-					id: 13,
-					type: "TXT",
-					source: "_acme-challenge",
-					target: '"token-value"',
-					ttl: 300,
-				},
-			]),
-		);
-
-		const records = await infomaniakClient.listRecords(config, "example.com");
-
-		expect(records[0]?.content).toBe("token-value");
-	});
-
-	it("leaves a CAA target untouched", async () => {
-		mockFetch.mockResolvedValue(
-			ikSuccess([
-				{
-					id: 14,
-					type: "CAA",
-					source: "",
-					target: '0 issue "letsencrypt.org"',
-					ttl: 300,
-				},
-			]),
-		);
-
-		const records = await infomaniakClient.listRecords(config, "example.com");
-
-		expect(records[0]?.content).toBe('0 issue "letsencrypt.org"');
-	});
-});
-
-describe("infomaniakClient.upsertRecord", () => {
-	it("creates the record when no matching source and type exists", async () => {
-		mockFetch
-			.mockResolvedValueOnce(ikSuccess([]))
-			.mockResolvedValueOnce(ikSuccess({ id: 42 }));
-
-		const result = await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-			ttl: 600,
-		});
-
-		expect(result).toEqual({ id: "42" });
-		const [url, init] = lastCall();
-		expect(url).toBe("https://api.infomaniak.com/2/zones/example.com/records");
-		expect(init.method).toBe("POST");
-		expect(lastBody()).toEqual({
-			type: "A",
-			source: "app",
-			target: "1.2.3.4",
-			ttl: 600,
-		});
-	});
-
-	it("updates the existing record when content matches", async () => {
-		mockFetch
-			.mockResolvedValueOnce(
-				ikSuccess([
-					{ id: 7, type: "A", source: "app", target: "1.2.3.4", ttl: 300 },
-				]),
-			)
-			.mockResolvedValueOnce(ikSuccess({ id: 7 }));
-
-		const result = await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		expect(result).toEqual({ id: "7" });
-		const [url, init] = lastCall();
-		expect(url).toBe(
-			"https://api.infomaniak.com/2/zones/example.com/records/7",
-		);
-		expect(init.method).toBe("PUT");
-		expect(lastBody().ttl).toBe(300);
-	});
-
-	it("creates a new record when content differs from existing", async () => {
-		mockFetch
-			.mockResolvedValueOnce(
-				ikSuccess([
-					{ id: 7, type: "A", source: "app", target: "1.1.1.1", ttl: 300 },
-				]),
-			)
-			.mockResolvedValueOnce(ikSuccess({ id: 50 }));
-
-		const result = await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		expect(result).toEqual({ id: "50" });
-		const [url, init] = lastCall();
-		expect(url).toBe("https://api.infomaniak.com/2/zones/example.com/records");
-		expect(init.method).toBe("POST");
-	});
-
-	it("writes a root dot as the source for an apex record and strips the trailing dot", async () => {
-		mockFetch
-			.mockResolvedValueOnce(ikSuccess([]))
-			.mockResolvedValueOnce(ikSuccess({ id: 43 }));
-
-		await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "example.com.",
-			content: "1.2.3.4",
-		});
-
-		expect(lastBody().source).toBe(".");
-	});
-
-	it.each([".", "", "@"])(
-		"matches an existing apex record stored with a %s source",
-		async (source) => {
-			mockFetch
-				.mockResolvedValueOnce(
-					ikSuccess([
-						{ id: 8, type: "A", source, target: "1.2.3.4", ttl: 3600 },
-					]),
-				)
-				.mockResolvedValueOnce(ikSuccess({ id: 8 }));
-
-			const result = await infomaniakClient.upsertRecord(config, {
-				zoneId: "example.com",
-				type: "A",
-				name: "example.com",
-				content: "1.2.3.4",
-			});
-
-			expect(result).toEqual({ id: "8" });
-			expect(lastCall()[1].method).toBe("PUT");
-		},
-	);
-
-	it("matches the existing apex record instead of creating a duplicate", async () => {
-		mockFetch
-			.mockResolvedValueOnce(
-				ikSuccess([
-					{
-						id: 8,
-						type: "TXT",
-						source: ".",
-						target: '"v=spf1 -all"',
-						ttl: 3600,
-					},
-				]),
-			)
-			.mockResolvedValueOnce(ikSuccess({ id: 8 }));
-
-		const result = await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "TXT",
-			name: "example.com",
-			content: "v=spf1 -all",
-		});
-
-		expect(result).toEqual({ id: "8" });
-		const [url, init] = lastCall();
-		expect(init.method).toBe("PUT");
-		expect(url).toBe(
-			"https://api.infomaniak.com/2/zones/example.com/records/8",
-		);
-		expect(lastBody().target).toBe('"v=spf1 -all"');
-	});
-
-	it("quotes a TXT target on write", async () => {
-		mockFetch
-			.mockResolvedValueOnce(ikSuccess([]))
-			.mockResolvedValueOnce(ikSuccess({ id: 44 }));
-
-		await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "TXT",
-			name: "_acme-challenge.example.com",
-			content: "token-value",
-		});
-
-		expect(lastBody().target).toBe('"token-value"');
-	});
-
-	it("does not double-quote a TXT target that is already quoted", async () => {
-		mockFetch
-			.mockResolvedValueOnce(ikSuccess([]))
-			.mockResolvedValueOnce(ikSuccess({ id: 45 }));
-
-		await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "TXT",
-			name: "_acme-challenge.example.com",
-			content: '"token-value"',
-		});
-
-		expect(lastBody().target).toBe('"token-value"');
-	});
-
-	it("queries the API with a source and type filter instead of the whole zone", async () => {
-		mockFetch
-			.mockResolvedValueOnce(ikSuccess([]))
-			.mockResolvedValueOnce(ikSuccess({ id: 50 }));
-
-		await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		const [url] = mockFetch.mock.calls[0] as [string];
-		expect(url).toContain("filter%5Bsource%5D=app");
-		expect(url).toContain("filter%5Btypes%5D%5B%5D=A");
-	});
-
-	it("ignores a partial filter hit rather than overwriting a different record", async () => {
-		// filter[source] matches substrings: asking for "auto" also returns
-		// "autoconfig" and "autodiscover". Trusting it would overwrite one of them.
-		mockFetch
-			.mockResolvedValueOnce(
-				ikSuccess([
-					{
-						id: 61,
-						type: "CNAME",
-						source: "autoconfig",
-						target: "a.example.net",
-						ttl: 300,
-					},
-					{
-						id: 62,
-						type: "CNAME",
-						source: "autodiscover",
-						target: "b.example.net",
-						ttl: 300,
-					},
-				]),
-			)
-			.mockResolvedValueOnce(ikSuccess({ id: 63 }));
-
-		const result = await infomaniakClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "CNAME",
-			name: "auto.example.com",
-			content: "c.example.net",
-		});
-
-		expect(result).toEqual({ id: "63" });
-		expect(lastCall()[1].method).toBe("POST");
-	});
-});
-
-describe("infomaniakClient.updateRecord", () => {
-	it("updates the record and keeps its id", async () => {
-		mockFetch.mockResolvedValue(ikSuccess({ id: 7 }));
-
-		const result = await infomaniakClient.updateRecord(
-			config,
-			"example.com",
-			"7",
-			{
-				type: "CNAME",
-				name: "www.example.com",
-				content: "example.com",
-				ttl: 900,
-			},
-		);
-
-		expect(result).toEqual({ id: "7" });
-		const [url, init] = lastCall();
-		expect(url).toBe(
-			"https://api.infomaniak.com/2/zones/example.com/records/7",
-		);
-		expect(init.method).toBe("PUT");
-		expect(lastBody()).toEqual({
-			type: "CNAME",
-			source: "www",
-			target: "example.com",
-			ttl: 900,
-		});
-	});
-
-	it("falls back to the default ttl when none is provided", async () => {
-		mockFetch.mockResolvedValue(ikSuccess({ id: 7 }));
-
-		await infomaniakClient.updateRecord(config, "example.com", "7", {
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		expect(lastBody().ttl).toBe(300);
-	});
-});
-
-describe("infomaniakClient.deleteRecord", () => {
-	it("deletes the record", async () => {
-		mockFetch.mockResolvedValue(ikSuccess(null));
-
-		await infomaniakClient.deleteRecord(config, "example.com", "7");
-
-		const [url, init] = lastCall();
-		expect(url).toBe(
-			"https://api.infomaniak.com/2/zones/example.com/records/7",
-		);
-		expect(init.method).toBe("DELETE");
-	});
-
-	it("propagates a delete failure", async () => {
-		mockFetch.mockResolvedValue(ikError("Record not found", 404));
-
-		await expect(
-			infomaniakClient.deleteRecord(config, "example.com", "7"),
-		).rejects.toThrow("Record not found");
-	});
-});
-
-describe("infomaniakClient.testConnection", () => {
-	it("resolves when the domain listing succeeds", async () => {
-		mockFetch.mockResolvedValue(ikSuccess([]));
-
-		await expect(
-			infomaniakClient.testConnection(config),
-		).resolves.toBeUndefined();
-	});
-
-	it("rejects on an invalid token", async () => {
-		mockFetch.mockResolvedValue(ikError("Authorization required", 401));
-
-		await expect(infomaniakClient.testConnection(config)).rejects.toThrow(
-			"Infomaniak: request to /1/products?service_name=domain&per_page=1 failed: Authorization required",
-		);
-	});
-});

apps/dokploy/__test__/dns/ovh.test.ts

@@ -1,581 +0,0 @@
-import { createHash } from "node:crypto";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const mockFetch = vi.fn();
-global.fetch = mockFetch as typeof fetch;
-
-import { ovhClient } from "@dokploy/server/utils/dns/ovh";
-
-const textResponse = (body: string, ok = true, status = 200) =>
-	({
-		ok,
-		status,
-		text: async () => body,
-	}) as Response;
-
-const ovhSuccess = (data: unknown) =>
-	textResponse(data === undefined ? "" : JSON.stringify(data));
-
-const ovhError = (message: string, status = 403) =>
-	textResponse(JSON.stringify({ message }), false, status);
-
-const SERVER_TIME = 1788268225;
-
-const config = {
-	providerType: "ovh" as const,
-	endpoint: "ovh-eu" as const,
-	applicationKey: "app-key",
-	applicationSecret: "app-secret",
-	consumerKey: "consumer-key",
-};
-
-// Each test uses a distinct endpoint so the module-level clock-skew cache, which
-// is keyed by base url, never leaks a measurement between them.
-let endpointCursor = 0;
-const endpoints = [
-	"ovh-eu",
-	"ovh-ca",
-	"ovh-us",
-	"kimsufi-eu",
-	"kimsufi-ca",
-	"soyoustart-eu",
-	"soyoustart-ca",
-] as const;
-const baseUrls: Record<(typeof endpoints)[number], string> = {
-	"ovh-eu": "https://eu.api.ovh.com/1.0",
-	"ovh-ca": "https://ca.api.ovh.com/1.0",
-	"ovh-us": "https://api.us.ovhcloud.com/1.0",
-	"kimsufi-eu": "https://eu.api.kimsufi.com/1.0",
-	"kimsufi-ca": "https://ca.api.kimsufi.com/1.0",
-	"soyoustart-eu": "https://eu.api.soyoustart.com/1.0",
-	"soyoustart-ca": "https://ca.api.soyoustart.com/1.0",
-};
-
-/** A config on a not-yet-used endpoint, so the first call always fetches /auth/time. */
-const freshConfig = () => {
-	const endpoint = endpoints[
-		endpointCursor % endpoints.length
-	] as (typeof endpoints)[number];
-	endpointCursor += 1;
-	return { ...config, endpoint, baseUrl: baseUrls[endpoint] };
-};
-
-/** Replies to /auth/time, then to each queued API response in order. */
-const mockApi = (...responses: Response[]) => {
-	let call = 0;
-	mockFetch.mockImplementation((url: string) => {
-		if (url.endsWith("/auth/time")) {
-			return Promise.resolve(textResponse(String(SERVER_TIME)));
-		}
-		const response = responses[call];
-		call += 1;
-		return Promise.resolve(response ?? ovhSuccess(null));
-	});
-};
-
-const apiCalls = () =>
-	mockFetch.mock.calls.filter(
-		([url]) => !(url as string).endsWith("/auth/time"),
-	) as [string, RequestInit][];
-
-beforeEach(() => {
-	mockFetch.mockReset();
-});
-
-describe("ovhClient request signing", () => {
-	it("signs the request with the API server clock, not the local one", async () => {
-		const { baseUrl, ...cfg } = freshConfig();
-		mockApi(ovhSuccess(["example.com"]));
-		vi.spyOn(Date, "now").mockReturnValue((SERVER_TIME - 120) * 1000);
-
-		await ovhClient.listZones(cfg);
-
-		const [url, init] = apiCalls()[0] as [string, RequestInit];
-		const headers = init.headers as Record<string, string>;
-		expect(url).toBe(`${baseUrl}/domain/zone`);
-		expect(headers["X-Ovh-Timestamp"]).toBe(String(SERVER_TIME));
-		expect(headers["X-Ovh-Application"]).toBe("app-key");
-		expect(headers["X-Ovh-Consumer"]).toBe("consumer-key");
-
-		const expected = createHash("sha1")
-			.update(
-				["app-secret", "consumer-key", "GET", url, "", SERVER_TIME].join("+"),
-			)
-			.digest("hex");
-		expect(headers["X-Ovh-Signature"]).toBe(`$1$${expected}`);
-
-		vi.restoreAllMocks();
-	});
-
-	it("signs a request body when one is sent", async () => {
-		const { baseUrl, ...cfg } = freshConfig();
-		mockApi(ovhSuccess([]), ovhSuccess({ id: 5 }), ovhSuccess(null));
-		vi.spyOn(Date, "now").mockReturnValue(SERVER_TIME * 1000);
-
-		await ovhClient.upsertRecord(cfg, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		const [url, init] = apiCalls()[1] as [string, RequestInit];
-		const headers = init.headers as Record<string, string>;
-		const body = init.body as string;
-		expect(body).not.toBe("");
-		const expected = createHash("sha1")
-			.update(
-				["app-secret", "consumer-key", "POST", url, body, SERVER_TIME].join(
-					"+",
-				),
-			)
-			.digest("hex");
-		expect(headers["X-Ovh-Signature"]).toBe(`$1$${expected}`);
-
-		vi.restoreAllMocks();
-	});
-});
-
-describe("ovhClient.listZones", () => {
-	it("maps each zone name to a zone", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhSuccess(["example.com", "example.fr"]));
-
-		const zones = await ovhClient.listZones(cfg);
-
-		expect(zones).toEqual([
-			{ id: "example.com", name: "example.com" },
-			{ id: "example.fr", name: "example.fr" },
-		]);
-	});
-
-	it("names the missing root right when OVH refuses the zone listing", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhError("This call has not been granted", 403));
-
-		// A `GET /domain/zone/*` rule does not cover the bare `GET /domain/zone`,
-		// so the raw OVH message would send users looking in the wrong place.
-		await expect(ovhClient.listZones(cfg)).rejects.toThrow(
-			/missing the `GET \/domain\/zone` right/,
-		);
-	});
-
-	it("propagates the API error message", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhError("Invalid signature", 403));
-
-		await expect(ovhClient.listZones(cfg)).rejects.toThrow("Invalid signature");
-	});
-});
-
-describe("ovhClient.listRecords", () => {
-	it("resolves each id into a full record", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess([1, 2]),
-			ovhSuccess({
-				id: 1,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.2.3.4",
-				ttl: 600,
-			}),
-			ovhSuccess({
-				id: 2,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: null,
-				target: "5.6.7.8",
-				ttl: null,
-			}),
-		);
-
-		const records = await ovhClient.listRecords(cfg, "example.com");
-
-		expect(records).toEqual([
-			{
-				id: "1",
-				type: "A",
-				name: "app.example.com",
-				content: "1.2.3.4",
-				ttl: 600,
-			},
-			{
-				id: "2",
-				type: "A",
-				name: "example.com",
-				content: "5.6.7.8",
-				ttl: 0,
-			},
-		]);
-	});
-
-	it("keeps the records in the order of the returned ids", async () => {
-		const cfg = freshConfig();
-		const record = (id: number, subDomain: string) => ({
-			id,
-			zone: "example.com",
-			fieldType: "A",
-			subDomain,
-			target: `10.0.0.${id}`,
-			ttl: 60,
-		});
-		mockApi(
-			ovhSuccess([1, 2, 3, 4, 5]),
-			...[1, 2, 3, 4, 5].map((id) => ovhSuccess(record(id, `host${id}`))),
-		);
-
-		const records = await ovhClient.listRecords(cfg, "example.com");
-
-		expect(records.map((r) => r.id)).toEqual(["1", "2", "3", "4", "5"]);
-	});
-});
-
-describe("ovhClient.upsertRecord", () => {
-	it("creates the record then refreshes the zone", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhSuccess([]), ovhSuccess({ id: 9 }), ovhSuccess(null));
-
-		const result = await ovhClient.upsertRecord(cfg, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-			ttl: 600,
-		});
-
-		expect(result).toEqual({ id: "9" });
-		const calls = apiCalls();
-		expect(calls[0]?.[0]).toContain(
-			"/domain/zone/example.com/record?fieldType=A&subDomain=app",
-		);
-		expect(calls[1]?.[1].method).toBe("POST");
-		expect(JSON.parse(calls[1]?.[1].body as string)).toEqual({
-			fieldType: "A",
-			subDomain: "app",
-			target: "1.2.3.4",
-			ttl: 600,
-		});
-		expect(calls[2]?.[0]).toContain("/domain/zone/example.com/refresh");
-		expect(calls[2]?.[1].method).toBe("POST");
-	});
-
-	it("updates the existing record when content matches", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess([4]),
-			ovhSuccess({
-				id: 4,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.2.3.4",
-				ttl: 60,
-			}),
-			ovhSuccess(null),
-			ovhSuccess(null),
-		);
-
-		const result = await ovhClient.upsertRecord(cfg, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		expect(result).toEqual({ id: "4" });
-		const calls = apiCalls();
-		expect(calls[2]?.[0]).toContain("/domain/zone/example.com/record/4");
-		expect(calls[2]?.[1].method).toBe("PUT");
-		expect(calls[3]?.[0]).toContain("/refresh");
-	});
-
-	it("creates a new record when content differs from existing", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess([4]),
-			ovhSuccess({
-				id: 4,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.1.1.1",
-				ttl: 60,
-			}),
-			ovhSuccess({ id: 10 }),
-			ovhSuccess(null),
-		);
-
-		const result = await ovhClient.upsertRecord(cfg, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "5.6.7.8",
-		});
-
-		expect(result).toEqual({ id: "10" });
-		const calls = apiCalls();
-		expect(calls[2]?.[1].method).toBe("POST");
-		expect(calls[3]?.[0]).toContain("/refresh");
-	});
-
-	it("omits the ttl so OVH applies the zone default", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhSuccess([]), ovhSuccess({ id: 9 }), ovhSuccess(null));
-
-		await ovhClient.upsertRecord(cfg, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		expect(JSON.parse(apiCalls()[1]?.[1].body as string)).not.toHaveProperty(
-			"ttl",
-		);
-	});
-
-	it("writes an empty subDomain for the apex and strips the trailing dot", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhSuccess([]), ovhSuccess({ id: 9 }), ovhSuccess(null));
-
-		await ovhClient.upsertRecord(cfg, {
-			zoneId: "example.com",
-			type: "A",
-			name: "example.com.",
-			content: "1.2.3.4",
-		});
-
-		expect(apiCalls()[0]?.[0]).toContain("subDomain=");
-		expect(JSON.parse(apiCalls()[1]?.[1].body as string).subDomain).toBe("");
-	});
-});
-
-describe("ovhClient.updateRecord", () => {
-	it("updates in place when the type is unchanged", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess({
-				id: 4,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.1.1.1",
-				ttl: 60,
-			}),
-			ovhSuccess(null),
-			ovhSuccess(null),
-		);
-
-		const result = await ovhClient.updateRecord(cfg, "example.com", "4", {
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-			ttl: 300,
-		});
-
-		expect(result).toEqual({ id: "4" });
-		const calls = apiCalls();
-		expect(calls[1]?.[1].method).toBe("PUT");
-		expect(JSON.parse(calls[1]?.[1].body as string)).toEqual({
-			subDomain: "app",
-			target: "1.2.3.4",
-			ttl: 300,
-		});
-		expect(calls[2]?.[0]).toContain("/refresh");
-	});
-
-	it("replaces the record when the type changes, since PUT carries no fieldType", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess({
-				id: 4,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.1.1.1",
-				ttl: 60,
-			}),
-			ovhSuccess(null),
-			ovhSuccess({ id: 11 }),
-			ovhSuccess(null),
-		);
-
-		const result = await ovhClient.updateRecord(cfg, "example.com", "4", {
-			type: "CNAME",
-			name: "app.example.com",
-			content: "example.com",
-		});
-
-		expect(result).toEqual({ id: "11" });
-		const calls = apiCalls();
-		expect(calls[1]?.[1].method).toBe("DELETE");
-		expect(calls[2]?.[1].method).toBe("POST");
-		expect(JSON.parse(calls[2]?.[1].body as string).fieldType).toBe("CNAME");
-		expect(calls[3]?.[0]).toContain("/refresh");
-	});
-
-	it("restores the original record when the replacement fails", async () => {
-		const cfg = freshConfig();
-		const original = {
-			id: 4,
-			zone: "example.com",
-			fieldType: "A",
-			subDomain: "app",
-			target: "1.1.1.1",
-			ttl: 60,
-		};
-		mockApi(
-			ovhSuccess(original),
-			ovhSuccess(null),
-			ovhError("Invalid target", 400),
-			ovhSuccess({ id: 12 }),
-			ovhSuccess(null),
-		);
-
-		await expect(
-			ovhClient.updateRecord(cfg, "example.com", "4", {
-				type: "CNAME",
-				name: "app.example.com",
-				content: "not a valid target",
-			}),
-		).rejects.toThrow("Invalid target");
-
-		const calls = apiCalls();
-		expect(calls[1]?.[1].method).toBe("DELETE");
-		expect(calls[2]?.[1].method).toBe("POST");
-		// The original record is put back with its own type, target and ttl.
-		expect(JSON.parse(calls[3]?.[1].body as string)).toEqual({
-			fieldType: "A",
-			subDomain: "app",
-			target: "1.1.1.1",
-			ttl: 60,
-		});
-		expect(calls[4]?.[0]).toContain("/refresh");
-	});
-
-	it("reports the lost record when the restore also fails", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess({
-				id: 4,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.1.1.1",
-				ttl: 60,
-			}),
-			ovhSuccess(null),
-			ovhError("Invalid target", 400),
-			ovhError("Service unavailable", 503),
-		);
-
-		await expect(
-			ovhClient.updateRecord(cfg, "example.com", "4", {
-				type: "CNAME",
-				name: "app.example.com",
-				content: "not a valid target",
-			}),
-		).rejects.toThrow(
-			/Recreate it manually: A app\.example\.com -> 1\.1\.1\.1/,
-		);
-	});
-
-	it("says the change was applied when only the zone refresh fails", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess({
-				id: 4,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.1.1.1",
-				ttl: 60,
-			}),
-			ovhSuccess(null),
-			ovhSuccess({ id: 11 }),
-			ovhError("Service unavailable", 503),
-		);
-
-		// The replacement succeeded, so the record exists at the provider — only
-		// publishing failed. Rolling back would destroy correct state.
-		await expect(
-			ovhClient.updateRecord(cfg, "example.com", "4", {
-				type: "CNAME",
-				name: "app.example.com",
-				content: "example.com",
-			}),
-		).rejects.toThrow(/was applied, but refreshing zone "example\.com" failed/);
-	});
-
-	it("does not tell the user to recreate a record that was restored but not published", async () => {
-		const cfg = freshConfig();
-		mockApi(
-			ovhSuccess({
-				id: 4,
-				zone: "example.com",
-				fieldType: "A",
-				subDomain: "app",
-				target: "1.1.1.1",
-				ttl: 60,
-			}),
-			ovhSuccess(null), // DELETE de l'ancien
-			ovhError("Invalid target", 400), // POST de remplacement -> échec
-			ovhSuccess({ id: 12 }), // POST de restauration -> succès
-			ovhError("Service unavailable", 503), // refresh -> échec
-		);
-
-		const attempt = ovhClient.updateRecord(cfg, "example.com", "4", {
-			type: "CNAME",
-			name: "app.example.com",
-			content: "not a valid target",
-		});
-
-		// L'enregistrement existe de nouveau chez OVH : le recréer le dupliquerait.
-		await expect(attempt).rejects.toThrow(/was restored, but refreshing zone/);
-		await expect(attempt).rejects.not.toThrow(/Recreate it manually/);
-	});
-});
-
-describe("ovhClient.deleteRecord", () => {
-	it("deletes the record then refreshes the zone", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhSuccess(null), ovhSuccess(null));
-
-		await ovhClient.deleteRecord(cfg, "example.com", "4");
-
-		const calls = apiCalls();
-		expect(calls[0]?.[0]).toContain("/domain/zone/example.com/record/4");
-		expect(calls[0]?.[1].method).toBe("DELETE");
-		expect(calls[1]?.[0]).toContain("/domain/zone/example.com/refresh");
-	});
-
-	it("does not refresh the zone when the delete fails", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhError("This object does not exist", 404));
-
-		await expect(
-			ovhClient.deleteRecord(cfg, "example.com", "4"),
-		).rejects.toThrow("This object does not exist");
-		expect(apiCalls()).toHaveLength(1);
-	});
-});
-
-describe("ovhClient.testConnection", () => {
-	it("resolves when the zone listing succeeds", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhSuccess([]));
-
-		await expect(ovhClient.testConnection(cfg)).resolves.toBeUndefined();
-	});
-
-	it("rejects on invalid credentials", async () => {
-		const cfg = freshConfig();
-		mockApi(ovhError("Invalid signature", 403));
-
-		await expect(ovhClient.testConnection(cfg)).rejects.toThrow(
-			"Invalid signature",
-		);
-	});
-});

apps/dokploy/__test__/dns/porkbun.test.ts

@@ -1,237 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const mockFetch = vi.fn();
-global.fetch = mockFetch as typeof fetch;
-
-import { porkbunClient } from "@dokploy/server/utils/dns/porkbun";
-
-const jsonResponse = (body: unknown, ok = true, status = 200) =>
-	({
-		ok,
-		status,
-		json: async () => body,
-	}) as Response;
-
-const pbSuccess = (result: Record<string, unknown> = {}) =>
-	jsonResponse({ status: "SUCCESS", ...result });
-
-const pbError = (message: string, status = 400) =>
-	jsonResponse({ status: "ERROR", message }, false, status);
-
-const config = {
-	providerType: "porkbun" as const,
-	apiKey: "pk1_test",
-	secretApiKey: "sk1_test",
-};
-
-beforeEach(() => {
-	mockFetch.mockReset();
-});
-
-describe("porkbunClient.listZones", () => {
-	it("lists all domains as zones", async () => {
-		mockFetch.mockResolvedValue(
-			pbSuccess({ domains: [{ domain: "example.com" }] }),
-		);
-
-		const zones = await porkbunClient.listZones(config);
-
-		expect(zones).toEqual([{ id: "example.com", name: "example.com" }]);
-		const [url, init] = mockFetch.mock.calls[0] as [string, RequestInit];
-		expect(url).toContain("/domain/listAll");
-		const body = JSON.parse(init.body as string);
-		expect(body).toMatchObject({
-			apikey: "pk1_test",
-			secretapikey: "sk1_test",
-		});
-	});
-});
-
-describe("porkbunClient.listRecords", () => {
-	it("lists records for a domain", async () => {
-		mockFetch.mockResolvedValue(
-			pbSuccess({
-				records: [
-					{
-						id: "1",
-						type: "A",
-						name: "app.example.com",
-						content: "1.2.3.4",
-						ttl: "600",
-						prio: "0",
-						notes: "",
-					},
-				],
-			}),
-		);
-
-		const records = await porkbunClient.listRecords(config, "example.com");
-
-		expect(records).toEqual([
-			{
-				id: "1",
-				type: "A",
-				name: "app.example.com",
-				content: "1.2.3.4",
-				ttl: 600,
-			},
-		]);
-		expect(mockFetch.mock.calls[0]?.[0]).toContain("/dns/retrieve/example.com");
-	});
-});
-
-describe("porkbunClient.upsertRecord", () => {
-	it("creates a record when none exists for the name/type", async () => {
-		mockFetch
-			.mockResolvedValueOnce(pbSuccess({ records: [] }))
-			.mockResolvedValueOnce(pbSuccess({ id: "new-1" }));
-
-		const result = await porkbunClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "1.2.3.4",
-		});
-
-		expect(result).toEqual({ id: "new-1" });
-		const [lookupUrl] = mockFetch.mock.calls[0] as [string];
-		expect(lookupUrl).toContain("/dns/retrieveByNameType/example.com/A/app");
-		const [createUrl, createInit] = mockFetch.mock.calls[1] as [
-			string,
-			RequestInit,
-		];
-		expect(createUrl).toContain("/dns/create/example.com");
-		const body = JSON.parse(createInit.body as string);
-		expect(body).toMatchObject({ name: "app", type: "A", content: "1.2.3.4" });
-	});
-
-	it("resolves the apex domain to an empty subdomain", async () => {
-		mockFetch
-			.mockResolvedValueOnce(pbSuccess({ records: [] }))
-			.mockResolvedValueOnce(pbSuccess({ id: "new-2" }));
-
-		await porkbunClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "example.com",
-			content: "1.2.3.4",
-		});
-
-		const [lookupUrl] = mockFetch.mock.calls[0] as [string];
-		expect(lookupUrl).toContain("/dns/retrieveByNameType/example.com/A/");
-	});
-
-	it("edits the existing record when content matches", async () => {
-		mockFetch
-			.mockResolvedValueOnce(
-				pbSuccess({ records: [{ id: "existing-1", content: "5.6.7.8" }] }),
-			)
-			.mockResolvedValueOnce(pbSuccess({}));
-
-		const result = await porkbunClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "5.6.7.8",
-		});
-
-		expect(result).toEqual({ id: "existing-1" });
-		const [editUrl] = mockFetch.mock.calls[1] as [string, RequestInit];
-		expect(editUrl).toContain("/dns/edit/example.com/existing-1");
-	});
-
-	it("creates a new record when content differs from existing", async () => {
-		mockFetch
-			.mockResolvedValueOnce(
-				pbSuccess({ records: [{ id: "existing-1", content: "1.1.1.1" }] }),
-			)
-			.mockResolvedValueOnce(pbSuccess({ id: "new-2" }));
-
-		const result = await porkbunClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "A",
-			name: "app.example.com",
-			content: "5.6.7.8",
-		});
-
-		expect(result).toEqual({ id: "new-2" });
-		const [createUrl, createInit] = mockFetch.mock.calls[1] as [
-			string,
-			RequestInit,
-		];
-		expect(createUrl).toContain("/dns/create/example.com");
-		const body = JSON.parse(createInit.body as string);
-		expect(body).toMatchObject({ name: "app", type: "A", content: "5.6.7.8" });
-	});
-
-	it("defaults ttl to 600 when not provided", async () => {
-		mockFetch
-			.mockResolvedValueOnce(pbSuccess({ records: [] }))
-			.mockResolvedValueOnce(pbSuccess({ id: "new-1" }));
-
-		await porkbunClient.upsertRecord(config, {
-			zoneId: "example.com",
-			type: "CNAME",
-			name: "www.example.com",
-			content: "example.com",
-		});
-
-		const [, createInit] = mockFetch.mock.calls[1] as [string, RequestInit];
-		const body = JSON.parse(createInit.body as string);
-		expect(body.ttl).toBe(600);
-	});
-});
-
-describe("porkbunClient.updateRecord", () => {
-	it("edits the given record id", async () => {
-		mockFetch.mockResolvedValue(pbSuccess({}));
-
-		const result = await porkbunClient.updateRecord(
-			config,
-			"example.com",
-			"1",
-			{
-				type: "A",
-				name: "app.example.com",
-				content: "9.9.9.9",
-				ttl: 300,
-			},
-		);
-
-		expect(result).toEqual({ id: "1" });
-		const [url, init] = mockFetch.mock.calls[0] as [string, RequestInit];
-		expect(url).toContain("/dns/edit/example.com/1");
-		expect(JSON.parse(init.body as string)).toMatchObject({
-			name: "app",
-			type: "A",
-			content: "9.9.9.9",
-			ttl: 300,
-		});
-	});
-});
-
-describe("porkbunClient.deleteRecord", () => {
-	it("posts to the delete endpoint for the given record id", async () => {
-		mockFetch.mockResolvedValue(pbSuccess({}));
-
-		await porkbunClient.deleteRecord(config, "example.com", "1");
-
-		const [url] = mockFetch.mock.calls[0] as [string];
-		expect(url).toContain("/dns/delete/example.com/1");
-	});
-});
-
-describe("porkbunClient.testConnection", () => {
-	it("succeeds when the credentials can ping the API", async () => {
-		mockFetch.mockResolvedValue(pbSuccess({}));
-		await expect(porkbunClient.testConnection(config)).resolves.toBeUndefined();
-	});
-
-	it("surfaces Porkbun's error message on invalid credentials", async () => {
-		mockFetch.mockResolvedValue(pbError("Invalid API key."));
-
-		await expect(porkbunClient.testConnection(config)).rejects.toThrow(
-			"Invalid API key.",
-		);
-	});
-});

apps/dokploy/__test__/dns/route53.test.ts

@@ -142,15 +142,13 @@ describe("route53Client.listRecords", () => {
 
 		const records = await route53Client.listRecords(config, "Z123");
 
-		expect(records[0]?.content).toBe("ns1.example.com\nns2.example.com");
+		expect(records[0]?.content).toBe("ns1.example.com, ns2.example.com");
 	});
 });
 
 describe("route53Client.upsertRecord", () => {
-	it("sends a single UPSERT change when nothing exists yet", async () => {
-		send
-			.mockResolvedValueOnce({ ResourceRecordSets: [] })
-			.mockResolvedValueOnce({});
+	it("sends a single UPSERT change", async () => {
+		send.mockResolvedValueOnce({});
 
 		const result = await route53Client.upsertRecord(config, {
 			zoneId: "Z123",
@@ -160,7 +158,7 @@ describe("route53Client.upsertRecord", () => {
 		});
 
 		expect(result).toEqual({ id: "A:app.example.com" });
-		const command = send.mock.calls[1]?.[0] as HasInput;
+		const command = send.mock.calls[0]?.[0] as HasInput;
 		expect(command.input.HostedZoneId).toBe("Z123");
 		expect(command.input.ChangeBatch.Changes).toEqual([
 			{
@@ -174,82 +172,6 @@ describe("route53Client.upsertRecord", () => {
 			},
 		]);
 	});
-
-	it("keeps the values already in the record set", async () => {
-		send
-			.mockResolvedValueOnce({
-				ResourceRecordSets: [
-					{
-						Name: "app.example.com.",
-						Type: "A",
-						TTL: 300,
-						ResourceRecords: [{ Value: "1.1.1.1" }, { Value: "2.2.2.2" }],
-					},
-				],
-			})
-			.mockResolvedValueOnce({});
-
-		await route53Client.upsertRecord(config, {
-			zoneId: "Z123",
-			type: "A",
-			name: "app.example.com",
-			content: "3.3.3.3",
-		});
-
-		const command = send.mock.calls[1]?.[0] as HasInput;
-		expect(
-			command.input.ChangeBatch.Changes[0].ResourceRecordSet.ResourceRecords,
-		).toEqual([
-			{ Value: "1.1.1.1" },
-			{ Value: "2.2.2.2" },
-			{ Value: "3.3.3.3" },
-		]);
-	});
-
-	it("does not duplicate a value that is already in the record set", async () => {
-		send
-			.mockResolvedValueOnce({
-				ResourceRecordSets: [
-					{
-						Name: "app.example.com.",
-						Type: "A",
-						TTL: 300,
-						ResourceRecords: [{ Value: "1.1.1.1" }],
-					},
-				],
-			})
-			.mockResolvedValueOnce({});
-
-		await route53Client.upsertRecord(config, {
-			zoneId: "Z123",
-			type: "A",
-			name: "app.example.com",
-			content: "1.1.1.1",
-		});
-
-		const command = send.mock.calls[1]?.[0] as HasInput;
-		expect(
-			command.input.ChangeBatch.Changes[0].ResourceRecordSet.ResourceRecords,
-		).toEqual([{ Value: "1.1.1.1" }]);
-	});
-
-	it("wraps unquoted TXT values in double quotes", async () => {
-		send
-			.mockResolvedValueOnce({ ResourceRecordSets: [] })
-			.mockResolvedValueOnce({});
-
-		await route53Client.upsertRecord(config, {
-			zoneId: "Z123",
-			type: "TXT",
-			name: "example.com",
-			content: 'v=spf1 ~all\n"already quoted"',
-		});
-
-		const command = send.mock.calls[1]?.[0] as HasInput;
-		expect(
-			command.input.ChangeBatch.Changes[0].ResourceRecordSet.ResourceRecords,
-		).toEqual([{ Value: '"v=spf1 ~all"' }, { Value: '"already quoted"' }]);
-	});
 });
 
 describe("route53Client.updateRecord", () => {
@@ -300,25 +222,6 @@ describe("route53Client.updateRecord", () => {
 		]);
 	});
 
-	it("keeps every line of a multi-value record set", async () => {
-		send.mockResolvedValueOnce({});
-
-		await route53Client.updateRecord(config, "Z123", "NS:example.com", {
-			type: "NS",
-			name: "example.com",
-			content: "ns1.example.com\nns2.example.com\n\n  ns3.example.com  ",
-		});
-
-		const command = send.mock.calls[0]?.[0] as HasInput;
-		expect(
-			command.input.ChangeBatch.Changes[0].ResourceRecordSet.ResourceRecords,
-		).toEqual([
-			{ Value: "ns1.example.com" },
-			{ Value: "ns2.example.com" },
-			{ Value: "ns3.example.com" },
-		]);
-	});
-
 	it("skips the DELETE when the old record no longer exists", async () => {
 		send
 			.mockResolvedValueOnce({ ResourceRecordSets: [] })

apps/dokploy/__test__/domains/domain-validation.test.ts

@@ -1,149 +0,0 @@
-import os from "node:os";
-import {
-	getServerIpCandidates,
-	validateDomain,
-} from "@dokploy/server/services/domain";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-	execAsyncRemote: vi.fn(),
-	findServerById: vi.fn(),
-	getPublicIpWithFallback: vi.fn(),
-	getWebServerSettings: vi.fn(),
-	resolve4: vi.fn(),
-	resolve6: vi.fn(),
-}));
-
-vi.mock("node:dns", () => ({
-	default: {
-		resolve4: mocks.resolve4,
-		resolve6: mocks.resolve6,
-	},
-}));
-
-vi.mock("@dokploy/server/utils/process/execAsync", () => ({
-	execAsyncRemote: mocks.execAsyncRemote,
-}));
-
-vi.mock("@dokploy/server/services/server", () => ({
-	findServerById: mocks.findServerById,
-}));
-
-vi.mock("@dokploy/server/services/web-server-settings", () => ({
-	getWebServerSettings: mocks.getWebServerSettings,
-}));
-
-vi.mock("@dokploy/server/wss/utils", () => ({
-	getPublicIpWithFallback: mocks.getPublicIpWithFallback,
-}));
-
-describe("getServerIpCandidates", () => {
-	beforeEach(() => {
-		vi.clearAllMocks();
-	});
-
-	afterEach(() => {
-		vi.restoreAllMocks();
-		vi.useRealTimers();
-	});
-
-	it("includes every address reported by a multi-homed remote server", async () => {
-		mocks.findServerById.mockResolvedValue({
-			ipAddress: "10.0.0.10",
-		});
-		mocks.execAsyncRemote.mockResolvedValue({
-			stdout: ["10.0.0.10", "192.0.2.10", "2001:db8::10"].join("\n"),
-			stderr: "",
-		});
-
-		await expect(getServerIpCandidates("server-id")).resolves.toEqual([
-			"10.0.0.10",
-			"192.0.2.10",
-			"2001:db8::10",
-		]);
-		expect(mocks.execAsyncRemote).toHaveBeenCalledWith(
-			"server-id",
-			expect.stringContaining("ip -o addr show scope global"),
-		);
-	});
-
-	it("includes every address assigned to the local Dokploy host", async () => {
-		mocks.getWebServerSettings.mockResolvedValue({
-			serverIp: "10.0.0.10",
-		});
-		mocks.getPublicIpWithFallback.mockResolvedValue("2001:db8::10");
-		vi.spyOn(os, "networkInterfaces").mockReturnValue({
-			eth0: [
-				{
-					address: "192.0.2.10",
-					netmask: "255.255.255.0",
-					family: "IPv4",
-					mac: "00:00:00:00:00:00",
-					internal: false,
-					cidr: "192.0.2.10/24",
-				},
-			],
-		});
-
-		await expect(getServerIpCandidates()).resolves.toEqual([
-			"10.0.0.10",
-			"192.0.2.10",
-			"2001:db8::10",
-		]);
-	});
-
-	it("retains remote interface addresses when public IP detection times out", async () => {
-		vi.useFakeTimers();
-		mocks.findServerById.mockResolvedValue({
-			ipAddress: "10.0.0.10",
-		});
-		mocks.execAsyncRemote.mockImplementation(
-			(_serverId: string, command: string) => {
-				if (command.includes("curl")) {
-					return new Promise(() => undefined);
-				}
-				return Promise.resolve({
-					stdout: "192.0.2.10\n",
-					stderr: "",
-				});
-			},
-		);
-
-		const candidatesPromise = getServerIpCandidates("server-id");
-		await vi.advanceTimersByTimeAsync(7000);
-
-		await expect(candidatesPromise).resolves.toEqual([
-			"10.0.0.10",
-			"192.0.2.10",
-		]);
-	});
-});
-
-describe("validateDomain", () => {
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	it("validates an IPv6-only domain against an IPv6 server address", async () => {
-		const noIpv4 = Object.assign(new Error("queryA ENODATA example.com"), {
-			code: "ENODATA",
-		});
-		mocks.resolve4.mockImplementation(
-			(_domain: string, callback: (error: Error | null) => void) =>
-				callback(noIpv4),
-		);
-		mocks.resolve6.mockImplementation(
-			(
-				_domain: string,
-				callback: (error: Error | null, addresses?: string[]) => void,
-			) => callback(null, ["2001:db8::10"]),
-		);
-
-		await expect(
-			validateDomain("example.com", ["2001:db8::10"]),
-		).resolves.toMatchObject({
-			isValid: true,
-			resolvedIp: "2001:db8::10",
-		});
-	});
-});

apps/dokploy/__test__/env/aws-parameter-store.test.ts

@@ -1,195 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-type HasInput = { input: Record<string, unknown> };
-
-const findMany = vi.hoisted(() => vi.fn());
-
-const {
-	send,
-	paginate,
-	SSMClient,
-	GetParametersCommand,
-	DescribeParametersCommand,
-} = vi.hoisted(() => {
-	class FakeCommand {
-		input: Record<string, unknown>;
-		constructor(input: Record<string, unknown>) {
-			this.input = input;
-		}
-	}
-	const send = vi.fn();
-	const paginate = vi.fn();
-	class SSMClient {
-		send(command: unknown) {
-			return send(command);
-		}
-	}
-	return {
-		send,
-		paginate,
-		SSMClient,
-		GetParametersCommand: class extends FakeCommand {},
-		DescribeParametersCommand: class extends FakeCommand {},
-	};
-});
-
-vi.mock("@aws-sdk/client-ssm", () => ({
-	SSMClient,
-	GetParametersCommand,
-	DescribeParametersCommand,
-	paginateDescribeParameters: paginate,
-}));
-
-vi.mock("@dokploy/server/db", () => ({
-	db: {
-		query: {
-			vaultProvider: {
-				findMany: (...args: unknown[]) => findMany(...args),
-			},
-		},
-	},
-}));
-
-import { resolveVaultReferences } from "@dokploy/server/utils/vault";
-import { awsParameterStoreClient } from "@dokploy/server/utils/vault/aws-parameter-store";
-
-const config = {
-	providerType: "aws-parameter-store" as const,
-	region: "eu-central-1",
-	accessKeyId: "AKIA_TEST",
-	secretAccessKey: "secret",
-};
-
-beforeEach(() => {
-	send.mockReset();
-	paginate.mockReset();
-	findMany.mockReset();
-});
-
-describe("awsParameterStoreClient", () => {
-	it("decrypts parameters in batches of ten and preserves selectors", async () => {
-		const refs = [
-			"/prod/database:CURRENT",
-			...Array.from({ length: 10 }, (_, index) => `/prod/secret-${index}`),
-		];
-		send.mockImplementation(async (command: HasInput) => ({
-			Parameters: (command.input.Names as string[]).map((ref) => {
-				if (ref === "/prod/database:CURRENT") {
-					return {
-						Name: "/prod/database",
-						Selector: ":CURRENT",
-						Value: "selected-value",
-					};
-				}
-				return { Name: ref, Value: `value-for-${ref}` };
-			}),
-		}));
-
-		const result = await awsParameterStoreClient.getSecrets(config, refs);
-
-		expect(send).toHaveBeenCalledTimes(2);
-		expect((send.mock.calls[0]?.[0] as HasInput).input).toMatchObject({
-			WithDecryption: true,
-		});
-		expect(
-			((send.mock.calls[0]?.[0] as HasInput).input.Names as string[]).length,
-		).toBe(10);
-		expect(
-			((send.mock.calls[1]?.[0] as HasInput).input.Names as string[]).length,
-		).toBe(1);
-		expect(result["/prod/database:CURRENT"]).toBe("selected-value");
-		expect(result["/prod/secret-9"]).toBe("value-for-/prod/secret-9");
-	});
-
-	it("reports a missing parameter without exposing other values", async () => {
-		send.mockResolvedValue({ Parameters: [], InvalidParameters: ["/missing"] });
-
-		await expect(
-			awsParameterStoreClient.getSecrets(config, ["/missing"]),
-		).rejects.toThrow('AWS Parameter Store: parameter "/missing" not found');
-	});
-
-	it("tests the connection within the configured hierarchy", async () => {
-		send.mockResolvedValue({ Parameters: [] });
-
-		await awsParameterStoreClient.testConnection({
-			...config,
-			parameterPath: "/production/my-app/",
-		});
-
-		expect(send).toHaveBeenCalledTimes(1);
-		expect((send.mock.calls[0]?.[0] as HasInput).input).toEqual({
-			ParameterFilters: [
-				{
-					Key: "Path",
-					Option: "Recursive",
-					Values: ["/production/my-app"],
-				},
-			],
-			MaxResults: 1,
-		});
-	});
-
-	it("explains the discovery permission when connection testing is denied", async () => {
-		const error = new Error("not authorized");
-		error.name = "AccessDeniedException";
-		send.mockRejectedValue(error);
-
-		await expect(
-			awsParameterStoreClient.testConnection(config),
-		).rejects.toThrow("ssm:DescribeParameters");
-	});
-
-	it("lists parameter names across pages within the configured hierarchy", async () => {
-		paginate.mockReturnValue(
-			(async function* () {
-				yield { Parameters: [{ Name: "/prod/db" }] };
-				yield { Parameters: [{ Name: "/prod/api" }] };
-			})(),
-		);
-
-		const names = await awsParameterStoreClient.listSecretNames?.({
-			...config,
-			parameterPath: " /production/my-app/ ",
-		});
-
-		expect(names).toEqual(["/prod/db", "/prod/api"]);
-		expect(paginate).toHaveBeenCalledWith(
-			expect.objectContaining({ pageSize: 50 }),
-			{
-				ParameterFilters: [
-					{
-						Key: "Path",
-						Option: "Recursive",
-						Values: ["/production/my-app"],
-					},
-				],
-			},
-		);
-	});
-
-	it("resolves a vault reference through the registered provider", async () => {
-		findMany.mockResolvedValue([
-			{
-				name: "ssm-prod",
-				providerType: "aws-parameter-store",
-				config,
-				assignments: [{ projectId: "project-1", environmentIds: [] }],
-			},
-		]);
-		send.mockResolvedValue({
-			Parameters: [{ Name: "/prod/database-password", Value: "resolved" }],
-		});
-
-		const result = await resolveVaultReferences(
-			"DB_PASSWORD=${{vault.ssm-prod./prod/database-password}}",
-			{
-				organizationId: "organization-1",
-				projectId: "project-1",
-				environmentId: "environment-1",
-			},
-		);
-
-		expect(result).toBe("DB_PASSWORD=resolved");
-	});
-});

apps/dokploy/__test__/env/vault.test.ts

@@ -20,8 +20,6 @@ import {
 import { azureClient } from "@dokploy/server/utils/vault/azure";
 import { dopplerClient } from "@dokploy/server/utils/vault/doppler";
 import { hashicorpClient } from "@dokploy/server/utils/vault/hashicorp";
-import { infisicalClient } from "@dokploy/server/utils/vault/infisical";
-import { phaseClient } from "@dokploy/server/utils/vault/phase";
 import { scalewayClient } from "@dokploy/server/utils/vault/scaleway";
 
 const mockFetch = vi.fn();
@@ -432,152 +430,6 @@ describe("azure client", () => {
 	});
 });
 
-describe("infisical client", () => {
-	const config = {
-		providerType: "infisical" as const,
-		siteUrl: "https://app.infisical.com",
-		clientId: "client-1",
-		clientSecret: "client-secret",
-		projectId: "workspace-1",
-		environmentSlug: "prod",
-		secretPath: "/frontend",
-	};
-
-	const loginResponse = () => jsonResponse({ accessToken: "token-1" });
-	const list = (secrets: Record<string, string>) =>
-		jsonResponse({
-			secrets: Object.entries(secrets).map(([secretKey, secretValue]) => ({
-				secretKey,
-				secretValue,
-			})),
-		});
-	const listPathOf = (callIndex: number) => {
-		const [url] = mockFetch.mock.calls[callIndex] as [string];
-		return new URL(url).searchParams.get("secretPath");
-	};
-
-	it("asks the list endpoint to expand secret references", async () => {
-		mockFetch
-			.mockResolvedValueOnce(loginResponse())
-			.mockResolvedValueOnce(list({ DB_URL: "postgres://real" }));
-
-		const result = await infisicalClient.getSecrets(config, ["DB_URL"]);
-
-		expect(result).toEqual({ DB_URL: "postgres://real" });
-		const [listUrl] = mockFetch.mock.calls[1] as [string];
-		const params = new URL(listUrl).searchParams;
-		expect(params.get("expandSecretReferences")).toBe("true");
-		expect(params.get("workspaceId")).toBe("workspace-1");
-		expect(params.get("environment")).toBe("prod");
-		expect(params.get("secretPath")).toBe("/frontend");
-	});
-
-	it("throws a clear error for a missing secret", async () => {
-		mockFetch
-			.mockResolvedValueOnce(loginResponse())
-			.mockResolvedValueOnce(jsonResponse({ secrets: [] }));
-
-		await expect(
-			infisicalClient.getSecrets(config, ["ABSENT"]),
-		).rejects.toThrow('secret "ABSENT" not found in environment "prod"');
-	});
-
-	it("propagates authentication failures with the status code", async () => {
-		mockFetch.mockResolvedValueOnce(jsonResponse({}, false, 401));
-
-		await expect(
-			infisicalClient.getSecrets(config, ["DB_URL"]),
-		).rejects.toThrow("authentication failed (status 401)");
-	});
-
-	it("resolves a relative <path>:<KEY> ref against the provider path", async () => {
-		mockFetch
-			.mockResolvedValueOnce(loginResponse())
-			.mockResolvedValueOnce(list({ SENTRY_DSN: "https://key@sentry.io/1" }));
-
-		const result = await infisicalClient.getSecrets(config, [
-			"shared/sentry:SENTRY_DSN",
-		]);
-
-		expect(result).toEqual({
-			"shared/sentry:SENTRY_DSN": "https://key@sentry.io/1",
-		});
-		expect(listPathOf(1)).toBe("/frontend/shared/sentry");
-	});
-
-	it("treats a leading slash as an absolute path", async () => {
-		mockFetch
-			.mockResolvedValueOnce(loginResponse())
-			.mockResolvedValueOnce(list({ SENTRY_DSN: "https://key@sentry.io/1" }));
-
-		await infisicalClient.getSecrets(config, ["/external/sentry:SENTRY_DSN"]);
-
-		expect(listPathOf(1)).toBe("/external/sentry");
-	});
-
-	it("keeps the root path clean when the provider sits at /", async () => {
-		mockFetch
-			.mockResolvedValueOnce(loginResponse())
-			.mockResolvedValueOnce(list({ KEY: "value" }));
-
-		await infisicalClient.getSecrets({ ...config, secretPath: "/" }, [
-			"external/sentry:KEY",
-		]);
-
-		expect(listPathOf(1)).toBe("/external/sentry");
-	});
-
-	it("logs in once and fetches each path once", async () => {
-		const byPath: Record<string, Record<string, string>> = {
-			"/frontend": { A: "a", B: "b" },
-			"/frontend/other": { C: "c" },
-		};
-		mockFetch.mockImplementation(async (url: string) => {
-			if (url.includes("/auth/universal-auth/login")) return loginResponse();
-			const path = new URL(url).searchParams.get("secretPath") as string;
-			return list(byPath[path] ?? {});
-		});
-
-		const result = await infisicalClient.getSecrets(config, [
-			"A",
-			"B",
-			"other:C",
-		]);
-
-		expect(result).toEqual({ A: "a", B: "b", "other:C": "c" });
-
-		const urls = mockFetch.mock.calls.map(([url]) => url as string);
-		expect(urls.filter((u) => u.includes("/login"))).toHaveLength(1);
-		expect(
-			urls
-				.filter((u) => u.includes("/secrets/raw?"))
-				.map((u) => new URL(u).searchParams.get("secretPath"))
-				.sort(),
-		).toEqual(["/frontend", "/frontend/other"]);
-	});
-
-	it("names the path when a secret is missing from an explicit one", async () => {
-		mockFetch
-			.mockResolvedValueOnce(loginResponse())
-			.mockResolvedValueOnce(list({}));
-
-		await expect(
-			infisicalClient.getSecrets(config, ["external/sentry:ABSENT"]),
-		).rejects.toThrow(
-			'secret "ABSENT" not found at "/frontend/external/sentry"',
-		);
-	});
-
-	it("rejects a ref with an empty path or key", async () => {
-		await expect(infisicalClient.getSecrets(config, [":KEY"])).rejects.toThrow(
-			"expected format <path>:<KEY>",
-		);
-		await expect(
-			infisicalClient.getSecrets(config, ["external/sentry:"]),
-		).rejects.toThrow("expected format <path>:<KEY>");
-	});
-});
-
 describe("doppler client", () => {
 	it("propagates auth errors with the status code", async () => {
 		mockFetch.mockResolvedValue(jsonResponse({}, false, 401));
@@ -764,129 +616,3 @@ describe("scaleway client", () => {
 		expect(result).toBe("DB_PASSWORD=s3cret");
 	});
 });
-
-describe("phase client", () => {
-	const config = {
-		providerType: "phase" as const,
-		token: "phase-rest-token",
-		appId: "app-123",
-		env: "Production",
-		path: "/",
-		apiUrl: "https://api.phase.dev",
-	};
-
-	it("fetches secrets by key and sends ServiceAccount auth", async () => {
-		mockFetch.mockResolvedValue(
-			jsonResponse([
-				{ key: "DB_URL", value: "postgres://real", path: "/" },
-				{ key: "API_KEY", value: "key-123", path: "/" },
-			]),
-		);
-
-		const result = await phaseClient.getSecrets(config, ["DB_URL", "API_KEY"]);
-
-		expect(result).toEqual({ DB_URL: "postgres://real", API_KEY: "key-123" });
-		expect(mockFetch).toHaveBeenCalledTimes(1);
-		const [url, init] = mockFetch.mock.calls[0] as [string, RequestInit];
-		expect(url).toBe(
-			"https://api.phase.dev/v1/secrets/?app_id=app-123&env=Production&path=%2F",
-		);
-		expect((init.headers as Record<string, string>).Authorization).toBe(
-			"Bearer ServiceAccount phase-rest-token",
-		);
-	});
-
-	it("throws when a requested secret is missing", async () => {
-		mockFetch.mockResolvedValue(
-			jsonResponse([{ key: "DB_URL", value: "postgres://real", path: "/" }]),
-		);
-
-		await expect(phaseClient.getSecrets(config, ["MISSING"])).rejects.toThrow(
-			'secret "MISSING" not found in environment "Production"',
-		);
-	});
-
-	it("reports authentication failures with the status code", async () => {
-		mockFetch.mockResolvedValue(
-			jsonResponse({ error: "unauthorized" }, false, 401),
-		);
-
-		await expect(phaseClient.getSecrets(config, ["DB_URL"])).rejects.toThrow(
-			"authentication failed (status 401: unauthorized)",
-		);
-	});
-
-	it("rejects apps without SSE enabled during testConnection", async () => {
-		mockFetch.mockResolvedValueOnce(
-			jsonResponse({
-				id: "app-123",
-				name: "My App",
-				sseEnabled: false,
-			}),
-		);
-
-		await expect(phaseClient.testConnection(config)).rejects.toThrow(
-			"enable Server-side Encryption (SSE)",
-		);
-		expect(mockFetch).toHaveBeenCalledTimes(1);
-		expect(mockFetch.mock.calls[0]?.[0]).toBe(
-			"https://api.phase.dev/v1/apps/app-123/",
-		);
-	});
-
-	it("tests connection against the app then secrets listing", async () => {
-		mockFetch
-			.mockResolvedValueOnce(
-				jsonResponse({
-					id: "app-123",
-					name: "My App",
-					sseEnabled: true,
-				}),
-			)
-			.mockResolvedValueOnce(jsonResponse([]));
-
-		await phaseClient.testConnection(config);
-
-		expect(mockFetch).toHaveBeenCalledTimes(2);
-		expect(mockFetch.mock.calls[0]?.[0]).toBe(
-			"https://api.phase.dev/v1/apps/app-123/",
-		);
-		expect(mockFetch.mock.calls[1]?.[0]).toBe(
-			"https://api.phase.dev/v1/secrets/?app_id=app-123&env=Production&path=%2F",
-		);
-	});
-
-	it("lists secret names from the configured path", async () => {
-		mockFetch.mockResolvedValue(
-			jsonResponse([
-				{ key: "DB_URL", value: "x", path: "/" },
-				{ key: "API_KEY", value: "y", path: "/" },
-			]),
-		);
-
-		const names = await phaseClient.listSecretNames?.(config);
-
-		expect(names).toEqual(["DB_URL", "API_KEY"]);
-	});
-
-	it("resolves env refs end to end through a phase provider", async () => {
-		findMany.mockResolvedValue([
-			{
-				name: "phase-prod",
-				providerType: "phase",
-				config,
-				assignments: assignedEverywhere,
-			},
-		]);
-		mockFetch.mockResolvedValue(
-			jsonResponse([{ key: "DB_PASSWORD", value: "s3cret", path: "/" }]),
-		);
-
-		const result = await resolveVaultReferences(
-			"DB_PASSWORD=${{vault.phase-prod.DB_PASSWORD}}",
-			scope,
-		);
-
-		expect(result).toBe("DB_PASSWORD=s3cret");
-	});
-});

apps/dokploy/__test__/logs/container-selection.test.ts

@@ -1,41 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveContainerSelection } from "@/components/dashboard/docker/logs/utils";
-
-const containers = [
-	{ containerId: "first-container" },
-	{ containerId: "selected-container" },
-];
-
-describe("resolveContainerSelection", () => {
-	it("selects the first container when no container is selected", () => {
-		expect(resolveContainerSelection(undefined, containers)).toBe(
-			"first-container",
-		);
-	});
-
-	it("preserves a manual selection when refreshed data contains it", () => {
-		const refreshedContainers = containers.map((container) => ({
-			...container,
-		}));
-
-		expect(
-			resolveContainerSelection("selected-container", refreshedContainers),
-		).toBe("selected-container");
-	});
-
-	it("falls back to the first container when the selection disappears", () => {
-		expect(resolveContainerSelection("removed-container", containers)).toBe(
-			"first-container",
-		);
-	});
-
-	it("keeps the current selection while container data is loading", () => {
-		expect(resolveContainerSelection("selected-container", undefined)).toBe(
-			"selected-container",
-		);
-	});
-
-	it("clears the selection when no containers are available", () => {
-		expect(resolveContainerSelection("selected-container", [])).toBeUndefined();
-	});
-});

apps/dokploy/__test__/permissions/check-permission.test.ts

@@ -126,13 +126,6 @@ describe("member is denied org-level enterprise resources (CVE: bypass via stati
 		await expect(checkPermission(ctx, { server: ["read"] })).rejects.toThrow();
 	});
 
-	it("member is denied server.terminal", async () => {
-		memberToReturn = mockMemberData("member");
-		await expect(
-			checkPermission(ctx, { server: ["terminal"] }),
-		).rejects.toThrow();
-	});
-
 	it("member is denied registry.create", async () => {
 		memberToReturn = mockMemberData("member");
 		await expect(

apps/dokploy/__test__/permissions/resolve-permissions.test.ts

@@ -105,7 +105,6 @@ describe("enterprise resources for static roles", () => {
 		const perms = await resolvePermissions(ctx);
 
 		expect(perms.server.read).toBe(false);
-		expect(perms.server.terminal).toBe(false);
 		expect(perms.registry.read).toBe(false);
 		expect(perms.certificate.read).toBe(false);
 		expect(perms.destination.read).toBe(false);

apps/dokploy/__test__/permissions/server-terminal.test.ts

@@ -1,105 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const mockMemberData = (role: string) => ({
-	id: "member-1",
-	role,
-	userId: "user-1",
-	organizationId: "org-1",
-	accessedProjects: [] as string[],
-	accessedServices: [] as string[],
-	accessedEnvironments: [] as string[],
-	accessedServers: [] as string[],
-	canCreateProjects: false,
-	canDeleteProjects: false,
-	canCreateServices: false,
-	canDeleteServices: false,
-	canCreateEnvironments: false,
-	canDeleteEnvironments: false,
-	canAccessToTraefikFiles: false,
-	canAccessToDocker: false,
-	canAccessToAPI: false,
-	canAccessToSSHKeys: false,
-	canAccessToGitProviders: false,
-	user: { id: "user-1", email: "test@test.com" },
-});
-
-let memberToReturn = mockMemberData("deployer");
-let rolesToReturn: { permission: string }[] = [];
-
-vi.mock("@dokploy/server/db", () => ({
-	db: {
-		query: {
-			member: {
-				findFirst: vi.fn(() => Promise.resolve(memberToReturn)),
-				findMany: vi.fn(() => Promise.resolve([])),
-			},
-			organizationRole: {
-				findFirst: vi.fn(),
-				findMany: vi.fn(() => Promise.resolve(rolesToReturn)),
-			},
-		},
-	},
-}));
-
-vi.mock("@dokploy/server/services/proprietary/license-key", () => ({
-	hasValidLicense: vi.fn(() => Promise.resolve(true)),
-}));
-
-const { checkPermission, resolvePermissions } = await import(
-	"@dokploy/server/services/permission"
-);
-
-const ctx = {
-	user: { id: "user-1" },
-	session: { activeOrganizationId: "org-1" },
-};
-
-const withPermissions = (permissions: Record<string, string[]>) => {
-	rolesToReturn = [{ permission: JSON.stringify(permissions) }];
-};
-
-beforeEach(() => {
-	vi.clearAllMocks();
-	memberToReturn = mockMemberData("deployer");
-	rolesToReturn = [];
-});
-
-describe("server.terminal on custom roles", () => {
-	it("a role with server.read alone cannot open a terminal", async () => {
-		withPermissions({ server: ["read"] });
-
-		await expect(
-			checkPermission(ctx, { server: ["read"] }),
-		).resolves.toBeUndefined();
-		await expect(
-			checkPermission(ctx, { server: ["terminal"] }),
-		).rejects.toThrow();
-
-		const perms = await resolvePermissions(ctx);
-		expect(perms.server.read).toBe(true);
-		expect(perms.server.terminal).toBe(false);
-	});
-
-	it("a role with server.terminal can open a terminal", async () => {
-		withPermissions({ server: ["read", "terminal"] });
-
-		await expect(
-			checkPermission(ctx, { server: ["terminal"] }),
-		).resolves.toBeUndefined();
-
-		const perms = await resolvePermissions(ctx);
-		expect(perms.server.terminal).toBe(true);
-	});
-
-	it("owner and admin keep terminal access", async () => {
-		for (const role of ["owner", "admin"]) {
-			memberToReturn = mockMemberData(role);
-			await expect(
-				checkPermission(ctx, { server: ["terminal"] }),
-			).resolves.toBeUndefined();
-
-			const perms = await resolvePermissions(ctx);
-			expect(perms.server.terminal).toBe(true);
-		}
-	});
-});

apps/dokploy/__test__/sandbox/container.test.ts

@@ -1,102 +0,0 @@
-import {
-	buildSandboxContainerOptions,
-	getSandboxNetworkName,
-	parseSandboxEnvVars,
-	parseSandboxUser,
-	SANDBOX_INTERNET_NETWORK,
-	SANDBOX_ISOLATED_NETWORK,
-} from "@dokploy/server/utils/sandbox/container";
-import { describe, expect, it } from "vitest";
-
-const spec = {
-	sandboxId: "sb_1",
-	projectId: "proj_1",
-	environmentId: "env_1",
-	image: "python:3.12-slim",
-	cpu: 1.5,
-	memoryMb: 512,
-	pidsLimit: 256,
-	networkMode: "isolated" as const,
-	envVars: "FOO=bar\n# comment\n\nBAZ=qux=1\ninvalid",
-	workdir: "/home/user",
-	user: "1000:1000",
-};
-
-describe("buildSandboxContainerOptions", () => {
-	it("applies cpu, memory and pids limits", () => {
-		const options = buildSandboxContainerOptions(spec);
-		expect(options.HostConfig?.NanoCpus).toBe(1_500_000_000);
-		expect(options.HostConfig?.Memory).toBe(512 * 1024 * 1024);
-		expect(options.HostConfig?.MemorySwap).toBe(512 * 1024 * 1024);
-		expect(options.HostConfig?.PidsLimit).toBe(256);
-	});
-
-	it("hardens the container", () => {
-		const options = buildSandboxContainerOptions(spec);
-		expect(options.HostConfig?.CapDrop).toEqual(["ALL"]);
-		expect(options.HostConfig?.SecurityOpt).toEqual(["no-new-privileges"]);
-		expect(options.HostConfig?.RestartPolicy).toEqual({ Name: "no" });
-		expect(options.HostConfig?.LogConfig?.Config?.["max-size"]).toBe("10m");
-		expect(options.User).toBe("1000:1000");
-	});
-
-	it("keeps the container alive with a portable command under an init", () => {
-		const options = buildSandboxContainerOptions(spec);
-		expect(options.Entrypoint).toEqual([""]);
-		expect(options.Cmd).toEqual(["tail", "-f", "/dev/null"]);
-		expect(options.HostConfig?.Init).toBe(true);
-		expect(options.WorkingDir).toBe("/home/user");
-	});
-
-	it("sets the labels used by the reaper and reconcile", () => {
-		const options = buildSandboxContainerOptions(spec);
-		expect(options.name).toBe("dokploy-sandbox-sb_1");
-		expect(options.Labels).toEqual({
-			"dokploy.sandbox": "true",
-			"dokploy.sandboxId": "sb_1",
-			"dokploy.projectId": "proj_1",
-			"dokploy.environmentId": "env_1",
-		});
-	});
-
-	it("selects the isolated or internet network and never dokploy-network", () => {
-		expect(buildSandboxContainerOptions(spec).HostConfig?.NetworkMode).toBe(
-			SANDBOX_ISOLATED_NETWORK,
-		);
-		expect(
-			buildSandboxContainerOptions({ ...spec, networkMode: "internet" })
-				.HostConfig?.NetworkMode,
-		).toBe(SANDBOX_INTERNET_NETWORK);
-		expect(getSandboxNetworkName("isolated")).not.toBe("dokploy-network");
-		expect(getSandboxNetworkName("internet")).not.toBe("dokploy-network");
-	});
-
-	it("passes env vars and HOME, skipping comments and malformed lines", () => {
-		const options = buildSandboxContainerOptions(spec);
-		expect(options.Env).toEqual(["HOME=/home/user", "FOO=bar", "BAZ=qux=1"]);
-	});
-
-	it("omits User when the image default should be used", () => {
-		const options = buildSandboxContainerOptions({ ...spec, user: null });
-		expect(options).not.toHaveProperty("User");
-	});
-});
-
-describe("parseSandboxEnvVars", () => {
-	it("returns an empty list for empty input", () => {
-		expect(parseSandboxEnvVars(null)).toEqual([]);
-		expect(parseSandboxEnvVars("")).toEqual([]);
-	});
-});
-
-describe("parseSandboxUser", () => {
-	it("parses uid:gid", () => {
-		expect(parseSandboxUser("1000:1000")).toEqual({ uid: 1000, gid: 1000 });
-		expect(parseSandboxUser("1001")).toEqual({ uid: 1001, gid: 1001 });
-	});
-
-	it("rejects named users", () => {
-		expect(parseSandboxUser("node")).toBeNull();
-		expect(parseSandboxUser(null)).toBeNull();
-	});
-});

apps/dokploy/__test__/sandbox/exec.test.ts

@@ -1,236 +0,0 @@
-import { EventEmitter } from "node:events";
-import { PassThrough } from "node:stream";
-import {
-	buildSandboxKillCommand,
-	runSandboxExec,
-	SANDBOX_EXEC_MARKER_ENV,
-	SANDBOX_EXEC_TIMEOUT_EXIT_CODE,
-	toSandboxEnvArray,
-} from "@dokploy/server/utils/sandbox/exec";
-import { parse, quote } from "shell-quote";
-import { describe, expect, it, vi } from "vitest";
-
-// Docker multiplexes stdout/stderr on a non-tty exec as 8-byte frames:
-// [stream type, 0, 0, 0, size (BE uint32)] followed by the payload.
-const frame = (type: 1 | 2, text: string) => {
-	const payload = Buffer.from(text);
-	const header = Buffer.alloc(8);
-	header[0] = type;
-	header.writeUInt32BE(payload.length, 4);
-	return Buffer.concat([header, payload]);
-};
-
-// Mirrors docker-modem's demuxStream so the runner is exercised end to end.
-const demuxStream = (
-	stream: NodeJS.ReadableStream,
-	stdout: NodeJS.WritableStream,
-	stderr: NodeJS.WritableStream,
-) => {
-	let buffer = Buffer.alloc(0);
-	stream.on("data", (chunk: Buffer) => {
-		buffer = Buffer.concat([buffer, chunk]);
-		while (buffer.length >= 8) {
-			const size = buffer.readUInt32BE(4);
-			if (buffer.length < 8 + size) break;
-			const payload = buffer.subarray(8, 8 + size);
-			(buffer[0] === 2 ? stderr : stdout).write(payload);
-			buffer = buffer.subarray(8 + size);
-		}
-	});
-};
-
-const createDocker = (opts: {
-	frames: Buffer[];
-	exitCode: number | null;
-	endAfterMs?: number;
-	dieOnKill?: boolean;
-}) => {
-	const stream = new PassThrough();
-	const execCreate = vi.fn();
-	const execStart = vi.fn();
-	const kill = vi.fn(async () => {
-		stream.end();
-	});
-	const start = vi.fn(async () => undefined);
-	const killExecStart = vi.fn(async () => {
-		if (opts.dieOnKill) stream.end();
-	});
-	const inspect = vi.fn(async () => ({ ExitCode: opts.exitCode }));
-
-	const exec = vi.fn(async (options: { Cmd: string[] }) => {
-		execCreate(options);
-		if (options.Cmd[2]?.startsWith("if grep -qzF x /dev/null")) {
-			return { start: killExecStart, inspect };
-		}
-		return {
-			start: vi.fn(async (startOptions: unknown) => {
-				execStart(startOptions);
-				setTimeout(() => {
-					for (const chunk of opts.frames) stream.write(chunk);
-					if (opts.endAfterMs === undefined) stream.end();
-					else if (opts.endAfterMs > 0)
-						setTimeout(() => stream.end(), opts.endAfterMs);
-				}, 5);
-				return stream;
-			}),
-			inspect,
-		};
-	});
-
-	const docker = {
-		getContainer: vi.fn(() => ({ exec, kill, start })),
-		modem: { demuxStream },
-	};
-	return { docker, execCreate, execStart, kill, start, killExecStart, inspect };
-};
-
-describe("runSandboxExec", () => {
-	it("demuxes stdout/stderr and reports the exit code", async () => {
-		const { docker, execCreate, execStart } = createDocker({
-			frames: [frame(1, "hello "), frame(1, "world\n"), frame(2, "oops\n")],
-			exitCode: 3,
-		});
-		const stdoutChunks: string[] = [];
-		const result = await runSandboxExec(docker as never, "ctr", {
-			cmd: "echo hello world; echo oops >&2; exit 3",
-			cwd: "/home/user",
-			env: { FOO: "bar" },
-			timeoutMs: 5000,
-			onStdout: (chunk) => stdoutChunks.push(chunk),
-		});
-
-		expect(result).toMatchObject({
-			stdout: "hello world\n",
-			stderr: "oops\n",
-			exitCode: 3,
-			timedOut: false,
-			truncated: false,
-			containerKilled: false,
-		});
-		expect(stdoutChunks.join("")).toBe("hello world\n");
-
-		const options = execCreate.mock.calls[0]?.[0];
-		expect(options.Cmd).toEqual([
-			"sh",
-			"-c",
-			"echo hello world; echo oops >&2; exit 3",
-		]);
-		expect(options.WorkingDir).toBe("/home/user");
-		expect(options.Tty).toBe(false);
-		expect(options.Env).toContain("FOO=bar");
-		expect(
-			options.Env.some((e: string) =>
-				e.startsWith(`${SANDBOX_EXEC_MARKER_ENV}=`),
-			),
-		).toBe(true);
-		expect(execStart).toHaveBeenCalledWith({ hijack: true, stdin: false });
-	});
-
-	it("treats a null exit code as failure", async () => {
-		const { docker } = createDocker({ frames: [], exitCode: null });
-		const result = await runSandboxExec(docker as never, "ctr", {
-			cmd: "true",
-			timeoutMs: 5000,
-		});
-		expect(result.exitCode).toBe(1);
-	});
-
-	it("truncates output beyond maxOutputBytes but keeps streaming", async () => {
-		const { docker } = createDocker({
-			frames: [frame(1, "a".repeat(100)), frame(1, "b".repeat(100))],
-			exitCode: 0,
-		});
-		const streamed: string[] = [];
-		const result = await runSandboxExec(docker as never, "ctr", {
-			cmd: "yes",
-			timeoutMs: 5000,
-			maxOutputBytes: 150,
-			onStdout: (chunk) => streamed.push(chunk),
-		});
-		expect(result.stdout).toHaveLength(150);
-		expect(result.truncated).toBe(true);
-		expect(streamed.join("")).toHaveLength(200);
-	});
-
-	it("kills the process on timeout and returns exit code 124", async () => {
-		const { docker, killExecStart, kill } = createDocker({
-			frames: [frame(1, "partial")],
-			exitCode: 0,
-			endAfterMs: 0,
-			dieOnKill: true,
-		});
-		const result = await runSandboxExec(docker as never, "ctr", {
-			cmd: "sleep 100",
-			timeoutMs: 50,
-		});
-		expect(result.timedOut).toBe(true);
-		expect(result.exitCode).toBe(SANDBOX_EXEC_TIMEOUT_EXIT_CODE);
-		expect(result.stdout).toBe("partial");
-		expect(killExecStart).toHaveBeenCalledWith({ Detach: true });
-		expect(kill).not.toHaveBeenCalled();
-		expect(result.containerKilled).toBe(false);
-		expect(result.containerRestarted).toBe(false);
-	});
-
-	it("kills and restarts the container when the process survives the marker kill", async () => {
-		const { docker, kill, start } = createDocker({
-			frames: [],
-			exitCode: 0,
-			endAfterMs: 0,
-			dieOnKill: false,
-		});
-		const result = await runSandboxExec(docker as never, "ctr", {
-			cmd: "sleep 100",
-			timeoutMs: 50,
-		});
-		expect(result.timedOut).toBe(true);
-		expect(result.exitCode).toBe(SANDBOX_EXEC_TIMEOUT_EXIT_CODE);
-		expect(kill).toHaveBeenCalledWith({ signal: "SIGKILL" });
-		expect(start).toHaveBeenCalledTimes(1);
-		expect(result.containerKilled).toBe(true);
-		expect(result.containerRestarted).toBe(true);
-	}, 10_000);
-
-	it("reports a failed restart so the sandbox can be marked as error", async () => {
-		const { docker, start } = createDocker({
-			frames: [],
-			exitCode: 0,
-			endAfterMs: 0,
-			dieOnKill: false,
-		});
-		start.mockRejectedValueOnce(new Error("no such container"));
-		const result = await runSandboxExec(docker as never, "ctr", {
-			cmd: "sleep 100",
-			timeoutMs: 50,
-		});
-		expect(result.containerKilled).toBe(true);
-		expect(result.containerRestarted).toBe(false);
-	}, 10_000);
-});
-
-describe("buildSandboxKillCommand", () => {
-	it("matches the marker as a fixed string and never fails the shell", () => {
-		const cmd = buildSandboxKillCommand("abc-123");
-		expect(cmd).toContain(`grep -qzxF ${quote(["DOKPLOY_EXEC_ID=abc-123"])}`);
-		expect(cmd).toContain(
-			`tr '\\0' '\\n' < "$f" 2>/dev/null | grep -qxF ${quote(["DOKPLOY_EXEC_ID=abc-123"])}`,
-		);
-		expect(parse(cmd)).toContain("DOKPLOY_EXEC_ID=abc-123");
-		expect(cmd).toContain("kill -9");
-		expect(cmd.endsWith("; true")).toBe(true);
-	});
-});
-
-describe("toSandboxEnvArray", () => {
-	it("converts records and passes arrays through", () => {
-		expect(toSandboxEnvArray({ A: "1", B: "x=y" })).toEqual(["A=1", "B=x=y"]);
-		expect(toSandboxEnvArray(["C=3"])).toEqual(["C=3"]);
-		expect(toSandboxEnvArray(undefined)).toEqual([]);
-	});
-});
-
-describe("EventEmitter sanity", () => {
-	it("keeps the fake stream API compatible with what the runner uses", () => {
-		expect(new PassThrough()).toBeInstanceOf(EventEmitter);
-	});
-});

apps/dokploy/__test__/sandbox/files.test.ts

@@ -1,80 +0,0 @@
-import {
-	buildSandboxFindCommand,
-	buildSandboxLsCommand,
-	parseSandboxFindOutput,
-	parseSandboxLsOutput,
-} from "@dokploy/server/utils/sandbox/files";
-import { parse } from "shell-quote";
-import { describe, expect, it } from "vitest";
-
-describe("list files commands", () => {
-	it("quotes the path against shell injection", () => {
-		expect(buildSandboxFindCommand("/tmp/a b; rm -rf /")).toContain(
-			"'/tmp/a b; rm -rf /'",
-		);
-		expect(parse(buildSandboxLsCommand("/tmp/$(id)"))).toEqual([
-			"ls",
-			"-1Ap",
-			"/tmp/$(id)",
-		]);
-	});
-});
-
-describe("parseSandboxFindOutput", () => {
-	it("parses type, size, mtime, mode and name, directories first", () => {
-		const out = [
-			"f\t12\t1700000000.5000\t644\tmain.py",
-			"d\t4096\t1700000100.0000\t755\tsrc",
-			"l\t7\t1700000200.0000\t777\tlink",
-			"f\t0\t1700000300.0000\t600\tname with\tspaces",
-		].join("\n");
-		const entries = parseSandboxFindOutput(out);
-		expect(entries.map((e) => e.name)).toEqual([
-			"src",
-			"link",
-			"main.py",
-			"name with\tspaces",
-		]);
-		expect(entries[0]).toEqual({
-			name: "src",
-			type: "directory",
-			size: 4096,
-			mode: "755",
-			modifiedAt: new Date(1700000100 * 1000).toISOString(),
-		});
-		expect(entries[2]).toMatchObject({
-			type: "file",
-			size: 12,
-			modifiedAt: new Date(1700000000500).toISOString(),
-		});
-		expect(entries[1]?.type).toBe("symlink");
-	});
-
-	it("returns an empty list for an empty directory", () => {
-		expect(parseSandboxFindOutput("")).toEqual([]);
-		expect(parseSandboxFindOutput("\n")).toEqual([]);
-	});
-});
-
-describe("parseSandboxLsOutput", () => {
-	it("marks trailing-slash entries as directories", () => {
-		const entries = parseSandboxLsOutput("b.txt\na/\n.hidden\n");
-		expect(entries).toEqual([
-			{
-				name: "a",
-				type: "directory",
-				size: null,
-				mode: null,
-				modifiedAt: null,
-			},
-			{
-				name: ".hidden",
-				type: "file",
-				size: null,
-				mode: null,
-				modifiedAt: null,
-			},
-			{ name: "b.txt", type: "file", size: null, mode: null, modifiedAt: null },
-		]);
-	});
-});

apps/dokploy/__test__/sandbox/network.test.ts

@@ -1,107 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-vi.mock("@dokploy/server/utils/servers/remote-docker", () => ({
-	getRemoteDocker: vi.fn(),
-}));
-
-import {
-	ensureSandboxNetwork,
-	SANDBOX_NETWORK_OPTIONS,
-} from "@dokploy/server/services/sandbox";
-
-const notFound = () =>
-	Object.assign(new Error("no such network"), { statusCode: 404 });
-
-const createDocker = (inspect: () => Promise<unknown>) => {
-	const remove = vi.fn(async () => undefined);
-	const createNetwork = vi.fn(async () => undefined);
-	const getNetwork = vi.fn(() => ({ inspect, remove }));
-	return {
-		docker: { getNetwork, createNetwork },
-		remove,
-		createNetwork,
-		getNetwork,
-	};
-};
-
-beforeEach(() => {
-	vi.spyOn(console, "warn").mockImplementation(() => {});
-});
-
-describe("ensureSandboxNetwork", () => {
-	it("creates an internal bridge without inter-container traffic for isolated mode", async () => {
-		const { docker, createNetwork } = createDocker(async () => {
-			throw notFound();
-		});
-		const name = await ensureSandboxNetwork(docker as never, "isolated");
-		expect(name).toBe("dokploy-sandboxes-isolated");
-		expect(createNetwork).toHaveBeenCalledWith(
-			expect.objectContaining({
-				Name: "dokploy-sandboxes-isolated",
-				Driver: "bridge",
-				Internal: true,
-				Options: SANDBOX_NETWORK_OPTIONS,
-			}),
-		);
-		expect(
-			SANDBOX_NETWORK_OPTIONS["com.docker.network.bridge.enable_icc"],
-		).toBe("false");
-	});
-
-	it("creates a non-internal bridge for internet mode", async () => {
-		const { docker, createNetwork } = createDocker(async () => {
-			throw notFound();
-		});
-		await ensureSandboxNetwork(docker as never, "internet");
-		expect(createNetwork).toHaveBeenCalledWith(
-			expect.objectContaining({
-				Name: "dokploy-sandboxes",
-				Internal: false,
-				Options: SANDBOX_NETWORK_OPTIONS,
-			}),
-		);
-	});
-
-	it("reuses a network that already blocks inter-container traffic", async () => {
-		const { docker, createNetwork, remove } = createDocker(async () => ({
-			Options: SANDBOX_NETWORK_OPTIONS,
-			Containers: {},
-		}));
-		await ensureSandboxNetwork(docker as never, "isolated");
-		expect(createNetwork).not.toHaveBeenCalled();
-		expect(remove).not.toHaveBeenCalled();
-	});
-
-	it("recreates an unused legacy network that allows inter-container traffic", async () => {
-		const { docker, createNetwork, remove } = createDocker(async () => ({
-			Options: {},
-			Containers: {},
-		}));
-		await ensureSandboxNetwork(docker as never, "isolated");
-		expect(remove).toHaveBeenCalledTimes(1);
-		expect(createNetwork).toHaveBeenCalledTimes(1);
-	});
-
-	it("keeps a legacy network that still has containers attached and warns", async () => {
-		const { docker, createNetwork, remove } = createDocker(async () => ({
-			Options: {},
-			Containers: { abc: { Name: "dokploy-sandbox-x" } },
-		}));
-		await ensureSandboxNetwork(docker as never, "isolated");
-		expect(remove).not.toHaveBeenCalled();
-		expect(createNetwork).not.toHaveBeenCalled();
-		expect(console.warn).toHaveBeenCalled();
-	});
-
-	it("tolerates a concurrent create of the same network", async () => {
-		const { docker, createNetwork } = createDocker(async () => {
-			throw notFound();
-		});
-		createNetwork.mockRejectedValueOnce(
-			Object.assign(new Error("exists"), { statusCode: 409 }),
-		);
-		await expect(
-			ensureSandboxNetwork(docker as never, "isolated"),
-		).resolves.toBe("dokploy-sandboxes-isolated");
-	});
-});

apps/dokploy/__test__/sandbox/reaper.test.ts

@@ -1,117 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const findMany = vi.hoisted(() => vi.fn());
-vi.mock("@dokploy/server/db", () => ({
-	db: { query: { sandboxes: { findMany } } },
-}));
-vi.mock("@dokploy/server/services/sandbox", () => ({
-	killSandbox: vi.fn(),
-}));
-
-import {
-	findExpiredSandboxes,
-	planSandboxReconcile,
-	reapExpiredSandboxes,
-} from "@dokploy/server/utils/sandbox/reaper";
-
-const now = new Date("2026-09-10T12:00:00Z");
-const past = new Date(now.getTime() - 1000);
-const future = new Date(now.getTime() + 60_000);
-
-beforeEach(() => {
-	findMany.mockReset();
-});
-
-describe("findExpiredSandboxes", () => {
-	it("returns only running sandboxes whose expiresAt has passed", () => {
-		const list = [
-			{ sandboxId: "expired", status: "running", expiresAt: past },
-			{ sandboxId: "alive", status: "running", expiresAt: future },
-			{ sandboxId: "no-expiry", status: "running", expiresAt: null },
-			{ sandboxId: "killed", status: "killed", expiresAt: past },
-			{ sandboxId: "error", status: "error", expiresAt: past },
-		];
-		expect(findExpiredSandboxes(list, now).map((s) => s.sandboxId)).toEqual([
-			"expired",
-		]);
-	});
-});
-
-describe("reapExpiredSandboxes", () => {
-	it("kills expired sandboxes and leaves the rest untouched", async () => {
-		findMany.mockResolvedValue([
-			{ sandboxId: "expired", status: "running", expiresAt: past },
-			{ sandboxId: "alive", status: "running", expiresAt: future },
-		]);
-		const kill = vi.fn(async () => undefined);
-		const killed = await reapExpiredSandboxes(now, kill);
-		expect(killed).toEqual(["expired"]);
-		expect(kill).toHaveBeenCalledTimes(1);
-		expect(kill).toHaveBeenCalledWith("expired");
-	});
-
-	it("continues when one kill fails", async () => {
-		findMany.mockResolvedValue([
-			{ sandboxId: "a", status: "running", expiresAt: past },
-			{ sandboxId: "b", status: "running", expiresAt: past },
-		]);
-		const kill = vi.fn(async (id: string) => {
-			if (id === "a") throw new Error("docker down");
-		});
-		const spy = vi.spyOn(console, "error").mockImplementation(() => {});
-		const killed = await reapExpiredSandboxes(now, kill);
-		spy.mockRestore();
-		expect(killed).toEqual(["b"]);
-		expect(kill).toHaveBeenCalledTimes(2);
-	});
-});
-
-describe("planSandboxReconcile", () => {
-	const container = (id: string, sandboxId: string, state = "running") => ({
-		Id: id,
-		State: state,
-		Labels: { "dokploy.sandbox": "true", "dokploy.sandboxId": sandboxId },
-	});
-
-	it("removes containers without a running row and errors rows without a container", () => {
-		const plan = planSandboxReconcile(
-			[
-				{ sandboxId: "ok", containerId: "c-ok", status: "running" },
-				{ sandboxId: "gone", containerId: "c-gone", status: "running" },
-				{ sandboxId: "never-started", containerId: null, status: "running" },
-			],
-			[
-				container("c-ok", "ok"),
-				container("c-orphan", "orphan"),
-				container("c-exited", "ok-old", "exited"),
-			],
-		);
-		expect(plan.removeContainers).toEqual(["c-orphan", "c-exited"]);
-		expect(plan.markError).toEqual(["gone", "never-started"]);
-	});
-
-	it("removes a stopped container even when its row is running, and errors the row", () => {
-		const plan = planSandboxReconcile(
-			[{ sandboxId: "sb", containerId: "c1", status: "running" }],
-			[container("c1", "sb", "exited")],
-		);
-		expect(plan.removeContainers).toEqual(["c1"]);
-		expect(plan.markError).toEqual(["sb"]);
-	});
-
-	it("leaves containers of sandboxes that are still being created alone", () => {
-		const plan = planSandboxReconcile(
-			[{ sandboxId: "new", containerId: null, status: "creating" }],
-			[container("c-new", "new")],
-		);
-		expect(plan).toEqual({ removeContainers: [], markError: [] });
-	});
-
-	it("does nothing when everything matches", () => {
-		const plan = planSandboxReconcile(
-			[{ sandboxId: "sb", containerId: "c1", status: "running" }],
-			[container("c1", "sb")],
-		);
-		expect(plan).toEqual({ removeContainers: [], markError: [] });
-	});
-});

apps/dokploy/__test__/sandbox/tar.test.ts

@@ -1,145 +0,0 @@
-import { Readable } from "node:stream";
-import {
-	buildSandboxDirectoryTar,
-	buildSandboxFileTar,
-	extractSandboxFile,
-	SandboxFileTooLargeError,
-	SandboxNotRegularFileError,
-} from "@dokploy/server/utils/sandbox/tar";
-import { describe, expect, it } from "vitest";
-
-type Entry = {
-	name: string;
-	type: string;
-	mode: number;
-	uid: number;
-	gid: number;
-	size: number;
-	content: string;
-};
-
-const TYPES: Record<string, string> = {
-	"0": "file",
-	"\0": "file",
-	"5": "directory",
-};
-
-// Minimal ustar reader: 512-byte header blocks with octal numeric fields.
-const readTar = (buffer: Buffer): Entry[] => {
-	const entries: Entry[] = [];
-	let offset = 0;
-	const field = (start: number, length: number) =>
-		buffer
-			.subarray(offset + start, offset + start + length)
-			.toString("utf8")
-			.replace(/\0.*$/s, "");
-	const octal = (start: number, length: number) =>
-		Number.parseInt(field(start, length).trim() || "0", 8);
-	while (offset + 512 <= buffer.length) {
-		const name = field(0, 100);
-		if (!name) break;
-		const size = octal(124, 12);
-		const typeflag = buffer[offset + 156] ?? 0;
-		entries.push({
-			name,
-			type: TYPES[String.fromCharCode(typeflag)] ?? "other",
-			mode: octal(100, 8),
-			uid: octal(108, 8),
-			gid: octal(116, 8),
-			size,
-			content: buffer
-				.subarray(offset + 512, offset + 512 + size)
-				.toString("utf8"),
-		});
-		offset += 512 + Math.ceil(size / 512) * 512;
-	}
-	return entries;
-};
-
-describe("buildSandboxFileTar", () => {
-	it("packs a single file with the requested ownership and mode", async () => {
-		const tar = await buildSandboxFileTar({
-			name: "main.py",
-			content: Buffer.from("print('hi')\n"),
-			uid: 1000,
-			gid: 1000,
-			mode: 0o600,
-		});
-		const entries = await readTar(tar);
-		expect(entries).toHaveLength(1);
-		expect(entries[0]).toMatchObject({
-			name: "main.py",
-			type: "file",
-			mode: 0o600,
-			uid: 1000,
-			gid: 1000,
-			size: 12,
-			content: "print('hi')\n",
-		});
-	});
-
-	it("defaults to root ownership and 0644", async () => {
-		const entries = await readTar(
-			await buildSandboxFileTar({ name: "a.txt", content: Buffer.alloc(0) }),
-		);
-		expect(entries[0]).toMatchObject({ mode: 0o644, uid: 0, gid: 0, size: 0 });
-	});
-});
-
-describe("buildSandboxDirectoryTar", () => {
-	it("packs a directory entry with a trailing slash", async () => {
-		const entries = await readTar(
-			await buildSandboxDirectoryTar({ name: "user", uid: 1000, gid: 1000 }),
-		);
-		expect(entries[0]).toMatchObject({
-			name: "user/",
-			type: "directory",
-			mode: 0o755,
-			uid: 1000,
-			gid: 1000,
-		});
-	});
-});
-
-describe("extractSandboxFile", () => {
-	it("extracts the first regular file", async () => {
-		const tar = await buildSandboxFileTar({
-			name: "out.txt",
-			content: Buffer.from("hello"),
-		});
-		const file = await extractSandboxFile(Readable.from(tar), 1024);
-		expect(file.name).toBe("out.txt");
-		expect(file.content.toString()).toBe("hello");
-	});
-
-	it("rejects files over the limit", async () => {
-		const tar = await buildSandboxFileTar({
-			name: "big.bin",
-			content: Buffer.alloc(2048, 1),
-		});
-		await expect(
-			extractSandboxFile(Readable.from(tar), 1024),
-		).rejects.toBeInstanceOf(SandboxFileTooLargeError);
-	});
-
-	it("rejects a directory archive even when it contains files", async () => {
-		const dir = await buildSandboxDirectoryTar({ name: "proj" });
-		const file = await buildSandboxFileTar({
-			name: "proj/main.py",
-			content: Buffer.from("print(1)"),
-		});
-		// tar-stream pads each archive with two zero blocks; strip the first
-		// archive's end-of-archive marker so the entries are read as one tar.
-		const combined = Buffer.concat([dir.subarray(0, dir.length - 1024), file]);
-		await expect(
-			extractSandboxFile(Readable.from(combined), 1024),
-		).rejects.toBeInstanceOf(SandboxNotRegularFileError);
-	});
-
-	it("rejects archives without a regular file", async () => {
-		const tar = await buildSandboxDirectoryTar({ name: "dir" });
-		await expect(
-			extractSandboxFile(Readable.from(tar), 1024),
-		).rejects.toBeInstanceOf(SandboxNotRegularFileError);
-	});
-});

apps/dokploy/__test__/setup/monitoring-setup.real.test.ts

@@ -1,261 +0,0 @@
-import { execSync } from "node:child_process";
-import { docker } from "@dokploy/server/constants";
-import { setupMonitoring } from "@dokploy/server/setup/monitoring-setup";
-import { afterAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-const REAL_TEST_TIMEOUT = 120000;
-const SERVICE_NAME = "dokploy-monitoring";
-const TEST_IMAGE = "busybox:latest";
-
-// Mock ONLY db-backed lookups and remote I/O. Dockerode stays real and talks to
-// the local daemon, so the legacy-container cleanup is exercised for real.
-vi.mock("@dokploy/server/services/server", () => ({
-	findServerById: vi.fn().mockResolvedValue({
-		serverId: "test-server",
-		serverType: "deploy",
-		sshKeyId: null, // -> getRemoteDocker returns the local docker instance
-		metricsConfig: {
-			server: {
-				type: "Remote",
-				port: 4500,
-				token: "test-token",
-				urlCallback: "http://localhost/callback",
-				cronJob: "0 0 * * *",
-				retentionDays: 2,
-				refreshRate: 60,
-				thresholds: { cpu: 0, memory: 0 },
-			},
-			containers: { refreshRate: 60, services: { include: [], exclude: [] } },
-		},
-	}),
-}));
-
-vi.mock("@dokploy/server/services/settings", () => ({
-	getDokployImageTag: vi.fn(() => "latest"),
-}));
-
-vi.mock("@dokploy/server/utils/docker/utils", () => ({
-	pullImage: vi.fn().mockResolvedValue(undefined),
-	pullRemoteImage: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@dokploy/server/utils/process/execAsync", () => ({
-	execAsync: vi.fn().mockResolvedValue({ stdout: "", stderr: "" }),
-	execAsyncRemote: vi.fn().mockResolvedValue({ stdout: "", stderr: "" }),
-}));
-
-const containerExists = async (name: string) => {
-	try {
-		await docker.getContainer(name).inspect();
-		return true;
-	} catch (error: any) {
-		if (error.statusCode === 404) return false;
-		throw error;
-	}
-};
-
-const serviceExists = async (name: string) => {
-	try {
-		await docker.getService(name).inspect();
-		return true;
-	} catch (error: any) {
-		if (error.statusCode === 404) return false;
-		throw error;
-	}
-};
-
-// Swarm keeps converging a service for a bit after it's created (scheduling
-// tasks, resolving endpoints), which bumps Version.Index on its own. Calling
-// setupMonitoring again before that settles races that internal bump, so wait
-// for two consecutive reads to agree before treating the service as stable.
-const waitForServiceConvergence = async (name: string, timeoutMs = 5000) => {
-	const deadline = Date.now() + timeoutMs;
-	let lastIndex: string | null = null;
-	while (Date.now() < deadline) {
-		const inspect = await docker.getService(name).inspect();
-		if (inspect.Version.Index === lastIndex) return;
-		lastIndex = inspect.Version.Index;
-		await new Promise((resolve) => setTimeout(resolve, 50));
-	}
-};
-
-const swarmTaskNames = async () => {
-	const list = await docker.listContainers({ all: true });
-	return list
-		.flatMap((c) => c.Names.map((n) => n.replace(/^\//, "")))
-		.filter((n) => n.startsWith(`${SERVICE_NAME}.`));
-};
-
-const cleanup = async () => {
-	try {
-		await docker.getService(SERVICE_NAME).remove();
-	} catch {}
-	try {
-		await docker.getContainer(SERVICE_NAME).remove({ force: true });
-	} catch {}
-	for (const name of await swarmTaskNames()) {
-		try {
-			await docker.getContainer(name).remove({ force: true });
-		} catch {}
-	}
-};
-
-// Recreates the pre-v0.30.0 standalone agent stuck in a crash loop.
-const createLegacyZombie = async () => {
-	const container = await docker.createContainer({
-		name: SERVICE_NAME,
-		Image: TEST_IMAGE,
-		Cmd: [
-			"sh",
-			"-c",
-			"echo 'Error starting metrics cleanup system: empty spec string'; exit 1",
-		],
-		HostConfig: { RestartPolicy: { Name: "always" }, NetworkMode: "host" },
-	});
-	await container.start();
-};
-
-const pullTestImage = async () => {
-	try {
-		await docker.getImage(TEST_IMAGE).inspect();
-		return;
-	} catch {}
-	await new Promise<void>((resolve, reject) =>
-		docker.pull(TEST_IMAGE, (err: any, stream: any) =>
-			err
-				? reject(err)
-				: docker.modem.followProgress(stream, (e: any) =>
-						e ? reject(e) : resolve(),
-					),
-		),
-	);
-};
-
-// The code under test hardcodes the production name, so this suite cannot
-// namespace its fixtures. Skip rather than wipe a real agent on a Dokploy host.
-const hasRealMonitoring = () => {
-	const query = (cmd: string) => {
-		try {
-			return execSync(cmd, { stdio: ["ignore", "pipe", "ignore"] })
-				.toString()
-				.trim();
-		} catch {
-			return "";
-		}
-	};
-
-	return (
-		query(
-			`docker service ls --filter name=${SERVICE_NAME} --format '{{.Name}}'`,
-		) !== "" ||
-		query(
-			`docker ps -a --filter name=^${SERVICE_NAME}$ --format '{{.Names}}'`,
-		) !== ""
-	);
-};
-
-const hasDocker = () => {
-	try {
-		execSync("docker info", { stdio: "ignore" });
-		return true;
-	} catch {
-		return false;
-	}
-};
-
-describe.skipIf(!hasDocker() || hasRealMonitoring() || !process.env.CI)(
-	"setupMonitoring - legacy container cleanup (real docker)",
-	() => {
-		beforeEach(async () => {
-			await pullTestImage();
-			await cleanup();
-		}, REAL_TEST_TIMEOUT);
-
-		afterAll(async () => {
-			await cleanup();
-		}, REAL_TEST_TIMEOUT);
-
-		it(
-			"removes the legacy standalone container left behind by the swarm migration",
-			async () => {
-				await createLegacyZombie();
-				expect(await containerExists(SERVICE_NAME)).toBe(true);
-
-				await setupMonitoring("test-server");
-
-				expect(await containerExists(SERVICE_NAME)).toBe(false);
-				expect(await serviceExists(SERVICE_NAME)).toBe(true);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"removes the legacy container without touching swarm tasks, which are named dokploy-monitoring.<slot>.<id>",
-			async () => {
-				const taskName = `${SERVICE_NAME}.1.qh3ldvg2h9x0test`;
-				const task = await docker.createContainer({
-					name: taskName,
-					Image: TEST_IMAGE,
-					Cmd: ["sleep", "3600"],
-				});
-				await task.start();
-				await createLegacyZombie();
-
-				await setupMonitoring("test-server");
-
-				expect(await containerExists(SERVICE_NAME)).toBe(false);
-				expect(await containerExists(taskName)).toBe(true);
-				const inspect = await docker.getContainer(taskName).inspect();
-				expect(inspect.State.Running).toBe(true);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"is idempotent when no legacy container exists",
-			async () => {
-				expect(await containerExists(SERVICE_NAME)).toBe(false);
-
-				await expect(setupMonitoring("test-server")).resolves.not.toThrow();
-				await waitForServiceConvergence(SERVICE_NAME);
-				await expect(setupMonitoring("test-server")).resolves.not.toThrow();
-
-				expect(await serviceExists(SERVICE_NAME)).toBe(true);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"deploys the service even when removing the legacy container fails",
-			async () => {
-				const failingDocker = {
-					getContainer: () => ({
-						remove: async () => {
-							const error: any = new Error("device or resource busy");
-							error.statusCode = 500;
-							throw error;
-						},
-					}),
-					getService: docker.getService.bind(docker),
-					createService: docker.createService.bind(docker),
-				};
-
-				const remoteDocker = await import(
-					"@dokploy/server/utils/servers/remote-docker"
-				);
-				const spy = vi
-					.spyOn(remoteDocker, "getRemoteDocker")
-					.mockResolvedValue(failingDocker as any);
-
-				try {
-					await expect(setupMonitoring("test-server")).resolves.not.toThrow();
-					expect(spy).toHaveBeenCalled(); // guards against the spy silently not intercepting
-					expect(await serviceExists(SERVICE_NAME)).toBe(true);
-				} finally {
-					spy.mockRestore();
-				}
-			},
-			REAL_TEST_TIMEOUT,
-		);
-	},
-);

apps/dokploy/__test__/traefik/reconnect-services.test.ts

@@ -1,71 +0,0 @@
-import { reconnectServicesToTraefik } from "@dokploy/server/services/settings";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-	findMany: vi.fn(),
-	execAsync: vi.fn(),
-	execAsyncRemote: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/db", () => ({
-	db: {
-		query: {
-			compose: {
-				findMany: mocks.findMany,
-			},
-		},
-	},
-}));
-
-vi.mock("@dokploy/server/utils/process/execAsync", () => ({
-	execAsync: mocks.execAsync,
-	execAsyncRemote: mocks.execAsyncRemote,
-}));
-
-describe("reconnectServicesToTraefik", () => {
-	beforeEach(() => {
-		vi.clearAllMocks();
-		mocks.findMany.mockResolvedValue([]);
-	});
-
-	it("does not execute an empty local command when no isolated deployments exist", async () => {
-		await reconnectServicesToTraefik();
-
-		expect(mocks.execAsync).not.toHaveBeenCalled();
-	});
-
-	it("does not execute an empty remote command when no isolated deployments exist", async () => {
-		await reconnectServicesToTraefik("server-id");
-
-		expect(mocks.execAsyncRemote).not.toHaveBeenCalled();
-	});
-
-	it("reconnects isolated deployments to the local Traefik network", async () => {
-		mocks.findMany.mockResolvedValue([
-			{ appName: "first-compose" },
-			{ appName: "second-compose" },
-		]);
-
-		await reconnectServicesToTraefik();
-
-		expect(mocks.execAsync).toHaveBeenCalledOnce();
-		expect(mocks.execAsync).toHaveBeenCalledWith(
-			'docker network connect first-compose $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1\n' +
-				'docker network connect second-compose $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1\n',
-		);
-		expect(mocks.execAsyncRemote).not.toHaveBeenCalled();
-	});
-
-	it("reconnects isolated deployments on a remote server", async () => {
-		mocks.findMany.mockResolvedValue([{ appName: "remote-compose" }]);
-
-		await reconnectServicesToTraefik("server-id");
-
-		expect(mocks.execAsyncRemote).toHaveBeenCalledOnce();
-		expect(mocks.execAsyncRemote).toHaveBeenCalledWith(
-			"server-id",
-			'docker network connect remote-compose $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1\n',
-		);
-		expect(mocks.execAsync).not.toHaveBeenCalled();
-	});
-});

apps/dokploy/__test__/traefik/server/update-server-config.test.ts

@@ -60,7 +60,7 @@ const baseSettings: WebServerSettings = {
 		docsUrl: null,
 		errorPageTitle: null,
 		errorPageDescription: null,
-		ogImageUrl: null,
+		metaTitle: null,
 		footerText: null,
 	},
 	cleanupCacheApplications: false,

apps/dokploy/__test__/traefik/write-app-traefik-config.test.ts

@@ -1,121 +0,0 @@
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { writeAppTraefikConfig } from "@dokploy/server/utils/traefik/application";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-	execAsyncRemote: vi.fn(),
-	writeFileRemote: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/process/execAsync", async (importOriginal) => {
-	const actual =
-		await importOriginal<
-			typeof import("@dokploy/server/utils/process/execAsync")
-		>();
-	return {
-		...actual,
-		execAsyncRemote: mocks.execAsyncRemote,
-		writeFileRemote: mocks.writeFileRemote,
-	};
-});
-
-describe("writeAppTraefikConfig", () => {
-	let cwd: string;
-	let dynamicPath: string;
-
-	beforeEach(() => {
-		cwd = fs.mkdtempSync(path.join(os.tmpdir(), "dokploy-traefik-"));
-		dynamicPath = path.join(cwd, ".docker", "traefik", "dynamic");
-		fs.mkdirSync(dynamicPath, { recursive: true });
-		vi.spyOn(process, "cwd").mockReturnValue(cwd);
-		vi.clearAllMocks();
-	});
-
-	afterEach(() => {
-		vi.restoreAllMocks();
-		fs.rmSync(cwd, { recursive: true, force: true });
-	});
-
-	// Regression test for #5189: Traefik's file provider rejects a standalone
-	// `routers: {}` / `services: {}` map and aborts its watcher for every
-	// dynamic config once it hits one, so an app with no domains must never
-	// get an on-disk config file at all.
-	it("removes the file instead of writing empty routers/services", async () => {
-		const appName = "no-domain-app";
-		const configPath = path.join(dynamicPath, `${appName}.yml`);
-		fs.writeFileSync(configPath, "stale content", "utf8");
-
-		await writeAppTraefikConfig(
-			{ http: { routers: {}, services: {} } },
-			appName,
-		);
-
-		expect(fs.existsSync(configPath)).toBe(false);
-	});
-
-	it("writes the file when routers/services are present", async () => {
-		const appName = "with-domain-app";
-		const configPath = path.join(dynamicPath, `${appName}.yml`);
-
-		await writeAppTraefikConfig(
-			{
-				http: {
-					routers: {
-						[`${appName}-router-1`]: {
-							rule: "Host(`x`)",
-							service: `${appName}-service`,
-						},
-					},
-					services: {},
-				},
-			},
-			appName,
-		);
-
-		expect(fs.existsSync(configPath)).toBe(true);
-	});
-
-	it("removes the remote file instead of writing empty routers/services", async () => {
-		mocks.execAsyncRemote.mockResolvedValue({ stdout: "", stderr: "" });
-
-		await writeAppTraefikConfig(
-			{ http: { routers: {}, services: {} } },
-			"no-domain-app",
-			"server-id",
-		);
-
-		expect(mocks.execAsyncRemote).toHaveBeenCalledOnce();
-		const [, command] = mocks.execAsyncRemote.mock.calls[0] ?? [];
-		expect(command).toMatch(/^rm -f /);
-		expect(command).toContain("no-domain-app.yml");
-	});
-
-	it("writes the remote file when routers/services are present", async () => {
-		mocks.writeFileRemote.mockResolvedValue(undefined);
-
-		await writeAppTraefikConfig(
-			{
-				http: {
-					routers: {
-						"with-domain-app-router-1": {
-							rule: "Host(`x`)",
-							service: "with-domain-app-service",
-						},
-					},
-					services: {},
-				},
-			},
-			"with-domain-app",
-			"server-id",
-		);
-
-		expect(mocks.writeFileRemote).toHaveBeenCalledOnce();
-		const [serverId, remotePath, content] =
-			mocks.writeFileRemote.mock.calls[0] ?? [];
-		expect(serverId).toBe("server-id");
-		expect(remotePath).toContain("with-domain-app.yml");
-		expect(content).toContain("with-domain-app-router-1");
-	});
-});

apps/dokploy/__test__/utils/remote-stream.test.ts

@@ -1,60 +0,0 @@
-import { promises as fs } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { describe, expect, it, vi } from "vitest";
-
-vi.mock("@dokploy/server/services/server", () => ({
-	findServerById: vi.fn(),
-}));
-
-import { pipeBetweenServers } from "@dokploy/server/utils/process/remoteStream";
-
-describe("pipeBetweenServers", () => {
-	it("delivers a short source stream that ends before the target is ready", async () => {
-		const bytes = await pipeBetweenServers({
-			source: { serverId: null, command: "printf 'hello world'" },
-			target: { serverId: null, command: "sleep 0.3; cat > /dev/null" },
-		});
-		expect(bytes).toBe(11);
-	});
-
-	it("pipes data larger than the pipe buffer unchanged", async () => {
-		const dir = await fs.mkdtemp(path.join(os.tmpdir(), "pipe-"));
-		const source = path.join(dir, "src.bin");
-		const target = path.join(dir, "dst.bin");
-		const size = 1024 * 1024;
-		const progress: number[] = [];
-
-		const bytes = await pipeBetweenServers({
-			source: {
-				serverId: null,
-				command: `head -c ${size} /dev/urandom | tee '${source}'`,
-			},
-			target: { serverId: null, command: `cat > '${target}'` },
-			onProgress: (transferred) => progress.push(transferred),
-		});
-
-		expect(bytes).toBe(size);
-		expect(progress.at(-1)).toBe(size);
-		expect(await fs.readFile(target)).toEqual(await fs.readFile(source));
-		await fs.rm(dir, { recursive: true, force: true });
-	}, 30_000);
-
-	it("reports a target failure with its stderr", async () => {
-		await expect(
-			pipeBetweenServers({
-				source: { serverId: null, command: "printf x" },
-				target: { serverId: null, command: "echo boom >&2; exit 3" },
-			}),
-		).rejects.toThrow("target exited with code 3: boom");
-	});
-
-	it("reports a source failure", async () => {
-		await expect(
-			pipeBetweenServers({
-				source: { serverId: null, command: "exit 2" },
-				target: { serverId: null, command: "cat > /dev/null" },
-			}),
-		).rejects.toThrow("source exited with code 2");
-	});
-});

apps/dokploy/__test__/wss/authorize.test.ts

@@ -95,35 +95,10 @@ describe("canAccessTerminalOverWss", () => {
 	});
 
 	it("gates a remote server terminal on server access", async () => {
-		mockHasPermission.mockResolvedValue(true);
 		mockGetAccessibleServerIds.mockResolvedValue(new Set(["srv-1"]));
 		expect(await canAccessTerminalOverWss(USER, SESSION, "srv-1")).toBe(true);
 		expect(await canAccessTerminalOverWss(USER, SESSION, "srv-2")).toBe(false);
-		// the remote path must never fall through to the owner/admin local branch
+		// role lookup must not be needed for the remote path
 		expect(mockFindMember).not.toHaveBeenCalled();
 	});
-
-	it("denies a remote server terminal without the server.terminal permission", async () => {
-		// Reaching a server (to deploy on it) must not imply a root shell on it.
-		mockGetAccessibleServerIds.mockResolvedValue(new Set(["srv-1"]));
-		mockHasPermission.mockResolvedValue(false);
-		expect(await canAccessTerminalOverWss(USER, SESSION, "srv-1")).toBe(false);
-		expect(mockHasPermission).toHaveBeenCalledWith(
-			{ user: { id: USER.id }, session: { activeOrganizationId: "org-1" } },
-			{ server: ["terminal"] },
-		);
-	});
-
-	it("allows a remote server terminal with the server.terminal permission", async () => {
-		mockGetAccessibleServerIds.mockResolvedValue(new Set(["srv-1"]));
-		mockHasPermission.mockResolvedValue(true);
-		expect(await canAccessTerminalOverWss(USER, SESSION, "srv-1")).toBe(true);
-	});
-
-	it("does not check permissions for a server the caller cannot access", async () => {
-		mockGetAccessibleServerIds.mockResolvedValue(new Set(["srv-1"]));
-		mockHasPermission.mockResolvedValue(true);
-		expect(await canAccessTerminalOverWss(USER, SESSION, "srv-2")).toBe(false);
-		expect(mockHasPermission).not.toHaveBeenCalled();
-	});
 });

apps/dokploy/__test__/wss/readValidDirectory.test.ts

@@ -94,32 +94,4 @@ describe("readValidDirectory (path traversal)", () => {
 			),
 		).toBe(true);
 	});
-
-	it("returns true for SvelteKit routes with + prefix and @ symbols", () => {
-		expect(
-			readValidDirectory(
-				`${BASE}/applications/myapp/code/src/routes/+page.svelte`,
-			),
-		).toBe(true);
-		expect(
-			readValidDirectory(
-				`${BASE}/applications/myapp/code/src/routes/+layout.svelte`,
-			),
-		).toBe(true);
-		expect(
-			readValidDirectory(
-				`${BASE}/applications/myapp/code/src/routes/+server.ts`,
-			),
-		).toBe(true);
-		expect(
-			readValidDirectory(
-				`${BASE}/applications/myapp/code/src/routes/+error.svelte`,
-			),
-		).toBe(true);
-		expect(
-			readValidDirectory(
-				`${BASE}/applications/myapp/code/node_modules/@types/node/index.d.ts`,
-			),
-		).toBe(true);
-	});
 });

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/index.ts

@@ -8,3 +8,4 @@ export { RestartPolicyForm } from "./restart-policy-form";
 export { RollbackConfigForm } from "./rollback-config-form";
 export { StopGracePeriodForm } from "./stop-grace-period-form";
 export { UpdateConfigForm } from "./update-config-form";
+export { filterEmptyValues, hasValues } from "./utils";

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/utils.ts

@@ -0,0 +1,31 @@
+/**
+ * Filters out undefined, null, and empty string values from form data
+ * Only returns fields that have actual values
+ */
+export const filterEmptyValues = (
+	formData: Record<string, any>,
+): Record<string, any> => {
+	return Object.entries(formData).reduce(
+		(acc, [key, value]) => {
+			// Keep arrays even if empty (they might be intentionally cleared)
+			if (Array.isArray(value)) {
+				if (value.length > 0) {
+					acc[key] = value;
+				}
+			}
+			// For other values, filter out undefined, null, and empty strings
+			else if (value !== undefined && value !== null && value !== "") {
+				acc[key] = value;
+			}
+			return acc;
+		},
+		{} as Record<string, any>,
+	);
+};
+
+/**
+ * Checks if filtered data has any values to save
+ */
+export const hasValues = (data: Record<string, any>): boolean => {
+	return Object.keys(data).length > 0;
+};

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

@@ -342,7 +342,7 @@ export const ShowDeployments = ({
 											)}
 											{/* Hash (from description) - shown in compact form */}
 											{deployment.description?.trim() && (
-												<span className="wrap-anywhere text-xs text-muted-foreground font-mono">
+												<span className="text-xs text-muted-foreground font-mono">
 													{deployment.description}
 												</span>
 											)}

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

@@ -156,7 +156,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 			domainId,
 		},
 		{
-			enabled: isOpen && !!domainId,
+			enabled: !!domainId,
 		},
 	);
 
@@ -167,7 +167,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 						applicationId: id,
 					},
 					{
-						enabled: isOpen && !!id,
+						enabled: !!id,
 					},
 				)
 			: api.compose.one.useQuery(
@@ -175,7 +175,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 						composeId: id,
 					},
 					{
-						enabled: isOpen && !!id,
+						enabled: !!id,
 					},
 				);
 
@@ -187,14 +187,9 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 		api.domain.generateDomain.useMutation();
 
 	const { data: canGenerateTraefikMeDomains } =
-		api.domain.canGenerateTraefikMeDomains.useQuery(
-			{
-				serverId: application?.serverId || "",
-			},
-			{
-				enabled: isOpen,
-			},
-		);
+		api.domain.canGenerateTraefikMeDomains.useQuery({
+			serverId: application?.serverId || "",
+		});
 
 	const {
 		data: services,
@@ -209,7 +204,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 		{
 			retry: false,
 			refetchOnWindowFocus: false,
-			enabled: isOpen && type === "compose" && !!id,
+			enabled: type === "compose" && !!id,
 		},
 	);
 

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

@@ -191,7 +191,8 @@ export const ShowDomains = ({ id, type }: Props) => {
 		try {
 			const result = await validateDomain({
 				domain: host,
-				serverId: application?.serverId ?? undefined,
+				serverIp:
+					application?.server?.ipAddress?.toString() || ip?.toString() || "",
 			});
 
 			setValidationStates((prev) => ({

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

@@ -6,7 +6,6 @@ import { toast } from "sonner";
 import { z } from "zod";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { useEnvCompletionSource } from "@/components/shared/env-autocomplete";
-import { VaultImportDialog } from "@/components/shared/vault-import-dialog";
 import { Button } from "@/components/ui/button";
 import {
 	Card,
@@ -198,18 +197,6 @@ export const ShowEnvironment = ({ id, type }: Props) => {
 								name="environment"
 								render={({ field }) => (
 									<FormItem>
-										<div className="flex justify-end">
-											<VaultImportDialog
-												projectId={data?.environment?.projectId}
-												environmentId={data?.environment?.environmentId}
-												currentEnv={field.value ?? ""}
-												onImport={(next) =>
-													form.setValue("environment", next, {
-														shouldDirty: true,
-													})
-												}
-											/>
-										</div>
 										<FormControl className="">
 											<CodeEditor
 												style={

apps/dokploy/components/dashboard/application/environment/show.tsx

@@ -151,8 +151,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 						}
 						placeholder={["NODE_ENV=production", "PORT=3000"].join("\n")}
 						completionSource={completionSource}
-						projectId={data?.environment?.projectId}
-						environmentId={data?.environment?.environmentId}
 					/>
 					{data?.buildType === "dockerfile" && (
 						<Secrets

apps/dokploy/components/dashboard/application/icon/show-icon-settings.tsx

@@ -1,3 +1,4 @@
+import DOMPurify from "dompurify";
 import { CircuitBoard, GlobeIcon, Pencil, Search, X } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
@@ -13,7 +14,6 @@ import { Dropzone } from "@/components/ui/dropzone";
 import { Input } from "@/components/ui/input";
 import { type BundledIcon, bundledIcons } from "@/lib/bundled-icons";
 import { api } from "@/utils/api";
-import { sanitizeSvg } from "@/utils/sanitize-svg";
 
 interface ShowIconSettingsProps {
 	serviceId: string;
@@ -89,6 +89,15 @@ export const ShowIconSettings = ({
 		}
 	};
 
+	const sanitizeSvg = (svgContent: string): string | null => {
+		const clean = DOMPurify.sanitize(svgContent, {
+			USE_PROFILES: { svg: true, svgFilters: true },
+			ADD_TAGS: ["use"],
+		});
+		if (!clean) return null;
+		return `data:image/svg+xml;base64,${btoa(clean)}`;
+	};
+
 	const handleFileUpload = async (files: FileList | null) => {
 		if (!files || files.length === 0) return;
 		const file = files[0];

apps/dokploy/components/dashboard/application/logs/show.tsx

@@ -1,7 +1,6 @@
 import { Loader2 } from "lucide-react";
 import dynamic from "next/dynamic";
 import { useEffect, useState } from "react";
-import { resolveContainerSelection } from "@/components/dashboard/docker/logs/utils";
 import { Badge } from "@/components/ui/badge";
 import {
 	Card,
@@ -80,13 +79,17 @@ export const ShowDockerLogs = ({ appName, serverId, serviceId }: Props) => {
 			},
 		);
 
-	const availableContainers = option === "native" ? containers : services;
-
 	useEffect(() => {
-		setContainerId((currentContainerId) =>
-			resolveContainerSelection(currentContainerId, availableContainers),
-		);
-	}, [availableContainers]);
+		if (option === "native") {
+			if (containers && containers?.length > 0) {
+				setContainerId(containers[0]?.containerId);
+			}
+		} else {
+			if (services && services?.length > 0) {
+				setContainerId(services[0]?.containerId);
+			}
+		}
+	}, [option, services, containers]);
 
 	const isLoading = option === "native" ? containersLoading : servicesLoading;
 	const containersLength =
@@ -102,7 +105,7 @@ export const ShowDockerLogs = ({ appName, serverId, serviceId }: Props) => {
 			</CardHeader>
 
 			<CardContent className="flex flex-col gap-4">
-				<div className="flex flex-col sm:flex-row justify-between sm:items-center gap-2">
+				<div className="flex flex-row justify-between items-center gap-2">
 					<Label>Select a container to view logs</Label>
 					<div className="flex flex-row gap-2 items-center">
 						<span className="text-sm text-muted-foreground">
@@ -111,7 +114,6 @@ export const ShowDockerLogs = ({ appName, serverId, serviceId }: Props) => {
 						<Switch
 							checked={option === "native"}
 							onCheckedChange={(checked) => {
-								setContainerId(undefined);
 								setOption(checked ? "native" : "swarm");
 							}}
 						/>

apps/dokploy/components/dashboard/billing/trial-banner.tsx

@@ -1,34 +0,0 @@
-import { Rocket } from "lucide-react";
-import { useRouter } from "next/router";
-import { Button } from "@/components/ui/button";
-import { api } from "@/utils/api";
-
-export const TrialBanner = () => {
-	const router = useRouter();
-	const { data: billingStatus } = api.stripe.getBillingStatus.useQuery();
-
-	if (!billingStatus?.isOnTrial) {
-		return null;
-	}
-
-	const daysRemaining = billingStatus.trialDaysRemaining ?? 0;
-
-	return (
-		<div className="sticky top-0 z-20 mx-4 mt-4 flex flex-wrap items-center justify-center gap-x-3 gap-y-2 rounded-lg border border-primary/20 bg-primary/10 px-4 py-2 text-sm">
-			<span className="flex items-center gap-2">
-				<Rocket className="h-4 w-4 text-primary shrink-0" />
-				{daysRemaining > 0
-					? `You have ${daysRemaining} day${daysRemaining === 1 ? "" : "s"} left in your free trial.`
-					: "Your free trial ends today."}
-			</span>
-			<Button
-				size="sm"
-				variant="default"
-				className="h-7"
-				onClick={() => router.push("/dashboard/settings/billing")}
-			>
-				Upgrade now
-			</Button>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/compose/advanced/add-command.tsx

@@ -22,7 +22,6 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 
 interface Props {
@@ -31,7 +30,6 @@ interface Props {
 
 const AddRedirectSchema = z.object({
 	command: z.string(),
-	pullImages: z.boolean(),
 });
 
 type AddCommand = z.infer<typeof AddRedirectSchema>;
@@ -59,25 +57,22 @@ export const AddCommandCompose = ({ composeId }: Props) => {
 	const form = useForm<AddCommand>({
 		defaultValues: {
 			command: "",
-			pullImages: false,
 		},
 		resolver: zodResolver(AddRedirectSchema),
 	});
 
 	useEffect(() => {
-		if (data) {
+		if (data?.command) {
 			form.reset({
-				command: data.command || "",
-				pullImages: data.pullImages ?? false,
+				command: data?.command || "",
 			});
 		}
-	}, [form, form.reset, form.formState.isSubmitSuccessful, data]);
+	}, [form, form.reset, form.formState.isSubmitSuccessful, data?.command]);
 
-	const onSubmit = async (formData: AddCommand) => {
+	const onSubmit = async (data: AddCommand) => {
 		await mutateAsync({
 			composeId,
-			command: formData.command,
-			pullImages: formData.pullImages,
+			command: data?.command,
 		})
 			.then(async () => {
 				toast.success("Command Updated");
@@ -114,30 +109,6 @@ export const AddCommandCompose = ({ composeId }: Props) => {
 							<strong>docker</strong>.
 						</AlertBlock>
 						<div className="flex flex-col gap-4">
-							{data?.composeType === "docker-compose" && (
-								<FormField
-									control={form.control}
-									name="pullImages"
-									render={({ field }) => (
-										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-xs">
-											<div className="space-y-0.5">
-												<FormLabel>Pull latest images on deploy</FormLabel>
-												<FormDescription>
-													Adds <strong>--pull always</strong> to the default
-													command so every deploy fetches the newest image for
-													each tag. Has no effect when a custom command is set.
-												</FormDescription>
-											</div>
-											<FormControl>
-												<Switch
-													checked={field.value}
-													onCheckedChange={field.onChange}
-												/>
-											</FormControl>
-										</FormItem>
-									)}
-								/>
-							)}
 							<FormField
 								control={form.control}
 								name="command"

apps/dokploy/components/dashboard/compose/advanced/fresh-volumes.tsx

@@ -1,216 +0,0 @@
-import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-import copy from "copy-to-clipboard";
-import { AlertTriangle, Copy, HardDriveDownload } from "lucide-react";
-import { useRouter } from "next/router";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-	Form,
-	FormControl,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-const freshVolumesSchema = z.object({
-	confirmName: z.string().min(1, {
-		message: "Compose name is required",
-	}),
-});
-
-type FreshVolumesForm = z.infer<typeof freshVolumesSchema>;
-
-interface Props {
-	composeId: string;
-}
-
-export const FreshVolumes = ({ composeId }: Props) => {
-	const router = useRouter();
-	const [isOpen, setIsOpen] = useState(false);
-	const { data: permissions } = api.user.getPermissions.useQuery();
-	const canDeploy = permissions?.deployment.create ?? false;
-	const { data, refetch } = api.compose.one.useQuery(
-		{ composeId },
-		{ enabled: !!composeId },
-	);
-	const { mutateAsync: deploy, isPending } = api.compose.deploy.useMutation();
-
-	const form = useForm<FreshVolumesForm>({
-		defaultValues: { confirmName: "" },
-		resolver: zodResolver(freshVolumesSchema),
-	});
-
-	const expectedName = `${data?.name}/${data?.appName}`;
-	const isRunning = data?.composeStatus === "running";
-
-	const onSubmit = async (formData: FreshVolumesForm) => {
-		if (formData.confirmName !== expectedName) {
-			form.setError("confirmName", {
-				message: `Compose name must match "${expectedName}"`,
-			});
-			return;
-		}
-		await deploy({ composeId, freshVolumes: true })
-			.then(() => {
-				toast.success("Compose deployed with fresh volumes");
-				setIsOpen(false);
-				form.reset();
-				refetch();
-				router.push(
-					`/dashboard/project/${data?.environment.projectId}/environment/${data?.environmentId}/services/compose/${composeId}?tab=deployments`,
-				);
-			})
-			.catch(() => {
-				toast.error("Error deploying compose");
-			});
-	};
-
-	if (!canDeploy || data?.composeType !== "docker-compose") return null;
-
-	return (
-		<Card className="bg-background border-destructive/50">
-			<CardHeader>
-				<CardTitle className="text-xl flex items-center gap-2">
-					<AlertTriangle className="h-5 w-5 text-destructive" />
-					Danger Zone
-				</CardTitle>
-			</CardHeader>
-			<CardContent>
-				<div className="flex flex-col gap-4">
-					<div className="flex flex-col gap-2">
-						<h3 className="text-base font-semibold">
-							Deploy with Fresh Volumes
-						</h3>
-						<p className="text-sm text-muted-foreground">
-							Permanently wipes every volume of this compose and redeploys it
-							from a clean state. All persistent data (databases, uploads,
-							caches) will be lost.
-						</p>
-					</div>
-					<Dialog
-						open={isOpen}
-						onOpenChange={(open) => {
-							setIsOpen(open);
-							if (!open) form.reset();
-						}}
-					>
-						<DialogTrigger asChild>
-							<Button
-								isLoading={isPending}
-								variant="outline"
-								className="w-full border-destructive/50 hover:bg-destructive/10 hover:text-destructive text-destructive"
-							>
-								<HardDriveDownload className="mr-2 h-4 w-4" />
-								Deploy with Fresh Volumes
-							</Button>
-						</DialogTrigger>
-						<DialogContent className="sm:max-w-lg">
-							<DialogHeader>
-								<DialogTitle className="flex items-center gap-2">
-									<AlertTriangle className="h-5 w-5 text-destructive" />
-									Are you absolutely sure?
-								</DialogTitle>
-								<DialogDescription asChild>
-									<div className="space-y-2">
-										<p>This action will:</p>
-										<ul className="list-disc list-inside space-y-1">
-											<li>Stop the current compose</li>
-											<li>Delete all volumes and their data</li>
-											<li>Redeploy the compose with empty volumes</li>
-										</ul>
-										<p className="font-medium text-destructive mt-4">
-											This action cannot be undone.
-										</p>
-									</div>
-								</DialogDescription>
-							</DialogHeader>
-							<Form {...form}>
-								<form
-									onSubmit={form.handleSubmit(onSubmit)}
-									id="hook-form-fresh-volumes"
-									className="grid w-full gap-4"
-								>
-									<FormField
-										control={form.control}
-										name="confirmName"
-										render={({ field }) => (
-											<FormItem>
-												<FormLabel className="flex items-center gap-2">
-													<span>
-														To confirm, type{" "}
-														<Badge
-															className="p-2 rounded-md ml-1 mr-1 hover:border-primary hover:text-primary-foreground hover:bg-primary hover:cursor-pointer"
-															variant="outline"
-															onClick={() => {
-																if (data?.name && data?.appName) {
-																	copy(expectedName);
-																	toast.success(
-																		"Copied to clipboard. Be careful!",
-																	);
-																}
-															}}
-														>
-															{expectedName}&nbsp;
-															<Copy className="h-4 w-4 ml-1 text-muted-foreground" />
-														</Badge>{" "}
-														in the box below:
-													</span>
-												</FormLabel>
-												<FormControl>
-													<Input
-														placeholder="Enter compose name to confirm"
-														autoComplete="off"
-														{...field}
-													/>
-												</FormControl>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								</form>
-							</Form>
-							{isRunning && (
-								<AlertBlock type="warning" className="w-full">
-									Cannot deploy with fresh volumes while a deployment is
-									running. Please wait for it to finish and then try again.
-								</AlertBlock>
-							)}
-							<DialogFooter>
-								<Button variant="secondary" onClick={() => setIsOpen(false)}>
-									Cancel
-								</Button>
-								<Button
-									isLoading={isPending}
-									disabled={isRunning}
-									form="hook-form-fresh-volumes"
-									type="submit"
-									variant="destructive"
-								>
-									Wipe volumes and deploy
-								</Button>
-							</DialogFooter>
-						</DialogContent>
-					</Dialog>
-				</div>
-			</CardContent>
-		</Card>
-	);
-};

apps/dokploy/components/dashboard/compose/logs/show-stack.tsx

@@ -2,7 +2,6 @@ import { Loader2 } from "lucide-react";
 import dynamic from "next/dynamic";
 import { useEffect, useState } from "react";
 import { badgeStateColor } from "@/components/dashboard/application/logs/show";
-import { resolveContainerSelection } from "@/components/dashboard/docker/logs/utils";
 import { Badge } from "@/components/ui/badge";
 import {
 	Card,
@@ -55,7 +54,6 @@ export const ShowDockerLogsStack = ({
 			},
 			{
 				enabled: !!appName && option === "swarm",
-				refetchInterval: 5000,
 			},
 		);
 
@@ -68,18 +66,22 @@ export const ShowDockerLogsStack = ({
 			},
 			{
 				enabled: !!appName && option === "native",
-				refetchInterval: 5000,
 			},
 		);
 
 	const containers = data?.filter((container) => container.containerId);
-	const availableContainers = option === "native" ? containers : services;
 
 	useEffect(() => {
-		setContainerId((currentContainerId) =>
-			resolveContainerSelection(currentContainerId, availableContainers),
-		);
-	}, [availableContainers]);
+		if (option === "native") {
+			if (containers && containers?.length > 0) {
+				setContainerId(containers[0]?.containerId);
+			}
+		} else {
+			if (services && services?.length > 0) {
+				setContainerId(services[0]?.containerId);
+			}
+		}
+	}, [option, services, containers]);
 
 	const isLoading = option === "native" ? containersLoading : servicesLoading;
 	const containersLength =
@@ -104,7 +106,6 @@ export const ShowDockerLogsStack = ({
 						<Switch
 							checked={option === "native"}
 							onCheckedChange={(checked) => {
-								setContainerId(undefined);
 								setOption(checked ? "native" : "swarm");
 							}}
 						/>

apps/dokploy/components/dashboard/compose/logs/show.tsx

@@ -2,7 +2,6 @@ import { Loader2 } from "lucide-react";
 import dynamic from "next/dynamic";
 import { useEffect, useState } from "react";
 import { badgeStateColor } from "@/components/dashboard/application/logs/show";
-import { resolveContainerSelection } from "@/components/dashboard/docker/logs/utils";
 import { Badge } from "@/components/ui/badge";
 import {
 	Card,
@@ -53,15 +52,14 @@ export const ShowDockerLogsCompose = ({
 		},
 		{
 			enabled: !!appName,
-			refetchInterval: 5000,
 		},
 	);
 	const [containerId, setContainerId] = useState<string | undefined>();
 
 	useEffect(() => {
-		setContainerId((currentContainerId) =>
-			resolveContainerSelection(currentContainerId, data),
-		);
+		if (data && data?.length > 0) {
+			setContainerId(data[0]?.containerId);
+		}
 	}, [data]);
 
 	return (

apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx

@@ -352,11 +352,11 @@ export const DockerLogsId: React.FC<Props> = ({
 							/>
 						</div>
 
-						<div className="flex flex-wrap gap-2">
+						<div className="flex gap-2">
 							<Button
 								variant="outline"
 								size="sm"
-								className="h-9 w-full sm:w-auto"
+								className="h-9"
 								onClick={handlePauseResume}
 								title={isPaused ? "Resume logs" : "Pause logs"}
 							>
@@ -372,7 +372,7 @@ export const DockerLogsId: React.FC<Props> = ({
 							<Button
 								variant="outline"
 								size="sm"
-								className="h-9 w-full sm:w-auto"
+								className="h-9"
 								onClick={handleCopy}
 								disabled={filteredLogs.length === 0}
 								title="Copy logs to clipboard"
@@ -389,7 +389,7 @@ export const DockerLogsId: React.FC<Props> = ({
 							<Button
 								variant="outline"
 								size="sm"
-								className="h-9 w-full sm:w-auto"
+								className="h-9 sm:w-auto w-full"
 								onClick={handleDownload}
 								disabled={filteredLogs.length === 0 || !data?.Name}
 								title="Download logs as text file"
@@ -418,7 +418,7 @@ export const DockerLogsId: React.FC<Props> = ({
 					<div
 						ref={scrollRef}
 						onScroll={handleScroll}
-						className="h-[50vh] sm:h-[720px] overflow-y-auto space-y-0 border p-4 bg-[#fafafa] dark:bg-[#050506] rounded custom-logs-scrollbar"
+						className="h-[720px] overflow-y-auto space-y-0 border p-4 bg-[#fafafa] dark:bg-[#050506] rounded custom-logs-scrollbar"
 					>
 						{filteredLogs.length > 0 ? (
 							filteredLogs.map((filteredLog: LogLine, index: number) => (

apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx

@@ -64,9 +64,7 @@ export function TerminalLine({ log, noTimestamp, searchTerm }: LogLineProps) {
 
 	const tooltip = (color: string, timestamp: string | null) => {
 		const square = (
-			<div
-				className={cn("w-2 min-h-4 h-full flex-shrink-0 rounded-[3px]", color)}
-			/>
+			<div className={cn("w-2 h-full shrink-0 rounded-[3px]", color)} />
 		);
 		return timestamp ? (
 			<TooltipProvider delayDuration={0} disableHoverableContent>
@@ -90,7 +88,7 @@ export function TerminalLine({ log, noTimestamp, searchTerm }: LogLineProps) {
 	return (
 		<div
 			className={cn(
-				"font-mono text-xs flex flex-col sm:flex-row gap-1 sm:gap-3 py-2 sm:py-0.5 group",
+				"font-mono text-xs flex flex-row gap-3 py-2 sm:py-0.5 group",
 				type === "error"
 					? "bg-red-500/10 hover:bg-red-500/15"
 					: type === "warning"
@@ -106,7 +104,7 @@ export function TerminalLine({ log, noTimestamp, searchTerm }: LogLineProps) {
 				{/* <Square className="size-4 text-muted-foreground opacity-0 group-hover/logitem:opacity-100 transition-opacity" /> */}
 				{tooltip(color, rawTimestamp)}
 				{!noTimestamp && (
-					<span className="select-none pl-2 text-muted-foreground w-auto sm:w-40 flex-shrink-0">
+					<span className="select-none pl-2 text-muted-foreground w-full sm:w-40 shrink-0">
 						{formattedTime}
 					</span>
 				)}

apps/dokploy/components/dashboard/docker/logs/utils.ts

@@ -7,28 +7,6 @@ export interface LogLine {
 	message: string;
 }
 
-interface ContainerOption {
-	containerId: string;
-}
-
-export const resolveContainerSelection = (
-	currentContainerId: string | undefined,
-	containers: readonly ContainerOption[] | undefined,
-) => {
-	if (!containers) {
-		return currentContainerId;
-	}
-
-	if (
-		currentContainerId &&
-		containers.some(({ containerId }) => containerId === currentContainerId)
-	) {
-		return currentContainerId;
-	}
-
-	return containers[0]?.containerId;
-};
-
 interface LogStyle {
 	type: LogType;
 	variant: LogVariant;

apps/dokploy/components/dashboard/docker/show/show-containers.tsx

@@ -114,7 +114,7 @@ export const ShowContainers = ({ serverId }: Props) => {
 					</CardHeader>
 					<CardContent className="space-y-2 py-8 border-t">
 						<div className="gap-4 pb-20 w-full">
-							<div className="flex flex-col gap-4 w-full overflow-auto">
+							<div className="flex flex-col gap-4  w-full overflow-auto">
 								<div className="flex items-center gap-2 max-sm:flex-wrap">
 									<Input
 										placeholder="Filter by name..."

apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx

@@ -1,6 +1,5 @@
 import { formatMb } from "@dokploy/server/monitoring/units";
 import { useEffect, useState } from "react";
-import { toast } from "sonner";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Progress } from "@/components/ui/progress";
 import { api } from "@/utils/api";
@@ -168,8 +167,6 @@ export const ContainerFreeMonitoring = ({
 	}, [data]);
 
 	useEffect(() => {
-		if (!appName) return;
-
 		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
 		const wsUrl = `${protocol}//${window.location.host}/listen-docker-stats-monitoring?appName=${appName}&appType=${appType}`;
 		const ws = new WebSocket(wsUrl);
@@ -199,9 +196,7 @@ export const ContainerFreeMonitoring = ({
 		};
 
 		ws.onclose = (e) => {
-			if (e.reason) {
-				toast.error(e.reason);
-			}
+			console.log(e.reason);
 		};
 
 		return () => ws.close();

apps/dokploy/components/dashboard/monitoring/paid/servers/network-chart.tsx

@@ -19,11 +19,6 @@ interface NetworkChartProps {
 	data: any[];
 }
 
-function formatNetworkGB(valueInMB: number) {
-	if (Number.isNaN(valueInMB)) return "0";
-	return (valueInMB / 1024).toFixed(1);
-}
-
 const chartConfig = {
 	networkIn: {
 		label: "Network In",
@@ -43,8 +38,8 @@ export function NetworkChart({ data }: NetworkChartProps) {
 			<CardHeader className="border-b py-5">
 				<CardTitle>Network</CardTitle>
 				<CardDescription>
-					Network Total: ↑ {formatNetworkGB(latestData.networkOut)} GB ↓{" "}
-					{formatNetworkGB(latestData.networkIn)} GB (since Boot)
+					Network Traffic: ↑ {latestData.networkOut} KB/s ↓{" "}
+					{latestData.networkIn} KB/s
 				</CardDescription>
 			</CardHeader>
 			<CardContent className="px-2 pt-4 sm:px-6 sm:pt-6">
@@ -88,7 +83,7 @@ export function NetworkChart({ data }: NetworkChartProps) {
 							minTickGap={32}
 							tickFormatter={(value) => formatTimestamp(value)}
 						/>
-						<YAxis tickFormatter={(value) => `${formatNetworkGB(value)} GB`} />
+						<YAxis tickFormatter={(value) => `${value} KB/s`} />
 						<ChartTooltip
 							cursor={false}
 							content={({ active, payload, label }) => {
@@ -110,8 +105,8 @@ export function NetworkChart({ data }: NetworkChartProps) {
 														Network
 													</span>
 													<span className="font-bold">
-														↑ {formatNetworkGB(data.networkOut)} GB
-														<br />↓ {formatNetworkGB(data.networkIn)} GB
+														↑ {data.networkOut} KB/s
+														<br />↓ {data.networkIn} KB/s
 													</span>
 												</div>
 											</div>

apps/dokploy/components/dashboard/networks/sync-networks.tsx

@@ -34,7 +34,6 @@ export const SyncNetworks = ({ serverId }: Props) => {
 	const importMutation = api.network.import.useMutation();
 	const removeMutation = api.network.remove.useMutation();
 	const recreateMutation = api.network.recreate.useMutation();
-	const resyncMutation = api.network.resync.useMutation();
 
 	const toggleSelected = (name: string) => {
 		setSelected((prev) => {
@@ -103,20 +102,6 @@ export const SyncNetworks = ({ serverId }: Props) => {
 		}
 	};
 
-	const onResync = async (networkId: string, name: string) => {
-		try {
-			await resyncMutation.mutateAsync({ networkId });
-			toast.success(`Network "${name}" updated from Docker`);
-			await utils.network.all.invalidate();
-			await utils.network.networksToSync.invalidate();
-			await refetch();
-		} catch (error) {
-			toast.error("Error updating network", {
-				description: error instanceof Error ? error.message : "Unknown error",
-			});
-		}
-	};
-
 	return (
 		<Dialog
 			open={open}
@@ -192,45 +177,6 @@ export const SyncNetworks = ({ serverId }: Props) => {
 							)}
 						</div>
 
-						{!!data?.changed.length && (
-							<>
-								<Separator />
-								<div className="flex flex-col gap-2">
-									<span className="text-sm font-medium">
-										Changed ({data.changed.length})
-									</span>
-									<span className="text-xs text-muted-foreground">
-										These networks were deleted and recreated in Docker under
-										the same name — attributes in Dokploy are outdated.
-									</span>
-									{data.changed.map((changed) => (
-										<div
-											key={changed.networkId}
-											className="flex items-center justify-between gap-3 rounded-lg border border-dashed p-3"
-										>
-											<div className="flex items-center gap-3">
-												<span className="text-sm">{changed.name}</span>
-												{changed.driver && (
-													<Badge variant="outline">{changed.driver}</Badge>
-												)}
-											</div>
-											<Button
-												variant="outline"
-												size="xs"
-												isLoading={resyncMutation.isPending}
-												onClick={() =>
-													onResync(changed.networkId, changed.name)
-												}
-											>
-												<RotateCcw className="size-3.5" />
-												Update
-											</Button>
-										</div>
-									))}
-								</div>
-							</>
-						)}
-
 						{!!data?.missing.length && (
 							<>
 								<Separator />

apps/dokploy/components/dashboard/onboarding/font.ts

@@ -1,8 +0,0 @@
-import { Fraunces } from "next/font/google";
-
-export const displayFont = Fraunces({
-	subsets: ["latin"],
-	weight: ["600"],
-	style: ["normal", "italic"],
-	display: "swap",
-});

apps/dokploy/components/dashboard/onboarding/onboarding-lock.ts

@@ -1,49 +0,0 @@
-const ONBOARDING_ACTIVE_KEY = "dokploy_onboarding_active";
-const ONBOARDING_STATE_KEY = "dokploy_onboarding_state";
-
-interface OnboardingState {
-	stepId?: string;
-	projectId?: string;
-	environmentId?: string;
-}
-
-export const isOnboardingActive = () => {
-	if (typeof window === "undefined") return false;
-	try {
-		return window.localStorage.getItem(ONBOARDING_ACTIVE_KEY) === "true";
-	} catch {
-		return false;
-	}
-};
-
-export const markOnboardingActive = () => {
-	try {
-		window.localStorage.setItem(ONBOARDING_ACTIVE_KEY, "true");
-	} catch {}
-};
-
-export const clearOnboardingActive = () => {
-	try {
-		window.localStorage.removeItem(ONBOARDING_ACTIVE_KEY);
-		window.localStorage.removeItem(ONBOARDING_STATE_KEY);
-	} catch {}
-};
-
-export const getOnboardingState = (): OnboardingState => {
-	if (typeof window === "undefined") return {};
-	try {
-		const raw = window.localStorage.getItem(ONBOARDING_STATE_KEY);
-		return raw ? JSON.parse(raw) : {};
-	} catch {
-		return {};
-	}
-};
-
-export const setOnboardingState = (state: OnboardingState) => {
-	try {
-		window.localStorage.setItem(
-			ONBOARDING_STATE_KEY,
-			JSON.stringify({ ...getOnboardingState(), ...state }),
-		);
-	} catch {}
-};

apps/dokploy/components/dashboard/onboarding/onboarding-wizard.tsx

@@ -1,295 +0,0 @@
-import { defineStepper } from "@stepperize/react";
-import { CheckIcon } from "lucide-react";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
-import { GithubIcon } from "@/components/icons/data-tools-icons";
-import { Logo } from "@/components/shared/logo";
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-} from "@/components/ui/dialog";
-import { api } from "@/utils/api";
-import { getOnboardingState, setOnboardingState } from "./onboarding-lock";
-import { CompleteStep } from "./steps/complete-step";
-import { DeployStep } from "./steps/deploy-step";
-import { PlanStep } from "./steps/plan-step";
-import { ProjectStep } from "./steps/project-step";
-import { ServerStep } from "./steps/server-step";
-import { WelcomeStep } from "./steps/welcome-step";
-
-const { useStepper, steps, Scoped } = defineStepper(
-	{ id: "welcome", title: "Welcome" },
-	{ id: "plan", title: "Pick a plan" },
-	{ id: "project", title: "New project" },
-	{ id: "server", title: "Connect server" },
-	{ id: "deploy", title: "Ship something" },
-	{ id: "complete", title: "You're live" },
-);
-
-type StepId = (typeof steps)[number]["id"];
-const isStepId = (id: string | undefined): id is StepId =>
-	!!id && steps.some((step) => step.id === id);
-
-interface Props {
-	onClose: () => void | Promise<void>;
-}
-
-export const OnboardingWizard = ({ onClose }: Props) => {
-	const router = useRouter();
-	const persisted = getOnboardingState();
-	const stepper = useStepper(
-		isStepId(persisted.stepId) ? persisted.stepId : undefined,
-	);
-	const [projectId, setProjectId] = useState<string | undefined>(
-		persisted.projectId,
-	);
-	const [environmentId, setEnvironmentId] = useState<string | undefined>(
-		persisted.environmentId,
-	);
-
-	const { data: isCloud = true } = api.settings.isCloud.useQuery();
-	const visibleStepIds = isCloud
-		? steps.map((step) => step.id)
-		: steps
-				.filter((step) => step.id !== "plan" && step.id !== "server")
-				.map((step) => step.id);
-	const visibleIndex = visibleStepIds.indexOf(stepper.current.id);
-	const isLastVisible = visibleIndex === visibleStepIds.length - 1;
-	const goToNextVisible = () => {
-		const nextId = visibleStepIds[visibleIndex + 1];
-		if (nextId) stepper.goTo(nextId);
-	};
-
-	const [skipAllOpen, setSkipAllOpen] = useState(false);
-	const handleSkipAll = async () => {
-		await onClose();
-		router.push(
-			projectId && environmentId
-				? `/dashboard/project/${projectId}/environment/${environmentId}`
-				: "/dashboard/projects",
-		);
-	};
-
-	useEffect(() => {
-		setOnboardingState({ stepId: stepper.current.id });
-	}, [stepper.current.id]);
-
-	const { error: projectCheckError } = api.project.one.useQuery(
-		{ projectId: projectId ?? "" },
-		{ enabled: !!projectId, retry: false },
-	);
-	useEffect(() => {
-		if (!projectCheckError || !projectId) return;
-		setProjectId(undefined);
-		setEnvironmentId(undefined);
-		setOnboardingState({ projectId: undefined, environmentId: undefined });
-		stepper.goTo("project");
-	}, [projectCheckError, projectId]);
-
-	return (
-		<>
-			<div className="fixed inset-0 z-50 flex flex-col md:flex-row bg-background text-foreground">
-				<aside className="relative shrink-0 md:w-[300px] lg:w-[340px] overflow-hidden bg-zinc-950 text-zinc-400">
-					<div
-						className="pointer-events-none absolute inset-0 opacity-[0.07]"
-						style={{
-							backgroundImage:
-								"linear-gradient(to right, white 1px, transparent 1px), linear-gradient(to bottom, white 1px, transparent 1px)",
-							backgroundSize: "28px 28px",
-						}}
-					/>
-					<div className="pointer-events-none absolute -top-24 -left-24 size-72 rounded-full bg-white/10 blur-[100px]" />
-
-					<div className="relative flex md:h-full flex-col p-6 lg:p-8">
-						<div className="flex items-center justify-between md:block">
-							<div className="flex items-center gap-2.5 text-zinc-50 [&_path]:!fill-white [&_path]:!stroke-white">
-								<Logo className="size-7" />
-								<span className="text-lg font-semibold tracking-tight">
-									Dokploy
-								</span>
-							</div>
-							{!isLastVisible && (
-								<button
-									type="button"
-									onClick={() => setSkipAllOpen(true)}
-									className="font-mono text-[11px] uppercase tracking-wider text-zinc-400 hover:text-zinc-100 transition-colors md:hidden"
-								>
-									Skip all
-								</button>
-							)}
-						</div>
-
-						<Scoped>
-							<ol className="hidden md:flex flex-col gap-0.5 mt-12">
-								{visibleStepIds.map((id, index) => {
-									const step = steps.find((s) => s.id === id)!;
-									const isDone = index < visibleIndex;
-									const isCurrent = stepper.current.id === step.id;
-									return (
-										<li key={step.id} className="flex gap-3.5">
-											<div className="flex flex-col items-center">
-												<span
-													className={`flex items-center justify-center font-mono text-[11px] tabular-nums size-5 rounded-full ${
-														isCurrent
-															? "bg-white text-zinc-950 font-semibold"
-															: isDone
-																? "text-zinc-100"
-																: "text-zinc-400"
-													}`}
-												>
-													{isDone ? (
-														<CheckIcon className="size-3" />
-													) : (
-														String(index + 1).padStart(2, "0")
-													)}
-												</span>
-												{index < visibleStepIds.length - 1 && (
-													<span
-														className={`w-px flex-1 min-h-7 my-1.5 ${
-															isDone ? "bg-zinc-400" : "bg-zinc-700"
-														}`}
-													/>
-												)}
-											</div>
-											{isDone ? (
-												<button
-													type="button"
-													onClick={() => stepper.goTo(step.id)}
-													className="text-sm font-medium transition-colors pb-6 last:pb-0 text-zinc-100 hover:text-white text-left"
-												>
-													{step.title}
-												</button>
-											) : (
-												<p
-													className={`text-sm font-medium transition-colors pb-6 last:pb-0 ${
-														isCurrent ? "text-white" : "text-zinc-400"
-													}`}
-												>
-													{step.title}
-												</p>
-											)}
-										</li>
-									);
-								})}
-							</ol>
-						</Scoped>
-
-						<div className="hidden md:flex flex-col gap-4 mt-auto pt-8 border-t border-zinc-800">
-							{!isLastVisible && (
-								<button
-									type="button"
-									onClick={() => setSkipAllOpen(true)}
-									className="w-fit font-mono text-[11px] uppercase tracking-wider text-zinc-400 hover:text-zinc-100 transition-colors"
-								>
-									Skip all →
-								</button>
-							)}
-							<div className="flex items-center gap-3 text-zinc-500">
-								<Link
-									href="https://github.com/dokploy/dokploy"
-									target="_blank"
-									className="hover:text-zinc-200 transition-colors"
-								>
-									<GithubIcon />
-								</Link>
-								<Link
-									href="https://x.com/getdokploy"
-									target="_blank"
-									className="hover:text-zinc-200 transition-colors"
-								>
-									<svg
-										stroke="currentColor"
-										fill="currentColor"
-										strokeWidth="0"
-										viewBox="0 0 24 24"
-										xmlns="http://www.w3.org/2000/svg"
-										className="size-4"
-									>
-										<path d="M10.4883 14.651L15.25 21H22.25L14.3917 10.5223L20.9308 3H18.2808L13.1643 8.88578L8.75 3H1.75L9.26086 13.0145L2.31915 21H4.96917L10.4883 14.651ZM16.25 19L5.75 5H7.75L18.25 19H16.25Z" />
-									</svg>
-								</Link>
-								<Link
-									href="https://discord.com/invite/2tBnJ3jDJc"
-									target="_blank"
-									className="hover:text-zinc-200 transition-colors"
-								>
-									<svg
-										xmlns="http://www.w3.org/2000/svg"
-										viewBox="0 0 48 48"
-										className="size-4"
-									>
-										<path
-											fill="currentColor"
-											d="M39.248,10.177c-2.804-1.287-5.812-2.235-8.956-2.778c-0.057-0.01-0.114,0.016-0.144,0.068	c-0.387,0.688-0.815,1.585-1.115,2.291c-3.382-0.506-6.747-0.506-10.059,0c-0.3-0.721-0.744-1.603-1.133-2.291	c-0.03-0.051-0.087-0.077-0.144-0.068c-3.143,0.541-6.15,1.489-8.956,2.778c-0.024,0.01-0.045,0.028-0.059,0.051	c-5.704,8.522-7.267,16.835-6.5,25.044c0.003,0.04,0.026,0.079,0.057,0.103c3.763,2.764,7.409,4.442,10.987,5.554	c0.057,0.017,0.118-0.003,0.154-0.051c0.846-1.156,1.601-2.374,2.248-3.656c0.038-0.075,0.002-0.164-0.076-0.194	c-1.197-0.454-2.336-1.007-3.432-1.636c-0.087-0.051-0.094-0.175-0.014-0.234c0.231-0.173,0.461-0.353,0.682-0.534	c0.04-0.033,0.095-0.04,0.142-0.019c7.201,3.288,14.997,3.288,22.113,0c0.047-0.023,0.102-0.016,0.144,0.017	c0.22,0.182,0.451,0.363,0.683,0.536c0.08,0.059,0.075,0.183-0.012,0.234c-1.096,0.641-2.236,1.182-3.434,1.634	c-0.078,0.03-0.113,0.12-0.075,0.196c0.661,1.28,1.415,2.498,2.246,3.654c0.035,0.049,0.097,0.07,0.154,0.052	c3.595-1.112,7.241-2.79,11.004-5.554c0.033-0.024,0.054-0.061,0.057-0.101c0.917-9.491-1.537-17.735-6.505-25.044	C39.293,10.205,39.272,10.187,39.248,10.177z M16.703,30.273c-2.168,0-3.954-1.99-3.954-4.435s1.752-4.435,3.954-4.435	c2.22,0,3.989,2.008,3.954,4.435C20.658,28.282,18.906,30.273,16.703,30.273z M31.324,30.273c-2.168,0-3.954-1.99-3.954-4.435	s1.752-4.435,3.954-4.435c2.22,0,3.989,2.008,3.954,4.435C35.278,28.282,33.544,30.273,31.324,30.273z"
-										/>
-									</svg>
-								</Link>
-							</div>
-						</div>
-					</div>
-				</aside>
-
-				<div className="flex-1 overflow-y-auto">
-					<div className="mx-auto w-full max-w-2xl px-6 py-14 lg:py-20">
-						{stepper.switch({
-							welcome: () => <WelcomeStep onNext={goToNextVisible} />,
-							plan: () => <PlanStep onNext={goToNextVisible} />,
-							project: () => (
-								<ProjectStep
-									onNext={(project) => {
-										setProjectId(project.projectId);
-										setEnvironmentId(project.environmentId);
-										setOnboardingState({
-											projectId: project.projectId,
-											environmentId: project.environmentId,
-										});
-										goToNextVisible();
-									}}
-								/>
-							),
-							server: () => <ServerStep onNext={goToNextVisible} />,
-							deploy: () => (
-								<DeployStep
-									environmentId={environmentId}
-									onNext={goToNextVisible}
-								/>
-							),
-							complete: () => (
-								<CompleteStep
-									projectId={projectId}
-									environmentId={environmentId}
-									onFinish={onClose}
-								/>
-							),
-						})}
-					</div>
-				</div>
-			</div>
-
-			<Dialog open={skipAllOpen} onOpenChange={setSkipAllOpen}>
-				<DialogContent>
-					<DialogHeader>
-						<DialogTitle>Skip onboarding?</DialogTitle>
-						<DialogDescription>
-							If this is your first time using Dokploy, we recommend going
-							through these steps — it only takes a couple of minutes and gives
-							you a feel for how projects, servers and deployments fit together.
-						</DialogDescription>
-					</DialogHeader>
-					<DialogFooter>
-						<Button variant="outline" onClick={() => setSkipAllOpen(false)}>
-							Continue setup
-						</Button>
-						<Button onClick={handleSkipAll}>Skip anyway</Button>
-					</DialogFooter>
-				</DialogContent>
-			</Dialog>
-		</>
-	);
-};

apps/dokploy/components/dashboard/onboarding/steps/complete-step.tsx

@@ -1,133 +0,0 @@
-import {
-	BookIcon,
-	DatabaseIcon,
-	GitMergeIcon,
-	GlobeIcon,
-	UsersIcon,
-} from "lucide-react";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
-import ConfettiExplosion from "react-confetti-explosion";
-import { Button } from "@/components/ui/button";
-import { displayFont } from "../font";
-
-interface Props {
-	projectId?: string;
-	environmentId?: string;
-	onFinish: () => void | Promise<void>;
-}
-
-const features = [
-	{
-		icon: DatabaseIcon,
-		title: "Databases",
-		description: "Postgres, MySQL, MongoDB, Redis and more, one click away.",
-	},
-	{
-		icon: GlobeIcon,
-		title: "Custom domains",
-		description: "Attach your own domains and get automatic HTTPS.",
-	},
-	{
-		icon: GitMergeIcon,
-		title: "CI/CD",
-		description: "Auto-deploy on every push from GitHub, GitLab or Bitbucket.",
-	},
-	{
-		icon: UsersIcon,
-		title: "Team collaboration",
-		description: "Invite teammates with fine-grained permissions.",
-	},
-];
-
-export const CompleteStep = ({ projectId, environmentId, onFinish }: Props) => {
-	const router = useRouter();
-	const [showConfetti, setShowConfetti] = useState(false);
-	const [isFinishing, setIsFinishing] = useState(false);
-
-	useEffect(() => {
-		setShowConfetti(true);
-	}, []);
-
-	const projectHref =
-		projectId && environmentId
-			? `/dashboard/project/${projectId}/environment/${environmentId}`
-			: "/dashboard/projects";
-
-	const handleFinish = async () => {
-		setIsFinishing(true);
-		await onFinish();
-		router.push(projectHref);
-	};
-
-	return (
-		<div className="flex flex-col gap-10">
-			<div className="fixed inset-x-0 top-0 flex justify-center pointer-events-none">
-				{showConfetti && (
-					<ConfettiExplosion
-						duration={3000}
-						force={0.35}
-						particleCount={200}
-						width={1200}
-						zIndex={60}
-					/>
-				)}
-			</div>
-
-			<div className="flex flex-col gap-4">
-				<span className="font-mono text-xs uppercase tracking-[0.2em] text-primary">
-					Done
-				</span>
-				<h1
-					className={`${displayFont.className} text-4xl sm:text-5xl leading-[1.05] tracking-tight`}
-				>
-					You're all set.
-				</h1>
-				<p className="text-muted-foreground text-lg max-w-md leading-relaxed">
-					This is just the beginning — here's some of what else you can do.
-				</p>
-			</div>
-
-			<dl className="flex flex-col divide-y">
-				{features.map((feature, index) => (
-					<div key={feature.title} className="flex gap-6 py-5 first:pt-0">
-						<dt className="font-mono text-xs text-muted-foreground pt-1 shrink-0 w-6">
-							{String(index + 1).padStart(2, "0")}
-						</dt>
-						<dd className="flex flex-col gap-1">
-							<span className="font-medium flex items-center gap-2">
-								<feature.icon className="size-4 text-muted-foreground" />
-								{feature.title}
-							</span>
-							<span className="text-sm text-muted-foreground">
-								{feature.description}
-							</span>
-						</dd>
-					</div>
-				))}
-			</dl>
-
-			<div className="flex items-center gap-4">
-				<Button
-					size="lg"
-					className="w-fit px-8"
-					isLoading={isFinishing}
-					onClick={handleFinish}
-				>
-					Go to my project
-				</Button>
-				<Button variant="ghost" asChild>
-					<Link
-						href="https://docs.dokploy.com/docs/core"
-						target="_blank"
-						className="flex items-center gap-1.5"
-					>
-						<BookIcon size={14} />
-						Read the docs
-					</Link>
-				</Button>
-			</div>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/onboarding/steps/deploy-step.tsx

@@ -1,295 +0,0 @@
-import copy from "copy-to-clipboard";
-import {
-	ArrowUpRightIcon,
-	CheckCircle2,
-	CopyIcon,
-	Loader2,
-	XCircleIcon,
-} from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import { api } from "@/utils/api";
-import { displayFont } from "../font";
-
-interface Props {
-	environmentId?: string;
-	onNext: () => void;
-	/** Drops the onboarding wizard's display serif for callers (e.g. the
-	 * post-checkout welcome modal) that want the app's regular typography. */
-	plainTitle?: boolean;
-}
-
-const CURATED_TEMPLATES = [
-	{ id: "wordpress", name: "WordPress", logo: "wordpress.png" },
-	{ id: "ghost", name: "Ghost", logo: "ghost.jpeg" },
-	{ id: "n8n", name: "n8n", logo: "n8n.png" },
-	{ id: "uptime-kuma", name: "Uptime Kuma", logo: "uptime-kuma.png" },
-];
-
-type Deploying = { kind: "app" | "template"; id: string; url: string };
-
-export const DeployStep = ({ environmentId, onNext, plainTitle }: Props) => {
-	const titleClassName = plainTitle
-		? "text-xl font-semibold tracking-tight"
-		: `${displayFont.className} text-4xl sm:text-5xl leading-[1.05] tracking-tight`;
-	const { data: isCloud = true } = api.settings.isCloud.useQuery();
-	const { data: servers } = api.server.withSSHKey.useQuery();
-	const serverId = servers?.[0]?.serverId;
-
-	const [deploying, setDeploying] = useState<Deploying | null>(null);
-	const [starting, setStarting] = useState<string | null>(null);
-
-	const { mutateAsync: deployNginx } =
-		api.application.deployNginxQuickstart.useMutation();
-	const { mutateAsync: deployTemplate } =
-		api.compose.deployTemplate.useMutation();
-	const { mutateAsync: deployCompose } = api.compose.deploy.useMutation();
-	const utils = api.useUtils();
-
-	const { data: application } = api.application.one.useQuery(
-		{ applicationId: deploying?.id ?? "" },
-		{
-			enabled: deploying?.kind === "app",
-			refetchInterval: (query) => {
-				const status = query.state.data?.applicationStatus;
-				return status === "done" || status === "error" ? false : 2500;
-			},
-		},
-	);
-	const { data: compose } = api.compose.one.useQuery(
-		{ composeId: deploying?.id ?? "" },
-		{
-			enabled: deploying?.kind === "template",
-			refetchInterval: (query) => {
-				const status = query.state.data?.composeStatus;
-				return status === "done" || status === "error" ? false : 2500;
-			},
-		},
-	);
-
-	const status =
-		deploying?.kind === "app"
-			? application?.applicationStatus
-			: compose?.composeStatus;
-
-	if (!environmentId || (isCloud && !serverId)) {
-		return (
-			<div className="flex flex-col gap-8">
-				<div className="flex flex-col gap-4">
-					<span className="font-mono text-xs uppercase tracking-[0.2em] text-primary">
-						First deploy
-					</span>
-					<h1 className={titleClassName}>Deploy something.</h1>
-				</div>
-				<AlertBlock type="info" className="max-w-md">
-					{isCloud
-						? "You'll need a project and a connected server before deploying — you can do that anytime from the dashboard."
-						: "You'll need a project before deploying — you can do that anytime from the dashboard."}
-				</AlertBlock>
-				<Button onClick={onNext} className="w-fit px-8">
-					Continue
-				</Button>
-			</div>
-		);
-	}
-
-	const handleNginx = async () => {
-		setStarting("nginx");
-		try {
-			const res = await deployNginx({ environmentId, serverId });
-			setDeploying({ kind: "app", id: res.applicationId, url: res.domainUrl });
-		} catch (error) {
-			toast.error(
-				error instanceof Error ? error.message : "Error deploying the app",
-			);
-		} finally {
-			setStarting(null);
-		}
-	};
-
-	const handleTemplate = async (id: string) => {
-		setStarting(id);
-		try {
-			const composeResult = await deployTemplate({
-				environmentId,
-				serverId,
-				id,
-			});
-			await deployCompose({ composeId: composeResult.composeId });
-			const domains = await utils.domain.byComposeId.fetch({
-				composeId: composeResult.composeId,
-			});
-			const host = domains?.[0]?.host;
-			setDeploying({
-				kind: "template",
-				id: composeResult.composeId,
-				url: host ? `http://${host}` : "",
-			});
-		} catch (error) {
-			toast.error(
-				error instanceof Error ? error.message : "Error deploying the template",
-			);
-		} finally {
-			setStarting(null);
-		}
-	};
-
-	if (deploying) {
-		const isDone = status === "done";
-		const isError = status === "error";
-
-		return (
-			<div className="flex flex-col gap-8">
-				<div className="flex flex-col gap-4">
-					<span
-						className={`font-mono text-xs uppercase tracking-[0.2em] flex items-center gap-2 ${
-							isError ? "text-destructive" : "text-primary"
-						}`}
-					>
-						{isDone ? (
-							<CheckCircle2 className="size-3.5" />
-						) : isError ? (
-							<XCircleIcon className="size-3.5" />
-						) : (
-							<Loader2 className="size-3.5 animate-spin" />
-						)}
-						{isDone ? "Live" : isError ? "Deploy failed" : "Deploying"}
-					</span>
-					<h1 className={titleClassName}>
-						{isDone
-							? "It's live."
-							: isError
-								? "Something went wrong."
-								: "Building your app..."}
-					</h1>
-					<p className="text-muted-foreground text-lg max-w-md leading-relaxed">
-						{isDone
-							? "Your app is up and reachable at:"
-							: isError
-								? "The deployment failed — you can check the logs from the dashboard later."
-								: "This usually takes a minute or two the first time."}
-					</p>
-				</div>
-
-				{isDone && deploying.url ? (
-					<div className="flex flex-col rounded-2xl border overflow-hidden max-w-md">
-						<div className="flex items-center gap-2 px-5 py-3 border-b bg-muted/30">
-							<span className="size-2 rounded-full bg-green-500 shrink-0" />
-							<span className="font-mono text-xs text-muted-foreground">
-								Reachable now
-							</span>
-						</div>
-						<div className="flex items-center justify-between gap-3 p-5">
-							<span className="font-mono text-sm truncate">
-								{deploying.url}
-							</span>
-							<div className="flex items-center gap-1 shrink-0">
-								<Button
-									variant="ghost"
-									size="icon"
-									onClick={() => {
-										copy(deploying.url);
-										toast.success("Copied to clipboard");
-									}}
-								>
-									<CopyIcon className="size-4" />
-								</Button>
-								<Button variant="ghost" size="icon" asChild>
-									<a href={deploying.url} target="_blank" rel="noreferrer">
-										<ArrowUpRightIcon className="size-4" />
-									</a>
-								</Button>
-							</div>
-						</div>
-					</div>
-				) : !isDone && !isError ? (
-					<div className="rounded-2xl border p-5 max-w-md">
-						<div className="flex items-center gap-3 text-sm text-muted-foreground">
-							<Loader2 className="size-4 animate-spin shrink-0" />
-							Waiting for the build to finish...
-						</div>
-					</div>
-				) : null}
-
-				<Button
-					onClick={onNext}
-					className="w-fit px-8"
-					disabled={!isDone && !isError}
-				>
-					Continue
-				</Button>
-			</div>
-		);
-	}
-
-	return (
-		<div className="flex flex-col gap-10">
-			<div className="flex flex-col gap-4">
-				<span className="font-mono text-xs uppercase tracking-[0.2em] text-primary">
-					First deploy
-				</span>
-				<h1 className={titleClassName}>Ship something.</h1>
-				<p className="text-muted-foreground text-lg max-w-md leading-relaxed">
-					Pick a quickstart — we'll generate a domain and deploy it for you.
-				</p>
-			</div>
-
-			<div className="grid grid-cols-1 sm:grid-cols-2 gap-px bg-border rounded-2xl overflow-hidden border">
-				<button
-					type="button"
-					onClick={handleNginx}
-					disabled={!!starting}
-					className="flex flex-col items-start justify-between gap-8 bg-background p-7 text-left hover:bg-muted/40 transition-colors disabled:opacity-60"
-				>
-					<div>
-						<p className="font-medium">Simple app</p>
-						<p className="text-sm text-muted-foreground mt-1">
-							A "Hello World" demo app, live in seconds.
-						</p>
-					</div>
-					<span className="font-mono text-xs uppercase tracking-wider text-muted-foreground flex items-center gap-2">
-						{starting === "nginx" ? (
-							<>
-								<Loader2 className="size-3.5 animate-spin" />
-								Starting...
-							</>
-						) : (
-							"Deploy now →"
-						)}
-					</span>
-				</button>
-
-				<div className="flex flex-col justify-between gap-8 bg-background p-7">
-					<div>
-						<p className="font-medium">Docker Compose template</p>
-						<p className="text-sm text-muted-foreground mt-1">
-							Popular open source stacks, one click away.
-						</p>
-					</div>
-					<div className="flex flex-col gap-2">
-						{CURATED_TEMPLATES.map((template) => (
-							<Button
-								key={template.id}
-								variant="outline"
-								size="sm"
-								disabled={!!starting}
-								isLoading={starting === template.id}
-								onClick={() => handleTemplate(template.id)}
-								className="justify-start"
-							>
-								<img
-									src={`https://templates.dokploy.com/blueprints/${template.id}/${template.logo}`}
-									alt={template.name}
-									className="size-4 object-contain shrink-0"
-								/>
-								{template.name}
-							</Button>
-						))}
-					</div>
-				</div>
-			</div>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/onboarding/steps/plan-step.tsx

@@ -1,213 +0,0 @@
-import { loadStripe } from "@stripe/stripe-js";
-import { ArrowRightIcon, CheckIcon } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
-import {
-	calculatePriceHobby,
-	calculatePriceStartup,
-	STARTUP_SERVERS_INCLUDED,
-} from "@/components/dashboard/settings/billing/show-billing";
-import { Button } from "@/components/ui/button";
-import { api } from "@/utils/api";
-import { displayFont } from "../font";
-
-const stripePromise = loadStripe(
-	process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY!,
-);
-
-interface Props {
-	onNext: () => void;
-}
-
-export const PlanStep = ({ onNext }: Props) => {
-	const [loadingTier, setLoadingTier] = useState<
-		"hobby" | "startup" | "trial" | null
-	>(null);
-	const { data } = api.stripe.getProducts.useQuery();
-	const { mutateAsync: createCheckoutSession } =
-		api.stripe.createCheckoutSession.useMutation();
-	const { mutateAsync: startFreeTrial } =
-		api.stripe.startFreeTrial.useMutation();
-	const utils = api.useUtils();
-
-	const handleCheckout = async (tier: "hobby" | "startup") => {
-		if (!data) return;
-		const productId =
-			tier === "hobby" ? data.hobbyProductId : data.startupProductId;
-		if (!productId) return;
-		setLoadingTier(tier);
-		try {
-			const stripe = await stripePromise;
-			const session = await createCheckoutSession({
-				tier,
-				productId,
-				serverQuantity: tier === "startup" ? STARTUP_SERVERS_INCLUDED : 1,
-				isAnnual: false,
-			});
-			await stripe?.redirectToCheckout({ sessionId: session.sessionId });
-		} catch {
-			toast.error("Error starting checkout");
-			setLoadingTier(null);
-		}
-	};
-
-	const handleTrial = async () => {
-		setLoadingTier("trial");
-		try {
-			await startFreeTrial();
-			await utils.project.onboardingStatus.invalidate();
-			toast.success("Your 7-day trial has started");
-			onNext();
-		} catch (error) {
-			toast.error(
-				error instanceof Error ? error.message : "Error starting trial",
-			);
-		} finally {
-			setLoadingTier(null);
-		}
-	};
-
-	return (
-		<div className="flex flex-col gap-10">
-			<div className="flex flex-col gap-4">
-				<span className="font-mono text-xs uppercase tracking-[0.2em] text-primary">
-					Billing
-				</span>
-				<h1
-					className={`${displayFont.className} text-4xl sm:text-5xl leading-[1.05] tracking-tight`}
-				>
-					Start free, upgrade when ready.
-				</h1>
-				<p className="text-muted-foreground text-lg max-w-md leading-relaxed">
-					No credit card for the trial — add one only if you decide to stay.
-				</p>
-			</div>
-
-			<div className="flex flex-col rounded-2xl bg-zinc-950 dark:bg-white text-white dark:text-zinc-950 overflow-hidden">
-				<div className="flex flex-col sm:flex-row sm:items-start justify-between gap-6 p-7">
-					<div>
-						<span className="inline-flex items-center rounded-full bg-white text-zinc-950 dark:bg-zinc-950 dark:text-white font-mono text-[10px] font-semibold uppercase tracking-[0.15em] px-2.5 py-1">
-							Recommended
-						</span>
-						<p className={`${displayFont.className} text-2xl mt-3`}>
-							7-day free trial
-						</p>
-						<p className="text-sm text-zinc-400 dark:text-zinc-600 mt-1 max-w-xs">
-							No card required — cancel anytime.
-						</p>
-						<ul className="flex flex-col gap-1.5 mt-4">
-							{[
-								"Setup 1 server",
-								"Unlimited apps & databases",
-								"Community support",
-							].map((f) => (
-								<li
-									key={f}
-									className="flex items-center gap-2 text-sm text-zinc-300 dark:text-zinc-700"
-								>
-									<CheckIcon className="size-3.5 text-zinc-500 shrink-0" />
-									{f}
-								</li>
-							))}
-						</ul>
-					</div>
-					<Button
-						size="lg"
-						className="bg-white text-zinc-950 hover:bg-zinc-200 dark:bg-zinc-950 dark:text-white dark:hover:bg-zinc-800 w-fit shrink-0 px-6"
-						isLoading={loadingTier === "trial"}
-						disabled={loadingTier !== null}
-						onClick={handleTrial}
-					>
-						Start trial
-						<ArrowRightIcon className="size-4" />
-					</Button>
-				</div>
-			</div>
-
-			<div className="grid grid-cols-1 sm:grid-cols-2 gap-px bg-border rounded-2xl overflow-hidden border">
-				<div className="flex flex-col justify-between gap-6 bg-background p-7">
-					<div>
-						<p className="font-medium">Hobby</p>
-						<p className="text-sm text-muted-foreground mt-1">
-							For individual developers
-						</p>
-						<p className="text-3xl font-semibold mt-4 tabular-nums">
-							${calculatePriceHobby(1, false).toFixed(2)}
-							<span className="text-sm font-normal text-muted-foreground">
-								{" "}
-								/mo
-							</span>
-						</p>
-						<ul className="flex flex-col gap-1.5 mt-4">
-							{[
-								"Setup 1 server",
-								"Unlimited apps & databases",
-								"2 environments",
-								"Community support",
-							].map((f) => (
-								<li
-									key={f}
-									className="flex items-center gap-2 text-sm text-muted-foreground"
-								>
-									<CheckIcon className="size-3.5 shrink-0" />
-									{f}
-								</li>
-							))}
-						</ul>
-					</div>
-					<Button
-						variant="outline"
-						isLoading={loadingTier === "hobby"}
-						disabled={loadingTier !== null || !data?.hobbyProductId}
-						onClick={() => handleCheckout("hobby")}
-					>
-						Subscribe
-					</Button>
-				</div>
-
-				<div className="flex flex-col justify-between gap-6 bg-background p-7">
-					<div>
-						<p className="font-medium">Startup</p>
-						<p className="text-sm text-muted-foreground mt-1">
-							For small to mid-size teams
-						</p>
-						<p className="text-3xl font-semibold mt-4 tabular-nums">
-							$
-							{calculatePriceStartup(STARTUP_SERVERS_INCLUDED, false).toFixed(
-								2,
-							)}
-							<span className="text-sm font-normal text-muted-foreground">
-								{" "}
-								/mo
-							</span>
-						</p>
-						<ul className="flex flex-col gap-1.5 mt-4">
-							{[
-								`Setup up to ${STARTUP_SERVERS_INCLUDED} servers`,
-								"Unlimited users & environments",
-								"Basic RBAC + 2FA",
-								"Email & chat support",
-							].map((f) => (
-								<li
-									key={f}
-									className="flex items-center gap-2 text-sm text-muted-foreground"
-								>
-									<CheckIcon className="size-3.5 shrink-0" />
-									{f}
-								</li>
-							))}
-						</ul>
-					</div>
-					<Button
-						variant="outline"
-						isLoading={loadingTier === "startup"}
-						disabled={loadingTier !== null || !data?.startupProductId}
-						onClick={() => handleCheckout("startup")}
-					>
-						Subscribe
-					</Button>
-				</div>
-			</div>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/onboarding/steps/project-step.tsx

@@ -1,118 +0,0 @@
-import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Textarea } from "@/components/ui/textarea";
-import { api } from "@/utils/api";
-import { displayFont } from "../font";
-
-const schema = z.object({
-	name: z.string().min(1, "Name is required"),
-	description: z.string().optional(),
-});
-type Schema = z.infer<typeof schema>;
-
-interface Props {
-	onNext: (project: { projectId: string; environmentId: string }) => void;
-	/** Drops the onboarding wizard's display serif for callers (e.g. the
-	 * post-checkout welcome modal) that want the app's regular typography. */
-	plainTitle?: boolean;
-}
-
-export const ProjectStep = ({ onNext, plainTitle }: Props) => {
-	const titleClassName = plainTitle
-		? "text-xl font-semibold tracking-tight"
-		: `${displayFont.className} text-4xl sm:text-5xl leading-[1.05] tracking-tight`;
-	const { mutateAsync, isPending } = api.project.create.useMutation();
-	const utils = api.useUtils();
-
-	const form = useForm<Schema>({
-		defaultValues: { name: "My First Project", description: "" },
-		resolver: zodResolver(schema),
-	});
-
-	const onSubmit = async (data: Schema) => {
-		try {
-			const result = await mutateAsync(data);
-			await utils.project.all.invalidate();
-			toast.success("Project created");
-			onNext({
-				projectId: result.project.projectId,
-				environmentId: result.environment?.environmentId ?? "",
-			});
-		} catch (error) {
-			toast.error(
-				error instanceof Error ? error.message : "Error creating the project",
-			);
-		}
-	};
-
-	return (
-		<div className="flex flex-col gap-10">
-			<div className="flex flex-col gap-4">
-				<span className="font-mono text-xs uppercase tracking-[0.2em] text-primary">
-					Workspace
-				</span>
-				<h1 className={titleClassName}>Create your first project.</h1>
-				<p className="text-muted-foreground text-lg max-w-md leading-relaxed">
-					Projects group your apps, databases and environments together.
-				</p>
-			</div>
-
-			<Form {...form}>
-				<form
-					onSubmit={form.handleSubmit(onSubmit)}
-					className="flex flex-col gap-5 max-w-sm"
-				>
-					<FormField
-						control={form.control}
-						name="name"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>Name</FormLabel>
-								<FormControl>
-									<Input placeholder="My First Project" {...field} />
-								</FormControl>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-					<FormField
-						control={form.control}
-						name="description"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>Description (optional)</FormLabel>
-								<FormControl>
-									<Textarea
-										placeholder="What is this project for?"
-										className="resize-none"
-										{...field}
-									/>
-								</FormControl>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-					<Button
-						type="submit"
-						isLoading={isPending}
-						className="w-fit px-8 mt-2"
-					>
-						Create project
-					</Button>
-				</form>
-			</Form>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/onboarding/steps/server-step.tsx

@@ -1,346 +0,0 @@
-import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-import copy from "copy-to-clipboard";
-import { CheckCircle2, CopyIcon, Loader2, XCircle } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-import { displayFont } from "../font";
-
-const schema = z.object({
-	name: z.string().min(1, "Name is required"),
-	ipAddress: z
-		.string()
-		.min(1, "IP address is required")
-		.refine((value) => !/\s/.test(value), "IP address cannot contain spaces"),
-});
-type Schema = z.infer<typeof schema>;
-
-interface Props {
-	onNext: () => void;
-	/** Drops the onboarding wizard's display serif for callers (e.g. the
-	 * post-checkout welcome modal) that want the app's regular typography. */
-	plainTitle?: boolean;
-}
-
-const StatusRow = ({
-	label,
-	ok,
-	pending,
-}: {
-	label: string;
-	ok?: boolean;
-	pending?: boolean;
-}) => (
-	<div className="flex items-center gap-2 text-sm">
-		{ok ? (
-			<CheckCircle2 className="size-4 text-green-600 dark:text-green-500 shrink-0" />
-		) : pending ? (
-			<Loader2 className="size-4 text-muted-foreground shrink-0 animate-spin" />
-		) : (
-			<XCircle className="size-4 text-muted-foreground shrink-0" />
-		)}
-		<span className={ok ? "" : "text-muted-foreground"}>{label}</span>
-	</div>
-);
-
-export const ServerStep = ({ onNext, plainTitle }: Props) => {
-	const titleClassName = plainTitle
-		? "text-xl font-semibold tracking-tight"
-		: `${displayFont.className} text-4xl sm:text-5xl leading-[1.05] tracking-tight`;
-
-	const { data: sshKeys, refetch: refetchSSHKeys } = api.sshKey.all.useQuery();
-	const generateSSHKey = api.sshKey.generate.useMutation();
-	const createSSHKey = api.sshKey.create.useMutation();
-	const hasCreatedKey = useRef(false);
-
-	const cloudSSHKey = sshKeys?.find(
-		(sshKey) => sshKey.name === "dokploy-onboarding-ssh-key",
-	);
-
-	useEffect(() => {
-		const ensureKey = async () => {
-			if (!sshKeys || cloudSSHKey || hasCreatedKey.current) return;
-			hasCreatedKey.current = true;
-			try {
-				const keys = await generateSSHKey.mutateAsync({ type: "rsa" });
-				await createSSHKey.mutateAsync({
-					name: "dokploy-onboarding-ssh-key",
-					description: "Used during onboarding",
-					privateKey: keys.privateKey,
-					publicKey: keys.publicKey,
-					organizationId: "",
-				});
-				await refetchSSHKeys();
-			} catch {
-				hasCreatedKey.current = false;
-			}
-		};
-		ensureKey();
-	}, [sshKeys]);
-
-	const { data: existingServers } = api.server.all.useQuery();
-	const [createdServerId, setCreatedServerId] = useState<string | null>(null);
-
-	useEffect(() => {
-		if (!createdServerId && existingServers && existingServers.length > 0) {
-			setCreatedServerId(existingServers[0]!.serverId);
-		}
-	}, [existingServers, createdServerId]);
-
-	const { data: canCreateMoreServers } =
-		api.stripe.canCreateMoreServers.useQuery();
-	const { mutateAsync: createServer, isPending: isCreating } =
-		api.server.create.useMutation();
-	const checkIsReady = (validation?: {
-		docker?: { enabled?: boolean };
-		isDokployNetworkInstalled?: boolean;
-	}) =>
-		!!validation?.docker?.enabled && !!validation?.isDokployNetworkInstalled;
-
-	const {
-		data: validation,
-		refetch: refetchValidation,
-		isFetching: isValidating,
-	} = api.server.validate.useQuery(
-		{ serverId: createdServerId ?? "" },
-		{
-			enabled: !!createdServerId,
-			refetchInterval: (query) =>
-				checkIsReady(query.state.data) ? false : 5000,
-		},
-	);
-	const isReady = checkIsReady(validation);
-
-	const [isSettingUp, setIsSettingUp] = useState(false);
-	const hasStartedSetup = useRef(false);
-
-	useEffect(() => {
-		if (createdServerId && !hasStartedSetup.current && !isReady) {
-			hasStartedSetup.current = true;
-			setIsSettingUp(true);
-		}
-	}, [createdServerId, isReady]);
-
-	useEffect(() => {
-		if (!isSettingUp) return;
-		const timeout = setTimeout(() => {
-			setIsSettingUp(false);
-			toast.error(
-				"Setup is taking too long — check the server is reachable, then try again.",
-			);
-		}, 120_000);
-		return () => clearTimeout(timeout);
-	}, [isSettingUp]);
-
-	api.server.setupWithLogs.useSubscription(
-		{ serverId: createdServerId ?? "" },
-		{
-			enabled: !!createdServerId && isSettingUp,
-			onData(log) {
-				if (typeof log === "string" && log.includes("Setup Server:")) {
-					setIsSettingUp(false);
-					refetchValidation();
-				}
-			},
-			onError(error) {
-				setIsSettingUp(false);
-				toast.error("Error setting up the server");
-				console.error(error);
-			},
-		},
-	);
-
-	const form = useForm<Schema>({
-		defaultValues: { name: "My First Server", ipAddress: "" },
-		resolver: zodResolver(schema),
-	});
-
-	const onSubmit = async (data: Schema) => {
-		if (!cloudSSHKey) {
-			toast.error("Still generating your SSH key, try again in a moment");
-			return;
-		}
-		try {
-			const server = await createServer({
-				name: data.name,
-				description: "",
-				ipAddress: data.ipAddress.trim(),
-				port: 22,
-				username: "root",
-				sshKeyId: cloudSSHKey.sshKeyId,
-				serverType: "deploy",
-				enableDockerCleanup: false,
-			});
-			setCreatedServerId(server.serverId);
-		} catch (error) {
-			toast.error(
-				error instanceof Error ? error.message : "Error creating the server",
-			);
-		}
-	};
-
-	return (
-		<div className="flex flex-col gap-10">
-			<div className="flex flex-col gap-4">
-				<span className="font-mono text-xs uppercase tracking-[0.2em] text-primary">
-					Infrastructure
-				</span>
-				<h1 className={titleClassName}>Connect a server.</h1>
-				<p className="text-muted-foreground text-lg max-w-md leading-relaxed">
-					Dokploy deploys to servers you own — buy one from any VPS provider
-					(Hetzner, DigitalOcean, Hostinger...) and paste its IP below.
-				</p>
-			</div>
-
-			{!createdServerId ? (
-				<div className="flex flex-col gap-4 max-w-sm">
-					{canCreateMoreServers === false && (
-						<AlertBlock type="warning">
-							You'll need a plan or trial before connecting a server — go back
-							to the "Pick a plan" step.
-						</AlertBlock>
-					)}
-					<div className="flex flex-col gap-2 rounded-lg border p-3">
-						<span className="text-xs font-medium text-muted-foreground">
-							1. Run this on your server to authorize Dokploy
-						</span>
-						<div className="flex items-center gap-2">
-							<code className="flex-1 min-w-0 truncate rounded bg-muted px-2 py-1.5 text-xs">
-								{cloudSSHKey
-									? `echo "${cloudSSHKey.publicKey}" >> ~/.ssh/authorized_keys`
-									: "Generating..."}
-							</code>
-							{cloudSSHKey && (
-								<button
-									type="button"
-									onClick={() => {
-										copy(
-											`echo "${cloudSSHKey.publicKey}" >> ~/.ssh/authorized_keys`,
-										);
-										toast.success("Copied to clipboard");
-									}}
-								>
-									<CopyIcon className="size-4 text-muted-foreground" />
-								</button>
-							)}
-						</div>
-					</div>
-
-					<Form {...form}>
-						<form
-							onSubmit={form.handleSubmit(onSubmit)}
-							className="flex flex-col gap-4"
-						>
-							<FormField
-								control={form.control}
-								name="name"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Server name</FormLabel>
-										<FormControl>
-											<Input placeholder="My First Server" {...field} />
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="ipAddress"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>2. IP address</FormLabel>
-										<FormControl>
-											<Input placeholder="192.168.1.100" {...field} />
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<Button
-								type="submit"
-								isLoading={isCreating}
-								disabled={!cloudSSHKey || canCreateMoreServers === false}
-								className="mt-2"
-							>
-								Connect server
-							</Button>
-						</form>
-					</Form>
-				</div>
-			) : (
-				<div className="flex flex-col gap-4 w-full max-w-sm">
-					<div className="flex flex-col gap-3 rounded-lg border p-4">
-						{isSettingUp ? (
-							<div className="flex items-center justify-center gap-3 py-4 text-sm text-muted-foreground">
-								<Loader2 className="size-4 animate-spin shrink-0" />
-								Setting up your server — installing Docker and dependencies...
-							</div>
-						) : isValidating && !validation ? (
-							<div className="flex items-center justify-center gap-2 py-4 text-sm text-muted-foreground">
-								<Loader2 className="size-4 animate-spin" />
-								Checking your server...
-							</div>
-						) : (
-							<>
-								<StatusRow
-									label="Docker installed"
-									ok={validation?.docker?.enabled}
-									pending={!validation?.docker?.enabled && !isReady}
-								/>
-								<StatusRow
-									label="Dokploy network created"
-									ok={validation?.isDokployNetworkInstalled}
-									pending={!validation?.isDokployNetworkInstalled && !isReady}
-								/>
-							</>
-						)}
-					</div>
-					{!isReady && !isSettingUp && (
-						<AlertBlock type="info">
-							Setup usually takes a minute after the server boots — this checks
-							automatically. You can retry setup, or use "Skip for now" above to
-							continue and come back to this later.
-						</AlertBlock>
-					)}
-					<div className="flex gap-2">
-						<Button
-							variant="secondary"
-							className="flex-1"
-							isLoading={isValidating || isSettingUp}
-							onClick={() => {
-								if (!isReady && !isSettingUp) {
-									setIsSettingUp(true);
-								} else {
-									refetchValidation();
-								}
-							}}
-						>
-							{!isReady && !isSettingUp ? "Retry setup" : "Check now"}
-						</Button>
-						<Button
-							className="flex-1"
-							disabled={!isReady || isSettingUp}
-							onClick={onNext}
-						>
-							Continue
-						</Button>
-					</div>
-				</div>
-			)}
-		</div>
-	);
-};

apps/dokploy/components/dashboard/onboarding/steps/welcome-step.tsx

@@ -1,71 +0,0 @@
-import { GitBranchIcon, PuzzleIcon, ServerIcon } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { displayFont } from "../font";
-
-interface Props {
-	onNext: () => void;
-}
-
-const points = [
-	{
-		icon: GitBranchIcon,
-		title: "Deploy from Git or Docker",
-		description:
-			"Push a repo, a compose file, or a container image and go live.",
-	},
-	{
-		icon: PuzzleIcon,
-		title: "One-click templates",
-		description:
-			"WordPress, databases, and dozens of open source apps, pre-wired.",
-	},
-	{
-		icon: ServerIcon,
-		title: "Your own servers",
-		description: "Runs on infrastructure you control — no vendor lock-in.",
-	},
-];
-
-export const WelcomeStep = ({ onNext }: Props) => {
-	return (
-		<div className="flex flex-col gap-12">
-			<div className="flex flex-col gap-4">
-				<span className="font-mono text-xs uppercase tracking-[0.2em] text-primary">
-					Welcome
-				</span>
-				<h1
-					className={`${displayFont.className} text-4xl sm:text-5xl leading-[1.05] tracking-tight`}
-				>
-					Let's get your first app <em className="not-italic">live</em>.
-				</h1>
-				<p className="text-muted-foreground text-lg max-w-md leading-relaxed">
-					A few steps — pick a plan, connect a server, ship something. You'll
-					have a working URL by the end.
-				</p>
-			</div>
-
-			<dl className="flex flex-col divide-y">
-				{points.map((point, index) => (
-					<div key={point.title} className="flex gap-6 py-5 first:pt-0">
-						<dt className="font-mono text-xs text-muted-foreground pt-1 shrink-0 w-6">
-							{String(index + 1).padStart(2, "0")}
-						</dt>
-						<dd className="flex flex-col gap-1">
-							<span className="font-medium flex items-center gap-2">
-								<point.icon className="size-4 text-muted-foreground" />
-								{point.title}
-							</span>
-							<span className="text-sm text-muted-foreground">
-								{point.description}
-							</span>
-						</dd>
-					</div>
-				))}
-			</dl>
-
-			<Button size="lg" onClick={onNext} className="w-fit px-8">
-				Get started
-			</Button>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/organization/handle-organization.tsx

@@ -1,11 +1,9 @@
 import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-
-import { PenBoxIcon, Plus, X } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
+import { PenBoxIcon, Plus } from "lucide-react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
-import { Logo } from "@/components/shared/logo";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -16,7 +14,6 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
-import { Dropzone } from "@/components/ui/dropzone";
 import {
 	Form,
 	FormControl,
@@ -27,8 +24,6 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
-import { resizeImage } from "@/utils/image-processing";
-import { sanitizeSvg } from "@/utils/sanitize-svg";
 
 const organizationSchema = z.object({
 	name: z.string().min(1, {
@@ -42,24 +37,10 @@ type OrganizationFormValues = z.infer<typeof organizationSchema>;
 interface Props {
 	organizationId?: string;
 	children?: React.ReactNode;
-	open?: boolean;
-	onOpenChange?: (open: boolean) => void;
 }
 
-export function AddOrganization({
-	organizationId,
-	open: controlledOpen,
-	onOpenChange: controlledOnOpenChange,
-}: Props) {
-	const [internalOpen, setInternalOpen] = useState(false);
-	const [uploadedFileName, setUploadedFileName] = useState<string | null>(null);
-	const [isUploading, setIsUploading] = useState(false);
-	const uploadCounter = useRef(0);
-	const isControlled = controlledOpen !== undefined;
-	const open = isControlled ? controlledOpen : internalOpen;
-	const setOpen = isControlled
-		? controlledOnOpenChange || (() => {})
-		: setInternalOpen;
+export function AddOrganization({ organizationId }: Props) {
+	const [open, setOpen] = useState(false);
 	const utils = api.useUtils();
 	const { data: organization } = api.organization.one.useQuery(
 		{
@@ -67,7 +48,6 @@ export function AddOrganization({
 		},
 		{
 			enabled: !!organizationId,
-			refetchOnWindowFocus: false,
 		},
 	);
 	const { mutateAsync, isPending } = organizationId
@@ -84,18 +64,14 @@ export function AddOrganization({
 
 	useEffect(() => {
 		if (organization) {
-			uploadCounter.current++;
-			setIsUploading(false);
 			form.reset({
 				name: organization.name,
 				logo: organization.logo || "",
 			});
-			setUploadedFileName(null);
 		}
 	}, [organization, form]);
 
 	const onSubmit = async (values: OrganizationFormValues) => {
-		if (isUploading) return;
 		await mutateAsync({
 			name: values.name,
 			logo: values.logo,
@@ -103,7 +79,6 @@ export function AddOrganization({
 		})
 			.then(() => {
 				form.reset();
-				setUploadedFileName(null);
 				toast.success(
 					`Organization ${organizationId ? "updated" : "created"} successfully`,
 				);
@@ -123,94 +98,8 @@ export function AddOrganization({
 			});
 	};
 
-	const handleFileUpload = async (files: FileList | null) => {
-		if (!files || files.length === 0) return;
-		const file = files[0];
-		if (!file) return;
-
-		const currentUploadId = ++uploadCounter.current;
-		setIsUploading(true);
-
-		const allowedTypes = [
-			"image/jpeg",
-			"image/jpg",
-			"image/png",
-			"image/svg+xml",
-			"image/webp",
-		];
-		const fileExtension = file.name.split(".").pop()?.toLowerCase();
-		const allowedExtensions = ["jpg", "jpeg", "png", "svg", "webp"];
-
-		if (
-			!allowedTypes.includes(file.type) &&
-			!allowedExtensions.includes(fileExtension || "")
-		) {
-			toast.error("Only JPG, JPEG, PNG, WEBP, and SVG files are allowed");
-			setIsUploading(false);
-			return;
-		}
-
-		if (file.size > 2 * 1024 * 1024) {
-			toast.error("Image size must be less than 2MB");
-			setIsUploading(false);
-			return;
-		}
-
-		const isSvg = file.type === "image/svg+xml" || fileExtension === "svg";
-
-		if (isSvg) {
-			try {
-				const text = await file.text();
-				const sanitizedDataUrl = sanitizeSvg(text);
-				if (currentUploadId !== uploadCounter.current) return;
-				if (!sanitizedDataUrl) {
-					toast.error("Invalid SVG file");
-					return;
-				}
-				form.setValue("logo", sanitizedDataUrl);
-				form.trigger("logo");
-				setUploadedFileName(file.name);
-			} catch (error) {
-				if (currentUploadId === uploadCounter.current) {
-					toast.error("Error processing SVG");
-				}
-			} finally {
-				if (currentUploadId === uploadCounter.current) {
-					setIsUploading(false);
-				}
-			}
-			return;
-		}
-
-		// Resize raster images to max 256x256 and convert to WebP to save space
-		try {
-			const resizedDataUrl = await resizeImage(file, 256);
-			if (currentUploadId !== uploadCounter.current) return;
-			form.setValue("logo", resizedDataUrl);
-			form.trigger("logo");
-			setUploadedFileName(file.name);
-		} catch (error) {
-			if (currentUploadId === uploadCounter.current) {
-				toast.error("Error processing image");
-			}
-		} finally {
-			if (currentUploadId === uploadCounter.current) {
-				setIsUploading(false);
-			}
-		}
-	};
-
 	return (
-		<Dialog
-			open={open}
-			onOpenChange={(val) => {
-				if (!val) {
-					uploadCounter.current++;
-					setIsUploading(false);
-				}
-				setOpen(val);
-			}}
-		>
+		<Dialog open={open} onOpenChange={setOpen}>
 			<DialogTrigger asChild>
 				{organizationId ? (
 					<Button
@@ -256,10 +145,8 @@ export function AddOrganization({
 							control={form.control}
 							name="name"
 							render={({ field }) => (
-								<FormItem className="items-center gap-4">
-									<div className="flex items-center justify-between">
-										<FormLabel className="text-right">Name</FormLabel>
-									</div>
+								<FormItem className="tems-center gap-4">
+									<FormLabel className="text-right">Name</FormLabel>
 									<FormControl>
 										<Input
 											placeholder="Organization name"
@@ -274,78 +161,23 @@ export function AddOrganization({
 						<FormField
 							control={form.control}
 							name="logo"
-							render={({ field }) => {
-								const isDataUrl = field.value?.startsWith("data:");
-								const displayValue = isDataUrl
-									? uploadedFileName || "Uploaded image"
-									: field.value || "";
-
-								return (
-									<FormItem className="gap-4">
-										<FormLabel className="text-right">
-											Logo URL or Upload
-										</FormLabel>
-										<FormControl>
-											<div className="col-span-3 flex flex-col gap-3">
-												<div className="flex items-center gap-3">
-													<div className="flex size-10 shrink-0 items-center justify-center rounded-md border bg-muted/50 overflow-hidden">
-														{field.value ? (
-															// biome-ignore lint/performance/noImgElement: user uploaded logo preview
-															<img
-																src={field.value}
-																alt="Logo preview"
-																className="size-full object-cover"
-															/>
-														) : (
-															<Logo className="size-7" />
-														)}
-													</div>
-													<div className="relative flex-1">
-														<Input
-															placeholder="https://example.com/logo.png"
-															{...field}
-															value={displayValue}
-															readOnly={isDataUrl}
-															onChange={(e) => {
-																uploadCounter.current++;
-																setIsUploading(false);
-																field.onChange(e);
-																if (isDataUrl) setUploadedFileName(null);
-															}}
-															className="w-full pr-8"
-														/>
-														{field.value && (
-															<button
-																type="button"
-																onClick={() => {
-																	uploadCounter.current++;
-																	setIsUploading(false);
-																	form.setValue("logo", "");
-																	setUploadedFileName(null);
-																}}
-																className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
-															>
-																<X className="size-4" />
-															</button>
-														)}
-													</div>
-												</div>
-												<Dropzone
-													dropMessage="Drag & drop a logo or click to upload"
-													accept=".jpg,.jpeg,.png,.svg,.webp,image/jpeg,image/png,image/svg+xml,image/webp"
-													onChange={handleFileUpload}
-													classNameWrapper="border-2 border-dashed border-border hover:border-primary bg-muted/30 hover:bg-muted/50 transition-all rounded-lg"
-													classNameContent="h-32"
-												/>
-											</div>
-										</FormControl>
-										<FormMessage className="col-span-3 col-start-2" />
-									</FormItem>
-								);
-							}}
+							render={({ field }) => (
+								<FormItem className="gap-4">
+									<FormLabel className="text-right">Logo URL</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="https://example.com/logo.png"
+											{...field}
+											value={field.value || ""}
+											className="col-span-3"
+										/>
+									</FormControl>
+									<FormMessage className="col-span-3 col-start-2" />
+								</FormItem>
+							)}
 						/>
 						<DialogFooter>
-							<Button type="submit" isLoading={isPending || isUploading}>
+							<Button type="submit" isLoading={isPending}>
 								{organizationId ? "Update organization" : "Create organization"}
 							</Button>
 						</DialogFooter>

apps/dokploy/components/dashboard/project/environment-variables.tsx

@@ -7,7 +7,6 @@ import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { useEnvCompletionSource } from "@/components/shared/env-autocomplete";
-import { VaultImportDialog } from "@/components/shared/vault-import-dialog";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -157,17 +156,7 @@ export const EnvironmentVariables = ({ environmentId, children }: Props) => {
 									name="env"
 									render={({ field }) => (
 										<FormItem>
-											<div className="flex items-center justify-between">
-												<FormLabel>Environment variables</FormLabel>
-												<VaultImportDialog
-													projectId={data?.projectId}
-													environmentId={environmentId}
-													currentEnv={field.value ?? ""}
-													onImport={(next) =>
-														form.setValue("env", next, { shouldDirty: true })
-													}
-												/>
-											</div>
+											<FormLabel>Environment variables</FormLabel>
 											<FormControl>
 												<CodeEditor
 													completionSource={completionSource}

apps/dokploy/components/dashboard/projects/project-environment.tsx

@@ -7,7 +7,6 @@ import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { useEnvCompletionSource } from "@/components/shared/env-autocomplete";
-import { VaultImportDialog } from "@/components/shared/vault-import-dialog";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -153,16 +152,7 @@ export const ProjectEnvironment = ({ projectId, children }: Props) => {
 									name="env"
 									render={({ field }) => (
 										<FormItem>
-											<div className="flex items-center justify-between">
-												<FormLabel>Environment variables</FormLabel>
-												<VaultImportDialog
-													projectId={projectId}
-													currentEnv={field.value ?? ""}
-													onImport={(next) =>
-														form.setValue("env", next, { shouldDirty: true })
-													}
-												/>
-											</div>
+											<FormLabel>Environment variables</FormLabel>
 											<FormControl>
 												<CodeEditor
 													completionSource={completionSource}

apps/dokploy/components/dashboard/requests/requests-table.tsx

@@ -17,13 +17,11 @@ import {
 	Download,
 	Globe,
 	InfoIcon,
-	Loader2,
 	Server,
 	TrendingUpIcon,
 } from "lucide-react";
 import { useMemo, useState } from "react";
 import { toast } from "sonner";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -102,12 +100,7 @@ export const RequestsTable = ({ dateRange }: RequestsTableProps) => {
 		pageSize: 10,
 	});
 
-	const {
-		data: statsLogs,
-		isLoading,
-		isError,
-		error,
-	} = api.settings.readStatsLogs.useQuery(
+	const { data: statsLogs } = api.settings.readStatsLogs.useQuery(
 		{
 			sort: sorting[0],
 			page: pagination,
@@ -189,7 +182,7 @@ export const RequestsTable = ({ dateRange }: RequestsTableProps) => {
 		<>
 			<div className="flex flex-col gap-6 w-full ">
 				<div className="mt-6 grid gap-4 pb-20 w-full">
-					<div className="flex flex-col gap-4 w-full overflow-auto">
+					<div className="flex flex-col gap-4  w-full overflow-auto">
 						<div className="flex items-center gap-2 max-sm:flex-wrap">
 							<Input
 								placeholder="Filter by hostname..."
@@ -280,18 +273,7 @@ export const RequestsTable = ({ dateRange }: RequestsTableProps) => {
 												colSpan={columns.length}
 												className="h-24 text-center"
 											>
-												{isLoading ? (
-													<div className="w-full flex gap-4 items-center justify-center h-[55vh] text-muted-foreground">
-														<Loader2 className="size-4 animate-spin" />
-														<span>Loading requests...</span>
-													</div>
-												) : isError ? (
-													<div className="w-full flex items-center justify-center h-[55vh]">
-														<AlertBlock type="error" className="w-full">
-															{error?.message}
-														</AlertBlock>
-													</div>
-												) : (
+												{statsLogs?.data.length === 0 && (
 													<div className="w-full flex-col gap-2 flex items-center justify-center h-[55vh]">
 														<span className="text-muted-foreground text-lg font-medium">
 															No results.

apps/dokploy/components/dashboard/sandbox/add-sandbox.tsx

@@ -1,383 +0,0 @@
-import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-import { Box, PlusIcon } from "lucide-react";
-import { useRouter } from "next/router";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-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 {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Textarea } from "@/components/ui/textarea";
-import { api } from "@/utils/api";
-
-const schema = z
-	.object({
-		name: z.string().max(64).optional(),
-		source: z.enum(["template", "image"]),
-		template: z.enum(["base", "python", "node"]),
-		image: z.string().max(255).optional(),
-		serverId: z.string().nullable(),
-		cpu: z.number().min(0.1).max(64),
-		memoryMb: z.number().int().min(64).max(262_144),
-		timeoutMinutes: z.number().min(1).max(1440),
-		networkMode: z.enum(["isolated", "internet"]),
-		envVars: z.string().optional(),
-	})
-	.refine((value) => value.source === "template" || !!value.image?.trim(), {
-		message: "Image is required",
-		path: ["image"],
-	});
-
-type FormValues = z.infer<typeof schema>;
-
-interface Props {
-	environmentId: string;
-	projectId: string;
-}
-
-export const AddSandbox = ({ environmentId, projectId }: Props) => {
-	const router = useRouter();
-	const utils = api.useUtils();
-	const [open, setOpen] = useState(false);
-	const { data: isCloud } = api.settings.isCloud.useQuery();
-	const { data: webServerSettings } =
-		api.settings.getWebServerSettings.useQuery();
-	const { data: servers } = api.server.withSSHKey.useQuery();
-	const { data: templates } = api.sandbox.templates.useQuery();
-	const { mutateAsync, isPending, error } = api.sandbox.create.useMutation();
-
-	const showLocalOption = !isCloud && !webServerSettings?.remoteServersOnly;
-
-	const form = useForm<FormValues>({
-		defaultValues: {
-			name: "",
-			source: "template",
-			template: "python",
-			image: "",
-			serverId: null,
-			cpu: 1,
-			memoryMb: 512,
-			timeoutMinutes: 5,
-			networkMode: "isolated",
-			envVars: "",
-		},
-		resolver: zodResolver(schema),
-	});
-	const source = form.watch("source");
-
-	const onSubmit = async (values: FormValues) => {
-		try {
-			const sandbox = await mutateAsync({
-				environmentId,
-				name: values.name?.trim() || undefined,
-				template: values.source === "template" ? values.template : undefined,
-				image: values.source === "image" ? values.image?.trim() : undefined,
-				serverId: values.serverId,
-				cpu: values.cpu,
-				memoryMb: values.memoryMb,
-				timeoutMs: Math.round(values.timeoutMinutes * 60_000),
-				networkMode: values.networkMode,
-				envVars: values.envVars?.trim() || undefined,
-			});
-			toast.success("Sandbox created");
-			await utils.sandbox.list.invalidate({ environmentId });
-			setOpen(false);
-			form.reset();
-			router.push(
-				`/dashboard/project/${projectId}/environment/${environmentId}/sandboxes/${sandbox.sandboxId}`,
-			);
-		} catch {
-			toast.error("Error creating the sandbox");
-		}
-	};
-
-	return (
-		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
-				<Button>
-					<PlusIcon className="size-4" />
-					Create Sandbox
-				</Button>
-			</DialogTrigger>
-			<DialogContent className="sm:max-w-2xl md:max-h-[90vh] overflow-y-auto">
-				<DialogHeader>
-					<DialogTitle className="flex items-center gap-2">
-						<Box className="size-5 text-muted-foreground" />
-						New Sandbox
-					</DialogTitle>
-					<DialogDescription>
-						An ephemeral, resource-limited container you can drive through the
-						API. It is removed automatically when its timeout expires.
-					</DialogDescription>
-				</DialogHeader>
-				{error && <AlertBlock type="error">{error.message}</AlertBlock>}
-				<Form {...form}>
-					<form
-						id="add-sandbox-form"
-						onSubmit={form.handleSubmit(onSubmit)}
-						className="grid gap-4"
-					>
-						<FormField
-							control={form.control}
-							name="name"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Name</FormLabel>
-									<FormControl>
-										<Input placeholder="my-sandbox" {...field} />
-									</FormControl>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="source"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Image</FormLabel>
-									<Tabs value={field.value} onValueChange={field.onChange}>
-										<TabsList>
-											<TabsTrigger value="template">Template</TabsTrigger>
-											<TabsTrigger value="image">Custom image</TabsTrigger>
-										</TabsList>
-									</Tabs>
-								</FormItem>
-							)}
-						/>
-
-						{source === "template" ? (
-							<FormField
-								control={form.control}
-								name="template"
-								render={({ field }) => (
-									<FormItem>
-										<Select value={field.value} onValueChange={field.onChange}>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a template" />
-											</SelectTrigger>
-											<SelectContent>
-												{(templates ?? []).map((template) => (
-													<SelectItem key={template.name} value={template.name}>
-														<span className="capitalize">{template.name}</span>
-														<span className="text-muted-foreground">
-															{" "}
-															· {template.image}
-														</span>
-													</SelectItem>
-												))}
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						) : (
-							<FormField
-								control={form.control}
-								name="image"
-								render={({ field }) => (
-									<FormItem>
-										<FormControl>
-											<Input placeholder="alpine:3.20" {...field} />
-										</FormControl>
-										<FormDescription>
-											The image must contain a POSIX shell (sh) and tail.
-										</FormDescription>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-
-						{(servers?.length ?? 0) > 0 && (
-							<FormField
-								control={form.control}
-								name="serverId"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Server</FormLabel>
-										<Select
-											value={field.value ?? "dokploy"}
-											onValueChange={(value) =>
-												field.onChange(value === "dokploy" ? null : value)
-											}
-										>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a server" />
-											</SelectTrigger>
-											<SelectContent>
-												{showLocalOption && (
-													<SelectItem value="dokploy">
-														Dokploy Server
-													</SelectItem>
-												)}
-												{servers?.map((server) => (
-													<SelectItem
-														key={server.serverId}
-														value={server.serverId}
-													>
-														{server.name}
-													</SelectItem>
-												))}
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-
-						<div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
-							<FormField
-								control={form.control}
-								name="cpu"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>CPU cores</FormLabel>
-										<FormControl>
-											<Input
-												type="number"
-												step="0.1"
-												min={0.1}
-												{...field}
-												onChange={(event) =>
-													field.onChange(event.target.valueAsNumber)
-												}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="memoryMb"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Memory (MB)</FormLabel>
-										<FormControl>
-											<Input
-												type="number"
-												step="64"
-												min={64}
-												{...field}
-												onChange={(event) =>
-													field.onChange(event.target.valueAsNumber)
-												}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="timeoutMinutes"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Timeout (minutes)</FormLabel>
-										<FormControl>
-											<Input
-												type="number"
-												step="1"
-												min={1}
-												{...field}
-												onChange={(event) =>
-													field.onChange(event.target.valueAsNumber)
-												}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-
-						<FormField
-							control={form.control}
-							name="networkMode"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Network</FormLabel>
-									<Select value={field.value} onValueChange={field.onChange}>
-										<SelectTrigger>
-											<SelectValue />
-										</SelectTrigger>
-										<SelectContent>
-											<SelectItem value="isolated">
-												Isolated (no network access)
-											</SelectItem>
-											<SelectItem value="internet">Internet access</SelectItem>
-										</SelectContent>
-									</Select>
-									<FormDescription>
-										Sandboxes are never attached to dokploy-network or any
-										application network.
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="envVars"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Environment variables</FormLabel>
-									<FormControl>
-										<Textarea
-											placeholder={"KEY=value\nOTHER=value"}
-											className="font-mono min-h-[80px]"
-											{...field}
-										/>
-									</FormControl>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-					</form>
-				</Form>
-				<DialogFooter>
-					<Button
-						type="submit"
-						form="add-sandbox-form"
-						isLoading={isPending}
-						disabled={isPending}
-					>
-						Create
-					</Button>
-				</DialogFooter>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/sandbox/extend-sandbox-timeout.tsx

@@ -1,120 +0,0 @@
-import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-import { Clock } from "lucide-react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-	Form,
-	FormControl,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-const schema = z.object({
-	minutes: z.number().min(1).max(1440),
-});
-
-interface Props {
-	sandboxId: string;
-	currentTimeoutMs: number;
-}
-
-export const ExtendSandboxTimeout = ({
-	sandboxId,
-	currentTimeoutMs,
-}: Props) => {
-	const utils = api.useUtils();
-	const [open, setOpen] = useState(false);
-	const { mutateAsync, isPending } = api.sandbox.setTimeout.useMutation();
-	const form = useForm<z.infer<typeof schema>>({
-		defaultValues: {
-			minutes: Math.max(1, Math.round(currentTimeoutMs / 60_000)),
-		},
-		resolver: zodResolver(schema),
-	});
-
-	return (
-		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
-				<Button variant="outline">
-					<Clock className="size-4" />
-					Extend timeout
-				</Button>
-			</DialogTrigger>
-			<DialogContent className="sm:max-w-md">
-				<DialogHeader>
-					<DialogTitle>Extend timeout</DialogTitle>
-					<DialogDescription>
-						The sandbox will be killed this many minutes after its last
-						activity.
-					</DialogDescription>
-				</DialogHeader>
-				<Form {...form}>
-					<form
-						id="extend-sandbox-form"
-						className="grid gap-4"
-						onSubmit={form.handleSubmit(async (values) => {
-							await mutateAsync({
-								sandboxId,
-								timeoutMs: Math.round(values.minutes * 60_000),
-							})
-								.then(async () => {
-									toast.success("Timeout updated");
-									await utils.sandbox.one.invalidate({ sandboxId });
-									setOpen(false);
-								})
-								.catch(() => toast.error("Error updating the timeout"));
-						})}
-					>
-						<FormField
-							control={form.control}
-							name="minutes"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Timeout (minutes)</FormLabel>
-									<FormControl>
-										<Input
-											type="number"
-											min={1}
-											step={1}
-											{...field}
-											onChange={(event) =>
-												field.onChange(event.target.valueAsNumber)
-											}
-										/>
-									</FormControl>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-					</form>
-				</Form>
-				<DialogFooter>
-					<Button
-						type="submit"
-						form="extend-sandbox-form"
-						isLoading={isPending}
-						disabled={isPending}
-					>
-						Save
-					</Button>
-				</DialogFooter>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/sandbox/sandbox-console.tsx

@@ -1,185 +0,0 @@
-import { Eraser, Loader2, Play, Terminal } from "lucide-react";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
-import { cn } from "@/lib/utils";
-
-type Line = {
-	kind: "cmd" | "stdout" | "stderr" | "exit" | "error" | "info";
-	text: string;
-};
-
-type ServerMessage =
-	| { type: "ready"; sandboxId: string }
-	| { type: "stdout"; data: string }
-	| { type: "stderr"; data: string }
-	| { type: "exit"; exitCode: number; timedOut: boolean }
-	| { type: "error"; message: string };
-
-interface Props {
-	sandboxId: string;
-	enabled: boolean;
-	workdir: string;
-}
-
-const lineClass: Record<Line["kind"], string> = {
-	cmd: "text-primary font-semibold",
-	stdout: "text-foreground",
-	stderr: "text-orange-500",
-	exit: "text-muted-foreground italic",
-	error: "text-destructive",
-	info: "text-muted-foreground",
-};
-
-export const SandboxConsole = ({ sandboxId, enabled, workdir }: Props) => {
-	const [lines, setLines] = useState<Line[]>([]);
-	const [command, setCommand] = useState("");
-	const [running, setRunning] = useState(false);
-	const [connected, setConnected] = useState(false);
-	const wsRef = useRef<WebSocket | null>(null);
-	const outputRef = useRef<HTMLDivElement | null>(null);
-
-	const append = useCallback((line: Line) => {
-		setLines((prev) => {
-			const last = prev[prev.length - 1];
-			if (
-				last &&
-				(line.kind === "stdout" || line.kind === "stderr") &&
-				last.kind === line.kind &&
-				!last.text.endsWith("\n")
-			) {
-				return [...prev.slice(0, -1), { ...last, text: last.text + line.text }];
-			}
-			return [...prev, line];
-		});
-	}, []);
-
-	useEffect(() => {
-		if (!enabled) return;
-		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-		const ws = new WebSocket(
-			`${protocol}//${window.location.host}/sandbox-exec?sandboxId=${sandboxId}`,
-		);
-		wsRef.current = ws;
-		ws.onopen = () => setConnected(true);
-		ws.onclose = (event) => {
-			setConnected(false);
-			setRunning(false);
-			if (event.code >= 4000) {
-				append({ kind: "error", text: event.reason || "Connection closed" });
-			}
-		};
-		ws.onmessage = (event) => {
-			let message: ServerMessage;
-			try {
-				message = JSON.parse(event.data);
-			} catch {
-				return;
-			}
-			if (message.type === "stdout")
-				append({ kind: "stdout", text: message.data });
-			else if (message.type === "stderr")
-				append({ kind: "stderr", text: message.data });
-			else if (message.type === "exit") {
-				append({
-					kind: "exit",
-					text: message.timedOut
-						? `[timed out, exit code ${message.exitCode}]`
-						: `[exit code ${message.exitCode}]`,
-				});
-				setRunning(false);
-			} else if (message.type === "error") {
-				append({ kind: "error", text: message.message });
-				setRunning(false);
-			}
-		};
-		return () => {
-			ws.close();
-			wsRef.current = null;
-		};
-	}, [sandboxId, enabled, append]);
-
-	useEffect(() => {
-		outputRef.current?.scrollTo({ top: outputRef.current.scrollHeight });
-	}, [lines]);
-
-	const run = () => {
-		const cmd = command.trim();
-		const ws = wsRef.current;
-		if (!cmd || !ws || ws.readyState !== WebSocket.OPEN || running) return;
-		append({ kind: "cmd", text: `$ ${cmd}` });
-		setRunning(true);
-		setCommand("");
-		ws.send(JSON.stringify({ type: "exec", cmd }));
-	};
-
-	return (
-		<Card className="bg-background">
-			<CardHeader className="flex flex-row items-center justify-between">
-				<CardTitle className="text-xl flex items-center gap-2">
-					<Terminal className="size-5 text-muted-foreground" />
-					Console
-					<span className="text-xs font-normal text-muted-foreground">
-						{enabled
-							? connected
-								? "connected"
-								: "connecting..."
-							: "sandbox is not running"}
-					</span>
-				</CardTitle>
-				<Button
-					variant="ghost"
-					size="sm"
-					onClick={() => setLines([])}
-					disabled={lines.length === 0}
-				>
-					<Eraser className="size-4" />
-					Clear
-				</Button>
-			</CardHeader>
-			<CardContent className="flex flex-col gap-3">
-				<div
-					ref={outputRef}
-					className="h-[360px] overflow-auto rounded-lg border bg-muted/30 p-3 font-mono text-xs whitespace-pre-wrap break-words"
-				>
-					{lines.length === 0 ? (
-						<span className="text-muted-foreground">
-							Commands run with `sh -c` inside {workdir}. Output streams here.
-						</span>
-					) : (
-						lines.map((line, index) => (
-							<div key={index} className={cn(lineClass[line.kind])}>
-								{line.text}
-							</div>
-						))
-					)}
-				</div>
-				<form
-					className="flex gap-2"
-					onSubmit={(event) => {
-						event.preventDefault();
-						run();
-					}}
-				>
-					<Input
-						value={command}
-						onChange={(event) => setCommand(event.target.value)}
-						placeholder="echo hello"
-						className="font-mono"
-						disabled={!enabled || !connected || running}
-						autoComplete="off"
-					/>
-					<Button type="submit" disabled={!enabled || !connected || running}>
-						{running ? (
-							<Loader2 className="size-4 animate-spin" />
-						) : (
-							<Play className="size-4" />
-						)}
-						Run
-					</Button>
-				</form>
-			</CardContent>
-		</Card>
-	);
-};

apps/dokploy/components/dashboard/sandbox/sandbox-status-badge.tsx

@@ -1,16 +0,0 @@
-import { Badge } from "@/components/ui/badge";
-
-type SandboxStatus = "creating" | "running" | "killed" | "error";
-
-const variants: Record<SandboxStatus, "green" | "yellow" | "blank" | "red"> = {
-	running: "green",
-	creating: "yellow",
-	killed: "blank",
-	error: "red",
-};
-
-export const SandboxStatusBadge = ({ status }: { status: SandboxStatus }) => (
-	<Badge variant={variants[status]} className="capitalize">
-		{status}
-	</Badge>
-);

apps/dokploy/components/dashboard/sandbox/show-sandboxes.tsx

@@ -1,134 +0,0 @@
-import { formatDistanceToNow } from "date-fns";
-import { Box, ServerIcon, Trash2 } from "lucide-react";
-import Link from "next/link";
-import { toast } from "sonner";
-import { DateTooltip } from "@/components/shared/date-tooltip";
-import { DialogAction } from "@/components/shared/dialog-action";
-import { Button } from "@/components/ui/button";
-import {
-	Table,
-	TableBody,
-	TableCell,
-	TableHead,
-	TableHeader,
-	TableRow,
-} from "@/components/ui/table";
-import { api } from "@/utils/api";
-import { SandboxStatusBadge } from "./sandbox-status-badge";
-
-interface Props {
-	projectId: string;
-	environmentId: string;
-}
-
-export const formatExpiresIn = (expiresAt: Date | null, status: string) => {
-	if (status !== "running" || !expiresAt) return "—";
-	if (expiresAt.getTime() <= Date.now()) return "expired";
-	return formatDistanceToNow(expiresAt, { addSuffix: true });
-};
-
-export const ShowSandboxes = ({ projectId, environmentId }: Props) => {
-	const utils = api.useUtils();
-	const { data: permissions } = api.user.getPermissions.useQuery();
-	const { data: sandboxes, isLoading } = api.sandbox.list.useQuery(
-		{ environmentId },
-		{ refetchInterval: 10_000 },
-	);
-	const { mutateAsync: kill } = api.sandbox.kill.useMutation();
-
-	if (isLoading) {
-		return (
-			<div className="flex min-h-[40vh] items-center justify-center text-sm text-muted-foreground">
-				Loading...
-			</div>
-		);
-	}
-
-	if (!sandboxes || sandboxes.length === 0) {
-		return (
-			<div className="flex min-h-[40vh] w-full flex-col items-center justify-center gap-2">
-				<Box className="size-8 text-muted-foreground" />
-				<span className="font-medium text-muted-foreground">
-					No sandboxes yet. Create one from the UI or through the API.
-				</span>
-			</div>
-		);
-	}
-
-	return (
-		<div className="rounded-lg border overflow-x-auto">
-			<Table>
-				<TableHeader>
-					<TableRow>
-						<TableHead>Name</TableHead>
-						<TableHead>Image</TableHead>
-						<TableHead>Status</TableHead>
-						<TableHead>Server</TableHead>
-						<TableHead>CPU / RAM</TableHead>
-						<TableHead>Expires</TableHead>
-						<TableHead>Created</TableHead>
-						<TableHead className="text-right">Actions</TableHead>
-					</TableRow>
-				</TableHeader>
-				<TableBody>
-					{sandboxes.map((sandbox) => (
-						<TableRow key={sandbox.sandboxId}>
-							<TableCell className="font-medium">
-								<Link
-									href={`/dashboard/project/${projectId}/environment/${environmentId}/sandboxes/${sandbox.sandboxId}`}
-									className="hover:underline"
-								>
-									{sandbox.name}
-								</Link>
-							</TableCell>
-							<TableCell className="font-mono text-xs">
-								{sandbox.image}
-							</TableCell>
-							<TableCell>
-								<SandboxStatusBadge status={sandbox.status} />
-							</TableCell>
-							<TableCell>
-								<span className="flex items-center gap-1.5 text-sm">
-									<ServerIcon className="size-3.5 text-muted-foreground" />
-									{sandbox.server?.name ?? "Dokploy Server"}
-								</span>
-							</TableCell>
-							<TableCell className="text-sm">
-								{sandbox.cpu} vCPU / {sandbox.memoryMb} MB
-							</TableCell>
-							<TableCell className="text-sm text-muted-foreground">
-								{formatExpiresIn(sandbox.expiresAt, sandbox.status)}
-							</TableCell>
-							<TableCell className="text-sm">
-								<DateTooltip date={sandbox.createdAt} />
-							</TableCell>
-							<TableCell className="text-right">
-								{sandbox.status === "running" &&
-									permissions?.deployment.create && (
-										<DialogAction
-											title="Kill sandbox"
-											description={`The container for "${sandbox.name}" will be stopped and removed.`}
-											onClick={async () => {
-												await kill({ sandboxId: sandbox.sandboxId })
-													.then(() => {
-														toast.success("Sandbox killed");
-														utils.sandbox.list.invalidate({ environmentId });
-													})
-													.catch(() =>
-														toast.error("Error killing the sandbox"),
-													);
-											}}
-										>
-											<Button variant="ghost" size="icon">
-												<Trash2 className="size-4 text-destructive" />
-											</Button>
-										</DialogAction>
-									)}
-							</TableCell>
-						</TableRow>
-					))}
-				</TableBody>
-			</Table>
-		</div>
-	);
-};

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

@@ -24,7 +24,7 @@ export const AiForm = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar  p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="flex flex-row gap-2 justify-between">
 						<div>
@@ -62,7 +62,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/api/show-api-keys.tsx

@@ -22,7 +22,7 @@ export const ShowApiKeys = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md">
 					<CardHeader className="flex flex-row gap-2 flex-wrap justify-between items-center">
 						<div>

apps/dokploy/components/dashboard/settings/billing/show-billing-invoices.tsx

@@ -29,7 +29,7 @@ export const ShowBillingInvoices = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="bg-sidebar p-2.5 rounded-xl w-full">
+			<Card className="bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md">
 					<CardHeader>
 						<CardTitle className="text-xl flex flex-row gap-2">

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

@@ -4,7 +4,6 @@ import {
 	AlertTriangle,
 	Bell,
 	CheckIcon,
-	Clock,
 	CreditCard,
 	FileText,
 	Loader2,
@@ -94,7 +93,6 @@ export const ShowBilling = () => {
 	const router = useRouter();
 	const { data: servers } = api.server.count.useQuery();
 	const { data: admin } = api.user.get.useQuery();
-	const { data: billingStatus } = api.stripe.getBillingStatus.useQuery();
 	const { data, isPending } = api.stripe.getProducts.useQuery();
 	const { mutateAsync: createCheckoutSession } =
 		api.stripe.createCheckoutSession.useMutation();
@@ -105,26 +103,8 @@ export const ShowBilling = () => {
 		api.stripe.upgradeSubscription.useMutation();
 	const { mutateAsync: updateInvoiceNotifications } =
 		api.stripe.updateInvoiceNotifications.useMutation();
-	const { mutateAsync: startFreeTrial, isPending: isStartingTrial } =
-		api.stripe.startFreeTrial.useMutation();
 	const utils = api.useUtils();
 
-	const handleStartTrial = async () => {
-		try {
-			await startFreeTrial();
-			await Promise.all([
-				utils.stripe.getBillingStatus.invalidate(),
-				utils.stripe.getProducts.invalidate(),
-				utils.user.get.invalidate(),
-			]);
-			toast.success("Your 7-day trial has started");
-		} catch (error) {
-			toast.error(
-				error instanceof Error ? error.message : "Error starting trial",
-			);
-		}
-	};
-
 	const [hobbyServerQuantity, setHobbyServerQuantity] = useState(1);
 	const [startupServerQuantity, setStartupServerQuantity] = useState(
 		STARTUP_SERVERS_INCLUDED,
@@ -269,94 +249,6 @@ export const ShowBilling = () => {
 						</nav>
 
 						<div className="flex flex-col gap-4 w-full mt-6">
-							{!isEnterpriseCloud &&
-								billingStatus &&
-								(billingStatus.plan || billingStatus.isOnTrial) && (
-									<div className="flex flex-wrap items-center justify-between gap-4 rounded-xl border p-4 max-w-2xl">
-										<div className="flex items-center gap-3">
-											{billingStatus.isOnTrial ? (
-												<Clock className="h-5 w-5 text-primary shrink-0" />
-											) : (
-												<CreditCard className="h-5 w-5 text-primary shrink-0" />
-											)}
-											<div className="flex flex-col">
-												<div className="flex items-center gap-2">
-													<span className="text-sm font-medium">
-														{billingStatus.isOnTrial
-															? "Free trial"
-															: "Current plan"}
-													</span>
-													<Badge className="capitalize" variant="secondary">
-														{billingStatus.plan ?? "Trial"}
-													</Badge>
-												</div>
-												<span className="text-sm text-muted-foreground">
-													{billingStatus.isOnTrial
-														? `${billingStatus.trialDaysRemaining} day${billingStatus.trialDaysRemaining === 1 ? "" : "s"} left${
-																billingStatus.trialEndsAt
-																	? ` · ends ${new Date(billingStatus.trialEndsAt).toLocaleDateString()}`
-																	: ""
-															}`
-														: "You're subscribed and billed automatically."}
-												</span>
-											</div>
-										</div>
-										{billingStatus.isOnTrial &&
-											admin?.user.stripeCustomerId && (
-												<Button
-													size="sm"
-													variant="outline"
-													onClick={async () => {
-														const session = await createCustomerPortalSession();
-														window.open(session.url);
-													}}
-												>
-													Add payment method
-												</Button>
-											)}
-									</div>
-								)}
-							{!isEnterpriseCloud &&
-								billingStatus &&
-								!billingStatus.plan &&
-								!billingStatus.isOnTrial &&
-								!billingStatus.hasUsedTrial && (
-									<div className="flex flex-wrap items-center justify-between gap-4 rounded-xl border border-primary/30 bg-primary/5 p-4 max-w-2xl">
-										<div className="flex items-center gap-3">
-											<Clock className="h-5 w-5 text-primary shrink-0" />
-											<div className="flex flex-col gap-1.5">
-												<span className="text-sm font-medium">
-													7-day free trial
-												</span>
-												<span className="text-sm text-muted-foreground">
-													No credit card required — cancel anytime.
-												</span>
-												<ul className="flex flex-col gap-1 mt-1">
-													{[
-														"Setup 1 server",
-														"Unlimited apps & databases",
-														"Community support",
-													].map((feature) => (
-														<li
-															key={feature}
-															className="flex items-center gap-2 text-sm text-muted-foreground"
-														>
-															<CheckIcon className="size-3.5 shrink-0" />
-															{feature}
-														</li>
-													))}
-												</ul>
-											</div>
-										</div>
-										<Button
-											size="sm"
-											isLoading={isStartingTrial}
-											onClick={handleStartTrial}
-										>
-											Start trial
-										</Button>
-									</div>
-								)}
 							{(admin?.user.stripeSubscriptionId || isEnterpriseCloud) && (
 								<div className="space-y-2 flex flex-col">
 									<h3 className="text-lg font-medium">Servers Plan</h3>
@@ -917,7 +809,7 @@ export const ShowBilling = () => {
 													"Unlimited Deployments",
 													"Unlimited Databases",
 													"Unlimited Applications",
-													"Setup 1 Server",
+													"1 Server Included",
 													"1 Organization",
 													"1 User",
 													"2 Environments",
@@ -1049,7 +941,7 @@ export const ShowBilling = () => {
 													All the features of Hobby, plus…
 												</li>
 												{[
-													"Setup up to 3 Servers",
+													"3 Servers Included",
 													"3 Organizations",
 													"Unlimited Users",
 													"Unlimited Environments",

apps/dokploy/components/dashboard/settings/billing/show-welcome-dokploy.tsx

@@ -0,0 +1,61 @@
+import { useEffect, useState } from "react";
+import { ShowBilling } from "@/components/dashboard/settings/billing/show-billing";
+import {
+	Dialog,
+	DialogContent,
+	DialogHeader,
+	DialogTitle,
+} from "@/components/ui/dialog";
+import { api } from "@/utils/api";
+
+export const ShowWelcomeDokploy = () => {
+	const { data } = api.user.get.useQuery();
+	const [open, setOpen] = useState(false);
+
+	const { data: isCloud, isPending } = api.settings.isCloud.useQuery();
+
+	if (!isCloud || data?.role !== "admin") {
+		return null;
+	}
+
+	useEffect(() => {
+		if (
+			!isPending &&
+			isCloud &&
+			!localStorage.getItem("hasSeenCloudWelcomeModal") &&
+			data?.role === "owner"
+		) {
+			setOpen(true);
+		}
+	}, [isCloud, isPending]);
+
+	const handleClose = (isOpen: boolean) => {
+		if (data?.role === "owner") {
+			setOpen(isOpen);
+			if (!isOpen) {
+				localStorage.setItem("hasSeenCloudWelcomeModal", "true"); // Establece el flag al cerrar el modal
+			}
+		}
+	};
+
+	return (
+		<>
+			<Dialog open={open} onOpenChange={handleClose}>
+				<DialogContent className="sm:max-w-xl">
+					<DialogHeader>
+						<DialogTitle className="text-2xl font-semibold text-center">
+							Welcome to Dokploy Cloud 🎉
+						</DialogTitle>
+						<p className="text-center text-sm text-muted-foreground mt-2">
+							Unlock powerful features to streamline your deployments and manage
+							projects effortlessly.
+						</p>
+					</DialogHeader>
+					<div className="mt-4 space-y-3 text-sm text-primary ">
+						<ShowBilling />
+					</div>
+				</DialogContent>
+			</Dialog>
+		</>
+	);
+};

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

@@ -38,7 +38,7 @@ export const ShowCertificates = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar  p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
@@ -111,7 +111,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/cluster/registry/show-registry.tsx

@@ -20,7 +20,7 @@ export const ShowRegistry = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar  p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
@@ -55,7 +55,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

@@ -19,7 +19,7 @@ export const ShowDestinations = () => {
 	const { data: permissions } = api.user.getPermissions.useQuery();
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar  p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
@@ -56,7 +56,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/dns/dns-record-panel.tsx

@@ -1,421 +0,0 @@
-import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-import { Cloud, CloudOff, XIcon } from "lucide-react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { Textarea } from "@/components/ui/textarea";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-
-export const DNS_RECORD_TYPES = [
-	"A",
-	"AAAA",
-	"CNAME",
-	"MX",
-	"TXT",
-	"NS",
-	"SRV",
-	"CAA",
-	"PTR",
-] as const;
-
-type RecordType = (typeof DNS_RECORD_TYPES)[number];
-
-export const PROXIABLE_TYPES: readonly string[] = ["A", "AAAA", "CNAME"];
-
-const valueFields: Record<
-	RecordType,
-	{ label: string; placeholder: string; hint?: string }
-> = {
-	A: { label: "IPv4 address", placeholder: "203.0.113.10" },
-	AAAA: { label: "IPv6 address", placeholder: "2001:db8::1" },
-	CNAME: { label: "Target", placeholder: "app.example.com" },
-	MX: {
-		label: "Mail server",
-		placeholder: "10 mail.example.com",
-		hint: "Start with the priority, then the mail server.",
-	},
-	TXT: { label: "Value", placeholder: "v=spf1 include:_spf.example.com ~all" },
-	NS: { label: "Nameserver", placeholder: "ns1.example.com" },
-	SRV: {
-		label: "Target",
-		placeholder: "1 10 5269 talk.example.com",
-		hint: "Priority, weight, port, then target.",
-	},
-	CAA: {
-		label: "Value",
-		placeholder: '0 issue "letsencrypt.org"',
-		hint: "Flags, tag, then the quoted value.",
-	},
-	PTR: { label: "Target", placeholder: "host.example.com" },
-};
-
-const structuredValuePatterns: Partial<Record<RecordType, RegExp>> = {
-	SRV: /^\d+\s+\d+\s+\d+\s+\S+$/,
-	CAA: /^\d+\s+\S+\s+.+$/,
-};
-
-const DnsRecordSchema = z
-	.object({
-		type: z.enum(DNS_RECORD_TYPES),
-		name: z.string().min(1, { message: "Name is required" }),
-		content: z.string().min(1, { message: "Content is required" }),
-		ttl: z.string(),
-		proxied: z.boolean(),
-	})
-	.superRefine((data, ctx) => {
-		const values = data.content
-			.split("\n")
-			.map((value) => value.trim())
-			.filter(Boolean);
-		if (!values.length) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				path: ["content"],
-				message: "Content is required",
-			});
-			return;
-		}
-		const pattern = structuredValuePatterns[data.type];
-		if (pattern && !values.every((value) => pattern.test(value))) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				path: ["content"],
-				message: `Expected ${valueFields[data.type].placeholder}`,
-			});
-		}
-	});
-
-type DnsRecordForm = z.infer<typeof DnsRecordSchema>;
-
-export interface DnsRecordValue {
-	id: string;
-	type: string;
-	name: string;
-	content: string;
-	ttl: number;
-	proxied?: boolean;
-}
-
-interface Props {
-	dnsProviderId: string;
-	zoneId: string;
-	zoneName: string;
-	record: DnsRecordValue | null;
-	onClose: () => void;
-}
-
-export const DnsRecordPanel = ({
-	dnsProviderId,
-	zoneId,
-	zoneName,
-	record,
-	onClose,
-}: Props) => {
-	const utils = api.useUtils();
-	const createRecord = api.dnsProvider.createRecord.useMutation();
-	const updateRecord = api.dnsProvider.updateRecord.useMutation();
-	const { mutateAsync, isPending, error, isError } = record
-		? updateRecord
-		: createRecord;
-
-	const { data: provider } = api.dnsProvider.one.useQuery({ dnsProviderId });
-	const { data: servers } = api.server.all.useQuery();
-	const { data: panelPublicIp } = api.server.publicIp.useQuery();
-	const { data: panelStoredIp } = api.settings.getIp.useQuery();
-
-	const panelIp = panelPublicIp || panelStoredIp;
-	const ipSuggestions = [
-		...(panelIp ? [{ ip: panelIp, label: "This Dokploy server" }] : []),
-		...(servers ?? []).map((server) => ({
-			ip: server.ipAddress,
-			label: server.name,
-		})),
-	].filter(
-		(suggestion, index, all) =>
-			!!suggestion.ip && all.findIndex((s) => s.ip === suggestion.ip) === index,
-	);
-
-	const form = useForm<DnsRecordForm>({
-		defaultValues: record
-			? {
-					type: (DNS_RECORD_TYPES.includes(record.type as RecordType)
-						? record.type
-						: "A") as RecordType,
-					name: record.name,
-					content: record.content,
-					ttl: record.ttl && record.ttl !== 1 ? String(record.ttl) : "",
-					proxied: record.proxied ?? false,
-				}
-			: { type: "A", name: "", content: "", ttl: "", proxied: false },
-		resolver: zodResolver(DnsRecordSchema),
-	});
-
-	const type = form.watch("type");
-	const proxied = form.watch("proxied");
-	const canProxy =
-		provider?.providerType === "cloudflare" && PROXIABLE_TYPES.includes(type);
-	const supportsMultipleValues = provider?.providerType === "route53";
-	const usesAutomaticTtl = canProxy && proxied;
-
-	const onSubmit = async (data: DnsRecordForm) => {
-		const name = data.name.trim() === "@" ? zoneName : data.name;
-		const isProxied = canProxy && data.proxied;
-		const payload = {
-			dnsProviderId,
-			zoneId,
-			type: data.type,
-			name,
-			content: data.content,
-			ttl: !isProxied && data.ttl ? Number(data.ttl) : undefined,
-			...(canProxy && { proxied: data.proxied }),
-			...(record && { recordId: record.id }),
-		};
-		await mutateAsync(payload as any)
-			.then(() => {
-				toast.success(record ? "Record updated" : "Record created");
-				utils.dnsProvider.listRecords.invalidate({ dnsProviderId, zoneId });
-				onClose();
-			})
-			.catch(() => {});
-	};
-
-	return (
-		<div className="flex flex-col gap-4 rounded-lg border bg-muted/30 p-4">
-			<div className="flex items-start justify-between gap-2">
-				<div className="flex flex-col gap-0.5">
-					<span className="text-sm font-medium">
-						{record ? "Edit record" : "New record"}
-					</span>
-					<span className="text-xs text-muted-foreground">{zoneName}</span>
-				</div>
-				<Button
-					variant="ghost"
-					size="icon-sm"
-					onClick={onClose}
-					aria-label="Close panel"
-				>
-					<XIcon className="size-4" />
-				</Button>
-			</div>
-
-			{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
-
-			<Form {...form}>
-				<form
-					onSubmit={form.handleSubmit(onSubmit)}
-					className="grid w-full gap-4"
-				>
-					<FormField
-						control={form.control}
-						name="type"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>Type</FormLabel>
-								<Select onValueChange={field.onChange} value={field.value}>
-									<FormControl>
-										<SelectTrigger>
-											<SelectValue />
-										</SelectTrigger>
-									</FormControl>
-									<SelectContent>
-										{DNS_RECORD_TYPES.map((recordType) => (
-											<SelectItem key={recordType} value={recordType}>
-												{recordType}
-											</SelectItem>
-										))}
-									</SelectContent>
-								</Select>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-					<FormField
-						control={form.control}
-						name="name"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>Name</FormLabel>
-								<FormControl>
-									<Input placeholder="app.example.com" {...field} />
-								</FormControl>
-								<FormDescription>
-									Use <code>@</code> for the root domain.
-								</FormDescription>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-					{type === "A" && ipSuggestions.length > 0 && (
-						<FormItem>
-							<FormLabel>Fill from server (optional)</FormLabel>
-							<Select
-								onValueChange={(ip) =>
-									form.setValue("content", ip, { shouldValidate: true })
-								}
-							>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select a server" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									{ipSuggestions.map((suggestion) => (
-										<SelectItem key={suggestion.ip} value={suggestion.ip}>
-											<div className="flex flex-row items-center gap-2">
-												<span>{suggestion.label}</span>
-												<span className="text-xs text-muted-foreground">
-													{suggestion.ip}
-												</span>
-											</div>
-										</SelectItem>
-									))}
-								</SelectContent>
-							</Select>
-						</FormItem>
-					)}
-					<FormField
-						control={form.control}
-						name="content"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>{valueFields[type].label}</FormLabel>
-								<FormControl>
-									{supportsMultipleValues ? (
-										<Textarea
-											className="min-h-[60px] font-mono text-xs"
-											placeholder={valueFields[type].placeholder}
-											{...field}
-										/>
-									) : (
-										<Input
-											placeholder={valueFields[type].placeholder}
-											{...field}
-										/>
-									)}
-								</FormControl>
-								{(supportsMultipleValues || valueFields[type].hint) && (
-									<FormDescription>
-										{[
-											valueFields[type].hint,
-											supportsMultipleValues &&
-												"One value per line: every line belongs to the same record set.",
-										]
-											.filter(Boolean)
-											.join(" ")}
-									</FormDescription>
-								)}
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-					{canProxy && (
-						<FormField
-							control={form.control}
-							name="proxied"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Proxy status</FormLabel>
-									<fieldset className="relative grid min-w-0 grid-cols-2 rounded-lg border bg-muted/40 p-1">
-										<legend className="sr-only">Proxy status</legend>
-										<span
-											aria-hidden="true"
-											className={cn(
-												"pointer-events-none absolute inset-y-1 left-1 z-0 w-[calc(50%-4px)] rounded-md bg-background shadow-sm ring-1 ring-foreground/10 transition-transform duration-[250ms] ease-[var(--ease-smooth-out)] will-change-transform motion-reduce:transition-none",
-												field.value && "translate-x-full",
-											)}
-										/>
-										<button
-											type="button"
-											aria-pressed={!field.value}
-											onClick={() => field.onChange(false)}
-											className={cn(
-												"relative z-10 flex h-8 items-center justify-center gap-1.5 rounded-md text-xs font-medium transition-colors duration-[250ms] ease-[var(--ease-smooth-out)] outline-none focus-visible:ring-3 focus-visible:ring-ring/50 motion-reduce:transition-none",
-												field.value
-													? "text-muted-foreground hover:text-foreground"
-													: "text-foreground",
-											)}
-										>
-											<CloudOff className="size-3.5" />
-											DNS only
-										</button>
-										<button
-											type="button"
-											aria-pressed={field.value}
-											onClick={() => field.onChange(true)}
-											className={cn(
-												"relative z-10 flex h-8 items-center justify-center gap-1.5 rounded-md text-xs font-medium transition-colors duration-[250ms] ease-[var(--ease-smooth-out)] outline-none focus-visible:ring-3 focus-visible:ring-ring/50 motion-reduce:transition-none",
-												field.value
-													? "text-[#f6821f]"
-													: "text-muted-foreground hover:text-foreground",
-											)}
-										>
-											<Cloud className="size-3.5" />
-											Proxied
-										</button>
-									</fieldset>
-									<FormDescription>
-										{field.value
-											? "Traffic runs through Cloudflare and the origin IP stays hidden."
-											: "Cloudflare only answers the DNS query; traffic reaches the origin directly."}
-									</FormDescription>
-								</FormItem>
-							)}
-						/>
-					)}
-					<FormField
-						control={form.control}
-						name="ttl"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>TTL (optional)</FormLabel>
-								<FormControl>
-									<Input
-										type="number"
-										placeholder="Auto"
-										className="tabular-nums"
-										disabled={usesAutomaticTtl}
-										{...field}
-									/>
-								</FormControl>
-								{usesAutomaticTtl && (
-									<FormDescription>
-										Proxied records always use automatic TTL.
-									</FormDescription>
-								)}
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-					<div className="flex flex-row justify-end gap-2">
-						<Button type="button" variant="ghost" onClick={onClose}>
-							Cancel
-						</Button>
-						<Button type="submit" isLoading={isPending}>
-							{record ? "Update" : "Create"}
-						</Button>
-					</div>
-				</form>
-			</Form>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/settings/dns/dns-record-type-badge.tsx

@@ -1,33 +0,0 @@
-import { cn } from "@/lib/utils";
-
-const recordTypeStyles: Record<string, string> = {
-	A: "bg-blue-500/10 text-blue-700 ring-blue-500/25 dark:text-blue-300",
-	AAAA: "bg-indigo-500/10 text-indigo-700 ring-indigo-500/25 dark:text-indigo-300",
-	CNAME:
-		"bg-violet-500/10 text-violet-700 ring-violet-500/25 dark:text-violet-300",
-	MX: "bg-amber-500/10 text-amber-700 ring-amber-500/25 dark:text-amber-300",
-	TXT: "bg-emerald-500/10 text-emerald-700 ring-emerald-500/25 dark:text-emerald-300",
-	NS: "bg-cyan-500/10 text-cyan-700 ring-cyan-500/25 dark:text-cyan-300",
-	SRV: "bg-rose-500/10 text-rose-700 ring-rose-500/25 dark:text-rose-300",
-	CAA: "bg-teal-500/10 text-teal-700 ring-teal-500/25 dark:text-teal-300",
-	PTR: "bg-orange-500/10 text-orange-700 ring-orange-500/25 dark:text-orange-300",
-	SOA: "bg-slate-500/10 text-slate-700 ring-slate-500/25 dark:text-slate-300",
-};
-
-interface Props {
-	type: string;
-	className?: string;
-}
-
-export const DnsRecordTypeBadge = ({ type, className }: Props) => (
-	<span
-		className={cn(
-			"inline-flex h-6 min-w-16 shrink-0 items-center justify-center rounded-md px-2 font-mono text-[11px] font-semibold tracking-wide ring-1 ring-inset",
-			recordTypeStyles[type.toUpperCase()] ??
-				"bg-foreground/5 text-muted-foreground ring-foreground/15",
-			className,
-		)}
-	>
-		{type.toUpperCase()}
-	</span>
-);

apps/dokploy/components/dashboard/settings/dns/handle-dns-provider.tsx

@@ -33,29 +33,11 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 
 const providerLabels = {
 	cloudflare: "Cloudflare",
 	route53: "AWS Route53",
-	porkbun: "Porkbun",
-	infomaniak: "Infomaniak",
-	ovh: "OVHcloud",
-} as const;
-
-const ovhEndpointLabels = {
-	"ovh-eu": "OVHcloud Europe",
-	"ovh-ca": "OVHcloud Canada",
-	"ovh-us": "OVHcloud US",
-	"kimsufi-eu": "Kimsufi Europe",
-	"kimsufi-ca": "Kimsufi Canada",
-	"soyoustart-eu": "So you Start Europe",
-	"soyoustart-ca": "So you Start Canada",
 } as const;
 
 type ProviderType = keyof typeof providerLabels;
@@ -67,27 +49,10 @@ const DnsProviderSchema = z.object({
 		.regex(/^[a-zA-Z0-9_-]+$/, {
 			message: "Only letters, numbers, dashes and underscores",
 		}),
-	providerType: z.enum([
-		"cloudflare",
-		"route53",
-		"porkbun",
-		"infomaniak",
-		"ovh",
-	]),
+	providerType: z.enum(["cloudflare", "route53"]),
 	apiToken: z.string(),
 	accessKeyId: z.string(),
 	secretAccessKey: z.string(),
-	apiKey: z.string(),
-	secretApiKey: z.string(),
-	endpoint: z.enum(
-		Object.keys(ovhEndpointLabels) as [
-			keyof typeof ovhEndpointLabels,
-			...(keyof typeof ovhEndpointLabels)[],
-		],
-	),
-	applicationKey: z.string(),
-	applicationSecret: z.string(),
-	consumerKey: z.string(),
 });
 
 type DnsProviderForm = z.infer<typeof DnsProviderSchema>;
@@ -98,12 +63,6 @@ const defaultValues: DnsProviderForm = {
 	apiToken: "",
 	accessKeyId: "",
 	secretAccessKey: "",
-	apiKey: "",
-	secretApiKey: "",
-	endpoint: "ovh-eu",
-	applicationKey: "",
-	applicationSecret: "",
-	consumerKey: "",
 };
 
 const buildConfig = (data: DnsProviderForm) => {
@@ -119,25 +78,6 @@ const buildConfig = (data: DnsProviderForm) => {
 				accessKeyId: data.accessKeyId,
 				secretAccessKey: data.secretAccessKey,
 			};
-		case "porkbun":
-			return {
-				providerType: "porkbun" as const,
-				apiKey: data.apiKey,
-				secretApiKey: data.secretApiKey,
-			};
-		case "infomaniak":
-			return {
-				providerType: "infomaniak" as const,
-				apiToken: data.apiToken,
-			};
-		case "ovh":
-			return {
-				providerType: "ovh" as const,
-				endpoint: data.endpoint,
-				applicationKey: data.applicationKey,
-				applicationSecret: data.applicationSecret,
-				consumerKey: data.consumerKey,
-			};
 	}
 };
 
@@ -195,19 +135,6 @@ export const HandleDnsProvider = ({ dnsProviderId }: Props) => {
 					accessKeyId: provider.config.accessKeyId,
 					secretAccessKey: provider.config.secretAccessKey,
 				}),
-				...(provider.config.providerType === "porkbun" && {
-					apiKey: provider.config.apiKey,
-					secretApiKey: provider.config.secretApiKey,
-				}),
-				...(provider.config.providerType === "infomaniak" && {
-					apiToken: provider.config.apiToken,
-				}),
-				...(provider.config.providerType === "ovh" && {
-					endpoint: provider.config.endpoint,
-					applicationKey: provider.config.applicationKey,
-					applicationSecret: provider.config.applicationSecret,
-					consumerKey: provider.config.consumerKey,
-				}),
 			});
 		} else if (!dnsProviderId) {
 			form.reset(defaultValues);
@@ -253,30 +180,22 @@ export const HandleDnsProvider = ({ dnsProviderId }: Props) => {
 
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			{dnsProviderId ? (
-				<Tooltip>
-					<TooltipTrigger asChild>
-						<DialogTrigger asChild>
-							<Button
-								variant="ghost"
-								size="icon"
-								className="text-muted-foreground"
-							>
-								<PenBoxIcon className="size-4" />
-								<span className="sr-only">Edit provider</span>
-							</Button>
-						</DialogTrigger>
-					</TooltipTrigger>
-					<TooltipContent>Edit provider</TooltipContent>
-				</Tooltip>
-			) : (
-				<DialogTrigger asChild>
-					<Button>
-						<PlusIcon className="size-4" />
+			<DialogTrigger asChild>
+				{dnsProviderId ? (
+					<Button
+						variant="ghost"
+						size="icon"
+						className="group hover:bg-blue-500/10"
+					>
+						<PenBoxIcon className="size-4 text-primary group-hover:text-blue-500" />
+					</Button>
+				) : (
+					<Button className="cursor-pointer space-x-3">
+						<PlusIcon className="h-4 w-4" />
 						Add Provider
 					</Button>
-				</DialogTrigger>
-			)}
+				)}
+			</DialogTrigger>
 			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>
@@ -400,154 +319,6 @@ export const HandleDnsProvider = ({ dnsProviderId }: Props) => {
 							</>
 						)}
 
-						{providerType === "porkbun" && (
-							<>
-								<FormField
-									control={form.control}
-									name="apiKey"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>API Key</FormLabel>
-											<FormControl>
-												<Input {...field} />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name="secretApiKey"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Secret API Key</FormLabel>
-											<FormControl>
-												<Input type="password" {...field} />
-											</FormControl>
-											<FormDescription>
-												Create API keys at porkbun.com/account/api and make sure
-												API access is enabled for the domains you want Dokploy
-												to manage.
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-							</>
-						)}
-
-						{providerType === "infomaniak" && (
-							<FormField
-								control={form.control}
-								name="apiToken"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>API Token</FormLabel>
-										<FormControl>
-											<Input type="password" {...field} />
-										</FormControl>
-										<FormDescription>
-											Create a token at manager.infomaniak.com with the{" "}
-											<code>domain:read</code>, <code>dns:read</code> and{" "}
-											<code>dns:write</code> scopes.
-										</FormDescription>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-
-						{providerType === "ovh" && (
-							<>
-								<FormField
-									control={form.control}
-									name="endpoint"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>API Endpoint</FormLabel>
-											<Select
-												onValueChange={field.onChange}
-												value={field.value}
-											>
-												<FormControl>
-													<SelectTrigger>
-														<SelectValue placeholder="Select an endpoint" />
-													</SelectTrigger>
-												</FormControl>
-												<SelectContent>
-													{Object.entries(ovhEndpointLabels).map(
-														([value, label]) => (
-															<SelectItem key={value} value={value}>
-																{label}
-															</SelectItem>
-														),
-													)}
-												</SelectContent>
-											</Select>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name="applicationKey"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Application Key</FormLabel>
-											<FormControl>
-												<Input {...field} />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name="applicationSecret"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Application Secret</FormLabel>
-											<FormControl>
-												<Input type="password" {...field} />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name="consumerKey"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Consumer Key</FormLabel>
-											<FormControl>
-												<Input type="password" {...field} />
-											</FormControl>
-											<FormDescription>
-												Create the three keys at once on
-												api.ovh.com/createToken, with exactly these five rights:
-												<br />
-												<code>GET /domain/zone</code>
-												<br />
-												<code>GET /domain/zone/*</code>
-												<br />
-												<code>POST /domain/zone/*</code>
-												<br />
-												<code>PUT /domain/zone/*</code>
-												<br />
-												<code>DELETE /domain/zone/*</code>
-												<br />
-												The first one lists your zones and has to be granted on
-												its own: OVH matches rights per exact path, so{" "}
-												<code>/domain/zone/*</code> does not cover it.
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-							</>
-						)}
-
 						<DialogFooter className="flex w-full flex-row justify-between gap-2 sm:justify-between">
 							<Button
 								type="button"

apps/dokploy/components/dashboard/settings/dns/handle-dns-record.tsx

@@ -0,0 +1,271 @@
+import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
+import { PenBoxIcon, PlusIcon } from "lucide-react";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+import { AlertBlock } from "@/components/shared/alert-block";
+import { Button } from "@/components/ui/button";
+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 {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { api } from "@/utils/api";
+
+const DnsRecordSchema = z.object({
+	type: z.enum(["A", "CNAME"]),
+	name: z.string().min(1, { message: "Name is required" }),
+	content: z.string().min(1, { message: "Content is required" }),
+	ttl: z.string(),
+});
+
+type DnsRecordForm = z.infer<typeof DnsRecordSchema>;
+
+interface DnsRecordValue {
+	id: string;
+	type: string;
+	name: string;
+	content: string;
+	ttl: number;
+}
+
+interface Props {
+	dnsProviderId: string;
+	zoneId: string;
+	zoneName: string;
+	record?: DnsRecordValue;
+}
+
+export const HandleDnsRecord = ({
+	dnsProviderId,
+	zoneId,
+	zoneName,
+	record,
+}: Props) => {
+	const utils = api.useUtils();
+	const [isOpen, setIsOpen] = useState(false);
+
+	const { mutateAsync, isPending, error, isError } = record
+		? api.dnsProvider.updateRecord.useMutation()
+		: api.dnsProvider.createRecord.useMutation();
+
+	const { data: servers } = api.server.all.useQuery(undefined, {
+		enabled: isOpen,
+	});
+	const { data: panelPublicIp } = api.server.publicIp.useQuery(undefined, {
+		enabled: isOpen,
+	});
+	const { data: panelStoredIp } = api.settings.getIp.useQuery(undefined, {
+		enabled: isOpen,
+	});
+
+	const panelIp = panelPublicIp || panelStoredIp;
+	const ipSuggestions = [
+		...(panelIp ? [{ ip: panelIp, label: "This Dokploy server" }] : []),
+		...(servers ?? []).map((server) => ({
+			ip: server.ipAddress,
+			label: server.name,
+		})),
+	].filter(
+		(suggestion, index, all) =>
+			!!suggestion.ip && all.findIndex((s) => s.ip === suggestion.ip) === index,
+	);
+
+	const form = useForm<DnsRecordForm>({
+		defaultValues: record
+			? {
+					type: record.type === "CNAME" ? "CNAME" : "A",
+					name: record.name,
+					content: record.content,
+					ttl: record.ttl && record.ttl !== 1 ? String(record.ttl) : "",
+				}
+			: { type: "A", name: "", content: "", ttl: "" },
+		resolver: zodResolver(DnsRecordSchema),
+	});
+
+	const type = form.watch("type");
+
+	const onSubmit = async (data: DnsRecordForm) => {
+		const name = data.name.trim() === "@" ? zoneName : data.name;
+		const payload = {
+			dnsProviderId,
+			zoneId,
+			type: data.type,
+			name,
+			content: data.content,
+			ttl: data.ttl ? Number(data.ttl) : undefined,
+			...(record && { recordId: record.id }),
+		};
+		await mutateAsync(payload as any)
+			.then(() => {
+				toast.success(record ? "Record updated" : "Record created");
+				utils.dnsProvider.listRecords.invalidate({ dnsProviderId, zoneId });
+				setIsOpen(false);
+			})
+			.catch(() => {});
+	};
+
+	return (
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+			<DialogTrigger asChild>
+				{record ? (
+					<Button
+						variant="ghost"
+						size="icon"
+						className="group hover:bg-blue-500/10 size-6"
+					>
+						<PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" />
+					</Button>
+				) : (
+					<Button variant="outline" size="sm">
+						<PlusIcon className="size-3.5 mr-1.5" />
+						Add Record
+					</Button>
+				)}
+			</DialogTrigger>
+			<DialogContent className="sm:max-w-md">
+				<DialogHeader>
+					<DialogTitle>{record ? "Edit Record" : "Add Record"}</DialogTitle>
+					<DialogDescription>
+						{record
+							? "Update this DNS record."
+							: "Create a new A or CNAME record in this zone."}
+					</DialogDescription>
+				</DialogHeader>
+				{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
+				<Form {...form}>
+					<form
+						onSubmit={form.handleSubmit(onSubmit)}
+						className="grid w-full gap-4"
+					>
+						<FormField
+							control={form.control}
+							name="type"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Type</FormLabel>
+									<Select onValueChange={field.onChange} value={field.value}>
+										<FormControl>
+											<SelectTrigger>
+												<SelectValue />
+											</SelectTrigger>
+										</FormControl>
+										<SelectContent>
+											<SelectItem value="A">A</SelectItem>
+											<SelectItem value="CNAME">CNAME</SelectItem>
+										</SelectContent>
+									</Select>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="name"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Name</FormLabel>
+									<FormControl>
+										<Input placeholder="app.example.com" {...field} />
+									</FormControl>
+									<FormDescription>
+										Use <code>@</code> for the root domain.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						{type === "A" && ipSuggestions.length > 0 && (
+							<FormItem>
+								<FormLabel>Fill from server (optional)</FormLabel>
+								<Select
+									onValueChange={(ip) =>
+										form.setValue("content", ip, { shouldValidate: true })
+									}
+								>
+									<FormControl>
+										<SelectTrigger>
+											<SelectValue placeholder="Select a server" />
+										</SelectTrigger>
+									</FormControl>
+									<SelectContent>
+										{ipSuggestions.map((suggestion) => (
+											<SelectItem key={suggestion.ip} value={suggestion.ip}>
+												<div className="flex flex-row items-center gap-2">
+													<span>{suggestion.label}</span>
+													<span className="text-xs text-muted-foreground">
+														{suggestion.ip}
+													</span>
+												</div>
+											</SelectItem>
+										))}
+									</SelectContent>
+								</Select>
+							</FormItem>
+						)}
+						<FormField
+							control={form.control}
+							name="content"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>
+										{type === "A" ? "IPv4 Address" : "Target"}
+									</FormLabel>
+									<FormControl>
+										<Input
+											placeholder={
+												type === "A" ? "203.0.113.10" : "app.example.com"
+											}
+											{...field}
+										/>
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="ttl"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>TTL (optional)</FormLabel>
+									<FormControl>
+										<Input type="number" placeholder="Auto" {...field} />
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<DialogFooter>
+							<Button type="submit" isLoading={isPending}>
+								{record ? "Update" : "Create"}
+							</Button>
+						</DialogFooter>
+					</form>
+				</Form>
+			</DialogContent>
+		</Dialog>
+	);
+};

apps/dokploy/components/dashboard/settings/dns/show-dns-provider-zones.tsx

@@ -0,0 +1,218 @@
+import {
+	ChevronDown,
+	ChevronRight,
+	Globe,
+	Loader2,
+	Trash2,
+} from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import { DialogAction } from "@/components/shared/dialog-action";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import { api } from "@/utils/api";
+import { HandleDnsRecord } from "./handle-dns-record";
+
+interface ZoneRecordsProps {
+	dnsProviderId: string;
+	zoneId: string;
+	zoneName: string;
+}
+
+const ZoneRecords = ({ dnsProviderId, zoneId, zoneName }: ZoneRecordsProps) => {
+	const utils = api.useUtils();
+	const { data, isLoading, isError, error } =
+		api.dnsProvider.listRecords.useQuery({ dnsProviderId, zoneId });
+	const { data: permissions } = api.user.getPermissions.useQuery();
+	const { mutateAsync: deleteRecord, isPending: isDeleting } =
+		api.dnsProvider.deleteRecord.useMutation();
+
+	const canWrite = !!permissions?.dnsProvider.update;
+	const canDelete = !!permissions?.dnsProvider.delete;
+
+	return (
+		<div className="flex flex-col gap-1 pl-8 pb-2 pr-3">
+			{isLoading && (
+				<div className="flex flex-row gap-2 items-center text-sm text-muted-foreground py-3">
+					<span>Loading records...</span>
+					<Loader2 className="animate-spin size-4" />
+				</div>
+			)}
+			{isError && (
+				<p className="text-sm text-destructive py-2">{error?.message}</p>
+			)}
+			{data && data.length === 0 && (
+				<p className="text-sm text-muted-foreground py-2">
+					No records found in this zone.
+				</p>
+			)}
+			{data?.map((record) => {
+				const isEditable = record.type === "A" || record.type === "CNAME";
+				return (
+					<div
+						key={record.id}
+						className="flex items-center gap-2 rounded-md border px-3 py-1.5 text-xs"
+					>
+						<Badge variant="outline" className="shrink-0">
+							{record.type}
+						</Badge>
+						<span className="font-medium truncate">{record.name}</span>
+						<span className="text-muted-foreground truncate flex-1">
+							→ {record.content}
+						</span>
+						{canWrite && isEditable && (
+							<HandleDnsRecord
+								dnsProviderId={dnsProviderId}
+								zoneId={zoneId}
+								zoneName={zoneName}
+								record={record}
+							/>
+						)}
+						{canDelete && (
+							<DialogAction
+								title="Delete Record"
+								description={`Delete the ${record.type} record "${record.name}"? This removes it from the DNS provider, not just from Dokploy.`}
+								type="destructive"
+								onClick={async () => {
+									await deleteRecord({
+										dnsProviderId,
+										zoneId,
+										recordId: record.id,
+									})
+										.then(() => {
+											toast.success("Record deleted");
+											utils.dnsProvider.listRecords.invalidate({
+												dnsProviderId,
+												zoneId,
+											});
+										})
+										.catch(() => {
+											toast.error("Error deleting the record");
+										});
+								}}
+							>
+								<Button
+									variant="ghost"
+									size="icon"
+									className="group hover:bg-red-500/10 size-6"
+									isLoading={isDeleting}
+								>
+									<Trash2 className="size-3.5 text-primary group-hover:text-red-500" />
+								</Button>
+							</DialogAction>
+						)}
+					</div>
+				);
+			})}
+			{canWrite && (
+				<div className="pt-1">
+					<HandleDnsRecord
+						dnsProviderId={dnsProviderId}
+						zoneId={zoneId}
+						zoneName={zoneName}
+					/>
+				</div>
+			)}
+		</div>
+	);
+};
+
+interface Props {
+	dnsProviderId: string;
+	providerName: string;
+}
+
+export const ShowDnsProviderZones = ({
+	dnsProviderId,
+	providerName,
+}: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
+	const [expandedZoneId, setExpandedZoneId] = useState<string | null>(null);
+
+	const { data, isLoading, isError, error } =
+		api.dnsProvider.listZones.useQuery({ dnsProviderId }, { enabled: isOpen });
+
+	return (
+		<Dialog
+			open={isOpen}
+			onOpenChange={(open) => {
+				setIsOpen(open);
+				if (!open) {
+					setExpandedZoneId(null);
+				}
+			}}
+		>
+			<DialogTrigger asChild>
+				<Button variant="outline" size="sm">
+					<Globe className="size-3.5 mr-1.5" />
+					View Domains
+				</Button>
+			</DialogTrigger>
+			<DialogContent className="sm:max-w-lg">
+				<DialogHeader>
+					<DialogTitle>Domains for {providerName}</DialogTitle>
+					<DialogDescription>
+						Zones this provider's API token can manage. Click a zone to see and
+						manage its records.
+					</DialogDescription>
+				</DialogHeader>
+				{isLoading && (
+					<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground py-6">
+						<span>Loading...</span>
+						<Loader2 className="animate-spin size-4" />
+					</div>
+				)}
+				{isError && (
+					<p className="text-sm text-destructive py-2">{error?.message}</p>
+				)}
+				{data && data.length === 0 && (
+					<p className="text-sm text-muted-foreground py-2">
+						No zones found for this token. Make sure it has access to at least
+						one zone.
+					</p>
+				)}
+				{data && data.length > 0 && (
+					<div className="flex flex-col gap-1.5 max-h-[60vh] overflow-y-auto">
+						{data.map((zone) => {
+							const isExpanded = expandedZoneId === zone.id;
+							return (
+								<div key={zone.id} className="rounded-md border">
+									<button
+										type="button"
+										className="flex items-center gap-2 w-full px-3 py-2 text-sm text-left"
+										onClick={() =>
+											setExpandedZoneId(isExpanded ? null : zone.id)
+										}
+									>
+										{isExpanded ? (
+											<ChevronDown className="size-3.5 text-muted-foreground shrink-0" />
+										) : (
+											<ChevronRight className="size-3.5 text-muted-foreground shrink-0" />
+										)}
+										<Globe className="size-3.5 text-muted-foreground shrink-0" />
+										{zone.name}
+									</button>
+									{isExpanded && (
+										<ZoneRecords
+											dnsProviderId={dnsProviderId}
+											zoneId={zone.id}
+											zoneName={zone.name}
+										/>
+									)}
+								</div>
+							);
+						})}
+					</div>
+				)}
+			</DialogContent>
+		</Dialog>
+	);
+};

apps/dokploy/components/dashboard/settings/dns/show-dns-providers.tsx

@@ -1,9 +1,8 @@
-import { EyeIcon, Globe, Loader2, Trash2 } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
+import { Globe, Loader2, Trash2 } from "lucide-react";
 import { toast } from "sonner";
 import { dnsProviderIcons } from "@/components/icons/dns-provider-icons";
 import { DialogAction } from "@/components/shared/dialog-action";
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
 	Card,
@@ -12,159 +11,131 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import { HandleDnsProvider } from "./handle-dns-provider";
+import { ShowDnsProviderZones } from "./show-dns-provider-zones";
 
 const providerLabels: Record<string, string> = {
 	cloudflare: "Cloudflare",
 	route53: "AWS Route53",
-	porkbun: "Porkbun",
-	infomaniak: "Infomaniak",
-	ovh: "OVHcloud",
 };
 
 export const ShowDnsProviders = () => {
-	const [removingId, setRemovingId] = useState<string | null>(null);
-	const { mutateAsync } = api.dnsProvider.remove.useMutation();
+	const { mutateAsync, isPending: isRemoving } =
+		api.dnsProvider.remove.useMutation();
 	const { data, isPending, refetch } = api.dnsProvider.all.useQuery();
 	const { data: permissions } = api.user.getPermissions.useQuery();
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar p-2.5 rounded-xl">
+			<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md">
-					<div className="flex flex-wrap items-center justify-between gap-4 p-6">
-						<CardHeader className="flex-1 p-0">
-							<CardTitle className="text-xl flex flex-row gap-2">
-								<Globe className="size-6 text-muted-foreground self-center" />
-								DNS Providers
-							</CardTitle>
-							<CardDescription>
-								Connect a DNS provider so Dokploy can create the A/CNAME record
-								for a domain instead of you setting it up by hand.
-							</CardDescription>
-						</CardHeader>
-						{permissions?.dnsProvider.create && <HandleDnsProvider />}
-					</div>
-
-					<CardContent className="flex min-h-[60vh] flex-col gap-4 border-t py-8">
+					<CardHeader>
+						<CardTitle className="text-xl flex flex-row gap-2">
+							<Globe className="size-6 text-muted-foreground self-center" />
+							DNS Providers
+						</CardTitle>
+						<CardDescription>
+							Connect a DNS provider so Dokploy can create the A/CNAME record
+							for a domain instead of you setting it up by hand.
+						</CardDescription>
+					</CardHeader>
+					<CardContent className="space-y-2 py-8 border-t">
 						{isPending ? (
-							<div className="flex flex-1 flex-row items-center justify-center gap-2 text-sm text-muted-foreground">
+							<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground min-h-[25vh]">
 								<span>Loading...</span>
 								<Loader2 className="animate-spin size-4" />
 							</div>
-						) : data?.length === 0 ? (
-							<div className="flex min-h-[50vh] flex-col items-center justify-center gap-3">
-								<Globe className="size-8 text-muted-foreground" />
-								<span className="font-medium text-muted-foreground">
-									No DNS providers connected
-								</span>
-								<span className="max-w-sm text-center text-sm text-muted-foreground">
-									Add Cloudflare or Route53 credentials to manage domain records
-									without leaving Dokploy.
-								</span>
-							</div>
 						) : (
-							<ul className="flex flex-col gap-2">
-								{data?.map((provider) => {
-									const ProviderIcon = dnsProviderIcons[provider.providerType];
-									const href = `/dashboard/settings/dns/${provider.dnsProviderId}`;
-									return (
-										<li
-											key={provider.dnsProviderId}
-											className="group relative flex items-center gap-3 rounded-lg border bg-background px-4 py-3 transition-colors duration-150 ease-out hover:border-foreground/20 hover:bg-muted/50 focus-within:border-ring"
-										>
-											<Link
-												href={href}
-												aria-label={`View domains for ${provider.name}`}
-												className="absolute inset-0 rounded-lg outline-none"
-											/>
-											<ProviderIcon className="size-7 shrink-0" />
-											<div className="flex min-w-0 flex-col gap-0.5">
-												<span className="truncate text-sm font-medium">
-													{provider.name}
-												</span>
-												<span className="text-xs text-muted-foreground">
-													{providerLabels[provider.providerType] ??
-														provider.providerType}
-												</span>
-											</div>
-
-											<div className="relative z-10 ml-auto flex flex-row items-center gap-1">
-												<Tooltip>
-													<TooltipTrigger asChild>
-														<Button
-															variant="ghost"
-															size="icon"
-															className="text-muted-foreground"
-															asChild
-														>
-															<Link href={href}>
-																<EyeIcon className="size-4" />
-																<span className="sr-only">View domains</span>
-															</Link>
-														</Button>
-													</TooltipTrigger>
-													<TooltipContent>View domains</TooltipContent>
-												</Tooltip>
-
-												{permissions?.dnsProvider.update && (
-													<HandleDnsProvider
-														dnsProviderId={provider.dnsProviderId}
-													/>
-												)}
-												{permissions?.dnsProvider.delete && (
-													<Tooltip>
-														<DialogAction
-															title="Delete DNS Provider"
-															description="Domains that rely on this provider to manage their records will need to be updated manually. Are you sure?"
-															type="destructive"
-															onClick={async () => {
-																setRemovingId(provider.dnsProviderId);
-																await mutateAsync({
-																	dnsProviderId: provider.dnsProviderId,
-																})
-																	.then(() => {
-																		toast.success("DNS provider deleted");
-																		refetch();
-																	})
-																	.catch(() => {
-																		toast.error(
-																			"Error deleting the DNS provider",
-																		);
-																	})
-																	.finally(() => setRemovingId(null));
-															}}
-														>
-															<TooltipTrigger asChild>
-																<Button
-																	variant="ghost"
-																	size="icon"
-																	className="text-muted-foreground hover:bg-red-500/10 hover:text-red-500"
-																	isLoading={
-																		removingId === provider.dnsProviderId
-																	}
-																>
-																	<Trash2 className="size-4" />
-																	<span className="sr-only">
-																		Delete provider
+							<>
+								{data?.length === 0 ? (
+									<div className="flex flex-col items-center gap-3 min-h-[25vh] justify-center">
+										<Globe className="size-8 self-center text-muted-foreground" />
+										<span className="text-base text-muted-foreground text-center">
+											You don't have any DNS providers configured
+										</span>
+										{permissions?.dnsProvider.create && <HandleDnsProvider />}
+									</div>
+								) : (
+									<div className="flex flex-col gap-4 min-h-[25vh]">
+										<div className="flex flex-col gap-4 rounded-lg">
+											{data?.map((provider) => {
+												const ProviderIcon =
+													dnsProviderIcons[provider.providerType];
+												return (
+													<div
+														key={provider.dnsProviderId}
+														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 flex-row items-center gap-3">
+																<ProviderIcon className="size-7 shrink-0" />
+																<div className="flex gap-2 flex-col">
+																	<span className="text-sm font-medium">
+																		{provider.name}
 																	</span>
-																</Button>
-															</TooltipTrigger>
-														</DialogAction>
-														<TooltipContent>Delete provider</TooltipContent>
-													</Tooltip>
-												)}
+																	<Badge variant="outline">
+																		{providerLabels[provider.providerType] ??
+																			provider.providerType}
+																	</Badge>
+																</div>
+															</div>
+
+															<div className="flex flex-row gap-1">
+																<ShowDnsProviderZones
+																	dnsProviderId={provider.dnsProviderId}
+																	providerName={provider.name}
+																/>
+																{permissions?.dnsProvider.update && (
+																	<HandleDnsProvider
+																		dnsProviderId={provider.dnsProviderId}
+																	/>
+																)}
+																{permissions?.dnsProvider.delete && (
+																	<DialogAction
+																		title="Delete DNS Provider"
+																		description="Domains that rely on this provider to manage their records will need to be updated manually. Are you sure?"
+																		type="destructive"
+																		onClick={async () => {
+																			await mutateAsync({
+																				dnsProviderId: provider.dnsProviderId,
+																			})
+																				.then(() => {
+																					toast.success("DNS provider deleted");
+																					refetch();
+																				})
+																				.catch(() => {
+																					toast.error(
+																						"Error deleting the DNS provider",
+																					);
+																				});
+																		}}
+																	>
+																		<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>
+
+										{permissions?.dnsProvider.create && (
+											<div className="flex flex-row gap-2 flex-wrap w-full justify-end mr-4">
+												<HandleDnsProvider />
 											</div>
-										</li>
-									);
-								})}
-							</ul>
+										)}
+									</div>
+								)}
+							</>
 						)}
 					</CardContent>
 				</div>

apps/dokploy/components/dashboard/settings/dns/show-dns-records.tsx

@@ -1,589 +0,0 @@
-import {
-	type ColumnDef,
-	flexRender,
-	getCoreRowModel,
-	getPaginationRowModel,
-	getSortedRowModel,
-	type PaginationState,
-	type SortingState,
-	useReactTable,
-} from "@tanstack/react-table";
-import {
-	ArrowLeft,
-	ArrowUpDown,
-	Cloud,
-	CloudOff,
-	ListTree,
-	Loader2,
-	PenBoxIcon,
-	PlusIcon,
-	Search,
-	Trash2,
-} from "lucide-react";
-import Link from "next/link";
-import { useMemo, useState } from "react";
-import { toast } from "sonner";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { DialogAction } from "@/components/shared/dialog-action";
-import { FocusShortcutInput } from "@/components/shared/focus-shortcut-input";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import {
-	Table,
-	TableBody,
-	TableCell,
-	TableHead,
-	TableHeader,
-	TableRow,
-} from "@/components/ui/table";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-import {
-	DNS_RECORD_TYPES,
-	DnsRecordPanel,
-	type DnsRecordValue,
-	PROXIABLE_TYPES,
-} from "./dns-record-panel";
-import { DnsRecordTypeBadge } from "./dns-record-type-badge";
-
-interface Props {
-	dnsProviderId: string;
-	zoneId: string;
-}
-
-const PAGE_SIZES = [10, 20, 50, 100];
-
-const SortableHeader = ({
-	column,
-	title,
-	className,
-}: {
-	column: {
-		getIsSorted: () => false | "asc" | "desc";
-		toggleSorting: (asc: boolean) => void;
-	};
-	title: string;
-	className?: string;
-}) => (
-	<Button
-		variant="ghost"
-		size="xs"
-		className={cn("-ml-2.5 text-muted-foreground", className)}
-		onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-	>
-		{title}
-		<ArrowUpDown className="size-3" />
-	</Button>
-);
-
-export const ShowDnsRecords = ({ dnsProviderId, zoneId }: Props) => {
-	const utils = api.useUtils();
-	const [isPanelOpen, setIsPanelOpen] = useState(false);
-	const [editing, setEditing] = useState<DnsRecordValue | null>(null);
-	const [deletingId, setDeletingId] = useState<string | null>(null);
-	const [search, setSearch] = useState("");
-	const [typeFilter, setTypeFilter] = useState("all");
-	const [sorting, setSorting] = useState<SortingState>([
-		{ id: "name", desc: false },
-	]);
-	const [pagination, setPagination] = useState<PaginationState>({
-		pageIndex: 0,
-		pageSize: 10,
-	});
-
-	const { data: provider } = api.dnsProvider.one.useQuery({ dnsProviderId });
-	const { data: zones } = api.dnsProvider.listZones.useQuery({ dnsProviderId });
-	const { data, isPending, isError, error } =
-		api.dnsProvider.listRecords.useQuery({ dnsProviderId, zoneId });
-	const { data: permissions } = api.user.getPermissions.useQuery();
-	const { mutateAsync: deleteRecord } =
-		api.dnsProvider.deleteRecord.useMutation();
-
-	const zoneName = zones?.find((zone) => zone.id === zoneId)?.name ?? "";
-	const isCloudflare = provider?.providerType === "cloudflare";
-	const canWrite = !!permissions?.dnsProvider.update;
-	const canDelete = !!permissions?.dnsProvider.delete;
-
-	const openEdit = (record: DnsRecordValue) => {
-		setEditing(record);
-		setIsPanelOpen(true);
-	};
-
-	const availableTypes = useMemo(
-		() => [...new Set((data ?? []).map((record) => record.type))].sort(),
-		[data],
-	);
-
-	const filteredRecords = useMemo(() => {
-		const query = search.trim().toLowerCase();
-		return (data ?? []).filter((record) => {
-			if (typeFilter !== "all" && record.type !== typeFilter) return false;
-			if (!query) return true;
-			return (
-				record.name.toLowerCase().includes(query) ||
-				record.content.toLowerCase().includes(query) ||
-				record.type.toLowerCase().includes(query)
-			);
-		});
-	}, [data, search, typeFilter]);
-
-	const handleDelete = async (record: DnsRecordValue) => {
-		setDeletingId(record.id);
-		await deleteRecord({ dnsProviderId, zoneId, recordId: record.id })
-			.then(() => {
-				toast.success("Record deleted");
-				utils.dnsProvider.listRecords.invalidate({ dnsProviderId, zoneId });
-				if (editing?.id === record.id) setIsPanelOpen(false);
-			})
-			.catch(() => {
-				toast.error("Error deleting the record");
-			})
-			.finally(() => setDeletingId(null));
-	};
-
-	const columns = useMemo<ColumnDef<DnsRecordValue>[]>(
-		() => [
-			{
-				accessorKey: "type",
-				header: ({ column }) => <SortableHeader column={column} title="Type" />,
-				cell: ({ row }) => <DnsRecordTypeBadge type={row.original.type} />,
-			},
-			{
-				accessorKey: "name",
-				header: ({ column }) => <SortableHeader column={column} title="Name" />,
-				cell: ({ row }) => (
-					<span
-						className="block max-w-[22ch] truncate font-medium"
-						title={row.original.name}
-					>
-						{row.original.name}
-					</span>
-				),
-			},
-			{
-				accessorKey: "content",
-				header: ({ column }) => (
-					<SortableHeader column={column} title="Value" />
-				),
-				cell: ({ row }) => (
-					<span
-						className="block max-w-[32ch] truncate font-mono text-xs text-muted-foreground"
-						title={row.original.content}
-					>
-						{row.original.content}
-					</span>
-				),
-			},
-			{
-				accessorKey: "ttl",
-				header: ({ column }) => <SortableHeader column={column} title="TTL" />,
-				cell: ({ row }) => (
-					<span className="text-xs text-muted-foreground tabular-nums">
-						{row.original.ttl === 1 ? "Auto" : row.original.ttl}
-					</span>
-				),
-			},
-			...(isCloudflare
-				? [
-						{
-							accessorKey: "proxied",
-							header: ({ column }) => (
-								<SortableHeader column={column} title="Proxy" />
-							),
-							cell: ({ row }) => {
-								if (!PROXIABLE_TYPES.includes(row.original.type)) {
-									return null;
-								}
-								const proxied = !!row.original.proxied;
-								return (
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<span className="inline-flex">
-												{proxied ? (
-													<Cloud className="size-4 text-[#f6821f]" />
-												) : (
-													<CloudOff className="size-4 text-muted-foreground" />
-												)}
-												<span className="sr-only">
-													{proxied ? "Proxied" : "DNS only"}
-												</span>
-											</span>
-										</TooltipTrigger>
-										<TooltipContent>
-											{proxied ? "Proxied" : "DNS only"}
-										</TooltipContent>
-									</Tooltip>
-								);
-							},
-						} satisfies ColumnDef<DnsRecordValue>,
-					]
-				: []),
-			{
-				id: "actions",
-				enableSorting: false,
-				header: () => <span className="sr-only">Actions</span>,
-				cell: ({ row }) => {
-					const record = row.original;
-					const isEditable = (DNS_RECORD_TYPES as readonly string[]).includes(
-						record.type,
-					);
-					return (
-						<div className="flex items-center justify-end gap-1">
-							{canWrite && isEditable && (
-								<Tooltip>
-									<TooltipTrigger asChild>
-										<Button
-											variant="ghost"
-											size="icon-sm"
-											className="text-muted-foreground"
-											onClick={() => openEdit(record)}
-										>
-											<PenBoxIcon className="size-4" />
-											<span className="sr-only">Edit record</span>
-										</Button>
-									</TooltipTrigger>
-									<TooltipContent>Edit record</TooltipContent>
-								</Tooltip>
-							)}
-							{canDelete && (
-								<Tooltip>
-									<DialogAction
-										title="Delete Record"
-										description={`Delete the ${record.type} record "${record.name}"? This removes it from the DNS provider, not just from Dokploy.`}
-										type="destructive"
-										onClick={() => handleDelete(record)}
-									>
-										<TooltipTrigger asChild>
-											<Button
-												variant="ghost"
-												size="icon-sm"
-												className="text-muted-foreground hover:bg-red-500/10 hover:text-red-500"
-												isLoading={deletingId === record.id}
-											>
-												<Trash2 className="size-4" />
-												<span className="sr-only">Delete record</span>
-											</Button>
-										</TooltipTrigger>
-									</DialogAction>
-									<TooltipContent>Delete record</TooltipContent>
-								</Tooltip>
-							)}
-						</div>
-					);
-				},
-			},
-		],
-		[canWrite, canDelete, deletingId, editing?.id, isCloudflare],
-	);
-
-	const pageCount = Math.max(
-		1,
-		Math.ceil(filteredRecords.length / pagination.pageSize),
-	);
-	const pageIndex = Math.min(pagination.pageIndex, pageCount - 1);
-
-	const resetToFirstPage = () =>
-		setPagination((previous) => ({ ...previous, pageIndex: 0 }));
-
-	const table = useReactTable({
-		data: filteredRecords,
-		columns,
-		getRowId: (row) => row.id,
-		state: {
-			sorting,
-			pagination: { pageIndex, pageSize: pagination.pageSize },
-		},
-		onSortingChange: setSorting,
-		onPaginationChange: setPagination,
-		getCoreRowModel: getCoreRowModel(),
-		getSortedRowModel: getSortedRowModel(),
-		getPaginationRowModel: getPaginationRowModel(),
-	});
-
-	return (
-		<div className="w-full ">
-			<Card className="h-full bg-sidebar p-2.5 rounded-xl">
-				<div className="rounded-xl bg-background shadow-md">
-					<div className="flex flex-wrap items-center justify-between gap-4 p-6">
-						<div className="flex flex-1 flex-row items-center gap-3">
-							<Button variant="ghost" size="icon" asChild>
-								<Link href={`/dashboard/settings/dns/${dnsProviderId}`}>
-									<ArrowLeft className="size-4" />
-									<span className="sr-only">Back to domains</span>
-								</Link>
-							</Button>
-							<CardHeader className="flex-1 p-0">
-								<CardTitle className="text-xl">
-									{zoneName || "DNS records"}
-								</CardTitle>
-								<CardDescription>
-									Records managed through {provider?.name ?? "this provider"}.
-									Changes are written straight to the provider.
-								</CardDescription>
-							</CardHeader>
-						</div>
-						{canWrite && (
-							<Button
-								onClick={() => {
-									setEditing(null);
-									setIsPanelOpen(true);
-								}}
-							>
-								<PlusIcon className="size-4" />
-								Add Record
-							</Button>
-						)}
-					</div>
-
-					<CardContent className="min-h-[60vh] border-t py-8">
-						{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
-						<div className="flex flex-col-reverse gap-4 lg:flex-row lg:items-start">
-							<div className="flex min-w-0 flex-1 flex-col gap-4">
-								{isPending ? (
-									<div className="flex min-h-[45vh] flex-row items-center justify-center gap-2 text-sm text-muted-foreground">
-										<span>Loading...</span>
-										<Loader2 className="animate-spin size-4" />
-									</div>
-								) : data?.length === 0 ? (
-									<div className="flex min-h-[45vh] w-full flex-col items-center justify-center gap-4 rounded-lg border border-dashed p-8">
-										<div className="rounded-full bg-muted p-4">
-											<ListTree className="size-10 text-muted-foreground" />
-										</div>
-										<div className="space-y-1 text-center">
-											<p className="text-sm font-medium">
-												No records in this zone
-											</p>
-											<p className="max-w-sm text-sm text-muted-foreground">
-												Add an A or CNAME record to point this domain at one of
-												your servers.
-											</p>
-										</div>
-									</div>
-								) : (
-									<>
-										<div className="flex flex-wrap items-center gap-2">
-											<div className="relative min-w-52 flex-1">
-												<FocusShortcutInput
-													placeholder="Filter records..."
-													value={search}
-													onChange={(e) => {
-														setSearch(e.target.value);
-														resetToFirstPage();
-													}}
-													className="pr-10"
-												/>
-												<Search className="absolute right-3 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" />
-											</div>
-											<Select
-												value={typeFilter}
-												onValueChange={(value) => {
-													setTypeFilter(value);
-													resetToFirstPage();
-												}}
-											>
-												<SelectTrigger className="w-36">
-													<SelectValue />
-												</SelectTrigger>
-												<SelectContent>
-													<SelectItem value="all">All types</SelectItem>
-													{availableTypes.map((type) => (
-														<SelectItem key={type} value={type}>
-															{type}
-														</SelectItem>
-													))}
-												</SelectContent>
-											</Select>
-											<span className="ml-auto text-xs text-muted-foreground tabular-nums">
-												{filteredRecords.length} of {data?.length ?? 0}
-											</span>
-										</div>
-
-										<div className="overflow-hidden rounded-lg border">
-											<Table>
-												<TableHeader className="[&_tr]:border-b">
-													{table.getHeaderGroups().map((headerGroup) => (
-														<TableRow
-															key={headerGroup.id}
-															className="bg-muted/40 hover:bg-muted/40"
-														>
-															{headerGroup.headers.map((header) => (
-																<TableHead
-																	key={header.id}
-																	className={cn(
-																		"h-9 px-4 text-xs",
-																		header.id === "actions" && "text-right",
-																	)}
-																>
-																	{header.isPlaceholder
-																		? null
-																		: flexRender(
-																				header.column.columnDef.header,
-																				header.getContext(),
-																			)}
-																</TableHead>
-															))}
-														</TableRow>
-													))}
-												</TableHeader>
-												<TableBody>
-													{table.getRowModel().rows.length ? (
-														table.getRowModel().rows.map((row) => {
-															const isEditable = (
-																DNS_RECORD_TYPES as readonly string[]
-															).includes(row.original.type);
-															const isSelected =
-																isPanelOpen && editing?.id === row.original.id;
-															return (
-																<TableRow
-																	key={row.id}
-																	data-state={
-																		isSelected ? "selected" : undefined
-																	}
-																	onClick={
-																		canWrite && isEditable
-																			? () => openEdit(row.original)
-																			: undefined
-																	}
-																	className={cn(
-																		"duration-150 ease-out",
-																		canWrite && isEditable && "cursor-pointer",
-																	)}
-																>
-																	{row.getVisibleCells().map((cell) => (
-																		<TableCell
-																			key={cell.id}
-																			onClick={
-																				cell.column.id === "actions"
-																					? (event) => event.stopPropagation()
-																					: undefined
-																			}
-																			className="px-4 py-2"
-																		>
-																			{flexRender(
-																				cell.column.columnDef.cell,
-																				cell.getContext(),
-																			)}
-																		</TableCell>
-																	))}
-																</TableRow>
-															);
-														})
-													) : (
-														<TableRow className="hover:bg-transparent">
-															<TableCell
-																colSpan={columns.length}
-																className="h-24 text-center text-muted-foreground"
-															>
-																No records match your filters.
-															</TableCell>
-														</TableRow>
-													)}
-												</TableBody>
-											</Table>
-										</div>
-
-										<div className="flex flex-wrap items-center justify-between gap-4">
-											<div className="flex items-center gap-2">
-												<span className="text-sm text-muted-foreground">
-													Rows per page
-												</span>
-												<Select
-													value={String(pagination.pageSize)}
-													onValueChange={(value) =>
-														setPagination({
-															pageIndex: 0,
-															pageSize: Number(value),
-														})
-													}
-												>
-													<SelectTrigger size="sm" className="w-20">
-														<SelectValue />
-													</SelectTrigger>
-													<SelectContent>
-														{PAGE_SIZES.map((size) => (
-															<SelectItem key={size} value={String(size)}>
-																{size}
-															</SelectItem>
-														))}
-													</SelectContent>
-												</Select>
-											</div>
-											<div className="flex items-center gap-4">
-												<span className="text-sm text-muted-foreground tabular-nums">
-													Page {pageIndex + 1} of {pageCount}
-												</span>
-												<div className="flex gap-2">
-													<Button
-														variant="outline"
-														size="sm"
-														onClick={() => table.previousPage()}
-														disabled={!table.getCanPreviousPage()}
-													>
-														Previous
-													</Button>
-													<Button
-														variant="outline"
-														size="sm"
-														onClick={() => table.nextPage()}
-														disabled={!table.getCanNextPage()}
-													>
-														Next
-													</Button>
-												</div>
-											</div>
-										</div>
-									</>
-								)}
-							</div>
-
-							<div
-								className={cn(
-									"t-panel-track grid lg:shrink-0 lg:grid-rows-[1fr]",
-									isPanelOpen
-										? "grid-rows-[1fr] lg:grid-cols-[1fr]"
-										: "grid-rows-[0fr] lg:grid-cols-[0fr]",
-								)}
-							>
-								<div className="overflow-hidden">
-									<div
-										data-open={isPanelOpen}
-										className="t-panel-slide-x w-full lg:w-[380px]"
-									>
-										{canWrite && (
-											<DnsRecordPanel
-												key={editing?.id ?? "new"}
-												dnsProviderId={dnsProviderId}
-												zoneId={zoneId}
-												zoneName={zoneName}
-												record={editing}
-												onClose={() => setIsPanelOpen(false)}
-											/>
-										)}
-									</div>
-								</div>
-							</div>
-						</div>
-					</CardContent>
-				</div>
-			</Card>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/settings/dns/show-dns-zones.tsx

@@ -1,132 +0,0 @@
-import { ArrowLeft, Globe, Loader2 } from "lucide-react";
-import Link from "next/link";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import { api } from "@/utils/api";
-
-interface Props {
-	dnsProviderId: string;
-}
-
-const RecordCount = ({
-	dnsProviderId,
-	zoneId,
-}: {
-	dnsProviderId: string;
-	zoneId: string;
-}) => {
-	const { data, isPending, isError } = api.dnsProvider.listRecords.useQuery({
-		dnsProviderId,
-		zoneId,
-	});
-
-	if (isPending) {
-		return <Loader2 className="animate-spin size-4 text-muted-foreground" />;
-	}
-
-	if (isError) {
-		return (
-			<span className="text-xs text-muted-foreground">Records unavailable</span>
-		);
-	}
-
-	return (
-		<span className="text-xs text-muted-foreground tabular-nums">
-			{data.length === 0
-				? "No records"
-				: `${data.length} record${data.length === 1 ? "" : "s"}`}
-		</span>
-	);
-};
-
-export const ShowDnsZones = ({ dnsProviderId }: Props) => {
-	const { data: provider } = api.dnsProvider.one.useQuery({ dnsProviderId });
-	const { data, isPending, isError, error } =
-		api.dnsProvider.listZones.useQuery({ dnsProviderId });
-
-	return (
-		<div className="w-full">
-			<Card className="h-full bg-sidebar p-2.5 rounded-xl">
-				<div className="rounded-xl bg-background shadow-md">
-					<div className="flex flex-wrap items-center justify-between gap-4 p-6">
-						<div className="flex flex-1 flex-row items-center gap-3">
-							<Button variant="ghost" size="icon" asChild>
-								<Link href="/dashboard/settings/dns">
-									<ArrowLeft className="size-4" />
-									<span className="sr-only">Back to DNS providers</span>
-								</Link>
-							</Button>
-							<CardHeader className="flex-1 p-0">
-								<CardTitle className="text-xl">
-									{provider?.name ?? "Domains"}
-								</CardTitle>
-								<CardDescription>
-									Domains this provider's credentials can manage. Open one to
-									see and edit its DNS records.
-								</CardDescription>
-							</CardHeader>
-						</div>
-					</div>
-
-					<CardContent className="flex min-h-[60vh] flex-col gap-4 border-t py-8">
-						{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
-						{isPending ? (
-							<div className="flex flex-1 flex-row items-center justify-center gap-2 text-sm text-muted-foreground">
-								<span>Loading...</span>
-								<Loader2 className="animate-spin size-4" />
-							</div>
-						) : data?.length === 0 ? (
-							<div className="flex min-h-[45vh] w-full flex-col items-center justify-center gap-4 rounded-lg border border-dashed p-8">
-								<div className="rounded-full bg-muted p-4">
-									<Globe className="size-10 text-muted-foreground" />
-								</div>
-								<div className="space-y-1 text-center">
-									<p className="text-sm font-medium">No domains found</p>
-									<p className="max-w-sm text-sm text-muted-foreground">
-										These credentials can't reach any zone. Check that the token
-										has access to at least one domain.
-									</p>
-								</div>
-							</div>
-						) : (
-							<div className="grid grid-cols-[repeat(auto-fill,minmax(260px,1fr))] gap-4">
-								{data?.map((zone) => (
-									<Link
-										key={zone.id}
-										href={`/dashboard/settings/dns/${dnsProviderId}/${zone.id}`}
-										className="group flex flex-col justify-between gap-6 rounded-xl border bg-background p-4 outline-none transition-colors duration-150 ease-out hover:border-foreground/20 hover:bg-muted/40 focus-visible:border-ring"
-									>
-										<div className="flex items-start gap-3">
-											<span className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-muted text-muted-foreground transition-colors duration-150 group-hover:text-foreground">
-												<Globe className="size-4" />
-											</span>
-											<span
-												className="min-w-0 flex-1 truncate pt-2 text-sm font-medium"
-												title={zone.name}
-											>
-												{zone.name}
-											</span>
-										</div>
-										<div className="flex min-h-4 items-center justify-end">
-											<RecordCount
-												dnsProviderId={dnsProviderId}
-												zoneId={zone.id}
-											/>
-										</div>
-									</Link>
-								))}
-							</div>
-						)}
-					</CardContent>
-				</div>
-			</Card>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/settings/git/show-git-providers.tsx

@@ -69,7 +69,7 @@ export const ShowGitProviders = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">

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

@@ -446,7 +446,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					serverUrl: notification.gotify?.serverUrl,
 					name: notification.name,
 					dockerCleanup: notification.dockerCleanup,
-					serverThreshold: notification.serverThreshold,
 				});
 			} else if (notification.notificationType === "ntfy") {
 				form.reset({
@@ -682,7 +681,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				name: data.name,
 				dockerCleanup: dockerCleanup,
 				decoration: data.decoration,
-				serverThreshold: serverThreshold,
 				notificationId: notificationId || "",
 				gotifyId: notification?.gotifyId || "",
 			});
@@ -700,7 +698,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				priority: data.priority,
 				name: data.name,
 				dockerCleanup: dockerCleanup,
-				serverThreshold: serverThreshold,
 				notificationId: notificationId || "",
 				ntfyId: notification?.ntfyId || "",
 			});

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

@@ -31,7 +31,7 @@ export const ShowNotifications = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar  p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
@@ -70,7 +70,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/profile-form.tsx

@@ -150,7 +150,7 @@ export const ProfileForm = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar  p-2.5 rounded-xl w-full">
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="flex flex-row gap-2 flex-wrap justify-between items-center">
 						<div>

apps/dokploy/components/dashboard/settings/servers/delete-server-modal.tsx

@@ -1,208 +0,0 @@
-import { ExternalLink, Loader2, Trash2 } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { toast } from "sonner";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { DialogAction } from "@/components/shared/dialog-action";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import { api } from "@/utils/api";
-
-interface Props {
-	serverId: string;
-	serverName: string;
-	children: React.ReactNode;
-}
-
-const serviceTypeLabel: Record<string, string> = {
-	application: "Application",
-	compose: "Compose",
-	postgres: "Postgres",
-	mysql: "MySQL",
-	mariadb: "MariaDB",
-	mongo: "MongoDB",
-	redis: "Redis",
-	libsql: "LibSQL",
-};
-
-export const DeleteServerModal = ({
-	serverId,
-	serverName,
-	children,
-}: Props) => {
-	const [open, setOpen] = useState(false);
-	const [deletingId, setDeletingId] = useState<string | null>(null);
-	const utils = api.useUtils();
-
-	const {
-		data: services,
-		isLoading,
-		refetch,
-	} = api.server.getServices.useQuery({ serverId }, { enabled: open });
-
-	const { mutateAsync: deleteApplication } =
-		api.application.delete.useMutation();
-	const { mutateAsync: deleteCompose } = api.compose.delete.useMutation();
-	const { mutateAsync: deletePostgres } = api.postgres.remove.useMutation();
-	const { mutateAsync: deleteMysql } = api.mysql.remove.useMutation();
-	const { mutateAsync: deleteMariadb } = api.mariadb.remove.useMutation();
-	const { mutateAsync: deleteMongo } = api.mongo.remove.useMutation();
-	const { mutateAsync: deleteRedis } = api.redis.remove.useMutation();
-	const { mutateAsync: deleteLibsql } = api.libsql.remove.useMutation();
-	const { mutateAsync: deleteServer, isPending: isDeletingServer } =
-		api.server.remove.useMutation();
-
-	const canDelete = (services?.length ?? 0) === 0;
-
-	const handleDeleteService = async (
-		service: NonNullable<typeof services>[number],
-	) => {
-		setDeletingId(service.id);
-		try {
-			switch (service.type) {
-				case "application":
-					await deleteApplication({ applicationId: service.id });
-					break;
-				case "compose":
-					await deleteCompose({
-						composeId: service.id,
-						deleteVolumes: false,
-					});
-					break;
-				case "postgres":
-					await deletePostgres({ postgresId: service.id });
-					break;
-				case "mysql":
-					await deleteMysql({ mysqlId: service.id });
-					break;
-				case "mariadb":
-					await deleteMariadb({ mariadbId: service.id });
-					break;
-				case "mongo":
-					await deleteMongo({ mongoId: service.id });
-					break;
-				case "redis":
-					await deleteRedis({ redisId: service.id });
-					break;
-				case "libsql":
-					await deleteLibsql({ libsqlId: service.id });
-					break;
-			}
-			toast.success(`${service.name} deleted successfully`);
-			await refetch();
-			utils.server.all.invalidate();
-		} catch (error: any) {
-			toast.error(error.message);
-		} finally {
-			setDeletingId(null);
-		}
-	};
-
-	const handleDeleteServer = async () => {
-		try {
-			await deleteServer({ serverId });
-			toast.success(`Server ${serverName} deleted successfully`);
-			setOpen(false);
-			utils.server.all.invalidate();
-		} catch (error: any) {
-			toast.error(error.message);
-		}
-	};
-
-	return (
-		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>{children}</DialogTrigger>
-			<DialogContent className="max-w-lg">
-				<DialogHeader>
-					<DialogTitle>Delete Server</DialogTitle>
-					<DialogDescription>
-						This will permanently delete "{serverName}" and all associated data.
-					</DialogDescription>
-				</DialogHeader>
-
-				{isLoading ? (
-					<div className="flex justify-center py-6">
-						<Loader2 className="size-5 animate-spin text-muted-foreground" />
-					</div>
-				) : canDelete ? (
-					<AlertBlock type="info">
-						No services are associated with this server. You can delete it
-						safely.
-					</AlertBlock>
-				) : (
-					<div className="flex flex-col gap-3">
-						<AlertBlock type="warning">
-							This server has {services?.length} service
-							{services?.length === 1 ? "" : "s"} associated. Delete them before
-							removing the server.
-						</AlertBlock>
-						<div className="flex max-h-72 flex-col gap-2 overflow-y-auto pr-1">
-							{services?.map((service) => (
-								<div
-									key={`${service.type}-${service.id}`}
-									className="flex items-center justify-between gap-2 rounded-lg border p-2"
-								>
-									<div className="flex min-w-0 flex-col gap-1">
-										<span className="truncate text-sm font-medium">
-											{service.name}
-										</span>
-										<Badge variant="outline" className="w-fit text-xs">
-											{serviceTypeLabel[service.type]}
-										</Badge>
-									</div>
-									<div className="flex shrink-0 items-center gap-1">
-										<Link href={service.url} target="_blank">
-											<Button variant="ghost" size="icon" className="h-8 w-8">
-												<ExternalLink className="h-4 w-4" />
-											</Button>
-										</Link>
-										<DialogAction
-											title="Delete Service"
-											description={`This will permanently delete "${service.name}" and all its associated data.`}
-											onClick={() => handleDeleteService(service)}
-										>
-											<Button
-												variant="ghost"
-												size="icon"
-												disabled={deletingId === service.id}
-												className="h-8 w-8 text-destructive hover:bg-destructive/10 hover:text-destructive"
-											>
-												{deletingId === service.id ? (
-													<Loader2 className="h-4 w-4 animate-spin" />
-												) : (
-													<Trash2 className="h-4 w-4" />
-												)}
-											</Button>
-										</DialogAction>
-									</div>
-								</div>
-							))}
-						</div>
-					</div>
-				)}
-
-				<DialogFooter>
-					<Button variant="outline" onClick={() => setOpen(false)}>
-						Cancel
-					</Button>
-					<Button
-						variant="destructive"
-						disabled={!canDelete || isDeletingServer}
-						onClick={handleDeleteServer}
-					>
-						Delete Server
-					</Button>
-				</DialogFooter>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/settings/servers/show-health-modal.tsx

@@ -0,0 +1,28 @@
+import { Stethoscope } from "lucide-react";
+import { useState } from "react";
+import { ShowHealth } from "@/components/dashboard/docker/health/show-health";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
+
+interface Props {
+	serverId: string;
+}
+
+export const ShowHealthModal = ({ serverId }: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
+
+	return (
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+			<DialogTrigger asChild>
+				<Button variant="outline" size="icon" className="h-9 w-9">
+					<Stethoscope className="h-4 w-4" />
+				</Button>
+			</DialogTrigger>
+			<DialogContent className="sm:max-w-5xl max-h-[85vh] overflow-y-auto">
+				<div className="flex gap-4 py-4 w-full">
+					<ShowHealth serverId={serverId} />
+				</div>
+			</DialogContent>
+		</Dialog>
+	);
+};