feat(whitelabel): implement whitelabeling features and settings

- Added whitelabeling support, allowing customization of application name, logos, and login page.
- Introduced new WhitelabelSettings component for managing whitelabel configurations.
- Updated onboarding and sidebar layouts to reflect whitelabel settings dynamically.
- Created database schema changes to accommodate new whitelabel fields.
- Implemented API endpoints for retrieving and updating whitelabel settings.

.devcontainer/Dockerfile

@@ -1,21 +0,0 @@
-# Dockerfile for DevContainer
-FROM node:20.16.0-bullseye-slim
-
-# Install essential packages
-RUN apt-get update && apt-get install -y \
-    curl \
-    bash \
-    git \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set up PNPM
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable && corepack prepare pnpm@9.12.0 --activate
-
-# Create workspace directory
-WORKDIR /workspaces/dokploy
-
-# Set up user permissions
-USER node

.devcontainer/devcontainer.json

@@ -1,53 +0,0 @@
-{
-	"name": "Dokploy development container",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"context": ".."
-	},
-	"features": {
-		"ghcr.io/devcontainers/features/docker-in-docker:2": {
-			"moby": true,
-			"version": "latest"
-		},
-		"ghcr.io/devcontainers/features/git:1": {
-			"ppa": true,
-			"version": "latest"
-		},
-		"ghcr.io/devcontainers/features/go:1": {
-			"version": "1.20"
-		}
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.vscode-typescript-next",
-				"bradlc.vscode-tailwindcss",
-				"ms-vscode.vscode-json",
-				"biomejs.biome",
-				"golang.go",
-				"redhat.vscode-xml",
-				"github.vscode-github-actions",
-				"github.copilot",
-				"github.copilot-chat"
-			]
-		}
-	},
-	"forwardPorts": [3000, 5432, 6379],
-	"portsAttributes": {
-		"3000": {
-			"label": "Dokploy App",
-			"onAutoForward": "notify"
-		},
-		"5432": {
-			"label": "PostgreSQL",
-			"onAutoForward": "silent"
-		},
-		"6379": {
-			"label": "Redis",
-			"onAutoForward": "silent"
-		}
-	},
-	"remoteUser": "node",
-	"workspaceFolder": "/workspaces/dokploy",
-	"runArgs": ["--name", "dokploy-devcontainer"]
-}

.github/pull_request_template.md

@@ -8,7 +8,7 @@ Before submitting this PR, please make sure that:
 
 - [ ] You created a dedicated branch based on the `canary` branch.
 - [ ] You have read the suggestions in the CONTRIBUTING.md file https://github.com/Dokploy/dokploy/blob/canary/CONTRIBUTING.md#pull-request
-- [ ] You have tested this PR in your local instance. If you have not tested it yet, please do so before submitting. This helps avoid wasting maintainers' time reviewing code that has not been verified by you.
+- [ ] You have tested this PR in your local instance.
 
 ## Issues related (if applicable)
 

.github/workflows/pr-quality.yml

@@ -1,22 +0,0 @@
-
-name: PR Quality
-
-permissions:
-  contents: read
-  issues: read
-  pull-requests: write
-
-on:
-  pull_request_target:
-    types: [opened, reopened]
-
-jobs:
-  anti-slop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peakoss/anti-slop@v0
-        with:
-          max-failures: 4
-          blocked-commit-authors: "claude,copilot"
-          require-description: true
-          min-account-age: 5

.gitignore

@@ -43,4 +43,7 @@ yarn-error.log*
 *.pem
 
 
-.db
+.db
+
+# Development environment
+.devcontainer

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Hey, thanks for your interest in contributing to Dokploy! We appreciate your help and taking your time to contribute.
 
-Before you start, please first discuss the feature/bug you want to add with the owners and community via github issues.
+Before you start, please first discuss the feature/bug you want to add with the owners and comunity via github issues.
 
 We have a few guidelines to follow when contributing to this project:
 
@@ -11,7 +11,6 @@ We have a few guidelines to follow when contributing to this project:
 - [Development](#development)
 - [Build](#build)
 - [Pull Request](#pull-request)
-- [Important Considerations](#important-considerations-for-pull-requests)
 
 ## Commit Convention
 
@@ -163,9 +162,8 @@ curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.39.1/pack-v0.
 - If your pull request fixes an open issue, please reference the issue in the pull request description.
 - Once your pull request is merged, you will be automatically added as a contributor to the project.
 
-### Important Considerations for Pull Requests
+**Important Considerations for Pull Requests:**
 
-- **Testing is Mandatory:** All Pull Requests **must be tested** before submission. You must verify that your changes work as expected in a local development environment (see [Setup](#setup)). **Pull Requests that have not been tested will be closed.** This policy ensures clean contributions and reduces the time maintainers spend reviewing untested or broken code.
 - **Focus and Scope:** Each Pull Request should ideally address a single, well-defined problem or introduce one new feature. This greatly facilitates review and reduces the chances of introducing unintended side effects.
 - **Avoid Unfocused Changes:** Please avoid submitting Pull Requests that contain only minor changes such as whitespace adjustments, IDE-generated formatting, or removal of unused variables, unless these are part of a larger, clearly defined refactor or a dedicated "cleanup" Pull Request that addresses a specific `good first issue` or maintenance task.
 - **Issue Association:** For any significant change, it's highly recommended to open an issue first to discuss the proposed solution with the community and maintainers. This ensures alignment and avoids duplicated effort. If your PR resolves an existing issue, please link it in the description (e.g., `Fixes #123`, `Closes #456`).

Dockerfile

@@ -65,8 +65,4 @@ RUN curl -sSL https://railpack.com/install.sh | bash
 COPY --from=buildpacksio/pack:0.39.1 /usr/local/bin/pack /usr/local/bin/pack
 
 EXPOSE 3000
-
-HEALTHCHECK --interval=10s --timeout=3s --retries=10 \
-  CMD curl -fs http://localhost:3000/api/trpc/settings.health || exit 1
-
-  CMD ["sh", "-c", "pnpm run wait-for-postgres && exec pnpm start"]
+CMD [ "pnpm", "start" ]

README.md

@@ -12,8 +12,24 @@
 <br />
 
 
+
+<div align="center" markdown="1">
+   <sup>Special thanks to:</sup>
+   <br>
+   <br>
+   <a href="https://tuple.app/dokploy">
+     <img src=".github/sponsors/tuple.png" alt="Tuple's sponsorship image" width="400"/>
+   </a>
+
+### [Tuple, the premier screen sharing app for developers](https://tuple.app/dokploy)
+[Available for MacOS & Windows](https://tuple.app/dokploy)<br>
+
+</div>
+
+
 Dokploy is a free, self-hostable Platform as a Service (PaaS) that simplifies the deployment and management of applications and databases.
 
+
 ## ✨ Features
 
 Dokploy includes multiple features to make your life easier.
@@ -44,9 +60,40 @@ curl -sSL https://dokploy.com/install.sh | sh
 
 For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 
+## ♥️ Sponsors
+
+🙏 We're deeply grateful to all our sponsors who make Dokploy possible! Your support helps cover the costs of hosting, testing, and developing new features.
+
+[Dokploy Open Collective](https://opencollective.com/dokploy)
 
 [Github Sponsors](https://github.com/sponsors/Siumauricio)
 
+## Sponsors
+
+| Sponsor | Logo | Supporter Level |
+|---------|:----:|----------------|
+| [Hostinger](https://www.hostinger.com/vps-hosting?ref=dokploy) | <img src=".github/sponsors/hostinger.jpg" alt="Hostinger" width="200"/> | 🎖 Hero Sponsor |
+| [LX Aer](https://www.lxaer.com/?ref=dokploy) | <img src=".github/sponsors/lxaer.png" alt="LX Aer" width="100"/> | 🎖 Hero Sponsor |
+| [LinkDR](https://linkdr.com/?ref=dokploy) | <img src="https://dokploy.com/linkdr-logo.svg" alt="LinkDR" width="100"/> | 🎖 Hero Sponsor |
+| [LambdaTest](https://www.lambdatest.com/?utm_source=dokploy&utm_medium=sponsor) | <img src="https://www.lambdatest.com/blue-logo.png" alt="LambdaTest" width="200"/> | 🎖 Hero Sponsor |
+| [Awesome Tools](https://awesome.tools/) | <img src=".github/sponsors/awesome.png" alt="Awesome Tools" width="100"/> | 🎖 Hero Sponsor |
+| [Supafort](https://supafort.com/?ref=dokploy) | <img src="https://supafort.com/build/q-4Ht4rBZR.webp" alt="Supafort.com" width="200"/> | 🥇 Premium Supporter |
+| [Agentdock](https://agentdock.ai/?ref=dokploy) | <img src=".github/sponsors/agentdock.png" alt="agentdock.ai" width="100"/> | 🥇 Premium Supporter |
+| [AmericanCloud](https://americancloud.com/?ref=dokploy) | <img src=".github/sponsors/american-cloud.png" alt="AmericanCloud" width="200"/> | 🥈 Elite Contributor |
+| [Tolgee](https://tolgee.io/?utm_source=github_dokploy&utm_medium=banner&utm_campaign=dokploy) | <img src="https://dokploy.com/tolgee-logo.png" alt="Tolgee" width="100"/> | 🥈 Elite Contributor |
+| [Cloudblast](https://cloudblast.io/?ref=dokploy) | <img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" alt="Cloudblast.io" width="150"/> | 🥉 Supporting Member |
+| [Synexa](https://synexa.ai/?ref=dokploy) | <img src=".github/sponsors/synexa.png" alt="Synexa" width="100"/> | 🥉 Supporting Member |
+
+### Community Backers 🤝
+
+#### Organizations:
+
+[Sponsors on Open Collective](https://opencollective.com/dokploy)
+
+#### Individuals:
+
+[![Individual Contributors on Open Collective](https://opencollective.com/dokploy/individuals.svg?width=890)](https://opencollective.com/dokploy)
+
 ### Contributors 🤝
 
 <a href="https://github.com/dokploy/dokploy/graphs/contributors">

apps/api/package.json

@@ -14,16 +14,16 @@
 		"@hono/node-server": "^1.14.3",
 		"@hono/zod-validator": "0.3.0",
 		"dotenv": "^16.4.5",
-		"hono": "^4.11.7",
+		"hono": "^4.7.10",
 		"pino": "9.4.0",
 		"pino-pretty": "11.2.2",
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
 		"redis": "4.7.0",
-		"zod": "^3.25.76"
+		"zod": "^3.25.32"
 	},
 	"devDependencies": {
-		"@types/node": "^20.16.0",
+		"@types/node": "^20.17.51",
 		"@types/react": "^18.2.37",
 		"@types/react-dom": "^18.2.15",
 		"tsx": "^4.16.2",

apps/dokploy/__test__/compose/domain/network-service.test.ts

@@ -4,30 +4,21 @@ import { describe, expect, it } from "vitest";
 describe("addDokployNetworkToService", () => {
 	it("should add network to an empty array", () => {
 		const result = addDokployNetworkToService([]);
-		expect(result).toEqual(["dokploy-network", "default"]);
+		expect(result).toEqual(["dokploy-network"]);
 	});
 
 	it("should not add duplicate network to an array", () => {
 		const result = addDokployNetworkToService(["dokploy-network"]);
-		expect(result).toEqual(["dokploy-network", "default"]);
+		expect(result).toEqual(["dokploy-network"]);
 	});
 
 	it("should add network to an existing array with other networks", () => {
 		const result = addDokployNetworkToService(["other-network"]);
-		expect(result).toEqual(["other-network", "dokploy-network", "default"]);
+		expect(result).toEqual(["other-network", "dokploy-network"]);
 	});
 
 	it("should add network to an object if networks is an object", () => {
 		const result = addDokployNetworkToService({ "other-network": {} });
-		expect(result).toEqual({
-			"other-network": {},
-			"dokploy-network": {},
-			default: {},
-		});
-	});
-
-	it("should not duplicate default network when already present", () => {
-		const result = addDokployNetworkToService(["default", "dokploy-network"]);
-		expect(result).toEqual(["default", "dokploy-network"]);
+		expect(result).toEqual({ "other-network": {}, "dokploy-network": {} });
 	});
 });

apps/dokploy/__test__/deploy/github.test.ts

@@ -83,14 +83,6 @@ describe("GitHub Webhook Skip CI", () => {
 				{ commits: [{ message: "[skip ci] test" }] },
 			),
 		).toBe("[skip ci] test");
-
-		// Soft Serve
-		expect(
-			extractCommitMessage(
-				{ "x-softserve-event": "push" },
-				{ commits: [{ message: "[skip ci] test" }] },
-			),
-		).toBe("[skip ci] test");
 	});
 
 	it("should handle missing commit message", () => {
@@ -107,9 +99,6 @@ describe("GitHub Webhook Skip CI", () => {
 		expect(extractCommitMessage({ "x-gitea-event": "push" }, {})).toBe(
 			"NEW COMMIT",
 		);
-		expect(extractCommitMessage({ "x-softserve-event": "push" }, {})).toBe(
-			"NEW COMMIT",
-		);
 	});
 });
 

apps/dokploy/__test__/deploy/soft-serve.test.ts

@@ -1,49 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-	extractBranchName,
-	extractCommitMessage,
-	extractHash,
-	getProviderByHeader,
-} from "@/pages/api/deploy/[refreshToken]";
-
-describe("Soft Serve Webhook", () => {
-	const mockSoftServeHeaders = {
-		"x-softserve-event": "push",
-	};
-
-	const createMockBody = (message: string, hash: string, branch: string) => ({
-		event: "push",
-		ref: `refs/heads/${branch}`,
-		after: hash,
-		commits: [{ message: message }],
-	});
-	const message: string = "feat: add new feature";
-	const hash: string = "3c91c24ef9560bddc695bce138bf8a7094ec3df5";
-	const branch: string = "feat/add-new";
-	const goodWebhook = createMockBody(message, hash, branch);
-
-	it("should properly extract the provider name", () => {
-		expect(getProviderByHeader(mockSoftServeHeaders)).toBe("soft-serve");
-	});
-
-	it("should properly extract the commit message", () => {
-		expect(extractCommitMessage(mockSoftServeHeaders, goodWebhook)).toBe(
-			message,
-		);
-	});
-
-	it("should properly extract hash", () => {
-		expect(extractHash(mockSoftServeHeaders, goodWebhook)).toBe(hash);
-	});
-
-	it("should properly extract branch name", () => {
-		expect(extractBranchName(mockSoftServeHeaders, goodWebhook)).toBe(branch);
-	});
-
-	it("should gracefully handle invalid webhook", () => {
-		expect(getProviderByHeader({})).toBeNull();
-		expect(extractCommitMessage(mockSoftServeHeaders, {})).toBe("NEW COMMIT");
-		expect(extractHash(mockSoftServeHeaders, {})).toBe("NEW COMMIT");
-		expect(extractBranchName(mockSoftServeHeaders, {})).toBeNull();
-	});
-});

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

@@ -6,7 +6,6 @@ import { paths } from "@dokploy/server/constants";
 import AdmZip from "adm-zip";
 import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
 
-const OUTPUT_BASE = "./__test__/drop/zips/output";
 const { APPLICATIONS_PATH } = paths();
 vi.mock("@dokploy/server/constants", async (importOriginal) => {
 	const actual = await importOriginal();
@@ -14,10 +13,7 @@ vi.mock("@dokploy/server/constants", async (importOriginal) => {
 		// @ts-ignore
 		...actual,
 		paths: () => ({
-			// @ts-ignore
-			...actual.paths(),
-			BASE_PATH: OUTPUT_BASE,
-			APPLICATIONS_PATH: OUTPUT_BASE,
+			APPLICATIONS_PATH: "./__test__/drop/zips/output",
 		}),
 	};
 });
@@ -151,179 +147,8 @@ const baseApp: ApplicationNested = {
 	dockerContextPath: null,
 	rollbackActive: false,
 	stopGracePeriodSwarm: null,
-	ulimitsSwarm: null,
 };
 
-/**
- * GHSA-66v7-g3fh-47h3: Remote Code Execution through Path Traversal.
- * Validates the exact PoC: ZIP with path traversal entry ../../../../../etc/cron.d/malicious-cron
- * plus cover files (package.json, index.js). unzipDrop must reject and never write outside output.
- */
-describe("GHSA-66v7-g3fh-47h3 path traversal RCE", () => {
-	beforeAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-	afterAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	it("rejects PoC ZIP: traversal ../../../../../etc/cron.d/malicious-cron + package.json + index.js", async () => {
-		baseApp.appName = "ghsa-rce";
-		// PoC payload: same entry name as advisory (Python zipfile keeps it; AdmZip normalizes on add → use placeholder + replace)
-		const traversalEntry = "../../../../../etc/cron.d/malicious-cron";
-		const cronPayload = "* * * * * root id\n";
-		const placeholder = "x".repeat(traversalEntry.length);
-		const zip = new AdmZip();
-		zip.addFile(
-			"package.json",
-			Buffer.from('{"name": "app", "version": "1.0.0"}'),
-		);
-		zip.addFile("index.js", Buffer.from('console.log("Application");'));
-		zip.addFile(placeholder, Buffer.from(cronPayload));
-		let buf = Buffer.from(zip.toBuffer());
-		buf = Buffer.from(
-			buf.toString("binary").split(placeholder).join(traversalEntry),
-			"binary",
-		);
-		const file = new File([buf as unknown as ArrayBuffer], "exploit.zip");
-		await expect(unzipDrop(file, baseApp)).rejects.toThrow(
-			/Path traversal detected.*resolved path escapes output directory/,
-		);
-	});
-});
-
-describe("security: existing symlink escape", () => {
-	beforeAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	afterAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	it("should NOT write outside base when directory is a symlink", async () => {
-		const appName = "symlink-existing";
-		const output = path.join(APPLICATIONS_PATH, appName, "code");
-		await fs.mkdir(output, { recursive: true });
-
-		// outside target (attacker wants to write here)
-		const outside = path.join(APPLICATIONS_PATH, "..", "outside");
-		await fs.mkdir(outside, { recursive: true });
-
-		// attacker-controlled symlink inside project
-		await fs.symlink(outside, path.join(output, "logs"));
-
-		// zip looks totally harmless
-		const zip = new AdmZip();
-		zip.addFile("logs/pwned.txt", Buffer.from("owned"));
-
-		const file = new File([zip.toBuffer() as any], "exploit.zip");
-
-		await unzipDrop(file, { ...baseApp, appName });
-
-		// if vulnerable -> file exists outside sandbox
-		const escaped = await fs
-			.readFile(path.join(outside, "pwned.txt"), "utf8")
-			.then(() => true)
-			.catch(() => false);
-
-		expect(escaped).toBe(false);
-	});
-});
-
-describe("security: zip symlink entry blocked", () => {
-	beforeAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	afterAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	it("rejects zip containing real symlink entry", async () => {
-		const appName = "zip-symlink";
-
-		const zipBuffer = await fs.readFile(
-			path.join(__dirname, "./zips/payload/symlink-entry.zip"),
-		);
-
-		const file = new File([zipBuffer as any], "exploit.zip");
-
-		await expect(unzipDrop(file, { ...baseApp, appName })).rejects.toThrow(
-			/Dangerous node entries are not allowed/,
-		);
-	});
-});
-
-describe("unzipDrop path under output (no traversal)", () => {
-	beforeAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-	afterAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	it("allows entry etc/cron.d/malicious-cron when under output (no path traversal)", async () => {
-		baseApp.appName = "cron-under-output";
-		const zip = new AdmZip();
-		zip.addFile(
-			"etc/cron.d/malicious-cron",
-			Buffer.from("* * * * * root id\n"),
-		);
-		zip.addFile("package.json", Buffer.from('{"name":"app"}'));
-		const file = new File(
-			[zip.toBuffer() as unknown as ArrayBuffer],
-			"app.zip",
-		);
-		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
-		await unzipDrop(file, baseApp);
-		const content = await fs.readFile(
-			path.join(outputPath, "etc/cron.d/malicious-cron"),
-			"utf8",
-		);
-		expect(content).toBe("* * * * * root id\n");
-	});
-});
-
-describe("security: traversal inside BASE_PATH (sandbox escape)", () => {
-	beforeAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	afterAll(async () => {
-		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
-	});
-
-	it("should NOT allow writing outside application directory but inside BASE_PATH", async () => {
-		const appName = "sandbox-escape";
-
-		const base = APPLICATIONS_PATH.replace("/applications", "");
-		const output = path.join(APPLICATIONS_PATH, appName, "code");
-
-		await fs.mkdir(output, { recursive: true });
-
-		// attacker writes into traefik config inside base
-		const zip = new AdmZip();
-		zip.addFile(
-			"../../../traefik/dynamic/evil.yml",
-			Buffer.from("pwned: true"),
-		);
-
-		const file = new File([zip.toBuffer() as any], "exploit.zip");
-
-		await unzipDrop(file, { ...baseApp, appName });
-
-		const escapedPath = path.join(base, "traefik/dynamic/evil.yml");
-
-		const exists = await fs
-			.readFile(escapedPath)
-			.then(() => true)
-			.catch(() => false);
-
-		expect(exists).toBe(false);
-	});
-});
-
 describe("unzipDrop using real zip files", () => {
 	// const { APPLICATIONS_PATH } = paths();
 	beforeAll(async () => {
@@ -340,12 +165,14 @@ describe("unzipDrop using real zip files", () => {
 		try {
 			const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
 			const zip = new AdmZip("./__test__/drop/zips/single-file.zip");
+			console.log(`Output Path: ${outputPath}`);
 			const zipBuffer = zip.toBuffer() as Buffer<ArrayBuffer>;
 			const file = new File([zipBuffer], "single.zip");
 			await unzipDrop(file, baseApp);
 			const files = await fs.readdir(outputPath, { withFileTypes: true });
 			expect(files.some((f) => f.name === "test.txt")).toBe(true);
 		} catch (err) {
+			console.log(err);
 		} finally {
 		}
 	});

apps/dokploy/__test__/drop/zips/payload/link

@@ -1 +0,0 @@
-/etc/passwd

apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts

@@ -6,7 +6,6 @@ type MockCreateServiceOptions = {
 	TaskTemplate?: {
 		ContainerSpec?: {
 			StopGracePeriod?: number;
-			Ulimits?: Array<{ Name: string; Soft: number; Hard: number }>;
 		};
 	};
 	[key: string]: unknown;
@@ -14,11 +13,11 @@ type MockCreateServiceOptions = {
 
 const { inspectMock, getServiceMock, createServiceMock, getRemoteDockerMock } =
 	vi.hoisted(() => {
-		const inspect = vi.fn<() => Promise<never>>();
+		const inspect = vi.fn<[], Promise<never>>();
 		const getService = vi.fn(() => ({ inspect }));
-		const createService = vi.fn<
-			(opts: MockCreateServiceOptions) => Promise<void>
-		>(async () => undefined);
+		const createService = vi.fn<[MockCreateServiceOptions], Promise<void>>(
+			async () => undefined,
+		);
 		const getRemoteDocker = vi.fn(async () => ({
 			getService,
 			createService,
@@ -58,7 +57,6 @@ const createApplication = (
 		},
 		replicas: 1,
 		stopGracePeriodSwarm: 0n,
-		ulimitsSwarm: null,
 		serverId: "server-id",
 		...overrides,
 	}) as unknown as ApplicationNested;
@@ -82,9 +80,7 @@ describe("mechanizeDockerContainer", () => {
 		await mechanizeDockerContainer(application);
 
 		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0] as
-			| [MockCreateServiceOptions]
-			| undefined;
+		const call = createServiceMock.mock.calls[0];
 		if (!call) {
 			throw new Error("createServiceMock should have been called once");
 		}
@@ -101,9 +97,7 @@ describe("mechanizeDockerContainer", () => {
 		await mechanizeDockerContainer(application);
 
 		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0] as
-			| [MockCreateServiceOptions]
-			| undefined;
+		const call = createServiceMock.mock.calls[0];
 		if (!call) {
 			throw new Error("createServiceMock should have been called once");
 		}
@@ -112,50 +106,4 @@ describe("mechanizeDockerContainer", () => {
 			"StopGracePeriod",
 		);
 	});
-
-	it("passes ulimits to ContainerSpec when ulimitsSwarm is defined", async () => {
-		const ulimits = [
-			{ Name: "nofile", Soft: 10000, Hard: 20000 },
-			{ Name: "nproc", Soft: 4096, Hard: 8192 },
-		];
-		const application = createApplication({ ulimitsSwarm: ulimits });
-
-		await mechanizeDockerContainer(application);
-
-		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0];
-		if (!call) {
-			throw new Error("createServiceMock should have been called once");
-		}
-		const [settings] = call;
-		expect(settings.TaskTemplate?.ContainerSpec?.Ulimits).toEqual(ulimits);
-	});
-
-	it("omits Ulimits when ulimitsSwarm is null", async () => {
-		const application = createApplication({ ulimitsSwarm: null });
-
-		await mechanizeDockerContainer(application);
-
-		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0];
-		if (!call) {
-			throw new Error("createServiceMock should have been called once");
-		}
-		const [settings] = call;
-		expect(settings.TaskTemplate?.ContainerSpec).not.toHaveProperty("Ulimits");
-	});
-
-	it("omits Ulimits when ulimitsSwarm is an empty array", async () => {
-		const application = createApplication({ ulimitsSwarm: [] });
-
-		await mechanizeDockerContainer(application);
-
-		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0];
-		if (!call) {
-			throw new Error("createServiceMock should have been called once");
-		}
-		const [settings] = call;
-		expect(settings.TaskTemplate?.ContainerSpec).not.toHaveProperty("Ulimits");
-	});
 });

apps/dokploy/__test__/setup.ts

@@ -1,40 +0,0 @@
-import { vi } from "vitest";
-
-/**
- * Mock the DB module so tests that import from @dokploy/server (barrel)
- * never open a real TCP connection to PostgreSQL (e.g. in CI where no DB runs).
- * Without this, loading the server barrel pulls in lib/auth and db, which
- * connect to localhost:5432 and cause ECONNREFUSED.
- */
-vi.mock("@dokploy/server/db", () => {
-	const chain = () => chain;
-	chain.set = () => chain;
-	chain.where = () => chain;
-	chain.values = () => chain;
-	chain.returning = () => Promise.resolve([{}]);
-	chain.then = undefined;
-
-	const tableMock = {
-		findFirst: vi.fn(() => Promise.resolve(undefined)),
-		findMany: vi.fn(() => Promise.resolve([])),
-		insert: vi.fn(() => Promise.resolve([{}])),
-		update: vi.fn(() => chain),
-		delete: vi.fn(() => chain),
-	};
-	const createQueryMock = () => tableMock;
-
-	return {
-		db: {
-			select: vi.fn(() => chain),
-			insert: vi.fn(() => ({
-				values: () => ({ returning: () => Promise.resolve([{}]) }),
-			})),
-			update: vi.fn(() => chain),
-			delete: vi.fn(() => chain),
-			query: new Proxy({} as Record<string, typeof tableMock>, {
-				get: () => tableMock,
-			}),
-		},
-		dbUrl: "postgres://mock:mock@localhost:5432/mock",
-	};
-});

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

@@ -125,7 +125,6 @@ const baseApp: ApplicationNested = {
 	username: null,
 	dockerContextPath: null,
 	stopGracePeriodSwarm: null,
-	ulimitsSwarm: null,
 };
 
 const baseDomain: Domain = {
@@ -275,51 +274,3 @@ test("CertificateType on websecure entrypoint", async () => {
 
 	expect(router.tls?.certResolver).toBe("letsencrypt");
 });
-
-/** IDN/Punycode */
-
-test("Internationalized domain name is converted to punycode", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "тест.рф" },
-		"web",
-	);
-
-	// тест.рф in punycode is xn--e1aybc.xn--p1ai
-	expect(router.rule).toContain("Host(`xn--e1aybc.xn--p1ai`)");
-	expect(router.rule).not.toContain("тест.рф");
-});
-
-test("ASCII domain remains unchanged", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "example.com" },
-		"web",
-	);
-
-	expect(router.rule).toContain("Host(`example.com`)");
-});
-
-test("Russian Cyrillic label with .ru TLD is converted to punycode", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "сайт.ru" },
-		"web",
-	);
-
-	// сайт in punycode is xn--80aswg
-	expect(router.rule).toContain("Host(`xn--80aswg.ru`)");
-	expect(router.rule).not.toContain("сайт");
-});
-
-test("Subdomain with Russian IDN TLD converts non-ASCII part to punycode", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "app.тест.рф" },
-		"web",
-	);
-
-	// app stays ASCII, тест.рф becomes xn--e1aybc.xn--p1ai
-	expect(router.rule).toContain("Host(`app.xn--e1aybc.xn--p1ai`)");
-	expect(router.rule).not.toContain("тест.рф");
-});

apps/dokploy/__test__/vitest.config.ts

@@ -7,15 +7,10 @@ export default defineConfig({
 		include: ["__test__/**/*.test.ts"], // Incluir solo los archivos de test en el directorio __test__
 		exclude: ["**/node_modules/**", "**/dist/**", "**/.docker/**"],
 		pool: "forks",
-		setupFiles: [path.resolve(__dirname, "setup.ts")],
 	},
 	define: {
 		"process.env": {
 			NODE: "test",
-			GITHUB_CLIENT_ID: "test",
-			GITHUB_CLIENT_SECRET: "test",
-			GOOGLE_CLIENT_ID: "test",
-			GOOGLE_CLIENT_SECRET: "test",
 		},
 	},
 	plugins: [

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

@@ -1,81 +0,0 @@
-import path from "node:path";
-import { describe, expect, it, vi } from "vitest";
-
-const BASE = "/base";
-
-vi.mock("@dokploy/server/constants", async (importOriginal) => {
-	const actual =
-		await importOriginal<typeof import("@dokploy/server/constants")>();
-	return {
-		...actual,
-		paths: () => ({
-			...actual.paths(),
-			BASE_PATH: BASE,
-			LOGS_PATH: `${BASE}/logs`,
-			APPLICATIONS_PATH: `${BASE}/applications`,
-		}),
-	};
-});
-
-// Import after mock so paths() uses our BASE
-const { readValidDirectory } = await import("@dokploy/server");
-
-describe("readValidDirectory (path traversal)", () => {
-	it("returns true when directory is exactly BASE_PATH", () => {
-		expect(readValidDirectory(BASE)).toBe(true);
-		expect(readValidDirectory(path.resolve(BASE))).toBe(true);
-	});
-
-	it("returns true when directory is under BASE_PATH", () => {
-		expect(readValidDirectory(`${BASE}/logs`)).toBe(true);
-		expect(readValidDirectory(`${BASE}/logs/app/foo.log`)).toBe(true);
-		expect(readValidDirectory(`${BASE}/applications/myapp/code`)).toBe(true);
-	});
-
-	it("returns false for path traversal escaping base (absolute)", () => {
-		expect(readValidDirectory("/etc/passwd")).toBe(false);
-		expect(readValidDirectory("/etc/cron.d/malicious")).toBe(false);
-		expect(readValidDirectory("/tmp/outside")).toBe(false);
-	});
-
-	it("returns false when resolved path escapes base via ..", () => {
-		// Resolved: /etc/passwd (outside /base)
-		expect(readValidDirectory(`${BASE}/../etc/passwd`)).toBe(false);
-		expect(readValidDirectory(`${BASE}/logs/../../etc/passwd`)).toBe(false);
-		expect(readValidDirectory(`${BASE}/..`)).toBe(false);
-	});
-
-	it("returns true when .. stays within base", () => {
-		// e.g. /base/logs/../applications -> /base/applications (still under /base)
-		expect(readValidDirectory(`${BASE}/logs/../applications`)).toBe(true);
-		expect(readValidDirectory(`${BASE}/foo/../bar`)).toBe(true);
-	});
-
-	it("accepts serverId for remote base path", () => {
-		// With our mock, serverId doesn't change BASE_PATH; just ensure it doesn't throw
-		expect(readValidDirectory(BASE, "server-1")).toBe(true);
-		expect(readValidDirectory("/etc/passwd", "server-1")).toBe(false);
-	});
-
-	it("returns false for null/undefined-like paths that resolve outside", () => {
-		// Paths that might resolve to cwd or root
-		expect(readValidDirectory(".")).toBe(false);
-		expect(readValidDirectory("..")).toBe(false);
-	});
-
-	it("returns true for BASE_PATH with trailing slash or double slashes under base", () => {
-		expect(readValidDirectory(`${BASE}/`)).toBe(true);
-		expect(readValidDirectory(`${BASE}//logs`)).toBe(true);
-		expect(readValidDirectory(`${BASE}/applications///myapp/code`)).toBe(true);
-	});
-
-	it("returns false when path looks like base but is a sibling or prefix", () => {
-		expect(readValidDirectory("/base-evil")).toBe(false);
-		expect(readValidDirectory("/bas")).toBe(false);
-		expect(readValidDirectory(`${BASE}/../base-evil`)).toBe(false);
-	});
-
-	it("returns false for empty string (resolves to cwd)", () => {
-		expect(readValidDirectory("")).toBe(false);
-	});
-});

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

@@ -1,132 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-	isValidContainerId,
-	isValidSearch,
-	isValidSince,
-	isValidTail,
-} from "../../server/wss/utils";
-
-describe("isValidTail (docker-container-logs)", () => {
-	it("accepts valid numeric tail values", () => {
-		expect(isValidTail("0")).toBe(true);
-		expect(isValidTail("1")).toBe(true);
-		expect(isValidTail("100")).toBe(true);
-		expect(isValidTail("10000")).toBe(true);
-	});
-
-	it("rejects tail above 10000", () => {
-		expect(isValidTail("10001")).toBe(false);
-		expect(isValidTail("99999")).toBe(false);
-	});
-
-	it("rejects non-numeric tail", () => {
-		expect(isValidTail("")).toBe(false);
-		expect(isValidTail("abc")).toBe(false);
-		expect(isValidTail("10a")).toBe(false);
-		expect(isValidTail("-1")).toBe(false);
-	});
-
-	it("rejects command injection payloads in tail", () => {
-		expect(isValidTail("10; whoami; #")).toBe(false);
-		expect(isValidTail("100 | cat /etc/passwd")).toBe(false);
-		expect(isValidTail("$(id)")).toBe(false);
-		expect(isValidTail("`id`")).toBe(false);
-		expect(isValidTail("100\nid")).toBe(false);
-		expect(isValidTail("100 && id")).toBe(false);
-		expect(isValidTail("100; env | grep DATABASE")).toBe(false);
-	});
-});
-
-describe("isValidSince (docker-container-logs)", () => {
-	it("accepts 'all'", () => {
-		expect(isValidSince("all")).toBe(true);
-	});
-
-	it("accepts valid duration format (number + s|m|h|d)", () => {
-		expect(isValidSince("5s")).toBe(true);
-		expect(isValidSince("10m")).toBe(true);
-		expect(isValidSince("1h")).toBe(true);
-		expect(isValidSince("2d")).toBe(true);
-		expect(isValidSince("0s")).toBe(true);
-		expect(isValidSince("999d")).toBe(true);
-	});
-
-	it("rejects invalid duration format", () => {
-		expect(isValidSince("")).toBe(false);
-		expect(isValidSince("5")).toBe(false);
-		expect(isValidSince("s")).toBe(false);
-		expect(isValidSince("5x")).toBe(false);
-		expect(isValidSince("5sec")).toBe(false);
-		expect(isValidSince("5 m")).toBe(false);
-	});
-
-	it("rejects command injection payloads in since", () => {
-		expect(isValidSince("5s; whoami")).toBe(false);
-		expect(isValidSince("all; id")).toBe(false);
-		expect(isValidSince("1m$(id)")).toBe(false);
-		expect(isValidSince("1m | cat /etc/passwd")).toBe(false);
-	});
-});
-
-describe("isValidSearch (docker-container-logs)", () => {
-	it("accepts empty string", () => {
-		expect(isValidSearch("")).toBe(true);
-	});
-
-	it("accepts only alphanumeric, space, dot, underscore, hyphen", () => {
-		expect(isValidSearch("error")).toBe(true);
-		expect(isValidSearch("foo bar")).toBe(true);
-		expect(isValidSearch("a-zA-Z0-9_.-")).toBe(true);
-		expect(isValidSearch("")).toBe(true);
-	});
-
-	it("rejects strings longer than 500 chars", () => {
-		expect(isValidSearch("a".repeat(501))).toBe(false);
-		expect(isValidSearch("a".repeat(500))).toBe(true);
-	});
-
-	it("rejects control characters and non-printable", () => {
-		expect(isValidSearch("foo\nbar")).toBe(false);
-		expect(isValidSearch("foo\rbar")).toBe(false);
-		expect(isValidSearch("\x00")).toBe(false);
-		expect(isValidSearch("a\x19b")).toBe(false);
-	});
-
-	it("rejects command injection vectors in search (search is concatenated into shell)", () => {
-		// Double-quoted context (SSH line 99): $ and ` execute
-		expect(isValidSearch("$(whoami)")).toBe(false);
-		expect(isValidSearch("`id`")).toBe(false);
-		expect(isValidSearch("$(id)")).toBe(false);
-		// Single-quoted context (local line 153): ' breaks out
-		expect(isValidSearch("'$(whoami)'")).toBe(false);
-		expect(isValidSearch("error'")).toBe(false);
-		expect(isValidSearch("'; whoami; #")).toBe(false);
-		// Other shell-metacharacters
-		expect(isValidSearch("error; id")).toBe(false);
-		expect(isValidSearch("a|b")).toBe(false);
-		expect(isValidSearch('error"')).toBe(false);
-		expect(isValidSearch("a&b")).toBe(false);
-	});
-});
-
-describe("isValidContainerId (docker-container-logs)", () => {
-	it("accepts valid hex container IDs", () => {
-		expect(isValidContainerId("a".repeat(12))).toBe(true);
-		expect(isValidContainerId("abc123def456")).toBe(true);
-		expect(isValidContainerId("a".repeat(64))).toBe(true);
-	});
-
-	it("accepts valid container names", () => {
-		expect(isValidContainerId("my-container")).toBe(true);
-		expect(isValidContainerId("app_1")).toBe(true);
-		expect(isValidContainerId("service.name")).toBe(true);
-	});
-
-	it("rejects command injection in container ID", () => {
-		expect(isValidContainerId("dummy; whoami")).toBe(false);
-		expect(isValidContainerId("$(id)")).toBe(false);
-		expect(isValidContainerId("`id`")).toBe(false);
-		expect(isValidContainerId("container|cat /etc/passwd")).toBe(false);
-		expect(isValidContainerId("x; env | grep DATABASE")).toBe(false);
-	});
-});

apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx

@@ -22,7 +22,6 @@ import {
 	HealthCheckForm,
 	LabelsForm,
 	ModeForm,
-	NetworkForm,
 	PlacementForm,
 	RestartPolicyForm,
 	RollbackConfigForm,
@@ -80,13 +79,6 @@ const menuItems: MenuItem[] = [
 		docDescription:
 			"Set service mode to either 'Replicated' with a specified number of tasks (Replicas), or 'Global' (one task per node).",
 	},
-	{
-		id: "network",
-		label: "Network",
-		description: "Configure network attachments",
-		docDescription:
-			"Attach the service to one or more networks. Specify the network name (Target) and optional network aliases for service discovery.",
-	},
 	{
 		id: "labels",
 		label: "Labels",
@@ -198,7 +190,6 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 							<RollbackConfigForm id={id} type={type} />
 						)}
 						{activeMenu === "mode" && <ModeForm id={id} type={type} />}
-						{activeMenu === "network" && <NetworkForm id={id} type={type} />}
 						{activeMenu === "labels" && <LabelsForm id={id} type={type} />}
 						{activeMenu === "stop-grace-period" && (
 							<StopGracePeriodForm id={id} type={type} />

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

@@ -2,7 +2,6 @@ export { EndpointSpecForm } from "./endpoint-spec-form";
 export { HealthCheckForm } from "./health-check-form";
 export { LabelsForm } from "./labels-form";
 export { ModeForm } from "./mode-form";
-export { NetworkForm } from "./network-form";
 export { PlacementForm } from "./placement-form";
 export { RestartPolicyForm } from "./restart-policy-form";
 export { RollbackConfigForm } from "./rollback-config-form";

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/mode-form.tsx

@@ -105,14 +105,7 @@ export const ModeForm = ({ id, type }: ModeFormProps) => {
 
 			const modeData =
 				formData.type === "Replicated"
-					? {
-							Replicated: {
-								Replicas:
-									formData.Replicas !== undefined && formData.Replicas !== ""
-										? Number(formData.Replicas)
-										: undefined,
-							},
-						}
+					? { Replicated: { Replicas: formData.Replicas } }
 					: { Global: {} };
 
 			await mutateAsync({

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/network-form.tsx

@@ -1,313 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-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 { api } from "@/utils/api";
-
-const driverOptEntrySchema = z.object({
-	key: z.string(),
-	value: z.string(),
-});
-
-export const networkFormSchema = z.object({
-	networks: z
-		.array(
-			z.object({
-				Target: z.string().optional(),
-				Aliases: z.string().optional(),
-				DriverOptsEntries: z.array(driverOptEntrySchema).optional(),
-			}),
-		)
-		.optional(),
-});
-
-interface NetworkFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const NetworkForm = ({ id, type }: NetworkFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<z.infer<typeof networkFormSchema>>({
-		resolver: zodResolver(networkFormSchema),
-		defaultValues: {
-			networks: [],
-		},
-	});
-
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "networks",
-	});
-
-	useEffect(() => {
-		if (data?.networkSwarm && Array.isArray(data.networkSwarm)) {
-			const networkEntries = data.networkSwarm.map((network) => ({
-				Target: network.Target || "",
-				Aliases: network.Aliases?.join(", ") || "",
-				DriverOptsEntries: network.DriverOpts
-					? Object.entries(network.DriverOpts).map(([key, value]) => ({
-							key,
-							value: value ?? "",
-						}))
-					: [],
-			}));
-			form.reset({ networks: networkEntries });
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof networkFormSchema>) => {
-		setIsLoading(true);
-		try {
-			const networksArray =
-				formData.networks
-					?.filter((network) => network.Target)
-					.map((network) => {
-						const entries = (network.DriverOptsEntries ?? []).filter(
-							(e) => e.key.trim() !== "",
-						);
-						const driverOpts =
-							entries.length > 0
-								? Object.fromEntries(
-										entries.map((e) => [e.key.trim(), e.value]),
-									)
-								: undefined;
-						return {
-							Target: network.Target,
-							Aliases: network.Aliases
-								? network.Aliases.split(",").map((alias) => alias.trim())
-								: undefined,
-							DriverOpts: driverOpts,
-						};
-					}) || [];
-
-			// If no networks, send null to clear the database
-			const networksToSend = networksArray.length > 0 ? networksArray : null;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				networkSwarm: networksToSend,
-			});
-
-			toast.success("Network configuration updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating network configuration");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Networks</FormLabel>
-					<FormDescription>
-						Configure network attachments for your service
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{fields.map((field, index) => (
-							<div key={field.id} className="space-y-2 p-3 border rounded">
-								<FormField
-									control={form.control}
-									name={`networks.${index}.Target`}
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Network Name</FormLabel>
-											<FormControl>
-												<Input {...field} placeholder="my-network" />
-											</FormControl>
-											<FormDescription>
-												The name of the network to attach to
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name={`networks.${index}.Aliases`}
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Aliases (optional)</FormLabel>
-											<FormControl>
-												<Input
-													{...field}
-													placeholder="alias1, alias2, alias3"
-												/>
-											</FormControl>
-											<FormDescription>
-												Comma-separated list of network aliases
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<div className="space-y-2">
-									<FormLabel>Driver options (optional)</FormLabel>
-									<FormDescription>
-										e.g. com.docker.network.driver.mtu,
-										com.docker.network.driver.host_binding
-									</FormDescription>
-									{(
-										form.watch(`networks.${index}.DriverOptsEntries`) ?? []
-									).map((_, optIndex) => (
-										<div
-											key={optIndex}
-											className="flex gap-2 items-end flex-wrap"
-										>
-											<FormField
-												control={form.control}
-												name={`networks.${index}.DriverOptsEntries.${optIndex}.key`}
-												render={({ field }) => (
-													<FormItem className="flex-1 min-w-[140px]">
-														<FormControl>
-															<Input
-																{...field}
-																placeholder="com.docker.network.driver.mtu"
-															/>
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<FormField
-												control={form.control}
-												name={`networks.${index}.DriverOptsEntries.${optIndex}.value`}
-												render={({ field }) => (
-													<FormItem className="flex-1 min-w-[100px]">
-														<FormControl>
-															<Input {...field} placeholder="1500" />
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<Button
-												type="button"
-												variant="ghost"
-												size="sm"
-												onClick={() => {
-													const entries =
-														form.getValues(
-															`networks.${index}.DriverOptsEntries`,
-														) ?? [];
-													form.setValue(
-														`networks.${index}.DriverOptsEntries`,
-														entries.filter((_, i) => i !== optIndex),
-													);
-												}}
-											>
-												Remove
-											</Button>
-										</div>
-									))}
-									<Button
-										type="button"
-										variant="outline"
-										size="sm"
-										onClick={() => {
-											const entries =
-												form.getValues(`networks.${index}.DriverOptsEntries`) ??
-												[];
-											form.setValue(`networks.${index}.DriverOptsEntries`, [
-												...entries,
-												{ key: "", value: "" },
-											]);
-										}}
-									>
-										Add driver option
-									</Button>
-								</div>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => remove(index)}
-								>
-									Remove Network
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={() =>
-								append({
-									Target: "",
-									Aliases: "",
-									DriverOptsEntries: [],
-								})
-							}
-						>
-							Add Network
-						</Button>
-					</div>
-				</div>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({ networks: [] });
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Networks
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/show-resources.tsx

@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { InfoIcon, Plus, Trash2 } from "lucide-react";
+import { InfoIcon } from "lucide-react";
 import { useEffect } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
@@ -21,18 +21,10 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
 import {
 	createConverter,
 	NumberInputWithSteps,
 } from "@/components/ui/number-input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
 import {
 	Tooltip,
 	TooltipContent,
@@ -58,36 +50,13 @@ const memoryConverter = createConverter(1024 * 1024, (mb) => {
 		: `${formatNumber(mb)} MB`;
 });
 
-const ulimitSchema = z.object({
-	Name: z.string().min(1, "Name is required"),
-	Soft: z.coerce.number().int().min(-1, "Must be >= -1"),
-	Hard: z.coerce.number().int().min(-1, "Must be >= -1"),
-});
-
 const addResourcesSchema = z.object({
 	memoryReservation: z.string().optional(),
 	cpuLimit: z.string().optional(),
 	memoryLimit: z.string().optional(),
 	cpuReservation: z.string().optional(),
-	ulimitsSwarm: z.array(ulimitSchema).optional(),
 });
 
-const ULIMIT_PRESETS = [
-	{ value: "nofile", label: "nofile (Open Files)" },
-	{ value: "nproc", label: "nproc (Processes)" },
-	{ value: "memlock", label: "memlock (Locked Memory)" },
-	{ value: "stack", label: "stack (Stack Size)" },
-	{ value: "core", label: "core (Core File Size)" },
-	{ value: "cpu", label: "cpu (CPU Time)" },
-	{ value: "data", label: "data (Data Segment)" },
-	{ value: "fsize", label: "fsize (File Size)" },
-	{ value: "locks", label: "locks (File Locks)" },
-	{ value: "msgqueue", label: "msgqueue (Message Queues)" },
-	{ value: "nice", label: "nice (Nice Priority)" },
-	{ value: "rtprio", label: "rtprio (Real-time Priority)" },
-	{ value: "sigpending", label: "sigpending (Pending Signals)" },
-];
-
 export type ServiceType =
 	| "postgres"
 	| "mongo"
@@ -138,16 +107,10 @@ export const ShowResources = ({ id, type }: Props) => {
 			cpuReservation: "",
 			memoryLimit: "",
 			memoryReservation: "",
-			ulimitsSwarm: [],
 		},
 		resolver: zodResolver(addResourcesSchema),
 	});
 
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "ulimitsSwarm",
-	});
-
 	useEffect(() => {
 		if (data) {
 			form.reset({
@@ -155,7 +118,6 @@ export const ShowResources = ({ id, type }: Props) => {
 				cpuReservation: data?.cpuReservation || undefined,
 				memoryLimit: data?.memoryLimit || undefined,
 				memoryReservation: data?.memoryReservation || undefined,
-				ulimitsSwarm: data?.ulimitsSwarm || [],
 			});
 		}
 	}, [data, form, form.reset]);
@@ -172,10 +134,6 @@ export const ShowResources = ({ id, type }: Props) => {
 			cpuReservation: formData.cpuReservation || null,
 			memoryLimit: formData.memoryLimit || null,
 			memoryReservation: formData.memoryReservation || null,
-			ulimitsSwarm:
-				formData.ulimitsSwarm && formData.ulimitsSwarm.length > 0
-					? formData.ulimitsSwarm
-					: null,
 		})
 			.then(async () => {
 				toast.success("Resources Updated");
@@ -367,145 +325,6 @@ export const ShowResources = ({ id, type }: Props) => {
 								}}
 							/>
 						</div>
-
-						{/* Ulimits Section */}
-						<div className="space-y-4">
-							<div className="flex items-center justify-between">
-								<div className="flex items-center gap-2">
-									<FormLabel className="text-base">Ulimits</FormLabel>
-									<TooltipProvider>
-										<Tooltip delayDuration={0}>
-											<TooltipTrigger>
-												<InfoIcon className="h-4 w-4 text-muted-foreground" />
-											</TooltipTrigger>
-											<TooltipContent className="max-w-xs">
-												<p>
-													Set resource limits for the container. Each ulimit has
-													a soft limit (warning threshold) and hard limit
-													(maximum allowed). Use -1 for unlimited.
-												</p>
-											</TooltipContent>
-										</Tooltip>
-									</TooltipProvider>
-								</div>
-								<Button
-									type="button"
-									variant="outline"
-									size="sm"
-									onClick={() =>
-										append({ Name: "nofile", Soft: 65535, Hard: 65535 })
-									}
-								>
-									<Plus className="h-4 w-4 mr-1" />
-									Add Ulimit
-								</Button>
-							</div>
-
-							{fields.length > 0 && (
-								<div className="space-y-3">
-									{fields.map((field, index) => (
-										<div
-											key={field.id}
-											className="flex items-start gap-3 p-3 border rounded-lg bg-muted/30"
-										>
-											<FormField
-												control={form.control}
-												name={`ulimitsSwarm.${index}.Name`}
-												render={({ field }) => (
-													<FormItem className="flex-1">
-														<FormLabel className="text-xs">Type</FormLabel>
-														<Select
-															onValueChange={field.onChange}
-															value={field.value}
-														>
-															<FormControl>
-																<SelectTrigger>
-																	<SelectValue placeholder="Select ulimit" />
-																</SelectTrigger>
-															</FormControl>
-															<SelectContent>
-																{ULIMIT_PRESETS.map((preset) => (
-																	<SelectItem
-																		key={preset.value}
-																		value={preset.value}
-																	>
-																		{preset.label}
-																	</SelectItem>
-																))}
-															</SelectContent>
-														</Select>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<FormField
-												control={form.control}
-												name={`ulimitsSwarm.${index}.Soft`}
-												render={({ field }) => (
-													<FormItem className="w-32">
-														<FormLabel className="text-xs">
-															Soft Limit
-														</FormLabel>
-														<FormControl>
-															<Input
-																type="number"
-																min={-1}
-																placeholder="65535"
-																{...field}
-																onChange={(e) =>
-																	field.onChange(Number(e.target.value))
-																}
-															/>
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<FormField
-												control={form.control}
-												name={`ulimitsSwarm.${index}.Hard`}
-												render={({ field }) => (
-													<FormItem className="w-32">
-														<FormLabel className="text-xs">
-															Hard Limit
-														</FormLabel>
-														<FormControl>
-															<Input
-																type="number"
-																min={-1}
-																placeholder="65535"
-																{...field}
-																onChange={(e) =>
-																	field.onChange(Number(e.target.value))
-																}
-															/>
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<Button
-												type="button"
-												variant="ghost"
-												size="icon"
-												className="mt-6 text-destructive hover:text-destructive"
-												onClick={() => remove(index)}
-											>
-												<Trash2 className="h-4 w-4" />
-											</Button>
-										</div>
-									))}
-								</div>
-							)}
-
-							{fields.length === 0 && (
-								<p className="text-sm text-muted-foreground">
-									No ulimits configured. Click &quot;Add Ulimit&quot; to set
-									resource limits.
-								</p>
-							)}
-						</div>
-
 						<div className="flex w-full justify-end">
 							<Button isLoading={isLoading} type="submit">
 								Save

apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx

@@ -24,8 +24,6 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Label } from "@/components/ui/label";
 import { api } from "@/utils/api";
 
 const UpdateTraefikConfigSchema = z.object({
@@ -61,7 +59,6 @@ export const validateAndFormatYAML = (yamlText: string) => {
 
 export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 	const [open, setOpen] = useState(false);
-	const [skipYamlValidation, setSkipYamlValidation] = useState(false);
 	const { data, refetch } = api.application.readTraefikConfig.useQuery(
 		{
 			applicationId,
@@ -88,15 +85,13 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 	}, [data]);
 
 	const onSubmit = async (data: UpdateTraefikConfig) => {
-		if (!skipYamlValidation) {
-			const { valid, error } = validateAndFormatYAML(data.traefikConfig);
-			if (!valid) {
-				form.setError("traefikConfig", {
-					type: "manual",
-					message: (error as string) || "Invalid YAML",
-				});
-				return;
-			}
+		const { valid, error } = validateAndFormatYAML(data.traefikConfig);
+		if (!valid) {
+			form.setError("traefikConfig", {
+				type: "manual",
+				message: (error as string) || "Invalid YAML",
+			});
+			return;
 		}
 		form.clearErrors("traefikConfig");
 		await mutateAsync({
@@ -121,7 +116,6 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 				setOpen(open);
 				if (!open) {
 					form.reset();
-					setSkipYamlValidation(false);
 				}
 			}}
 		>
@@ -175,28 +169,7 @@ routers:
 						</div>
 					</form>
 
-					<DialogFooter className="flex-col sm:flex-row gap-4">
-						<div className="flex flex-col gap-1 w-full sm:w-auto sm:mr-auto">
-							<div className="flex items-center space-x-2">
-								<Checkbox
-									id="skip-yaml-validation-app"
-									checked={skipYamlValidation}
-									onCheckedChange={(checked) =>
-										setSkipYamlValidation(checked === true)
-									}
-								/>
-								<Label
-									htmlFor="skip-yaml-validation-app"
-									className="text-sm font-normal cursor-pointer"
-								>
-									Skip YAML validation (for Go templating)
-								</Label>
-							</div>
-							<p className="text-sm text-muted-foreground">
-								Check to save configs with Go templating (e.g.{" "}
-								<code className="text-xs">{"{{range}}"}</code>).
-							</p>
-						</div>
+					<DialogFooter>
 						<Button
 							isLoading={isLoading}
 							form="hook-form-update-traefik-config"

apps/dokploy/components/dashboard/application/deployments/cancel-queues.tsx

@@ -1,4 +1,4 @@
-import { Ban } from "lucide-react";
+import { Paintbrush } from "lucide-react";
 import { toast } from "sonner";
 import {
 	AlertDialog,
@@ -35,7 +35,7 @@ export const CancelQueues = ({ id, type }: Props) => {
 			<AlertDialogTrigger asChild>
 				<Button variant="destructive" className="w-fit" isLoading={isLoading}>
 					Cancel Queues
-					<Ban className="size-4" />
+					<Paintbrush className="size-4" />
 				</Button>
 			</AlertDialogTrigger>
 			<AlertDialogContent>

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

@@ -1,73 +0,0 @@
-import { Paintbrush } from "lucide-react";
-import { toast } from "sonner";
-import {
-	AlertDialog,
-	AlertDialogAction,
-	AlertDialogCancel,
-	AlertDialogContent,
-	AlertDialogDescription,
-	AlertDialogFooter,
-	AlertDialogHeader,
-	AlertDialogTitle,
-	AlertDialogTrigger,
-} from "@/components/ui/alert-dialog";
-import { Button } from "@/components/ui/button";
-import { api } from "@/utils/api";
-
-interface Props {
-	id: string;
-	type: "application" | "compose";
-}
-
-export const ClearDeployments = ({ id, type }: Props) => {
-	const utils = api.useUtils();
-	const { mutateAsync, isLoading } =
-		type === "application"
-			? api.application.clearDeployments.useMutation()
-			: api.compose.clearDeployments.useMutation();
-
-	return (
-		<AlertDialog>
-			<AlertDialogTrigger asChild>
-				<Button variant="outline" className="w-fit" isLoading={isLoading}>
-					Clear deployments
-					<Paintbrush className="size-4" />
-				</Button>
-			</AlertDialogTrigger>
-			<AlertDialogContent>
-				<AlertDialogHeader>
-					<AlertDialogTitle>
-						Are you sure you want to clear old deployments?
-					</AlertDialogTitle>
-					<AlertDialogDescription>
-						This will delete all old deployment records and logs, keeping only
-						the active deployment (the most recent successful one).
-					</AlertDialogDescription>
-				</AlertDialogHeader>
-				<AlertDialogFooter>
-					<AlertDialogCancel>Cancel</AlertDialogCancel>
-					<AlertDialogAction
-						onClick={async () => {
-							await mutateAsync({
-								applicationId: id || "",
-								composeId: id || "",
-							})
-								.then(async () => {
-									toast.success("Old deployments cleared successfully");
-									await utils.deployment.allByType.invalidate({
-										id,
-										type: type as "application" | "compose",
-									});
-								})
-								.catch((err) => {
-									toast.error(err.message);
-								});
-						}}
-					>
-						Confirm
-					</AlertDialogAction>
-				</AlertDialogFooter>
-			</AlertDialogContent>
-		</AlertDialog>
-	);
-};

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

@@ -6,7 +6,6 @@ import {
 	RefreshCcw,
 	RocketIcon,
 	Settings,
-	Trash2,
 } from "lucide-react";
 import React, { useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
@@ -26,7 +25,6 @@ import {
 import { api, type RouterOutputs } from "@/utils/api";
 import { ShowRollbackSettings } from "../rollbacks/show-rollback-settings";
 import { CancelQueues } from "./cancel-queues";
-import { ClearDeployments } from "./clear-deployments";
 import { KillBuild } from "./kill-build";
 import { RefreshToken } from "./refresh-token";
 import { ShowDeployment } from "./show-deployment";
@@ -79,8 +77,6 @@ export const ShowDeployments = ({
 		api.rollback.rollback.useMutation();
 	const { mutateAsync: killProcess, isLoading: isKillingProcess } =
 		api.deployment.killProcess.useMutation();
-	const { mutateAsync: removeDeployment, isLoading: isRemovingDeployment } =
-		api.deployment.removeDeployment.useMutation();
 
 	// Cancel deployment mutations
 	const {
@@ -148,9 +144,6 @@ export const ShowDeployments = ({
 					</CardDescription>
 				</div>
 				<div className="flex flex-row items-center flex-wrap gap-2">
-					{(type === "application" || type === "compose") && (
-						<ClearDeployments id={id} type={type} />
-					)}
 					{(type === "application" || type === "compose") && (
 						<KillBuild id={id} type={type} />
 					)}
@@ -259,8 +252,6 @@ export const ShowDeployments = ({
 							const isExpanded = expandedDescriptions.has(
 								deployment.deploymentId,
 							);
-							const canDelete =
-								deployment.status === "done" || deployment.status === "error";
 
 							return (
 								<div
@@ -379,33 +370,6 @@ export const ShowDeployments = ({
 												View
 											</Button>
 
-											{canDelete && (
-												<DialogAction
-													title="Delete Deployment"
-													description="Are you sure you want to delete this deployment? This action cannot be undone."
-													type="default"
-													onClick={async () => {
-														try {
-															await removeDeployment({
-																deploymentId: deployment.deploymentId,
-															});
-															toast.success("Deployment deleted successfully");
-														} catch (error) {
-															toast.error("Error deleting deployment");
-														}
-													}}
-												>
-													<Button
-														variant="destructive"
-														size="sm"
-														isLoading={isRemovingDeployment}
-													>
-														Delete
-														<Trash2 className="size-4" />
-													</Button>
-												</DialogAction>
-											)}
-
 											{deployment?.rollback &&
 												deployment.status === "done" &&
 												type === "application" && (

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

@@ -245,13 +245,13 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -263,15 +263,11 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!bitbucketId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Bitbucket account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -258,14 +258,14 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo: GiteaRepository) =>
 																		repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -277,15 +277,11 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!giteaId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Gitea account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -233,13 +233,13 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -251,15 +251,11 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!githubId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitHub account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -254,13 +254,13 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -272,15 +272,11 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!gitlabId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitLab account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -34,7 +34,6 @@ export const DockerLogs = dynamic(
 export const badgeStateColor = (state: string) => {
 	switch (state) {
 		case "running":
-		case "ready":
 			return "green";
 		case "exited":
 		case "shutdown":
@@ -143,7 +142,6 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.status ? ` ${container.status}` : ""}
 										</SelectItem>
 									))}
 								</div>
@@ -159,9 +157,6 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.currentState
-												? ` ${container.currentState}`
-												: ""}
 										</SelectItem>
 									))}
 								</>
@@ -171,13 +166,6 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
 						</SelectGroup>
 					</SelectContent>
 				</Select>
-				{option === "swarm" &&
-					services?.find((c) => c.containerId === containerId)?.error && (
-						<div className="rounded-md bg-destructive/10 border border-destructive/20 px-3 py-2 text-sm text-destructive">
-							<span className="font-medium">Error: </span>
-							{services?.find((c) => c.containerId === containerId)?.error}
-						</div>
-					)}
 				<DockerLogs
 					serverId={serverId || ""}
 					containerId={containerId || "select-a-container"}

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

@@ -247,13 +247,13 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -265,15 +265,11 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!bitbucketId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Bitbucket account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -244,13 +244,13 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
 											</FormControl>
@@ -261,15 +261,11 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!giteaId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Gitea account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -234,13 +234,13 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -252,15 +252,11 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!githubId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitHub account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -256,13 +256,13 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
-														? "Select repository"
-														: isLoadingRepositories
-															? "Loading...."
-															: (repositories?.find(
+													{isLoadingRepositories
+														? "Loading...."
+														: field.value.owner
+															? repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -274,15 +274,11 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!gitlabId ? (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitLab account first
-													</span>
-												) : isLoadingRepositories ? (
+												{isLoadingRepositories && (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

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

@@ -128,7 +128,6 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.status ? ` ${container.status}` : ""}
 										</SelectItem>
 									))}
 								</div>
@@ -144,9 +143,6 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.currentState
-												? ` ${container.currentState}`
-												: ""}
 										</SelectItem>
 									))}
 								</>
@@ -156,13 +152,6 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 						</SelectGroup>
 					</SelectContent>
 				</Select>
-				{option === "swarm" &&
-					services?.find((c) => c.containerId === containerId)?.error && (
-						<div className="rounded-md bg-destructive/10 border border-destructive/20 px-3 py-2 text-sm text-destructive">
-							<span className="font-medium">Error: </span>
-							{services.find((c) => c.containerId === containerId)?.error}
-						</div>
-					)}
 				<DockerLogs
 					serverId={serverId || ""}
 					containerId={containerId || "select-a-container"}

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

@@ -1,8 +1,8 @@
 import { Loader2 } from "lucide-react";
-import { badgeStateColor } from "@/components/dashboard/application/logs/show";
-import { Badge } from "@/components/ui/badge";
 import dynamic from "next/dynamic";
 import { useEffect, useState } from "react";
+import { badgeStateColor } from "@/components/dashboard/application/logs/show";
+import { Badge } from "@/components/ui/badge";
 import {
 	Card,
 	CardContent,
@@ -93,7 +93,6 @@ export const ShowDockerLogsCompose = ({
 									<Badge variant={badgeStateColor(container.state)}>
 										{container.state}
 									</Badge>
-									{container.status ? ` ${container.status}` : ""}
 								</SelectItem>
 							))}
 							<SelectLabel>Containers ({data?.length})</SelectLabel>

apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx

@@ -7,7 +7,6 @@ import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
 import {
 	Form,
 	FormControl,
@@ -17,7 +16,6 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { Label } from "@/components/ui/label";
 import { api } from "@/utils/api";
 import { validateAndFormatYAML } from "../application/advanced/traefik/update-traefik-config";
 
@@ -49,7 +47,6 @@ export const ShowTraefikFile = ({ path, serverId }: Props) => {
 		},
 	);
 	const [canEdit, setCanEdit] = useState(true);
-	const [skipYamlValidation, setSkipYamlValidation] = useState(false);
 
 	const { mutateAsync, isLoading, error, isError } =
 		api.settings.updateTraefikFile.useMutation();
@@ -69,15 +66,13 @@ export const ShowTraefikFile = ({ path, serverId }: Props) => {
 	}, [form, form.reset, data]);
 
 	const onSubmit = async (data: UpdateServerMiddlewareConfig) => {
-		if (!skipYamlValidation) {
-			const { valid, error } = validateAndFormatYAML(data.traefikConfig);
-			if (!valid) {
-				form.setError("traefikConfig", {
-					type: "manual",
-					message: error || "Invalid YAML",
-				});
-				return;
-			}
+		const { valid, error } = validateAndFormatYAML(data.traefikConfig);
+		if (!valid) {
+			form.setError("traefikConfig", {
+				type: "manual",
+				message: error || "Invalid YAML",
+			});
+			return;
 		}
 		form.clearErrors("traefikConfig");
 		await mutateAsync({
@@ -158,37 +153,14 @@ routers:
 							/>
 						)}
 					</div>
-					<div className="flex flex-col gap-4">
-						<div className="flex items-center space-x-2">
-							<Checkbox
-								id="skip-yaml-validation"
-								checked={skipYamlValidation}
-								onCheckedChange={(checked) =>
-									setSkipYamlValidation(checked === true)
-								}
-							/>
-							<Label
-								htmlFor="skip-yaml-validation"
-								className="text-sm font-normal cursor-pointer"
-							>
-								Skip YAML validation (for Go templating)
-							</Label>
-						</div>
-						<p className="text-sm text-muted-foreground -mt-2">
-							Traefik supports Go templating in dynamic configs (e.g.{" "}
-							<code className="text-xs">{"{{range}}"}</code>). Configs using
-							templates will fail standard YAML validation. Check this to save
-							without validation.
-						</p>
-						<div className="flex justify-end">
-							<Button
-								isLoading={isLoading}
-								disabled={canEdit || isLoading}
-								type="submit"
-							>
-								Update
-							</Button>
-						</div>
+					<div className="flex justify-end">
+						<Button
+							isLoading={isLoading}
+							disabled={canEdit || isLoading}
+							type="submit"
+						>
+							Update
+						</Button>
 					</div>
 				</form>
 			</Form>

apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx

@@ -73,8 +73,8 @@ export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx

@@ -73,8 +73,8 @@ export const ShowExternalMongoCredentials = ({ mongoId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx

@@ -73,8 +73,8 @@ export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx

@@ -75,8 +75,8 @@ export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

apps/dokploy/components/dashboard/projects/show.tsx

@@ -430,7 +430,7 @@ export const ShowProjects = () => {
 																</DropdownMenu>
 															) : null}
 															<CardHeader>
-																<CardTitle className="flex items-center justify-between gap-2 overflow-clip">
+																<CardTitle className="flex items-center justify-between gap-2">
 																	<span className="flex flex-col gap-1.5 ">
 																		<div className="flex items-center gap-2">
 																			<BookIcon className="size-4 text-muted-foreground" />
@@ -439,7 +439,7 @@ export const ShowProjects = () => {
 																			</span>
 																		</div>
 
-																		<span className="text-sm font-medium text-muted-foreground break-normal">
+																		<span className="text-sm font-medium text-muted-foreground break-all">
 																			{project.description}
 																		</span>
 

apps/dokploy/components/dashboard/redis/general/show-external-redis-credentials.tsx

@@ -74,8 +74,8 @@ export const ShowExternalRedisCredentials = ({ redisId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

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

@@ -21,7 +21,6 @@ import {
 	FormControl,
 	FormField,
 	FormItem,
-	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
@@ -40,10 +39,6 @@ const Schema = z.object({
 	giteaUrl: z.string().min(1, {
 		message: "Gitea URL is required",
 	}),
-	giteaInternalUrl: z
-		.union([z.string().url(), z.literal("")])
-		.optional()
-		.transform((v) => (v === "" ? undefined : v)),
 	clientId: z.string().min(1, {
 		message: "Client ID is required",
 	}),
@@ -75,7 +70,6 @@ export const AddGiteaProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			giteaUrl: "https://gitea.com",
-			giteaInternalUrl: "",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -89,7 +83,6 @@ export const AddGiteaProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			giteaUrl: "https://gitea.com",
-			giteaInternalUrl: "",
 		});
 	}, [form, webhookUrl, isOpen]);
 
@@ -102,7 +95,6 @@ export const AddGiteaProvider = () => {
 				name: data.name,
 				redirectUri: data.redirectUri,
 				giteaUrl: data.giteaUrl,
-				giteaInternalUrl: data.giteaInternalUrl || undefined,
 				organizationName: data.organizationName,
 			})) as unknown as GiteaProviderResponse;
 
@@ -231,29 +223,6 @@ export const AddGiteaProvider = () => {
 									)}
 								/>
 
-								<FormField
-									control={form.control}
-									name="giteaInternalUrl"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Internal URL (Optional)</FormLabel>
-											<FormControl>
-												<Input
-													placeholder="http://gitea:3000"
-													{...field}
-													value={field.value ?? ""}
-												/>
-											</FormControl>
-											<FormDescription>
-												Use when Gitea runs on the same instance as Dokploy.
-												Used for OAuth token exchange to reach Gitea via
-												internal network (e.g. Docker service name).
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="redirectUri"

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

@@ -19,7 +19,6 @@ import {
 	FormControl,
 	FormField,
 	FormItem,
-	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
@@ -31,10 +30,6 @@ import { useUrl } from "@/utils/hooks/use-url";
 const formSchema = z.object({
 	name: z.string().min(1, "Name is required"),
 	giteaUrl: z.string().min(1, "Gitea URL is required"),
-	giteaInternalUrl: z
-		.union([z.string().url(), z.literal("")])
-		.optional()
-		.transform((v) => (v === "" ? undefined : v)),
 	clientId: z.string().min(1, "Client ID is required"),
 	clientSecret: z.string().min(1, "Client Secret is required"),
 });
@@ -99,7 +94,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 		defaultValues: {
 			name: "",
 			giteaUrl: "https://gitea.com",
-			giteaInternalUrl: "",
 			clientId: "",
 			clientSecret: "",
 		},
@@ -110,7 +104,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 			form.reset({
 				name: gitea.gitProvider?.name || "",
 				giteaUrl: gitea.giteaUrl || "https://gitea.com",
-				giteaInternalUrl: gitea.giteaInternalUrl || "",
 				clientId: gitea.clientId || "",
 				clientSecret: gitea.clientSecret || "",
 			});
@@ -123,7 +116,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 			gitProviderId: gitea?.gitProvider?.gitProviderId || "",
 			name: values.name,
 			giteaUrl: values.giteaUrl,
-			giteaInternalUrl: values.giteaInternalUrl ?? null,
 			clientId: values.clientId,
 			clientSecret: values.clientSecret,
 		})
@@ -232,28 +224,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="giteaInternalUrl"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Internal URL (Optional)</FormLabel>
-									<FormControl>
-										<Input
-											placeholder="http://gitea:3000"
-											{...field}
-											value={field.value ?? ""}
-										/>
-									</FormControl>
-									<FormDescription>
-										Use when Gitea runs on the same instance as Dokploy. Used
-										for OAuth token exchange to reach Gitea via internal network
-										(e.g. Docker service name).
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
 						<FormField
 							control={form.control}
 							name="clientId"

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

@@ -21,7 +21,6 @@ import {
 	FormControl,
 	FormField,
 	FormItem,
-	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
@@ -36,10 +35,6 @@ const Schema = z.object({
 	gitlabUrl: z.string().min(1, {
 		message: "GitLab URL is required",
 	}),
-	gitlabInternalUrl: z
-		.union([z.string().url(), z.literal("")])
-		.optional()
-		.transform((v) => (v === "" ? undefined : v)),
 	applicationId: z.string().min(1, {
 		message: "Application ID is required",
 	}),
@@ -71,7 +66,6 @@ export const AddGitlabProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			gitlabUrl: "https://gitlab.com",
-			gitlabInternalUrl: "",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -86,7 +80,6 @@ export const AddGitlabProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			gitlabUrl: "https://gitlab.com",
-			gitlabInternalUrl: "",
 		});
 	}, [form, isOpen]);
 
@@ -99,7 +92,6 @@ export const AddGitlabProvider = () => {
 			name: data.name || "",
 			redirectUri: data.redirectUri || "",
 			gitlabUrl: data.gitlabUrl || "https://gitlab.com",
-			gitlabInternalUrl: data.gitlabInternalUrl || undefined,
 		})
 			.then(async () => {
 				await utils.gitProvider.getAll.invalidate();
@@ -200,29 +192,6 @@ export const AddGitlabProvider = () => {
 									)}
 								/>
 
-								<FormField
-									control={form.control}
-									name="gitlabInternalUrl"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Internal URL (Optional)</FormLabel>
-											<FormControl>
-												<Input
-													placeholder="http://gitlab:80"
-													{...field}
-													value={field.value ?? ""}
-												/>
-											</FormControl>
-											<FormDescription>
-												Use when GitLab runs on the same instance as Dokploy.
-												Used for OAuth token exchange to reach GitLab via
-												internal network (e.g. Docker service name).
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="redirectUri"

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

@@ -20,7 +20,6 @@ import {
 	FormControl,
 	FormField,
 	FormItem,
-	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
@@ -34,10 +33,6 @@ const Schema = z.object({
 	gitlabUrl: z.string().url({
 		message: "Invalid Gitlab URL",
 	}),
-	gitlabInternalUrl: z
-		.union([z.string().url(), z.literal("")])
-		.optional()
-		.transform((v) => (v === "" ? undefined : v)),
 	groupName: z.string().optional(),
 });
 
@@ -66,7 +61,6 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => {
 			groupName: "",
 			name: "",
 			gitlabUrl: "https://gitlab.com",
-			gitlabInternalUrl: "",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -78,7 +72,6 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => {
 			groupName: gitlab?.groupName || "",
 			name: gitlab?.gitProvider.name || "",
 			gitlabUrl: gitlab?.gitlabUrl || "",
-			gitlabInternalUrl: gitlab?.gitlabInternalUrl || "",
 		});
 	}, [form, isOpen]);
 
@@ -89,7 +82,6 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => {
 			groupName: data.groupName || "",
 			name: data.name || "",
 			gitlabUrl: data.gitlabUrl || "",
-			gitlabInternalUrl: data.gitlabInternalUrl ?? null,
 		})
 			.then(async () => {
 				await utils.gitProvider.getAll.invalidate();
@@ -159,29 +151,6 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => {
 									)}
 								/>
 
-								<FormField
-									control={form.control}
-									name="gitlabInternalUrl"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Internal URL (Optional)</FormLabel>
-											<FormControl>
-												<Input
-													placeholder="http://gitlab:80"
-													{...field}
-													value={field.value ?? ""}
-												/>
-											</FormControl>
-											<FormDescription>
-												Use when GitLab runs on the same instance as Dokploy.
-												Used for OAuth token exchange to reach GitLab via
-												internal network (e.g. Docker service name).
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="groupName"

apps/dokploy/components/dashboard/settings/linking-account/linking-account.tsx

@@ -1,245 +0,0 @@
-"use client";
-
-import { Link2, Loader2, Unlink } from "lucide-react";
-import { useCallback, useEffect, useState } from "react";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import { authClient } from "@/lib/auth-client";
-
-const LINKING_CALLBACK_URL = "/dashboard/settings/profile";
-
-const TRUSTED_PROVIDERS = ["google", "github"] as const;
-type SocialProvider = (typeof TRUSTED_PROVIDERS)[number];
-
-type AccountItem = {
-	providerId: string;
-	accountId?: string;
-};
-
-function providerLabel(providerId: string): string {
-	return providerId.charAt(0).toUpperCase() + providerId.slice(1);
-}
-
-export function LinkingAccount() {
-	const [accounts, setAccounts] = useState<AccountItem[]>([]);
-	const [accountsLoading, setAccountsLoading] = useState(true);
-	const [linkingProvider, setLinkingProvider] = useState<SocialProvider | null>(
-		null,
-	);
-	const [unlinkingProviderId, setUnlinkingProviderId] = useState<string | null>(
-		null,
-	);
-
-	const fetchAccounts = useCallback(async () => {
-		setAccountsLoading(true);
-		try {
-			const { data } = await authClient.listAccounts();
-			const list = Array.isArray(data)
-				? data
-				: ((data && typeof data === "object" && "accounts" in data
-						? (data as { accounts?: AccountItem[] }).accounts
-						: null) ?? []);
-			setAccounts(Array.isArray(list) ? list : []);
-		} catch {
-			setAccounts([]);
-		} finally {
-			setAccountsLoading(false);
-		}
-	}, []);
-
-	useEffect(() => {
-		fetchAccounts();
-	}, [fetchAccounts]);
-
-	const linkedProviderIds = new Set(accounts.map((a) => a.providerId));
-	const socialAccounts = accounts.filter((a) =>
-		TRUSTED_PROVIDERS.includes(a.providerId as SocialProvider),
-	);
-
-	const handleLinkSocial = async (provider: SocialProvider) => {
-		setLinkingProvider(provider);
-		try {
-			const { error } = await authClient.linkSocial({
-				provider,
-				callbackURL: LINKING_CALLBACK_URL,
-			});
-			if (error) {
-				toast.error(error.message ?? "Failed to link account");
-				setLinkingProvider(null);
-				return;
-			}
-		} catch (err) {
-			toast.error(
-				"Failed to link account",
-				err instanceof Error ? { description: err.message } : undefined,
-			);
-			setLinkingProvider(null);
-		}
-	};
-
-	const handleUnlink = async (providerId: string, accountId?: string) => {
-		setUnlinkingProviderId(providerId);
-		try {
-			const { error } = await authClient.unlinkAccount({
-				providerId,
-				...(accountId && { accountId }),
-			});
-			if (error) {
-				toast.error(error.message ?? "Failed to unlink account");
-				return;
-			}
-			toast.success("Account unlinked");
-			await fetchAccounts();
-		} catch (err) {
-			toast.error(
-				"Failed to unlink account",
-				err instanceof Error ? { description: err.message } : undefined,
-			);
-		} finally {
-			setUnlinkingProviderId(null);
-		}
-	};
-
-	const canUnlink = accounts.length > 1;
-
-	return (
-		<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-6xl mx-auto w-full">
-			<div className="rounded-xl bg-background shadow-md">
-				<CardHeader>
-					<div className="flex flex-row gap-2 flex-wrap justify-between items-center">
-						<div>
-							<CardTitle className="text-xl flex flex-row gap-2">
-								<Link2 className="size-6 text-muted-foreground self-center" />
-								Linking account
-							</CardTitle>
-							<CardDescription>
-								Link your Google or GitHub account to sign in with them.
-							</CardDescription>
-						</div>
-					</div>
-				</CardHeader>
-				<CardContent className="space-y-6 py-8 border-t">
-					{/* Linked accounts */}
-					<div className="space-y-2">
-						<p className="text-sm font-medium">Linked accounts</p>
-						{accountsLoading ? (
-							<div className="flex items-center gap-2 text-sm text-muted-foreground py-2">
-								<Loader2 className="size-4 animate-spin" />
-								Loading...
-							</div>
-						) : socialAccounts.length === 0 ? (
-							<p className="text-sm text-muted-foreground py-2">
-								No social accounts linked yet.
-							</p>
-						) : (
-							<ul className="space-y-2">
-								{socialAccounts.map((acc) => (
-									<li
-										key={acc.accountId ?? acc.providerId}
-										className="flex items-center justify-between rounded-lg border px-3 py-2 text-sm"
-									>
-										<span className="font-medium">
-											{providerLabel(acc.providerId)}
-										</span>
-										{canUnlink && (
-											<Button
-												variant="ghost"
-												size="sm"
-												className="text-destructive hover:text-destructive hover:bg-destructive/10"
-												onClick={() =>
-													handleUnlink(acc.providerId, acc.accountId)
-												}
-												disabled={unlinkingProviderId === acc.providerId}
-												isLoading={unlinkingProviderId === acc.providerId}
-											>
-												{unlinkingProviderId === acc.providerId ? (
-													<Loader2 className="size-4 animate-spin" />
-												) : (
-													<>
-														<Unlink className="mr-1.5 size-4" />
-														Unlink
-													</>
-												)}
-											</Button>
-										)}
-									</li>
-								))}
-							</ul>
-						)}
-					</div>
-
-					<p className="text-sm text-muted-foreground">
-						Click a provider below to link it to your account. You will be
-						redirected to complete the flow.
-					</p>
-					<div className="flex flex-wrap gap-3">
-						{!linkedProviderIds.has("google") && (
-							<Button
-								variant="outline"
-								type="button"
-								className="min-w-[180px]"
-								onClick={() => handleLinkSocial("google")}
-								disabled={!!linkingProvider}
-								isLoading={linkingProvider === "google"}
-							>
-								{linkingProvider === "google" ? (
-									<Loader2 className="mr-2 size-4 animate-spin" />
-								) : (
-									<svg viewBox="0 0 24 24" className="mr-2 size-4">
-										<path
-											fill="currentColor"
-											d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-										/>
-										<path
-											fill="currentColor"
-											d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-										/>
-										<path
-											fill="currentColor"
-											d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-										/>
-										<path
-											fill="currentColor"
-											d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-										/>
-									</svg>
-								)}
-								Link with Google
-							</Button>
-						)}
-						{!linkedProviderIds.has("github") && (
-							<Button
-								variant="outline"
-								type="button"
-								className="min-w-[180px]"
-								onClick={() => handleLinkSocial("github")}
-								disabled={!!linkingProvider}
-								isLoading={linkingProvider === "github"}
-							>
-								{linkingProvider === "github" ? (
-									<Loader2 className="mr-2 size-4 animate-spin" />
-								) : (
-									<svg
-										viewBox="0 0 24 24"
-										className="mr-2 size-4"
-										fill="currentColor"
-									>
-										<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
-									</svg>
-								)}
-								Link with GitHub
-							</Button>
-						)}
-					</div>
-				</CardContent>
-			</div>
-		</Card>
-	);
-}

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

@@ -16,9 +16,7 @@ import {
 	LarkIcon,
 	NtfyIcon,
 	PushoverIcon,
-	ResendIcon,
 	SlackIcon,
-	TeamsIcon,
 	TelegramIcon,
 } from "@/components/icons/notification-icons";
 import { Button } from "@/components/ui/button";
@@ -99,23 +97,6 @@ export const notificationSchema = z.discriminatedUnion("type", [
 				.min(1, { message: "At least one email is required" }),
 		})
 		.merge(notificationBaseSchema),
-	z
-		.object({
-			type: z.literal("resend"),
-			apiKey: z.string().min(1, { message: "API Key is required" }),
-			fromAddress: z
-				.string()
-				.min(1, { message: "From Address is required" })
-				.email({ message: "Email is invalid" }),
-			toAddresses: z
-				.array(
-					z.string().min(1, { message: "Email is required" }).email({
-						message: "Email is invalid",
-					}),
-				)
-				.min(1, { message: "At least one email is required" }),
-		})
-		.merge(notificationBaseSchema),
 	z
 		.object({
 			type: z.literal("gotify"),
@@ -165,12 +146,6 @@ export const notificationSchema = z.discriminatedUnion("type", [
 			webhookUrl: z.string().min(1, { message: "Webhook URL is required" }),
 		})
 		.merge(notificationBaseSchema),
-	z
-		.object({
-			type: z.literal("teams"),
-			webhookUrl: z.string().min(1, { message: "Webhook URL is required" }),
-		})
-		.merge(notificationBaseSchema),
 ]);
 
 export const notificationsMap = {
@@ -190,18 +165,10 @@ export const notificationsMap = {
 		icon: <LarkIcon className="text-muted-foreground" />,
 		label: "Lark",
 	},
-	teams: {
-		icon: <TeamsIcon className="text-muted-foreground" />,
-		label: "Microsoft Teams",
-	},
 	email: {
 		icon: <Mail size={29} className="text-muted-foreground" />,
 		label: "Email",
 	},
-	resend: {
-		icon: <ResendIcon className="text-muted-foreground" />,
-		label: "Resend",
-	},
 	gotify: {
 		icon: <GotifyIcon />,
 		label: "Gotify",
@@ -247,16 +214,12 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 		api.notification.testDiscordConnection.useMutation();
 	const { mutateAsync: testEmailConnection, isLoading: isLoadingEmail } =
 		api.notification.testEmailConnection.useMutation();
-	const { mutateAsync: testResendConnection, isLoading: isLoadingResend } =
-		api.notification.testResendConnection.useMutation();
 	const { mutateAsync: testGotifyConnection, isLoading: isLoadingGotify } =
 		api.notification.testGotifyConnection.useMutation();
 	const { mutateAsync: testNtfyConnection, isLoading: isLoadingNtfy } =
 		api.notification.testNtfyConnection.useMutation();
 	const { mutateAsync: testLarkConnection, isLoading: isLoadingLark } =
 		api.notification.testLarkConnection.useMutation();
-	const { mutateAsync: testTeamsConnection, isLoading: isLoadingTeams } =
-		api.notification.testTeamsConnection.useMutation();
 
 	const { mutateAsync: testCustomConnection, isLoading: isLoadingCustom } =
 		api.notification.testCustomConnection.useMutation();
@@ -279,9 +242,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 	const emailMutation = notificationId
 		? api.notification.updateEmail.useMutation()
 		: api.notification.createEmail.useMutation();
-	const resendMutation = notificationId
-		? api.notification.updateResend.useMutation()
-		: api.notification.createResend.useMutation();
 	const gotifyMutation = notificationId
 		? api.notification.updateGotify.useMutation()
 		: api.notification.createGotify.useMutation();
@@ -291,9 +251,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 	const larkMutation = notificationId
 		? api.notification.updateLark.useMutation()
 		: api.notification.createLark.useMutation();
-	const teamsMutation = notificationId
-		? api.notification.updateTeams.useMutation()
-		: api.notification.createTeams.useMutation();
 	const pushoverMutation = notificationId
 		? api.notification.updatePushover.useMutation()
 		: api.notification.createPushover.useMutation();
@@ -324,7 +281,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 	});
 
 	useEffect(() => {
-		if ((type === "email" || type === "resend") && fields.length === 0) {
+		if (type === "email" && fields.length === 0) {
 			append("");
 		}
 	}, [type, append, fields.length]);
@@ -369,7 +326,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					volumeBackup: notification.volumeBackup,
 					type: notification.notificationType,
 					webhookUrl: notification.discord?.webhookUrl,
-					decoration: notification.discord?.decoration ?? undefined,
+					decoration: notification.discord?.decoration || undefined,
 					name: notification.name,
 					dockerCleanup: notification.dockerCleanup,
 					serverThreshold: notification.serverThreshold,
@@ -392,21 +349,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					dockerCleanup: notification.dockerCleanup,
 					serverThreshold: notification.serverThreshold,
 				});
-			} else if (notification.notificationType === "resend") {
-				form.reset({
-					appBuildError: notification.appBuildError,
-					appDeploy: notification.appDeploy,
-					dokployRestart: notification.dokployRestart,
-					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
-					type: notification.notificationType,
-					apiKey: notification.resend?.apiKey,
-					toAddresses: notification.resend?.toAddresses,
-					fromAddress: notification.resend?.fromAddress,
-					name: notification.name,
-					dockerCleanup: notification.dockerCleanup,
-					serverThreshold: notification.serverThreshold,
-				});
 			} else if (notification.notificationType === "gotify") {
 				form.reset({
 					appBuildError: notification.appBuildError,
@@ -416,7 +358,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					volumeBackup: notification.volumeBackup,
 					type: notification.notificationType,
 					appToken: notification.gotify?.appToken,
-					decoration: notification.gotify?.decoration ?? undefined,
+					decoration: notification.gotify?.decoration || undefined,
 					priority: notification.gotify?.priority,
 					serverUrl: notification.gotify?.serverUrl,
 					name: notification.name,
@@ -451,19 +393,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					volumeBackup: notification.volumeBackup,
 					serverThreshold: notification.serverThreshold,
 				});
-			} else if (notification.notificationType === "teams") {
-				form.reset({
-					appBuildError: notification.appBuildError,
-					appDeploy: notification.appDeploy,
-					dokployRestart: notification.dokployRestart,
-					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
-					type: notification.notificationType,
-					webhookUrl: notification.teams?.webhookUrl,
-					name: notification.name,
-					dockerCleanup: notification.dockerCleanup,
-					serverThreshold: notification.serverThreshold,
-				});
 			} else if (notification.notificationType === "custom") {
 				form.reset({
 					appBuildError: notification.appBuildError,
@@ -513,11 +442,9 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 		telegram: telegramMutation,
 		discord: discordMutation,
 		email: emailMutation,
-		resend: resendMutation,
 		gotify: gotifyMutation,
 		ntfy: ntfyMutation,
 		lark: larkMutation,
-		teams: teamsMutation,
 		custom: customMutation,
 		pushover: pushoverMutation,
 	};
@@ -598,22 +525,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				emailId: notification?.emailId || "",
 				serverThreshold: serverThreshold,
 			});
-		} else if (data.type === "resend") {
-			promise = resendMutation.mutateAsync({
-				appBuildError: appBuildError,
-				appDeploy: appDeploy,
-				dokployRestart: dokployRestart,
-				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
-				apiKey: data.apiKey,
-				fromAddress: data.fromAddress,
-				toAddresses: data.toAddresses,
-				name: data.name,
-				dockerCleanup: dockerCleanup,
-				notificationId: notificationId || "",
-				resendId: notification?.resendId || "",
-				serverThreshold: serverThreshold,
-			});
 		} else if (data.type === "gotify") {
 			promise = gotifyMutation.mutateAsync({
 				appBuildError: appBuildError,
@@ -660,20 +571,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				larkId: notification?.larkId || "",
 				serverThreshold: serverThreshold,
 			});
-		} else if (data.type === "teams") {
-			promise = teamsMutation.mutateAsync({
-				appBuildError: appBuildError,
-				appDeploy: appDeploy,
-				dokployRestart: dokployRestart,
-				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
-				webhookUrl: data.webhookUrl,
-				name: data.name,
-				dockerCleanup: dockerCleanup,
-				notificationId: notificationId || "",
-				teamsId: notification?.teamsId || "",
-				serverThreshold: serverThreshold,
-			});
 		} else if (data.type === "custom") {
 			// Convert headers array to object
 			const headersRecord =
@@ -1145,96 +1042,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 									</>
 								)}
 
-								{type === "resend" && (
-									<>
-										<FormField
-											control={form.control}
-											name="apiKey"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>API Key</FormLabel>
-													<FormControl>
-														<Input
-															type="password"
-															placeholder="re_********"
-															{...field}
-														/>
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-
-										<FormField
-											control={form.control}
-											name="fromAddress"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>From Address</FormLabel>
-													<FormControl>
-														<Input placeholder="from@example.com" {...field} />
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-
-										<div className="flex flex-col gap-2 pt-2">
-											<FormLabel>To Addresses</FormLabel>
-
-											{fields.map((field, index) => (
-												<div
-													key={field.id}
-													className="flex flex-row gap-2 w-full"
-												>
-													<FormField
-														control={form.control}
-														name={`toAddresses.${index}`}
-														render={({ field }) => (
-															<FormItem className="w-full">
-																<FormControl>
-																	<Input
-																		placeholder="email@example.com"
-																		className="w-full"
-																		{...field}
-																	/>
-																</FormControl>
-
-																<FormMessage />
-															</FormItem>
-														)}
-													/>
-													<Button
-														variant="outline"
-														type="button"
-														onClick={() => {
-															remove(index);
-														}}
-													>
-														Remove
-													</Button>
-												</div>
-											))}
-											{type === "resend" &&
-												"toAddresses" in form.formState.errors && (
-													<div className="text-sm font-medium text-destructive">
-														{form.formState?.errors?.toAddresses?.root?.message}
-													</div>
-												)}
-										</div>
-
-										<Button
-											variant="outline"
-											type="button"
-											onClick={() => {
-												append("");
-											}}
-										>
-											Add
-										</Button>
-									</>
-								)}
-
 								{type === "gotify" && (
 									<>
 										<FormField
@@ -1509,32 +1316,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 										/>
 									</>
 								)}
-
-								{type === "teams" && (
-									<>
-										<FormField
-											control={form.control}
-											name="webhookUrl"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Webhook URL</FormLabel>
-													<FormControl>
-														<Input
-															placeholder="https://xxx.webhook.office.com/webhookb2/..."
-															{...field}
-														/>
-													</FormControl>
-													<FormDescription>
-														Incoming Webhook URL from a Teams channel. Add an
-														Incoming Webhook in your channel settings to get the
-														URL.
-													</FormDescription>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-									</>
-								)}
 								{type === "pushover" && (
 									<>
 										<FormField
@@ -1846,11 +1627,9 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 								isLoadingTelegram ||
 								isLoadingDiscord ||
 								isLoadingEmail ||
-								isLoadingResend ||
 								isLoadingGotify ||
 								isLoadingNtfy ||
 								isLoadingLark ||
-								isLoadingTeams ||
 								isLoadingCustom ||
 								isLoadingPushover
 							}
@@ -1888,12 +1667,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 											fromAddress: data.fromAddress,
 											toAddresses: data.toAddresses,
 										});
-									} else if (data.type === "resend") {
-										await testResendConnection({
-											apiKey: data.apiKey,
-											fromAddress: data.fromAddress,
-											toAddresses: data.toAddresses,
-										});
 									} else if (data.type === "gotify") {
 										await testGotifyConnection({
 											serverUrl: data.serverUrl,
@@ -1912,10 +1685,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 										await testLarkConnection({
 											webhookUrl: data.webhookUrl,
 										});
-									} else if (data.type === "teams") {
-										await testTeamsConnection({
-											webhookUrl: data.webhookUrl,
-										});
 									} else if (data.type === "custom") {
 										const headersRecord =
 											data.headers && data.headers.length > 0

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

@@ -5,9 +5,7 @@ import {
 	GotifyIcon,
 	LarkIcon,
 	NtfyIcon,
-	ResendIcon,
 	SlackIcon,
-	TeamsIcon,
 	TelegramIcon,
 } from "@/components/icons/notification-icons";
 import { DialogAction } from "@/components/shared/dialog-action";
@@ -38,7 +36,7 @@ export const ShowNotifications = () => {
 						</CardTitle>
 						<CardDescription>
 							Add your providers to receive notifications, like Discord, Slack,
-							Telegram, Teams, Email, Resend, Lark.
+							Telegram, Email, Lark.
 						</CardDescription>
 					</CardHeader>
 					<CardContent className="space-y-2 py-8 border-t">
@@ -88,11 +86,6 @@ export const ShowNotifications = () => {
 																	<Mail className="size-6 text-muted-foreground" />
 																</div>
 															)}
-															{notification.notificationType === "resend" && (
-																<div className="flex  items-center justify-center rounded-lg ">
-																	<ResendIcon className="size-6 text-muted-foreground" />
-																</div>
-															)}
 															{notification.notificationType === "gotify" && (
 																<div className="flex  items-center justify-center rounded-lg ">
 																	<GotifyIcon className="size-6" />
@@ -113,11 +106,6 @@ export const ShowNotifications = () => {
 																	<LarkIcon className="size-7 text-muted-foreground" />
 																</div>
 															)}
-															{notification.notificationType === "teams" && (
-																<div className="flex  items-center justify-center rounded-lg">
-																	<TeamsIcon className="size-7 text-muted-foreground" />
-																</div>
-															)}
 
 															{notification.name}
 														</span>

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

@@ -1,5 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Loader2, Palette, User } from "lucide-react";
+import { useTranslation } from "next-i18next";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -72,6 +73,7 @@ export const ProfileForm = () => {
 		isError,
 		error,
 	} = api.user.update.useMutation();
+	const { t } = useTranslation("settings");
 	const [gravatarHash, setGravatarHash] = useState<string | null>(null);
 	const colorInputRef = useRef<HTMLInputElement>(null);
 
@@ -155,10 +157,10 @@ export const ProfileForm = () => {
 						<div>
 							<CardTitle className="text-xl flex flex-row gap-2">
 								<User className="size-6 text-muted-foreground self-center" />
-								Account
+								{t("settings.profile.title")}
 							</CardTitle>
 							<CardDescription>
-								Change the details of your profile here.
+								{t("settings.profile.description")}
 							</CardDescription>
 						</div>
 
@@ -211,9 +213,12 @@ export const ProfileForm = () => {
 												name="email"
 												render={({ field }) => (
 													<FormItem>
-														<FormLabel>Email</FormLabel>
+														<FormLabel>{t("settings.profile.email")}</FormLabel>
 														<FormControl>
-															<Input placeholder="Email" {...field} />
+															<Input
+																placeholder={t("settings.profile.email")}
+																{...field}
+															/>
 														</FormControl>
 														<FormMessage />
 													</FormItem>
@@ -228,7 +233,7 @@ export const ProfileForm = () => {
 														<FormControl>
 															<Input
 																type="password"
-																placeholder="Current Password"
+																placeholder={t("settings.profile.password")}
 																{...field}
 																value={field.value || ""}
 															/>
@@ -242,11 +247,13 @@ export const ProfileForm = () => {
 												name="password"
 												render={({ field }) => (
 													<FormItem>
-														<FormLabel>Password</FormLabel>
+														<FormLabel>
+															{t("settings.profile.password")}
+														</FormLabel>
 														<FormControl>
 															<Input
 																type="password"
-																placeholder="Password"
+																placeholder={t("settings.profile.password")}
 																{...field}
 																value={field.value || ""}
 															/>
@@ -261,7 +268,9 @@ export const ProfileForm = () => {
 												name="image"
 												render={({ field }) => (
 													<FormItem>
-														<FormLabel>Avatar</FormLabel>
+														<FormLabel>
+															{t("settings.profile.avatar")}
+														</FormLabel>
 														<FormControl>
 															<RadioGroup
 																onValueChange={(e) => {
@@ -445,7 +454,7 @@ export const ProfileForm = () => {
 
 										<div className="flex items-center justify-end gap-2">
 											<Button type="submit" isLoading={isUpdating}>
-												Save
+												{t("settings.common.save")}
 											</Button>
 										</div>
 									</form>

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

@@ -1,3 +1,4 @@
+import { useTranslation } from "next-i18next";
 import { toast } from "sonner";
 import { UpdateServerIp } from "@/components/dashboard/settings/web-server/update-server-ip";
 import { Button } from "@/components/ui/button";
@@ -16,23 +17,24 @@ import { TerminalModal } from "../../web-server/terminal-modal";
 import { GPUSupportModal } from "../gpu-support-modal";
 
 export const ShowDokployActions = () => {
+	const { t } = useTranslation("settings");
 	const { mutateAsync: reloadServer, isLoading } =
 		api.settings.reloadServer.useMutation();
 
 	const { mutateAsync: cleanRedis } = api.settings.cleanRedis.useMutation();
 	const { mutateAsync: reloadRedis } = api.settings.reloadRedis.useMutation();
-	const { mutateAsync: cleanAllDeploymentQueue } =
-		api.settings.cleanAllDeploymentQueue.useMutation();
 
 	return (
 		<DropdownMenu>
 			<DropdownMenuTrigger asChild disabled={isLoading}>
 				<Button isLoading={isLoading} variant="outline">
-					Server
+					{t("settings.server.webServer.server.label")}
 				</Button>
 			</DropdownMenuTrigger>
 			<DropdownMenuContent className="w-56" align="start">
-				<DropdownMenuLabel>Actions</DropdownMenuLabel>
+				<DropdownMenuLabel>
+					{t("settings.server.webServer.actions")}
+				</DropdownMenuLabel>
 				<DropdownMenuSeparator />
 				<DropdownMenuGroup>
 					<DropdownMenuItem
@@ -47,17 +49,17 @@ export const ShowDokployActions = () => {
 						}}
 						className="cursor-pointer"
 					>
-						<span>Reload</span>
+						<span>{t("settings.server.webServer.reload")}</span>
 					</DropdownMenuItem>
 					<TerminalModal serverId="local">
-						<span>Terminal</span>
+						<span>{t("settings.common.enterTerminal")}</span>
 					</TerminalModal>
 					<ShowModalLogs appName="dokploy">
 						<DropdownMenuItem
 							className="cursor-pointer"
 							onSelect={(e) => e.preventDefault()}
 						>
-							View Logs
+							{t("settings.server.webServer.watchLogs")}
 						</DropdownMenuItem>
 					</ShowModalLogs>
 					<GPUSupportModal />
@@ -66,7 +68,7 @@ export const ShowDokployActions = () => {
 							className="cursor-pointer"
 							onSelect={(e) => e.preventDefault()}
 						>
-							Update Server IP
+							{t("settings.server.webServer.updateServerIp")}
 						</DropdownMenuItem>
 					</UpdateServerIp>
 
@@ -85,21 +87,6 @@ export const ShowDokployActions = () => {
 						Clean Redis
 					</DropdownMenuItem>
 
-					<DropdownMenuItem
-						className="cursor-pointer"
-						onClick={async () => {
-							await cleanAllDeploymentQueue()
-								.then(() => {
-									toast.success("Deployment queue cleaned");
-								})
-								.catch(() => {
-									toast.error("Error cleaning deployment queue");
-								});
-						}}
-					>
-						Clean all deployment queue
-					</DropdownMenuItem>
-
 					<DropdownMenuItem
 						className="cursor-pointer"
 						onClick={async () => {

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

@@ -1,3 +1,4 @@
+import { useTranslation } from "next-i18next";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
 import {
@@ -15,6 +16,7 @@ interface Props {
 	serverId?: string;
 }
 export const ShowStorageActions = ({ serverId }: Props) => {
+	const { t } = useTranslation("settings");
 	const { mutateAsync: cleanAll, isLoading: cleanAllIsLoading } =
 		api.settings.cleanAll.useMutation();
 
@@ -62,11 +64,13 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 					}
 					variant="outline"
 				>
-					Space
+					{t("settings.server.webServer.storage.label")}
 				</Button>
 			</DropdownMenuTrigger>
 			<DropdownMenuContent className="w-64" align="start">
-				<DropdownMenuLabel>Actions</DropdownMenuLabel>
+				<DropdownMenuLabel>
+					{t("settings.server.webServer.actions")}
+				</DropdownMenuLabel>
 				<DropdownMenuSeparator />
 				<DropdownMenuGroup>
 					<DropdownMenuItem
@@ -83,7 +87,9 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 								});
 						}}
 					>
-						<span>Clean unused images</span>
+						<span>
+							{t("settings.server.webServer.storage.cleanUnusedImages")}
+						</span>
 					</DropdownMenuItem>
 					<DropdownMenuItem
 						className="w-full cursor-pointer"
@@ -99,7 +105,9 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 								});
 						}}
 					>
-						<span>Clean unused volumes</span>
+						<span>
+							{t("settings.server.webServer.storage.cleanUnusedVolumes")}
+						</span>
 					</DropdownMenuItem>
 
 					<DropdownMenuItem
@@ -116,7 +124,9 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 								});
 						}}
 					>
-						<span>Clean stopped containers</span>
+						<span>
+							{t("settings.server.webServer.storage.cleanStoppedContainers")}
+						</span>
 					</DropdownMenuItem>
 
 					<DropdownMenuItem
@@ -133,7 +143,9 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 								});
 						}}
 					>
-						<span>Clean Docker Builder & System</span>
+						<span>
+							{t("settings.server.webServer.storage.cleanDockerBuilder")}
+						</span>
 					</DropdownMenuItem>
 					{!serverId && (
 						<DropdownMenuItem
@@ -148,7 +160,9 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 									});
 							}}
 						>
-							<span>Clean Monitoring</span>
+							<span>
+								{t("settings.server.webServer.storage.cleanMonitoring")}
+							</span>
 						</DropdownMenuItem>
 					)}
 
@@ -166,7 +180,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 								});
 						}}
 					>
-						<span>Clean all</span>
+						<span>{t("settings.server.webServer.storage.cleanAll")}</span>
 					</DropdownMenuItem>
 				</DropdownMenuGroup>
 			</DropdownMenuContent>

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

@@ -1,3 +1,4 @@
+import { useTranslation } from "next-i18next";
 import { toast } from "sonner";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { DialogAction } from "@/components/shared/dialog-action";
@@ -11,7 +12,6 @@ import {
 	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
 import { api } from "@/utils/api";
 import { EditTraefikEnv } from "../../web-server/edit-traefik-env";
 import { ManageTraefikPorts } from "../../web-server/manage-traefik-ports";
@@ -21,6 +21,7 @@ interface Props {
 	serverId?: string;
 }
 export const ShowTraefikActions = ({ serverId }: Props) => {
+	const { t } = useTranslation("settings");
 	const { mutateAsync: reloadTraefik, isLoading: reloadTraefikIsLoading } =
 		api.settings.reloadTraefik.useMutation();
 
@@ -32,71 +33,38 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 			serverId,
 		});
 
-	const {
-		execute: executeWithHealthCheck,
-		isExecuting: isHealthCheckExecuting,
-	} = useHealthCheckAfterMutation({
-		initialDelay: 5000,
-		pollInterval: 4000,
-		successMessage: "Traefik dashboard updated successfully",
-		onSuccess: () => {
-			refetchDashboard();
-		},
-	});
-
-	const {
-		execute: executeReloadWithHealthCheck,
-		isExecuting: isReloadHealthCheckExecuting,
-	} = useHealthCheckAfterMutation({
-		initialDelay: 5000,
-		pollInterval: 4000,
-		successMessage: "Traefik Reloaded",
-	});
-
 	return (
 		<DropdownMenu>
 			<DropdownMenuTrigger
 				asChild
-				disabled={
-					reloadTraefikIsLoading ||
-					toggleDashboardIsLoading ||
-					isHealthCheckExecuting ||
-					isReloadHealthCheckExecuting
-				}
+				disabled={reloadTraefikIsLoading || toggleDashboardIsLoading}
 			>
 				<Button
-					isLoading={
-						reloadTraefikIsLoading ||
-						toggleDashboardIsLoading ||
-						isHealthCheckExecuting ||
-						isReloadHealthCheckExecuting
-					}
+					isLoading={reloadTraefikIsLoading || toggleDashboardIsLoading}
 					variant="outline"
 				>
-					Traefik
+					{t("settings.server.webServer.traefik.label")}
 				</Button>
 			</DropdownMenuTrigger>
 			<DropdownMenuContent className="w-56" align="start">
-				<DropdownMenuLabel>Actions</DropdownMenuLabel>
+				<DropdownMenuLabel>
+					{t("settings.server.webServer.actions")}
+				</DropdownMenuLabel>
 				<DropdownMenuSeparator />
 				<DropdownMenuGroup>
 					<DropdownMenuItem
 						onClick={async () => {
-							try {
-								await executeReloadWithHealthCheck(() =>
-									reloadTraefik({ serverId }),
-								);
-							} catch (error) {
-								const errorMessage =
-									(error as Error)?.message ||
-									"Failed to reload Traefik. Please try again.";
-								toast.error(errorMessage);
-							}
+							await reloadTraefik({
+								serverId: serverId,
+							})
+								.then(async () => {
+									toast.success("Traefik Reloaded");
+								})
+								.catch(() => {});
 						}}
 						className="cursor-pointer"
-						disabled={isReloadHealthCheckExecuting}
 					>
-						<span>Reload</span>
+						<span>{t("settings.server.webServer.reload")}</span>
 					</DropdownMenuItem>
 					<ShowModalLogs
 						appName="dokploy-traefik"
@@ -107,7 +75,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 							onSelect={(e) => e.preventDefault()}
 							className="cursor-pointer"
 						>
-							View Logs
+							{t("settings.server.webServer.watchLogs")}
 						</DropdownMenuItem>
 					</ShowModalLogs>
 					<EditTraefikEnv serverId={serverId}>
@@ -115,7 +83,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 							onSelect={(e) => e.preventDefault()}
 							className="cursor-pointer"
 						>
-							<span>Modify Environment</span>
+							<span>{t("settings.server.webServer.traefik.modifyEnv")}</span>
 						</DropdownMenuItem>
 					</EditTraefikEnv>
 
@@ -140,21 +108,24 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 							</div>
 						}
 						onClick={async () => {
-							try {
-								await executeWithHealthCheck(() =>
-									toggleDashboard({
-										enableDashboard: !haveTraefikDashboardPortEnabled,
-										serverId: serverId,
-									}),
-								);
-							} catch (error) {
-								const errorMessage =
-									(error as Error)?.message ||
-									"Failed to toggle dashboard. Please check if port 8080 is available.";
-								toast.error(errorMessage);
-							}
+							await toggleDashboard({
+								enableDashboard: !haveTraefikDashboardPortEnabled,
+								serverId: serverId,
+							})
+								.then(async () => {
+									toast.success(
+										`${haveTraefikDashboardPortEnabled ? "Disabled" : "Enabled"} Dashboard`,
+									);
+									refetchDashboard();
+								})
+								.catch((error) => {
+									const errorMessage =
+										error?.message ||
+										"Failed to toggle dashboard. Please check if port 8080 is available.";
+									toast.error(errorMessage);
+								});
 						}}
-						disabled={toggleDashboardIsLoading || isHealthCheckExecuting}
+						disabled={toggleDashboardIsLoading}
 						type="default"
 					>
 						<DropdownMenuItem
@@ -172,7 +143,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 							onSelect={(e) => e.preventDefault()}
 							className="cursor-pointer"
 						>
-							<span>Additional Port Mappings</span>
+							<span>{t("settings.server.webServer.traefik.managePorts")}</span>
 						</DropdownMenuItem>
 					</ManageTraefikPorts>
 				</DropdownMenuGroup>

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

@@ -1,6 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Pencil, PlusIcon } from "lucide-react";
 import Link from "next/link";
+import { useTranslation } from "next-i18next";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -62,6 +63,8 @@ interface Props {
 }
 
 export const HandleServers = ({ serverId, asButton = false }: Props) => {
+	const { t } = useTranslation("settings");
+
 	const utils = api.useUtils();
 	const [isOpen, setIsOpen] = useState(false);
 	const { data: canCreateMoreServers, refetch } =
@@ -362,7 +365,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 								name="ipAddress"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>IP Address</FormLabel>
+										<FormLabel>{t("settings.terminal.ipAddress")}</FormLabel>
 										<FormControl>
 											<Input placeholder="192.168.1.100" {...field} />
 										</FormControl>
@@ -376,7 +379,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 								name="port"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Port</FormLabel>
+										<FormLabel>{t("settings.terminal.port")}</FormLabel>
 										<FormControl>
 											<Input
 												placeholder="22"
@@ -406,7 +409,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 							name="username"
 							render={({ field }) => (
 								<FormItem>
-									<FormLabel>Username</FormLabel>
+									<FormLabel>{t("settings.terminal.username")}</FormLabel>
 									<FormControl>
 										<Input placeholder="root" {...field} />
 									</FormControl>

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

@@ -13,6 +13,7 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 import { useRouter } from "next/router";
+import { useTranslation } from "next-i18next";
 import { toast } from "sonner";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { DialogAction } from "@/components/shared/dialog-action";
@@ -51,6 +52,7 @@ import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal";
 import { WelcomeSuscription } from "./welcome-stripe/welcome-suscription";
 
 export const ShowServers = () => {
+	const { t } = useTranslation("settings");
 	const router = useRouter();
 	const query = router.query;
 	const { data, refetch, isLoading } = api.server.all.useQuery();

apps/dokploy/components/dashboard/settings/web-domain.tsx

@@ -1,5 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { GlobeIcon } from "lucide-react";
+import { useTranslation } from "next-i18next";
 import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -65,6 +66,7 @@ const addServerDomain = z
 type AddServerDomain = z.infer<typeof addServerDomain>;
 
 export const WebDomain = () => {
+	const { t } = useTranslation("settings");
 	const { data, refetch } = api.settings.getWebServerSettings.useQuery();
 	const { mutateAsync, isLoading } =
 		api.settings.assignDomainServer.useMutation();
@@ -117,10 +119,10 @@ export const WebDomain = () => {
 						<div className="flex flex-col gap-1">
 							<CardTitle className="text-xl flex flex-row gap-2">
 								<GlobeIcon className="size-6 text-muted-foreground self-center" />
-								Server Domain
+								{t("settings.server.domain.title")}
 							</CardTitle>
 							<CardDescription>
-								Add a domain to your server application.
+								{t("settings.server.domain.description")}
 							</CardDescription>
 						</div>
 					</CardHeader>
@@ -149,7 +151,9 @@ export const WebDomain = () => {
 									render={({ field }) => {
 										return (
 											<FormItem>
-												<FormLabel>Domain</FormLabel>
+												<FormLabel>
+													{t("settings.server.domain.form.domain")}
+												</FormLabel>
 												<FormControl>
 													<Input
 														className="w-full"
@@ -169,7 +173,9 @@ export const WebDomain = () => {
 									render={({ field }) => {
 										return (
 											<FormItem>
-												<FormLabel>Let's Encrypt Email</FormLabel>
+												<FormLabel>
+													{t("settings.server.domain.form.letsEncryptEmail")}
+												</FormLabel>
 												<FormControl>
 													<Input
 														className="w-full"
@@ -210,20 +216,32 @@ export const WebDomain = () => {
 										render={({ field }) => {
 											return (
 												<FormItem className="md:col-span-2">
-													<FormLabel>Certificate Provider</FormLabel>
+													<FormLabel>
+														{t("settings.server.domain.form.certificate.label")}
+													</FormLabel>
 													<Select
 														onValueChange={field.onChange}
 														value={field.value}
 													>
 														<FormControl>
 															<SelectTrigger>
-																<SelectValue placeholder="Select a certificate" />
+																<SelectValue
+																	placeholder={t(
+																		"settings.server.domain.form.certificate.placeholder",
+																	)}
+																/>
 															</SelectTrigger>
 														</FormControl>
 														<SelectContent>
-															<SelectItem value={"none"}>None</SelectItem>
+															<SelectItem value={"none"}>
+																{t(
+																	"settings.server.domain.form.certificateOptions.none",
+																)}
+															</SelectItem>
 															<SelectItem value={"letsencrypt"}>
-																Let's Encrypt
+																{t(
+																	"settings.server.domain.form.certificateOptions.letsencrypt",
+																)}
 															</SelectItem>
 														</SelectContent>
 													</Select>
@@ -236,7 +254,7 @@ export const WebDomain = () => {
 
 								<div className="flex w-full justify-end col-span-2">
 									<Button isLoading={isLoading} type="submit">
-										Save
+										{t("settings.common.save")}
 									</Button>
 								</div>
 							</form>

apps/dokploy/components/dashboard/settings/web-server.tsx

@@ -1,4 +1,5 @@
 import { ServerIcon } from "lucide-react";
+import { useTranslation } from "next-i18next";
 import {
 	Card,
 	CardContent,
@@ -14,6 +15,7 @@ import { ToggleDockerCleanup } from "./servers/actions/toggle-docker-cleanup";
 import { UpdateServer } from "./web-server/update-server";
 
 export const WebServer = () => {
+	const { t } = useTranslation("settings");
 	const { data: webServerSettings } =
 		api.settings.getWebServerSettings.useQuery();
 
@@ -27,16 +29,18 @@ export const WebServer = () => {
 					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
 							<ServerIcon className="size-6 text-muted-foreground self-center" />
-							Web Server
+							{t("settings.server.webServer.title")}
 						</CardTitle>
-						<CardDescription>Reload or clean the web server.</CardDescription>
+						<CardDescription>
+							{t("settings.server.webServer.description")}
+						</CardDescription>
 					</CardHeader>
 					{/* <CardHeader>
 						<CardTitle className="text-xl">
-							Web Server
+							{t("settings.server.webServer.title")}
 						</CardTitle>
 						<CardDescription>
-							Reload or clean the web server.
+							{t("settings.server.webServer.description")}
 						</CardDescription>
 					</CardHeader> */}
 					<CardContent className="space-y-6 py-6 border-t">

apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx

@@ -1,7 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
-import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
 import { toast } from "sonner";
 import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
@@ -47,14 +46,6 @@ export const EditTraefikEnv = ({ children, serverId }: Props) => {
 	const { mutateAsync, isLoading, error, isError } =
 		api.settings.writeTraefikEnv.useMutation();
 
-	const {
-		execute: executeWithHealthCheck,
-		isExecuting: isHealthCheckExecuting,
-	} = useHealthCheckAfterMutation({
-		initialDelay: 5000,
-		successMessage: "Traefik Env Updated",
-	});
-
 	const form = useForm<Schema>({
 		defaultValues: {
 			env: data || "",
@@ -72,16 +63,16 @@ export const EditTraefikEnv = ({ children, serverId }: Props) => {
 	}, [form, form.reset, data]);
 
 	const onSubmit = async (data: Schema) => {
-		try {
-			await executeWithHealthCheck(() =>
-				mutateAsync({
-					env: data.env,
-					serverId,
-				}),
-			);
-		} catch {
-			toast.error("Error updating the Traefik env");
-		}
+		await mutateAsync({
+			env: data.env,
+			serverId,
+		})
+			.then(async () => {
+				toast.success("Traefik Env Updated");
+			})
+			.catch(() => {
+				toast.error("Error updating the Traefik env");
+			});
 	};
 
 	// Add keyboard shortcut for Ctrl+S/Cmd+S
@@ -163,8 +154,8 @@ TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_HTTP_CHALLENGE_DNS_PROVIDER=cloudflare
 
 					<DialogFooter>
 						<Button
-							isLoading={isLoading || isHealthCheckExecuting}
-							disabled={canEdit || isLoading || isHealthCheckExecuting}
+							isLoading={isLoading}
+							disabled={canEdit || isLoading}
 							form="hook-form-update-server-traefik-config"
 							type="submit"
 						>

apps/dokploy/components/dashboard/settings/web-server/local-server-config.tsx

@@ -1,5 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Settings } from "lucide-react";
+import { useTranslation } from "next-i18next";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import {
@@ -51,6 +52,8 @@ interface Props {
 }
 
 const LocalServerConfig = ({ onSave }: Props) => {
+	const { t } = useTranslation("settings");
+
 	const form = useForm<Schema>({
 		defaultValues: getLocalServerData(),
 		resolver: zodResolver(Schema),
@@ -74,7 +77,9 @@ const LocalServerConfig = ({ onSave }: Props) => {
 					<div className="flex flex-row items-center gap-2 justify-between w-full">
 						<div className="flex flex-row gap-2 items-center">
 							<Settings className="h-4 w-4" />
-							<span className="dark:hover:text-white">Connection settings</span>
+							<span className="dark:hover:text-white">
+								{t("settings.terminal.connectionSettings")}
+							</span>
 						</div>
 					</div>
 				</AccordionTrigger>
@@ -91,7 +96,7 @@ const LocalServerConfig = ({ onSave }: Props) => {
 								name="port"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Port</FormLabel>
+										<FormLabel>{t("settings.terminal.port")}</FormLabel>
 										<FormControl>
 											<Input
 												{...field}
@@ -119,7 +124,7 @@ const LocalServerConfig = ({ onSave }: Props) => {
 								name="username"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Username</FormLabel>
+										<FormLabel>{t("settings.terminal.username")}</FormLabel>
 										<FormControl>
 											<Input placeholder="root" {...field} />
 										</FormControl>
@@ -137,7 +142,7 @@ const LocalServerConfig = ({ onSave }: Props) => {
 						className="ml-auto"
 						disabled={!form.formState.isDirty}
 					>
-						Save
+						{t("settings.common.save")}
 					</Button>
 				</AccordionContent>
 			</AccordionItem>

apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx

@@ -1,6 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ArrowRightLeft, Plus, Trash2 } from "lucide-react";
-import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
+import { useTranslation } from "next-i18next";
 import type React from "react";
 import { useEffect, useState } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
@@ -55,6 +55,7 @@ const TraefikPortsSchema = z.object({
 type TraefikPortsForm = z.infer<typeof TraefikPortsSchema>;
 
 export const ManageTraefikPorts = ({ children, serverId }: Props) => {
+	const { t } = useTranslation("settings");
 	const [open, setOpen] = useState(false);
 
 	const form = useForm<TraefikPortsForm>({
@@ -75,19 +76,11 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 		});
 
 	const { mutateAsync: updatePorts, isLoading } =
-		api.settings.updateTraefikPorts.useMutation();
-
-	const {
-		execute: executeWithHealthCheck,
-		isExecuting: isHealthCheckExecuting,
-	} = useHealthCheckAfterMutation({
-		initialDelay: 5000,
-		successMessage: "Ports updated successfully",
-		onSuccess: () => {
-			refetchPorts();
-			setOpen(false);
-		},
-	});
+		api.settings.updateTraefikPorts.useMutation({
+			onSuccess: () => {
+				refetchPorts();
+			},
+		});
 
 	useEffect(() => {
 		if (currentPorts) {
@@ -106,12 +99,11 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 
 	const onSubmit = async (data: TraefikPortsForm) => {
 		try {
-			await executeWithHealthCheck(() =>
-				updatePorts({
-					serverId,
-					additionalPorts: data.ports,
-				}),
-			);
+			await updatePorts({
+				serverId,
+				additionalPorts: data.ports,
+			});
+			toast.success(t("settings.server.webServer.traefik.portsUpdated"));
 			setOpen(false);
 		} catch (error) {
 			toast.error((error as Error).message || "Error updating Traefik ports");
@@ -127,12 +119,14 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 				<DialogContent className="sm:max-w-3xl">
 					<DialogHeader>
 						<DialogTitle className="flex items-center gap-2 text-xl">
-							Additional Port Mappings
+							{t("settings.server.webServer.traefik.managePorts")}
 						</DialogTitle>
 						<DialogDescription className="text-base w-full">
 							<div className="flex items-center justify-between">
 								<div className="flex flex-col gap-1">
-									Add or remove additional ports for Traefik
+									{t(
+										"settings.server.webServer.traefik.managePortsDescription",
+									)}
 									<span className="text-sm text-muted-foreground">
 										{fields.length} port mapping{fields.length !== 1 ? "s" : ""}{" "}
 										configured
@@ -175,7 +169,9 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 															render={({ field }) => (
 																<FormItem>
 																	<FormLabel className="text-sm font-medium text-muted-foreground">
-																		Target Port
+																		{t(
+																			"settings.server.webServer.traefik.targetPort",
+																		)}
 																	</FormLabel>
 																	<FormControl>
 																		<Input
@@ -204,7 +200,9 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 															render={({ field }) => (
 																<FormItem>
 																	<FormLabel className="text-sm font-medium text-muted-foreground">
-																		Published Port
+																		{t(
+																			"settings.server.webServer.traefik.publishedPort",
+																		)}
 																	</FormLabel>
 																	<FormControl>
 																		<Input
@@ -319,7 +317,7 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 									type="submit"
 									variant="default"
 									className="text-sm"
-									isLoading={isLoading || isHealthCheckExecuting}
+									isLoading={isLoading}
 								>
 									Save
 								</Button>

apps/dokploy/components/dashboard/settings/web-server/update-server.tsx

@@ -135,9 +135,7 @@ export const UpdateServer = ({
 						<div className="flex items-center gap-1.5 rounded-full px-3 py-1 mr-2 bg-muted">
 							<Server className="h-4 w-4 text-muted-foreground" />
 							<span className="text-sm text-muted-foreground">
-								{dokployVersion}{" "}
-								{(releaseTag === "canary" || releaseTag === "feature") &&
-									`(${releaseTag})`}
+								{dokployVersion} | {releaseTag}
 							</span>
 						</div>
 					)}

apps/dokploy/components/icons/notification-icons.tsx

@@ -88,35 +88,6 @@ export const DiscordIcon = ({ className }: Props) => {
 		</svg>
 	);
 };
-export const TeamsIcon = ({ className }: Props) => {
-	return (
-		<svg
-			xmlns="http://www.w3.org/2000/svg"
-			width="26"
-			height="36"
-			viewBox="0 0 512 476"
-			className={cn("size-9", className)}
-		>
-			<g>
-				<rect x="116" y="50" width="280" height="276" rx="64" fill="#6264A7" />
-				<rect x="236" y="138" width="180" height="224" rx="60" fill="#5059C9" />
-				<circle cx="122" cy="332" r="80" fill="#B2B4D3" />
-				<circle cx="370" cy="364" r="64" fill="#A6A7DC" />
-				<text
-					x="180"
-					y="270"
-					fill="#fff"
-					font-family="Segoe UI, Arial, sans-serif"
-					font-size="110"
-					font-weight="bold"
-				>
-					T
-				</text>
-			</g>
-		</svg>
-	);
-};
-
 export const LarkIcon = ({ className }: Props) => {
 	return (
 		<svg
@@ -286,23 +257,3 @@ export const PushoverIcon = ({ className }: Props) => {
 		</svg>
 	);
 };
-
-export const ResendIcon = ({ className }: Props) => {
-	return (
-		<svg
-			viewBox="0 0 24 24"
-			className={cn("size-8", className)}
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<circle cx="12" cy="12" r="10" fill="currentColor" opacity="0.12" />
-			<path
-				d="M8 17V7h6a3 3 0 0 1 0 6H8m6 0 2 4"
-				stroke="currentColor"
-				strokeWidth="1.6"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-				fill="none"
-			/>
-		</svg>
-	);
-};

apps/dokploy/components/layouts/onboarding-layout.tsx

@@ -4,21 +4,35 @@ import { cn } from "@/lib/utils";
 import { GithubIcon } from "../icons/data-tools-icons";
 import { Logo } from "../shared/logo";
 import { Button } from "../ui/button";
+import { api } from "@/utils/api";
 
 interface Props {
 	children: React.ReactNode;
 }
 export const OnboardingLayout = ({ children }: Props) => {
+	const { data: whitelabel } = api.settings.getWhitelabelSettings.useQuery();
+	const appName = whitelabel?.whitelabelAppName ?? "Dokploy";
+	const logoUrl =
+		whitelabel?.whitelabelLogoUrl ?? whitelabel?.whitelabelLoginLogoUrl;
+
 	return (
 		<div className="container relative min-h-svh flex-col items-center justify-center flex lg:max-w-none lg:grid lg:grid-cols-2 lg:px-0 w-full">
 			<div className="relative hidden h-full flex-col  p-10 text-primary dark:border-r lg:flex">
 				<div className="absolute inset-0 bg-muted" />
+				{whitelabel?.whitelabelLoginBackgroundImageUrl && (
+					<div
+						className="absolute inset-0 bg-cover bg-center bg-no-repeat opacity-30"
+						style={{
+							backgroundImage: `url(${whitelabel.whitelabelLoginBackgroundImageUrl})`,
+						}}
+					/>
+				)}
 				<Link
 					href="https://dokploy.com"
 					className="relative z-20 flex items-center text-lg font-medium gap-4  text-primary"
 				>
-					<Logo className="size-10" />
-					Dokploy
+					<Logo className="size-10" logoUrl={logoUrl ?? undefined} />
+					{appName}
 				</Link>
 				<div className="relative z-20 mt-auto">
 					<blockquote className="space-y-2">

apps/dokploy/components/layouts/side.tsx

@@ -24,6 +24,7 @@ import {
 	LogIn,
 	type LucideIcon,
 	Package,
+	Palette,
 	PieChart,
 	Server,
 	ShieldCheck,
@@ -404,7 +405,8 @@ const MENU: Menu = {
 			url: "/dashboard/settings/license",
 			icon: Key,
 			// Only enabled for admins in non-cloud environments
-			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
+			isEnabled: ({ auth, isCloud }) =>
+				!!((auth?.role === "owner" || auth?.role === "admin") && !isCloud),
 		},
 		{
 			isSingle: true,
@@ -415,6 +417,15 @@ const MENU: Menu = {
 			isEnabled: ({ auth }) =>
 				!!(auth?.role === "owner" || auth?.role === "admin"),
 		},
+		{
+			isSingle: true,
+			title: "Whitelabeling",
+			url: "/dashboard/settings/whitelabelling",
+			icon: Palette,
+			// Enterprise only – page shows gate if no license
+			isEnabled: ({ auth }) =>
+				!!(auth?.role === "owner" || auth?.role === "admin"),
+		},
 	],
 
 	help: [
@@ -545,6 +556,7 @@ function SidebarLogo() {
 		refetch,
 		isLoading,
 	} = api.organization.all.useQuery();
+	const { data: whitelabel } = api.settings.getWhitelabelSettings.useQuery();
 	const { mutateAsync: deleteOrganization, isLoading: isRemoving } =
 		api.organization.delete.useMutation();
 	const { mutateAsync: setDefaultOrganization, isLoading: isSettingDefault } =
@@ -610,7 +622,11 @@ function SidebarLogo() {
 													"transition-all",
 													state === "collapsed" ? "size-4" : "size-5",
 												)}
-												logoUrl={activeOrganization?.logo || undefined}
+												logoUrl={
+													activeOrganization?.logo ||
+													whitelabel?.whitelabelLogoUrl ||
+													undefined
+												}
 											/>
 										</div>
 										<div
@@ -620,7 +636,9 @@ function SidebarLogo() {
 											)}
 										>
 											<p className="text-sm font-medium leading-none">
-												{activeOrganization?.name ?? "Select Organization"}
+												{activeOrganization?.name ??
+													whitelabel?.whitelabelAppName ??
+													"Select Organization"}
 											</p>
 										</div>
 									</div>
@@ -630,137 +648,135 @@ function SidebarLogo() {
 								</SidebarMenuButton>
 							</DropdownMenuTrigger>
 							<DropdownMenuContent
-								className="rounded-lg max-h-[min(70vh,28rem)] flex flex-col"
+								className="rounded-lg"
 								align="start"
 								side={isMobile ? "bottom" : "right"}
 								sideOffset={4}
 							>
-								<DropdownMenuLabel className="text-xs text-muted-foreground shrink-0">
+								<DropdownMenuLabel className="text-xs text-muted-foreground">
 									Organizations
 								</DropdownMenuLabel>
-								<div className="overflow-y-auto overflow-x-hidden min-h-0 -mx-1 px-1">
-									{organizations?.map((org) => {
-										const isDefault = org.members?.[0]?.isDefault ?? false;
-										return (
-											<div
-												className="flex flex-row justify-between"
-												key={org.name}
+								{organizations?.map((org) => {
+									const isDefault = org.members?.[0]?.isDefault ?? false;
+									return (
+										<div
+											className="flex flex-row justify-between"
+											key={org.name}
+										>
+											<DropdownMenuItem
+												onClick={async () => {
+													await authClient.organization.setActive({
+														organizationId: org.id,
+													});
+													window.location.reload();
+												}}
+												className="w-full gap-2 p-2"
 											>
-												<DropdownMenuItem
-													onClick={async () => {
-														await authClient.organization.setActive({
-															organizationId: org.id,
-														});
-														window.location.reload();
-													}}
-													className="w-full gap-2 p-2"
-												>
-													<div className="flex flex-col gap-1">
-														<div className="flex items-center gap-2">
-															{org.name}
-														</div>
+												<div className="flex flex-col gap-1">
+													<div className="flex items-center gap-2">
+														{org.name}
 													</div>
-													<div className="flex size-6 items-center justify-center rounded-sm border">
-														<Logo
-															className={cn(
-																"transition-all",
-																state === "collapsed" ? "size-6" : "size-10",
-															)}
-															logoUrl={org.logo ?? undefined}
-														/>
-													</div>
-												</DropdownMenuItem>
-
-												<div className="flex items-center gap-2">
-													<Button
-														variant="ghost"
-														size="icon"
-														className={cn(
-															"group",
-															isDefault
-																? "hover:bg-yellow-500/10"
-																: "hover:bg-blue-500/10",
-														)}
-														isLoading={isSettingDefault && !isDefault}
-														disabled={isDefault}
-														onClick={async (e) => {
-															if (isDefault) return;
-															e.stopPropagation();
-															await setDefaultOrganization({
-																organizationId: org.id,
-															})
-																.then(() => {
-																	refetch();
-																	toast.success("Default organization updated");
-																})
-																.catch((error) => {
-																	toast.error(
-																		error?.message ||
-																			"Error setting default organization",
-																	);
-																});
-														}}
-														title={
-															isDefault
-																? "Default organization"
-																: "Set as default"
-														}
-													>
-														{isDefault ? (
-															<Star
-																fill="#eab308"
-																stroke="#eab308"
-																className="size-4 text-yellow-500"
-															/>
-														) : (
-															<Star
-																fill="none"
-																stroke="currentColor"
-																className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors"
-															/>
-														)}
-													</Button>
-													{org.ownerId === session?.user?.id && (
-														<>
-															<AddOrganization organizationId={org.id} />
-															<DialogAction
-																title="Delete Organization"
-																description="Are you sure you want to delete this organization?"
-																type="destructive"
-																onClick={async () => {
-																	await deleteOrganization({
-																		organizationId: org.id,
-																	})
-																		.then(() => {
-																			refetch();
-																			toast.success(
-																				"Organization deleted successfully",
-																			);
-																		})
-																		.catch((error) => {
-																			toast.error(
-																				error?.message ||
-																					"Error deleting organization",
-																			);
-																		});
-																}}
-															>
-																<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 className="flex size-6 items-center justify-center rounded-sm border">
+													<Logo
+														className={cn(
+															"transition-all",
+															state === "collapsed" ? "size-6" : "size-10",
+														)}
+														logoUrl={org.logo ?? undefined}
+													/>
+												</div>
+											</DropdownMenuItem>
+
+											<div className="flex items-center gap-2">
+												<Button
+													variant="ghost"
+													size="icon"
+													className={cn(
+														"group",
+														isDefault
+															? "hover:bg-yellow-500/10"
+															: "hover:bg-blue-500/10",
+													)}
+													isLoading={isSettingDefault && !isDefault}
+													disabled={isDefault}
+													onClick={async (e) => {
+														if (isDefault) return;
+														e.stopPropagation();
+														await setDefaultOrganization({
+															organizationId: org.id,
+														})
+															.then(() => {
+																refetch();
+																toast.success("Default organization updated");
+															})
+															.catch((error) => {
+																toast.error(
+																	error?.message ||
+																		"Error setting default organization",
+																);
+															});
+													}}
+													title={
+														isDefault
+															? "Default organization"
+															: "Set as default"
+													}
+												>
+													{isDefault ? (
+														<Star
+															fill="#eab308"
+															stroke="#eab308"
+															className="size-4 text-yellow-500"
+														/>
+													) : (
+														<Star
+															fill="none"
+															stroke="currentColor"
+															className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors"
+														/>
+													)}
+												</Button>
+												{org.ownerId === session?.user?.id && (
+													<>
+														<AddOrganization organizationId={org.id} />
+														<DialogAction
+															title="Delete Organization"
+															description="Are you sure you want to delete this organization?"
+															type="destructive"
+															onClick={async () => {
+																await deleteOrganization({
+																	organizationId: org.id,
+																})
+																	.then(() => {
+																		refetch();
+																		toast.success(
+																			"Organization deleted successfully",
+																		);
+																	})
+																	.catch((error) => {
+																		toast.error(
+																			error?.message ||
+																				"Error deleting organization",
+																		);
+																	});
+															}}
+														>
+															<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>
+									);
+								})}
 								{(user?.role === "owner" ||
 									user?.role === "admin" ||
 									isCloud) && (

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

@@ -10,9 +10,18 @@ import {
 	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
 import { authClient } from "@/lib/auth-client";
+import { Languages } from "@/lib/languages";
 import { getFallbackAvatarInitials } from "@/lib/utils";
 import { api } from "@/utils/api";
+import useLocale from "@/utils/hooks/use-locale";
 import { ModeToggle } from "../ui/modeToggle";
 import { SidebarMenuButton } from "../ui/sidebar";
 
@@ -23,6 +32,7 @@ export const UserNav = () => {
 	const { data } = api.user.get.useQuery();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
+	const { locale, setLocale } = useLocale();
 	// const { mutateAsync } = api.auth.logout.useMutation();
 
 	return (
@@ -145,19 +155,39 @@ export const UserNav = () => {
 					</DropdownMenuItem>
 				)}
 				<DropdownMenuSeparator />
-				<DropdownMenuItem
-					className="cursor-pointer"
-					onClick={async () => {
-						await authClient.signOut().then(() => {
-							router.push("/");
-						});
-						// await mutateAsync().then(() => {
-						// 	router.push("/");
-						// });
-					}}
-				>
-					Log out
-				</DropdownMenuItem>
+				<div className="flex items-center justify-between px-2 py-1.5">
+					<DropdownMenuItem
+						className="cursor-pointer"
+						onClick={async () => {
+							await authClient.signOut().then(() => {
+								router.push("/");
+							});
+							// await mutateAsync().then(() => {
+							// 	router.push("/");
+							// });
+						}}
+					>
+						Log out
+					</DropdownMenuItem>
+					<div className="w-32">
+						<Select
+							onValueChange={setLocale}
+							defaultValue={locale}
+							value={locale}
+						>
+							<SelectTrigger>
+								<SelectValue placeholder="Select Language" />
+							</SelectTrigger>
+							<SelectContent>
+								{Object.values(Languages).map((language) => (
+									<SelectItem key={language.code} value={language.code}>
+										{language.name}
+									</SelectItem>
+								))}
+							</SelectContent>
+						</Select>
+					</div>
+				</div>
 			</DropdownMenuContent>
 		</DropdownMenu>
 	);

apps/dokploy/components/proprietary/license-keys/license-key.tsx

@@ -166,12 +166,7 @@ export function LicenseKeySettings() {
 									{!haveValidLicenseKey && (
 										<Button
 											variant="secondary"
-											disabled={
-												isSaving ||
-												isValidating ||
-												isDeactivating ||
-												!licenseKey.trim()
-											}
+											disabled={isSaving || isValidating || isDeactivating}
 											isLoading={isActivating}
 											onClick={async () => {
 												try {

apps/dokploy/components/proprietary/sso/register-oidc-dialog.tsx

@@ -2,9 +2,9 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Plus, Trash2 } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import type { FieldArrayPath } from "react-hook-form";
-import { useFieldArray, useForm, useWatch } from "react-hook-form";
+import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
@@ -28,7 +28,6 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
-import { useUrl } from "@/utils/hooks/use-url";
 
 const DEFAULT_SCOPES = ["openid", "email", "profile"];
 
@@ -59,7 +58,6 @@ const oidcProviderSchema = z.object({
 type OidcProviderForm = z.infer<typeof oidcProviderSchema>;
 
 interface RegisterOidcDialogProps {
-	providerId?: string;
 	children: React.ReactNode;
 }
 
@@ -72,86 +70,16 @@ const formDefaultValues = {
 	scopes: [...DEFAULT_SCOPES],
 };
 
-function parseOidcConfig(oidcConfig: string | null): {
-	clientId?: string;
-	clientSecret?: string;
-	scopes?: string[];
-} | null {
-	if (!oidcConfig) return null;
-	try {
-		const parsed = JSON.parse(oidcConfig) as {
-			clientId?: string;
-			clientSecret?: string;
-			scopes?: string[];
-		};
-		return {
-			clientId: parsed.clientId,
-			clientSecret: parsed.clientSecret,
-			scopes: Array.isArray(parsed.scopes) ? parsed.scopes : undefined,
-		};
-	} catch {
-		return null;
-	}
-}
-
-export function RegisterOidcDialog({
-	providerId,
-	children,
-}: RegisterOidcDialogProps) {
+export function RegisterOidcDialog({ children }: RegisterOidcDialogProps) {
 	const utils = api.useUtils();
 	const [open, setOpen] = useState(false);
-
-	const { data } = api.sso.one.useQuery(
-		{ providerId: providerId ?? "" },
-		{ enabled: !!providerId && open },
-	);
-	const registerMutation = api.sso.register.useMutation();
-	const updateMutation = api.sso.update.useMutation();
-
-	const isEdit = !!providerId;
-	const mutateAsync = isEdit
-		? updateMutation.mutateAsync
-		: registerMutation.mutateAsync;
-	const isLoading = isEdit
-		? updateMutation.isLoading
-		: registerMutation.isLoading;
+	const { mutateAsync, isLoading } = api.sso.register.useMutation();
 
 	const form = useForm<OidcProviderForm>({
 		resolver: zodResolver(oidcProviderSchema),
 		defaultValues: formDefaultValues,
 	});
 
-	const watchedProviderId = useWatch({
-		control: form.control,
-		name: "providerId",
-		defaultValue: "",
-	});
-
-	const baseURL = useUrl();
-
-	useEffect(() => {
-		if (!data || !open) return;
-		const domains = data.domain
-			? data.domain
-					.split(",")
-					.map((d) => d.trim())
-					.filter(Boolean)
-			: [""];
-		if (domains.length === 0) domains.push("");
-		const oidc = parseOidcConfig(data.oidcConfig);
-		form.reset({
-			providerId: data.providerId,
-			issuer: data.issuer,
-			domains,
-			clientId: oidc?.clientId ?? "",
-			clientSecret: oidc?.clientSecret ?? "",
-			scopes:
-				oidc?.scopes && oidc.scopes.length > 0
-					? oidc.scopes
-					: [...DEFAULT_SCOPES],
-		});
-	}, [data, open, form]);
-
 	const { fields, append, remove } = useFieldArray({
 		control: form.control,
 		name: "domains" as FieldArrayPath<OidcProviderForm>,
@@ -173,40 +101,31 @@ export function RegisterOidcDialog({
 			const scopes = data.scopes.filter(Boolean).length
 				? data.scopes.filter(Boolean)
 				: DEFAULT_SCOPES;
-
-			const isAzure = data.issuer.includes("login.microsoftonline.com");
-			const mapping = isAzure
-				? {
-						id: "sub",
-						email: "preferred_username",
-						emailVerified: "email_verified",
-						name: "name",
-					}
-				: {
-						id: "sub",
-						email: "email",
-						emailVerified: "email_verified",
-						name: "preferred_username",
-						image: "picture",
-					};
+			const domain = data.domains
+				.map((d) => d.trim())
+				.filter(Boolean)
+				.join(",");
 			await mutateAsync({
 				providerId: data.providerId,
 				issuer: data.issuer,
-				domains: data.domains,
+				domain,
 				oidcConfig: {
 					clientId: data.clientId,
 					clientSecret: data.clientSecret,
 					scopes,
 					pkce: true,
-					mapping,
+					// Keycloak (and many IdPs) send preferred_username; better-auth expects name
+					mapping: {
+						id: "sub",
+						email: "email",
+						emailVerified: "email_verified",
+						name: "preferred_username",
+						image: "picture",
+					},
 				},
 			});
 
-			toast.success(
-				isEdit
-					? "OIDC provider updated successfully"
-					: "OIDC provider registered successfully",
-			);
+			toast.success("OIDC provider registered successfully");
 			form.reset(formDefaultValues);
 			setOpen(false);
 			await utils.sso.listProviders.invalidate();
@@ -222,13 +141,11 @@ export function RegisterOidcDialog({
 			<DialogTrigger asChild>{children}</DialogTrigger>
 			<DialogContent className="sm:max-w-[500px]">
 				<DialogHeader>
-					<DialogTitle>
-						{isEdit ? "Update OIDC provider" : "Register OIDC provider"}
-					</DialogTitle>
+					<DialogTitle>Register OIDC provider</DialogTitle>
 					<DialogDescription>
-						{isEdit
-							? "Change issuer, domains, client settings or scopes. Provider ID cannot be changed."
-							: "Add any OIDC-compliant identity provider (e.g. Okta, Azure AD, Google Workspace, Auth0, Keycloak). Discovery will fill endpoints from the issuer URL when possible."}
+						Add any OIDC-compliant identity provider (e.g. Okta, Azure AD,
+						Google Workspace, Auth0, Keycloak). Discovery will fill endpoints
+						from the issuer URL when possible.
 					</DialogDescription>
 				</DialogHeader>
 				<Form {...form}>
@@ -240,28 +157,11 @@ export function RegisterOidcDialog({
 								<FormItem>
 									<FormLabel>Provider ID</FormLabel>
 									<FormControl>
-										<Input
-											placeholder="e.g. okta or my-idp"
-											{...field}
-											readOnly={isEdit}
-											className={isEdit ? "bg-muted" : undefined}
-										/>
+										<Input placeholder="e.g. okta or my-idp" {...field} />
 									</FormControl>
 									<FormDescription>
 										Unique identifier; used in callback URL path.
-										{isEdit && " Cannot be changed when editing."}
 									</FormDescription>
-									{baseURL && (
-										<div className="rounded-md bg-muted px-3 py-2 text-xs">
-											<p className="font-medium text-muted-foreground">
-												Callback URL (configure in your IdP)
-											</p>
-											<p className="mt-0.5 break-all font-mono">
-												{baseURL}/api/auth/sso/callback/
-												{watchedProviderId?.trim() || "..."}
-											</p>
-										</div>
-									)}
 									<FormMessage />
 								</FormItem>
 							)}
@@ -436,7 +336,7 @@ export function RegisterOidcDialog({
 								Cancel
 							</Button>
 							<Button type="submit" isLoading={isLoading}>
-								{isEdit ? "Update provider" : "Register provider"}
+								Register provider
 							</Button>
 						</DialogFooter>
 					</form>

apps/dokploy/components/proprietary/sso/register-saml-dialog.tsx

@@ -2,13 +2,8 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Plus, Trash2 } from "lucide-react";
-import { useEffect, useState } from "react";
-import {
-	type FieldArrayPath,
-	useFieldArray,
-	useForm,
-	useWatch,
-} from "react-hook-form";
+import { useState } from "react";
+import { type FieldArrayPath, useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
@@ -33,7 +28,6 @@ import {
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { api } from "@/utils/api";
-import { useUrl } from "@/utils/hooks/use-url";
 
 const domainsArraySchema = z
 	.array(z.string().trim())
@@ -58,13 +52,17 @@ const samlProviderSchema = z.object({
 		.url("Invalid URL")
 		.trim(),
 	cert: z.string().min(1, "IdP signing certificate is required"),
-	idpMetadataXml: z.string().optional(),
+	callbackUrl: z
+		.string()
+		.min(1, "Callback URL is required")
+		.url("Invalid URL")
+		.trim(),
+	audience: z.string().min(1, "Audience (Entity ID) is required").trim(),
 });
 
 type SamlProviderForm = z.infer<typeof samlProviderSchema>;
 
 interface RegisterSamlDialogProps {
-	providerId?: string;
 	children: React.ReactNode;
 }
 
@@ -74,86 +72,20 @@ const formDefaultValues: SamlProviderForm = {
 	domains: [""],
 	entryPoint: "",
 	cert: "",
-	idpMetadataXml: "",
+	callbackUrl: "",
+	audience: "",
 };
 
-function parseSamlConfig(samlConfig: string | null): {
-	entryPoint?: string;
-	cert?: string;
-	idpMetadataXml?: string;
-} | null {
-	if (!samlConfig) return null;
-	try {
-		const parsed = JSON.parse(samlConfig) as {
-			entryPoint?: string;
-			cert?: string;
-			idpMetadata?: { metadata?: string };
-		};
-		return {
-			entryPoint: parsed.entryPoint,
-			cert: parsed.cert,
-			idpMetadataXml: parsed.idpMetadata?.metadata,
-		};
-	} catch {
-		return null;
-	}
-}
-
-export function RegisterSamlDialog({
-	providerId,
-	children,
-}: RegisterSamlDialogProps) {
+export function RegisterSamlDialog({ children }: RegisterSamlDialogProps) {
 	const utils = api.useUtils();
 	const [open, setOpen] = useState(false);
-
-	const { data } = api.sso.one.useQuery(
-		{ providerId: providerId ?? "" },
-		{ enabled: !!providerId && open },
-	);
-	const registerMutation = api.sso.register.useMutation();
-	const updateMutation = api.sso.update.useMutation();
-
-	const isEdit = !!providerId;
-	const mutateAsync = isEdit
-		? updateMutation.mutateAsync
-		: registerMutation.mutateAsync;
-	const isLoading = isEdit
-		? updateMutation.isLoading
-		: registerMutation.isLoading;
-
-	const baseURL = useUrl();
+	const { mutateAsync, isLoading } = api.sso.register.useMutation();
 
 	const form = useForm<SamlProviderForm>({
 		resolver: zodResolver(samlProviderSchema),
 		defaultValues: formDefaultValues,
 	});
 
-	useEffect(() => {
-		if (!data || !open) return;
-		const domains = data.domain
-			? data.domain
-					.split(",")
-					.map((d) => d.trim())
-					.filter(Boolean)
-			: [""];
-		if (domains.length === 0) domains.push("");
-		const saml = parseSamlConfig(data.samlConfig);
-		form.reset({
-			providerId: data.providerId,
-			issuer: data.issuer,
-			domains,
-			entryPoint: saml?.entryPoint ?? "",
-			cert: saml?.cert ?? "",
-			idpMetadataXml: saml?.idpMetadataXml ?? "",
-		});
-	}, [data, open, form]);
-
-	const watchedProviderId = useWatch({
-		control: form.control,
-		name: "providerId",
-		defaultValue: "",
-	});
-
 	const { fields, append, remove } = useFieldArray({
 		control: form.control,
 		name: "domains" as FieldArrayPath<SamlProviderForm>,
@@ -163,47 +95,29 @@ export function RegisterSamlDialog({
 
 	const onSubmit = async (data: SamlProviderForm) => {
 		try {
-			// maybe add the /saml/metadata endpoint to the baseURL
-			const baseURLWithMetadata = `${baseURL}/saml/metadata`;
-			const generateSpMetadata = (providerId: string) => {
-				return `<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="${baseURL}">
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="${baseURL}/api/auth/sso/saml2/callback/${providerId}" index="1"/>
-    </md:SPSSODescriptor>
-</md:EntityDescriptor>`;
-			};
-
+			const domain = data.domains
+				.map((d) => d.trim())
+				.filter(Boolean)
+				.join(",");
 			await mutateAsync({
 				providerId: data.providerId,
 				issuer: data.issuer,
-				domains: data.domains,
+				domain,
 				samlConfig: {
 					entryPoint: data.entryPoint,
 					cert: data.cert,
-					callbackUrl: `${baseURL}/api/auth/sso/saml2/callback/${data.providerId}`,
-					audience: baseURL,
-					idpMetadata: data.idpMetadataXml?.trim()
-						? { metadata: data.idpMetadataXml.trim() }
-						: undefined,
+					callbackUrl: data.callbackUrl,
+					audience: data.audience,
+					wantAssertionsSigned: true,
+					signatureAlgorithm: "sha256",
+					digestAlgorithm: "sha256",
 					spMetadata: {
-						metadata: generateSpMetadata(data.providerId),
-					},
-					mapping: {
-						id: "nameID",
-						email: "email",
-						name: "displayName",
-						firstName: "givenName",
-						lastName: "surname",
+						entityID: data.audience,
 					},
 				},
 			});
 
-			toast.success(
-				isEdit
-					? "SAML provider updated successfully"
-					: "SAML provider registered successfully",
-			);
+			toast.success("SAML provider registered successfully");
 			form.reset(formDefaultValues);
 			setOpen(false);
 			await utils.sso.listProviders.invalidate();
@@ -219,13 +133,10 @@ export function RegisterSamlDialog({
 			<DialogTrigger asChild>{children}</DialogTrigger>
 			<DialogContent className="sm:max-w-[500px] max-h-[90vh] overflow-y-auto">
 				<DialogHeader>
-					<DialogTitle>
-						{isEdit ? "Update SAML provider" : "Register SAML provider"}
-					</DialogTitle>
+					<DialogTitle>Register SAML provider</DialogTitle>
 					<DialogDescription>
-						{isEdit
-							? "Change issuer, domains, entry point or certificate. Provider ID cannot be changed."
-							: "Add a SAML 2.0 identity provider (e.g. Okta SAML, Azure AD SAML, OneLogin). You need the IdP's SSO URL and signing certificate."}
+						Add a SAML 2.0 identity provider (e.g. Okta SAML, Azure AD SAML,
+						OneLogin). You need the IdP&apos;s SSO URL and signing certificate.
 					</DialogDescription>
 				</DialogHeader>
 				<Form {...form}>
@@ -240,26 +151,8 @@ export function RegisterSamlDialog({
 										<Input
 											placeholder="e.g. okta-saml or azure-saml"
 											{...field}
-											readOnly={isEdit}
-											className={isEdit ? "bg-muted" : undefined}
 										/>
 									</FormControl>
-									{isEdit && (
-										<FormDescription>
-											Cannot be changed when editing.
-										</FormDescription>
-									)}
-									{baseURL && (
-										<div className="rounded-md bg-muted px-3 py-2 text-xs">
-											<p className="font-medium text-muted-foreground">
-												Callback URL (configure in your IdP)
-											</p>
-											<p className="mt-0.5 break-all font-mono">
-												{baseURL}/api/auth/sso/saml2/callback/
-												{watchedProviderId?.trim() || "..."}
-											</p>
-										</div>
-									)}
 									<FormMessage />
 								</FormItem>
 							)}
@@ -375,29 +268,39 @@ export function RegisterSamlDialog({
 								</FormItem>
 							)}
 						/>
-
 						<FormField
 							control={form.control}
-							name="idpMetadataXml"
+							name="callbackUrl"
 							render={({ field }) => (
 								<FormItem>
-									<FormLabel>IdP metadata XML (optional)</FormLabel>
+									<FormLabel>Callback URL (ACS)</FormLabel>
 									<FormControl>
-										<Textarea
-											placeholder="Paste full IdP metadata XML if you have it (EntityDescriptor). Otherwise leave empty and use Issuer, IdP SSO URL and certificate above."
-											rows={5}
-											className="font-mono text-xs"
+										<Input
+											placeholder="https://yourapp.com/api/auth/sso/saml2/callback/my-provider"
 											{...field}
 										/>
 									</FormControl>
 									<FormDescription>
-										Some IdPs require full metadata; paste the XML here to
-										override issuer/entry point/cert.
+										Use the callback URL shown in your IdP app config for this
+										provider.
 									</FormDescription>
 									<FormMessage />
 								</FormItem>
 							)}
 						/>
+						<FormField
+							control={form.control}
+							name="audience"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Audience (Entity ID)</FormLabel>
+									<FormControl>
+										<Input placeholder="https://yourapp.com" {...field} />
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
 						<DialogFooter>
 							<Button
 								type="button"
@@ -408,7 +311,7 @@ export function RegisterSamlDialog({
 								Cancel
 							</Button>
 							<Button type="submit" isLoading={isLoading}>
-								{isEdit ? "Update provider" : "Register provider"}
+								Register provider
 							</Button>
 						</DialogFooter>
 					</form>

apps/dokploy/components/proprietary/sso/sso-settings.tsx

@@ -1,15 +1,7 @@
 "use client";
 
-import {
-	Eye,
-	Loader2,
-	LogIn,
-	Pencil,
-	Plus,
-	Shield,
-	Trash2,
-} from "lucide-react";
-import { useState } from "react";
+import { Eye, Loader2, LogIn, Trash2 } from "lucide-react";
+import { useEffect, useState } from "react";
 import { toast } from "sonner";
 import { DialogAction } from "@/components/shared/dialog-action";
 import { Badge } from "@/components/ui/badge";
@@ -29,9 +21,7 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
-import { useUrl } from "@/utils/hooks/use-url";
 import { RegisterOidcDialog } from "./register-oidc-dialog";
 import { RegisterSamlDialog } from "./register-saml-dialog";
 
@@ -77,107 +67,29 @@ export const SSOSettings = () => {
 	const utils = api.useUtils();
 	const [detailsProvider, setDetailsProvider] =
 		useState<ProviderForDetails | null>(null);
-	const baseURL = useUrl();
-	const [manageOriginsOpen, setManageOriginsOpen] = useState(false);
-	const [editingOrigin, setEditingOrigin] = useState<string | null>(null);
-	const [editingValue, setEditingValue] = useState("");
-	const [newOriginInput, setNewOriginInput] = useState("");
+	const [baseURL, setBaseURL] = useState("");
+
+	useEffect(() => {
+		if (typeof window !== "undefined") {
+			setBaseURL(window.location.origin);
+		}
+	}, []);
 
 	const { data: providers, isLoading } = api.sso.listProviders.useQuery();
-	const { data: trustedOrigins = [] } = api.sso.getTrustedOrigins.useQuery(
-		undefined,
-		{ enabled: manageOriginsOpen },
-	);
 	const { mutateAsync: deleteProvider, isLoading: isDeleting } =
 		api.sso.deleteProvider.useMutation();
-	const { mutateAsync: addTrustedOrigin, isLoading: isAddingOrigin } =
-		api.sso.addTrustedOrigin.useMutation();
-	const { mutateAsync: removeTrustedOrigin, isLoading: isRemovingOrigin } =
-		api.sso.removeTrustedOrigin.useMutation();
-	const { mutateAsync: updateTrustedOrigin, isLoading: isUpdatingOrigin } =
-		api.sso.updateTrustedOrigin.useMutation();
-
-	const handleAddOrigin = async () => {
-		const value = newOriginInput.trim();
-		if (!value) return;
-		try {
-			await addTrustedOrigin({ origin: value });
-			toast.success("Trusted origin added");
-			setNewOriginInput("");
-			await utils.sso.getTrustedOrigins.invalidate();
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to add trusted origin",
-			);
-		}
-	};
-
-	const handleRemoveOrigin = async (origin: string) => {
-		try {
-			await removeTrustedOrigin({ origin });
-			toast.success("Trusted origin removed");
-			if (editingOrigin === origin) setEditingOrigin(null);
-			await utils.sso.getTrustedOrigins.invalidate();
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to remove trusted origin",
-			);
-		}
-	};
-
-	const handleStartEdit = (origin: string) => {
-		setEditingOrigin(origin);
-		setEditingValue(origin);
-	};
-
-	const handleSaveEdit = async () => {
-		if (editingOrigin == null || !editingValue.trim()) {
-			setEditingOrigin(null);
-			return;
-		}
-		try {
-			await updateTrustedOrigin({
-				oldOrigin: editingOrigin,
-				newOrigin: editingValue.trim(),
-			});
-			toast.success("Trusted origin updated");
-			setEditingOrigin(null);
-			setEditingValue("");
-			await utils.sso.getTrustedOrigins.invalidate();
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to update trusted origin",
-			);
-		}
-	};
-
-	const handleCancelEdit = () => {
-		setEditingOrigin(null);
-		setEditingValue("");
-	};
 
 	return (
 		<div className="flex flex-col gap-4 rounded-lg border p-4">
-			<div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between">
-				<div className="flex flex-col gap-2">
-					<div className="flex items-center gap-2">
-						<LogIn className="size-6 text-muted-foreground" />
-						<CardTitle className="text-xl">Single Sign-On (SSO)</CardTitle>
-					</div>
-					<CardDescription>
-						Configure OIDC or SAML identity providers for enterprise sign-in.
-						Users can sign in with their organization&apos;s IdP.
-					</CardDescription>
+			<div className="flex flex-col gap-2">
+				<div className="flex items-center gap-2">
+					<LogIn className="size-6 text-muted-foreground" />
+					<CardTitle className="text-xl">Single Sign-On (SSO)</CardTitle>
 				</div>
-				<Button
-					variant="outline"
-					size="sm"
-					onClick={() => setManageOriginsOpen(true)}
-					className="shrink-0"
-				>
-					<Shield className="mr-2 size-4" />
-					Manage origins
-				</Button>
+				<CardDescription>
+					Configure OIDC or SAML identity providers for enterprise sign-in.
+					Users can sign in with their organization&apos;s IdP.
+				</CardDescription>
 			</div>
 
 			{isLoading ? (
@@ -265,22 +177,6 @@ export const SSOSettings = () => {
 													<Eye className="mr-1 size-3" />
 													View details
 												</Button>
-												{isOidc && (
-													<RegisterOidcDialog providerId={provider.providerId}>
-														<Button variant="ghost" size="sm">
-															<Pencil className="mr-1 size-3" />
-															Edit
-														</Button>
-													</RegisterOidcDialog>
-												)}
-												{isSaml && (
-													<RegisterSamlDialog providerId={provider.providerId}>
-														<Button variant="ghost" size="sm">
-															<Pencil className="mr-1 size-3" />
-															Edit
-														</Button>
-													</RegisterSamlDialog>
-												)}
 												<DialogAction
 													title="Remove SSO provider"
 													description={`Remove provider "${provider.providerId}"? Users will no longer be able to sign in with this IdP.`}
@@ -360,7 +256,8 @@ export const SSOSettings = () => {
 							<DialogHeader>
 								<DialogTitle>SSO provider details</DialogTitle>
 								<DialogDescription>
-									Use Edit to change provider settings (OIDC or SAML).
+									View-only. To change settings, remove this provider and add it
+									again with the new values.
 								</DialogDescription>
 							</DialogHeader>
 							<div className="grid gap-3 py-2">
@@ -443,10 +340,7 @@ export const SSOSettings = () => {
 										Callback URL (configure in your IdP)
 									</span>
 									<p className="break-all rounded-md bg-muted px-2 py-1.5 font-mono text-xs">
-										{baseURL || "{baseURL}"}
-										{detailsProvider.samlConfig
-											? "/api/auth/sso/saml2/callback/"
-											: "/api/auth/sso/callback/"}
+										{baseURL || "{baseURL}"}/api/auth/sso/callback/
 										{detailsProvider.providerId}
 									</p>
 									{!baseURL && (
@@ -469,128 +363,6 @@ export const SSOSettings = () => {
 					)}
 				</DialogContent>
 			</Dialog>
-
-			<Dialog open={manageOriginsOpen} onOpenChange={setManageOriginsOpen}>
-				<DialogContent className="sm:max-w-[480px]">
-					<DialogHeader>
-						<DialogTitle className="flex items-center gap-2">
-							<Shield className="size-5" />
-							Trusted origins
-						</DialogTitle>
-						<DialogDescription>
-							Manage allowed origins for SSO callbacks. Add, edit, or remove
-							origins for your account.
-						</DialogDescription>
-					</DialogHeader>
-					<div className="space-y-4 py-2">
-						<div className="space-y-2">
-							<span className="text-sm font-medium">Current origins</span>
-							{trustedOrigins.length === 0 ? (
-								<p className="rounded-md border border-dashed bg-muted/30 px-3 py-4 text-center text-sm text-muted-foreground">
-									No trusted origins yet. Add one below.
-								</p>
-							) : (
-								<ul className="flex flex-col gap-2">
-									{trustedOrigins.map((origin) => (
-										<li
-											key={origin}
-											className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2"
-										>
-											{editingOrigin === origin ? (
-												<>
-													<Input
-														value={editingValue}
-														onChange={(e) => setEditingValue(e.target.value)}
-														placeholder="https://..."
-														className="flex-1 font-mono text-sm"
-														autoFocus
-													/>
-													<Button
-														size="sm"
-														onClick={handleSaveEdit}
-														disabled={!editingValue.trim() || isUpdatingOrigin}
-													>
-														Save
-													</Button>
-													<Button
-														size="sm"
-														variant="ghost"
-														onClick={handleCancelEdit}
-													>
-														Cancel
-													</Button>
-												</>
-											) : (
-												<>
-													<span className="flex-1 break-all font-mono text-sm">
-														{origin}
-													</span>
-													<Button
-														variant="ghost"
-														size="icon"
-														className="size-8 shrink-0"
-														onClick={() => handleStartEdit(origin)}
-													>
-														<Pencil className="size-3.5" />
-													</Button>
-													<DialogAction
-														title="Remove trusted origin"
-														description={`Remove "${origin}" from trusted origins?`}
-														type="destructive"
-														onClick={async () => handleRemoveOrigin(origin)}
-													>
-														<Button
-															variant="ghost"
-															size="icon"
-															className="size-8 shrink-0 text-destructive hover:text-destructive"
-															disabled={isRemovingOrigin}
-														>
-															<Trash2 className="size-3.5" />
-														</Button>
-													</DialogAction>
-												</>
-											)}
-										</li>
-									))}
-								</ul>
-							)}
-						</div>
-						<div className="space-y-2">
-							<span className="text-sm font-medium">Add trusted origin</span>
-							<div className="flex gap-2">
-								<Input
-									value={newOriginInput}
-									onChange={(e) => setNewOriginInput(e.target.value)}
-									placeholder="https://example.com"
-									className="font-mono text-sm"
-									onKeyDown={(e) => {
-										if (e.key === "Enter") {
-											e.preventDefault();
-											void handleAddOrigin();
-										}
-									}}
-								/>
-								<Button
-									size="sm"
-									onClick={handleAddOrigin}
-									disabled={!newOriginInput.trim() || isAddingOrigin}
-								>
-									<Plus className="mr-1 size-4" />
-									Add
-								</Button>
-							</div>
-						</div>
-					</div>
-					<DialogFooter>
-						<Button
-							variant="outline"
-							onClick={() => setManageOriginsOpen(false)}
-						>
-							Close
-						</Button>
-					</DialogFooter>
-				</DialogContent>
-			</Dialog>
 		</div>
 	);
 };

apps/dokploy/components/proprietary/whitelabelling/whitelabel-settings.tsx

@@ -0,0 +1,290 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Loader2, Palette } from "lucide-react";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+import { Button } from "@/components/ui/button";
+import { CardDescription, CardTitle } from "@/components/ui/card";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { api } from "@/utils/api";
+
+const whitelabelSchema = z.object({
+	whitelabelAppName: z.string().min(1).max(100),
+	whitelabelLogoUrl: z.union([z.string().url(), z.literal("")]).optional(),
+	whitelabelLoginLogoUrl: z.union([z.string().url(), z.literal("")]).optional(),
+	whitelabelFaviconUrl: z.union([z.string().url(), z.literal("")]).optional(),
+	whitelabelLoginTitle: z.string().max(200).optional(),
+	whitelabelLoginSubtitle: z.string().max(500).optional(),
+	whitelabelLoginBackgroundImageUrl: z
+		.union([z.string().url(), z.literal("")])
+		.optional(),
+});
+
+type WhitelabelFormValues = z.infer<typeof whitelabelSchema>;
+
+export function WhitelabelSettings() {
+	const { data: settings, isLoading } =
+		api.settings.getWebServerSettings.useQuery();
+	const { mutateAsync: updateWhitelabel, isLoading: isSaving } =
+		api.settings.updateWhitelabelSettings.useMutation();
+	const utils = api.useUtils();
+
+	const form = useForm<WhitelabelFormValues>({
+		resolver: zodResolver(whitelabelSchema),
+		defaultValues: {
+			whitelabelAppName: "Dokploy",
+			whitelabelLogoUrl: "",
+			whitelabelLoginLogoUrl: "",
+			whitelabelFaviconUrl: "",
+			whitelabelLoginTitle: "",
+			whitelabelLoginSubtitle: "",
+			whitelabelLoginBackgroundImageUrl: "",
+		},
+	});
+
+	useEffect(() => {
+		if (settings) {
+			form.reset({
+				whitelabelAppName: settings.whitelabelAppName ?? "Dokploy",
+				whitelabelLogoUrl: settings.whitelabelLogoUrl ?? "",
+				whitelabelLoginLogoUrl: settings.whitelabelLoginLogoUrl ?? "",
+				whitelabelFaviconUrl: settings.whitelabelFaviconUrl ?? "",
+				whitelabelLoginTitle: settings.whitelabelLoginTitle ?? "",
+				whitelabelLoginSubtitle: settings.whitelabelLoginSubtitle ?? "",
+				whitelabelLoginBackgroundImageUrl:
+					settings.whitelabelLoginBackgroundImageUrl ?? "",
+			});
+		}
+	}, [settings, form]);
+
+	const onSubmit = async (values: WhitelabelFormValues) => {
+		try {
+			await updateWhitelabel({
+				whitelabelAppName: values.whitelabelAppName || null,
+				whitelabelLogoUrl: values.whitelabelLogoUrl || undefined,
+				whitelabelLoginLogoUrl: values.whitelabelLoginLogoUrl || undefined,
+				whitelabelFaviconUrl: values.whitelabelFaviconUrl || undefined,
+				whitelabelLoginTitle: values.whitelabelLoginTitle || null,
+				whitelabelLoginSubtitle: values.whitelabelLoginSubtitle || null,
+				whitelabelLoginBackgroundImageUrl:
+					values.whitelabelLoginBackgroundImageUrl || undefined,
+			});
+			toast.success("Whitelabel settings saved");
+			utils.settings.getWebServerSettings.invalidate();
+			utils.settings.getWhitelabelSettings.invalidate();
+		} catch (e) {
+			toast.error("Failed to save whitelabel settings");
+		}
+	};
+
+	if (isLoading) {
+		return (
+			<div className="flex items-center gap-2 justify-center min-h-[25vh]">
+				<Loader2 className="size-6 text-muted-foreground animate-spin" />
+				<span className="text-sm text-muted-foreground">
+					Loading whitelabel settings...
+				</span>
+			</div>
+		);
+	}
+
+	return (
+		<div className="flex flex-col gap-4 rounded-lg ">
+			<div className="flex flex-col gap-2">
+				<div className="flex items-center gap-2">
+					<Palette className="size-6 text-muted-foreground" />
+					<CardTitle className="text-xl">Whitelabeling</CardTitle>
+				</div>
+				<CardDescription>
+					Customize the application name, logos, and login page for your brand.
+					Leave URLs empty to use defaults.
+				</CardDescription>
+			</div>
+
+			<Form {...form}>
+				<form
+					onSubmit={form.handleSubmit(onSubmit)}
+					className="flex flex-col gap-6"
+				>
+					<div className="space-y-4 pt-2 border-t">
+						<div>
+							<h3 className="text-sm font-medium">Brand</h3>
+							<p className="text-sm text-muted-foreground">
+								Application name and main logo (sidebar, header).
+							</p>
+						</div>
+						<FormField
+							control={form.control}
+							name="whitelabelAppName"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Application name</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="Dokploy"
+											{...field}
+											className="max-w-md"
+										/>
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="whitelabelLogoUrl"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Logo URL</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="https://example.com/logo.png"
+											{...field}
+											value={field.value ?? ""}
+											className="max-w-md"
+										/>
+									</FormControl>
+									<FormDescription>
+										Logo shown in the sidebar and header.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="whitelabelFaviconUrl"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Favicon URL</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="https://example.com/favicon.ico"
+											{...field}
+											value={field.value ?? ""}
+											className="max-w-md"
+										/>
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					</div>
+
+					<div className="space-y-4 pt-6 border-t">
+						<div>
+							<h3 className="text-sm font-medium">Login page</h3>
+							<p className="text-sm text-muted-foreground">
+								Customize the sign-in and registration screens.
+							</p>
+						</div>
+						<FormField
+							control={form.control}
+							name="whitelabelLoginLogoUrl"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Login logo URL</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="https://example.com/login-logo.png"
+											{...field}
+											value={field.value ?? ""}
+											className="max-w-md"
+										/>
+									</FormControl>
+									<FormDescription>
+										Logo on the login and register pages. Falls back to the main
+										logo if empty.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="whitelabelLoginTitle"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Login title</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="Sign in"
+											{...field}
+											value={field.value ?? ""}
+											className="max-w-md"
+										/>
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="whitelabelLoginSubtitle"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Login subtitle</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="Enter your email and password to sign in"
+											{...field}
+											value={field.value ?? ""}
+											className="max-w-md"
+										/>
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="whitelabelLoginBackgroundImageUrl"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Login background image URL</FormLabel>
+									<FormControl>
+										<Input
+											placeholder="https://example.com/background.jpg"
+											{...field}
+											value={field.value ?? ""}
+											className="max-w-md"
+										/>
+									</FormControl>
+									<FormDescription>
+										Optional background image for the login page.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					</div>
+
+					<div className="flex justify-end pt-4 border-t">
+						<Button type="submit" disabled={isSaving}>
+							{isSaving ? (
+								<>
+									<Loader2 className="mr-2 size-4 animate-spin" />
+									Saving...
+								</>
+							) : (
+								"Save changes"
+							)}
+						</Button>
+					</div>
+				</form>
+			</Form>
+		</div>
+	);
+}

apps/dokploy/drizzle/0137_colossal_sally_floyd.sql

@@ -1,18 +0,0 @@
-CREATE TABLE "sso_provider" (
-	"id" text PRIMARY KEY NOT NULL,
-	"issuer" text NOT NULL,
-	"oidc_config" text,
-	"saml_config" text,
-	"provider_id" text NOT NULL,
-	"user_id" text,
-	"organization_id" text,
-	"domain" text NOT NULL,
-	CONSTRAINT "sso_provider_provider_id_unique" UNIQUE("provider_id")
-);
---> statement-breakpoint
-ALTER TABLE "user" ADD COLUMN "enableEnterpriseFeatures" boolean DEFAULT false NOT NULL;--> statement-breakpoint
-ALTER TABLE "user" ADD COLUMN "licenseKey" text;--> statement-breakpoint
-ALTER TABLE "user" ADD COLUMN "isValidEnterpriseLicense" boolean DEFAULT false NOT NULL;--> statement-breakpoint
-ALTER TABLE "user" ADD COLUMN "trustedOrigins" text[];--> statement-breakpoint
-ALTER TABLE "sso_provider" ADD CONSTRAINT "sso_provider_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "sso_provider" ADD CONSTRAINT "sso_provider_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0137_naive_power_pack.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "user" ADD COLUMN "enableEnterpriseFeatures" boolean DEFAULT false NOT NULL;--> statement-breakpoint
+ALTER TABLE "user" ADD COLUMN "licenseKey" text;

apps/dokploy/drizzle/0138_common_mathemanic.sql

@@ -0,0 +1,13 @@
+CREATE TABLE "sso_provider" (
+	"id" text PRIMARY KEY NOT NULL,
+	"issuer" text NOT NULL,
+	"oidc_config" text,
+	"saml_config" text,
+	"user_id" text,
+	"provider_id" text NOT NULL,
+	"organization_id" text,
+	"domain" text NOT NULL,
+	CONSTRAINT "sso_provider_provider_id_unique" UNIQUE("provider_id")
+);
+--> statement-breakpoint
+ALTER TABLE "sso_provider" ADD CONSTRAINT "sso_provider_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0138_pretty_ironclad.sql

@@ -1,10 +0,0 @@
-ALTER TYPE "public"."notificationType" ADD VALUE 'resend' BEFORE 'gotify';--> statement-breakpoint
-CREATE TABLE "resend" (
-	"resendId" text PRIMARY KEY NOT NULL,
-	"apiKey" text NOT NULL,
-	"fromAddress" text NOT NULL,
-	"toAddress" text[] NOT NULL
-);
---> statement-breakpoint
-ALTER TABLE "notification" ADD COLUMN "resendId" text;--> statement-breakpoint
-ALTER TABLE "notification" ADD CONSTRAINT "notification_resendId_resend_resendId_fk" FOREIGN KEY ("resendId") REFERENCES "public"."resend"("resendId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0139_brave_bloodstorm.sql

@@ -1 +0,0 @@
-ALTER TABLE "invitation" ADD COLUMN "created_at" timestamp DEFAULT now() NOT NULL;

apps/dokploy/drizzle/0139_smiling_havok.sql

@@ -0,0 +1 @@
+ALTER TABLE "user" ADD COLUMN "isValidEnterpriseLicense" boolean DEFAULT false NOT NULL;

apps/dokploy/drizzle/0140_great_lightspeed.sql

@@ -0,0 +1 @@
+ALTER TABLE "sso_provider" ADD CONSTRAINT "sso_provider_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0140_lame_mattie_franklin.sql

@@ -1 +0,0 @@
-ALTER TABLE "gitlab" ADD COLUMN "gitlabInternalUrl" text;

apps/dokploy/drizzle/0141_plain_earthquake.sql

@@ -1 +0,0 @@
-ALTER TABLE "gitea" ADD COLUMN "giteaInternalUrl" text;

apps/dokploy/drizzle/0142_outstanding_tusk.sql

@@ -1,6 +0,0 @@
-ALTER TABLE "application" ADD COLUMN "ulimitsSwarm" json;--> statement-breakpoint
-ALTER TABLE "mariadb" ADD COLUMN "ulimitsSwarm" json;--> statement-breakpoint
-ALTER TABLE "mongo" ADD COLUMN "ulimitsSwarm" json;--> statement-breakpoint
-ALTER TABLE "mysql" ADD COLUMN "ulimitsSwarm" json;--> statement-breakpoint
-ALTER TABLE "postgres" ADD COLUMN "ulimitsSwarm" json;--> statement-breakpoint
-ALTER TABLE "redis" ADD COLUMN "ulimitsSwarm" json;

apps/dokploy/drizzle/0143_brown_ultron.sql

@@ -1 +0,0 @@
-ALTER TABLE "sso_provider" ADD COLUMN "created_at" timestamp DEFAULT now() NOT NULL;

apps/dokploy/drizzle/0144_odd_gunslinger.sql

@@ -1,8 +0,0 @@
-ALTER TYPE "public"."notificationType" ADD VALUE 'teams';--> statement-breakpoint
-CREATE TABLE "teams" (
-	"teamsId" text PRIMARY KEY NOT NULL,
-	"webhookUrl" text NOT NULL
-);
---> statement-breakpoint
-ALTER TABLE "notification" ADD COLUMN "teamsId" text;--> statement-breakpoint
-ALTER TABLE "notification" ADD CONSTRAINT "notification_teamsId_teams_teamsId_fk" FOREIGN KEY ("teamsId") REFERENCES "public"."teams"("teamsId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/meta/0137_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "e5c16e66-ec3d-4a91-b3ac-f9ea4577f53f",
+  "id": "af1f5881-9a57-4f68-9ef2-632b0370b0c5",
   "prevId": "5958b029-1fb9-4a44-be24-c96b4e899b84",
   "version": "7",
   "dialect": "postgresql",
@@ -6309,102 +6309,6 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "public.sso_provider": {
-      "name": "sso_provider",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "issuer": {
-          "name": "issuer",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "oidc_config": {
-          "name": "oidc_config",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "saml_config": {
-          "name": "saml_config",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "domain": {
-          "name": "domain",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "sso_provider_user_id_user_id_fk": {
-          "name": "sso_provider_user_id_user_id_fk",
-          "tableFrom": "sso_provider",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "sso_provider_organization_id_organization_id_fk": {
-          "name": "sso_provider_organization_id_organization_id_fk",
-          "tableFrom": "sso_provider",
-          "tableTo": "organization",
-          "columnsFrom": [
-            "organization_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "sso_provider_provider_id_unique": {
-          "name": "sso_provider_provider_id_unique",
-          "nullsNotDistinct": false,
-          "columns": [
-            "provider_id"
-          ]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "public.user": {
       "name": "user",
       "schema": "",
@@ -6537,13 +6441,6 @@
           "primaryKey": false,
           "notNull": false
         },
-        "isValidEnterpriseLicense": {
-          "name": "isValidEnterpriseLicense",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": false
-        },
         "stripeCustomerId": {
           "name": "stripeCustomerId",
           "type": "text",
@@ -6562,12 +6459,6 @@
           "primaryKey": false,
           "notNull": true,
           "default": 0
-        },
-        "trustedOrigins": {
-          "name": "trustedOrigins",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": false
         }
       },
       "indexes": {},

apps/dokploy/drizzle/meta/0138_snapshot.json

@@ -1,6 +1,6 @@
 {
-  "id": "45344442-d8aa-48cf-b45f-0c869acbd620",
-  "prevId": "e5c16e66-ec3d-4a91-b3ac-f9ea4577f53f",
+  "id": "9192b74d-8589-483e-a188-32d60d18c112",
+  "prevId": "af1f5881-9a57-4f68-9ef2-632b0370b0c5",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
@@ -639,6 +639,89 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
+    "public.sso_provider": {
+      "name": "sso_provider",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "oidc_config": {
+          "name": "oidc_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "saml_config": {
+          "name": "saml_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "domain": {
+          "name": "domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "sso_provider_user_id_user_id_fk": {
+          "name": "sso_provider_user_id_user_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "sso_provider_provider_id_unique": {
+          "name": "sso_provider_provider_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "provider_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
     "public.two_factor": {
       "name": "two_factor",
       "schema": "",
@@ -4492,12 +4575,6 @@
           "primaryKey": false,
           "notNull": false
         },
-        "resendId": {
-          "name": "resendId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
         "gotifyId": {
           "name": "gotifyId",
           "type": "text",
@@ -4589,19 +4666,6 @@
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
-        "notification_resendId_resend_resendId_fk": {
-          "name": "notification_resendId_resend_resendId_fk",
-          "tableFrom": "notification",
-          "tableTo": "resend",
-          "columnsFrom": [
-            "resendId"
-          ],
-          "columnsTo": [
-            "resendId"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
         "notification_gotifyId_gotify_gotifyId_fk": {
           "name": "notification_gotifyId_gotify_gotifyId_fk",
           "tableFrom": "notification",
@@ -4781,43 +4845,6 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "public.resend": {
-      "name": "resend",
-      "schema": "",
-      "columns": {
-        "resendId": {
-          "name": "resendId",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "apiKey": {
-          "name": "apiKey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "fromAddress": {
-          "name": "fromAddress",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "toAddress": {
-          "name": "toAddress",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "public.slack": {
       "name": "slack",
       "schema": "",
@@ -6365,102 +6392,6 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "public.sso_provider": {
-      "name": "sso_provider",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "issuer": {
-          "name": "issuer",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "oidc_config": {
-          "name": "oidc_config",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "saml_config": {
-          "name": "saml_config",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "domain": {
-          "name": "domain",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "sso_provider_user_id_user_id_fk": {
-          "name": "sso_provider_user_id_user_id_fk",
-          "tableFrom": "sso_provider",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "sso_provider_organization_id_organization_id_fk": {
-          "name": "sso_provider_organization_id_organization_id_fk",
-          "tableFrom": "sso_provider",
-          "tableTo": "organization",
-          "columnsFrom": [
-            "organization_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "sso_provider_provider_id_unique": {
-          "name": "sso_provider_provider_id_unique",
-          "nullsNotDistinct": false,
-          "columns": [
-            "provider_id"
-          ]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "public.user": {
       "name": "user",
       "schema": "",
@@ -6593,13 +6524,6 @@
           "primaryKey": false,
           "notNull": false
         },
-        "isValidEnterpriseLicense": {
-          "name": "isValidEnterpriseLicense",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": false
-        },
         "stripeCustomerId": {
           "name": "stripeCustomerId",
           "type": "text",
@@ -6618,12 +6542,6 @@
           "primaryKey": false,
           "notNull": true,
           "default": 0
-        },
-        "trustedOrigins": {
-          "name": "trustedOrigins",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": false
         }
       },
       "indexes": {},
@@ -7122,7 +7040,6 @@
         "telegram",
         "discord",
         "email",
-        "resend",
         "gotify",
         "ntfy",
         "pushover",

apps/dokploy/drizzle/meta/0139_snapshot.json

@@ -1,6 +1,6 @@
 {
-  "id": "c845d075-eec8-41b2-a3c9-9c63e9425c4b",
-  "prevId": "45344442-d8aa-48cf-b45f-0c869acbd620",
+  "id": "4b2adb61-29b2-456d-829f-67faa7c64982",
+  "prevId": "9192b74d-8589-483e-a188-32d60d18c112",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
@@ -344,13 +344,6 @@
           "type": "text",
           "primaryKey": false,
           "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
         }
       },
       "indexes": {},
@@ -646,6 +639,89 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
+    "public.sso_provider": {
+      "name": "sso_provider",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "oidc_config": {
+          "name": "oidc_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "saml_config": {
+          "name": "saml_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "domain": {
+          "name": "domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "sso_provider_user_id_user_id_fk": {
+          "name": "sso_provider_user_id_user_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "sso_provider_provider_id_unique": {
+          "name": "sso_provider_provider_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "provider_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
     "public.two_factor": {
       "name": "two_factor",
       "schema": "",
@@ -4499,12 +4575,6 @@
           "primaryKey": false,
           "notNull": false
         },
-        "resendId": {
-          "name": "resendId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
         "gotifyId": {
           "name": "gotifyId",
           "type": "text",
@@ -4596,19 +4666,6 @@
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
-        "notification_resendId_resend_resendId_fk": {
-          "name": "notification_resendId_resend_resendId_fk",
-          "tableFrom": "notification",
-          "tableTo": "resend",
-          "columnsFrom": [
-            "resendId"
-          ],
-          "columnsTo": [
-            "resendId"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
         "notification_gotifyId_gotify_gotifyId_fk": {
           "name": "notification_gotifyId_gotify_gotifyId_fk",
           "tableFrom": "notification",
@@ -4788,43 +4845,6 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "public.resend": {
-      "name": "resend",
-      "schema": "",
-      "columns": {
-        "resendId": {
-          "name": "resendId",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "apiKey": {
-          "name": "apiKey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "fromAddress": {
-          "name": "fromAddress",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "toAddress": {
-          "name": "toAddress",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "public.slack": {
       "name": "slack",
       "schema": "",
@@ -6372,102 +6392,6 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "public.sso_provider": {
-      "name": "sso_provider",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "issuer": {
-          "name": "issuer",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "oidc_config": {
-          "name": "oidc_config",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "saml_config": {
-          "name": "saml_config",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "domain": {
-          "name": "domain",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "sso_provider_user_id_user_id_fk": {
-          "name": "sso_provider_user_id_user_id_fk",
-          "tableFrom": "sso_provider",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "sso_provider_organization_id_organization_id_fk": {
-          "name": "sso_provider_organization_id_organization_id_fk",
-          "tableFrom": "sso_provider",
-          "tableTo": "organization",
-          "columnsFrom": [
-            "organization_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "sso_provider_provider_id_unique": {
-          "name": "sso_provider_provider_id_unique",
-          "nullsNotDistinct": false,
-          "columns": [
-            "provider_id"
-          ]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "public.user": {
       "name": "user",
       "schema": "",
@@ -6625,12 +6549,6 @@
           "primaryKey": false,
           "notNull": true,
           "default": 0
-        },
-        "trustedOrigins": {
-          "name": "trustedOrigins",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": false
         }
       },
       "indexes": {},
@@ -7129,7 +7047,6 @@
         "telegram",
         "discord",
         "email",
-        "resend",
         "gotify",
         "ntfy",
         "pushover",

apps/dokploy/drizzle/meta/0140_snapshot.json

@@ -1,6 +1,6 @@
 {
-  "id": "9cf69a2e-b38d-4ed5-ad01-27065deac7f6",
-  "prevId": "c845d075-eec8-41b2-a3c9-9c63e9425c4b",
+  "id": "2d5967fa-7d7c-4efe-b573-02c14983be02",
+  "prevId": "4b2adb61-29b2-456d-829f-67faa7c64982",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
@@ -344,13 +344,6 @@
           "type": "text",
           "primaryKey": false,
           "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
         }
       },
       "indexes": {},
@@ -3218,12 +3211,6 @@
           "notNull": true,
           "default": "'https://gitlab.com'"
         },
-        "gitlabInternalUrl": {
-          "name": "gitlabInternalUrl",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
         "application_id": {
           "name": "application_id",
           "type": "text",
@@ -4505,12 +4492,6 @@
           "primaryKey": false,
           "notNull": false
         },
-        "resendId": {
-          "name": "resendId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
         "gotifyId": {
           "name": "gotifyId",
           "type": "text",
@@ -4602,19 +4583,6 @@
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
-        "notification_resendId_resend_resendId_fk": {
-          "name": "notification_resendId_resend_resendId_fk",
-          "tableFrom": "notification",
-          "tableTo": "resend",
-          "columnsFrom": [
-            "resendId"
-          ],
-          "columnsTo": [
-            "resendId"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
         "notification_gotifyId_gotify_gotifyId_fk": {
           "name": "notification_gotifyId_gotify_gotifyId_fk",
           "tableFrom": "notification",
@@ -4794,43 +4762,6 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "public.resend": {
-      "name": "resend",
-      "schema": "",
-      "columns": {
-        "resendId": {
-          "name": "resendId",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "apiKey": {
-          "name": "apiKey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "fromAddress": {
-          "name": "fromAddress",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "toAddress": {
-          "name": "toAddress",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "public.slack": {
       "name": "slack",
       "schema": "",
@@ -6631,12 +6562,6 @@
           "primaryKey": false,
           "notNull": true,
           "default": 0
-        },
-        "trustedOrigins": {
-          "name": "trustedOrigins",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": false
         }
       },
       "indexes": {},
@@ -7135,7 +7060,6 @@
         "telegram",
         "discord",
         "email",
-        "resend",
         "gotify",
         "ntfy",
         "pushover",

apps/dokploy/drizzle/meta/_journal.json

@@ -964,57 +964,29 @@
     {
       "idx": 137,
       "version": "7",
-      "when": 1770274109332,
-      "tag": "0137_colossal_sally_floyd",
+      "when": 1769616589728,
+      "tag": "0137_naive_power_pack",
       "breakpoints": true
     },
     {
       "idx": 138,
       "version": "7",
-      "when": 1770324882572,
-      "tag": "0138_pretty_ironclad",
+      "when": 1769745328628,
+      "tag": "0138_common_mathemanic",
       "breakpoints": true
     },
     {
       "idx": 139,
       "version": "7",
-      "when": 1770442690721,
-      "tag": "0139_brave_bloodstorm",
+      "when": 1769746948088,
+      "tag": "0139_smiling_havok",
       "breakpoints": true
     },
     {
       "idx": 140,
       "version": "7",
-      "when": 1770489900075,
-      "tag": "0140_lame_mattie_franklin",
-      "breakpoints": true
-    },
-    {
-      "idx": 141,
-      "version": "7",
-      "when": 1770490719123,
-      "tag": "0141_plain_earthquake",
-      "breakpoints": true
-    },
-    {
-      "idx": 142,
-      "version": "7",
-      "when": 1770615019498,
-      "tag": "0142_outstanding_tusk",
-      "breakpoints": true
-    },
-    {
-      "idx": 143,
-      "version": "7",
-      "when": 1770961667210,
-      "tag": "0143_brown_ultron",
-      "breakpoints": true
-    },
-    {
-      "idx": 144,
-      "version": "7",
-      "when": 1771297084611,
-      "tag": "0144_odd_gunslinger",
+      "when": 1769854977685,
+      "tag": "0140_great_lightspeed",
       "breakpoints": true
     }
   ]

apps/dokploy/esbuild.config.ts

@@ -24,8 +24,6 @@ try {
 		.build({
 			entryPoints: {
 				server: "server/server.ts",
-				migration: "migration.ts",
-				"wait-for-postgres": "wait-for-postgres.ts",
 				"reset-password": "reset-password.ts",
 				"reset-2fa": "reset-2fa.ts",
 			},

apps/dokploy/hooks/use-health-check-after-mutation.ts

@@ -1,92 +0,0 @@
-import { useCallback, useState } from "react";
-import { toast } from "sonner";
-
-const HEALTH_CHECK_URL = "/api/health";
-
-export interface UseHealthCheckAfterMutationOptions {
-	/**
-	 * Delay in ms before starting to poll the health endpoint.
-	 * Gives time for the service (e.g. Traefik) to restart.
-	 * @default 5000
-	 */
-	initialDelay?: number;
-	/**
-	 * Delay in ms between each health check poll.
-	 * @default 2000
-	 */
-	pollInterval?: number;
-	/**
-	 * Message shown in toast when the operation completes successfully.
-	 */
-	successMessage: string;
-	/**
-	 * Callback when health check passes. Use for refetching data.
-	 */
-	onSuccess?: () => void | Promise<void>;
-	/**
-	 * If true, reloads the page when health check passes (e.g. for server update).
-	 * @default false
-	 */
-	reloadOnSuccess?: boolean;
-}
-
-export const useHealthCheckAfterMutation = ({
-	initialDelay = 5000,
-	pollInterval = 2000,
-	successMessage,
-	onSuccess,
-	reloadOnSuccess = false,
-}: UseHealthCheckAfterMutationOptions) => {
-	const [isExecuting, setIsExecuting] = useState(false);
-
-	const checkHealth = useCallback(async (): Promise<boolean> => {
-		try {
-			const response = await fetch(HEALTH_CHECK_URL);
-			return response.ok;
-		} catch {
-			return false;
-		}
-	}, []);
-
-	const pollUntilHealthy = useCallback(async (): Promise<void> => {
-		const isHealthy = await checkHealth();
-
-		if (isHealthy) {
-			toast.success(successMessage);
-
-			if (reloadOnSuccess) {
-				setTimeout(() => {
-					window.location.reload();
-				}, 2000);
-			} else {
-				await onSuccess?.();
-			}
-			return;
-		}
-
-		await new Promise((resolve) => setTimeout(resolve, pollInterval));
-		await pollUntilHealthy();
-	}, [checkHealth, successMessage, reloadOnSuccess, onSuccess, pollInterval]);
-
-	const execute = useCallback(
-		async <T>(mutationFn: () => Promise<T>): Promise<T> => {
-			setIsExecuting(true);
-
-			try {
-				const result = await mutationFn();
-
-				// Give time for the service to restart before polling
-				await new Promise((resolve) => setTimeout(resolve, initialDelay));
-
-				await pollUntilHealthy();
-
-				return result;
-			} finally {
-				setIsExecuting(false);
-			}
-		},
-		[initialDelay, pollUntilHealthy],
-	);
-
-	return { execute, isExecuting };
-};

apps/dokploy/lib/languages.ts

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