Merge branch 'canary' into feat/add-concurrent-builds

- Introduced tests for the GroupedQueue class, covering basic functionality, concurrency handling, and job processing across multiple groups.
- Added tests for the QueueManager class, ensuring correct queue creation, job management, and handler functionality.
- Implemented tests for concurrency changes and their effects on pending tasks, enhancing overall test coverage for the queue system.
- Created a new ChangeConcurrencyModal component for adjusting deployment concurrency settings in the UI.

.github/workflows/pull-request.yml

@@ -20,32 +20,6 @@ jobs:
         with:
           node-version: 20.16.0
           cache: "pnpm"
-      
-      - name: Install Nixpacks
-        if: matrix.job == 'test'
-        run:  |
-          export NIXPACKS_VERSION=1.39.0
-          curl -sSL https://nixpacks.com/install.sh | bash
-          echo "Nixpacks installed $NIXPACKS_VERSION"
-      
-      - name: Install Railpack
-        if: matrix.job == 'test'
-        run:  |
-          export RAILPACK_VERSION=0.15.0
-          curl -sSL https://railpack.com/install.sh | bash
-          echo "Railpack installed $RAILPACK_VERSION"
-      
-      - name: Add build tools to PATH
-        if: matrix.job == 'test'
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-      
-      - name: Initialize Docker Swarm
-        if: matrix.job == 'test'
-        run: |
-          docker swarm init
-          docker network create --driver overlay dokploy-network || true
-          echo "✅ Docker Swarm initialized"
-      
       - run: pnpm install --frozen-lockfile
       - run: pnpm server:build
       - run: pnpm ${{ matrix.job }}

.github/workflows/sync-openapi-docs.yml

@@ -1,70 +0,0 @@
-name: Generate and Sync OpenAPI
-
-on:
-  push:
-    branches:
-      - canary
-      - main
-    paths:
-      - 'apps/dokploy/server/api/routers/**'
-      - 'packages/server/src/services/**'
-      - 'packages/server/src/db/schema/**'
-
-  workflow_dispatch:
-
-jobs:
-  generate-and-commit:
-    name: Generate OpenAPI and commit to Dokploy repo
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Dokploy repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.16.0
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Generate OpenAPI specification
-        run: |
-          pnpm generate:openapi
-          
-          # Verifica que se generó correctamente
-          if [ ! -f openapi.json ]; then
-            echo "❌ openapi.json not found"
-            exit 1
-          fi
-          
-          echo "✅ OpenAPI specification generated successfully"
-
-      - name: Sync to website repository
-        run: |
-          # Clona el repositorio de website
-          git clone https://x-access-token:${{ secrets.DOCS_SYNC_TOKEN }}@github.com/dokploy/website.git website-repo
-          
-          cd website-repo
-          
-          # Copia el openapi.json al website (sobrescribe)
-          mkdir -p apps/docs/public
-          cp -f ../openapi.json apps/docs/public/openapi.json
-          
-          # Configura git
-          git config user.name "Dokploy Bot"
-          git config user.email "bot@dokploy.com"
-          
-          # Agrega y commitea siempre
-          git add apps/docs/public/openapi.json
-          git commit -m "chore: sync OpenAPI specification [skip ci]" \
-            -m "Source: ${{ github.repository }}@${{ github.sha }}" \
-            -m "Updated: $(date -u +'%Y-%m-%d %H:%M:%S UTC')" \
-            --allow-empty
-          
-          git push
-          
-          echo "✅ OpenAPI synced to website successfully"
-

.gitignore

@@ -13,8 +13,6 @@ node_modules
 .env.test.local
 .env.production.local
 
-openapi.json
-
 # Testing
 coverage
 

Dockerfile

@@ -46,7 +46,7 @@ COPY --from=build /prod/dokploy/node_modules ./node_modules
 
 
 # Install docker
-RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --version 28.5.2 && rm get-docker.sh && curl https://rclone.org/install.sh | bash
+RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm get-docker.sh && curl https://rclone.org/install.sh | bash
 
 # Install Nixpacks and tsx
 # | VERBOSE=1 VERSION=1.21.0 bash

Dockerfile.cloud

@@ -16,11 +16,11 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 
 
 # Deploy only the dokploy app
-# ARG NEXT_PUBLIC_UMAMI_HOST
-# ENV NEXT_PUBLIC_UMAMI_HOST=$NEXT_PUBLIC_UMAMI_HOST
+ARG NEXT_PUBLIC_UMAMI_HOST
+ENV NEXT_PUBLIC_UMAMI_HOST=$NEXT_PUBLIC_UMAMI_HOST
 
-# ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
-# ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
+ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
+ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
 
 ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
 ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY

README.md

@@ -80,9 +80,7 @@ For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
         <a href="https://www.lambdatest.com/?utm_source=dokploy&utm_medium=sponsor" target="_blank">
             <img src="https://www.lambdatest.com/blue-logo.png"  width="450" height="100" />
         </a>
-        <a href="https://awesome.tools/" target="_blank">
-            <img src=".github/sponsors/awesome.png"  width="200" height="150" />
-        </a>
+
 </div>
 
 <!-- Premium Supporters 🥇 -->

apps/dokploy/.env.example

@@ -1,3 +1,3 @@
 DATABASE_URL="postgres://dokploy:amukds4wi9001583845717ad2@localhost:5432/dokploy"
 PORT=3000
-NODE_ENV=development
+NODE_ENV=development

apps/dokploy/__test__/cluster/upload.test.ts

@@ -1,243 +0,0 @@
-import type { Registry } from "@dokploy/server";
-import { getRegistryTag } from "@dokploy/server";
-import { describe, expect, it } from "vitest";
-
-describe("getRegistryTag", () => {
-	// Helper to create a mock registry
-	const createMockRegistry = (overrides: Partial<Registry> = {}): Registry => {
-		return {
-			registryId: "test-registry-id",
-			registryName: "Test Registry",
-			username: "myuser",
-			password: "test-password",
-			registryUrl: "docker.io",
-			registryType: "cloud",
-			imagePrefix: null,
-			createdAt: new Date().toISOString(),
-			organizationId: "test-org-id",
-			...overrides,
-		};
-	};
-
-	describe("with username (no imagePrefix)", () => {
-		it("should handle simple image name without tag", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("docker.io/myuser/nginx");
-		});
-
-		it("should handle image name with tag", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "nginx:latest");
-			expect(result).toBe("docker.io/myuser/nginx:latest");
-		});
-
-		it("should handle image name with username already present (no duplication)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			// Should not duplicate username
-			expect(result).toBe("docker.io/myuser/myprivaterepo");
-		});
-
-		it("should handle image name with username and tag already present", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "myuser/myprivaterepo:latest");
-			// Should not duplicate username
-			expect(result).toBe("docker.io/myuser/myprivaterepo:latest");
-		});
-
-		it("should handle complex image name with username", () => {
-			const registry = createMockRegistry({ username: "siumauricio" });
-			const result = getRegistryTag(
-				registry,
-				"siumauricio/app-parse-multi-byte-port-e32uh7",
-			);
-			// Should not duplicate username
-			expect(result).toBe(
-				"docker.io/siumauricio/app-parse-multi-byte-port-e32uh7",
-			);
-		});
-
-		it("should handle image name with different username (should not duplicate)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "otheruser/myprivaterepo");
-			expect(result).toBe("docker.io/myuser/myprivaterepo");
-		});
-
-		it("should handle image name with full registry URL (no username)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "docker.io/nginx");
-			// Should add username since imageName doesn't have one
-			expect(result).toBe("docker.io/myuser/nginx");
-		});
-
-		it("should handle image name with custom registry URL and username", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "ghcr.io/myuser/repo");
-			// Should not duplicate username even if registry URL is different
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-
-		it("should handle image name with custom registry URL (different username)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "ghcr.io/otheruser/repo");
-			// Should use registry username, not the one in imageName
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-	});
-
-	describe("with imagePrefix", () => {
-		it("should use imagePrefix instead of username", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("docker.io/myorg/nginx");
-		});
-
-		it("should use imagePrefix with image tag", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "nginx:latest");
-			expect(result).toBe("docker.io/myorg/nginx:latest");
-		});
-
-		it("should handle imagePrefix with username already in image name", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			expect(result).toBe("docker.io/myorg/myprivaterepo");
-		});
-
-		it("should handle imagePrefix matching image name prefix", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "myorg/myprivaterepo");
-			// Should not duplicate prefix
-			expect(result).toBe("docker.io/myorg/myprivaterepo");
-		});
-	});
-
-	describe("without registryUrl", () => {
-		it("should work without registryUrl", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("myuser/nginx");
-		});
-
-		it("should work without registryUrl with imagePrefix", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-				registryUrl: "",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("myorg/nginx");
-		});
-
-		it("should handle username already present without registryUrl", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "",
-			});
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			// Should not duplicate username
-			expect(result).toBe("myuser/myprivaterepo");
-		});
-	});
-
-	describe("with custom registryUrl", () => {
-		it("should handle custom registry URL", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "ghcr.io",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("ghcr.io/myuser/nginx");
-		});
-
-		it("should handle custom registry URL with imagePrefix", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-				registryUrl: "ghcr.io",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("ghcr.io/myorg/nginx");
-		});
-
-		it("should handle custom registry URL with username already present", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "ghcr.io",
-			});
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			// Should not duplicate username
-			expect(result).toBe("ghcr.io/myuser/myprivaterepo");
-		});
-	});
-
-	describe("edge cases", () => {
-		it("should handle empty image name", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "");
-			expect(result).toBe("docker.io/myuser/");
-		});
-
-		it("should handle image name with multiple slashes", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "org/suborg/repo");
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-
-		it("should handle image name with username at different position", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "org/myuser/repo");
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-	});
-
-	describe("special characters in username", () => {
-		it("should handle Harbor robot account username with $ (e.g. robot$library+dokploy)", () => {
-			const registry = createMockRegistry({
-				username: "robot$library+dokploy",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("docker.io/robot$library+dokploy/nginx");
-		});
-
-		it("should handle username with $ and other special characters", () => {
-			const registry = createMockRegistry({
-				username: "robot$test+app",
-			});
-			const result = getRegistryTag(registry, "myapp:latest");
-			expect(result).toBe("docker.io/robot$test+app/myapp:latest");
-		});
-
-		it("should handle username with multiple $ symbols", () => {
-			const registry = createMockRegistry({
-				username: "user$name$test",
-			});
-			const result = getRegistryTag(registry, "app");
-			expect(result).toBe("docker.io/user$name$test/app");
-		});
-
-		it("should handle username with + and - symbols", () => {
-			const registry = createMockRegistry({
-				username: "robot+test-user",
-			});
-			const result = getRegistryTag(registry, "nginx:latest");
-			expect(result).toBe("docker.io/robot+test-user/nginx:latest");
-		});
-	});
-});

apps/dokploy/__test__/compose/domain/host-rule-format.test.ts

@@ -1,215 +0,0 @@
-import type { Domain } from "@dokploy/server";
-import { createDomainLabels } from "@dokploy/server";
-import { describe, expect, it } from "vitest";
-import { parse, stringify } from "yaml";
-
-/**
- * Regression tests for Traefik Host rule label format.
- *
- * These tests verify that the Host rule is generated with the correct format:
- * - Host(`domain.com`) - with opening and closing parentheses
- * - Host(`domain.com`) && PathPrefix(`/path`) - for path-based routing
- *
- * Issue: https://github.com/Dokploy/dokploy/issues/3161
- * The bug caused Host rules to be malformed as Host`domain.com`)
- * (missing opening parenthesis) which broke all domain routing.
- */
-describe("Host rule format regression tests", () => {
-	const baseDomain: Domain = {
-		host: "example.com",
-		port: 8080,
-		https: false,
-		uniqueConfigKey: 1,
-		customCertResolver: null,
-		certificateType: "none",
-		applicationId: "",
-		composeId: "",
-		domainType: "compose",
-		serviceName: "test-app",
-		domainId: "",
-		path: "/",
-		createdAt: "",
-		previewDeploymentId: "",
-		internalPath: "/",
-		stripPath: false,
-	};
-
-	describe("Host rule format validation", () => {
-		it("should generate Host rule with correct parentheses format", async () => {
-			const labels = await createDomainLabels("test-app", baseDomain, "web");
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			expect(ruleLabel).toBeDefined();
-			// Verify exact format: Host(`domain`)
-			expect(ruleLabel).toMatch(/Host\(`[^`]+`\)/);
-			// Ensure opening parenthesis is present after Host
-			expect(ruleLabel).toContain("Host(`example.com`)");
-			// Ensure it does NOT have the malformed format
-			expect(ruleLabel).not.toMatch(/Host`[^`]+`\)/);
-		});
-
-		it("should generate PathPrefix with correct parentheses format", async () => {
-			const labels = await createDomainLabels(
-				"test-app",
-				{ ...baseDomain, path: "/api" },
-				"web",
-			);
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			expect(ruleLabel).toBeDefined();
-			// Verify PathPrefix format
-			expect(ruleLabel).toMatch(/PathPrefix\(`[^`]+`\)/);
-			expect(ruleLabel).toContain("PathPrefix(`/api`)");
-			// Ensure opening parenthesis is present
-			expect(ruleLabel).not.toMatch(/PathPrefix`[^`]+`\)/);
-		});
-
-		it("should generate combined Host and PathPrefix with correct format", async () => {
-			const labels = await createDomainLabels(
-				"test-app",
-				{ ...baseDomain, path: "/api/v1" },
-				"websecure",
-			);
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			expect(ruleLabel).toBeDefined();
-			expect(ruleLabel).toBe(
-				"traefik.http.routers.test-app-1-websecure.rule=Host(`example.com`) && PathPrefix(`/api/v1`)",
-			);
-		});
-	});
-
-	describe("YAML serialization preserves Host rule format", () => {
-		it("should preserve Host rule format through YAML stringify/parse", async () => {
-			const labels = await createDomainLabels("test-app", baseDomain, "web");
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			// Simulate compose file structure
-			const composeSpec = {
-				services: {
-					myapp: {
-						image: "nginx",
-						labels: labels,
-					},
-				},
-			};
-
-			// Stringify to YAML
-			const yamlOutput = stringify(composeSpec, { lineWidth: 1000 });
-
-			// Parse back
-			const parsed = parse(yamlOutput) as typeof composeSpec;
-			const parsedRuleLabel = parsed.services.myapp.labels.find((l: string) =>
-				l.includes(".rule="),
-			);
-
-			// Verify format is preserved
-			expect(parsedRuleLabel).toBe(ruleLabel);
-			expect(parsedRuleLabel).toContain("Host(`example.com`)");
-			expect(parsedRuleLabel).not.toMatch(/Host`[^`]+`\)/);
-		});
-
-		it("should preserve complex rule format through YAML serialization", async () => {
-			const labels = await createDomainLabels(
-				"test-app",
-				{ ...baseDomain, path: "/api", https: true },
-				"websecure",
-			);
-
-			const composeSpec = {
-				services: {
-					myapp: {
-						labels: labels,
-					},
-				},
-			};
-
-			const yamlOutput = stringify(composeSpec, { lineWidth: 1000 });
-			const parsed = parse(yamlOutput) as typeof composeSpec;
-			const parsedRuleLabel = parsed.services.myapp.labels.find((l: string) =>
-				l.includes(".rule="),
-			);
-
-			expect(parsedRuleLabel).toContain(
-				"Host(`example.com`) && PathPrefix(`/api`)",
-			);
-		});
-	});
-
-	describe("Edge cases for domain names", () => {
-		const domainCases = [
-			{ name: "simple domain", host: "example.com" },
-			{ name: "subdomain", host: "app.example.com" },
-			{ name: "deep subdomain", host: "api.v1.app.example.com" },
-			{ name: "numeric domain", host: "123.example.com" },
-			{ name: "hyphenated domain", host: "my-app.example-host.com" },
-			{ name: "localhost", host: "localhost" },
-			{ name: "IP address style", host: "192.168.1.100" },
-		];
-
-		for (const { name, host } of domainCases) {
-			it(`should generate correct Host rule for ${name}: ${host}`, async () => {
-				const labels = await createDomainLabels(
-					"test-app",
-					{ ...baseDomain, host },
-					"web",
-				);
-				const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-				expect(ruleLabel).toBeDefined();
-				expect(ruleLabel).toContain(`Host(\`${host}\`)`);
-				// Verify parenthesis is present
-				expect(ruleLabel).toMatch(
-					new RegExp(`Host\\(\\\`${host.replace(/\./g, "\\.")}\\\`\\)`),
-				);
-			});
-		}
-	});
-
-	describe("Multiple domains scenario", () => {
-		it("should generate correct format for both web and websecure entrypoints", async () => {
-			const webLabels = await createDomainLabels("test-app", baseDomain, "web");
-			const websecureLabels = await createDomainLabels(
-				"test-app",
-				baseDomain,
-				"websecure",
-			);
-
-			const webRule = webLabels.find((l) => l.includes(".rule="));
-			const websecureRule = websecureLabels.find((l) => l.includes(".rule="));
-
-			// Both should have correct format
-			expect(webRule).toContain("Host(`example.com`)");
-			expect(websecureRule).toContain("Host(`example.com`)");
-
-			// Neither should have malformed format
-			expect(webRule).not.toMatch(/Host`[^`]+`\)/);
-			expect(websecureRule).not.toMatch(/Host`[^`]+`\)/);
-		});
-	});
-
-	describe("Special characters in paths", () => {
-		const pathCases = [
-			{ name: "simple path", path: "/api" },
-			{ name: "nested path", path: "/api/v1/users" },
-			{ name: "path with hyphen", path: "/api-v1" },
-			{ name: "path with underscore", path: "/api_v1" },
-		];
-
-		for (const { name, path } of pathCases) {
-			it(`should generate correct PathPrefix for ${name}: ${path}`, async () => {
-				const labels = await createDomainLabels(
-					"test-app",
-					{ ...baseDomain, path },
-					"web",
-				);
-				const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-				expect(ruleLabel).toBeDefined();
-				expect(ruleLabel).toContain(`PathPrefix(\`${path}\`)`);
-				// Verify parenthesis is present
-				expect(ruleLabel).not.toMatch(/PathPrefix`[^`]+`\)/);
-			});
-		}
-	});
-});

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

@@ -1,276 +0,0 @@
-import * as adminService from "@dokploy/server/services/admin";
-import * as applicationService from "@dokploy/server/services/application";
-import { deployApplication } from "@dokploy/server/services/application";
-import * as deploymentService from "@dokploy/server/services/deployment";
-import * as builders from "@dokploy/server/utils/builders";
-import * as notifications from "@dokploy/server/utils/notifications/build-success";
-import * as execProcess from "@dokploy/server/utils/process/execAsync";
-import * as gitProvider from "@dokploy/server/utils/providers/git";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-vi.mock("@dokploy/server/db", () => {
-	const createChainableMock = (): any => {
-		const chain = {
-			set: vi.fn(() => chain),
-			where: vi.fn(() => chain),
-			returning: vi.fn().mockResolvedValue([{}] as any),
-		} as any;
-		return chain;
-	};
-
-	return {
-		db: {
-			select: vi.fn(),
-			insert: vi.fn(),
-			update: vi.fn(() => createChainableMock()),
-			delete: vi.fn(),
-			query: {
-				applications: {
-					findFirst: vi.fn(),
-				},
-			},
-		},
-	};
-});
-
-vi.mock("@dokploy/server/services/application", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/services/application")
-	>("@dokploy/server/services/application");
-	return {
-		...actual,
-		findApplicationById: vi.fn(),
-		updateApplicationStatus: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/services/admin", () => ({
-	getDokployUrl: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/services/deployment", () => ({
-	createDeployment: vi.fn(),
-	updateDeploymentStatus: vi.fn(),
-	updateDeployment: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/providers/git", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/utils/providers/git")
-	>("@dokploy/server/utils/providers/git");
-	return {
-		...actual,
-		getGitCommitInfo: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/utils/process/execAsync", () => ({
-	execAsync: vi.fn(),
-	ExecError: class ExecError extends Error {},
-}));
-
-vi.mock("@dokploy/server/utils/builders", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/utils/builders")
-	>("@dokploy/server/utils/builders");
-	return {
-		...actual,
-		mechanizeDockerContainer: vi.fn(),
-		getBuildCommand: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/utils/notifications/build-success", () => ({
-	sendBuildSuccessNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/notifications/build-error", () => ({
-	sendBuildErrorNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/services/rollbacks", () => ({
-	createRollback: vi.fn(),
-}));
-
-import { db } from "@dokploy/server/db";
-import { cloneGitRepository } from "@dokploy/server/utils/providers/git";
-
-const createMockApplication = (overrides = {}) => ({
-	applicationId: "test-app-id",
-	name: "Test App",
-	appName: "test-app",
-	sourceType: "git" as const,
-	customGitUrl: "https://github.com/Dokploy/examples.git",
-	customGitBranch: "main",
-	customGitSSHKeyId: null,
-	buildType: "nixpacks" as const,
-	buildPath: "/astro",
-	env: "NODE_ENV=production",
-	serverId: null,
-	rollbackActive: false,
-	enableSubmodules: false,
-	environmentId: "env-id",
-	environment: {
-		projectId: "project-id",
-		env: "",
-		name: "production",
-		project: {
-			name: "Test Project",
-			organizationId: "org-id",
-			env: "",
-		},
-	},
-	domains: [],
-	...overrides,
-});
-
-const createMockDeployment = () => ({
-	deploymentId: "deployment-id",
-	logPath: "/tmp/test-deployment.log",
-});
-
-describe("deployApplication - Command Generation Tests", () => {
-	beforeEach(() => {
-		vi.clearAllMocks();
-		vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-			createMockApplication() as any,
-		);
-		vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-			createMockApplication() as any,
-		);
-		vi.mocked(adminService.getDokployUrl).mockResolvedValue(
-			"http://localhost:3000",
-		);
-		vi.mocked(deploymentService.createDeployment).mockResolvedValue(
-			createMockDeployment() as any,
-		);
-		vi.mocked(execProcess.execAsync).mockResolvedValue({
-			stdout: "",
-			stderr: "",
-		} as any);
-		vi.mocked(builders.mechanizeDockerContainer).mockResolvedValue(
-			undefined as any,
-		);
-		vi.mocked(deploymentService.updateDeploymentStatus).mockResolvedValue(
-			undefined as any,
-		);
-		vi.mocked(applicationService.updateApplicationStatus).mockResolvedValue(
-			{} as any,
-		);
-		vi.mocked(notifications.sendBuildSuccessNotifications).mockResolvedValue(
-			undefined as any,
-		);
-		vi.mocked(gitProvider.getGitCommitInfo).mockResolvedValue({
-			message: "test commit",
-			hash: "abc123",
-		});
-		vi.mocked(deploymentService.updateDeployment).mockResolvedValue({} as any);
-	});
-
-	it("should generate correct git clone command for astro example", async () => {
-		const app = createMockApplication();
-		const command = await cloneGitRepository(app);
-		console.log(command);
-
-		expect(command).toContain("https://github.com/Dokploy/examples.git");
-		expect(command).not.toContain("--recurse-submodules");
-		expect(command).toContain("--branch main");
-		expect(command).toContain("--depth 1");
-		expect(command).toContain("git clone");
-	});
-
-	it("should generate git clone with submodules when enabled", async () => {
-		const app = createMockApplication({ enableSubmodules: true });
-		const command = await cloneGitRepository(app);
-
-		expect(command).toContain("--recurse-submodules");
-		expect(command).toContain("https://github.com/Dokploy/examples.git");
-	});
-
-	it("should verify nixpacks command is called with correct app", async () => {
-		const mockNixpacksCommand = "nixpacks build /path/to/app --name test-app";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockNixpacksCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Test deployment",
-			descriptionLog: "",
-		});
-
-		expect(builders.getBuildCommand).toHaveBeenCalledWith(
-			expect.objectContaining({
-				buildType: "nixpacks",
-				customGitUrl: "https://github.com/Dokploy/examples.git",
-				buildPath: "/astro",
-			}),
-		);
-
-		expect(execProcess.execAsync).toHaveBeenCalledWith(
-			expect.stringContaining("nixpacks build"),
-		);
-	});
-
-	it("should verify railpack command includes correct parameters", async () => {
-		const mockApp = createMockApplication({ buildType: "railpack" });
-		vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-			mockApp as any,
-		);
-		vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-			mockApp as any,
-		);
-
-		const mockRailpackCommand = "railpack prepare /path/to/app";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockRailpackCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Railpack test",
-			descriptionLog: "",
-		});
-
-		expect(builders.getBuildCommand).toHaveBeenCalledWith(
-			expect.objectContaining({
-				buildType: "railpack",
-			}),
-		);
-
-		expect(execProcess.execAsync).toHaveBeenCalledWith(
-			expect.stringContaining("railpack prepare"),
-		);
-	});
-
-	it("should execute commands in correct order", async () => {
-		const mockNixpacksCommand = "nixpacks build";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockNixpacksCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Test",
-			descriptionLog: "",
-		});
-
-		const execCalls = vi.mocked(execProcess.execAsync).mock.calls;
-		expect(execCalls.length).toBeGreaterThan(0);
-
-		const fullCommand = execCalls[0]?.[0];
-		expect(fullCommand).toContain("set -e");
-		expect(fullCommand).toContain("git clone");
-		expect(fullCommand).toContain("nixpacks build");
-	});
-
-	it("should include log redirection in command", async () => {
-		const mockCommand = "nixpacks build";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Test",
-			descriptionLog: "",
-		});
-
-		const execCalls = vi.mocked(execProcess.execAsync).mock.calls;
-		const fullCommand = execCalls[0]?.[0];
-
-		expect(fullCommand).toContain(">> /tmp/test-deployment.log 2>&1");
-	});
-});

apps/dokploy/__test__/deploy/application.real.test.ts

@@ -1,479 +0,0 @@
-import { existsSync } from "node:fs";
-import path from "node:path";
-import type { ApplicationNested } from "@dokploy/server";
-import { paths } from "@dokploy/server/constants";
-import { execAsync } from "@dokploy/server/utils/process/execAsync";
-import { format } from "date-fns";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-const REAL_TEST_TIMEOUT = 180000; // 3 minutes
-
-// Mock ONLY database and notifications
-vi.mock("@dokploy/server/db", () => {
-	const createChainableMock = (): any => {
-		const chain: any = {
-			set: vi.fn(() => chain),
-			where: vi.fn(() => chain),
-			returning: vi.fn().mockResolvedValue([{}]),
-		};
-		return chain;
-	};
-
-	return {
-		db: {
-			select: vi.fn(),
-			insert: vi.fn(),
-			update: vi.fn(() => createChainableMock()),
-			delete: vi.fn(),
-			query: {
-				applications: {
-					findFirst: vi.fn(),
-				},
-			},
-		},
-	};
-});
-
-vi.mock("@dokploy/server/services/application", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/services/application")
-	>("@dokploy/server/services/application");
-	return {
-		...actual,
-		findApplicationById: vi.fn(),
-		updateApplicationStatus: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/services/admin", () => ({
-	getDokployUrl: vi.fn().mockResolvedValue("http://localhost:3000"),
-}));
-
-vi.mock("@dokploy/server/services/deployment", () => ({
-	createDeployment: vi.fn(),
-	updateDeploymentStatus: vi.fn(),
-	updateDeployment: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/notifications/build-success", () => ({
-	sendBuildSuccessNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/notifications/build-error", () => ({
-	sendBuildErrorNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/services/rollbacks", () => ({
-	createRollback: vi.fn(),
-}));
-
-// NOT mocked (executed for real):
-// - execAsync
-// - cloneGitRepository
-// - getBuildCommand
-// - mechanizeDockerContainer (requires Docker Swarm)
-
-import { db } from "@dokploy/server/db";
-import * as adminService from "@dokploy/server/services/admin";
-import * as applicationService from "@dokploy/server/services/application";
-import { deployApplication } from "@dokploy/server/services/application";
-import * as deploymentService from "@dokploy/server/services/deployment";
-
-const createMockApplication = (
-	overrides: Partial<ApplicationNested> = {},
-): ApplicationNested =>
-	({
-		applicationId: "test-app-id",
-		name: "Real Test App",
-		appName: `real-test-${Date.now()}`,
-		sourceType: "git" as const,
-		customGitUrl: "https://github.com/Dokploy/examples.git",
-		customGitBranch: "main",
-		customGitSSHKeyId: null,
-		customGitBuildPath: "/astro",
-		buildType: "nixpacks" as const,
-		env: "NODE_ENV=production",
-		serverId: null,
-		rollbackActive: false,
-		enableSubmodules: false,
-		environmentId: "env-id",
-		environment: {
-			projectId: "project-id",
-			env: "",
-			name: "production",
-			project: {
-				name: "Test Project",
-				organizationId: "org-id",
-				env: "",
-			},
-		},
-		domains: [],
-		mounts: [],
-		security: [],
-		redirects: [],
-		ports: [],
-		registry: null,
-		...overrides,
-	}) as ApplicationNested;
-
-const createMockDeployment = async (appName: string) => {
-	const { LOGS_PATH } = paths(false); // false = local, no remote server
-	const formattedDateTime = format(new Date(), "yyyy-MM-dd:HH:mm:ss");
-	const fileName = `${appName}-${formattedDateTime}.log`;
-	const logFilePath = path.join(LOGS_PATH, appName, fileName);
-
-	// Actually create the log directory
-	await execAsync(`mkdir -p ${path.dirname(logFilePath)}`);
-	await execAsync(`echo "Initializing deployment" > ${logFilePath}`);
-
-	return {
-		deploymentId: "deployment-id",
-		logPath: logFilePath,
-	};
-};
-
-async function cleanupDocker(appName: string) {
-	try {
-		await execAsync(`docker stop ${appName} 2>/dev/null || true`);
-		await execAsync(`docker rm ${appName} 2>/dev/null || true`);
-		await execAsync(`docker rmi ${appName} 2>/dev/null || true`);
-	} catch (error) {
-		console.log("Docker cleanup completed");
-	}
-}
-
-async function cleanupFiles(appName: string) {
-	try {
-		const { LOGS_PATH, APPLICATIONS_PATH } = paths(false);
-
-		// Clean cloned code directories
-		const appPath = path.join(APPLICATIONS_PATH, appName);
-		await execAsync(`rm -rf ${appPath} 2>/dev/null || true`);
-
-		// Clean logs for appName - removes entire folder
-		const logPath = path.join(LOGS_PATH, appName);
-		await execAsync(`rm -rf ${logPath} 2>/dev/null || true`);
-
-		console.log(`✅ Cleaned up files and logs for ${appName}`);
-	} catch (error) {
-		console.error(`⚠️ Error during cleanup for ${appName}:`, error);
-	}
-}
-
-describe(
-	"deployApplication - REAL Execution Tests",
-	() => {
-		let currentAppName: string;
-		let currentDeployment: any;
-		const allTestAppNames: string[] = [];
-
-		beforeEach(async () => {
-			vi.clearAllMocks();
-			currentAppName = `real-test-${Date.now()}`;
-			currentDeployment = await createMockDeployment(currentAppName);
-			allTestAppNames.push(currentAppName);
-
-			const mockApp = createMockApplication({ appName: currentAppName });
-
-			vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-				mockApp as any,
-			);
-			vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-				mockApp as any,
-			);
-			vi.mocked(adminService.getDokployUrl).mockResolvedValue(
-				"http://localhost:3000",
-			);
-			vi.mocked(deploymentService.createDeployment).mockResolvedValue(
-				currentDeployment as any,
-			);
-			vi.mocked(deploymentService.updateDeploymentStatus).mockResolvedValue(
-				undefined as any,
-			);
-			vi.mocked(applicationService.updateApplicationStatus).mockResolvedValue(
-				{} as any,
-			);
-			vi.mocked(deploymentService.updateDeployment).mockResolvedValue(
-				{} as any,
-			);
-		});
-
-		afterEach(async () => {
-			// ALWAYS cleanup, even if test failed or passed
-			console.log(`\n🧹 Cleaning up test: ${currentAppName}`);
-
-			// Clean current appName
-			try {
-				await cleanupDocker(currentAppName);
-				await cleanupFiles(currentAppName);
-			} catch (error) {
-				console.error("⚠️ Error cleaning current app:", error);
-			}
-
-			// Clean ALL test folders just in case
-			try {
-				const { LOGS_PATH, APPLICATIONS_PATH } = paths(false);
-				await execAsync(`rm -rf ${LOGS_PATH}/real-* 2>/dev/null || true`);
-				await execAsync(
-					`rm -rf ${APPLICATIONS_PATH}/real-* 2>/dev/null || true`,
-				);
-				console.log("✅ Cleaned up all test artifacts");
-			} catch (error) {
-				console.error("⚠️ Error cleaning all artifacts:", error);
-			}
-
-			console.log("✅ Cleanup completed\n");
-		});
-
-		it(
-			"should REALLY clone git repo and build with nixpacks",
-			async () => {
-				console.log(`\n🚀 Testing real deployment with app: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Nixpacks Test",
-					descriptionLog: "Testing real execution",
-				});
-
-				expect(result).toBe(true);
-
-				// Verify that Docker image was actually created
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				console.log("dockerImages", dockerImages);
-				expect(dockerImages.trim()).toBe(currentAppName);
-				console.log(`✅ Docker image created: ${currentAppName}`);
-
-				// Verify log exists and has content
-				expect(existsSync(currentDeployment.logPath)).toBe(true);
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("Cloning");
-				expect(logContent).toContain("nixpacks");
-				console.log(`✅ Build log created with ${logContent.length} chars`);
-
-				// Verify update functions were called
-				expect(deploymentService.updateDeploymentStatus).toHaveBeenCalledWith(
-					"deployment-id",
-					"done",
-				);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it.skip(
-			"should REALLY build with railpack (SKIPPED: requires special permissions)",
-			async () => {
-				const railpackAppName = `real-railpack-${Date.now()}`;
-				const railpackApp = createMockApplication({
-					appName: railpackAppName,
-					buildType: "railpack",
-					railpackVersion: "3",
-				});
-				currentAppName = railpackAppName;
-				allTestAppNames.push(railpackAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					railpackApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					railpackApp as any,
-				);
-
-				console.log(`\n🚀 Testing real railpack deployment: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Railpack Test",
-					descriptionLog: "",
-				});
-
-				expect(result).toBe(true);
-
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				expect(dockerImages.trim()).toBe(currentAppName);
-				console.log(`✅ Railpack image created: ${currentAppName}`);
-
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("railpack");
-				console.log("✅ Railpack build completed");
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should handle REAL git clone errors",
-			async () => {
-				const errorAppName = `real-error-${Date.now()}`;
-				const errorApp = createMockApplication({
-					appName: errorAppName,
-					customGitUrl:
-						"https://github.com/invalid/nonexistent-repo-123456.git",
-				});
-				currentAppName = errorAppName;
-				allTestAppNames.push(errorAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					errorApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					errorApp as any,
-				);
-
-				console.log(`\n🚀 Testing real error handling: ${currentAppName}`);
-
-				await expect(
-					deployApplication({
-						applicationId: "test-app-id",
-						titleLog: "Real Error Test",
-						descriptionLog: "",
-					}),
-				).rejects.toThrow();
-
-				// Verify error status was called
-				expect(deploymentService.updateDeploymentStatus).toHaveBeenCalledWith(
-					"deployment-id",
-					"error",
-				);
-
-				// Verify log contains error
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent.toLowerCase()).toContain("error");
-				console.log("✅ Error handling verified");
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should REALLY clone with submodules when enabled",
-			async () => {
-				const submodulesAppName = `real-submodules-${Date.now()}`;
-				const submodulesApp = createMockApplication({
-					appName: submodulesAppName,
-					enableSubmodules: true,
-				});
-				currentAppName = submodulesAppName;
-				allTestAppNames.push(submodulesAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					submodulesApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					submodulesApp as any,
-				);
-
-				console.log(`\n🚀 Testing real submodules support: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Submodules Test",
-					descriptionLog: "",
-				});
-
-				expect(result).toBe(true);
-
-				// Verify deployment completed successfully
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("Cloning");
-				expect(logContent.length).toBeGreaterThan(100);
-				console.log("✅ Submodules deployment completed");
-
-				// Verify image
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				expect(dockerImages.trim()).toBe(currentAppName);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should verify REAL commit info extraction",
-			async () => {
-				console.log(`\n🚀 Testing real commit info: ${currentAppName}`);
-
-				await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Commit Test",
-					descriptionLog: "",
-				});
-
-				// Verify updateDeployment was called with commit info
-				expect(deploymentService.updateDeployment).toHaveBeenCalled();
-				const updateCall = vi.mocked(deploymentService.updateDeployment).mock
-					.calls[0];
-
-				// Real commit info should have title and hash
-				expect(updateCall?.[1]).toHaveProperty("title");
-				expect(updateCall?.[1]).toHaveProperty("description");
-				expect(updateCall?.[1]?.description).toContain("Commit:");
-
-				console.log(
-					`✅ Real commit extracted: ${updateCall?.[1]?.title?.substring(0, 50)}...`,
-				);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should REALLY build with Dockerfile",
-			async () => {
-				const dockerfileAppName = `real-dockerfile-${Date.now()}`;
-				const dockerfileApp = createMockApplication({
-					appName: dockerfileAppName,
-					buildType: "dockerfile",
-					customGitBuildPath: "/deno",
-					dockerfile: "Dockerfile",
-				});
-				currentAppName = dockerfileAppName;
-				allTestAppNames.push(dockerfileAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					dockerfileApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					dockerfileApp as any,
-				);
-
-				console.log(`\n🚀 Testing real Dockerfile build: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Dockerfile Test",
-					descriptionLog: "",
-				});
-
-				expect(result).toBe(true);
-
-				// Verify log
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("Building");
-				expect(logContent).toContain(dockerfileAppName);
-				console.log("✅ Dockerfile build log verified");
-
-				// Verify image
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				console.log("dockerImages", dockerImages);
-				expect(dockerImages.trim()).toBe(currentAppName);
-				console.log(`✅ Docker image created: ${currentAppName}`);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-	},
-	REAL_TEST_TIMEOUT,
-);

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

@@ -28,13 +28,8 @@ const baseApp: ApplicationNested = {
 	railpackVersion: "0.2.2",
 	applicationId: "",
 	previewLabels: [],
-	createEnvFile: true,
 	herokuVersion: "",
 	giteaBranch: "",
-	buildServerId: "",
-	buildRegistryId: "",
-	buildRegistry: null,
-	args: [],
 	giteaBuildPath: "",
 	previewRequireCollaboratorPermissions: false,
 	giteaId: "",
@@ -42,9 +37,6 @@ const baseApp: ApplicationNested = {
 	giteaRepository: "",
 	cleanCache: false,
 	watchPaths: [],
-	rollbackRegistryId: "",
-	rollbackRegistry: null,
-	deployments: [],
 	enableSubmodules: false,
 	applicationStatus: "done",
 	triggerType: "push",
@@ -68,7 +60,6 @@ const baseApp: ApplicationNested = {
 	previewWildcard: "",
 	environment: {
 		env: "",
-		isDefault: false,
 		environmentId: "",
 		name: "",
 		createdAt: "",

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

@@ -1,7 +1,4 @@
-import {
-	prepareEnvironmentVariables,
-	prepareEnvironmentVariablesForShell,
-} from "@dokploy/server/index";
+import { prepareEnvironmentVariables } from "@dokploy/server/index";
 import { describe, expect, it } from "vitest";
 
 const projectEnv = `
@@ -335,310 +332,4 @@ IS_DEV=\${{environment.DEVELOPMENT}}
 			"IS_DEV=0",
 		]);
 	});
-
-	it("handles environment variables with single quotes in values", () => {
-		const envWithSingleQuotes = `
-ENV_VARIABLE='ENVITONME'NT'
-ANOTHER_VAR='value with 'quotes' inside'
-SIMPLE_VAR=no-quotes
-`;
-
-		const serviceWithSingleQuotes = `
-TEST_VAR=\${{environment.ENV_VARIABLE}}
-ANOTHER_TEST=\${{environment.ANOTHER_VAR}}
-SIMPLE=\${{environment.SIMPLE_VAR}}
-`;
-
-		const resolved = prepareEnvironmentVariables(
-			serviceWithSingleQuotes,
-			"",
-			envWithSingleQuotes,
-		);
-
-		expect(resolved).toEqual([
-			"TEST_VAR=ENVITONME'NT",
-			"ANOTHER_TEST=value with 'quotes' inside",
-			"SIMPLE=no-quotes",
-		]);
-	});
-});
-
-describe("prepareEnvironmentVariablesForShell (shell escaping)", () => {
-	it("escapes single quotes in environment variable values", () => {
-		const serviceEnv = `
-ENV_VARIABLE='ENVITONME'NT'
-ANOTHER_VAR='value with 'quotes' inside'
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote should wrap these in double quotes
-		expect(resolved).toEqual([
-			`"ENV_VARIABLE=ENVITONME'NT"`,
-			`"ANOTHER_VAR=value with 'quotes' inside"`,
-		]);
-	});
-
-	it("escapes double quotes in environment variable values", () => {
-		const serviceEnv = `
-MESSAGE="Hello "World""
-QUOTED_PATH="/path/to/"file""
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote wraps in single quotes when there are double quotes inside
-		expect(resolved).toEqual([
-			`'MESSAGE=Hello "World"'`,
-			`'QUOTED_PATH=/path/to/"file"'`,
-		]);
-	});
-
-	it("escapes dollar signs in environment variable values", () => {
-		const serviceEnv = `
-PRICE=$100
-VARIABLE=$HOME/path
-TEMPLATE=Hello $USER
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// Dollar signs should be escaped to prevent variable expansion
-		for (const env of resolved) {
-			expect(env).toContain("$");
-		}
-	});
-
-	it("escapes backticks in environment variable values", () => {
-		const serviceEnv = `
-COMMAND=\`echo "test"\`
-NESTED=value with \`backticks\` inside
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// Backticks are escaped/removed by dotenv parsing, but values should be safely quoted
-		expect(resolved.length).toBe(2);
-		expect(resolved[0]).toContain("COMMAND");
-		expect(resolved[1]).toContain("NESTED");
-	});
-
-	it("handles environment variables with spaces", () => {
-		const serviceEnv = `
-FULL_NAME="John Doe"
-MESSAGE='Hello World'
-SENTENCE=This is a test
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote uses single quotes for strings with spaces
-		expect(resolved).toEqual([
-			`'FULL_NAME=John Doe'`,
-			`'MESSAGE=Hello World'`,
-			`'SENTENCE=This is a test'`,
-		]);
-	});
-
-	it("handles environment variables with backslashes", () => {
-		const serviceEnv = `
-WINDOWS_PATH=C:\\Users\\Documents
-ESCAPED=value\\with\\backslashes
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// Backslashes should be properly escaped
-		expect(resolved.length).toBe(2);
-		for (const env of resolved) {
-			expect(env).toContain("\\");
-		}
-	});
-
-	it("handles simple environment variables without special characters", () => {
-		const serviceEnv = `
-NODE_ENV=production
-PORT=3000
-DEBUG=true
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote escapes the = sign in some cases
-		expect(resolved).toEqual([
-			"NODE_ENV\\=production",
-			"PORT\\=3000",
-			"DEBUG\\=true",
-		]);
-	});
-
-	it("handles environment variables with mixed special characters", () => {
-		const serviceEnv = `
-COMPLEX='value with "double" and 'single' quotes'
-BASH_COMMAND=echo "$HOME" && echo 'test'
-WEIRD=\`echo "$VAR"\` with 'quotes' and "more"
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// All should be escaped, none should throw errors
-		expect(resolved.length).toBe(3);
-		// Verify each can be safely used in shell
-		for (const env of resolved) {
-			expect(typeof env).toBe("string");
-			expect(env.length).toBeGreaterThan(0);
-		}
-	});
-
-	it("handles environment variables with newlines", () => {
-		const serviceEnv = `
-MULTILINE="line1
-line2
-line3"
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(1);
-		expect(resolved[0]).toContain("MULTILINE");
-	});
-
-	it("handles empty environment variable values", () => {
-		const serviceEnv = `
-EMPTY=
-EMPTY_QUOTED=""
-EMPTY_SINGLE=''
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote escapes the = sign for empty values
-		expect(resolved).toEqual([
-			"EMPTY\\=",
-			"EMPTY_QUOTED\\=",
-			"EMPTY_SINGLE\\=",
-		]);
-	});
-
-	it("handles environment variables with equals signs in values", () => {
-		const serviceEnv = `
-EQUATION=a=b+c
-CONNECTION_STRING=user=admin;password=test
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(2);
-		expect(resolved[0]).toContain("EQUATION");
-		expect(resolved[1]).toContain("CONNECTION_STRING");
-	});
-
-	it("resolves and escapes environment variables together", () => {
-		const projectEnv = `
-BASE_URL=https://example.com
-API_KEY='secret-key-with-quotes'
-`;
-
-		const environmentEnv = `
-ENV_NAME=production
-DB_PASS='pa$$word'
-`;
-
-		const serviceEnv = `
-FULL_URL=\${{project.BASE_URL}}/api
-AUTH_KEY=\${{project.API_KEY}}
-ENVIRONMENT=\${{environment.ENV_NAME}}
-DB_PASSWORD=\${{environment.DB_PASS}}
-CUSTOM='value with 'quotes' inside'
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(
-			serviceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(resolved.length).toBe(5);
-		// All resolved values should be properly escaped
-		for (const env of resolved) {
-			expect(typeof env).toBe("string");
-		}
-	});
-
-	it("handles environment variables with semicolons and ampersands", () => {
-		const serviceEnv = `
-COMMAND=echo "test" && echo "test2"
-MULTIPLE=cmd1; cmd2; cmd3
-URL_WITH_PARAMS=https://example.com?a=1&b=2&c=3
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		// These should be safely escaped to prevent command injection
-		for (const env of resolved) {
-			expect(typeof env).toBe("string");
-			expect(env.length).toBeGreaterThan(0);
-		}
-	});
-
-	it("handles environment variables with pipes and redirects", () => {
-		const serviceEnv = `
-PIPE_COMMAND=cat file | grep test
-REDIRECT=echo "test" > output.txt
-BOTH=cat input.txt | grep pattern > output.txt
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		// Pipes and redirects should be safely quoted
-		expect(resolved[0]).toContain("PIPE_COMMAND");
-		expect(resolved[1]).toContain("REDIRECT");
-		expect(resolved[2]).toContain("BOTH");
-		// At least one should contain a pipe
-		const hasPipe = resolved.some((env) => env.includes("|"));
-		expect(hasPipe).toBe(true);
-	});
-
-	it("handles environment variables with parentheses and brackets", () => {
-		const serviceEnv = `
-MATH=(a+b)*c
-ARRAY=[1,2,3]
-JSON={"key":"value"}
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		expect(resolved[0]).toContain("(");
-		expect(resolved[1]).toContain("[");
-		expect(resolved[2]).toContain("{");
-	});
-
-	it("handles very long environment variable values", () => {
-		const longValue = "a".repeat(10000);
-		const serviceEnv = `LONG_VAR=${longValue}`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(1);
-		expect(resolved[0]).toContain("LONG_VAR");
-		expect(resolved[0]?.length).toBeGreaterThan(10000);
-	});
-
-	it("handles special unicode characters in environment variables", () => {
-		const serviceEnv = `
-EMOJI=Hello 🌍 World 🚀
-CHINESE=你好世界
-SPECIAL=café résumé naïve
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		expect(resolved[0]).toContain("🌍");
-		expect(resolved[1]).toContain("你好");
-		expect(resolved[2]).toContain("café");
-	});
 });

apps/dokploy/__test__/queues/grouped-queue.test.ts

@@ -0,0 +1,809 @@
+import { describe, expect, it } from "vitest";
+import { GroupedQueue } from "../../server/queues/grouped-queue-wrapper";
+
+describe("GroupedQueue", () => {
+	describe("Basic functionality", () => {
+		it("should process a single job with concurrency 1", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			await queue.add("group1", { id: "job1" });
+
+			// Wait for processing to complete
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toEqual(["job1"]);
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should process jobs in FIFO order within a group", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 20));
+				processed.push(data.id);
+			});
+
+			// Add multiple jobs to the same group
+			await Promise.all([
+				queue.add("group1", { id: "job1" }),
+				queue.add("group1", { id: "job2" }),
+				queue.add("group1", { id: "job3" }),
+			]);
+
+			// Wait for all processing
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			expect(processed).toEqual(["job1", "job2", "job3"]);
+		});
+	});
+
+	describe("Concurrency 1 with multiple groups", () => {
+		it("should process one group at a time with concurrency 1", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(1);
+			const processed: string[] = [];
+			const activeGroups: string[] = [];
+
+			queue.setHandler(async (data) => {
+				activeGroups.push(data.group);
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+				activeGroups.pop();
+			});
+
+			// Add jobs to 3 different groups
+			const promises = [
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+			];
+
+			// Check after 30ms - only one should be processing
+			await new Promise((resolve) => setTimeout(resolve, 30));
+			expect(activeGroups.length).toBeLessThanOrEqual(1);
+
+			// Wait for all to complete
+			await Promise.all(promises);
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			expect(processed).toHaveLength(3);
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should process groups sequentially with concurrency 1", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(1);
+			const processingOrder: string[] = [];
+			const startTimes: Map<string, number> = new Map();
+			const endTimes: Map<string, number> = new Map();
+
+			queue.setHandler(async (data) => {
+				startTimes.set(data.id, Date.now());
+				processingOrder.push(`start-${data.group}`);
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				endTimes.set(data.id, Date.now());
+				processingOrder.push(`end-${data.group}`);
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 300));
+
+			// Verify sequential processing
+			expect(processingOrder).toEqual([
+				"start-app1",
+				"end-app1",
+				"start-app2",
+				"end-app2",
+				"start-app3",
+				"end-app3",
+			]);
+
+			// Verify jobs don't overlap
+			const job1End = endTimes.get("job1")!;
+			const job2Start = startTimes.get("job2")!;
+			const job2End = endTimes.get("job2")!;
+			const job3Start = startTimes.get("job3")!;
+
+			expect(job2Start).toBeGreaterThanOrEqual(job1End);
+			expect(job3Start).toBeGreaterThanOrEqual(job2End);
+		});
+	});
+
+	describe("Concurrency 3 with 4 groups", () => {
+		it("should process up to 3 groups simultaneously", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(3);
+			const activeGroups = new Set<string>();
+			const maxConcurrent = { value: 0 };
+
+			queue.setHandler(async (data) => {
+				activeGroups.add(data.group);
+				maxConcurrent.value = Math.max(maxConcurrent.value, activeGroups.size);
+
+				await new Promise((resolve) => setTimeout(resolve, 100));
+
+				activeGroups.delete(data.group);
+			});
+
+			// Add 4 jobs to different groups
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+				queue.add("app4", { id: "job4", group: "app4" }),
+			]);
+
+			// Check during processing
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Should have processed 3 groups simultaneously
+			expect(maxConcurrent.value).toBe(3);
+			expect(activeGroups.size).toBeLessThanOrEqual(3);
+
+			// Wait for all to complete
+			await new Promise((resolve) => setTimeout(resolve, 200));
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should process 4th group after one of the first 3 completes", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(3);
+			const processingOrder: string[] = [];
+
+			queue.setHandler(async (data) => {
+				processingOrder.push(`start-${data.group}`);
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processingOrder.push(`end-${data.group}`);
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+				queue.add("app4", { id: "job4", group: "app4" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 250));
+
+			// First 3 should start together
+			const firstThree = processingOrder.slice(0, 3);
+			expect(firstThree).toContain("start-app1");
+			expect(firstThree).toContain("start-app2");
+			expect(firstThree).toContain("start-app3");
+
+			// 4th should start after one completes
+			const app4StartIndex = processingOrder.indexOf("start-app4");
+			expect(app4StartIndex).toBeGreaterThan(0);
+			expect(app4StartIndex).toBeLessThan(processingOrder.length - 1);
+		});
+	});
+
+	describe("Multiple jobs per group", () => {
+		it("should process jobs sequentially within same group", async () => {
+			const queue = new GroupedQueue<{ id: string }>(3);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 30));
+				processed.push(data.id);
+			});
+
+			// Add 3 jobs to same group
+			await Promise.all([
+				queue.add("app1", { id: "job1" }),
+				queue.add("app1", { id: "job2" }),
+				queue.add("app1", { id: "job3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			// Should process in order
+			expect(processed).toEqual(["job1", "job2", "job3"]);
+		});
+
+		it("should process multiple groups with multiple jobs each", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(2);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 20));
+				processed.push(`${data.group}-${data.id}`);
+			});
+
+			// Add jobs to 2 groups, 2 jobs each
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app1", { id: "job2", group: "app1" }),
+				queue.add("app2", { id: "job1", group: "app2" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			// Should process both groups, jobs within each group in order
+			expect(processed).toHaveLength(4);
+			expect(processed.filter((p) => p.startsWith("app1"))).toEqual([
+				"app1-job1",
+				"app1-job2",
+			]);
+			expect(processed.filter((p) => p.startsWith("app2"))).toEqual([
+				"app2-job1",
+				"app2-job2",
+			]);
+		});
+	});
+
+	describe("Error handling", () => {
+		it("should reject job on handler error", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+
+			queue.setHandler(async () => {
+				throw new Error("Test error");
+			});
+
+			await expect(queue.add("group1", { id: "job1" })).rejects.toThrow(
+				"Test error",
+			);
+		});
+
+		it("should continue processing other jobs after error", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				if (data.id === "job2") {
+					throw new Error("Job 2 error");
+				}
+				processed.push(data.id);
+			});
+
+			await expect(
+				queue.add("group1", { id: "job1" }),
+			).resolves.toBeUndefined();
+			await expect(queue.add("group1", { id: "job2" })).rejects.toThrow();
+			await expect(
+				queue.add("group1", { id: "job3" }),
+			).resolves.toBeUndefined();
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toEqual(["job1", "job3"]);
+		});
+	});
+
+	describe("Queue management", () => {
+		it("should clear group tasks", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs without awaiting - they'll start processing
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Clear immediately - job1 might be processing, but job2 should be cleared
+			queue.clearGroup("group1");
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue cleared");
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// Job1 might have processed, but job2 should not
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+
+		it("should return correct group length", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+
+			queue.setHandler(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add jobs without awaiting - check length immediately
+			const promises = [
+				queue.add("group1", { id: "job1" }),
+				queue.add("group1", { id: "job2" }),
+				queue.add("group1", { id: "job3" }),
+			];
+
+			// Check length immediately - at least some should be pending
+			// (job1 might be processing, but job2 and job3 should be pending)
+			const length = queue.getGroupLength("group1");
+			expect(length).toBeGreaterThanOrEqual(0);
+
+			// Wait for all to complete
+			await Promise.all(promises);
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// After processing should be 0
+			expect(queue.getGroupLength("group1")).toBe(0);
+		});
+
+		it("should close queue and reject pending tasks", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+
+			queue.setHandler(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add first job and wait a bit to ensure it starts processing
+			const job1Promise = queue.add("group1", { id: "job1" });
+			// Add second job without awaiting
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Wait a tiny bit to ensure job2 is queued
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Close queue - job2 should be rejected
+			await queue.close();
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue closed");
+			}
+		});
+	});
+
+	describe("Concurrency edge cases", () => {
+		it("should handle concurrency 1 with 1 app correctly", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			await queue.add("app1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toEqual(["job1"]);
+			expect(queue.getActiveGroupsCount()).toBe(0);
+		});
+
+		it("should handle concurrency 1 with 3 apps correctly", async () => {
+			const queue = new GroupedQueue<{ id: string; app: string }>(1);
+			const processingTimes: Map<string, { start: number; end: number }> =
+				new Map();
+
+			queue.setHandler(async (data) => {
+				const start = Date.now();
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				const end = Date.now();
+				processingTimes.set(data.app, { start, end });
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", app: "app1" }),
+				queue.add("app2", { id: "job2", app: "app2" }),
+				queue.add("app3", { id: "job3", app: "app3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 300));
+
+			// Verify sequential processing
+			const app1 = processingTimes.get("app1")!;
+			const app2 = processingTimes.get("app2")!;
+			const app3 = processingTimes.get("app3")!;
+
+			expect(app2.start).toBeGreaterThanOrEqual(app1.end);
+			expect(app3.start).toBeGreaterThanOrEqual(app2.end);
+			expect(queue.getActiveGroupsCount()).toBe(0);
+		});
+
+		it("should handle 4 apps with concurrency 3 correctly", async () => {
+			const queue = new GroupedQueue<{ id: string; app: string }>(3);
+			const concurrentCounts: number[] = [];
+
+			queue.setHandler(async () => {
+				// Track concurrent processing
+				const interval = setInterval(() => {
+					concurrentCounts.push(queue.getActiveGroupsCount());
+				}, 10);
+
+				await new Promise((resolve) => setTimeout(resolve, 100));
+
+				clearInterval(interval);
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", app: "app1" }),
+				queue.add("app2", { id: "job2", app: "app2" }),
+				queue.add("app3", { id: "job3", app: "app3" }),
+				queue.add("app4", { id: "job4", app: "app4" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			// Should never exceed concurrency of 3
+			const maxConcurrent = Math.max(...concurrentCounts);
+			expect(maxConcurrent).toBeLessThanOrEqual(3);
+			expect(queue.getActiveGroupsCount()).toBe(0);
+		});
+	});
+
+	describe("Idle state", () => {
+		it("should be idle when no jobs are processing", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should not be idle while processing", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			let isIdleDuringProcessing = false;
+
+			queue.setHandler(async () => {
+				isIdleDuringProcessing = queue.isIdle();
+				await new Promise((resolve) => setTimeout(resolve, 50));
+			});
+
+			await queue.add("group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 30));
+
+			expect(isIdleDuringProcessing).toBe(false);
+			expect(queue.isIdle()).toBe(true);
+		});
+	});
+
+	describe("Concurrency management", () => {
+		it("should get current concurrency", () => {
+			const queue1 = new GroupedQueue<{ id: string }>(1);
+			const queue2 = new GroupedQueue<{ id: string }>(5);
+			const queue3 = new GroupedQueue<{ id: string }>(10);
+
+			expect(queue1.getConcurrency()).toBe(1);
+			expect(queue2.getConcurrency()).toBe(5);
+			expect(queue3.getConcurrency()).toBe(10);
+		});
+
+		it("should set concurrency dynamically", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			expect(queue.getConcurrency()).toBe(1);
+
+			queue.setConcurrency(3);
+			expect(queue.getConcurrency()).toBe(3);
+
+			queue.setConcurrency(5);
+			expect(queue.getConcurrency()).toBe(5);
+		});
+
+		it("should throw error when setting concurrency less than 1", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			expect(() => queue.setConcurrency(0)).toThrow(
+				"Concurrency must be at least 1",
+			);
+			expect(() => queue.setConcurrency(-1)).toThrow(
+				"Concurrency must be at least 1",
+			);
+		});
+
+		it("should process next group when concurrency increases", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs to 3 different groups with concurrency 1
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group2", { id: "job2" });
+			const job3Promise = queue.add("group3", { id: "job3" });
+
+			// Wait a bit to ensure job1 starts processing
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Increase concurrency to 3 - should allow group2 and group3 to start
+			queue.setConcurrency(3);
+
+			// Wait for all to complete
+			await Promise.all([job1Promise, job2Promise, job3Promise]);
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toHaveLength(3);
+			expect(processed).toContain("job1");
+			expect(processed).toContain("job2");
+			expect(processed).toContain("job3");
+		});
+	});
+
+	describe("Clear all pending tasks", () => {
+		it("should clear all pending tasks across all groups", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processed.push(data.id);
+			});
+
+			// Add multiple jobs to different groups
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+			const job3Promise = queue.add("group2", { id: "job3" });
+			const job4Promise = queue.add("group2", { id: "job4" });
+			const job5Promise = queue.add("group3", { id: "job5" });
+
+			// Wait a bit to ensure job1 starts processing
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Clear all pending tasks
+			const clearedCount = queue.clearAllPendingTasks();
+
+			// Should have cleared 4 pending tasks (job2, job3, job4, job5)
+			// job1 is processing so it's not in the queue anymore
+			expect(clearedCount).toBe(4);
+
+			// Handle all promises
+			const results = await Promise.allSettled([
+				job1Promise,
+				job2Promise,
+				job3Promise,
+				job4Promise,
+				job5Promise,
+			]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// All pending jobs should be rejected
+			for (let i = 1; i < results.length; i++) {
+				const result = results[i];
+				if (result && result.status === "rejected") {
+					expect(result.reason.message).toBe(
+						"Concurrency changed - queue cleared",
+					);
+				}
+			}
+
+			// Wait for job1 to complete
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// Only job1 should have processed
+			expect(processed).toHaveLength(1);
+			expect(processed).toContain("job1");
+		});
+
+		it("should not clear tasks that are currently processing", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processed.push(data.id);
+			});
+
+			// Add jobs - first one will start processing immediately
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Wait to ensure job1 is processing (it's been shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 20));
+
+			// Clear all pending - should only clear job2, not job1
+			// job1 is already executing (not in tasks array)
+			const clearedCount = queue.clearAllPendingTasks();
+
+			expect(clearedCount).toBe(1);
+
+			// Handle all promises
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Only job1 should have processed
+			expect(processed).toHaveLength(1);
+			expect(processed).toContain("job1");
+		});
+
+		it("should return 0 when no pending tasks", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const clearedCount = queue.clearAllPendingTasks();
+			expect(clearedCount).toBe(0);
+		});
+
+		it("should clear tasks from multiple groups", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs to multiple groups
+			const promises = [
+				queue.add("group1", { id: "job1" }),
+				queue.add("group1", { id: "job2" }),
+				queue.add("group2", { id: "job3" }),
+				queue.add("group2", { id: "job4" }),
+				queue.add("group3", { id: "job5" }),
+			];
+
+			// Wait a bit for first job to start (it gets shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Clear all pending
+			const clearedCount = queue.clearAllPendingTasks();
+
+			// Should clear 4 tasks (job2, job3, job4, job5)
+			// job1 is processing so it's not in the queue anymore
+			expect(clearedCount).toBe(4);
+
+			// Handle all promises
+			const results = await Promise.allSettled(promises);
+
+			// job1 should succeed
+			const job1Result = results[0];
+			expect(job1Result?.status).toBe("fulfilled");
+
+			// Others should be rejected
+			for (let i = 1; i < results.length; i++) {
+				const result = results[i];
+				if (result && result.status === "rejected") {
+					expect(result.reason.message).toBe(
+						"Concurrency changed - queue cleared",
+					);
+				}
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// Only first job should process
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+	});
+
+	describe("Concurrency change with pending tasks", () => {
+		it("should clear pending tasks when concurrency changes", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs with concurrency 1
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+			const job3Promise = queue.add("group2", { id: "job3" });
+
+			// Wait for job1 to start processing (it gets shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency - should clear pending tasks via clearAllPendingTasks
+			queue.setConcurrency(3);
+
+			// Handle all promises
+			const results = await Promise.allSettled([
+				job1Promise,
+				job2Promise,
+				job3Promise,
+			]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// Pending jobs should be rejected (job2 and job3 were in queue when cleared)
+			const job2Result = results[1];
+			const job3Result = results[2];
+
+			// At least one of the pending jobs should be rejected
+			const rejectedCount = [job2Result, job3Result].filter(
+				(r) => r && r.status === "rejected",
+			).length;
+			expect(rejectedCount).toBeGreaterThan(0);
+
+			// Verify rejection messages
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+			if (job3Result && job3Result.status === "rejected") {
+				expect(job3Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// job1 should have processed, others may or may not depending on timing
+			expect(processed.length).toBeGreaterThanOrEqual(1);
+			expect(processed).toContain("job1");
+		});
+
+		it("should allow new jobs after concurrency change", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add job with concurrency 1
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Wait for job1 to start (it gets shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency to 3 - this calls clearAllPendingTasks internally
+			queue.setConcurrency(3);
+
+			// Handle all promises
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// job2 should be rejected (it was in queue when cleared)
+			const job2Result = results[1];
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			} else {
+				// If job2 wasn't rejected, it means it started processing before clear
+				// This is acceptable as it's a timing issue
+			}
+
+			// Add new jobs after concurrency change - they should work
+			await Promise.all([
+				queue.add("group2", { id: "job3" }),
+				queue.add("group3", { id: "job4" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// job1, job3, and job4 should have processed
+			expect(processed.length).toBeGreaterThanOrEqual(2);
+			expect(processed).toContain("job1");
+		});
+	});
+});

apps/dokploy/__test__/queues/queue-manager.test.ts

@@ -0,0 +1,313 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import { QueueManager } from "../../server/queues/queue-manager";
+
+describe("QueueManager", () => {
+	let manager: QueueManager;
+
+	beforeEach(() => {
+		manager = new QueueManager();
+	});
+
+	describe("Queue creation and retrieval", () => {
+		it("should create a queue with default concurrency 1", () => {
+			const queue = manager.getQueue("test-queue");
+			expect(queue.getConcurrency()).toBe(1);
+		});
+
+		it("should create a queue with custom concurrency", () => {
+			const queue = manager.getQueue("test-queue", 5);
+			expect(queue.getConcurrency()).toBe(5);
+		});
+
+		it("should return the same queue instance for the same name", () => {
+			const queue1 = manager.getQueue("test-queue", 3);
+			const queue2 = manager.getQueue("test-queue", 5);
+			expect(queue1).toBe(queue2);
+			// Concurrency should remain as first set
+			expect(queue1.getConcurrency()).toBe(3);
+		});
+
+		it("should create different queues for different names", () => {
+			const queue1 = manager.getQueue("queue1", 2);
+			const queue2 = manager.getQueue("queue2", 4);
+			expect(queue1).not.toBe(queue2);
+			expect(queue1.getConcurrency()).toBe(2);
+			expect(queue2.getConcurrency()).toBe(4);
+		});
+	});
+
+	describe("Handler management", () => {
+		it("should set handler for a queue", async () => {
+			const processed: string[] = [];
+
+			manager.setHandler("test-queue", async (data: { id: string }) => {
+				processed.push(data.id);
+			});
+
+			await manager.add("test-queue", "group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(processed).toEqual(["job1"]);
+		});
+
+		it("should handle different handlers for different queues", async () => {
+			const queue1Processed: string[] = [];
+			const queue2Processed: string[] = [];
+
+			manager.setHandler("queue1", async (data: { id: string }) => {
+				queue1Processed.push(data.id);
+			});
+
+			manager.setHandler("queue2", async (data: { id: string }) => {
+				queue2Processed.push(data.id);
+			});
+
+			await Promise.all([
+				manager.add("queue1", "group1", { id: "job1" }),
+				manager.add("queue2", "group1", { id: "job2" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(queue1Processed).toEqual(["job1"]);
+			expect(queue2Processed).toEqual(["job2"]);
+		});
+	});
+
+	describe("Job management", () => {
+		it("should add jobs to correct queue and group", async () => {
+			const processed: string[] = [];
+
+			manager.setHandler("test-queue", async (data: { id: string }) => {
+				processed.push(data.id);
+			});
+
+			await manager.add("test-queue", "group1", { id: "job1" });
+			await manager.add("test-queue", "group2", { id: "job2" });
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(processed).toContain("job1");
+			expect(processed).toContain("job2");
+		});
+
+		it("should create queue with concurrency when adding job", async () => {
+			const processed: string[] = [];
+
+			// Create queue with concurrency first (without handler)
+			manager.getQueue("new-queue", 3);
+
+			// Set handler
+			manager.setHandler("new-queue", async (data: { id: string }) => {
+				processed.push(data.id);
+			});
+
+			// Now add job - it should process
+			await manager.add("new-queue", "group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const queue = manager.getQueue("new-queue");
+			expect(queue.getConcurrency()).toBe(3);
+			expect(processed).toEqual(["job1"]);
+		});
+	});
+
+	describe("Queue operations", () => {
+		it("should clear group in specific queue", async () => {
+			const processed: string[] = [];
+
+			manager.setHandler("test-queue", async (data: { id: string }) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processed.push(data.id);
+			});
+
+			// Add jobs but don't await - they'll start processing
+			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
+			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
+
+			// Clear immediately - job1 might be processing, but job2 should be cleared
+			manager.clearGroup("test-queue", "group1");
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue cleared");
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// Job1 might have processed, but job2 should not
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+
+		it("should get group length for specific queue", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add jobs without awaiting - check length immediately
+			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
+			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
+
+			// Check length immediately - at least one should be pending
+			// (job1 might be processing, but job2 should be pending)
+			const length = manager.getGroupLength("test-queue", "group1");
+			expect(length).toBeGreaterThanOrEqual(0);
+
+			// Wait for both to complete
+			await Promise.all([job1Promise, job2Promise]);
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(manager.getGroupLength("test-queue", "group1")).toBe(0);
+		});
+
+		it("should get total length for specific queue", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+			});
+
+			// Add jobs without awaiting - check length immediately
+			const promises = [
+				manager.add("test-queue", "group1", { id: "job1" }),
+				manager.add("test-queue", "group2", { id: "job2" }),
+				manager.add("test-queue", "group3", { id: "job3" }),
+			];
+
+			// Check length immediately - at least some should be pending
+			const length = manager.getTotalLength("test-queue");
+			expect(length).toBeGreaterThanOrEqual(0);
+
+			// Wait for all to complete
+			await Promise.all(promises);
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(manager.getTotalLength("test-queue")).toBe(0);
+		});
+
+		it("should check if queue is idle", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+			});
+
+			expect(manager.isIdle("test-queue")).toBe(true);
+
+			await manager.add("test-queue", "group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(manager.isIdle("test-queue")).toBe(true);
+		});
+	});
+
+	describe("Queue lifecycle", () => {
+		it("should close a specific queue", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add first job and wait a bit to ensure it starts processing
+			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
+			// Add second job without awaiting
+			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
+
+			// Wait a tiny bit to ensure job2 is queued
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Close queue - job2 should be rejected
+			await manager.closeQueue("test-queue");
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue closed");
+			}
+
+			expect(manager.getQueueNames()).not.toContain("test-queue");
+		});
+
+		it("should close all queues", async () => {
+			manager.setHandler("queue1", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+			manager.setHandler("queue2", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			await manager.add("queue1", "group1", { id: "job1" });
+			await manager.add("queue2", "group1", { id: "job2" });
+
+			await manager.closeAll();
+
+			expect(manager.getQueueNames()).toHaveLength(0);
+		});
+
+		it("should get all queue names", () => {
+			manager.getQueue("queue1");
+			manager.getQueue("queue2");
+			manager.getQueue("queue3");
+
+			const names = manager.getQueueNames();
+			expect(names).toContain("queue1");
+			expect(names).toContain("queue2");
+			expect(names).toContain("queue3");
+			expect(names).toHaveLength(3);
+		});
+	});
+
+	describe("Multiple queues with different concurrency", () => {
+		it("should handle multiple queues with different concurrency settings", async () => {
+			const queue1Processed: string[] = [];
+			const queue2Processed: string[] = [];
+
+			// Create queues with specific concurrency FIRST, before setting handlers
+			const queue1 = manager.getQueue("queue1", 1);
+			const queue2 = manager.getQueue("queue2", 3);
+
+			// Verify concurrency is set correctly before proceeding
+			expect(queue1.getConcurrency()).toBe(1);
+			expect(queue2.getConcurrency()).toBe(3);
+
+			manager.setHandler("queue1", async (data: { id: string }) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				queue1Processed.push(data.id);
+			});
+
+			manager.setHandler("queue2", async (data: { id: string }) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				queue2Processed.push(data.id);
+			});
+
+			// Queue1 with concurrency 1 (sequential)
+			await Promise.all([
+				manager.add("queue1", "app1", { id: "job1" }),
+				manager.add("queue1", "app2", { id: "job2" }),
+			]);
+
+			// Queue2 with concurrency 3 (parallel)
+			await Promise.all([
+				manager.add("queue2", "app1", { id: "job1" }),
+				manager.add("queue2", "app2", { id: "job2" }),
+				manager.add("queue2", "app3", { id: "job3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			expect(queue1Processed).toHaveLength(2);
+			expect(queue2Processed).toHaveLength(3);
+
+			// Verify concurrency settings are still correct
+			expect(manager.getQueue("queue1").getConcurrency()).toBe(1);
+			expect(manager.getQueue("queue2").getConcurrency()).toBe(3);
+		});
+	});
+});

apps/dokploy/__test__/queues/queue-setup.test.ts

@@ -0,0 +1,250 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import type { DeploymentJob } from "../../server/queues/queue-types";
+import {
+	getConcurrency,
+	myQueue,
+	setConcurrency,
+} from "../../server/queues/queueSetup";
+
+describe("queueSetup", () => {
+	beforeEach(() => {
+		// Reset concurrency to default (1) before each test
+		setConcurrency(1);
+		// Clear all pending tasks
+		myQueue.clearAllPendingTasks();
+	});
+
+	describe("getConcurrency", () => {
+		it("should return default concurrency of 1", () => {
+			const concurrency = getConcurrency();
+			expect(concurrency).toBe(1);
+		});
+
+		it("should return current concurrency after setting it", () => {
+			setConcurrency(3);
+			expect(getConcurrency()).toBe(3);
+
+			setConcurrency(5);
+			expect(getConcurrency()).toBe(5);
+		});
+	});
+
+	describe("setConcurrency", () => {
+		it("should set concurrency successfully", () => {
+			const clearedCount = setConcurrency(3);
+			expect(getConcurrency()).toBe(3);
+			expect(clearedCount).toBe(0); // No pending tasks to clear
+		});
+
+		it("should throw error for concurrency less than 1", () => {
+			expect(() => setConcurrency(0)).toThrow("Concurrency must be at least 1");
+			expect(() => setConcurrency(-1)).toThrow(
+				"Concurrency must be at least 1",
+			);
+		});
+
+		it("should return 0 cleared builds when no pending tasks", () => {
+			const clearedCount = setConcurrency(2);
+			expect(clearedCount).toBe(0);
+			expect(getConcurrency()).toBe(2);
+		});
+
+		it("should clear pending builds when concurrency changes", async () => {
+			const processed: string[] = [];
+
+			// Set handler
+			myQueue.setHandler(async (job: DeploymentJob) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				if (job.applicationType === "application") {
+					processed.push(job.applicationId);
+				} else if (job.applicationType === "compose") {
+					processed.push(job.composeId);
+				} else if (job.applicationType === "application-preview") {
+					processed.push(job.previewDeploymentId);
+				}
+			});
+
+			// Add jobs to different groups
+			const job1: DeploymentJob = {
+				applicationId: "app1",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job2: DeploymentJob = {
+				applicationId: "app2",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job3: DeploymentJob = {
+				applicationId: "app3",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+
+			// Add jobs without awaiting
+			const promise1 = myQueue.add("application:app1", job1);
+			const promise2 = myQueue.add("application:app2", job2);
+			const promise3 = myQueue.add("application:app3", job3);
+
+			// Wait for first job to start processing
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency - should clear pending builds
+			const clearedCount = setConcurrency(3);
+
+			// Should have cleared 2 pending builds (app2 and app3)
+			expect(clearedCount).toBe(2);
+			expect(getConcurrency()).toBe(3);
+
+			// Handle all promises - use allSettled to handle both resolved and rejected
+			const results = await Promise.allSettled([promise1, promise2, promise3]);
+
+			// job1 should succeed (it was processing), others should be rejected
+			const job1Result = results[0];
+			if (job1Result.status === "fulfilled") {
+				// Job1 completed successfully
+			}
+
+			// Pending jobs should be rejected
+			const job2Result = results[1];
+			const job3Result = results[2];
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+			if (job3Result && job3Result.status === "rejected") {
+				expect(job3Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// Only first job should have processed
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+
+		it("should not clear builds when concurrency doesn't change", async () => {
+			// Set to 2
+			setConcurrency(2);
+			expect(getConcurrency()).toBe(2);
+
+			// Set to 2 again - should not clear anything
+			const clearedCount = setConcurrency(2);
+			expect(clearedCount).toBe(0);
+			expect(getConcurrency()).toBe(2);
+		});
+
+		it("should allow new jobs after concurrency change", async () => {
+			const processed: string[] = [];
+
+			myQueue.setHandler(async (job: DeploymentJob) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				if (job.applicationType === "application") {
+					processed.push(job.applicationId);
+				}
+			});
+
+			// Add job with concurrency 1
+			const job1: DeploymentJob = {
+				applicationId: "app1",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job2: DeploymentJob = {
+				applicationId: "app2",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+
+			const promise1 = myQueue.add("application:app1", job1);
+			const promise2 = myQueue.add("application:app2", job2);
+
+			// Wait for first job to start
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency to 3
+			const clearedCount = setConcurrency(3);
+			expect(clearedCount).toBe(1); // app2 should be cleared
+
+			// Handle all promises - use allSettled to handle both resolved and rejected
+			const results = await Promise.allSettled([promise1, promise2]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			if (job1Result.status === "fulfilled") {
+				// Job1 completed successfully
+			}
+
+			// app2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			// Add new jobs after concurrency change - they should work
+			const job3: DeploymentJob = {
+				applicationId: "app3",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job4: DeploymentJob = {
+				applicationId: "app4",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+
+			await Promise.all([
+				myQueue.add("application:app3", job3),
+				myQueue.add("application:app4", job4),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// app1, app3, and app4 should have processed
+			expect(processed.length).toBeGreaterThanOrEqual(2);
+			expect(processed).toContain("app1");
+		});
+
+		it("should handle multiple concurrency changes correctly", () => {
+			// Start at 1
+			expect(getConcurrency()).toBe(1);
+
+			// Change to 3
+			setConcurrency(3);
+			expect(getConcurrency()).toBe(3);
+
+			// Change to 5
+			setConcurrency(5);
+			expect(getConcurrency()).toBe(5);
+
+			// Change back to 1
+			setConcurrency(1);
+			expect(getConcurrency()).toBe(1);
+		});
+	});
+});

apps/dokploy/__test__/requests/request.test.ts

@@ -54,22 +54,4 @@ describe("processLogs", () => {
 		const result = parseRawConfig(entryWithWhitespace);
 		expect(result.data).toHaveLength(2);
 	});
-
-	it("should filter out Dokploy dashboard requests", () => {
-		const dokployDashboardEntry = `{"ClientAddr":"172.71.187.131:9485","ClientHost":"172.71.187.131","ClientPort":"9485","ClientUsername":"-","DownstreamContentSize":14550,"DownstreamStatus":200,"Duration":57681682,"OriginContentSize":14550,"OriginDuration":57612242,"OriginStatus":200,"Overhead":69440,"RequestAddr":"hostinger.dokploy.com","RequestContentSize":0,"RequestCount":20142,"RequestHost":"hostinger.dokploy.com","RequestMethod":"GET","RequestPath":"/_next/data/cb_zzI4Rp9G7Q7djrFKh0/en/dashboard/traefik.json","RequestPort":"-","RequestProtocol":"HTTP/2.0","RequestScheme":"https","RetryAttempts":0,"RouterName":"dokploy-router-app-secure@file","ServiceAddr":"dokploy:3000","ServiceName":"dokploy-service-app@file","ServiceURL":"http://dokploy:3000","StartLocal":"2025-12-10T05:10:41.957755949Z","StartUTC":"2025-12-10T05:10:41.957755949Z","TLSCipher":"TLS_AES_128_GCM_SHA256","TLSVersion":"1.3","entryPointName":"websecure","level":"info","msg":"","time":"2025-12-10T05:10:42Z"}`;
-
-		// Test with only Dokploy dashboard entry - should be filtered out
-		const resultOnlyDokploy = parseRawConfig(dokployDashboardEntry);
-		expect(resultOnlyDokploy.data).toHaveLength(0);
-		expect(resultOnlyDokploy.totalCount).toBe(0);
-
-		// Test with mixed entries - Dokploy should be filtered, others should remain
-		const mixedEntries = `${dokployDashboardEntry}\n${sampleLogEntry}`;
-		const resultMixed = parseRawConfig(mixedEntries);
-		expect(resultMixed.data).toHaveLength(1);
-		expect(resultMixed.totalCount).toBe(1);
-		expect(resultMixed.data[0]?.ServiceName).not.toBe(
-			"dokploy-service-app@file",
-		);
-	});
 });

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

@@ -1,13 +1,10 @@
-import type { ApplicationNested } from "@dokploy/server/utils/builders";
-import { mechanizeDockerContainer } from "@dokploy/server/utils/builders";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+import type { ApplicationNested } from "@dokploy/server/utils/builders";
+import { mechanizeDockerContainer } from "@dokploy/server/utils/builders";
+
 type MockCreateServiceOptions = {
-	TaskTemplate?: {
-		ContainerSpec?: {
-			StopGracePeriod?: number;
-		};
-	};
+	StopGracePeriod?: number;
 	[key: string]: unknown;
 };
 
@@ -85,10 +82,8 @@ describe("mechanizeDockerContainer", () => {
 			throw new Error("createServiceMock should have been called once");
 		}
 		const [settings] = call;
-		expect(settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(0);
-		expect(typeof settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(
-			"number",
-		);
+		expect(settings.StopGracePeriod).toBe(0);
+		expect(typeof settings.StopGracePeriod).toBe("number");
 	});
 
 	it("omits StopGracePeriod when stopGracePeriodSwarm is null", async () => {
@@ -102,8 +97,6 @@ describe("mechanizeDockerContainer", () => {
 			throw new Error("createServiceMock should have been called once");
 		}
 		const [settings] = call;
-		expect(settings.TaskTemplate?.ContainerSpec).not.toHaveProperty(
-			"StopGracePeriod",
-		);
+		expect(settings).not.toHaveProperty("StopGracePeriod");
 	});
 });

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

@@ -161,50 +161,6 @@ describe("helpers functions", () => {
 		});
 	});
 
-	describe("Empty string variables", () => {
-		it("should replace variables with empty string values correctly", () => {
-			const variables = {
-				smtp_username: "",
-				smtp_password: "",
-				non_empty: "value",
-			};
-
-			const result1 = processValue("${smtp_username}", variables, mockSchema);
-			expect(result1).toBe("");
-
-			const result2 = processValue("${smtp_password}", variables, mockSchema);
-			expect(result2).toBe("");
-
-			const result3 = processValue("${non_empty}", variables, mockSchema);
-			expect(result3).toBe("value");
-		});
-
-		it("should not replace undefined variables", () => {
-			const variables = {
-				defined_var: "",
-			};
-
-			const result = processValue("${undefined_var}", variables, mockSchema);
-			expect(result).toBe("${undefined_var}");
-		});
-
-		it("should handle mixed empty and non-empty variables in template", () => {
-			const variables = {
-				smtp_address: "smtp.example.com",
-				smtp_port: "2525",
-				smtp_username: "",
-				smtp_password: "",
-			};
-
-			const template =
-				"SMTP_ADDRESS=${smtp_address} SMTP_PORT=${smtp_port} SMTP_USERNAME=${smtp_username} SMTP_PASSWORD=${smtp_password}";
-			const result = processValue(template, variables, mockSchema);
-			expect(result).toBe(
-				"SMTP_ADDRESS=smtp.example.com SMTP_PORT=2525 SMTP_USERNAME= SMTP_PASSWORD=",
-			);
-		});
-	});
-
 	describe("${jwt}", () => {
 		it("should generate a JWT string", () => {
 			const jwt = processValue("${jwt}", {}, mockSchema);

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

@@ -5,27 +5,19 @@ vi.mock("node:fs", () => ({
 	default: fs,
 }));
 
-import type { FileConfig } from "@dokploy/server";
+import type { FileConfig, User } from "@dokploy/server";
 import {
 	createDefaultServerTraefikConfig,
 	loadOrCreateConfig,
 	updateServerTraefik,
 } from "@dokploy/server";
-import type { webServerSettings } from "@dokploy/server/db/schema";
 import { beforeEach, expect, test, vi } from "vitest";
 
-type WebServerSettings = typeof webServerSettings.$inferSelect;
-
-const baseSettings: WebServerSettings = {
-	id: "",
+const baseAdmin: User = {
 	https: false,
-	certificateType: "none",
-	host: null,
-	serverIp: null,
-	letsEncryptEmail: null,
-	sshPrivateKey: null,
-	enableDockerCleanup: false,
-	logCleanupCron: null,
+	enablePaidFeatures: false,
+	allowImpersonation: false,
+	role: "user",
 	metricsConfig: {
 		containers: {
 			refreshRate: 20,
@@ -51,8 +43,30 @@ const baseSettings: WebServerSettings = {
 	cleanupCacheApplications: false,
 	cleanupCacheOnCompose: false,
 	cleanupCacheOnPreviews: false,
-	createdAt: null,
+	createdAt: new Date(),
+	serverIp: null,
+	certificateType: "none",
+	host: null,
+	letsEncryptEmail: null,
+	sshPrivateKey: null,
+	enableDockerCleanup: false,
+	logCleanupCron: null,
+	serversQuantity: 0,
+	stripeCustomerId: "",
+	stripeSubscriptionId: "",
+	banExpires: new Date(),
+	banned: true,
+	banReason: "",
+	email: "",
+	expirationDate: "",
+	id: "",
+	isRegistered: false,
+	name: "",
+	createdAt2: new Date().toISOString(),
+	emailVerified: false,
+	image: "",
 	updatedAt: new Date(),
+	twoFactorEnabled: false,
 };
 
 beforeEach(() => {
@@ -70,7 +84,7 @@ test("Should read the configuration file", () => {
 test("Should apply redirect-to-https", () => {
 	updateServerTraefik(
 		{
-			...baseSettings,
+			...baseAdmin,
 			https: true,
 			certificateType: "letsencrypt",
 		},
@@ -85,7 +99,7 @@ test("Should apply redirect-to-https", () => {
 });
 
 test("Should change only host when no certificate", () => {
-	updateServerTraefik(baseSettings, "example.com");
+	updateServerTraefik(baseAdmin, "example.com");
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 
@@ -95,7 +109,7 @@ test("Should change only host when no certificate", () => {
 test("Should not touch config without host", () => {
 	const originalConfig: FileConfig = loadOrCreateConfig("dokploy");
 
-	updateServerTraefik(baseSettings, null);
+	updateServerTraefik(baseAdmin, null);
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 
@@ -104,14 +118,11 @@ test("Should not touch config without host", () => {
 
 test("Should remove websecure if https rollback to http", () => {
 	updateServerTraefik(
-		{ ...baseSettings, certificateType: "letsencrypt" },
+		{ ...baseAdmin, certificateType: "letsencrypt" },
 		"example.com",
 	);
 
-	updateServerTraefik(
-		{ ...baseSettings, certificateType: "none" },
-		"example.com",
-	);
+	updateServerTraefik({ ...baseAdmin, certificateType: "none" }, "example.com");
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 

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

@@ -7,20 +7,12 @@ const baseApp: ApplicationNested = {
 	rollbackActive: false,
 	applicationId: "",
 	previewLabels: [],
-	createEnvFile: true,
 	herokuVersion: "",
 	giteaRepository: "",
 	giteaOwner: "",
 	giteaBranch: "",
-	buildServerId: "",
-	buildRegistryId: "",
-	buildRegistry: null,
 	giteaBuildPath: "",
 	giteaId: "",
-	args: [],
-	rollbackRegistryId: "",
-	rollbackRegistry: null,
-	deployments: [],
 	cleanCache: false,
 	applicationStatus: "done",
 	endpointSpecSwarm: null,
@@ -50,7 +42,6 @@ const baseApp: ApplicationNested = {
 	environmentId: "",
 	environment: {
 		env: "",
-		isDefault: false,
 		environmentId: "",
 		name: "",
 		createdAt: "",

apps/dokploy/__test__/vitest.config.ts

@@ -13,11 +13,7 @@ export default defineConfig({
 			NODE: "test",
 		},
 	},
-	plugins: [
-		tsconfigPaths({
-			projects: [path.resolve(__dirname, "../tsconfig.json")],
-		}),
-	],
+	plugins: [tsconfigPaths()],
 	resolve: {
 		alias: {
 			"@dokploy/server": path.resolve(

apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx

@@ -1,7 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Plus, Trash2 } 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 { Button } from "@/components/ui/button";
@@ -29,13 +28,6 @@ interface Props {
 
 const AddRedirectSchema = z.object({
 	command: z.string(),
-	args: z
-		.array(
-			z.object({
-				value: z.string().min(1, "Argument cannot be empty"),
-			}),
-		)
-		.optional(),
 });
 
 type AddCommand = z.infer<typeof AddRedirectSchema>;
@@ -55,30 +47,22 @@ export const AddCommand = ({ applicationId }: Props) => {
 	const form = useForm<AddCommand>({
 		defaultValues: {
 			command: "",
-			args: [],
 		},
 		resolver: zodResolver(AddRedirectSchema),
 	});
 
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "args",
-	});
-
 	useEffect(() => {
-		if (data) {
+		if (data?.command) {
 			form.reset({
 				command: data?.command || "",
-				args: data?.args?.map((arg) => ({ value: arg })) || [],
 			});
 		}
-	}, [data, form]);
+	}, [form, form.reset, form.formState.isSubmitSuccessful, data?.command]);
 
 	const onSubmit = async (data: AddCommand) => {
 		await mutateAsync({
 			applicationId,
 			command: data?.command,
-			args: data?.args?.map((arg) => arg.value).filter(Boolean),
 		})
 			.then(async () => {
 				toast.success("Command Updated");
@@ -116,65 +100,13 @@ export const AddCommand = ({ applicationId }: Props) => {
 									<FormItem>
 										<FormLabel>Command</FormLabel>
 										<FormControl>
-											<Input placeholder="/bin/sh" {...field} />
+											<Input placeholder="Custom command" {...field} />
 										</FormControl>
 
 										<FormMessage />
 									</FormItem>
 								)}
 							/>
-
-							<div className="space-y-2">
-								<div className="flex items-center justify-between">
-									<FormLabel>Arguments (Args)</FormLabel>
-									<Button
-										type="button"
-										variant="outline"
-										size="sm"
-										onClick={() => append({ value: "" })}
-									>
-										<Plus className="h-4 w-4 mr-1" />
-										Add Argument
-									</Button>
-								</div>
-
-								{fields.length === 0 && (
-									<p className="text-sm text-muted-foreground">
-										No arguments added yet. Click "Add Argument" to add one.
-									</p>
-								)}
-
-								{fields.map((field, index) => (
-									<FormField
-										key={field.id}
-										control={form.control}
-										name={`args.${index}.value`}
-										render={({ field }) => (
-											<FormItem>
-												<div className="flex gap-2">
-													<FormControl>
-														<Input
-															placeholder={
-																index === 0 ? "-c" : "echo Hello World"
-															}
-															{...field}
-														/>
-													</FormControl>
-													<Button
-														type="button"
-														variant="destructive"
-														size="icon"
-														onClick={() => remove(index)}
-													>
-														<Trash2 className="h-4 w-4" />
-													</Button>
-												</div>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								))}
-							</div>
 						</div>
 						<div className="flex justify-end">
 							<Button isLoading={isLoading} type="submit" className="w-fit">

apps/dokploy/components/dashboard/application/advanced/show-build-server.tsx

@@ -1,286 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Server } from "lucide-react";
-import Link from "next/link";
-import { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import {
-	Select,
-	SelectContent,
-	SelectGroup,
-	SelectItem,
-	SelectLabel,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-interface Props {
-	applicationId: string;
-}
-
-const schema = z
-	.object({
-		buildServerId: z.string().optional(),
-		buildRegistryId: z.string().optional(),
-	})
-	.refine(
-		(data) => {
-			// Both empty/none is valid
-			const buildServerIsNone =
-				!data.buildServerId || data.buildServerId === "none";
-			const buildRegistryIsNone =
-				!data.buildRegistryId || data.buildRegistryId === "none";
-
-			// Both should be either filled or empty
-			if (buildServerIsNone && buildRegistryIsNone) return true;
-			if (!buildServerIsNone && !buildRegistryIsNone) return true;
-
-			return false;
-		},
-		{
-			message:
-				"Both Build Server and Build Registry must be selected together, or both set to None",
-			path: ["buildServerId"], // Show error on buildServerId field
-		},
-	);
-
-type Schema = z.infer<typeof schema>;
-
-export const ShowBuildServer = ({ applicationId }: Props) => {
-	const { data, refetch } = api.application.one.useQuery(
-		{ applicationId },
-		{ enabled: !!applicationId },
-	);
-	const { data: buildServers } = api.server.buildServers.useQuery();
-	const { data: registries } = api.registry.all.useQuery();
-
-	const { mutateAsync, isLoading } = api.application.update.useMutation();
-
-	const form = useForm<Schema>({
-		defaultValues: {
-			buildServerId: data?.buildServerId || "",
-			buildRegistryId: data?.buildRegistryId || "",
-		},
-		resolver: zodResolver(schema),
-	});
-
-	useEffect(() => {
-		if (data) {
-			form.reset({
-				buildServerId: data?.buildServerId || "",
-				buildRegistryId: data?.buildRegistryId || "",
-			});
-		}
-	}, [form, form.reset, data]);
-
-	const onSubmit = async (formData: Schema) => {
-		await mutateAsync({
-			applicationId,
-			buildServerId:
-				formData?.buildServerId === "none" || !formData?.buildServerId
-					? null
-					: formData?.buildServerId,
-			buildRegistryId:
-				formData?.buildRegistryId === "none" || !formData?.buildRegistryId
-					? null
-					: formData?.buildRegistryId,
-		})
-			.then(async () => {
-				toast.success("Build Server Settings Updated");
-				await refetch();
-			})
-			.catch(() => {
-				toast.error("Error updating build server settings");
-			});
-	};
-
-	return (
-		<Card className="bg-background">
-			<CardHeader>
-				<div className="flex flex-row items-center gap-2">
-					<Server className="size-6 text-muted-foreground" />
-					<div>
-						<CardTitle className="text-xl">Build Server</CardTitle>
-						<CardDescription>
-							Configure a dedicated server for building your application.
-						</CardDescription>
-					</div>
-				</div>
-			</CardHeader>
-			<CardContent className="flex flex-col gap-4">
-				<AlertBlock type="info">
-					Build servers offload the build process from your deployment servers.
-					Select a build server and registry to use for building your
-					application.
-				</AlertBlock>
-
-				<AlertBlock type="info">
-					📊 <strong>Important:</strong> Once the build finishes, you'll need to
-					wait a few seconds for the deployment server to download the image.
-					These download logs will <strong>NOT</strong> appear in the build
-					deployment logs. Check the <strong>Logs</strong> tab to see when the
-					container starts running.
-				</AlertBlock>
-
-				<AlertBlock type="info">
-					<strong>Note:</strong> Build Server and Build Registry must be
-					configured together. You can either select both or set both to None.
-				</AlertBlock>
-
-				{!registries || registries.length === 0 ? (
-					<AlertBlock type="warning">
-						You need to add at least one registry to use build servers. Please
-						go to{" "}
-						<Link
-							href="/dashboard/settings/registry"
-							className="text-primary underline"
-						>
-							Settings
-						</Link>{" "}
-						to add a registry.
-					</AlertBlock>
-				) : null}
-
-				<Form {...form}>
-					<form
-						onSubmit={form.handleSubmit(onSubmit)}
-						className="grid w-full gap-4"
-					>
-						<FormField
-							control={form.control}
-							name="buildServerId"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Build Server</FormLabel>
-									<Select
-										onValueChange={(value) => {
-											field.onChange(value);
-											// If setting to "none", also reset build registry to "none"
-											if (value === "none") {
-												form.setValue("buildRegistryId", "none");
-											}
-										}}
-										value={field.value || "none"}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a build server" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											<SelectGroup>
-												<SelectItem value="none">
-													<span className="flex items-center gap-2">
-														<span>None</span>
-													</span>
-												</SelectItem>
-												{buildServers?.map((server) => (
-													<SelectItem
-														key={server.serverId}
-														value={server.serverId}
-													>
-														<span className="flex items-center gap-2 justify-between w-full">
-															<span>{server.name}</span>
-															<span className="text-muted-foreground text-xs">
-																{server.ipAddress}
-															</span>
-														</span>
-													</SelectItem>
-												))}
-												<SelectLabel>
-													Build Servers ({buildServers?.length || 0})
-												</SelectLabel>
-											</SelectGroup>
-										</SelectContent>
-									</Select>
-									<FormDescription>
-										Select a build server to handle the build process for this
-										application.
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="buildRegistryId"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Build Registry</FormLabel>
-									<Select
-										onValueChange={(value) => {
-											field.onChange(value);
-											// If setting to "none", also reset build server to "none"
-											if (value === "none") {
-												form.setValue("buildServerId", "none");
-											}
-										}}
-										value={field.value || "none"}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a registry" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											<SelectGroup>
-												<SelectItem value="none">
-													<span className="flex items-center gap-2">
-														<span>None</span>
-													</span>
-												</SelectItem>
-												{registries?.map((registry) => (
-													<SelectItem
-														key={registry.registryId}
-														value={registry.registryId}
-													>
-														{registry.registryName}
-													</SelectItem>
-												))}
-												<SelectLabel>
-													Registries ({registries?.length || 0})
-												</SelectLabel>
-											</SelectGroup>
-										</SelectContent>
-									</Select>
-									<FormDescription>
-										Select a registry to store the built images from the build
-										server.
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<div className="flex w-full justify-end">
-							<Button isLoading={isLoading} type="submit">
-								Save
-							</Button>
-						</div>
-					</form>
-				</Form>
-			</CardContent>
-		</Card>
-	);
-};

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

@@ -21,10 +21,7 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import {
-	createConverter,
-	NumberInputWithSteps,
-} from "@/components/ui/number-input";
+import { Input } from "@/components/ui/input";
 import {
 	Tooltip,
 	TooltipContent,
@@ -33,23 +30,6 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 
-const CPU_STEP = 0.25;
-const MEMORY_STEP_MB = 256;
-
-const formatNumber = (value: number, decimals = 2): string =>
-	Number.isInteger(value) ? String(value) : value.toFixed(decimals);
-
-const cpuConverter = createConverter(1_000_000_000, (cpu) =>
-	cpu <= 0 ? "" : `${formatNumber(cpu)} CPU`,
-);
-
-const memoryConverter = createConverter(1024 * 1024, (mb) => {
-	if (mb <= 0) return "";
-	return mb >= 1024
-		? `${formatNumber(mb / 1024)} GB`
-		: `${formatNumber(mb)} MB`;
-});
-
 const addResourcesSchema = z.object({
 	memoryReservation: z.string().optional(),
 	cpuLimit: z.string().optional(),
@@ -71,7 +51,6 @@ interface Props {
 }
 
 type AddResources = z.infer<typeof addResourcesSchema>;
-
 export const ShowResources = ({ id, type }: Props) => {
 	const queryMap = {
 		postgres: () =>
@@ -184,20 +163,16 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																Memory hard limit in bytes. Example: 1GB =
-																1073741824 bytes. Use +/- buttons to adjust by
-																256 MB.
+																1073741824 bytes
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
+												<Input
 													placeholder="1073741824 (1GB in bytes)"
-													step={MEMORY_STEP_MB}
-													converter={memoryConverter}
+													{...field}
 												/>
 											</FormControl>
 											<FormMessage />
@@ -223,20 +198,16 @@ export const ShowResources = ({ id, type }: Props) => {
 													<TooltipContent>
 														<p>
 															Memory soft limit in bytes. Example: 256MB =
-															268435456 bytes. Use +/- buttons to adjust by 256
-															MB.
+															268435456 bytes
 														</p>
 													</TooltipContent>
 												</Tooltip>
 											</TooltipProvider>
 										</div>
 										<FormControl>
-											<NumberInputWithSteps
-												value={field.value}
-												onChange={field.onChange}
+											<Input
 												placeholder="268435456 (256MB in bytes)"
-												step={MEMORY_STEP_MB}
-												converter={memoryConverter}
+												{...field}
 											/>
 										</FormControl>
 										<FormMessage />
@@ -263,20 +234,17 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
-																CPUs = 2000000000. Use +/- buttons to adjust by
-																0.25 CPU.
+																CPUs = 2000000000
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
+												<Input
 													placeholder="2000000000 (2 CPUs)"
-													step={CPU_STEP}
-													converter={cpuConverter}
+													{...field}
+													value={field.value?.toString() || ""}
 												/>
 											</FormControl>
 											<FormMessage />
@@ -303,21 +271,14 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																CPU shares (relative weight). Example: 1 CPU =
-																1000000000. Use +/- buttons to adjust by 0.25
-																CPU.
+																1000000000
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
-													placeholder="1000000000 (1 CPU)"
-													step={CPU_STEP}
-													converter={cpuConverter}
-												/>
+												<Input placeholder="1000000000 (1 CPU)" {...field} />
 											</FormControl>
 											<FormMessage />
 										</FormItem>

apps/dokploy/components/dashboard/application/deployments/kill-build.tsx

@@ -1,65 +0,0 @@
-import { Scissors } 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 KillBuild = ({ id, type }: Props) => {
-	const { mutateAsync, isLoading } =
-		type === "application"
-			? api.application.killBuild.useMutation()
-			: api.compose.killBuild.useMutation();
-
-	return (
-		<AlertDialog>
-			<AlertDialogTrigger asChild>
-				<Button variant="outline" className="w-fit" isLoading={isLoading}>
-					Kill Build
-					<Scissors className="size-4" />
-				</Button>
-			</AlertDialogTrigger>
-			<AlertDialogContent>
-				<AlertDialogHeader>
-					<AlertDialogTitle>Are you sure to kill the build?</AlertDialogTitle>
-					<AlertDialogDescription>
-						This will kill the build process
-					</AlertDialogDescription>
-				</AlertDialogHeader>
-				<AlertDialogFooter>
-					<AlertDialogCancel>Cancel</AlertDialogCancel>
-					<AlertDialogAction
-						onClick={async () => {
-							await mutateAsync({
-								applicationId: id || "",
-								composeId: id || "",
-							})
-								.then(() => {
-									toast.success("Build killed successfully");
-								})
-								.catch((err) => {
-									toast.error(err.message);
-								});
-						}}
-					>
-						Confirm
-					</AlertDialogAction>
-				</AlertDialogFooter>
-			</AlertDialogContent>
-		</AlertDialog>
-	);
-};

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

@@ -25,7 +25,6 @@ import {
 import { api, type RouterOutputs } from "@/utils/api";
 import { ShowRollbackSettings } from "../rollbacks/show-rollback-settings";
 import { CancelQueues } from "./cancel-queues";
-import { KillBuild } from "./kill-build";
 import { RefreshToken } from "./refresh-token";
 import { ShowDeployment } from "./show-deployment";
 
@@ -143,10 +142,7 @@ export const ShowDeployments = ({
 						See the last 10 deployments for this {type}
 					</CardDescription>
 				</div>
-				<div className="flex flex-row items-center flex-wrap gap-2">
-					{(type === "application" || type === "compose") && (
-						<KillBuild id={id} type={type} />
-					)}
+				<div className="flex flex-row items-center gap-2">
 					{(type === "application" || type === "compose") && (
 						<CancelQueues id={id} type={type} />
 					)}
@@ -373,19 +369,7 @@ export const ShowDeployments = ({
 												type === "application" && (
 													<DialogAction
 														title="Rollback to this deployment"
-														description={
-															<div className="flex flex-col gap-3">
-																<p>
-																	Are you sure you want to rollback to this
-																	deployment?
-																</p>
-																<AlertBlock type="info" className="text-sm">
-																	Please wait a few seconds while the image is
-																	pulled from the registry. Your application
-																	should be running shortly.
-																</AlertBlock>
-															</div>
-														}
+														description="Are you sure you want to rollback to this deployment?"
 														type="default"
 														onClick={async () => {
 															await rollback({
@@ -419,7 +403,7 @@ export const ShowDeployments = ({
 					</div>
 				)}
 				<ShowDeployment
-					serverId={activeLog?.buildServerId || serverId}
+					serverId={serverId}
 					open={Boolean(activeLog && activeLog.logPath !== null)}
 					onClose={() => setActiveLog(null)}
 					logPath={activeLog?.logPath || ""}

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

@@ -46,13 +46,7 @@ export type CacheType = "fetch" | "cache";
 
 export const domain = z
 	.object({
-		host: z
-			.string()
-			.min(1, { message: "Add a hostname" })
-			.refine((val) => val === val.trim(), {
-				message: "Domain name cannot have leading or trailing spaces",
-			})
-			.transform((val) => val.trim()),
+		host: z.string().min(1, { message: "Add a hostname" }),
 		path: z.string().min(1).optional(),
 		internalPath: z.string().optional(),
 		stripPath: z.boolean().optional(),
@@ -208,8 +202,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 	const certificateType = form.watch("certificateType");
 	const https = form.watch("https");
 	const domainType = form.watch("domainType");
-	const host = form.watch("host");
-	const isTraefikMeDomain = host?.includes("traefik.me") || false;
 
 	useEffect(() => {
 		if (data) {
@@ -307,13 +299,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 				</DialogHeader>
 				{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
 
-				{type === "compose" && (
-					<AlertBlock type="info" className="mb-4">
-						Whenever you make changes to domains, remember to redeploy your
-						compose to apply the changes.
-					</AlertBlock>
-				)}
-
 				<Form {...form}>
 					<form
 						id="hook-form"
@@ -504,13 +489,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 														to make your traefik.me domain work.
 													</AlertBlock>
 												)}
-											{isTraefikMeDomain && (
-												<AlertBlock type="info">
-													<strong>Note:</strong> traefik.me is a public HTTP
-													service and does not support SSL/HTTPS. HTTPS and
-													certificate options will not have any effect.
-												</AlertBlock>
-											)}
 											<FormLabel>Host</FormLabel>
 											<div className="flex gap-2">
 												<FormControl>

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

@@ -5,23 +5,14 @@ import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-} from "@/components/ui/form";
+import { Form } from "@/components/ui/form";
 import { Secrets } from "@/components/ui/secrets";
-import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 
 const addEnvironmentSchema = z.object({
 	env: z.string(),
 	buildArgs: z.string(),
 	buildSecrets: z.string(),
-	createEnvFile: z.boolean(),
 });
 
 type EnvironmentSchema = z.infer<typeof addEnvironmentSchema>;
@@ -48,7 +39,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 			env: "",
 			buildArgs: "",
 			buildSecrets: "",
-			createEnvFile: true,
 		},
 		resolver: zodResolver(addEnvironmentSchema),
 	});
@@ -57,12 +47,10 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 	const currentEnv = form.watch("env");
 	const currentBuildArgs = form.watch("buildArgs");
 	const currentBuildSecrets = form.watch("buildSecrets");
-	const currentCreateEnvFile = form.watch("createEnvFile");
 	const hasChanges =
 		currentEnv !== (data?.env || "") ||
 		currentBuildArgs !== (data?.buildArgs || "") ||
-		currentBuildSecrets !== (data?.buildSecrets || "") ||
-		currentCreateEnvFile !== (data?.createEnvFile ?? true);
+		currentBuildSecrets !== (data?.buildSecrets || "");
 
 	useEffect(() => {
 		if (data) {
@@ -70,7 +58,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 				env: data.env || "",
 				buildArgs: data.buildArgs || "",
 				buildSecrets: data.buildSecrets || "",
-				createEnvFile: data.createEnvFile ?? true,
 			});
 		}
 	}, [data, form]);
@@ -80,7 +67,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 			env: formData.env,
 			buildArgs: formData.buildArgs,
 			buildSecrets: formData.buildSecrets,
-			createEnvFile: formData.createEnvFile,
 			applicationId,
 		})
 			.then(async () => {
@@ -97,7 +83,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 			env: data?.env || "",
 			buildArgs: data?.buildArgs || "",
 			buildSecrets: data?.buildSecrets || "",
-			createEnvFile: data?.createEnvFile ?? true,
 		});
 	};
 
@@ -182,31 +167,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 							placeholder="NPM_TOKEN=xyz"
 						/>
 					)}
-					{data?.buildType === "dockerfile" && (
-						<FormField
-							control={form.control}
-							name="createEnvFile"
-							render={({ field }) => (
-								<FormItem className="flex flex-row items-center justify-between p-3 border rounded-lg shadow-sm">
-									<div className="space-y-0.5">
-										<FormLabel>Create Environment File</FormLabel>
-										<FormDescription>
-											When enabled, an .env file will be created in the same
-											directory as your Dockerfile during the build process.
-											Disable this if you don't want to generate an environment
-											file.
-										</FormDescription>
-									</div>
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-								</FormItem>
-							)}
-						/>
-					)}
 					<div className="flex flex-row justify-end gap-2">
 						{hasChanges && (
 							<Button type="button" variant="outline" onClick={handleCancel}>

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

@@ -79,7 +79,7 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => {
 						>
 							<Button
 								variant="default"
-								isLoading={data?.applicationStatus === "running"}
+								// isLoading={data?.applicationStatus === "running"}
 								className="flex items-center gap-1.5 group focus-visible:ring-2 focus-visible:ring-offset-2"
 							>
 								<Tooltip>

apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx

@@ -86,9 +86,6 @@ export const AddPreviewDomain = ({
 		resolver: zodResolver(domain),
 	});
 
-	const host = form.watch("host");
-	const isTraefikMeDomain = host?.includes("traefik.me") || false;
-
 	useEffect(() => {
 		if (data) {
 			form.reset({
@@ -160,13 +157,6 @@ export const AddPreviewDomain = ({
 									name="host"
 									render={({ field }) => (
 										<FormItem>
-											{isTraefikMeDomain && (
-												<AlertBlock type="info">
-													<strong>Note:</strong> traefik.me is a public HTTP
-													service and does not support SSL/HTTPS. HTTPS and
-													certificate options will not have any effect.
-												</AlertBlock>
-											)}
 											<FormLabel>Host</FormLabel>
 											<div className="flex gap-2">
 												<FormControl>

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

@@ -182,16 +182,7 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 															id={deployment.previewDeploymentId}
 															type="previewDeployment"
 															serverId={data?.serverId || ""}
-														>
-															<Button
-																variant="outline"
-																size="sm"
-																className="gap-2"
-															>
-																<RocketIcon className="size-4" />
-																Deployments
-															</Button>
-														</ShowDeploymentsModal>
+														/>
 
 														<AddPreviewDomain
 															previewDeploymentId={`${deployment.previewDeploymentId}`}

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

@@ -4,7 +4,6 @@ import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -101,8 +100,6 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 	});
 
 	const previewHttps = form.watch("previewHttps");
-	const wildcardDomain = form.watch("wildcardDomain");
-	const isTraefikMeDomain = wildcardDomain?.includes("traefik.me") || false;
 
 	useEffect(() => {
 		setIsEnabled(data?.isPreviewDeploymentsActive || false);
@@ -123,7 +120,7 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 				previewCertificateType: data.previewCertificateType || "none",
 				previewCustomCertResolver: data.previewCustomCertResolver || "",
 				previewRequireCollaboratorPermissions:
-					data.previewRequireCollaboratorPermissions ?? true,
+					data.previewRequireCollaboratorPermissions || true,
 			});
 		}
 	}, [data]);
@@ -171,13 +168,6 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 						</DialogDescription>
 					</DialogHeader>
 					<div className="grid gap-4">
-						{isTraefikMeDomain && (
-							<AlertBlock type="info">
-								<strong>Note:</strong> traefik.me is a public HTTP service and
-								does not support SSL/HTTPS. HTTPS and certificate options will
-								not have any effect.
-							</AlertBlock>
-						)}
 						<Form {...form}>
 							<form
 								onSubmit={form.handleSubmit(onSubmit)}

apps/dokploy/components/dashboard/application/rollbacks/show-rollback-settings.tsx

@@ -1,6 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import Link from "next/link";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -21,37 +20,13 @@ import {
 	FormField,
 	FormItem,
 	FormLabel,
-	FormMessage,
 } from "@/components/ui/form";
-import {
-	Select,
-	SelectContent,
-	SelectGroup,
-	SelectItem,
-	SelectLabel,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 
-const formSchema = z
-	.object({
-		rollbackActive: z.boolean(),
-		rollbackRegistryId: z.string().optional(),
-	})
-	.superRefine((values, ctx) => {
-		if (
-			values.rollbackActive &&
-			(!values.rollbackRegistryId || values.rollbackRegistryId === "none")
-		) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				path: ["rollbackRegistryId"],
-				message: "Registry is required when rollbacks are enabled",
-			});
-		}
-	});
+const formSchema = z.object({
+	rollbackActive: z.boolean(),
+});
 
 type FormValues = z.infer<typeof formSchema>;
 
@@ -74,33 +49,17 @@ export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
 	const { mutateAsync: updateApplication, isLoading } =
 		api.application.update.useMutation();
 
-	const { data: registries } = api.registry.all.useQuery();
-
 	const form = useForm<FormValues>({
 		resolver: zodResolver(formSchema),
 		defaultValues: {
 			rollbackActive: application?.rollbackActive ?? false,
-			rollbackRegistryId: application?.rollbackRegistryId || "",
 		},
 	});
 
-	useEffect(() => {
-		if (application) {
-			form.reset({
-				rollbackActive: application.rollbackActive ?? false,
-				rollbackRegistryId: application.rollbackRegistryId || "",
-			});
-		}
-	}, [application, form]);
-
 	const onSubmit = async (data: FormValues) => {
 		await updateApplication({
 			applicationId,
 			rollbackActive: data.rollbackActive,
-			rollbackRegistryId:
-				data.rollbackRegistryId === "none" || !data.rollbackRegistryId
-					? null
-					: data.rollbackRegistryId,
 		})
 			.then(() => {
 				toast.success("Rollback settings updated");
@@ -153,65 +112,6 @@ export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
 							)}
 						/>
 
-						{form.watch("rollbackActive") && (
-							<FormField
-								control={form.control}
-								name="rollbackRegistryId"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Rollback Registry</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											value={field.value || "none"}
-										>
-											<FormControl>
-												<SelectTrigger>
-													<SelectValue placeholder="Select a registry" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="none">
-														<span className="flex items-center gap-2">
-															<span>None</span>
-														</span>
-													</SelectItem>
-													{registries?.map((registry) => (
-														<SelectItem
-															key={registry.registryId}
-															value={registry.registryId}
-														>
-															{registry.registryName}
-														</SelectItem>
-													))}
-													<SelectLabel>
-														Registries ({registries?.length || 0})
-													</SelectLabel>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										{!registries || registries.length === 0 ? (
-											<FormDescription className="text-amber-600 dark:text-amber-500">
-												No registries available. Please{" "}
-												<Link
-													href="/dashboard/settings/registry"
-													className="underline font-medium hover:text-amber-700 dark:hover:text-amber-400"
-												>
-													configure a registry
-												</Link>{" "}
-												first to enable rollbacks.
-											</FormDescription>
-										) : (
-											<FormDescription>
-												Select a registry where rollback images will be stored.
-											</FormDescription>
-										)}
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-
 						<Button type="submit" className="w-full" isLoading={isLoading}>
 							Save Settings
 						</Button>

apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx

@@ -1,7 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
-	CheckIcon,
-	ChevronsUpDown,
 	DatabaseZap,
 	Info,
 	PenBoxIcon,
@@ -15,14 +13,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 {
-	Command,
-	CommandEmpty,
-	CommandGroup,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@/components/ui/command";
 import {
 	Dialog,
 	DialogContent,
@@ -41,12 +31,6 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import {
-	Popover,
-	PopoverContent,
-	PopoverTrigger,
-} from "@/components/ui/popover";
-import { ScrollArea } from "@/components/ui/scroll-area";
 import {
 	Select,
 	SelectContent,
@@ -64,7 +48,6 @@ import {
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import type { CacheType } from "../domains/handle-domain";
-import { getTimezoneLabel, TIMEZONES } from "./timezones";
 
 export const commonCronExpressions = [
 	{ label: "Every minute", value: "* * * * *" },
@@ -92,7 +75,6 @@ const formSchema = z
 			"dokploy-server",
 		]),
 		script: z.string(),
-		timezone: z.string().optional(),
 	})
 	.superRefine((data, ctx) => {
 		if (data.scheduleType === "compose" && !data.serviceName) {
@@ -231,7 +213,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 			serviceName: "",
 			scheduleType: scheduleType || "application",
 			script: "",
-			timezone: undefined,
 		},
 	});
 
@@ -270,7 +251,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 				serviceName: schedule.serviceName || "",
 				scheduleType: schedule.scheduleType,
 				script: schedule.script || "",
-				timezone: schedule.timezone || undefined,
 			});
 		}
 	}, [form, schedule, scheduleId]);
@@ -484,89 +464,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 							formControl={form.control}
 						/>
 
-						<FormField
-							control={form.control}
-							name="timezone"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel className="flex items-center gap-2">
-										Timezone
-										<TooltipProvider>
-											<Tooltip>
-												<TooltipTrigger asChild>
-													<Info className="w-4 h-4 text-muted-foreground cursor-help" />
-												</TooltipTrigger>
-												<TooltipContent>
-													<p>
-														Select a timezone for the schedule. If not
-														specified, UTC will be used.
-													</p>
-												</TooltipContent>
-											</Tooltip>
-										</TooltipProvider>
-									</FormLabel>
-									<Popover>
-										<PopoverTrigger asChild>
-											<FormControl>
-												<Button
-													variant="outline"
-													className={cn(
-														"w-full justify-between !bg-input",
-														!field.value && "text-muted-foreground",
-													)}
-												>
-													{getTimezoneLabel(field.value)}
-													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-												</Button>
-											</FormControl>
-										</PopoverTrigger>
-										<PopoverContent className="w-[400px] p-0" align="start">
-											<Command>
-												<CommandInput
-													placeholder="Search timezone..."
-													className="h-9"
-												/>
-												<CommandList>
-													<CommandEmpty>No timezone found.</CommandEmpty>
-													<ScrollArea className="h-72">
-														{Object.entries(TIMEZONES).map(
-															([region, zones]) => (
-																<CommandGroup key={region} heading={region}>
-																	{zones.map((tz) => (
-																		<CommandItem
-																			key={tz.value}
-																			value={`${region} ${tz.label} ${tz.value}`}
-																			onSelect={() => {
-																				field.onChange(tz.value);
-																			}}
-																		>
-																			{tz.value}
-																			<CheckIcon
-																				className={cn(
-																					"ml-auto h-4 w-4",
-																					field.value === tz.value
-																						? "opacity-100"
-																						: "opacity-0",
-																				)}
-																			/>
-																		</CommandItem>
-																	))}
-																</CommandGroup>
-															),
-														)}
-													</ScrollArea>
-												</CommandList>
-											</Command>
-										</PopoverContent>
-									</Popover>
-									<FormDescription>
-										Optional: Choose a timezone for the schedule execution time
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
 						{(scheduleTypeForm === "application" ||
 							scheduleTypeForm === "compose") && (
 							<>

apps/dokploy/components/dashboard/application/schedules/timezones.ts

@@ -1,458 +0,0 @@
-// Complete list of IANA timezones grouped by region
-export const TIMEZONES: Record<
-	string,
-	Array<{ label: string; value: string }>
-> = {
-	Common: [{ label: "UTC (Coordinated Universal Time)", value: "UTC" }],
-	Africa: [
-		{ label: "Abidjan", value: "Africa/Abidjan" },
-		{ label: "Accra", value: "Africa/Accra" },
-		{ label: "Addis Ababa", value: "Africa/Addis_Ababa" },
-		{ label: "Algiers", value: "Africa/Algiers" },
-		{ label: "Asmara", value: "Africa/Asmara" },
-		{ label: "Bamako", value: "Africa/Bamako" },
-		{ label: "Bangui", value: "Africa/Bangui" },
-		{ label: "Banjul", value: "Africa/Banjul" },
-		{ label: "Bissau", value: "Africa/Bissau" },
-		{ label: "Blantyre", value: "Africa/Blantyre" },
-		{ label: "Brazzaville", value: "Africa/Brazzaville" },
-		{ label: "Bujumbura", value: "Africa/Bujumbura" },
-		{ label: "Cairo", value: "Africa/Cairo" },
-		{ label: "Casablanca", value: "Africa/Casablanca" },
-		{ label: "Ceuta", value: "Africa/Ceuta" },
-		{ label: "Conakry", value: "Africa/Conakry" },
-		{ label: "Dakar", value: "Africa/Dakar" },
-		{ label: "Dar es Salaam", value: "Africa/Dar_es_Salaam" },
-		{ label: "Djibouti", value: "Africa/Djibouti" },
-		{ label: "Douala", value: "Africa/Douala" },
-		{ label: "El Aaiun", value: "Africa/El_Aaiun" },
-		{ label: "Freetown", value: "Africa/Freetown" },
-		{ label: "Gaborone", value: "Africa/Gaborone" },
-		{ label: "Harare", value: "Africa/Harare" },
-		{ label: "Johannesburg", value: "Africa/Johannesburg" },
-		{ label: "Juba", value: "Africa/Juba" },
-		{ label: "Kampala", value: "Africa/Kampala" },
-		{ label: "Khartoum", value: "Africa/Khartoum" },
-		{ label: "Kigali", value: "Africa/Kigali" },
-		{ label: "Kinshasa", value: "Africa/Kinshasa" },
-		{ label: "Lagos", value: "Africa/Lagos" },
-		{ label: "Libreville", value: "Africa/Libreville" },
-		{ label: "Lome", value: "Africa/Lome" },
-		{ label: "Luanda", value: "Africa/Luanda" },
-		{ label: "Lubumbashi", value: "Africa/Lubumbashi" },
-		{ label: "Lusaka", value: "Africa/Lusaka" },
-		{ label: "Malabo", value: "Africa/Malabo" },
-		{ label: "Maputo", value: "Africa/Maputo" },
-		{ label: "Maseru", value: "Africa/Maseru" },
-		{ label: "Mbabane", value: "Africa/Mbabane" },
-		{ label: "Mogadishu", value: "Africa/Mogadishu" },
-		{ label: "Monrovia", value: "Africa/Monrovia" },
-		{ label: "Nairobi", value: "Africa/Nairobi" },
-		{ label: "Ndjamena", value: "Africa/Ndjamena" },
-		{ label: "Niamey", value: "Africa/Niamey" },
-		{ label: "Nouakchott", value: "Africa/Nouakchott" },
-		{ label: "Ouagadougou", value: "Africa/Ouagadougou" },
-		{ label: "Porto-Novo", value: "Africa/Porto-Novo" },
-		{ label: "Sao Tome", value: "Africa/Sao_Tome" },
-		{ label: "Tripoli", value: "Africa/Tripoli" },
-		{ label: "Tunis", value: "Africa/Tunis" },
-		{ label: "Windhoek", value: "Africa/Windhoek" },
-	],
-	America: [
-		{ label: "Adak", value: "America/Adak" },
-		{ label: "Anchorage", value: "America/Anchorage" },
-		{ label: "Anguilla", value: "America/Anguilla" },
-		{ label: "Antigua", value: "America/Antigua" },
-		{ label: "Araguaina", value: "America/Araguaina" },
-		{
-			label: "Argentina/Buenos Aires",
-			value: "America/Argentina/Buenos_Aires",
-		},
-		{ label: "Argentina/Catamarca", value: "America/Argentina/Catamarca" },
-		{ label: "Argentina/Cordoba", value: "America/Argentina/Cordoba" },
-		{ label: "Argentina/Jujuy", value: "America/Argentina/Jujuy" },
-		{ label: "Argentina/La Rioja", value: "America/Argentina/La_Rioja" },
-		{ label: "Argentina/Mendoza", value: "America/Argentina/Mendoza" },
-		{
-			label: "Argentina/Rio Gallegos",
-			value: "America/Argentina/Rio_Gallegos",
-		},
-		{ label: "Argentina/Salta", value: "America/Argentina/Salta" },
-		{ label: "Argentina/San Juan", value: "America/Argentina/San_Juan" },
-		{ label: "Argentina/San Luis", value: "America/Argentina/San_Luis" },
-		{ label: "Argentina/Tucuman", value: "America/Argentina/Tucuman" },
-		{ label: "Argentina/Ushuaia", value: "America/Argentina/Ushuaia" },
-		{ label: "Aruba", value: "America/Aruba" },
-		{ label: "Asuncion", value: "America/Asuncion" },
-		{ label: "Atikokan", value: "America/Atikokan" },
-		{ label: "Bahia", value: "America/Bahia" },
-		{ label: "Bahia Banderas", value: "America/Bahia_Banderas" },
-		{ label: "Barbados", value: "America/Barbados" },
-		{ label: "Belem", value: "America/Belem" },
-		{ label: "Belize", value: "America/Belize" },
-		{ label: "Blanc-Sablon", value: "America/Blanc-Sablon" },
-		{ label: "Boa Vista", value: "America/Boa_Vista" },
-		{ label: "Bogota", value: "America/Bogota" },
-		{ label: "Boise", value: "America/Boise" },
-		{ label: "Cambridge Bay", value: "America/Cambridge_Bay" },
-		{ label: "Campo Grande", value: "America/Campo_Grande" },
-		{ label: "Cancun", value: "America/Cancun" },
-		{ label: "Caracas", value: "America/Caracas" },
-		{ label: "Cayenne", value: "America/Cayenne" },
-		{ label: "Cayman", value: "America/Cayman" },
-		{ label: "Chicago (Central Time)", value: "America/Chicago" },
-		{ label: "Chihuahua", value: "America/Chihuahua" },
-		{ label: "Ciudad Juarez", value: "America/Ciudad_Juarez" },
-		{ label: "Costa Rica", value: "America/Costa_Rica" },
-		{ label: "Creston", value: "America/Creston" },
-		{ label: "Cuiaba", value: "America/Cuiaba" },
-		{ label: "Curacao", value: "America/Curacao" },
-		{ label: "Danmarkshavn", value: "America/Danmarkshavn" },
-		{ label: "Dawson", value: "America/Dawson" },
-		{ label: "Dawson Creek", value: "America/Dawson_Creek" },
-		{ label: "Denver (Mountain Time)", value: "America/Denver" },
-		{ label: "Detroit", value: "America/Detroit" },
-		{ label: "Dominica", value: "America/Dominica" },
-		{ label: "Edmonton", value: "America/Edmonton" },
-		{ label: "Eirunepe", value: "America/Eirunepe" },
-		{ label: "El Salvador", value: "America/El_Salvador" },
-		{ label: "Fort Nelson", value: "America/Fort_Nelson" },
-		{ label: "Fortaleza", value: "America/Fortaleza" },
-		{ label: "Glace Bay", value: "America/Glace_Bay" },
-		{ label: "Goose Bay", value: "America/Goose_Bay" },
-		{ label: "Grand Turk", value: "America/Grand_Turk" },
-		{ label: "Grenada", value: "America/Grenada" },
-		{ label: "Guadeloupe", value: "America/Guadeloupe" },
-		{ label: "Guatemala", value: "America/Guatemala" },
-		{ label: "Guayaquil", value: "America/Guayaquil" },
-		{ label: "Guyana", value: "America/Guyana" },
-		{ label: "Halifax", value: "America/Halifax" },
-		{ label: "Havana", value: "America/Havana" },
-		{ label: "Hermosillo", value: "America/Hermosillo" },
-		{ label: "Indiana/Indianapolis", value: "America/Indiana/Indianapolis" },
-		{ label: "Indiana/Knox", value: "America/Indiana/Knox" },
-		{ label: "Indiana/Marengo", value: "America/Indiana/Marengo" },
-		{ label: "Indiana/Petersburg", value: "America/Indiana/Petersburg" },
-		{ label: "Indiana/Tell City", value: "America/Indiana/Tell_City" },
-		{ label: "Indiana/Vevay", value: "America/Indiana/Vevay" },
-		{ label: "Indiana/Vincennes", value: "America/Indiana/Vincennes" },
-		{ label: "Indiana/Winamac", value: "America/Indiana/Winamac" },
-		{ label: "Inuvik", value: "America/Inuvik" },
-		{ label: "Iqaluit", value: "America/Iqaluit" },
-		{ label: "Jamaica", value: "America/Jamaica" },
-		{ label: "Juneau", value: "America/Juneau" },
-		{ label: "Kentucky/Louisville", value: "America/Kentucky/Louisville" },
-		{ label: "Kentucky/Monticello", value: "America/Kentucky/Monticello" },
-		{ label: "Kralendijk", value: "America/Kralendijk" },
-		{ label: "La Paz", value: "America/La_Paz" },
-		{ label: "Lima", value: "America/Lima" },
-		{ label: "Los Angeles (Pacific Time)", value: "America/Los_Angeles" },
-		{ label: "Lower Princes", value: "America/Lower_Princes" },
-		{ label: "Maceio", value: "America/Maceio" },
-		{ label: "Managua", value: "America/Managua" },
-		{ label: "Manaus", value: "America/Manaus" },
-		{ label: "Marigot", value: "America/Marigot" },
-		{ label: "Martinique", value: "America/Martinique" },
-		{ label: "Matamoros", value: "America/Matamoros" },
-		{ label: "Mazatlan", value: "America/Mazatlan" },
-		{ label: "Menominee", value: "America/Menominee" },
-		{ label: "Merida", value: "America/Merida" },
-		{ label: "Metlakatla", value: "America/Metlakatla" },
-		{ label: "Mexico City (Central Mexico)", value: "America/Mexico_City" },
-		{ label: "Miquelon", value: "America/Miquelon" },
-		{ label: "Moncton", value: "America/Moncton" },
-		{ label: "Monterrey", value: "America/Monterrey" },
-		{ label: "Montevideo", value: "America/Montevideo" },
-		{ label: "Montserrat", value: "America/Montserrat" },
-		{ label: "Nassau", value: "America/Nassau" },
-		{ label: "New York (Eastern Time)", value: "America/New_York" },
-		{ label: "Nome", value: "America/Nome" },
-		{ label: "Noronha", value: "America/Noronha" },
-		{ label: "North Dakota/Beulah", value: "America/North_Dakota/Beulah" },
-		{ label: "North Dakota/Center", value: "America/North_Dakota/Center" },
-		{
-			label: "North Dakota/New Salem",
-			value: "America/North_Dakota/New_Salem",
-		},
-		{ label: "Nuuk", value: "America/Nuuk" },
-		{ label: "Ojinaga", value: "America/Ojinaga" },
-		{ label: "Panama", value: "America/Panama" },
-		{ label: "Paramaribo", value: "America/Paramaribo" },
-		{ label: "Phoenix", value: "America/Phoenix" },
-		{ label: "Port-au-Prince", value: "America/Port-au-Prince" },
-		{ label: "Port of Spain", value: "America/Port_of_Spain" },
-		{ label: "Porto Velho", value: "America/Porto_Velho" },
-		{ label: "Puerto Rico", value: "America/Puerto_Rico" },
-		{ label: "Punta Arenas", value: "America/Punta_Arenas" },
-		{ label: "Rankin Inlet", value: "America/Rankin_Inlet" },
-		{ label: "Recife", value: "America/Recife" },
-		{ label: "Regina", value: "America/Regina" },
-		{ label: "Resolute", value: "America/Resolute" },
-		{ label: "Rio Branco", value: "America/Rio_Branco" },
-		{ label: "Santarem", value: "America/Santarem" },
-		{ label: "Santiago", value: "America/Santiago" },
-		{ label: "Santo Domingo", value: "America/Santo_Domingo" },
-		{ label: "Sao Paulo (Brasilia Time)", value: "America/Sao_Paulo" },
-		{ label: "Scoresbysund", value: "America/Scoresbysund" },
-		{ label: "Sitka", value: "America/Sitka" },
-		{ label: "St Barthelemy", value: "America/St_Barthelemy" },
-		{ label: "St Johns", value: "America/St_Johns" },
-		{ label: "St Kitts", value: "America/St_Kitts" },
-		{ label: "St Lucia", value: "America/St_Lucia" },
-		{ label: "St Thomas", value: "America/St_Thomas" },
-		{ label: "St Vincent", value: "America/St_Vincent" },
-		{ label: "Swift Current", value: "America/Swift_Current" },
-		{ label: "Tegucigalpa", value: "America/Tegucigalpa" },
-		{ label: "Thule", value: "America/Thule" },
-		{ label: "Tijuana", value: "America/Tijuana" },
-		{ label: "Toronto", value: "America/Toronto" },
-		{ label: "Tortola", value: "America/Tortola" },
-		{ label: "Vancouver", value: "America/Vancouver" },
-		{ label: "Whitehorse", value: "America/Whitehorse" },
-		{ label: "Winnipeg", value: "America/Winnipeg" },
-		{ label: "Yakutat", value: "America/Yakutat" },
-	],
-	Antarctica: [
-		{ label: "Casey", value: "Antarctica/Casey" },
-		{ label: "Davis", value: "Antarctica/Davis" },
-		{ label: "DumontDUrville", value: "Antarctica/DumontDUrville" },
-		{ label: "Macquarie", value: "Antarctica/Macquarie" },
-		{ label: "Mawson", value: "Antarctica/Mawson" },
-		{ label: "McMurdo", value: "Antarctica/McMurdo" },
-		{ label: "Palmer", value: "Antarctica/Palmer" },
-		{ label: "Rothera", value: "Antarctica/Rothera" },
-		{ label: "Syowa", value: "Antarctica/Syowa" },
-		{ label: "Troll", value: "Antarctica/Troll" },
-		{ label: "Vostok", value: "Antarctica/Vostok" },
-	],
-	Arctic: [{ label: "Longyearbyen", value: "Arctic/Longyearbyen" }],
-	Asia: [
-		{ label: "Aden", value: "Asia/Aden" },
-		{ label: "Almaty", value: "Asia/Almaty" },
-		{ label: "Amman", value: "Asia/Amman" },
-		{ label: "Anadyr", value: "Asia/Anadyr" },
-		{ label: "Aqtau", value: "Asia/Aqtau" },
-		{ label: "Aqtobe", value: "Asia/Aqtobe" },
-		{ label: "Ashgabat", value: "Asia/Ashgabat" },
-		{ label: "Atyrau", value: "Asia/Atyrau" },
-		{ label: "Baghdad", value: "Asia/Baghdad" },
-		{ label: "Bahrain", value: "Asia/Bahrain" },
-		{ label: "Baku", value: "Asia/Baku" },
-		{ label: "Bangkok", value: "Asia/Bangkok" },
-		{ label: "Barnaul", value: "Asia/Barnaul" },
-		{ label: "Beirut", value: "Asia/Beirut" },
-		{ label: "Bishkek", value: "Asia/Bishkek" },
-		{ label: "Brunei", value: "Asia/Brunei" },
-		{ label: "Chita", value: "Asia/Chita" },
-		{ label: "Choibalsan", value: "Asia/Choibalsan" },
-		{ label: "Colombo", value: "Asia/Colombo" },
-		{ label: "Damascus", value: "Asia/Damascus" },
-		{ label: "Dhaka", value: "Asia/Dhaka" },
-		{ label: "Dili", value: "Asia/Dili" },
-		{ label: "Dubai (Gulf Standard Time)", value: "Asia/Dubai" },
-		{ label: "Dushanbe", value: "Asia/Dushanbe" },
-		{ label: "Famagusta", value: "Asia/Famagusta" },
-		{ label: "Gaza", value: "Asia/Gaza" },
-		{ label: "Hebron", value: "Asia/Hebron" },
-		{ label: "Ho Chi Minh", value: "Asia/Ho_Chi_Minh" },
-		{ label: "Hong Kong", value: "Asia/Hong_Kong" },
-		{ label: "Hovd", value: "Asia/Hovd" },
-		{ label: "Irkutsk", value: "Asia/Irkutsk" },
-		{ label: "Jakarta", value: "Asia/Jakarta" },
-		{ label: "Jayapura", value: "Asia/Jayapura" },
-		{ label: "Jerusalem", value: "Asia/Jerusalem" },
-		{ label: "Kabul", value: "Asia/Kabul" },
-		{ label: "Kamchatka", value: "Asia/Kamchatka" },
-		{ label: "Karachi", value: "Asia/Karachi" },
-		{ label: "Kathmandu", value: "Asia/Kathmandu" },
-		{ label: "Khandyga", value: "Asia/Khandyga" },
-		{ label: "Kolkata (India Standard Time)", value: "Asia/Kolkata" },
-		{ label: "Krasnoyarsk", value: "Asia/Krasnoyarsk" },
-		{ label: "Kuala Lumpur", value: "Asia/Kuala_Lumpur" },
-		{ label: "Kuching", value: "Asia/Kuching" },
-		{ label: "Kuwait", value: "Asia/Kuwait" },
-		{ label: "Macau", value: "Asia/Macau" },
-		{ label: "Magadan", value: "Asia/Magadan" },
-		{ label: "Makassar", value: "Asia/Makassar" },
-		{ label: "Manila", value: "Asia/Manila" },
-		{ label: "Muscat", value: "Asia/Muscat" },
-		{ label: "Nicosia", value: "Asia/Nicosia" },
-		{ label: "Novokuznetsk", value: "Asia/Novokuznetsk" },
-		{ label: "Novosibirsk", value: "Asia/Novosibirsk" },
-		{ label: "Omsk", value: "Asia/Omsk" },
-		{ label: "Oral", value: "Asia/Oral" },
-		{ label: "Phnom Penh", value: "Asia/Phnom_Penh" },
-		{ label: "Pontianak", value: "Asia/Pontianak" },
-		{ label: "Pyongyang", value: "Asia/Pyongyang" },
-		{ label: "Qatar", value: "Asia/Qatar" },
-		{ label: "Qostanay", value: "Asia/Qostanay" },
-		{ label: "Qyzylorda", value: "Asia/Qyzylorda" },
-		{ label: "Riyadh", value: "Asia/Riyadh" },
-		{ label: "Sakhalin", value: "Asia/Sakhalin" },
-		{ label: "Samarkand", value: "Asia/Samarkand" },
-		{ label: "Seoul", value: "Asia/Seoul" },
-		{ label: "Shanghai (China Standard Time)", value: "Asia/Shanghai" },
-		{ label: "Singapore", value: "Asia/Singapore" },
-		{ label: "Srednekolymsk", value: "Asia/Srednekolymsk" },
-		{ label: "Taipei", value: "Asia/Taipei" },
-		{ label: "Tashkent", value: "Asia/Tashkent" },
-		{ label: "Tbilisi", value: "Asia/Tbilisi" },
-		{ label: "Tehran", value: "Asia/Tehran" },
-		{ label: "Thimphu", value: "Asia/Thimphu" },
-		{ label: "Tokyo (Japan Standard Time)", value: "Asia/Tokyo" },
-		{ label: "Tomsk", value: "Asia/Tomsk" },
-		{ label: "Ulaanbaatar", value: "Asia/Ulaanbaatar" },
-		{ label: "Urumqi", value: "Asia/Urumqi" },
-		{ label: "Ust-Nera", value: "Asia/Ust-Nera" },
-		{ label: "Vientiane", value: "Asia/Vientiane" },
-		{ label: "Vladivostok", value: "Asia/Vladivostok" },
-		{ label: "Yakutsk", value: "Asia/Yakutsk" },
-		{ label: "Yangon", value: "Asia/Yangon" },
-		{ label: "Yekaterinburg", value: "Asia/Yekaterinburg" },
-		{ label: "Yerevan", value: "Asia/Yerevan" },
-	],
-	Atlantic: [
-		{ label: "Azores", value: "Atlantic/Azores" },
-		{ label: "Bermuda", value: "Atlantic/Bermuda" },
-		{ label: "Canary", value: "Atlantic/Canary" },
-		{ label: "Cape Verde", value: "Atlantic/Cape_Verde" },
-		{ label: "Faroe", value: "Atlantic/Faroe" },
-		{ label: "Madeira", value: "Atlantic/Madeira" },
-		{ label: "Reykjavik", value: "Atlantic/Reykjavik" },
-		{ label: "South Georgia", value: "Atlantic/South_Georgia" },
-		{ label: "St Helena", value: "Atlantic/St_Helena" },
-		{ label: "Stanley", value: "Atlantic/Stanley" },
-	],
-	Australia: [
-		{ label: "Adelaide", value: "Australia/Adelaide" },
-		{ label: "Brisbane", value: "Australia/Brisbane" },
-		{ label: "Broken Hill", value: "Australia/Broken_Hill" },
-		{ label: "Darwin", value: "Australia/Darwin" },
-		{ label: "Eucla", value: "Australia/Eucla" },
-		{ label: "Hobart", value: "Australia/Hobart" },
-		{ label: "Lindeman", value: "Australia/Lindeman" },
-		{ label: "Lord Howe", value: "Australia/Lord_Howe" },
-		{ label: "Melbourne", value: "Australia/Melbourne" },
-		{ label: "Perth", value: "Australia/Perth" },
-		{ label: "Sydney (Australian Eastern Time)", value: "Australia/Sydney" },
-	],
-	Europe: [
-		{ label: "Amsterdam", value: "Europe/Amsterdam" },
-		{ label: "Andorra", value: "Europe/Andorra" },
-		{ label: "Astrakhan", value: "Europe/Astrakhan" },
-		{ label: "Athens", value: "Europe/Athens" },
-		{ label: "Belgrade", value: "Europe/Belgrade" },
-		{ label: "Berlin (Central European Time)", value: "Europe/Berlin" },
-		{ label: "Bratislava", value: "Europe/Bratislava" },
-		{ label: "Brussels", value: "Europe/Brussels" },
-		{ label: "Bucharest", value: "Europe/Bucharest" },
-		{ label: "Budapest", value: "Europe/Budapest" },
-		{ label: "Busingen", value: "Europe/Busingen" },
-		{ label: "Chisinau", value: "Europe/Chisinau" },
-		{ label: "Copenhagen", value: "Europe/Copenhagen" },
-		{ label: "Dublin", value: "Europe/Dublin" },
-		{ label: "Gibraltar", value: "Europe/Gibraltar" },
-		{ label: "Guernsey", value: "Europe/Guernsey" },
-		{ label: "Helsinki", value: "Europe/Helsinki" },
-		{ label: "Isle of Man", value: "Europe/Isle_of_Man" },
-		{ label: "Istanbul", value: "Europe/Istanbul" },
-		{ label: "Jersey", value: "Europe/Jersey" },
-		{ label: "Kaliningrad", value: "Europe/Kaliningrad" },
-		{ label: "Kirov", value: "Europe/Kirov" },
-		{ label: "Kyiv", value: "Europe/Kyiv" },
-		{ label: "Lisbon", value: "Europe/Lisbon" },
-		{ label: "Ljubljana", value: "Europe/Ljubljana" },
-		{ label: "London (Greenwich Mean Time)", value: "Europe/London" },
-		{ label: "Luxembourg", value: "Europe/Luxembourg" },
-		{ label: "Madrid", value: "Europe/Madrid" },
-		{ label: "Malta", value: "Europe/Malta" },
-		{ label: "Mariehamn", value: "Europe/Mariehamn" },
-		{ label: "Minsk", value: "Europe/Minsk" },
-		{ label: "Monaco", value: "Europe/Monaco" },
-		{ label: "Moscow", value: "Europe/Moscow" },
-		{ label: "Oslo", value: "Europe/Oslo" },
-		{ label: "Paris (Central European Time)", value: "Europe/Paris" },
-		{ label: "Podgorica", value: "Europe/Podgorica" },
-		{ label: "Prague", value: "Europe/Prague" },
-		{ label: "Riga", value: "Europe/Riga" },
-		{ label: "Rome", value: "Europe/Rome" },
-		{ label: "Samara", value: "Europe/Samara" },
-		{ label: "San Marino", value: "Europe/San_Marino" },
-		{ label: "Sarajevo", value: "Europe/Sarajevo" },
-		{ label: "Saratov", value: "Europe/Saratov" },
-		{ label: "Simferopol", value: "Europe/Simferopol" },
-		{ label: "Skopje", value: "Europe/Skopje" },
-		{ label: "Sofia", value: "Europe/Sofia" },
-		{ label: "Stockholm", value: "Europe/Stockholm" },
-		{ label: "Tallinn", value: "Europe/Tallinn" },
-		{ label: "Tirane", value: "Europe/Tirane" },
-		{ label: "Ulyanovsk", value: "Europe/Ulyanovsk" },
-		{ label: "Vaduz", value: "Europe/Vaduz" },
-		{ label: "Vatican", value: "Europe/Vatican" },
-		{ label: "Vienna", value: "Europe/Vienna" },
-		{ label: "Vilnius", value: "Europe/Vilnius" },
-		{ label: "Volgograd", value: "Europe/Volgograd" },
-		{ label: "Warsaw", value: "Europe/Warsaw" },
-		{ label: "Zagreb", value: "Europe/Zagreb" },
-		{ label: "Zurich", value: "Europe/Zurich" },
-	],
-	Indian: [
-		{ label: "Antananarivo", value: "Indian/Antananarivo" },
-		{ label: "Chagos", value: "Indian/Chagos" },
-		{ label: "Christmas", value: "Indian/Christmas" },
-		{ label: "Cocos", value: "Indian/Cocos" },
-		{ label: "Comoro", value: "Indian/Comoro" },
-		{ label: "Kerguelen", value: "Indian/Kerguelen" },
-		{ label: "Mahe", value: "Indian/Mahe" },
-		{ label: "Maldives", value: "Indian/Maldives" },
-		{ label: "Mauritius", value: "Indian/Mauritius" },
-		{ label: "Mayotte", value: "Indian/Mayotte" },
-		{ label: "Reunion", value: "Indian/Reunion" },
-	],
-	Pacific: [
-		{ label: "Apia", value: "Pacific/Apia" },
-		{ label: "Auckland", value: "Pacific/Auckland" },
-		{ label: "Bougainville", value: "Pacific/Bougainville" },
-		{ label: "Chatham", value: "Pacific/Chatham" },
-		{ label: "Chuuk", value: "Pacific/Chuuk" },
-		{ label: "Easter", value: "Pacific/Easter" },
-		{ label: "Efate", value: "Pacific/Efate" },
-		{ label: "Fakaofo", value: "Pacific/Fakaofo" },
-		{ label: "Fiji", value: "Pacific/Fiji" },
-		{ label: "Funafuti", value: "Pacific/Funafuti" },
-		{ label: "Galapagos", value: "Pacific/Galapagos" },
-		{ label: "Gambier", value: "Pacific/Gambier" },
-		{ label: "Guadalcanal", value: "Pacific/Guadalcanal" },
-		{ label: "Guam", value: "Pacific/Guam" },
-		{ label: "Honolulu", value: "Pacific/Honolulu" },
-		{ label: "Kanton", value: "Pacific/Kanton" },
-		{ label: "Kiritimati", value: "Pacific/Kiritimati" },
-		{ label: "Kosrae", value: "Pacific/Kosrae" },
-		{ label: "Kwajalein", value: "Pacific/Kwajalein" },
-		{ label: "Majuro", value: "Pacific/Majuro" },
-		{ label: "Marquesas", value: "Pacific/Marquesas" },
-		{ label: "Midway", value: "Pacific/Midway" },
-		{ label: "Nauru", value: "Pacific/Nauru" },
-		{ label: "Niue", value: "Pacific/Niue" },
-		{ label: "Norfolk", value: "Pacific/Norfolk" },
-		{ label: "Noumea", value: "Pacific/Noumea" },
-		{ label: "Pago Pago", value: "Pacific/Pago_Pago" },
-		{ label: "Palau", value: "Pacific/Palau" },
-		{ label: "Pitcairn", value: "Pacific/Pitcairn" },
-		{ label: "Pohnpei", value: "Pacific/Pohnpei" },
-		{ label: "Port Moresby", value: "Pacific/Port_Moresby" },
-		{ label: "Rarotonga", value: "Pacific/Rarotonga" },
-		{ label: "Saipan", value: "Pacific/Saipan" },
-		{ label: "Tahiti", value: "Pacific/Tahiti" },
-		{ label: "Tarawa", value: "Pacific/Tarawa" },
-		{ label: "Tongatapu", value: "Pacific/Tongatapu" },
-		{ label: "Wake", value: "Pacific/Wake" },
-		{ label: "Wallis", value: "Pacific/Wallis" },
-	],
-};
-
-// Helper to get display label for a timezone value
-export function getTimezoneLabel(value: string | undefined): string {
-	if (!value) return "UTC (default)";
-	return value;
-}

apps/dokploy/components/dashboard/application/volume-backups/show-volume-backups.tsx

@@ -86,7 +86,7 @@ export const ShowVolumeBackups = ({
 						</CardTitle>
 						<CardDescription>
 							Schedule volume backups to run automatically at specified
-							intervals
+							intervals.
 						</CardDescription>
 					</div>
 					<div className="flex items-center gap-2 flex-wrap">

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

@@ -49,7 +49,7 @@ export function parseLogs(logString: string): LogLine[] {
 	// { timestamp: new Date("2024-12-10T10:00:00.000Z"),
 	// message: "The server is running on port 8080" }
 	const logRegex =
-		/^(?:(?<lineNumber>\d+)\s+)?(?<timestamp>(?:\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z|\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} UTC))?\s*(?<message>[\s\S]*)$/;
+		/^(?:(\d+)\s+)?(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z|\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} UTC)?\s*(.*)$/;
 
 	return logString
 		.split("\n")
@@ -59,7 +59,7 @@ export function parseLogs(logString: string): LogLine[] {
 			const match = line.match(logRegex);
 			if (!match) return null;
 
-			const { timestamp, message } = match.groups ?? {};
+			const [, , timestamp, message] = match;
 
 			if (!message?.trim()) return null;
 
@@ -108,8 +108,7 @@ export const getLogType = (message: string): LogStyle => {
 		/(?:might|may|could)\s+(?:not|cause|lead\s+to)/i.test(lowerMessage) ||
 		/(?:!+\s*(?:warning|caution|attention)\s*!+)/i.test(lowerMessage) ||
 		/\b(?:deprecated|obsolete)\b/i.test(lowerMessage) ||
-		/\b(?:unstable|experimental)\b/i.test(lowerMessage) ||
-		/⚠|⚠️/i.test(lowerMessage)
+		/\b(?:unstable|experimental)\b/i.test(lowerMessage)
 	) {
 		return LOG_STYLES.warning;
 	}

apps/dokploy/components/dashboard/impersonation/impersonation-bar.tsx

@@ -103,7 +103,7 @@ export const ImpersonationBar = () => {
 			setOpen(false);
 
 			toast.success("Successfully impersonating user", {
-				description: `You are now viewing as ${`${selectedUser.name} ${selectedUser.lastName}`.trim() || selectedUser.email}`,
+				description: `You are now viewing as ${selectedUser.name || selectedUser.email}`,
 			});
 			window.location.reload();
 		} catch (error) {
@@ -195,8 +195,7 @@ export const ImpersonationBar = () => {
 													<UserIcon className="mr-2 h-4 w-4 flex-shrink-0" />
 													<span className="truncate flex flex-col items-start">
 														<span className="text-sm font-medium">
-															{`${selectedUser.name} ${selectedUser.lastName}`.trim() ||
-																""}
+															{selectedUser.name || ""}
 														</span>
 														<span className="text-xs text-muted-foreground">
 															{selectedUser.email}
@@ -243,8 +242,7 @@ export const ImpersonationBar = () => {
 																		<UserIcon className="h-4 w-4 flex-shrink-0" />
 																		<span className="flex flex-col items-start">
 																			<span className="text-sm font-medium">
-																				{`${user.name} ${user.lastName}`.trim() ||
-																					""}
+																				{user.name || ""}
 																			</span>
 																			<span className="text-xs text-muted-foreground">
 																				{user.email} • {user.role}
@@ -285,14 +283,10 @@ export const ImpersonationBar = () => {
 										<AvatarImage
 											className="object-cover"
 											src={data?.user?.image || ""}
-											alt={
-												`${data?.user?.firstName} ${data?.user?.lastName}`.trim() ||
-												""
-											}
+											alt={data?.user?.name || ""}
 										/>
 										<AvatarFallback>
-											{`${data?.user?.firstName?.[0] || ""}${data?.user?.lastName?.[0] || ""}`.toUpperCase() ||
-												"U"}
+											{data?.user?.name?.slice(0, 2).toUpperCase() || "U"}
 										</AvatarFallback>
 									</Avatar>
 									<div className="flex flex-col gap-1">
@@ -305,8 +299,7 @@ export const ImpersonationBar = () => {
 												Impersonating
 											</Badge>
 											<span className="font-medium">
-												{`${data?.user?.firstName} ${data?.user?.lastName}`.trim() ||
-													""}
+												{data?.user?.name || ""}
 											</span>
 										</div>
 										<div className="flex items-center gap-3 text-sm text-muted-foreground flex-wrap">

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

@@ -10,7 +10,7 @@ import { DockerNetworkChart } from "./docker-network-chart";
 
 const defaultData = {
 	cpu: {
-		value: "0%",
+		value: 0,
 		time: "",
 	},
 	memory: {
@@ -46,7 +46,7 @@ interface Props {
 }
 export interface DockerStats {
 	cpu: {
-		value: string;
+		value: number;
 		time: string;
 	};
 	memory: {
@@ -220,13 +220,7 @@ export const ContainerFreeMonitoring = ({
 							<span className="text-sm text-muted-foreground">
 								Used: {currentData.cpu.value}
 							</span>
-							<Progress
-								value={Number.parseInt(
-									currentData.cpu.value.replace("%", ""),
-									10,
-								)}
-								className="w-[100%]"
-							/>
+							<Progress value={currentData.cpu.value} className="w-[100%]" />
 							<DockerCpuChart acummulativeData={acummulativeData.cpu} />
 						</div>
 					</CardContent>

apps/dokploy/components/dashboard/postgres/advanced/show-custom-command.tsx

@@ -1,7 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Plus, Trash2 } 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 { Button } from "@/components/ui/button";
@@ -21,13 +20,6 @@ import type { ServiceType } from "../../application/advanced/show-resources";
 const addDockerImage = z.object({
 	dockerImage: z.string().min(1, "Docker image is required"),
 	command: z.string(),
-	args: z
-		.array(
-			z.object({
-				value: z.string().min(1, "Argument cannot be empty"),
-			}),
-		)
-		.optional(),
 });
 
 interface Props {
@@ -69,25 +61,18 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 		defaultValues: {
 			dockerImage: "",
 			command: "",
-			args: [],
 		},
 		resolver: zodResolver(addDockerImage),
 	});
 
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "args",
-	});
-
 	useEffect(() => {
 		if (data) {
 			form.reset({
 				dockerImage: data.dockerImage,
 				command: data.command || "",
-				args: data.args?.map((arg) => ({ value: arg })) || [],
 			});
 		}
-	}, [data, form]);
+	}, [data, form, form.reset]);
 
 	const onSubmit = async (formData: AddDockerImage) => {
 		await mutateAsync({
@@ -98,7 +83,6 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 			mariadbId: id || "",
 			dockerImage: formData?.dockerImage,
 			command: formData?.command,
-			args: formData?.args?.map((arg) => arg.value).filter(Boolean),
 		})
 			.then(async () => {
 				toast.success("Custom Command Updated");
@@ -144,68 +128,13 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 										<FormItem>
 											<FormLabel>Command</FormLabel>
 											<FormControl>
-												<Input placeholder="/bin/sh" {...field} />
+												<Input placeholder="Custom command" {...field} />
 											</FormControl>
 
 											<FormMessage />
 										</FormItem>
 									)}
 								/>
-
-								<div className="space-y-2">
-									<div className="flex items-center justify-between">
-										<FormLabel>Arguments (Args)</FormLabel>
-										<Button
-											type="button"
-											variant="outline"
-											size="sm"
-											onClick={() => append({ value: "" })}
-										>
-											<Plus className="h-4 w-4 mr-1" />
-											Add Argument
-										</Button>
-									</div>
-
-									{fields.length === 0 && (
-										<p className="text-sm text-muted-foreground">
-											No arguments added yet. Click "Add Argument" to add one.
-										</p>
-									)}
-
-									{fields.map((field, index) => (
-										<FormField
-											key={field.id}
-											control={form.control}
-											name={`args.${index}.value`}
-											render={({ field }) => (
-												<FormItem>
-													<div className="flex gap-2">
-														<FormControl>
-															<Input
-																placeholder={
-																	index === 0
-																		? "-c"
-																		: "redis-server --port 6379"
-																}
-																{...field}
-															/>
-														</FormControl>
-														<Button
-															type="button"
-															variant="destructive"
-															size="icon"
-															onClick={() => remove(index)}
-														>
-															<Trash2 className="h-4 w-4" />
-														</Button>
-													</div>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-									))}
-								</div>
-
 								<div className="flex w-full justify-end">
 									<Button isLoading={form.formState.isSubmitting} type="submit">
 										Save

apps/dokploy/components/dashboard/project/add-application.tsx

@@ -150,8 +150,8 @@ export const AddApplication = ({ environmentId, projectName }: Props) => {
 											placeholder="Frontend"
 											{...field}
 											onChange={(e) => {
-												const val = e.target.value || "";
-												const serviceName = slugify(val.trim());
+												const val = e.target.value?.trim() || "";
+												const serviceName = slugify(val);
 												form.setValue("appName", `${slug}-${serviceName}`);
 												field.onChange(val);
 											}}

apps/dokploy/components/dashboard/project/add-compose.tsx

@@ -161,8 +161,8 @@ export const AddCompose = ({ environmentId, projectName }: Props) => {
 												placeholder="Frontend"
 												{...field}
 												onChange={(e) => {
-													const val = e.target.value || "";
-													const serviceName = slugify(val.trim());
+													const val = e.target.value?.trim() || "";
+													const serviceName = slugify(val);
 													form.setValue("appName", `${slug}-${serviceName}`);
 													field.onChange(val);
 												}}

apps/dokploy/components/dashboard/project/add-database.tsx

@@ -395,8 +395,8 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
 													placeholder="Name"
 													{...field}
 													onChange={(e) => {
-														const val = e.target.value || "";
-														const serviceName = slugify(val.trim());
+														const val = e.target.value?.trim() || "";
+														const serviceName = slugify(val);
 														form.setValue("appName", `${slug}-${serviceName}`);
 														field.onChange(val);
 													}}

apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx

@@ -1,8 +1,15 @@
 import type { findEnvironmentsByProjectId } from "@dokploy/server";
-import { ChevronDownIcon, PencilIcon, PlusIcon, TrashIcon } from "lucide-react";
+import {
+	ChevronDownIcon,
+	PencilIcon,
+	PlusIcon,
+	Terminal,
+	TrashIcon,
+} from "lucide-react";
 import { useRouter } from "next/router";
 import { useState } from "react";
 import { toast } from "sonner";
+import { EnvironmentVariables } from "@/components/dashboard/project/environment-variables";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
@@ -102,9 +109,7 @@ export const AdvancedEnvironmentSelector = ({
 			setName("");
 			setDescription("");
 		} catch (error) {
-			toast.error(
-				`Failed to create environment: ${error instanceof Error ? error.message : error}`,
-			);
+			toast.error("Failed to create environment");
 		}
 	};
 
@@ -125,9 +130,7 @@ export const AdvancedEnvironmentSelector = ({
 			setName("");
 			setDescription("");
 		} catch (error) {
-			toast.error(
-				`Failed to update environment: ${error instanceof Error ? error.message : error}`,
-			);
+			toast.error("Failed to update environment");
 		}
 	};
 
@@ -144,18 +147,15 @@ export const AdvancedEnvironmentSelector = ({
 			setIsDeleteDialogOpen(false);
 			setSelectedEnvironment(null);
 
-			// Redirect to first available environment if we deleted the current environment
+			// Redirect to production if we deleted the current environment
 			if (selectedEnvironment.environmentId === currentEnvironmentId) {
-				const firstEnv = environments?.find(
-					(env) => env.environmentId !== selectedEnvironment.environmentId,
+				const productionEnv = environments?.find(
+					(env) => env.name === "production",
 				);
-				if (firstEnv) {
+				if (productionEnv) {
 					router.push(
-						`/dashboard/project/${projectId}/environment/${firstEnv.environmentId}`,
+						`/dashboard/project/${projectId}/environment/${productionEnv.environmentId}`,
 					);
-				} else {
-					// No other environments, redirect to project page
-					router.push(`/dashboard/project/${projectId}`);
 				}
 			}
 		} catch (error) {
@@ -246,8 +246,22 @@ export const AdvancedEnvironmentSelector = ({
 										)}
 									</div>
 								</DropdownMenuItem>
-								<div className="flex items-center gap-1 px-2">
-									{!environment.isDefault && (
+
+								{/* Action buttons for non-production environments */}
+								{/* <EnvironmentVariables environmentId={environment.environmentId}>
+									<Button
+										variant="ghost"
+										size="sm"
+										className="h-6 w-6 p-0"
+										onClick={(e) => {
+											e.stopPropagation();
+										}}
+									>
+										<Terminal className="h-3 w-3" />
+									</Button>
+								</EnvironmentVariables> */}
+								{environment.name !== "production" && (
+									<div className="flex items-center gap-1 px-2">
 										<Button
 											variant="ghost"
 											size="sm"
@@ -259,21 +273,22 @@ export const AdvancedEnvironmentSelector = ({
 										>
 											<PencilIcon className="h-3 w-3" />
 										</Button>
-									)}
-									{canDeleteEnvironments && !environment.isDefault && (
-										<Button
-											variant="ghost"
-											size="sm"
-											className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
-											onClick={(e) => {
-												e.stopPropagation();
-												openDeleteDialog(environment);
-											}}
-										>
-											<TrashIcon className="h-3 w-3" />
-										</Button>
-									)}
-								</div>
+
+										{canDeleteEnvironments && (
+											<Button
+												variant="ghost"
+												size="sm"
+												className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
+												onClick={(e) => {
+													e.stopPropagation();
+													openDeleteDialog(environment);
+												}}
+											>
+												<TrashIcon className="h-3 w-3" />
+											</Button>
+										)}
+									</div>
+								)}
 							</div>
 						);
 					})}

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

@@ -10,7 +10,6 @@ import {
 	TrashIcon,
 } from "lucide-react";
 import Link from "next/link";
-import { useRouter } from "next/router";
 import { useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { BreadcrumbSidebar } from "@/components/shared/breadcrumb-sidebar";
@@ -55,23 +54,16 @@ import {
 } from "@/components/ui/select";
 import { TimeBadge } from "@/components/ui/time-badge";
 import { api } from "@/utils/api";
-import { useDebounce } from "@/utils/hooks/use-debounce";
 import { HandleProject } from "./handle-project";
 import { ProjectEnvironment } from "./project-environment";
 
 export const ShowProjects = () => {
 	const utils = api.useUtils();
-	const router = useRouter();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data, isLoading } = api.project.all.useQuery();
 	const { data: auth } = api.user.get.useQuery();
 	const { mutateAsync } = api.project.remove.useMutation();
-
-	const [searchQuery, setSearchQuery] = useState(
-		router.isReady && typeof router.query.q === "string" ? router.query.q : "",
-	);
-	const debouncedSearchQuery = useDebounce(searchQuery, 500);
-
+	const [searchQuery, setSearchQuery] = useState("");
 	const [sortBy, setSortBy] = useState<string>(() => {
 		if (typeof window !== "undefined") {
 			return localStorage.getItem("projectsSort") || "createdAt-desc";
@@ -83,41 +75,14 @@ export const ShowProjects = () => {
 		localStorage.setItem("projectsSort", sortBy);
 	}, [sortBy]);
 
-	useEffect(() => {
-		if (!router.isReady) return;
-		const urlQuery = typeof router.query.q === "string" ? router.query.q : "";
-		if (urlQuery !== searchQuery) {
-			setSearchQuery(urlQuery);
-		}
-	}, [router.isReady, router.query.q]);
-
-	useEffect(() => {
-		if (!router.isReady) return;
-		const urlQuery = typeof router.query.q === "string" ? router.query.q : "";
-		if (debouncedSearchQuery === urlQuery) return;
-
-		const newQuery = { ...router.query };
-		if (debouncedSearchQuery) {
-			newQuery.q = debouncedSearchQuery;
-		} else {
-			delete newQuery.q;
-		}
-		router.replace({ pathname: router.pathname, query: newQuery }, undefined, {
-			shallow: true,
-		});
-	}, [debouncedSearchQuery]);
-
 	const filteredProjects = useMemo(() => {
 		if (!data) return [];
 
+		// First filter by search query
 		const filtered = data.filter(
 			(project) =>
-				project.name
-					.toLowerCase()
-					.includes(debouncedSearchQuery.toLowerCase()) ||
-				project.description
-					?.toLowerCase()
-					.includes(debouncedSearchQuery.toLowerCase()),
+				project.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+				project.description?.toLowerCase().includes(searchQuery.toLowerCase()),
 		);
 
 		// Then sort the filtered results
@@ -165,7 +130,7 @@ export const ShowProjects = () => {
 			}
 			return direction === "asc" ? comparison : -comparison;
 		});
-	}, [data, debouncedSearchQuery, sortBy]);
+	}, [data, searchQuery, sortBy]);
 
 	return (
 		<>
@@ -173,7 +138,7 @@ export const ShowProjects = () => {
 				list={[{ name: "Projects", href: "/dashboard/projects" }]}
 			/>
 			{!isCloud && (
-				<div className="absolute top-4 right-4">
+				<div className="absolute top-5 right-5">
 					<TimeBadge />
 				</div>
 			)}
@@ -190,9 +155,7 @@ export const ShowProjects = () => {
 									Create and manage your projects
 								</CardDescription>
 							</CardHeader>
-							{(auth?.role === "owner" ||
-								auth?.role === "admin" ||
-								auth?.canCreateProjects) && (
+							{(auth?.role === "owner" || auth?.canCreateProjects) && (
 								<div className="">
 									<HandleProject />
 								</div>
@@ -288,17 +251,13 @@ export const ShowProjects = () => {
 												)
 												.some(Boolean);
 
-											const productionEnvironment = project?.environments.find(
-												(env) => env.isDefault,
-											);
-
 											return (
 												<div
 													key={project.projectId}
 													className="w-full lg:max-w-md"
 												>
 													<Link
-														href={`/dashboard/project/${project.projectId}/environment/${productionEnvironment?.environmentId}`}
+														href={`/dashboard/project/${project.projectId}/environment/${project?.environments?.[0]?.environmentId}`}
 													>
 														<Card className="group relative w-full h-full bg-transparent transition-colors hover:bg-border">
 															{haveServicesWithDomains ? (

apps/dokploy/components/dashboard/requests/request-distribution-chart.tsx

@@ -49,65 +49,51 @@ export const RequestDistributionChart = ({
 	);
 
 	return (
-		<div className="w-full h-[200px] overflow-hidden">
-			<ResponsiveContainer
-				width="100%"
-				height="100%"
-				className="overflow-hidden"
-			>
-				<ChartContainer config={chartConfig}>
-					<AreaChart
-						accessibilityLayer
-						data={stats || []}
-						margin={{
-							top: 10,
-							left: 12,
-							right: 12,
-							bottom: 0,
-						}}
-					>
-						<CartesianGrid vertical={false} />
-						<XAxis
-							dataKey="hour"
-							tickLine={false}
-							axisLine={false}
-							tickMargin={8}
-							tickFormatter={(value) =>
-								new Date(value).toLocaleTimeString([], {
-									hour: "2-digit",
-									minute: "2-digit",
-								})
-							}
-						/>
-						<YAxis
-							tickLine={false}
-							axisLine={false}
-							tickMargin={8}
-							allowDataOverflow={false}
-							domain={[0, "auto"]}
-						/>
-						<ChartTooltip
-							cursor={false}
-							content={<ChartTooltipContent indicator="line" />}
-							labelFormatter={(value) =>
-								new Date(value).toLocaleString([], {
-									month: "short",
-									day: "numeric",
-									hour: "2-digit",
-									minute: "2-digit",
-								})
-							}
-						/>
-						<Area
-							dataKey="count"
-							type="monotone"
-							fill="hsl(var(--chart-1))"
-							fillOpacity={0.4}
-							stroke="hsl(var(--chart-1))"
-						/>
-					</AreaChart>
-				</ChartContainer>
-			</ResponsiveContainer>
-		</div>
+		<ResponsiveContainer width="100%" height={200}>
+			<ChartContainer config={chartConfig}>
+				<AreaChart
+					accessibilityLayer
+					data={stats || []}
+					margin={{
+						left: 12,
+						right: 12,
+					}}
+				>
+					<CartesianGrid vertical={false} />
+					<XAxis
+						dataKey="hour"
+						tickLine={false}
+						axisLine={false}
+						tickMargin={8}
+						tickFormatter={(value) =>
+							new Date(value).toLocaleTimeString([], {
+								hour: "2-digit",
+								minute: "2-digit",
+							})
+						}
+					/>
+					<YAxis tickLine={false} axisLine={false} tickMargin={8} />
+					<ChartTooltip
+						cursor={false}
+						content={<ChartTooltipContent indicator="line" />}
+						labelFormatter={(value) =>
+							new Date(value).toLocaleString([], {
+								month: "short",
+								day: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+							})
+						}
+					/>
+					<Area
+						dataKey="count"
+						type="natural"
+						fill="hsl(var(--chart-1))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-1))"
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</ResponsiveContainer>
 	);
 };

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

@@ -51,38 +51,13 @@ export const ShowRequests = () => {
 	const { mutateAsync: updateLogCleanup } =
 		api.settings.updateLogCleanup.useMutation();
 	const [cronExpression, setCronExpression] = useState<string | null>(null);
-
-	// Set default date range to last 3 days
-	const getDefaultDateRange = () => {
-		const to = new Date();
-		const from = new Date();
-		from.setDate(from.getDate() - 3);
-		return { from, to };
-	};
-
 	const [dateRange, setDateRange] = useState<{
 		from: Date | undefined;
 		to: Date | undefined;
-	}>(getDefaultDateRange());
-
-	// Check if logs exist to determine if traefik has been reloaded
-	// Only fetch when active to minimize network calls
-	const { data: statsLogsCheck } = api.settings.readStatsLogs.useQuery(
-		{
-			page: {
-				pageIndex: 0,
-				pageSize: 1,
-			},
-		},
-		{
-			enabled: !!isActive,
-			refetchInterval: 5000, // Check every 5 seconds when active
-		},
-	);
-
-	// Determine if warning should be shown
-	// Show warning only if active but no logs exist yet
-	const shouldShowWarning = isActive && (statsLogsCheck?.totalCount ?? 0) === 0;
+	}>({
+		from: undefined,
+		to: undefined,
+	});
 
 	useEffect(() => {
 		if (logCleanupStatus) {
@@ -104,18 +79,16 @@ export const ShowRequests = () => {
 								See all the incoming requests that pass trough Traefik
 							</CardDescription>
 
-							{shouldShowWarning && (
-								<AlertBlock type="warning">
-									When you activate, you need to reload traefik to apply the
-									changes, you can reload traefik in{" "}
-									<Link
-										href="/dashboard/settings/server"
-										className="text-primary"
-									>
-										Settings
-									</Link>
-								</AlertBlock>
-							)}
+							<AlertBlock type="warning">
+								When you activate, you need to reload traefik to apply the
+								changes, you can reload traefik in{" "}
+								<Link
+									href="/dashboard/settings/server"
+									className="text-primary"
+								>
+									Settings
+								</Link>
+							</AlertBlock>
 						</CardHeader>
 						<CardContent className="space-y-2 py-8 border-t">
 							<div className="flex w-full gap-4 justify-end items-center">
@@ -196,13 +169,17 @@ export const ShowRequests = () => {
 							{isActive ? (
 								<>
 									<div className="flex justify-end mb-4 gap-2">
-										<Button
-											variant="outline"
-											onClick={() => setDateRange(getDefaultDateRange())}
-											className="px-3"
-										>
-											Reset to Last 3 Days
-										</Button>
+										{(dateRange.from || dateRange.to) && (
+											<Button
+												variant="outline"
+												onClick={() =>
+													setDateRange({ from: undefined, to: undefined })
+												}
+												className="px-3"
+											>
+												Clear dates
+											</Button>
+										)}
 										<Popover>
 											<PopoverTrigger asChild>
 												<Button

apps/dokploy/components/dashboard/search-command.tsx

@@ -89,26 +89,24 @@ export const SearchCommand = () => {
 					<CommandGroup heading={"Projects"}>
 						<CommandList>
 							{data?.map((project) => {
-								// Find default environment, or fall back to first environment
-								const defaultEnvironment =
-									project.environments.find(
-										(environment) => environment.isDefault,
-									) || project?.environments?.[0];
+								const productionEnvironment = project.environments.find(
+									(environment) => environment.name === "production",
+								);
 
-								if (!defaultEnvironment) return null;
+								if (!productionEnvironment) return null;
 
 								return (
 									<CommandItem
 										key={project.projectId}
 										onSelect={() => {
 											router.push(
-												`/dashboard/project/${project.projectId}/environment/${defaultEnvironment.environmentId}`,
+												`/dashboard/project/${project.projectId}/environment/${productionEnvironment!.environmentId}`,
 											);
 											setOpen(false);
 										}}
 									>
 										<BookIcon className="size-4 text-muted-foreground mr-2" />
-										{project.name} / {defaultEnvironment.name}
+										{project.name} / {productionEnvironment!.name}
 									</CommandItem>
 								);
 							})}

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

@@ -42,38 +42,12 @@ const AddRegistrySchema = z.object({
 	username: z.string().min(1, {
 		message: "Username is required",
 	}),
-	password: z.string(),
-	registryUrl: z
-		.string()
-		.optional()
-		.refine(
-			(val) => {
-				// If empty or undefined, skip validation (field is optional)
-				if (!val || val.trim().length === 0) {
-					return true;
-				}
-				// Validate that it's a valid hostname (no protocol, no path, optional port)
-				// Valid formats: example.com, registry.example.com, [::1], example.com:5000
-				// Invalid: https://example.com, example.com/path
-				const trimmed = val.trim();
-				// Check for protocol or path - these are not allowed
-				if (/^https?:\/\//i.test(trimmed) || trimmed.includes("/")) {
-					return false;
-				}
-				// Basic hostname validation: allow alphanumeric, dots, hyphens, underscores, and IPv6 in brackets
-				// Allow optional port at the end
-				const hostnameRegex =
-					/^(?:\[[^\]]+\]|[a-zA-Z0-9](?:[a-zA-Z0-9._-]{0,253}[a-zA-Z0-9])?)(?::\d+)?$/;
-				return hostnameRegex.test(trimmed);
-			},
-			{
-				message:
-					"Invalid registry URL. Please enter only the hostname (e.g., example.com or registry.example.com). Do not include protocol (https://) or paths.",
-			},
-		),
+	password: z.string().min(1, {
+		message: "Password is required",
+	}),
+	registryUrl: z.string(),
 	imagePrefix: z.string(),
 	serverId: z.string().optional(),
-	isEditing: z.boolean().optional(),
 });
 
 type AddRegistry = z.infer<typeof AddRegistrySchema>;
@@ -100,21 +74,13 @@ export const HandleRegistry = ({ registryId }: Props) => {
 	const { mutateAsync, error, isError } = registryId
 		? api.registry.update.useMutation()
 		: api.registry.create.useMutation();
-	const { data: deployServers } = api.server.withSSHKey.useQuery();
-	const { data: buildServers } = api.server.buildServers.useQuery();
-	const servers = [...(deployServers || []), ...(buildServers || [])];
+	const { data: servers } = api.server.withSSHKey.useQuery();
 	const {
 		mutateAsync: testRegistry,
 		isLoading,
 		error: testRegistryError,
 		isError: testRegistryIsError,
 	} = api.registry.testRegistry.useMutation();
-	const {
-		mutateAsync: testRegistryById,
-		isLoading: isLoadingById,
-		error: testRegistryByIdError,
-		isError: testRegistryByIdIsError,
-	} = api.registry.testRegistryById.useMutation();
 	const form = useForm<AddRegistry>({
 		defaultValues: {
 			username: "",
@@ -123,26 +89,8 @@ export const HandleRegistry = ({ registryId }: Props) => {
 			imagePrefix: "",
 			registryName: "",
 			serverId: "",
-			isEditing: !!registryId,
 		},
-		resolver: zodResolver(
-			AddRegistrySchema.refine(
-				(data) => {
-					// When creating a new registry, password is required
-					if (
-						!data.isEditing &&
-						(!data.password || data.password.length === 0)
-					) {
-						return false;
-					}
-					return true;
-				},
-				{
-					message: "Password is required",
-					path: ["password"],
-				},
-			),
-		),
+		resolver: zodResolver(AddRegistrySchema),
 	});
 
 	const password = form.watch("password");
@@ -151,9 +99,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 	const registryName = form.watch("registryName");
 	const imagePrefix = form.watch("imagePrefix");
 	const serverId = form.watch("serverId");
-	const selectedServer = servers?.find(
-		(server) => server.serverId === serverId,
-	);
 
 	useEffect(() => {
 		if (registry) {
@@ -163,7 +108,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 				registryUrl: registry.registryUrl,
 				imagePrefix: registry.imagePrefix || "",
 				registryName: registry.registryName,
-				isEditing: true,
 			});
 		} else {
 			form.reset({
@@ -172,29 +116,21 @@ export const HandleRegistry = ({ registryId }: Props) => {
 				registryUrl: "",
 				imagePrefix: "",
 				serverId: "",
-				isEditing: false,
 			});
 		}
 	}, [form, form.reset, form.formState.isSubmitSuccessful, registry]);
 
 	const onSubmit = async (data: AddRegistry) => {
-		const payload: any = {
+		await mutateAsync({
+			password: data.password,
 			registryName: data.registryName,
 			username: data.username,
-			registryUrl: data.registryUrl || "",
+			registryUrl: data.registryUrl,
 			registryType: "cloud",
 			imagePrefix: data.imagePrefix,
 			serverId: data.serverId,
 			registryId: registryId || "",
-		};
-
-		// Only include password if it's been provided (not empty)
-		// When editing, empty password means "keep the existing password"
-		if (data.password && data.password.length > 0) {
-			payload.password = data.password;
-		}
-
-		await mutateAsync(payload)
+		})
 			.then(async (_data) => {
 				await utils.registry.all.invalidate();
 				toast.success(registryId ? "Registry updated" : "Registry added");
@@ -232,14 +168,11 @@ export const HandleRegistry = ({ registryId }: Props) => {
 						Fill the next fields to add a external registry.
 					</DialogDescription>
 				</DialogHeader>
-				{(isError || testRegistryIsError || testRegistryByIdIsError) && (
+				{(isError || testRegistryIsError) && (
 					<div className="flex flex-row gap-4 rounded-lg bg-red-50 p-2 dark:bg-red-950">
 						<AlertTriangle className="text-red-600 dark:text-red-400" />
 						<span className="text-sm text-red-600 dark:text-red-400">
-							{testRegistryError?.message ||
-								testRegistryByIdError?.message ||
-								error?.message ||
-								""}
+							{testRegistryError?.message || error?.message || ""}
 						</span>
 					</div>
 				)}
@@ -290,20 +223,10 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								name="password"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Password{registryId && " (Optional)"}</FormLabel>
-										{registryId && (
-											<FormDescription>
-												Leave blank to keep existing password. Enter new
-												password to test or update it.
-											</FormDescription>
-										)}
+										<FormLabel>Password</FormLabel>
 										<FormControl>
 											<Input
-												placeholder={
-													registryId
-														? "Leave blank to keep existing"
-														: "Password"
-												}
+												placeholder="Password"
 												autoComplete="one-time-code"
 												{...field}
 												type="password"
@@ -338,10 +261,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								render={({ field }) => (
 									<FormItem>
 										<FormLabel>Registry URL</FormLabel>
-										<FormDescription>
-											Enter only the hostname (e.g.,
-											aws_account_id.dkr.ecr.us-west-2.amazonaws.com).
-										</FormDescription>
 										<FormControl>
 											<Input
 												placeholder="aws_account_id.dkr.ecr.us-west-2.amazonaws.com"
@@ -363,40 +282,8 @@ export const HandleRegistry = ({ registryId }: Props) => {
 									<FormItem>
 										<FormLabel>Server {!isCloud && "(Optional)"}</FormLabel>
 										<FormDescription>
-											{!isCloud ? (
-												<>
-													{serverId && serverId !== "none" && selectedServer ? (
-														<>
-															Authentication will be performed on{" "}
-															<strong>{selectedServer.name}</strong>. This
-															registry will be available on this server.
-														</>
-													) : (
-														<>
-															Choose where to authenticate with the registry. By
-															default, authentication occurs on the Dokploy
-															server. Select a specific server to authenticate
-															from that server instead.
-														</>
-													)}
-												</>
-											) : (
-												<>
-													{serverId && serverId !== "none" && selectedServer ? (
-														<>
-															Authentication will be performed on{" "}
-															<strong>{selectedServer.name}</strong>. This
-															registry will be available on this server.
-														</>
-													) : (
-														<>
-															Select a server to authenticate with the registry.
-															The authentication will be performed from the
-															selected server.
-														</>
-													)}
-												</>
-											)}
+											Select a server to test the registry. this will run the
+											following command on the server
 										</FormDescription>
 										<FormControl>
 											<Select
@@ -407,33 +294,16 @@ export const HandleRegistry = ({ registryId }: Props) => {
 													<SelectValue placeholder="Select a server" />
 												</SelectTrigger>
 												<SelectContent>
-													{deployServers && deployServers.length > 0 && (
-														<SelectGroup>
-															<SelectLabel>Deploy Servers</SelectLabel>
-															{deployServers.map((server) => (
-																<SelectItem
-																	key={server.serverId}
-																	value={server.serverId}
-																>
-																	{server.name}
-																</SelectItem>
-															))}
-														</SelectGroup>
-													)}
-													{buildServers && buildServers.length > 0 && (
-														<SelectGroup>
-															<SelectLabel>Build Servers</SelectLabel>
-															{buildServers.map((server) => (
-																<SelectItem
-																	key={server.serverId}
-																	value={server.serverId}
-																>
-																	{server.name}
-																</SelectItem>
-															))}
-														</SelectGroup>
-													)}
 													<SelectGroup>
+														<SelectLabel>Servers</SelectLabel>
+														{servers?.map((server) => (
+															<SelectItem
+																key={server.serverId}
+																value={server.serverId}
+															>
+																{server.name}
+															</SelectItem>
+														))}
 														<SelectItem value={"none"}>None</SelectItem>
 													</SelectGroup>
 												</SelectContent>
@@ -451,37 +321,8 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								<Button
 									type="button"
 									variant={"secondary"}
-									isLoading={isLoading || isLoadingById}
+									isLoading={isLoading}
 									onClick={async () => {
-										// When editing with empty password, use the existing password from DB
-										if (registryId && (!password || password.length === 0)) {
-											await testRegistryById({
-												registryId: registryId || "",
-												...(serverId && { serverId }),
-											})
-												.then((data) => {
-													if (data) {
-														toast.success("Registry Tested Successfully");
-													} else {
-														toast.error("Registry Test Failed");
-													}
-												})
-												.catch(() => {
-													toast.error("Error testing the registry");
-												});
-											return;
-										}
-
-										// When creating, password is required
-										if (!registryId && (!password || password.length === 0)) {
-											form.setError("password", {
-												type: "manual",
-												message: "Password is required",
-											});
-											return;
-										}
-
-										// When creating or editing with new password, validate and test with provided credentials
 										const validationResult = AddRegistrySchema.safeParse({
 											username,
 											password,
@@ -489,7 +330,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 											registryName: "Dokploy Registry",
 											imagePrefix,
 											serverId,
-											isEditing: !!registryId,
 										});
 
 										if (!validationResult.success) {
@@ -505,7 +345,7 @@ export const HandleRegistry = ({ registryId }: Props) => {
 										await testRegistry({
 											username: username,
 											password: password,
-											registryUrl: registryUrl || "",
+											registryUrl: registryUrl,
 											registryName: registryName,
 											registryType: "cloud",
 											imagePrefix: imagePrefix,

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

@@ -122,9 +122,6 @@ export const HandleDestinations = ({ destinationId }: Props) => {
 			.then(async () => {
 				toast.success(`Destination ${destinationId ? "Updated" : "Created"}`);
 				await utils.destination.all.invalidate();
-				if (destinationId) {
-					await utils.destination.one.invalidate({ destinationId });
-				}
 				setOpen(false);
 			})
 			.catch(() => {

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

@@ -48,7 +48,7 @@ export const ShowGitProviders = () => {
 	) => {
 		const redirectUri = `${url}/api/providers/gitlab/callback?gitlabId=${gitlabId}`;
 		const scope = "api read_user read_repository";
-		const authUrl = `${gitlabUrl}/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&response_type=code&scopes=${encodeURIComponent(scope)}`;
+		const authUrl = `${gitlabUrl}/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&response_type=code&scope=${encodeURIComponent(scope)}`;
 		return authUrl;
 	};
 

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

@@ -1,19 +1,12 @@
 "use client";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Check, ChevronDown, PenBoxIcon, PlusIcon } from "lucide-react";
+import { PenBoxIcon, PlusIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@/components/ui/command";
 import {
 	Dialog,
 	DialogContent,
@@ -33,12 +26,13 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import {
-	Popover,
-	PopoverContent,
-	PopoverTrigger,
-} from "@/components/ui/popover";
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
-import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 
 const Schema = z.object({
@@ -59,8 +53,6 @@ export const HandleAi = ({ aiId }: Props) => {
 	const utils = api.useUtils();
 	const [error, setError] = useState<string | null>(null);
 	const [open, setOpen] = useState(false);
-	const [modelPopoverOpen, setModelPopoverOpen] = useState(false);
-	const [modelSearch, setModelSearch] = useState("");
 	const { data, refetch } = api.ai.one.useQuery(
 		{
 			aiId: aiId || "",
@@ -85,17 +77,13 @@ export const HandleAi = ({ aiId }: Props) => {
 	});
 
 	useEffect(() => {
-		if (data) {
-			form.reset({
-				name: data?.name ?? "",
-				apiUrl: data?.apiUrl ?? "https://api.openai.com/v1",
-				apiKey: data?.apiKey ?? "",
-				model: data?.model ?? "",
-				isEnabled: data?.isEnabled ?? true,
-			});
-		}
-		setModelSearch("");
-		setModelPopoverOpen(false);
+		form.reset({
+			name: data?.name ?? "",
+			apiUrl: data?.apiUrl ?? "https://api.openai.com/v1",
+			apiKey: data?.apiKey ?? "",
+			model: data?.model ?? "",
+			isEnabled: data?.isEnabled ?? true,
+		});
 	}, [aiId, form, data]);
 
 	const apiUrl = form.watch("apiUrl");
@@ -116,6 +104,14 @@ export const HandleAi = ({ aiId }: Props) => {
 			},
 		);
 
+	useEffect(() => {
+		const apiUrl = form.watch("apiUrl");
+		const apiKey = form.watch("apiKey");
+		if (apiUrl && apiKey) {
+			form.setValue("model", "");
+		}
+	}, [form.watch("apiUrl"), form.watch("apiKey")]);
+
 	const onSubmit = async (data: Schema) => {
 		try {
 			await mutateAsync({
@@ -135,16 +131,7 @@ export const HandleAi = ({ aiId }: Props) => {
 	};
 
 	return (
-		<Dialog
-			open={open}
-			onOpenChange={(isOpen) => {
-				setOpen(isOpen);
-				if (!isOpen) {
-					setModelSearch("");
-					setModelPopoverOpen(false);
-				}
-			}}
-		>
+		<Dialog open={open} onOpenChange={setOpen}>
 			<DialogTrigger className="" asChild>
 				{aiId ? (
 					<Button
@@ -195,17 +182,7 @@ export const HandleAi = ({ aiId }: Props) => {
 								<FormItem>
 									<FormLabel>API URL</FormLabel>
 									<FormControl>
-										<Input
-											placeholder="https://api.openai.com/v1"
-											{...field}
-											onChange={(e) => {
-												field.onChange(e);
-												// Reset model when user changes API URL
-												if (form.getValues("model")) {
-													form.setValue("model", "");
-												}
-											}}
-										/>
+										<Input placeholder="https://api.openai.com/v1" {...field} />
 									</FormControl>
 									<FormDescription>
 										The base URL for your AI provider's API
@@ -228,13 +205,6 @@ export const HandleAi = ({ aiId }: Props) => {
 												placeholder="sk-..."
 												autoComplete="one-time-code"
 												{...field}
-												onChange={(e) => {
-													field.onChange(e);
-													// Reset model when user changes API Key
-													if (form.getValues("model")) {
-														form.setValue("model", "");
-													}
-												}}
 											/>
 										</FormControl>
 										<FormDescription>
@@ -262,89 +232,30 @@ export const HandleAi = ({ aiId }: Props) => {
 							<FormField
 								control={form.control}
 								name="model"
-								render={({ field }) => {
-									const selectedModel = models.find(
-										(m) => m.id === field.value,
-									);
-									const filteredModels = models.filter((model) =>
-										model.id.toLowerCase().includes(modelSearch.toLowerCase()),
-									);
-
-									// Ensure selected model is always in the filtered list
-									const displayModels =
-										field.value &&
-										!filteredModels.find((m) => m.id === field.value) &&
-										selectedModel
-											? [selectedModel, ...filteredModels]
-											: filteredModels;
-
-									return (
-										<FormItem>
-											<FormLabel>Model</FormLabel>
-											<Popover
-												open={modelPopoverOpen}
-												onOpenChange={setModelPopoverOpen}
-											>
-												<PopoverTrigger asChild>
-													<FormControl>
-														<Button
-															variant="outline"
-															className={cn(
-																"w-full justify-between",
-																!field.value && "text-muted-foreground",
-															)}
-														>
-															{field.value
-																? (selectedModel?.id ?? field.value)
-																: "Select a model"}
-															<ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-														</Button>
-													</FormControl>
-												</PopoverTrigger>
-												<PopoverContent className="w-[400px] p-0" align="start">
-													<Command>
-														<CommandInput
-															placeholder="Search models..."
-															value={modelSearch}
-															onValueChange={setModelSearch}
-														/>
-														<CommandList>
-															<CommandEmpty>No models found.</CommandEmpty>
-															{displayModels.map((model) => {
-																const isSelected = field.value === model.id;
-																return (
-																	<CommandItem
-																		key={model.id}
-																		value={model.id}
-																		onSelect={() => {
-																			field.onChange(model.id);
-																			setModelPopoverOpen(false);
-																			setModelSearch("");
-																		}}
-																	>
-																		<Check
-																			className={cn(
-																				"mr-2 h-4 w-4",
-																				isSelected
-																					? "opacity-100"
-																					: "opacity-0",
-																			)}
-																		/>
-																		{model.id}
-																	</CommandItem>
-																);
-															})}
-														</CommandList>
-													</Command>
-												</PopoverContent>
-											</Popover>
-											<FormDescription>
-												Select an AI model to use
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									);
-								}}
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Model</FormLabel>
+										<Select
+											onValueChange={field.onChange}
+											value={field.value || ""}
+										>
+											<FormControl>
+												<SelectTrigger>
+													<SelectValue placeholder="Select a model" />
+												</SelectTrigger>
+											</FormControl>
+											<SelectContent>
+												{models.map((model) => (
+													<SelectItem key={model.id} value={model.id}>
+														{model.id}
+													</SelectItem>
+												))}
+											</SelectContent>
+										</Select>
+										<FormDescription>Select an AI model to use</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
 							/>
 						)}
 

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

@@ -1,11 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import {
-	AlertTriangle,
-	Mail,
-	PenBoxIcon,
-	PlusIcon,
-	Trash2,
-} from "lucide-react";
+import { AlertTriangle, Mail, PenBoxIcon, PlusIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -50,7 +44,6 @@ const notificationBaseSchema = z.object({
 	appDeploy: z.boolean().default(false),
 	appBuildError: z.boolean().default(false),
 	databaseBackup: z.boolean().default(false),
-	volumeBackup: z.boolean().default(false),
 	dokployRestart: z.boolean().default(false),
 	dockerCleanup: z.boolean().default(false),
 	serverThreshold: z.boolean().default(false),
@@ -110,25 +103,10 @@ export const notificationSchema = z.discriminatedUnion("type", [
 			type: z.literal("ntfy"),
 			serverUrl: z.string().min(1, { message: "Server URL is required" }),
 			topic: z.string().min(1, { message: "Topic is required" }),
-			accessToken: z.string().optional(),
+			accessToken: z.string().min(1, { message: "Access Token is required" }),
 			priority: z.number().min(1).max(5).default(3),
 		})
 		.merge(notificationBaseSchema),
-	z
-		.object({
-			type: z.literal("custom"),
-			endpoint: z.string().min(1, { message: "Endpoint URL is required" }),
-			headers: z
-				.array(
-					z.object({
-						key: z.string(),
-						value: z.string(),
-					}),
-				)
-				.optional()
-				.default([]),
-		})
-		.merge(notificationBaseSchema),
 	z
 		.object({
 			type: z.literal("lark"),
@@ -166,10 +144,6 @@ export const notificationsMap = {
 		icon: <NtfyIcon />,
 		label: "ntfy",
 	},
-	custom: {
-		icon: <PenBoxIcon size={29} className="text-muted-foreground" />,
-		label: "Custom",
-	},
 };
 
 export type NotificationSchema = z.infer<typeof notificationSchema>;
@@ -205,13 +179,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 		api.notification.testNtfyConnection.useMutation();
 	const { mutateAsync: testLarkConnection, isLoading: isLoadingLark } =
 		api.notification.testLarkConnection.useMutation();
-
-	const { mutateAsync: testCustomConnection, isLoading: isLoadingCustom } =
-		api.notification.testCustomConnection.useMutation();
-
-	const customMutation = notificationId
-		? api.notification.updateCustom.useMutation()
-		: api.notification.createCustom.useMutation();
 	const slackMutation = notificationId
 		? api.notification.updateSlack.useMutation()
 		: api.notification.createSlack.useMutation();
@@ -250,15 +217,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 		name: "toAddresses" as never,
 	});
 
-	const {
-		fields: headerFields,
-		append: appendHeader,
-		remove: removeHeader,
-	} = useFieldArray({
-		control: form.control,
-		name: "headers" as never,
-	});
-
 	useEffect(() => {
 		if (type === "email" && fields.length === 0) {
 			append("");
@@ -273,7 +231,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					appDeploy: notification.appDeploy,
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
 					dockerCleanup: notification.dockerCleanup,
 					webhookUrl: notification.slack?.webhookUrl,
 					channel: notification.slack?.channel || "",
@@ -287,7 +244,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					appDeploy: notification.appDeploy,
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
 					botToken: notification.telegram?.botToken,
 					messageThreadId: notification.telegram?.messageThreadId || "",
 					chatId: notification.telegram?.chatId,
@@ -302,7 +258,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					appDeploy: notification.appDeploy,
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
 					type: notification.notificationType,
 					webhookUrl: notification.discord?.webhookUrl,
 					decoration: notification.discord?.decoration || undefined,
@@ -316,7 +271,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					appDeploy: notification.appDeploy,
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
 					type: notification.notificationType,
 					smtpServer: notification.email?.smtpServer,
 					smtpPort: notification.email?.smtpPort,
@@ -334,7 +288,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					appDeploy: notification.appDeploy,
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
 					type: notification.notificationType,
 					appToken: notification.gotify?.appToken,
 					decoration: notification.gotify?.decoration || undefined,
@@ -349,9 +302,8 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					appDeploy: notification.appDeploy,
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
 					type: notification.notificationType,
-					accessToken: notification.ntfy?.accessToken || "",
+					accessToken: notification.ntfy?.accessToken,
 					topic: notification.ntfy?.topic,
 					priority: notification.ntfy?.priority,
 					serverUrl: notification.ntfy?.serverUrl,
@@ -369,28 +321,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					webhookUrl: notification.lark?.webhookUrl,
 					name: notification.name,
 					dockerCleanup: notification.dockerCleanup,
-					volumeBackup: notification.volumeBackup,
-					serverThreshold: notification.serverThreshold,
-				});
-			} else if (notification.notificationType === "custom") {
-				form.reset({
-					appBuildError: notification.appBuildError,
-					appDeploy: notification.appDeploy,
-					dokployRestart: notification.dokployRestart,
-					databaseBackup: notification.databaseBackup,
-					type: notification.notificationType,
-					endpoint: notification.custom?.endpoint || "",
-					headers: notification.custom?.headers
-						? Object.entries(notification.custom.headers).map(
-								([key, value]) => ({
-									key,
-									value,
-								}),
-							)
-						: [],
-					name: notification.name,
-					volumeBackup: notification.volumeBackup,
-					dockerCleanup: notification.dockerCleanup,
 					serverThreshold: notification.serverThreshold,
 				});
 			}
@@ -407,7 +337,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 		gotify: gotifyMutation,
 		ntfy: ntfyMutation,
 		lark: larkMutation,
-		custom: customMutation,
 	};
 
 	const onSubmit = async (data: NotificationSchema) => {
@@ -416,7 +345,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 			appDeploy,
 			dokployRestart,
 			databaseBackup,
-			volumeBackup,
 			dockerCleanup,
 			serverThreshold,
 		} = data;
@@ -427,7 +355,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				appDeploy: appDeploy,
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
 				webhookUrl: data.webhookUrl,
 				channel: data.channel,
 				name: data.name,
@@ -442,7 +369,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				appDeploy: appDeploy,
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
 				botToken: data.botToken,
 				messageThreadId: data.messageThreadId || "",
 				chatId: data.chatId,
@@ -458,7 +384,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				appDeploy: appDeploy,
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
 				webhookUrl: data.webhookUrl,
 				decoration: data.decoration,
 				name: data.name,
@@ -473,7 +398,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				appDeploy: appDeploy,
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
 				smtpServer: data.smtpServer,
 				smtpPort: data.smtpPort,
 				username: data.username,
@@ -492,7 +416,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				appDeploy: appDeploy,
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
 				serverUrl: data.serverUrl,
 				appToken: data.appToken,
 				priority: data.priority,
@@ -508,9 +431,8 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				appDeploy: appDeploy,
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
 				serverUrl: data.serverUrl,
-				accessToken: data.accessToken || "",
+				accessToken: data.accessToken,
 				topic: data.topic,
 				priority: data.priority,
 				name: data.name,
@@ -524,7 +446,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				appDeploy: appDeploy,
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
 				webhookUrl: data.webhookUrl,
 				name: data.name,
 				dockerCleanup: dockerCleanup,
@@ -532,33 +453,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				larkId: notification?.larkId || "",
 				serverThreshold: serverThreshold,
 			});
-		} else if (data.type === "custom") {
-			// Convert headers array to object
-			const headersRecord =
-				data.headers && data.headers.length > 0
-					? data.headers.reduce(
-							(acc, { key, value }) => {
-								if (key.trim()) acc[key] = value;
-								return acc;
-							},
-							{} as Record<string, string>,
-						)
-					: undefined;
-
-			promise = customMutation.mutateAsync({
-				appBuildError: appBuildError,
-				appDeploy: appDeploy,
-				dokployRestart: dokployRestart,
-				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
-				endpoint: data.endpoint,
-				headers: headersRecord,
-				name: data.name,
-				dockerCleanup: dockerCleanup,
-				serverThreshold: serverThreshold,
-				notificationId: notificationId || "",
-				customId: notification?.customId || "",
-			});
 		}
 
 		if (promise) {
@@ -1107,12 +1001,8 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 														<Input
 															placeholder="AzxcvbnmKjhgfdsa..."
 															{...field}
-															value={field.value ?? ""}
 														/>
 													</FormControl>
-													<FormDescription>
-														Optional. Leave blank for public topics.
-													</FormDescription>
 													<FormMessage />
 												</FormItem>
 											)}
@@ -1149,92 +1039,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 										/>
 									</>
 								)}
-								{type === "custom" && (
-									<div className="space-y-4">
-										<FormField
-											control={form.control}
-											name="endpoint"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>Webhook URL</FormLabel>
-													<FormControl>
-														<Input
-															placeholder="https://api.example.com/webhook"
-															{...field}
-														/>
-													</FormControl>
-													<FormDescription>
-														The URL where POST requests will be sent with
-														notification data.
-													</FormDescription>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
 
-										<div className="space-y-3">
-											<div>
-												<FormLabel>Headers</FormLabel>
-												<FormDescription>
-													Optional. Custom headers for your POST request (e.g.,
-													Authorization, Content-Type).
-												</FormDescription>
-											</div>
-
-											<div className="space-y-2">
-												{headerFields.map((field, index) => (
-													<div
-														key={field.id}
-														className="flex items-center gap-2 p-2 border rounded-md bg-muted/50"
-													>
-														<FormField
-															control={form.control}
-															name={`headers.${index}.key` as never}
-															render={({ field }) => (
-																<FormItem className="flex-1">
-																	<FormControl>
-																		<Input placeholder="Key" {...field} />
-																	</FormControl>
-																</FormItem>
-															)}
-														/>
-														<FormField
-															control={form.control}
-															name={`headers.${index}.value` as never}
-															render={({ field }) => (
-																<FormItem className="flex-[2]">
-																	<FormControl>
-																		<Input placeholder="Value" {...field} />
-																	</FormControl>
-																</FormItem>
-															)}
-														/>
-														<Button
-															type="button"
-															variant="ghost"
-															size="sm"
-															onClick={() => removeHeader(index)}
-															className="text-red-500 hover:text-red-700 hover:bg-red-50"
-														>
-															<Trash2 className="h-4 w-4" />
-														</Button>
-													</div>
-												))}
-											</div>
-
-											<Button
-												type="button"
-												variant="outline"
-												size="sm"
-												onClick={() => appendHeader({ key: "", value: "" })}
-												className="w-full"
-											>
-												<PlusIcon className="h-4 w-4 mr-2" />
-												Add header
-											</Button>
-										</div>
-									</div>
-								)}
 								{type === "lark" && (
 									<>
 										<FormField
@@ -1325,27 +1130,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 									)}
 								/>
 
-								<FormField
-									control={form.control}
-									name="volumeBackup"
-									render={({ field }) => (
-										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm gap-2">
-											<div className="space-y-0.5">
-												<FormLabel>Volume Backup</FormLabel>
-												<FormDescription>
-													Trigger the action when a volume backup is created.
-												</FormDescription>
-											</div>
-											<FormControl>
-												<Switch
-													checked={field.value}
-													onCheckedChange={field.onChange}
-												/>
-											</FormControl>
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="dockerCleanup"
@@ -1427,82 +1211,58 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 								isLoadingEmail ||
 								isLoadingGotify ||
 								isLoadingNtfy ||
-								isLoadingLark ||
-								isLoadingCustom
+								isLoadingLark
 							}
 							variant="secondary"
-							type="button"
 							onClick={async () => {
-								const isValid = await form.trigger();
-								if (!isValid) return;
-
-								const data = form.getValues();
-
 								try {
-									if (data.type === "slack") {
+									if (type === "slack") {
 										await testSlackConnection({
-											webhookUrl: data.webhookUrl,
-											channel: data.channel,
+											webhookUrl: form.getValues("webhookUrl"),
+											channel: form.getValues("channel"),
 										});
-									} else if (data.type === "telegram") {
+									} else if (type === "telegram") {
 										await testTelegramConnection({
-											botToken: data.botToken,
-											chatId: data.chatId,
-											messageThreadId: data.messageThreadId || "",
+											botToken: form.getValues("botToken"),
+											chatId: form.getValues("chatId"),
+											messageThreadId: form.getValues("messageThreadId") || "",
 										});
-									} else if (data.type === "discord") {
+									} else if (type === "discord") {
 										await testDiscordConnection({
-											webhookUrl: data.webhookUrl,
-											decoration: data.decoration,
+											webhookUrl: form.getValues("webhookUrl"),
+											decoration: form.getValues("decoration"),
 										});
-									} else if (data.type === "email") {
+									} else if (type === "email") {
 										await testEmailConnection({
-											smtpServer: data.smtpServer,
-											smtpPort: data.smtpPort,
-											username: data.username,
-											password: data.password,
-											fromAddress: data.fromAddress,
-											toAddresses: data.toAddresses,
+											smtpServer: form.getValues("smtpServer"),
+											smtpPort: form.getValues("smtpPort"),
+											username: form.getValues("username"),
+											password: form.getValues("password"),
+											toAddresses: form.getValues("toAddresses"),
+											fromAddress: form.getValues("fromAddress"),
 										});
-									} else if (data.type === "gotify") {
+									} else if (type === "gotify") {
 										await testGotifyConnection({
-											serverUrl: data.serverUrl,
-											appToken: data.appToken,
-											priority: data.priority,
-											decoration: data.decoration,
+											serverUrl: form.getValues("serverUrl"),
+											appToken: form.getValues("appToken"),
+											priority: form.getValues("priority"),
+											decoration: form.getValues("decoration"),
 										});
-									} else if (data.type === "ntfy") {
+									} else if (type === "ntfy") {
 										await testNtfyConnection({
-											serverUrl: data.serverUrl,
-											topic: data.topic,
-											accessToken: data.accessToken || "",
-											priority: data.priority,
+											serverUrl: form.getValues("serverUrl"),
+											topic: form.getValues("topic"),
+											accessToken: form.getValues("accessToken"),
+											priority: form.getValues("priority"),
 										});
-									} else if (data.type === "lark") {
+									} else if (type === "lark") {
 										await testLarkConnection({
-											webhookUrl: data.webhookUrl,
-										});
-									} else if (data.type === "custom") {
-										const headersRecord =
-											data.headers && data.headers.length > 0
-												? data.headers.reduce(
-														(acc, { key, value }) => {
-															if (key.trim()) acc[key] = value;
-															return acc;
-														},
-														{} as Record<string, string>,
-													)
-												: undefined;
-										await testCustomConnection({
-											endpoint: data.endpoint,
-											headers: headersRecord,
+											webhookUrl: form.getValues("webhookUrl"),
 										});
 									}
 									toast.success("Connection Success");
-								} catch (error) {
-									toast.error(
-										`Error testing the provider: ${error instanceof Error ? error.message : "Unknown error"}`,
-									);
+								} catch {
+									toast.error("Error testing the provider");
 								}
 							}}
 						>

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

@@ -1,4 +1,4 @@
-import { Bell, Loader2, Mail, PenBoxIcon, Trash2 } from "lucide-react";
+import { Bell, Loader2, Mail, Trash2 } from "lucide-react";
 import { toast } from "sonner";
 import {
 	DiscordIcon,
@@ -96,11 +96,6 @@ export const ShowNotifications = () => {
 																	<NtfyIcon className="size-6" />
 																</div>
 															)}
-															{notification.notificationType === "custom" && (
-																<div className="flex  items-center justify-center rounded-lg ">
-																	<PenBoxIcon className="size-6 text-muted-foreground" />
-																</div>
-															)}
 															{notification.notificationType === "lark" && (
 																<div className="flex  items-center justify-center rounded-lg">
 																	<LarkIcon className="size-7 text-muted-foreground" />

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

@@ -41,7 +41,6 @@ const profileSchema = z.object({
 	currentPassword: z.string().nullable(),
 	image: z.string().optional(),
 	name: z.string().optional(),
-	lastName: z.string().optional(),
 	allowImpersonation: z.boolean().optional().default(false),
 });
 
@@ -89,8 +88,7 @@ export const ProfileForm = () => {
 			image: data?.user?.image || "",
 			currentPassword: "",
 			allowImpersonation: data?.user?.allowImpersonation || false,
-			name: data?.user?.firstName || "",
-			lastName: data?.user?.lastName || "",
+			name: data?.user?.name || "",
 		},
 		resolver: zodResolver(profileSchema),
 	});
@@ -104,8 +102,7 @@ export const ProfileForm = () => {
 					image: data?.user?.image || "",
 					currentPassword: form.getValues("currentPassword") || "",
 					allowImpersonation: data?.user?.allowImpersonation,
-					name: data?.user?.firstName || "",
-					lastName: data?.user?.lastName || "",
+					name: data?.user?.name || "",
 				},
 				{
 					keepValues: true,
@@ -130,7 +127,6 @@ export const ProfileForm = () => {
 				currentPassword: values.currentPassword || undefined,
 				allowImpersonation: values.allowImpersonation,
 				name: values.name || undefined,
-				lastName: values.lastName || undefined,
 			});
 			await refetch();
 			toast.success("Profile Updated");
@@ -140,7 +136,6 @@ export const ProfileForm = () => {
 				image: values.image,
 				currentPassword: "",
 				name: values.name || "",
-				lastName: values.lastName || "",
 			});
 		} catch (error) {
 			toast.error("Error updating the profile");
@@ -185,22 +180,9 @@ export const ProfileForm = () => {
 												name="name"
 												render={({ field }) => (
 													<FormItem>
-														<FormLabel>First Name</FormLabel>
+														<FormLabel>Name</FormLabel>
 														<FormControl>
-															<Input placeholder="John" {...field} />
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<FormField
-												control={form.control}
-												name="lastName"
-												render={({ field }) => (
-													<FormItem>
-														<FormLabel>Last Name</FormLabel>
-														<FormControl>
-															<Input placeholder="Doe" {...field} />
+															<Input placeholder="Name" {...field} />
 														</FormControl>
 														<FormMessage />
 													</FormItem>
@@ -298,7 +280,7 @@ export const ProfileForm = () => {
 																		<Avatar className="default-avatar h-12 w-12 rounded-full border hover:p-px hover:border-primary transition-transform">
 																			<AvatarFallback className="rounded-lg">
 																				{getFallbackAvatarInitials(
-																					`${data?.user?.firstName} ${data?.user?.lastName}`.trim(),
+																					data?.user?.name,
 																				)}
 																			</AvatarFallback>
 																		</Avatar>

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

@@ -15,6 +15,7 @@ import { api } from "@/utils/api";
 import { ShowModalLogs } from "../../web-server/show-modal-logs";
 import { TerminalModal } from "../../web-server/terminal-modal";
 import { GPUSupportModal } from "../gpu-support-modal";
+import { ChangeConcurrencyModal } from "../change-concurrency-modal";
 
 export const ShowDokployActions = () => {
 	const { t } = useTranslation("settings");
@@ -101,6 +102,14 @@ export const ShowDokployActions = () => {
 					>
 						Reload Redis
 					</DropdownMenuItem>
+					<ChangeConcurrencyModal>
+						<DropdownMenuItem
+							className="cursor-pointer"
+							onSelect={(e) => e.preventDefault()}
+						>
+							Change Concurrency
+						</DropdownMenuItem>
+					</ChangeConcurrencyModal>
 				</DropdownMenuGroup>
 			</DropdownMenuContent>
 		</DropdownMenu>

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

@@ -1,6 +1,4 @@
-import { Activity } from "lucide-react";
 import { useState } from "react";
-import { Button } from "@/components/ui/button";
 import {
 	Dialog,
 	DialogContent,
@@ -9,36 +7,28 @@ import {
 	DialogTrigger,
 } from "@/components/ui/dialog";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { Button } from "@/components/ui/button";
 import { ShowStorageActions } from "./show-storage-actions";
 import { ShowTraefikActions } from "./show-traefik-actions";
 import { ToggleDockerCleanup } from "./toggle-docker-cleanup";
+import { ChangeConcurrencyModal } from "../change-concurrency-modal";
 
 interface Props {
 	serverId: string;
-	asButton?: boolean;
 }
 
-export const ShowServerActions = ({ serverId, asButton = false }: Props) => {
+export const ShowServerActions = ({ serverId }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			{asButton ? (
-				<DialogTrigger asChild>
-					<Button variant="outline" size="icon" className="h-9 w-9">
-						<Activity className="h-4 w-4" />
-					</Button>
-				</DialogTrigger>
-			) : (
+			<DialogTrigger asChild>
 				<DropdownMenuItem
 					className="w-full cursor-pointer"
-					onSelect={(e) => {
-						e.preventDefault();
-						setIsOpen(true);
-					}}
+					onSelect={(e) => e.preventDefault()}
 				>
 					View Actions
 				</DropdownMenuItem>
-			)}
+			</DialogTrigger>
 			<DialogContent className="sm:max-w-xl">
 				<div className="flex flex-col gap-1">
 					<DialogTitle className="text-xl">Web server settings</DialogTitle>
@@ -49,6 +39,16 @@ export const ShowServerActions = ({ serverId, asButton = false }: Props) => {
 					<ShowTraefikActions serverId={serverId} />
 					<ShowStorageActions serverId={serverId} />
 					<ToggleDockerCleanup serverId={serverId} />
+					<div className="col-span-2">
+						<ChangeConcurrencyModal
+							serverId={serverId}
+							trigger={
+								<Button variant="outline" className="w-full">
+									Change Concurrency
+								</Button>
+							}
+						/>
+					</div>
 				</div>
 			</DialogContent>
 		</Dialog>

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

@@ -173,7 +173,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 								serverId: serverId,
 							})
 								.then(async () => {
-									toast.success("Cleaning in progress... Please wait");
+									toast.success("Cleaned all");
 								})
 								.catch(() => {
 									toast.error("Error cleaning all");

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

@@ -1,7 +1,5 @@
 import { useTranslation } from "next-i18next";
 import { toast } from "sonner";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { DialogAction } from "@/components/shared/dialog-action";
 import { Button } from "@/components/ui/button";
 import {
 	DropdownMenu,
@@ -87,26 +85,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 						</DropdownMenuItem>
 					</EditTraefikEnv>
 
-					<DialogAction
-						title={
-							haveTraefikDashboardPortEnabled
-								? "Disable Traefik Dashboard"
-								: "Enable Traefik Dashboard"
-						}
-						description={
-							<div className="space-y-4">
-								<AlertBlock type="warning">
-									The Traefik container will be recreated from scratch. This
-									means the container will be deleted and created again, which
-									may cause downtime in your applications.
-								</AlertBlock>
-								<p>
-									Are you sure you want to{" "}
-									{haveTraefikDashboardPortEnabled ? "disable" : "enable"} the
-									Traefik dashboard?
-								</p>
-							</div>
-						}
+					<DropdownMenuItem
 						onClick={async () => {
 							await toggleDashboard({
 								enableDashboard: !haveTraefikDashboardPortEnabled,
@@ -118,26 +97,14 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 									);
 									refetchDashboard();
 								})
-								.catch((error) => {
-									const errorMessage =
-										error?.message ||
-										"Failed to toggle dashboard. Please check if port 8080 is available.";
-									toast.error(errorMessage);
-								});
+								.catch(() => {});
 						}}
-						disabled={toggleDashboardIsLoading}
-						type="default"
+						className="w-full cursor-pointer space-x-3"
 					>
-						<DropdownMenuItem
-							onSelect={(e) => e.preventDefault()}
-							className="w-full cursor-pointer space-x-3"
-						>
-							<span>
-								{haveTraefikDashboardPortEnabled ? "Disable" : "Enable"}{" "}
-								Dashboard
-							</span>
-						</DropdownMenuItem>
-					</DialogAction>
+						<span>
+							{haveTraefikDashboardPortEnabled ? "Disable" : "Enable"} Dashboard
+						</span>
+					</DropdownMenuItem>
 					<ManageTraefikPorts serverId={serverId}>
 						<DropdownMenuItem
 							onSelect={(e) => e.preventDefault()}

apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx

@@ -7,12 +7,9 @@ interface Props {
 	serverId?: string;
 }
 export const ToggleDockerCleanup = ({ serverId }: Props) => {
-	const { data, refetch } = api.settings.getWebServerSettings.useQuery(
-		undefined,
-		{
-			enabled: !serverId,
-		},
-	);
+	const { data, refetch } = api.user.get.useQuery(undefined, {
+		enabled: !serverId,
+	});
 
 	const { data: server, refetch: refetchServer } = api.server.one.useQuery(
 		{
@@ -25,7 +22,7 @@ export const ToggleDockerCleanup = ({ serverId }: Props) => {
 
 	const enabled = serverId
 		? server?.enableDockerCleanup
-		: data?.enableDockerCleanup;
+		: data?.user.enableDockerCleanup;
 
 	const { mutateAsync } = api.settings.updateDockerCleanup.useMutation();
 
@@ -33,10 +30,7 @@ export const ToggleDockerCleanup = ({ serverId }: Props) => {
 		try {
 			await mutateAsync({
 				enableDockerCleanup: checked,
-				...(serverId && { serverId }),
-			} as {
-				enableDockerCleanup: boolean;
-				serverId?: string;
+				serverId: serverId,
 			});
 			if (serverId) {
 				await refetchServer();

apps/dokploy/components/dashboard/settings/servers/change-concurrency-modal.tsx

@@ -0,0 +1,180 @@
+"use client";
+
+import { InfoIcon, Loader2 } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { api } from "@/utils/api";
+
+interface Props {
+	serverId?: string;
+	trigger?: React.ReactNode;
+}
+
+export const ChangeConcurrencyModal = ({ serverId, trigger }: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
+	const [concurrency, setConcurrency] = useState<number | "">("");
+
+	const { data, isLoading: isLoadingCurrent } =
+		api.settings.getDeploymentConcurrency.useQuery(
+			{ serverId },
+			{
+				enabled: isOpen,
+				onSuccess: (data) => {
+					if (concurrency === "") {
+						setConcurrency(data.concurrency);
+					}
+				},
+			},
+		);
+
+	const { mutateAsync, isLoading } =
+		api.settings.setDeploymentConcurrency.useMutation();
+
+	const handleSubmit = async (e: React.FormEvent) => {
+		e.preventDefault();
+		if (
+			typeof concurrency !== "number" ||
+			concurrency < 1 ||
+			concurrency > 20
+		) {
+			toast.error("Concurrency must be between 1 and 20");
+			return;
+		}
+
+		try {
+			const result = await mutateAsync({ concurrency, serverId });
+			if (result.clearedBuilds > 0) {
+				toast.warning(
+					`Concurrency updated. ${result.clearedBuilds} pending build${result.clearedBuilds > 1 ? "s were" : " was"} cancelled.`,
+				);
+			} else {
+				toast.success("Concurrency updated successfully");
+			}
+			setIsOpen(false);
+		} catch (error) {
+			toast.error("Failed to update concurrency");
+		}
+	};
+
+	const serverType = serverId ? "Remote Server" : "Dokploy Server";
+
+	return (
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+			<DialogTrigger asChild>
+				{trigger || (
+					<Button variant="outline" size="sm">
+						Change Concurrency
+					</Button>
+				)}
+			</DialogTrigger>
+			<DialogContent className="sm:max-w-md">
+				<DialogHeader>
+					<DialogTitle>Deployment Concurrency - {serverType}</DialogTitle>
+					<DialogDescription>
+						Configure how many deployments can run simultaneously on this
+						server.
+					</DialogDescription>
+				</DialogHeader>
+				<form onSubmit={handleSubmit} className="space-y-4">
+					<div className="space-y-2">
+						<Label htmlFor="concurrency">Concurrency</Label>
+						<Input
+							id="concurrency"
+							type="number"
+							min={1}
+							max={20}
+							value={concurrency}
+							onChange={(e) => {
+								const value = e.target.value;
+								setConcurrency(value === "" ? "" : Number.parseInt(value, 10));
+							}}
+							placeholder="Enter concurrency (1-20)"
+							disabled={isLoading || isLoadingCurrent}
+						/>
+						{isLoadingCurrent && (
+							<div className="flex items-center gap-2 text-sm text-muted-foreground">
+								<Loader2 className="h-4 w-4 animate-spin" />
+								Loading current concurrency...
+							</div>
+						)}
+						{!isLoadingCurrent && data && (
+							<p className="text-sm text-muted-foreground">
+								Current: {data.concurrency}
+							</p>
+						)}
+					</div>
+
+					<div className="space-y-3">
+						<Alert>
+							<InfoIcon className="h-4 w-4" />
+							<AlertDescription className="text-sm">
+								<div className="space-y-1 mt-1">
+									<p>
+										<strong>Default:</strong> 1 deployment at a time
+										(sequential)
+									</p>
+									<p>
+										<strong>Higher values:</strong> More deployments in
+										parallel, but will use more RAM and CPU resources.
+									</p>
+									{serverId && (
+										<p className="text-muted-foreground text-xs mt-2">
+											This setting applies to deployments on this remote server.
+										</p>
+									)}
+									{!serverId && (
+										<p className="text-muted-foreground text-xs mt-2">
+											This setting applies to deployments on the Dokploy server.
+										</p>
+									)}
+								</div>
+							</AlertDescription>
+						</Alert>
+						<Alert variant="destructive">
+							<InfoIcon className="h-4 w-4" />
+							<AlertDescription className="text-sm font-medium">
+								⚠️ <strong>Warning:</strong> Changing concurrency will cancel all
+								pending builds. Currently running builds will continue, but
+								queued builds will be cancelled.
+							</AlertDescription>
+						</Alert>
+					</div>
+
+					<DialogFooter>
+						<Button
+							type="button"
+							variant="outline"
+							onClick={() => setIsOpen(false)}
+							disabled={isLoading}
+						>
+							Cancel
+						</Button>
+						<Button type="submit" disabled={isLoading || isLoadingCurrent}>
+							{isLoading ? (
+								<>
+									<Loader2 className="mr-2 h-4 w-4 animate-spin" />
+									Updating...
+								</>
+							) : (
+								"Update Concurrency"
+							)}
+						</Button>
+					</DialogFooter>
+				</form>
+			</DialogContent>
+		</Dialog>
+	);
+};

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

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Pencil, PlusIcon } from "lucide-react";
+import { PlusIcon } from "lucide-react";
 import Link from "next/link";
 import { useTranslation } from "next-i18next";
 import { useEffect, useState } from "react";
@@ -52,17 +52,15 @@ const Schema = z.object({
 	sshKeyId: z.string().min(1, {
 		message: "SSH Key is required",
 	}),
-	serverType: z.enum(["deploy", "build"]).default("deploy"),
 });
 
 type Schema = z.infer<typeof Schema>;
 
 interface Props {
 	serverId?: string;
-	asButton?: boolean;
 }
 
-export const HandleServers = ({ serverId, asButton = false }: Props) => {
+export const HandleServers = ({ serverId }: Props) => {
 	const { t } = useTranslation("settings");
 
 	const utils = api.useUtils();
@@ -91,7 +89,6 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 			port: 22,
 			username: "root",
 			sshKeyId: "",
-			serverType: "deploy",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -104,7 +101,6 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 			port: data?.port || 22,
 			username: data?.username || "root",
 			sshKeyId: data?.sshKeyId || "",
-			serverType: data?.serverType || "deploy",
 		});
 	}, [form, form.reset, form.formState.isSubmitSuccessful, data]);
 
@@ -120,7 +116,6 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 			port: data.port || 22,
 			username: data.username || "root",
 			sshKeyId: data.sshKeyId || "",
-			serverType: data.serverType || "deploy",
 			serverId: serverId || "",
 		})
 			.then(async (_data) => {
@@ -138,32 +133,21 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			{serverId ? (
-				asButton ? (
-					<DialogTrigger asChild>
-						<Button variant="outline" size="icon" className="h-9 w-9">
-							<Pencil className="h-4 w-4" />
-						</Button>
-					</DialogTrigger>
-				) : (
+			<DialogTrigger asChild>
+				{serverId ? (
 					<DropdownMenuItem
 						className="w-full cursor-pointer "
-						onSelect={(e) => {
-							e.preventDefault();
-							setIsOpen(true);
-						}}
+						onSelect={(e) => e.preventDefault()}
 					>
 						Edit Server
 					</DropdownMenuItem>
-				)
-			) : (
-				<DialogTrigger asChild>
+				) : (
 					<Button className="cursor-pointer space-x-3">
 						<PlusIcon className="h-4 w-4" />
 						Create Server
 					</Button>
-				</DialogTrigger>
-			)}
+				)}
+			</DialogTrigger>
 			<DialogContent className="sm:max-w-3xl ">
 				<DialogHeader>
 					<DialogTitle>{serverId ? "Edit" : "Create"} Server</DialogTitle>
@@ -282,50 +266,6 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="serverType"
-							render={({ field }) => {
-								const serverTypeValue = form.watch("serverType");
-								return (
-									<FormItem>
-										<FormLabel>Server Type</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a server type" />
-											</SelectTrigger>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="deploy">Deploy Server</SelectItem>
-													<SelectItem value="build">Build Server</SelectItem>
-													<SelectLabel>Server Type</SelectLabel>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-										{serverTypeValue === "deploy" && (
-											<AlertBlock type="info" className="mt-2">
-												Deploy servers are used to run your applications,
-												databases, and services. They handle the deployment and
-												execution of your projects.
-											</AlertBlock>
-										)}
-										{serverTypeValue === "build" && (
-											<AlertBlock type="info" className="mt-2">
-												Build servers are dedicated to building your
-												applications. They handle the compilation and build
-												process, offloading this work from your deployment
-												servers. Build servers won't appear in deployment
-												options.
-											</AlertBlock>
-										)}
-									</FormItem>
-								);
-							}}
-						/>
 						<FormField
 							control={form.control}
 							name="sshKeyId"

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

@@ -80,7 +80,7 @@ const Schema = z.object({
 type Schema = z.infer<typeof Schema>;
 
 export const SetupMonitoring = ({ serverId }: Props) => {
-	const { data: serverData } = serverId
+	const { data } = serverId
 		? api.server.one.useQuery(
 				{
 					serverId: serverId || "",
@@ -89,14 +89,7 @@ export const SetupMonitoring = ({ serverId }: Props) => {
 					enabled: !!serverId,
 				},
 			)
-		: { data: null };
-
-	const { data: webServerSettings } =
-		api.settings.getWebServerSettings.useQuery(undefined, {
-			enabled: !serverId,
-		});
-
-	const data = serverId ? serverData : webServerSettings;
+		: api.user.getServerMetrics.useQuery();
 
 	const url = useUrl();
 

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

@@ -1,5 +1,5 @@
 import copy from "copy-to-clipboard";
-import { CopyIcon, ExternalLinkIcon, ServerIcon, Settings } from "lucide-react";
+import { CopyIcon, ExternalLinkIcon, ServerIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
 import { toast } from "sonner";
@@ -36,10 +36,9 @@ import { ValidateServer } from "./validate-server";
 
 interface Props {
 	serverId: string;
-	asButton?: boolean;
 }
 
-export const SetupServer = ({ serverId, asButton = false }: Props) => {
+export const SetupServer = ({ serverId }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const { data: server } = api.server.one.useQuery(
 		{
@@ -52,7 +51,6 @@ export const SetupServer = ({ serverId, asButton = false }: Props) => {
 
 	const [activeLog, setActiveLog] = useState<string | null>(null);
 	const { data: isCloud } = api.settings.isCloud.useQuery();
-	const isBuildServer = server?.serverType === "build";
 	const [isDrawerOpen, setIsDrawerOpen] = useState(false);
 	const [filteredLogs, setFilteredLogs] = useState<LogLine[]>([]);
 	const [isDeploying, setIsDeploying] = useState(false);
@@ -82,23 +80,14 @@ export const SetupServer = ({ serverId, asButton = false }: Props) => {
 
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			{asButton ? (
-				<DialogTrigger asChild>
-					<Button variant="outline" size="icon" className="h-9 w-9">
-						<Settings className="h-4 w-4" />
-					</Button>
-				</DialogTrigger>
-			) : (
+			<DialogTrigger asChild>
 				<DropdownMenuItem
 					className="w-full cursor-pointer "
-					onSelect={(e) => {
-						e.preventDefault();
-						setIsOpen(true);
-					}}
+					onSelect={(e) => e.preventDefault()}
 				>
 					Setup Server
 				</DropdownMenuItem>
-			)}
+			</DialogTrigger>
 			<DialogContent className="sm:max-w-4xl  ">
 				<DialogHeader>
 					<div className="flex flex-col gap-1.5">
@@ -128,26 +117,17 @@ export const SetupServer = ({ serverId, asButton = false }: Props) => {
 							<TabsList
 								className={cn(
 									"grid  w-[700px]",
-									isBuildServer
-										? "grid-cols-3"
-										: isCloud
-											? "grid-cols-6"
-											: "grid-cols-5",
+									isCloud ? "grid-cols-6" : "grid-cols-5",
 								)}
 							>
 								<TabsTrigger value="ssh-keys">SSH Keys</TabsTrigger>
 								<TabsTrigger value="deployments">Deployments</TabsTrigger>
 								<TabsTrigger value="validate">Validate</TabsTrigger>
-
-								{!isBuildServer && (
-									<>
-										<TabsTrigger value="audit">Security</TabsTrigger>
-										{isCloud && (
-											<TabsTrigger value="monitoring">Monitoring</TabsTrigger>
-										)}
-										<TabsTrigger value="gpu-setup">GPU Setup</TabsTrigger>
-									</>
+								<TabsTrigger value="audit">Security</TabsTrigger>
+								{isCloud && (
+									<TabsTrigger value="monitoring">Monitoring</TabsTrigger>
 								)}
+								<TabsTrigger value="gpu-setup">GPU Setup</TabsTrigger>
 							</TabsList>
 							<TabsContent
 								value="ssh-keys"
@@ -331,36 +311,32 @@ export const SetupServer = ({ serverId, asButton = false }: Props) => {
 									<ValidateServer serverId={serverId} />
 								</div>
 							</TabsContent>
-							{!isBuildServer && (
-								<>
-									<TabsContent
-										value="audit"
-										className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-									>
-										<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
-											<SecurityAudit serverId={serverId} />
-										</div>
-									</TabsContent>
-									<TabsContent
-										value="monitoring"
-										className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-									>
-										<div className="flex flex-col gap-2 text-sm pt-3">
-											<div className="rounded-xl bg-background shadow-md border">
-												<SetupMonitoring serverId={serverId} />
-											</div>
-										</div>
-									</TabsContent>
-									<TabsContent
-										value="gpu-setup"
-										className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-									>
-										<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
-											<GPUSupport serverId={serverId} />
-										</div>
-									</TabsContent>
-								</>
-							)}
+							<TabsContent
+								value="audit"
+								className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
+							>
+								<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
+									<SecurityAudit serverId={serverId} />
+								</div>
+							</TabsContent>
+							<TabsContent
+								value="monitoring"
+								className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
+							>
+								<div className="flex flex-col gap-2 text-sm pt-3">
+									<div className="rounded-xl bg-background shadow-md border">
+										<SetupMonitoring serverId={serverId} />
+									</div>
+								</div>
+							</TabsContent>
+							<TabsContent
+								value="gpu-setup"
+								className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
+							>
+								<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
+									<GPUSupport serverId={serverId} />
+								</div>
+							</TabsContent>
 						</Tabs>
 					</div>
 				)}

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

@@ -1,18 +1,5 @@
 import { format } from "date-fns";
-import {
-	Clock,
-	Key,
-	KeyIcon,
-	Loader2,
-	MoreHorizontal,
-	Network,
-	Pencil,
-	ServerIcon,
-	Settings,
-	Terminal,
-	Trash2,
-	User,
-} from "lucide-react";
+import { KeyIcon, Loader2, MoreHorizontal, ServerIcon } from "lucide-react";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { useTranslation } from "next-i18next";
@@ -37,11 +24,14 @@ import {
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
+	Table,
+	TableBody,
+	TableCaption,
+	TableCell,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "@/components/ui/table";
 import { api } from "@/utils/api";
 import { ShowNodesModal } from "../cluster/nodes/show-nodes-modal";
 import { TerminalModal } from "../web-server/terminal-modal";
@@ -69,7 +59,7 @@ export const ShowServers = () => {
 	return (
 		<div className="w-full">
 			{query?.success && isCloud && <WelcomeSuscription />}
-			<Card className="h-full  p-2.5 rounded-xl  max-w-5xl mx-auto">
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md ">
 					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
@@ -124,44 +114,185 @@ export const ShowServers = () => {
 												<HandleServers />
 											</div>
 										) : (
-											<div className="flex flex-col gap-4 min-h-[25vh]">
-												<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-													{data?.map((server) => {
-														const canDelete = server.totalSum === 0;
-														const isActive = server.serverStatus === "active";
-														const isBuildServer = server.serverType === "build";
-														return (
-															<Card
-																key={server.serverId}
-																className="relative hover:shadow-lg transition-shadow flex flex-col bg-transparent"
-															>
-																<CardHeader className="pb-3">
-																	<div className="flex items-start justify-between">
-																		<div className="flex items-center gap-2">
-																			<ServerIcon className="size-5 text-muted-foreground" />
-																			<CardTitle className="text-lg">
-																				{server.name}
-																			</CardTitle>
-																		</div>
-																		{isActive &&
-																			server.sshKeyId &&
-																			!isBuildServer && (
-																				<DropdownMenu>
-																					<DropdownMenuTrigger asChild>
-																						<Button
-																							variant="ghost"
-																							className="h-8 w-8 p-0"
-																						>
-																							<span className="sr-only">
-																								More options
-																							</span>
-																							<MoreHorizontal className="h-4 w-4" />
-																						</Button>
-																					</DropdownMenuTrigger>
-																					<DropdownMenuContent align="end">
+											<div className="flex flex-col gap-4  min-h-[25vh]">
+												<Table>
+													<TableCaption>
+														<div className="flex flex-col  gap-4">
+															See all servers
+														</div>
+													</TableCaption>
+													<TableHeader>
+														<TableRow>
+															<TableHead className="text-left">Name</TableHead>
+															{isCloud && (
+																<TableHead className="text-center">
+																	Status
+																</TableHead>
+															)}
+															<TableHead className="text-center">
+																IP Address
+															</TableHead>
+															<TableHead className="text-center">
+																Port
+															</TableHead>
+															<TableHead className="text-center">
+																Username
+															</TableHead>
+															<TableHead className="text-center">
+																SSH Key
+															</TableHead>
+															<TableHead className="text-center">
+																Created
+															</TableHead>
+															<TableHead className="text-right">
+																Actions
+															</TableHead>
+														</TableRow>
+													</TableHeader>
+													<TableBody>
+														{data?.map((server) => {
+															const canDelete = server.totalSum === 0;
+															const isActive = server.serverStatus === "active";
+															return (
+																<TableRow key={server.serverId}>
+																	<TableCell className="text-left">
+																		{server.name}
+																	</TableCell>
+																	{isCloud && (
+																		<TableHead className="text-center">
+																			<Badge
+																				variant={
+																					server.serverStatus === "active"
+																						? "default"
+																						: "destructive"
+																				}
+																			>
+																				{server.serverStatus}
+																			</Badge>
+																		</TableHead>
+																	)}
+																	<TableCell className="text-center">
+																		<Badge>{server.ipAddress}</Badge>
+																	</TableCell>
+																	<TableCell className="text-center">
+																		{server.port}
+																	</TableCell>
+																	<TableCell className="text-center">
+																		{server.username}
+																	</TableCell>
+																	<TableCell className="text-right">
+																		<span className="text-sm text-muted-foreground">
+																			{server.sshKeyId ? "Yes" : "No"}
+																		</span>
+																	</TableCell>
+																	<TableCell className="text-right">
+																		<span className="text-sm text-muted-foreground">
+																			{format(
+																				new Date(server.createdAt),
+																				"PPpp",
+																			)}
+																		</span>
+																	</TableCell>
+
+																	<TableCell className="text-right flex justify-end">
+																		<DropdownMenu>
+																			<DropdownMenuTrigger asChild>
+																				<Button
+																					variant="ghost"
+																					className="h-8 w-8 p-0"
+																				>
+																					<span className="sr-only">
+																						Open menu
+																					</span>
+																					<MoreHorizontal className="h-4 w-4" />
+																				</Button>
+																			</DropdownMenuTrigger>
+																			<DropdownMenuContent align="end">
+																				<DropdownMenuLabel>
+																					Actions
+																				</DropdownMenuLabel>
+
+																				{isActive && (
+																					<>
+																						{server.sshKeyId && (
+																							<TerminalModal
+																								serverId={server.serverId}
+																							>
+																								<span>
+																									{t(
+																										"settings.common.enterTerminal",
+																									)}
+																								</span>
+																							</TerminalModal>
+																						)}
+																						<SetupServer
+																							serverId={server.serverId}
+																						/>
+
+																						<HandleServers
+																							serverId={server.serverId}
+																						/>
+
+																						{server.sshKeyId && (
+																							<ShowServerActions
+																								serverId={server.serverId}
+																							/>
+																						)}
+																					</>
+																				)}
+
+																				<DialogAction
+																					disabled={!canDelete}
+																					title={
+																						canDelete
+																							? "Delete Server"
+																							: "Server has active services"
+																					}
+																					description={
+																						canDelete ? (
+																							"This will delete the server and all associated data"
+																						) : (
+																							<div className="flex flex-col gap-2">
+																								You can not delete this server
+																								because it has active services.
+																								<AlertBlock type="warning">
+																									You have active services
+																									associated with this server,
+																									please delete them first.
+																								</AlertBlock>
+																							</div>
+																						)
+																					}
+																					onClick={async () => {
+																						await mutateAsync({
+																							serverId: server.serverId,
+																						})
+																							.then(() => {
+																								refetch();
+																								toast.success(
+																									`Server ${server.name} deleted successfully`,
+																								);
+																							})
+																							.catch((err) => {
+																								toast.error(err.message);
+																							});
+																					}}
+																				>
+																					<DropdownMenuItem
+																						className="w-full cursor-pointer text-red-500 hover:!text-red-600"
+																						onSelect={(e) => e.preventDefault()}
+																					>
+																						Delete Server
+																					</DropdownMenuItem>
+																				</DialogAction>
+
+																				{isActive && server.sshKeyId && (
+																					<>
+																						<DropdownMenuSeparator />
 																						<DropdownMenuLabel>
-																							Advanced
+																							Extra
 																						</DropdownMenuLabel>
+
 																						<ShowTraefikFileSystemModal
 																							serverId={server.serverId}
 																						/>
@@ -177,256 +308,29 @@ export const ShowServers = () => {
 																								}
 																							/>
 																						)}
+
 																						<ShowSwarmOverviewModal
 																							serverId={server.serverId}
 																						/>
 																						<ShowNodesModal
 																							serverId={server.serverId}
 																						/>
+
 																						<ShowSchedulesModal
 																							serverId={server.serverId}
 																						/>
-																					</DropdownMenuContent>
-																				</DropdownMenu>
-																			)}
-																	</div>
-																	<TooltipProvider>
-																		<div className="flex gap-2 mt-2 flex-wrap">
-																			{isCloud && (
-																				<>
-																					{server.serverStatus === "active" ? (
-																						<Badge variant="default">
-																							{server.serverStatus}
-																						</Badge>
-																					) : (
-																						<Tooltip delayDuration={0}>
-																							<TooltipTrigger asChild>
-																								<span className="inline-block">
-																									<Badge
-																										variant="destructive"
-																										className="cursor-help"
-																									>
-																										{server.serverStatus}
-																									</Badge>
-																								</span>
-																							</TooltipTrigger>
-																							<TooltipContent
-																								className="max-w-xs"
-																								side="bottom"
-																							>
-																								<p className="text-sm">
-																									This server is deactivated due
-																									to lack of payment. Please pay
-																									your invoice to reactivate it.
-																									If you think this is an error,
-																									please contact support.
-																								</p>
-																							</TooltipContent>
-																						</Tooltip>
-																					)}
-																				</>
-																			)}
-																			<Badge
-																				variant={
-																					isBuildServer
-																						? "secondary"
-																						: "default"
-																				}
-																			>
-																				{server.serverType}
-																			</Badge>
-																		</div>
-																	</TooltipProvider>
-																</CardHeader>
-																<CardContent className="space-y-3 flex-1 flex flex-col">
-																	<div className="flex items-center gap-2 text-sm">
-																		<Network className="size-4 text-muted-foreground" />
-																		<span className="text-muted-foreground">
-																			IP:
-																		</span>
-																		<Badge variant="outline">
-																			{server.ipAddress}
-																		</Badge>
-																		<span className="text-muted-foreground">
-																			Port:
-																		</span>
-																		<span className="font-medium">
-																			{server.port}
-																		</span>
-																	</div>
-																	<div className="flex items-center gap-2 text-sm">
-																		<User className="size-4 text-muted-foreground" />
-																		<span className="text-muted-foreground">
-																			User:
-																		</span>
-																		<span className="font-medium">
-																			{server.username}
-																		</span>
-																	</div>
-																	<div className="flex items-center gap-2 text-sm">
-																		<Key className="size-4 text-muted-foreground" />
-																		<span className="text-muted-foreground">
-																			SSH Key:
-																		</span>
-																		<span className="font-medium">
-																			{server.sshKeyId ? "Yes" : "No"}
-																		</span>
-																	</div>
-																	<div className="flex items-center gap-2 text-sm pt-2 border-t">
-																		<Clock className="size-4 text-muted-foreground" />
-																		<span className="text-xs text-muted-foreground">
-																			Created{" "}
-																			{format(
-																				new Date(server.createdAt),
-																				"PPp",
-																			)}
-																		</span>
-																	</div>
-
-																	{/* Compact Actions */}
-																	{isActive && (
-																		<div className="flex items-center gap-2 pt-3 border-t mt-auto">
-																			<TooltipProvider>
-																				{server.sshKeyId && (
-																					<Tooltip>
-																						<TooltipTrigger asChild>
-																							<div>
-																								<TerminalModal
-																									serverId={server.serverId}
-																									asButton={true}
-																								>
-																									<Button
-																										variant="outline"
-																										size="icon"
-																										className="h-9 w-9"
-																									>
-																										<Terminal className="h-4 w-4" />
-																									</Button>
-																								</TerminalModal>
-																							</div>
-																						</TooltipTrigger>
-																						<TooltipContent>
-																							<p>Terminal</p>
-																						</TooltipContent>
-																					</Tooltip>
+																					</>
 																				)}
+																			</DropdownMenuContent>
+																		</DropdownMenu>
+																	</TableCell>
+																</TableRow>
+															);
+														})}
+													</TableBody>
+												</Table>
 
-																				<Tooltip>
-																					<TooltipTrigger asChild>
-																						<div>
-																							<SetupServer
-																								serverId={server.serverId}
-																								asButton={true}
-																							/>
-																						</div>
-																					</TooltipTrigger>
-																					<TooltipContent>
-																						<p>Setup Server</p>
-																					</TooltipContent>
-																				</Tooltip>
-
-																				<Tooltip>
-																					<TooltipTrigger asChild>
-																						<div>
-																							<HandleServers
-																								serverId={server.serverId}
-																								asButton={true}
-																							/>
-																						</div>
-																					</TooltipTrigger>
-																					<TooltipContent>
-																						<p>Edit Server</p>
-																					</TooltipContent>
-																				</Tooltip>
-
-																				{server.sshKeyId && !isBuildServer && (
-																					<Tooltip>
-																						<TooltipTrigger asChild>
-																							<div>
-																								<ShowServerActions
-																									serverId={server.serverId}
-																									asButton={true}
-																								/>
-																							</div>
-																						</TooltipTrigger>
-																						<TooltipContent>
-																							<p>Web Server Actions</p>
-																						</TooltipContent>
-																					</Tooltip>
-																				)}
-
-																				<div className="flex-1" />
-
-																				<Tooltip>
-																					<TooltipTrigger asChild>
-																						<div>
-																							<DialogAction
-																								disabled={!canDelete}
-																								title={
-																									canDelete
-																										? "Delete Server"
-																										: "Server has active services"
-																								}
-																								description={
-																									canDelete ? (
-																										"This will delete the server and all associated data"
-																									) : (
-																										<div className="flex flex-col gap-2">
-																											You can not delete this
-																											server because it has
-																											active services.
-																											<AlertBlock type="warning">
-																												You have active services
-																												associated with this
-																												server, please delete
-																												them first.
-																											</AlertBlock>
-																										</div>
-																									)
-																								}
-																								onClick={async () => {
-																									await mutateAsync({
-																										serverId: server.serverId,
-																									})
-																										.then(() => {
-																											refetch();
-																											toast.success(
-																												`Server ${server.name} deleted successfully`,
-																											);
-																										})
-																										.catch((err) => {
-																											toast.error(err.message);
-																										});
-																								}}
-																							>
-																								<Button
-																									variant="ghost"
-																									size="icon"
-																									className={`h-9 w-9 ${canDelete ? "text-destructive hover:text-destructive hover:bg-destructive/10" : "text-muted-foreground hover:bg-muted"}`}
-																								>
-																									<Trash2 className="h-4 w-4" />
-																								</Button>
-																							</DialogAction>
-																						</div>
-																					</TooltipTrigger>
-																					<TooltipContent>
-																						<p>
-																							{canDelete
-																								? "Delete Server"
-																								: "Cannot delete - has active services"}
-																						</p>
-																					</TooltipContent>
-																				</Tooltip>
-																			</TooltipProvider>
-																		</div>
-																	)}
-																</CardContent>
-															</Card>
-														);
-													})}
-												</div>
-
-												<div className="flex flex-row gap-2 flex-wrap w-full justify-end mt-4">
+												<div className="flex flex-row gap-2 flex-wrap w-full justify-end mr-4">
 													{data && data?.length > 0 && (
 														<div>
 															<HandleServers />

apps/dokploy/components/dashboard/settings/servers/validate-server.tsx

@@ -25,13 +25,6 @@ export const ValidateServer = ({ serverId }: Props) => {
 				enabled: !!serverId,
 			},
 		);
-	const { data: server } = api.server.one.useQuery(
-		{ serverId },
-		{
-			enabled: !!serverId,
-		},
-	);
-	const isBuildServer = server?.serverType === "build";
 	const _utils = api.useUtils();
 	return (
 		<CardContent className="p-0">
@@ -80,9 +73,7 @@ export const ValidateServer = ({ serverId }: Props) => {
 								<div className="border rounded-lg p-4">
 									<h3 className="text-lg font-semibold mb-1">Status</h3>
 									<p className="text-sm text-muted-foreground mb-4">
-										{isBuildServer
-											? "Shows the build server configuration status"
-											: "Shows the server configuration status"}
+										Shows the server configuration status
 									</p>
 									<div className="grid gap-2.5">
 										<StatusRow
@@ -94,17 +85,15 @@ export const ValidateServer = ({ serverId }: Props) => {
 													: undefined
 											}
 										/>
-										{!isBuildServer && (
-											<StatusRow
-												label="RClone Installed"
-												isEnabled={data?.rclone?.enabled}
-												description={
-													data?.rclone?.enabled
-														? `Installed: ${data?.rclone?.version}`
-														: undefined
-												}
-											/>
-										)}
+										<StatusRow
+											label="RClone Installed"
+											isEnabled={data?.rclone?.enabled}
+											description={
+												data?.rclone?.enabled
+													? `Installed: ${data?.rclone?.version}`
+													: undefined
+											}
+										/>
 										<StatusRow
 											label="Nixpacks Installed"
 											isEnabled={data?.nixpacks?.enabled}
@@ -124,36 +113,23 @@ export const ValidateServer = ({ serverId }: Props) => {
 											}
 										/>
 										<StatusRow
-											label="Railpack Installed"
-											isEnabled={data?.railpack?.enabled}
+											label="Docker Swarm Initialized"
+											isEnabled={data?.isSwarmInstalled}
 											description={
-												data?.railpack?.enabled
-													? `Installed: ${data?.railpack?.version}`
-													: undefined
+												data?.isSwarmInstalled
+													? "Initialized"
+													: "Not Initialized"
+											}
+										/>
+										<StatusRow
+											label="Dokploy Network Created"
+											isEnabled={data?.isDokployNetworkInstalled}
+											description={
+												data?.isDokployNetworkInstalled
+													? "Created"
+													: "Not Created"
 											}
 										/>
-										{!isBuildServer && (
-											<>
-												<StatusRow
-													label="Docker Swarm Initialized"
-													isEnabled={data?.isSwarmInstalled}
-													description={
-														data?.isSwarmInstalled
-															? "Initialized"
-															: "Not Initialized"
-													}
-												/>
-												<StatusRow
-													label="Dokploy Network Created"
-													isEnabled={data?.isDokployNetworkInstalled}
-													description={
-														data?.isDokployNetworkInstalled
-															? "Created"
-															: "Not Created"
-													}
-												/>
-											</>
-										)}
 										<StatusRow
 											label="Main Directory Created"
 											isEnabled={data?.isMainDirectoryInstalled}
@@ -163,6 +139,15 @@ export const ValidateServer = ({ serverId }: Props) => {
 													: "Not Created"
 											}
 										/>
+										<StatusRow
+											label="Railpack Installed"
+											isEnabled={data?.railpack?.enabled}
+											description={
+												data?.railpack?.enabled
+													? `Installed: ${data?.railpack?.version}`
+													: undefined
+											}
+										/>
 									</div>
 								</div>
 							</div>

apps/dokploy/components/dashboard/settings/servers/welcome-stripe/create-server.tsx

@@ -95,7 +95,6 @@ export const CreateServer = ({ stepper }: Props) => {
 			port: data.port || 22,
 			username: data.username || "root",
 			sshKeyId: data.sshKeyId || "",
-			serverType: "deploy",
 		})
 			.then(async (_data) => {
 				toast.success("Server Created");

apps/dokploy/components/dashboard/settings/users/add-invitation.tsx

@@ -158,7 +158,6 @@ export const AddInvitation = () => {
 											</FormControl>
 											<SelectContent>
 												<SelectItem value="member">Member</SelectItem>
-												<SelectItem value="admin">Admin</SelectItem>
 											</SelectContent>
 										</Select>
 										<FormDescription>

apps/dokploy/components/dashboard/settings/users/change-role.tsx

@@ -1,159 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-const changeRoleSchema = z.object({
-	role: z.enum(["admin", "member"]),
-});
-
-type ChangeRoleSchema = z.infer<typeof changeRoleSchema>;
-
-interface Props {
-	memberId: string;
-	currentRole: "admin" | "member";
-	userEmail: string;
-}
-
-export const ChangeRole = ({ memberId, currentRole, userEmail }: Props) => {
-	const [isOpen, setIsOpen] = useState(false);
-	const utils = api.useUtils();
-
-	const { mutateAsync, isError, error, isLoading } =
-		api.organization.updateMemberRole.useMutation();
-
-	const form = useForm<ChangeRoleSchema>({
-		defaultValues: {
-			role: currentRole,
-		},
-		resolver: zodResolver(changeRoleSchema),
-	});
-
-	useEffect(() => {
-		if (isOpen) {
-			form.reset({
-				role: currentRole,
-			});
-		}
-	}, [form, currentRole, isOpen]);
-
-	const onSubmit = async (data: ChangeRoleSchema) => {
-		await mutateAsync({
-			memberId,
-			role: data.role,
-		})
-			.then(async () => {
-				toast.success("Role updated successfully");
-				await utils.user.all.invalidate();
-				setIsOpen(false);
-			})
-			.catch((error) => {
-				toast.error(error?.message || "Error updating role");
-			});
-	};
-
-	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger className="" asChild>
-				<DropdownMenuItem
-					className="w-full cursor-pointer"
-					onSelect={(e) => e.preventDefault()}
-				>
-					Change Role
-				</DropdownMenuItem>
-			</DialogTrigger>
-			<DialogContent className="max-h-[85vh] sm:max-w-lg">
-				<DialogHeader>
-					<DialogTitle>Change User Role</DialogTitle>
-					<DialogDescription>
-						Change the role for <strong>{userEmail}</strong>
-					</DialogDescription>
-				</DialogHeader>
-				{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
-
-				<Form {...form}>
-					<form
-						id="hook-form-change-role"
-						onSubmit={form.handleSubmit(onSubmit)}
-						className="w-full space-y-4"
-					>
-						<FormField
-							control={form.control}
-							name="role"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Role</FormLabel>
-									<Select
-										onValueChange={field.onChange}
-										defaultValue={field.value}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a role" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											<SelectItem value="admin">Admin</SelectItem>
-											<SelectItem value="member">Member</SelectItem>
-										</SelectContent>
-									</Select>
-									<FormDescription>
-										<strong>Admin:</strong> Can manage users and settings.
-										<br />
-										<strong>Member:</strong> Limited permissions, can be
-										customized.
-										<br />
-										<em className="text-muted-foreground text-xs">
-											Note: Owner role is intransferible.
-										</em>
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-					</form>
-				</Form>
-
-				<DialogFooter>
-					<Button
-						isLoading={isLoading}
-						form="hook-form-change-role"
-						type="submit"
-					>
-						Update Role
-					</Button>
-				</DialogFooter>
-			</DialogContent>
-		</Dialog>
-	);
-};

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

@@ -21,6 +21,7 @@ import {
 import {
 	Table,
 	TableBody,
+	TableCaption,
 	TableCell,
 	TableHead,
 	TableHeader,
@@ -29,15 +30,12 @@ import {
 import { authClient } from "@/lib/auth-client";
 import { api } from "@/utils/api";
 import { AddUserPermissions } from "./add-permissions";
-import { ChangeRole } from "./change-role";
 
 export const ShowUsers = () => {
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data, isLoading, refetch } = api.user.all.useQuery();
 	const { mutateAsync } = api.user.remove.useMutation();
-
 	const utils = api.useUtils();
-	const { data: session } = authClient.useSession();
 
 	return (
 		<div className="w-full">
@@ -70,6 +68,7 @@ export const ShowUsers = () => {
 								) : (
 									<div className="flex flex-col gap-4  min-h-[25vh]">
 										<Table>
+											<TableCaption>See all users</TableCaption>
 											<TableHeader>
 												<TableRow>
 													<TableHead className="w-[100px]">Email</TableHead>
@@ -84,52 +83,6 @@ export const ShowUsers = () => {
 											</TableHeader>
 											<TableBody>
 												{data?.map((member) => {
-													const currentUserRole = data?.find(
-														(m) => m.user.id === session?.user?.id,
-													)?.role;
-
-													// Owner never has "Edit Permissions" (they're absolute owner)
-													// Other users can edit permissions if target is not themselves and target is a member
-													const canEditPermissions =
-														member.role !== "owner" &&
-														member.role === "member" &&
-														member.user.id !== session?.user?.id;
-
-													// Can change role based on hierarchy:
-													// - Owner: Can change anyone's role (except themselves and other owners)
-													// - Admin: Can only change member roles (not other admins or owners)
-													// - Owner role is intransferible
-													const canChangeRole =
-														member.role !== "owner" &&
-														member.user.id !== session?.user?.id &&
-														(currentUserRole === "owner" ||
-															(currentUserRole === "admin" &&
-																member.role === "member"));
-
-													// Delete/Unlink follow same hierarchy as role changes
-													// - Owner: Can delete/unlink anyone (except themselves and owner can't be deleted)
-													// - Admin: Can only delete/unlink members (not other admins or owner)
-													const canDelete =
-														member.role !== "owner" &&
-														!isCloud &&
-														member.user.id !== session?.user?.id &&
-														(currentUserRole === "owner" ||
-															(currentUserRole === "admin" &&
-																member.role === "member"));
-
-													const canUnlink =
-														member.role !== "owner" &&
-														member.user.id !== session?.user?.id &&
-														(currentUserRole === "owner" ||
-															(currentUserRole === "admin" &&
-																member.role === "member"));
-
-													const hasAnyAction =
-														canEditPermissions ||
-														canChangeRole ||
-														canDelete ||
-														canUnlink;
-
 													return (
 														<TableRow key={member.id}>
 															<TableCell className="w-[100px]">
@@ -158,73 +111,62 @@ export const ShowUsers = () => {
 															</TableCell>
 
 															<TableCell className="text-right flex justify-end">
-																{hasAnyAction ? (
-																	<DropdownMenu>
-																		<DropdownMenuTrigger asChild>
-																			<Button
-																				variant="ghost"
-																				className="h-8 w-8 p-0"
-																			>
-																				<span className="sr-only">
-																					Open menu
-																				</span>
-																				<MoreHorizontal className="h-4 w-4" />
-																			</Button>
-																		</DropdownMenuTrigger>
-																		<DropdownMenuContent align="end">
-																			<DropdownMenuLabel>
-																				Actions
-																			</DropdownMenuLabel>
+																<DropdownMenu>
+																	<DropdownMenuTrigger asChild>
+																		<Button
+																			variant="ghost"
+																			className="h-8 w-8 p-0"
+																		>
+																			<span className="sr-only">Open menu</span>
+																			<MoreHorizontal className="h-4 w-4" />
+																		</Button>
+																	</DropdownMenuTrigger>
+																	<DropdownMenuContent align="end">
+																		<DropdownMenuLabel>
+																			Actions
+																		</DropdownMenuLabel>
 
-																			{canChangeRole && (
-																				<ChangeRole
-																					memberId={member.id}
-																					currentRole={
-																						member.role as "admin" | "member"
-																					}
-																					userEmail={member.user.email}
-																				/>
-																			)}
+																		{member.role !== "owner" && (
+																			<AddUserPermissions
+																				userId={member.user.id}
+																			/>
+																		)}
 
-																			{canEditPermissions && (
-																				<AddUserPermissions
-																					userId={member.user.id}
-																				/>
-																			)}
-
-																			{canDelete && (
-																				<DialogAction
-																					title="Delete User"
-																					description="Are you sure you want to delete this user?"
-																					type="destructive"
-																					onClick={async () => {
-																						await mutateAsync({
-																							userId: member.user.id,
-																						})
-																							.then(() => {
-																								toast.success(
-																									"User deleted successfully",
-																								);
-																								refetch();
+																		{member.role !== "owner" && (
+																			<>
+																				{!isCloud && (
+																					<DialogAction
+																						title="Delete User"
+																						description="Are you sure you want to delete this user?"
+																						type="destructive"
+																						onClick={async () => {
+																							await mutateAsync({
+																								userId: member.user.id,
 																							})
-																							.catch((err) => {
-																								toast.error(
-																									err?.message ||
-																										"Error deleting user",
-																								);
-																							});
-																					}}
-																				>
-																					<DropdownMenuItem
-																						className="w-full cursor-pointer text-red-500 hover:!text-red-600"
-																						onSelect={(e) => e.preventDefault()}
+																								.then(() => {
+																									toast.success(
+																										"User deleted successfully",
+																									);
+																									refetch();
+																								})
+																								.catch(() => {
+																									toast.error(
+																										"Error deleting destination",
+																									);
+																								});
+																						}}
 																					>
-																						Delete User
-																					</DropdownMenuItem>
-																				</DialogAction>
-																			)}
+																						<DropdownMenuItem
+																							className="w-full cursor-pointer text-red-500 hover:!text-red-600"
+																							onSelect={(e) =>
+																								e.preventDefault()
+																							}
+																						>
+																							Delete User
+																						</DropdownMenuItem>
+																					</DialogAction>
+																				)}
 
-																			{canUnlink && (
 																				<DialogAction
 																					title="Unlink User"
 																					description="Are you sure you want to unlink this user?"
@@ -238,6 +180,8 @@ export const ShowUsers = () => {
 																									},
 																								);
 
+																							console.log(orgCount);
+
 																							if (orgCount === 1) {
 																								await mutateAsync({
 																									userId: member.user.id,
@@ -283,21 +227,10 @@ export const ShowUsers = () => {
 																						Unlink User
 																					</DropdownMenuItem>
 																				</DialogAction>
-																			)}
-																		</DropdownMenuContent>
-																	</DropdownMenu>
-																) : (
-																	<Button
-																		variant="ghost"
-																		className="h-8 w-8 p-0"
-																		disabled
-																	>
-																		<span className="sr-only">
-																			No actions available
-																		</span>
-																		<MoreHorizontal className="h-4 w-4 text-muted-foreground" />
-																	</Button>
-																)}
+																			</>
+																		)}
+																	</DropdownMenuContent>
+																</DropdownMenu>
 															</TableCell>
 														</TableRow>
 													);

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

@@ -36,7 +36,7 @@ import { api } from "@/utils/api";
 
 const addServerDomain = z
 	.object({
-		domain: z.string().trim().toLowerCase(),
+		domain: z.string(),
 		letsEncryptEmail: z.string(),
 		https: z.boolean().optional(),
 		certificateType: z.enum(["letsencrypt", "none", "custom"]),
@@ -49,11 +49,7 @@ const addServerDomain = z
 				message: "Required",
 			});
 		}
-		if (
-			data.https &&
-			data.certificateType === "letsencrypt" &&
-			!data.letsEncryptEmail
-		) {
+		if (data.certificateType === "letsencrypt" && !data.letsEncryptEmail) {
 			ctx.addIssue({
 				code: z.ZodIssueCode.custom,
 				message:
@@ -67,7 +63,7 @@ type AddServerDomain = z.infer<typeof addServerDomain>;
 
 export const WebDomain = () => {
 	const { t } = useTranslation("settings");
-	const { data, refetch } = api.settings.getWebServerSettings.useQuery();
+	const { data, refetch } = api.user.get.useQuery();
 	const { mutateAsync, isLoading } =
 		api.settings.assignDomainServer.useMutation();
 
@@ -82,15 +78,15 @@ export const WebDomain = () => {
 	});
 	const https = form.watch("https");
 	const domain = form.watch("domain") || "";
-	const host = data?.host || "";
+	const host = data?.user?.host || "";
 	const hasChanged = domain !== host;
 	useEffect(() => {
 		if (data) {
 			form.reset({
-				domain: data?.host || "",
-				certificateType: data?.certificateType || "none",
-				letsEncryptEmail: data?.letsEncryptEmail || "",
-				https: data?.https || false,
+				domain: data?.user?.host || "",
+				certificateType: data?.user?.certificateType,
+				letsEncryptEmail: data?.user?.letsEncryptEmail || "",
+				https: data?.user?.https || false,
 			});
 		}
 	}, [form, form.reset, data]);

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

@@ -16,8 +16,7 @@ import { UpdateServer } from "./web-server/update-server";
 
 export const WebServer = () => {
 	const { t } = useTranslation("settings");
-	const { data: webServerSettings } =
-		api.settings.getWebServerSettings.useQuery();
+	const { data } = api.user.get.useQuery();
 
 	const { data: dokployVersion } = api.settings.getDokployVersion.useQuery();
 
@@ -54,7 +53,7 @@ export const WebServer = () => {
 
 						<div className="flex items-center flex-wrap justify-between gap-4">
 							<span className="text-sm text-muted-foreground">
-								Server IP: {webServerSettings?.serverIp}
+								Server IP: {data?.user.serverIp}
 							</span>
 							<span className="text-sm text-muted-foreground">
 								Version: {dokployVersion}

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

@@ -105,9 +105,7 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 			});
 			toast.success(t("settings.server.webServer.traefik.portsUpdated"));
 			setOpen(false);
-		} catch (error) {
-			toast.error((error as Error).message || "Error updating Traefik ports");
-		}
+		} catch {}
 	};
 
 	return (
@@ -158,11 +156,11 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 										</p>
 									</div>
 								) : (
-									<ScrollArea className="pr-4">
+									<ScrollArea className="h-[400px] pr-4">
 										<div className="grid gap-4">
 											{fields.map((field, index) => (
 												<Card key={field.id} className="bg-transparent">
-													<CardContent className="grid grid-cols-4  gap-4 p-4 transparent">
+													<CardContent className="grid grid-cols-[1fr_1fr_1fr_auto] gap-4 p-4 transparent">
 														<FormField
 															control={form.control}
 															name={`ports.${index}.targetPort`}
@@ -305,12 +303,6 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
 										</div>
 									</AlertBlock>
 								)}
-
-								<AlertBlock type="warning">
-									The Traefik container will be recreated from scratch. This
-									means the container will be deleted and created again, which
-									may cause downtime in your applications.
-								</AlertBlock>
 							</div>
 							<DialogFooter>
 								<Button

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

@@ -24,16 +24,10 @@ const getTerminalKey = () => {
 interface Props {
 	children?: React.ReactNode;
 	serverId: string;
-	asButton?: boolean;
 }
 
-export const TerminalModal = ({
-	children,
-	serverId,
-	asButton = false,
-}: Props) => {
+export const TerminalModal = ({ children, serverId }: Props) => {
 	const [terminalKey, setTerminalKey] = useState<string>(getTerminalKey());
-	const [isOpen, setIsOpen] = useState(false);
 	const isLocalServer = serverId === "local";
 
 	const { data } = api.server.one.useQuery(
@@ -49,20 +43,15 @@ export const TerminalModal = ({
 	};
 
 	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			{asButton ? (
-				<DialogTrigger asChild>{children}</DialogTrigger>
-			) : (
+		<Dialog>
+			<DialogTrigger asChild>
 				<DropdownMenuItem
 					className="w-full cursor-pointer space-x-3"
-					onSelect={(e) => {
-						e.preventDefault();
-						setIsOpen(true);
-					}}
+					onSelect={(e) => e.preventDefault()}
 				>
 					{children}
 				</DropdownMenuItem>
-			)}
+			</DialogTrigger>
 			<DialogContent
 				className="sm:max-w-7xl"
 				onEscapeKeyDown={(event) => event.preventDefault()}

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

@@ -46,15 +46,15 @@ interface Props {
 export const UpdateServerIp = ({ children }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 
-	const { data, refetch } = api.settings.getWebServerSettings.useQuery();
+	const { data } = api.user.get.useQuery();
 	const { data: ip } = api.server.publicIp.useQuery();
 
 	const { mutateAsync, isLoading, error, isError } =
-		api.settings.updateServerIp.useMutation();
+		api.user.update.useMutation();
 
 	const form = useForm<Schema>({
 		defaultValues: {
-			serverIp: data?.serverIp || "",
+			serverIp: data?.user.serverIp || "",
 		},
 		resolver: zodResolver(schema),
 	});
@@ -62,11 +62,13 @@ export const UpdateServerIp = ({ children }: Props) => {
 	useEffect(() => {
 		if (data) {
 			form.reset({
-				serverIp: data.serverIp || "",
+				serverIp: data.user.serverIp || "",
 			});
 		}
 	}, [form, form.reset, data]);
 
+	const utils = api.useUtils();
+
 	const setCurrentIp = () => {
 		if (!ip) return;
 		form.setValue("serverIp", ip);
@@ -78,7 +80,7 @@ export const UpdateServerIp = ({ children }: Props) => {
 		})
 			.then(async () => {
 				toast.success("Server IP Updated");
-				await refetch();
+				await utils.user.get.invalidate();
 				setIsOpen(false);
 			})
 			.catch(() => {

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

@@ -1,6 +1,6 @@
 import { api } from "@/utils/api";
 import { ImpersonationBar } from "../dashboard/impersonation/impersonation-bar";
-import { HubSpotWidget } from "../shared/HubSpotWidget";
+import { ChatwootWidget } from "../shared/ChatwootWidget";
 import Page from "./side";
 
 interface Props {
@@ -25,9 +25,7 @@ export const DashboardLayout = ({ children }: Props) => {
 		<>
 			<Page>{children}</Page>
 			{isCloud === true && isUserSubscribed === true && (
-				<>
-					<HubSpotWidget />
-				</>
+				<ChatwootWidget websiteToken="USCpQRKzHvFMssf3p6Eacae5" />
 			)}
 
 			{haveRootAccess === true && <ImpersonationBar />}

apps/dokploy/components/layouts/side.tsx

@@ -158,8 +158,7 @@ const MENU: Menu = {
 			url: "/dashboard/schedules",
 			icon: Clock,
 			// Only enabled in non-cloud environments
-			isEnabled: ({ isCloud, auth }) =>
-				!isCloud && (auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ isCloud, auth }) => !isCloud && auth?.role === "owner",
 		},
 		{
 			isSingle: true,
@@ -169,9 +168,7 @@ const MENU: Menu = {
 			// Only enabled for admins and users with access to Traefik files in non-cloud environments
 			isEnabled: ({ auth, isCloud }) =>
 				!!(
-					(auth?.role === "owner" ||
-						auth?.role === "admin" ||
-						auth?.canAccessToTraefikFiles) &&
+					(auth?.role === "owner" || auth?.canAccessToTraefikFiles) &&
 					!isCloud
 				),
 		},
@@ -182,12 +179,7 @@ const MENU: Menu = {
 			icon: BlocksIcon,
 			// Only enabled for admins and users with access to Docker in non-cloud environments
 			isEnabled: ({ auth, isCloud }) =>
-				!!(
-					(auth?.role === "owner" ||
-						auth?.role === "admin" ||
-						auth?.canAccessToDocker) &&
-					!isCloud
-				),
+				!!((auth?.role === "owner" || auth?.canAccessToDocker) && !isCloud),
 		},
 		{
 			isSingle: true,
@@ -196,12 +188,7 @@ const MENU: Menu = {
 			icon: PieChart,
 			// Only enabled for admins and users with access to Docker in non-cloud environments
 			isEnabled: ({ auth, isCloud }) =>
-				!!(
-					(auth?.role === "owner" ||
-						auth?.role === "admin" ||
-						auth?.canAccessToDocker) &&
-					!isCloud
-				),
+				!!((auth?.role === "owner" || auth?.canAccessToDocker) && !isCloud),
 		},
 		{
 			isSingle: true,
@@ -210,12 +197,7 @@ const MENU: Menu = {
 			icon: Forward,
 			// Only enabled for admins and users with access to Docker in non-cloud environments
 			isEnabled: ({ auth, isCloud }) =>
-				!!(
-					(auth?.role === "owner" ||
-						auth?.role === "admin" ||
-						auth?.canAccessToDocker) &&
-					!isCloud
-				),
+				!!((auth?.role === "owner" || auth?.canAccessToDocker) && !isCloud),
 		},
 
 		// Legacy unused menu, adjusted to the new structure
@@ -282,8 +264,7 @@ const MENU: Menu = {
 			url: "/dashboard/settings/server",
 			icon: Activity,
 			// Only enabled for admins in non-cloud environments
-			isEnabled: ({ auth, isCloud }) =>
-				!!((auth?.role === "owner" || auth?.role === "admin") && !isCloud),
+			isEnabled: ({ auth, isCloud }) => !!(auth?.role === "owner" && !isCloud),
 		},
 		{
 			isSingle: true,
@@ -297,8 +278,7 @@ const MENU: Menu = {
 			url: "/dashboard/settings/servers",
 			icon: Server,
 			// Only enabled for admins
-			isEnabled: ({ auth }) =>
-				!!(auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
 		},
 		{
 			isSingle: true,
@@ -306,8 +286,7 @@ const MENU: Menu = {
 			icon: Users,
 			url: "/dashboard/settings/users",
 			// Only enabled for admins
-			isEnabled: ({ auth }) =>
-				!!(auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
 		},
 		{
 			isSingle: true,
@@ -316,19 +295,14 @@ const MENU: Menu = {
 			url: "/dashboard/settings/ssh-keys",
 			// Only enabled for admins and users with access to SSH keys
 			isEnabled: ({ auth }) =>
-				!!(
-					auth?.role === "owner" ||
-					auth?.canAccessToSSHKeys ||
-					auth?.role === "admin"
-				),
+				!!(auth?.role === "owner" || auth?.canAccessToSSHKeys),
 		},
 		{
 			title: "AI",
 			icon: BotIcon,
 			url: "/dashboard/settings/ai",
 			isSingle: true,
-			isEnabled: ({ auth }) =>
-				!!(auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
 		},
 		{
 			isSingle: true,
@@ -337,11 +311,7 @@ const MENU: Menu = {
 			icon: GitBranch,
 			// Only enabled for admins and users with access to Git providers
 			isEnabled: ({ auth }) =>
-				!!(
-					auth?.role === "owner" ||
-					auth?.canAccessToGitProviders ||
-					auth?.role === "admin"
-				),
+				!!(auth?.role === "owner" || auth?.canAccessToGitProviders),
 		},
 		{
 			isSingle: true,
@@ -349,8 +319,7 @@ const MENU: Menu = {
 			url: "/dashboard/settings/registry",
 			icon: Package,
 			// Only enabled for admins
-			isEnabled: ({ auth }) =>
-				!!(auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
 		},
 		{
 			isSingle: true,
@@ -358,8 +327,7 @@ const MENU: Menu = {
 			url: "/dashboard/settings/destinations",
 			icon: Database,
 			// Only enabled for admins
-			isEnabled: ({ auth }) =>
-				!!(auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
 		},
 
 		{
@@ -368,8 +336,7 @@ const MENU: Menu = {
 			url: "/dashboard/settings/certificates",
 			icon: ShieldCheck,
 			// Only enabled for admins
-			isEnabled: ({ auth }) =>
-				!!(auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
 		},
 		{
 			isSingle: true,
@@ -377,8 +344,7 @@ const MENU: Menu = {
 			url: "/dashboard/settings/cluster",
 			icon: Boxes,
 			// Only enabled for admins in non-cloud environments
-			isEnabled: ({ auth, isCloud }) =>
-				!!((auth?.role === "owner" || auth?.role === "admin") && !isCloud),
+			isEnabled: ({ auth, isCloud }) => !!(auth?.role === "owner" && !isCloud),
 		},
 		{
 			isSingle: true,
@@ -386,8 +352,7 @@ const MENU: Menu = {
 			url: "/dashboard/settings/notifications",
 			icon: Bell,
 			// Only enabled for admins
-			isEnabled: ({ auth }) =>
-				!!(auth?.role === "owner" || auth?.role === "admin"),
+			isEnabled: ({ auth }) => !!(auth?.role === "owner"),
 		},
 		{
 			isSingle: true,
@@ -753,9 +718,7 @@ function SidebarLogo() {
 										</div>
 									);
 								})}
-								{(user?.role === "owner" ||
-									user?.role === "admin" ||
-									isCloud) && (
+								{(user?.role === "owner" || isCloud) && (
 									<>
 										<DropdownMenuSeparator />
 										<AddOrganization />
@@ -1119,7 +1082,7 @@ export default function Page({ children }: Props) {
 				</SidebarContent>
 				<SidebarFooter>
 					<SidebarMenu className="flex flex-col gap-2">
-						{!isCloud && (auth?.role === "owner" || auth?.role === "admin") && (
+						{!isCloud && auth?.role === "owner" && (
 							<SidebarMenuItem>
 								<UpdateServerButton />
 							</SidebarMenuItem>

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

@@ -49,9 +49,7 @@ export const UserNav = () => {
 							alt={data?.user?.image || ""}
 						/>
 						<AvatarFallback className="rounded-lg">
-							{getFallbackAvatarInitials(
-								`${data?.user?.firstName} ${data?.user?.lastName}`.trim(),
-							)}
+							{getFallbackAvatarInitials(data?.user?.name)}
 						</AvatarFallback>
 					</Avatar>
 					<div className="grid flex-1 text-left text-sm leading-tight">
@@ -104,9 +102,7 @@ export const UserNav = () => {
 							>
 								Monitoring
 							</DropdownMenuItem>
-							{(data?.role === "owner" ||
-								data?.role === "admin" ||
-								data?.canAccessToTraefikFiles) && (
+							{(data?.role === "owner" || data?.canAccessToTraefikFiles) && (
 								<DropdownMenuItem
 									className="cursor-pointer"
 									onClick={() => {
@@ -116,9 +112,7 @@ export const UserNav = () => {
 									Traefik
 								</DropdownMenuItem>
 							)}
-							{(data?.role === "owner" ||
-								data?.role === "admin" ||
-								data?.canAccessToDocker) && (
+							{(data?.role === "owner" || data?.canAccessToDocker) && (
 								<DropdownMenuItem
 									className="cursor-pointer"
 									onClick={() => {
@@ -132,7 +126,7 @@ export const UserNav = () => {
 							)}
 						</>
 					) : (
-						(data?.role === "owner" || data?.role === "admin") && (
+						data?.role === "owner" && (
 							<DropdownMenuItem
 								className="cursor-pointer"
 								onClick={() => {

apps/dokploy/components/shared/HubSpotWidget.tsx

@@ -1,14 +0,0 @@
-import Script from "next/script";
-
-export const HubSpotWidget = () => {
-	return (
-		<Script
-			id="hs-script-loader"
-			type="text/javascript"
-			src="//js-eu1.hs-scripts.com/147033433.js"
-			strategy="lazyOnload"
-			async
-			defer
-		/>
-	);
-};

apps/dokploy/components/shared/breadcrumb-sidebar.tsx

@@ -1,4 +1,3 @@
-import { ChevronDown } from "lucide-react";
 import Link from "next/link";
 import { Fragment } from "react";
 import {
@@ -6,29 +5,16 @@ import {
 	BreadcrumbItem,
 	BreadcrumbLink,
 	BreadcrumbList,
-	BreadcrumbPage,
 	BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import { Separator } from "@/components/ui/separator";
 import { SidebarTrigger } from "@/components/ui/sidebar";
 
-interface BreadcrumbEntry {
-	name: string;
-	href?: string;
-	dropdownItems?: {
-		name: string;
-		href: string;
-	}[];
-}
-
 interface Props {
-	list: BreadcrumbEntry[];
+	list: {
+		name: string;
+		href?: string;
+	}[];
 }
 
 export const BreadcrumbSidebar = ({ list }: Props) => {
@@ -43,29 +29,13 @@ export const BreadcrumbSidebar = ({ list }: Props) => {
 							{list.map((item, index) => (
 								<Fragment key={item.name}>
 									<BreadcrumbItem className="block">
-										{item.dropdownItems && item.dropdownItems.length > 0 ? (
-											<DropdownMenu>
-												<DropdownMenuTrigger className="flex items-center gap-1 hover:text-foreground transition-colors outline-none">
-													{item.name}
-													<ChevronDown className="h-4 w-4 opacity-50" />
-												</DropdownMenuTrigger>
-												<DropdownMenuContent align="start">
-													{item.dropdownItems.map((subItem) => (
-														<DropdownMenuItem key={subItem.href} asChild>
-															<Link href={subItem.href}>{subItem.name}</Link>
-														</DropdownMenuItem>
-													))}
-												</DropdownMenuContent>
-											</DropdownMenu>
-										) : (
-											<BreadcrumbLink href={item?.href} asChild={!!item?.href}>
-												{item.href ? (
-													<Link href={item?.href}>{item?.name}</Link>
-												) : (
-													<BreadcrumbPage>{item?.name}</BreadcrumbPage>
-												)}
-											</BreadcrumbLink>
-										)}
+										<BreadcrumbLink href={item?.href} asChild={!!item?.href}>
+											{item.href ? (
+												<Link href={item?.href}>{item?.name}</Link>
+											) : (
+												item?.name
+											)}
+										</BreadcrumbLink>
 									</BreadcrumbItem>
 									{index + 1 < list.length && (
 										<BreadcrumbSeparator className="block" />

apps/dokploy/components/ui/number-input.tsx

@@ -1,84 +0,0 @@
-import { MinusIcon, PlusIcon } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-
-export interface UnitConverter {
-	toValue: (raw: string | undefined) => number;
-	fromValue: (value: number) => string;
-	formatDisplay: (value: number) => string;
-}
-
-export const createConverter = (
-	multiplier: number,
-	formatDisplay: (value: number) => string,
-): UnitConverter => ({
-	toValue: (raw) => {
-		if (!raw) return 0;
-		const value = Number.parseInt(raw, 10);
-		return Number.isNaN(value) ? 0 : value / multiplier;
-	},
-	fromValue: (value) =>
-		value <= 0 ? "" : String(Math.round(value * multiplier)),
-	formatDisplay,
-});
-
-interface NumberInputWithStepsProps {
-	value: string | undefined;
-	onChange: (value: string) => void;
-	placeholder: string;
-	step: number;
-	converter: UnitConverter;
-}
-
-export const NumberInputWithSteps = ({
-	value,
-	onChange,
-	placeholder,
-	step,
-	converter,
-}: NumberInputWithStepsProps) => {
-	const numericValue = converter.toValue(value);
-	const displayValue = converter.formatDisplay(numericValue);
-
-	const handleIncrement = () =>
-		onChange(converter.fromValue(numericValue + step));
-	const handleDecrement = () =>
-		onChange(converter.fromValue(Math.max(0, numericValue - step)));
-
-	return (
-		<div className="flex flex-col gap-2">
-			<div className="flex items-center gap-2">
-				<Button
-					type="button"
-					variant="outline"
-					size="icon"
-					className="h-9 w-9 shrink-0"
-					onClick={handleDecrement}
-					disabled={numericValue <= 0}
-				>
-					<MinusIcon className="h-4 w-4" />
-				</Button>
-				<Input
-					placeholder={placeholder}
-					value={value || ""}
-					onChange={(e) => onChange(e.target.value)}
-					className="text-center"
-				/>
-				<Button
-					type="button"
-					variant="outline"
-					size="icon"
-					className="h-9 w-9 shrink-0"
-					onClick={handleIncrement}
-				>
-					<PlusIcon className="h-4 w-4" />
-				</Button>
-			</div>
-			{displayValue && (
-				<span className="text-xs text-muted-foreground text-center">
-					{displayValue}
-				</span>
-			)}
-		</div>
-	);
-};

apps/dokploy/components/ui/time-badge.tsx

@@ -44,20 +44,14 @@ export function TimeBadge() {
 			.padStart(2, "0")}`;
 	};
 
-	const formattedTime = new Intl.DateTimeFormat("en-US", {
-		timeZone: serverTime.timezone,
-		timeStyle: "medium",
-		hour12: false,
-	}).format(time);
-
 	return (
-		<div className="inline-flex items-center rounded-full border p-1 text-xs whitespace-nowrap max-w-full overflow-hidden gap-1">
-			<div className="inline-flex items-center px-1 gap-1">
-				<span className="hidden sm:inline">Server Time:</span>
-				<span className="font-medium tabular-nums">{formattedTime}</span>
-			</div>
-			<span className="hidden sm:inline text-primary/70 border rounded-full bg-foreground/5 px-1.5 py-0.5">
-				{serverTime.timezone} | {getUtcOffset(serverTime.timezone)}
+		<div className="inline-flex items-center gap-2 rounded-md border px-2 py-1 text-xs sm:text-sm whitespace-nowrap max-w-full overflow-hidden">
+			<span className="hidden sm:inline">Server Time:</span>
+			<span className="font-medium tabular-nums">
+				{time.toLocaleTimeString()}
+			</span>
+			<span className="hidden sm:inline text-muted-foreground">
+				({serverTime.timezone} | {getUtcOffset(serverTime.timezone)})
 			</span>
 		</div>
 	);

apps/dokploy/drizzle/0121_rainy_cargill.sql

@@ -1,9 +0,0 @@
--- Fix inconsistent date formats in environment.createdAt field
--- Convert PostgreSQL timestamp format to ISO 8601 format
--- This addresses issue #2992 where old environments have PostgreSQL timestamp format
--- while new ones have ISO 8601 format
-
-UPDATE "environment"
-SET "createdAt" = to_char("createdAt"::timestamptz, 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')
-WHERE "createdAt" NOT LIKE '%T%';
-

apps/dokploy/drizzle/0122_absent_frightful_four.sql

@@ -1,8 +0,0 @@
-CREATE TYPE "public"."serverType" AS ENUM('deploy', 'build');--> statement-breakpoint
-ALTER TABLE "application" ADD COLUMN "buildServerId" text;--> statement-breakpoint
-ALTER TABLE "application" ADD COLUMN "buildRegistryId" text;--> statement-breakpoint
-ALTER TABLE "deployment" ADD COLUMN "buildServerId" text;--> statement-breakpoint
-ALTER TABLE "server" ADD COLUMN "serverType" "serverType" DEFAULT 'deploy' NOT NULL;--> statement-breakpoint
-ALTER TABLE "application" ADD CONSTRAINT "application_buildServerId_server_serverId_fk" FOREIGN KEY ("buildServerId") REFERENCES "public"."server"("serverId") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "application" ADD CONSTRAINT "application_buildRegistryId_registry_registryId_fk" FOREIGN KEY ("buildRegistryId") REFERENCES "public"."registry"("registryId") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "deployment" ADD CONSTRAINT "deployment_buildServerId_server_serverId_fk" FOREIGN KEY ("buildServerId") REFERENCES "public"."server"("serverId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0123_cloudy_piledriver.sql

@@ -1,6 +0,0 @@
-ALTER TABLE "application" ADD COLUMN "args" text[];--> statement-breakpoint
-ALTER TABLE "mariadb" ADD COLUMN "args" text[];--> statement-breakpoint
-ALTER TABLE "mongo" ADD COLUMN "args" text[];--> statement-breakpoint
-ALTER TABLE "mysql" ADD COLUMN "args" text[];--> statement-breakpoint
-ALTER TABLE "postgres" ADD COLUMN "args" text[];--> statement-breakpoint
-ALTER TABLE "redis" ADD COLUMN "args" text[];

apps/dokploy/drizzle/0124_certain_cloak.sql

@@ -1 +0,0 @@
-ALTER TABLE "ntfy" ALTER COLUMN "accessToken" DROP NOT NULL;

apps/dokploy/drizzle/0125_neat_the_phantom.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "application" ADD COLUMN "rollbackRegistryId" text;--> statement-breakpoint
-ALTER TABLE "application" ADD CONSTRAINT "application_rollbackRegistryId_registry_registryId_fk" FOREIGN KEY ("rollbackRegistryId") REFERENCES "public"."registry"("registryId") ON DELETE set null ON UPDATE no action;

apps/dokploy/drizzle/0126_nifty_monster_badoon.sql

@@ -1 +0,0 @@
-ALTER TABLE "user" ALTER COLUMN "enableDockerCleanup" SET DEFAULT true;

apps/dokploy/drizzle/0127_superb_alice.sql

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

apps/dokploy/drizzle/0128_hard_falcon.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "user" RENAME COLUMN "name" TO "firstName";--> statement-breakpoint
-ALTER TABLE "user" ADD COLUMN "lastName" text DEFAULT '' NOT NULL;

apps/dokploy/drizzle/0129_pale_roughhouse.sql

@@ -1,9 +0,0 @@
-ALTER TYPE "public"."notificationType" ADD VALUE 'custom' BEFORE 'lark';--> statement-breakpoint
-CREATE TABLE "custom" (
-	"customId" text PRIMARY KEY NOT NULL,
-	"endpoint" text NOT NULL,
-	"headers" jsonb
-);
---> statement-breakpoint
-ALTER TABLE "notification" ADD COLUMN "customId" text;--> statement-breakpoint
-ALTER TABLE "notification" ADD CONSTRAINT "notification_customId_custom_customId_fk" FOREIGN KEY ("customId") REFERENCES "public"."custom"("customId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0130_perpetual_screwball.sql

@@ -1 +0,0 @@
-ALTER TABLE "schedule" ADD COLUMN "timezone" text;

apps/dokploy/drizzle/0131_volatile_beast.sql

@@ -1 +0,0 @@
-ALTER TABLE "application" ADD COLUMN "createEnvFile" boolean DEFAULT true NOT NULL;

apps/dokploy/drizzle/0132_clean_layla_miller.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "environment" ADD COLUMN "isDefault" boolean DEFAULT false NOT NULL;
-
--- Set isDefault to true for existing production environments
-UPDATE "environment" SET "isDefault" = true WHERE "name" = 'production';

apps/dokploy/drizzle/0133_striped_the_order.sql

@@ -1,114 +0,0 @@
-CREATE TABLE "webServerSettings" (
-	"id" text PRIMARY KEY NOT NULL,
-	"serverIp" text,
-	"certificateType" "certificateType" DEFAULT 'none' NOT NULL,
-	"https" boolean DEFAULT false NOT NULL,
-	"host" text,
-	"letsEncryptEmail" text,
-	"sshPrivateKey" text,
-	"enableDockerCleanup" boolean DEFAULT true NOT NULL,
-	"logCleanupCron" text DEFAULT '0 0 * * *',
-	"metricsConfig" jsonb DEFAULT '{"server":{"type":"Dokploy","refreshRate":60,"port":4500,"token":"","retentionDays":2,"cronJob":"","urlCallback":"","thresholds":{"cpu":0,"memory":0}},"containers":{"refreshRate":60,"services":{"include":[],"exclude":[]}}}'::jsonb NOT NULL,
-	"cleanupCacheApplications" boolean DEFAULT false NOT NULL,
-	"cleanupCacheOnPreviews" boolean DEFAULT false NOT NULL,
-	"cleanupCacheOnCompose" boolean DEFAULT false NOT NULL,
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now() NOT NULL
-);
-
--- Migrate data from user table to webServerSettings
--- Get the owner user's data and insert into webServerSettings
-INSERT INTO "webServerSettings" (
-	"id",
-	"serverIp",
-	"certificateType",
-	"https",
-	"host",
-	"letsEncryptEmail",
-	"sshPrivateKey",
-	"enableDockerCleanup",
-	"logCleanupCron",
-	"metricsConfig",
-	"cleanupCacheApplications",
-	"cleanupCacheOnPreviews",
-	"cleanupCacheOnCompose",
-	"created_at",
-	"updated_at"
-)
-SELECT 
-	gen_random_uuid()::text as "id",
-	u."serverIp",
-	COALESCE(u."certificateType", 'none') as "certificateType",
-	COALESCE(u."https", false) as "https",
-	u."host",
-	u."letsEncryptEmail",
-	u."sshPrivateKey",
-	COALESCE(u."enableDockerCleanup", true) as "enableDockerCleanup",
-	COALESCE(u."logCleanupCron", '0 0 * * *') as "logCleanupCron",
-	COALESCE(
-		u."metricsConfig",
-		'{"server":{"type":"Dokploy","refreshRate":60,"port":4500,"token":"","retentionDays":2,"cronJob":"","urlCallback":"","thresholds":{"cpu":0,"memory":0}},"containers":{"refreshRate":60,"services":{"include":[],"exclude":[]}}}'::jsonb
-	) as "metricsConfig",
-	COALESCE(u."cleanupCacheApplications", false) as "cleanupCacheApplications",
-	COALESCE(u."cleanupCacheOnPreviews", false) as "cleanupCacheOnPreviews",
-	COALESCE(u."cleanupCacheOnCompose", false) as "cleanupCacheOnCompose",
-	NOW() as "created_at",
-	NOW() as "updated_at"
-FROM "user" u
-INNER JOIN "member" m ON u."id" = m."user_id"
-WHERE m."role" = 'owner'
-ORDER BY m."created_at" ASC
-LIMIT 1;
-
--- If no owner found, create a default entry
-INSERT INTO "webServerSettings" (
-	"id",
-	"serverIp",
-	"certificateType",
-	"https",
-	"host",
-	"letsEncryptEmail",
-	"sshPrivateKey",
-	"enableDockerCleanup",
-	"logCleanupCron",
-	"metricsConfig",
-	"cleanupCacheApplications",
-	"cleanupCacheOnPreviews",
-	"cleanupCacheOnCompose",
-	"created_at",
-	"updated_at"
-)
-SELECT 
-	gen_random_uuid()::text as "id",
-	NULL as "serverIp",
-	'none' as "certificateType",
-	false as "https",
-	NULL as "host",
-	NULL as "letsEncryptEmail",
-	NULL as "sshPrivateKey",
-	true as "enableDockerCleanup",
-	'0 0 * * *' as "logCleanupCron",
-	'{"server":{"type":"Dokploy","refreshRate":60,"port":4500,"token":"","retentionDays":2,"cronJob":"","urlCallback":"","thresholds":{"cpu":0,"memory":0}},"containers":{"refreshRate":60,"services":{"include":[],"exclude":[]}}}'::jsonb as "metricsConfig",
-	false as "cleanupCacheApplications",
-	false as "cleanupCacheOnPreviews",
-	false as "cleanupCacheOnCompose",
-	NOW() as "created_at",
-	NOW() as "updated_at"
-WHERE NOT EXISTS (
-	SELECT 1 FROM "webServerSettings"
-);
-
-
---> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "serverIp";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "certificateType";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "https";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "host";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "letsEncryptEmail";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "sshPrivateKey";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "enableDockerCleanup";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "logCleanupCron";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "metricsConfig";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "cleanupCacheApplications";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "cleanupCacheOnPreviews";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "cleanupCacheOnCompose";