fix: update project handling permissions to include admin role

feat(schedules): add support for all IANA timezones

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

@@ -161,6 +161,50 @@ 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/components/dashboard/application/preview-deployments/show-preview-settings.tsx

@@ -123,7 +123,7 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 				previewCertificateType: data.previewCertificateType || "none",
 				previewCustomCertResolver: data.previewCustomCertResolver || "",
 				previewRequireCollaboratorPermissions:
-					data.previewRequireCollaboratorPermissions || true,
+					data.previewRequireCollaboratorPermissions ?? true,
 			});
 		}
 	}, [data]);

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

@@ -1,5 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
+	CheckIcon,
+	ChevronsUpDown,
 	DatabaseZap,
 	Info,
 	PenBoxIcon,
@@ -13,6 +15,14 @@ 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,
@@ -31,6 +41,12 @@ 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,
@@ -48,6 +64,7 @@ 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: "* * * * *" },
@@ -60,30 +77,6 @@ export const commonCronExpressions = [
 	{ label: "Custom", value: "custom" },
 ];
 
-export const commonTimezones = [
-	{ label: "UTC (Coordinated Universal Time)", value: "UTC" },
-	{ label: "America/New_York (Eastern Time)", value: "America/New_York" },
-	{ label: "America/Chicago (Central Time)", value: "America/Chicago" },
-	{ label: "America/Denver (Mountain Time)", value: "America/Denver" },
-	{ label: "America/Los_Angeles (Pacific Time)", value: "America/Los_Angeles" },
-	{
-		label: "America/Mexico_City (Central Mexico)",
-		value: "America/Mexico_City",
-	},
-	{ label: "America/Sao_Paulo (Brasilia Time)", value: "America/Sao_Paulo" },
-	{ label: "Europe/London (Greenwich Mean Time)", value: "Europe/London" },
-	{ label: "Europe/Paris (Central European Time)", value: "Europe/Paris" },
-	{ label: "Europe/Berlin (Central European Time)", value: "Europe/Berlin" },
-	{ label: "Asia/Tokyo (Japan Standard Time)", value: "Asia/Tokyo" },
-	{ label: "Asia/Shanghai (China Standard Time)", value: "Asia/Shanghai" },
-	{ label: "Asia/Dubai (Gulf Standard Time)", value: "Asia/Dubai" },
-	{ label: "Asia/Kolkata (India Standard Time)", value: "Asia/Kolkata" },
-	{
-		label: "Australia/Sydney (Australian Eastern Time)",
-		value: "Australia/Sydney",
-	},
-];
-
 const formSchema = z
 	.object({
 		name: z.string().min(1, "Name is required"),
@@ -512,25 +505,60 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 											</Tooltip>
 										</TooltipProvider>
 									</FormLabel>
-									<Select
-										onValueChange={(value) => {
-											field.onChange(value);
-										}}
-										value={field.value}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="UTC (default)" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											{commonTimezones.map((tz) => (
-												<SelectItem key={tz.value} value={tz.value}>
-													{tz.label}
-												</SelectItem>
-											))}
-										</SelectContent>
-									</Select>
+									<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>

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

@@ -0,0 +1,458 @@
+// 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/projects/show.tsx

@@ -190,7 +190,9 @@ export const ShowProjects = () => {
 									Create and manage your projects
 								</CardDescription>
 							</CardHeader>
-							{(auth?.role === "owner" || auth?.canCreateProjects) && (
+							{(auth?.role === "owner" ||
+								auth?.role === "admin" ||
+								auth?.canCreateProjects) && (
 								<div className="">
 									<HandleProject />
 								</div>

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

@@ -42,9 +42,7 @@ const AddRegistrySchema = z.object({
 	username: z.string().min(1, {
 		message: "Username is required",
 	}),
-	password: z.string().min(1, {
-		message: "Password is required",
-	}),
+	password: z.string(),
 	registryUrl: z
 		.string()
 		.optional()
@@ -75,6 +73,7 @@ const AddRegistrySchema = z.object({
 		),
 	imagePrefix: z.string(),
 	serverId: z.string().optional(),
+	isEditing: z.boolean().optional(),
 });
 
 type AddRegistry = z.infer<typeof AddRegistrySchema>;
@@ -101,13 +100,21 @@ export const HandleRegistry = ({ registryId }: Props) => {
 	const { mutateAsync, error, isError } = registryId
 		? api.registry.update.useMutation()
 		: api.registry.create.useMutation();
-	const { data: servers } = api.server.withSSHKey.useQuery();
+	const { data: deployServers } = api.server.withSSHKey.useQuery();
+	const { data: buildServers } = api.server.buildServers.useQuery();
+	const servers = [...(deployServers || []), ...(buildServers || [])];
 	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: "",
@@ -116,8 +123,26 @@ export const HandleRegistry = ({ registryId }: Props) => {
 			imagePrefix: "",
 			registryName: "",
 			serverId: "",
+			isEditing: !!registryId,
 		},
-		resolver: zodResolver(AddRegistrySchema),
+		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"],
+				},
+			),
+		),
 	});
 
 	const password = form.watch("password");
@@ -138,6 +163,7 @@ export const HandleRegistry = ({ registryId }: Props) => {
 				registryUrl: registry.registryUrl,
 				imagePrefix: registry.imagePrefix || "",
 				registryName: registry.registryName,
+				isEditing: true,
 			});
 		} else {
 			form.reset({
@@ -146,13 +172,13 @@ export const HandleRegistry = ({ registryId }: Props) => {
 				registryUrl: "",
 				imagePrefix: "",
 				serverId: "",
+				isEditing: false,
 			});
 		}
 	}, [form, form.reset, form.formState.isSubmitSuccessful, registry]);
 
 	const onSubmit = async (data: AddRegistry) => {
-		await mutateAsync({
-			password: data.password,
+		const payload: any = {
 			registryName: data.registryName,
 			username: data.username,
 			registryUrl: data.registryUrl || "",
@@ -160,7 +186,15 @@ export const HandleRegistry = ({ registryId }: Props) => {
 			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");
@@ -198,11 +232,14 @@ export const HandleRegistry = ({ registryId }: Props) => {
 						Fill the next fields to add a external registry.
 					</DialogDescription>
 				</DialogHeader>
-				{(isError || testRegistryIsError) && (
+				{(isError || testRegistryIsError || testRegistryByIdIsError) && (
 					<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 || error?.message || ""}
+							{testRegistryError?.message ||
+								testRegistryByIdError?.message ||
+								error?.message ||
+								""}
 						</span>
 					</div>
 				)}
@@ -253,10 +290,20 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								name="password"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Password</FormLabel>
+										<FormLabel>Password{registryId && " (Optional)"}</FormLabel>
+										{registryId && (
+											<FormDescription>
+												Leave blank to keep existing password. Enter new
+												password to test or update it.
+											</FormDescription>
+										)}
 										<FormControl>
 											<Input
-												placeholder="Password"
+												placeholder={
+													registryId
+														? "Leave blank to keep existing"
+														: "Password"
+												}
 												autoComplete="one-time-code"
 												{...field}
 												type="password"
@@ -360,16 +407,33 @@ 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>
@@ -387,8 +451,37 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								<Button
 									type="button"
 									variant={"secondary"}
-									isLoading={isLoading}
+									isLoading={isLoading || isLoadingById}
 									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,
@@ -396,6 +489,7 @@ export const HandleRegistry = ({ registryId }: Props) => {
 											registryName: "Dokploy Registry",
 											imagePrefix,
 											serverId,
+											isEditing: !!registryId,
 										});
 
 										if (!validationResult.success) {

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

@@ -122,6 +122,9 @@ 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/servers/actions/show-server-actions.tsx

@@ -1,3 +1,4 @@
+import { Activity } from "lucide-react";
 import { useState } from "react";
 import {
 	Dialog,
@@ -6,6 +7,7 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
 import { ShowStorageActions } from "./show-storage-actions";
 import { ShowTraefikActions } from "./show-traefik-actions";
@@ -13,20 +15,30 @@ import { ToggleDockerCleanup } from "./toggle-docker-cleanup";
 
 interface Props {
 	serverId: string;
+	asButton?: boolean;
 }
 
-export const ShowServerActions = ({ serverId }: Props) => {
+export const ShowServerActions = ({ serverId, asButton = false }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
+			{asButton ? (
+				<DialogTrigger asChild>
+					<Button variant="outline" size="icon" className="h-9 w-9">
+						<Activity className="h-4 w-4" />
+					</Button>
+				</DialogTrigger>
+			) : (
 				<DropdownMenuItem
 					className="w-full cursor-pointer"
-					onSelect={(e) => e.preventDefault()}
+					onSelect={(e) => {
+						e.preventDefault();
+						setIsOpen(true);
+					}}
 				>
 					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>

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

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { PlusIcon } from "lucide-react";
+import { PlusIcon, Pencil } from "lucide-react";
 import Link from "next/link";
 import { useTranslation } from "next-i18next";
 import { useEffect, useState } from "react";
@@ -59,9 +59,10 @@ type Schema = z.infer<typeof Schema>;
 
 interface Props {
 	serverId?: string;
+	asButton?: boolean;
 }
 
-export const HandleServers = ({ serverId }: Props) => {
+export const HandleServers = ({ serverId, asButton = false }: Props) => {
 	const { t } = useTranslation("settings");
 
 	const utils = api.useUtils();
@@ -137,21 +138,32 @@ export const HandleServers = ({ serverId }: Props) => {
 
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
-				{serverId ? (
+			{serverId ? (
+				asButton ? (
+					<DialogTrigger asChild>
+						<Button variant="outline" size="icon" className="h-9 w-9">
+							<Pencil className="h-4 w-4" />
+						</Button>
+					</DialogTrigger>
+				) : (
 					<DropdownMenuItem
 						className="w-full cursor-pointer "
-						onSelect={(e) => e.preventDefault()}
+						onSelect={(e) => {
+							e.preventDefault();
+							setIsOpen(true);
+						}}
 					>
 						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>

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

@@ -1,5 +1,5 @@
 import copy from "copy-to-clipboard";
-import { CopyIcon, ExternalLinkIcon, ServerIcon } from "lucide-react";
+import { CopyIcon, ExternalLinkIcon, ServerIcon, Settings } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
 import { toast } from "sonner";
@@ -36,9 +36,10 @@ import { ValidateServer } from "./validate-server";
 
 interface Props {
 	serverId: string;
+	asButton?: boolean;
 }
 
-export const SetupServer = ({ serverId }: Props) => {
+export const SetupServer = ({ serverId, asButton = false }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const { data: server } = api.server.one.useQuery(
 		{
@@ -81,14 +82,23 @@ export const SetupServer = ({ serverId }: Props) => {
 
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
+			{asButton ? (
+				<DialogTrigger asChild>
+					<Button variant="outline" size="icon" className="h-9 w-9">
+						<Settings className="h-4 w-4" />
+					</Button>
+				</DialogTrigger>
+			) : (
 				<DropdownMenuItem
 					className="w-full cursor-pointer "
-					onSelect={(e) => e.preventDefault()}
+					onSelect={(e) => {
+						e.preventDefault();
+						setIsOpen(true);
+					}}
 				>
 					Setup Server
 				</DropdownMenuItem>
-			</DialogTrigger>
+			)}
 			<DialogContent className="sm:max-w-4xl  ">
 				<DialogHeader>
 					<div className="flex flex-col gap-1.5">

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

@@ -1,5 +1,18 @@
 import { format } from "date-fns";
-import { KeyIcon, Loader2, MoreHorizontal, ServerIcon } from "lucide-react";
+import {
+	KeyIcon,
+	Loader2,
+	MoreHorizontal,
+	ServerIcon,
+	Clock,
+	User,
+	Key,
+	Network,
+	Terminal,
+	Settings,
+	Pencil,
+	Trash2,
+} from "lucide-react";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { useTranslation } from "next-i18next";
@@ -24,14 +37,11 @@ import {
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import {
-	Table,
-	TableBody,
-	TableCaption,
-	TableCell,
-	TableHead,
-	TableHeader,
-	TableRow,
-} from "@/components/ui/table";
+	Tooltip,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
+} from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import { ShowNodesModal } from "../cluster/nodes/show-nodes-modal";
 import { TerminalModal } from "../web-server/terminal-modal";
@@ -59,7 +69,7 @@ export const ShowServers = () => {
 	return (
 		<div className="w-full">
 			{query?.success && isCloud && <WelcomeSuscription />}
-			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
+			<Card className="h-full  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">
@@ -114,240 +124,309 @@ export const ShowServers = () => {
 												<HandleServers />
 											</div>
 										) : (
-											<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">
-																Type
-															</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";
-															const isBuildServer =
-																server.serverType === "build";
-															return (
-																<TableRow key={server.serverId}>
-																	<TableCell className="text-left">
-																		{server.name}
-																	</TableCell>
-																	{isCloud && (
-																		<TableHead className="text-center">
+											<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">
+																						<DropdownMenuLabel>
+																							Advanced
+																						</DropdownMenuLabel>
+																						<ShowTraefikFileSystemModal
+																							serverId={server.serverId}
+																						/>
+																						<ShowDockerContainersModal
+																							serverId={server.serverId}
+																						/>
+																						{isCloud && (
+																							<ShowMonitoringModal
+																								url={`http://${server.ipAddress}:${server?.metricsConfig?.server?.port}/metrics`}
+																								token={
+																									server?.metricsConfig?.server
+																										?.token
+																								}
+																							/>
+																						)}
+																						<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={
-																					server.serverStatus === "active"
-																						? "default"
-																						: "destructive"
+																					isBuildServer
+																						? "secondary"
+																						: "default"
 																				}
 																			>
-																				{server.serverStatus}
+																				{server.serverType}
 																			</Badge>
-																		</TableHead>
-																	)}
-																	<TableCell className="text-center">
-																		<Badge
-																			variant={
-																				isBuildServer ? "secondary" : "default"
-																			}
-																		>
-																			{server.serverType}
+																		</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>
-																	</TableCell>
-																	<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">
+																		<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>
-																	</TableCell>
-																	<TableCell className="text-right">
-																		<span className="text-sm text-muted-foreground">
+																	</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),
-																				"PPpp",
+																				"PPp",
 																			)}
 																		</span>
-																	</TableCell>
+																	</div>
 
-																	<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 &&
-																							!isBuildServer && (
-																								<ShowServerActions
+																	{/* 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>
 																				)}
 
-																				<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 &&
-																					!isBuildServer && (
-																						<>
-																							<DropdownMenuSeparator />
-																							<DropdownMenuLabel>
-																								Extra
-																							</DropdownMenuLabel>
-
-																							<ShowTraefikFileSystemModal
+																				<Tooltip>
+																					<TooltipTrigger asChild>
+																						<div>
+																							<SetupServer
 																								serverId={server.serverId}
+																								asButton={true}
 																							/>
-																							<ShowDockerContainersModal
+																						</div>
+																					</TooltipTrigger>
+																					<TooltipContent>
+																						<p>Setup Server</p>
+																					</TooltipContent>
+																				</Tooltip>
+
+																				<Tooltip>
+																					<TooltipTrigger asChild>
+																						<div>
+																							<HandleServers
 																								serverId={server.serverId}
+																								asButton={true}
 																							/>
-																							{isCloud && (
-																								<ShowMonitoringModal
-																									url={`http://${server.ipAddress}:${server?.metricsConfig?.server?.port}/metrics`}
-																									token={
-																										server?.metricsConfig
-																											?.server?.token
-																									}
+																						</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>
+																				)}
 
-																							<ShowSwarmOverviewModal
-																								serverId={server.serverId}
-																							/>
-																							<ShowNodesModal
-																								serverId={server.serverId}
-																							/>
+																				<div className="flex-1" />
 
-																							<ShowSchedulesModal
-																								serverId={server.serverId}
-																							/>
-																						</>
-																					)}
-																			</DropdownMenuContent>
-																		</DropdownMenu>
-																	</TableCell>
-																</TableRow>
-															);
-														})}
-													</TableBody>
-												</Table>
+																				<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 mr-4">
+												<div className="flex flex-row gap-2 flex-wrap w-full justify-end mt-4">
 													{data && data?.length > 0 && (
 														<div>
 															<HandleServers />

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

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

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

@@ -1,22 +1,36 @@
 import Link from "next/link";
 import { Fragment } from "react";
+import { ChevronDown } from "lucide-react";
 import {
 	Breadcrumb,
 	BreadcrumbItem,
 	BreadcrumbLink,
 	BreadcrumbList,
 	BreadcrumbSeparator,
+	BreadcrumbPage,
 } 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 Props {
-	list: {
+interface BreadcrumbEntry {
+	name: string;
+	href?: string;
+	dropdownItems?: {
 		name: string;
-		href?: string;
+		href: string;
 	}[];
 }
 
+interface Props {
+	list: BreadcrumbEntry[];
+}
+
 export const BreadcrumbSidebar = ({ list }: Props) => {
 	return (
 		<header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12">
@@ -29,13 +43,29 @@ export const BreadcrumbSidebar = ({ list }: Props) => {
 							{list.map((item, index) => (
 								<Fragment key={item.name}>
 									<BreadcrumbItem className="block">
-										<BreadcrumbLink href={item?.href} asChild={!!item?.href}>
-											{item.href ? (
-												<Link href={item?.href}>{item?.name}</Link>
-											) : (
-												item?.name
-											)}
-										</BreadcrumbLink>
+										{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>
+										)}
 									</BreadcrumbItem>
 									{index + 1 < list.length && (
 										<BreadcrumbSeparator className="block" />

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.26.2",
+	"version": "v0.26.3",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",
@@ -33,7 +33,7 @@
 		"docker:build:canary": "./docker/build.sh canary",
 		"docker:push:canary": "./docker/push.sh canary",
 		"version": "echo $(node -p \"require('./package.json').version\")",
-		"test": "vitest --config __test__/vitest.config.ts",
+		"test": "vitest --config __test__/vitest.config.ts volume-backups",
 		"generate:openapi": "tsx -r dotenv/config scripts/generate-openapi.ts"
 	},
 	"dependencies": {

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

@@ -279,6 +279,16 @@ const EnvironmentPage = (
 	const [isBulkActionLoading, setIsBulkActionLoading] = useState(false);
 	const { projectId, environmentId } = props;
 	const { data: auth } = api.user.get.useQuery();
+
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: projectId,
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
+
 	const [sortBy, setSortBy] = useState<string>(() => {
 		if (typeof window !== "undefined") {
 			return localStorage.getItem("servicesSort") || "lastDeploy-desc";
@@ -863,6 +873,7 @@ const EnvironmentPage = (
 					},
 					{
 						name: currentEnvironment.name,
+						dropdownItems: environmentDropdownItems,
 					},
 				]}
 			/>

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

@@ -91,6 +91,15 @@ const Service = (
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data: auth } = api.user.get.useQuery();
 
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: data?.environment?.project?.projectId || "",
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
+
 	return (
 		<div className="pb-10">
 			<UseKeyboardNav forPage="application" />
@@ -98,11 +107,11 @@ const Service = (
 				list={[
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
-						name: data?.environment.project.name || "",
+						name: data?.environment?.project?.name || "",
 					},
 					{
 						name: data?.environment?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
+						dropdownItems: environmentDropdownItems,
 					},
 					{
 						name: data?.name || "",

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

@@ -80,6 +80,14 @@ const Service = (
 
 	const { data: auth } = api.user.get.useQuery();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: data?.environment?.projectId || "",
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
 
 	return (
 		<div className="pb-10">
@@ -92,7 +100,7 @@ const Service = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
+						dropdownItems: environmentDropdownItems,
 					},
 					{
 						name: data?.name || "",

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

@@ -62,6 +62,15 @@ const Mariadb = (
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: data?.environment?.projectId || "",
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
+
 	return (
 		<div className="pb-10">
 			<UseKeyboardNav forPage="mariadb" />
@@ -73,7 +82,7 @@ const Mariadb = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
+						dropdownItems: environmentDropdownItems,
 					},
 					{
 						name: data?.name || "",

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

@@ -61,6 +61,14 @@ const Mongo = (
 	const { data: auth } = api.user.get.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: data?.environment?.projectId || "",
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
 
 	return (
 		<div className="pb-10">
@@ -73,7 +81,7 @@ const Mongo = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
+						dropdownItems: environmentDropdownItems,
 					},
 					{
 						name: data?.name || "",

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

@@ -60,6 +60,14 @@ const MySql = (
 	const { data: auth } = api.user.get.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: data?.environment?.projectId || "",
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
 
 	return (
 		<div className="pb-10">
@@ -72,7 +80,7 @@ const MySql = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
+						dropdownItems: environmentDropdownItems,
 					},
 					{
 						name: data?.name || "",

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

@@ -60,6 +60,14 @@ const Postgresql = (
 	const { data: auth } = api.user.get.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: data?.environment?.projectId || "",
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
 
 	return (
 		<div className="pb-10">
@@ -72,7 +80,7 @@ const Postgresql = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
+						dropdownItems: environmentDropdownItems,
 					},
 					{
 						name: data?.name || "",

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

@@ -60,6 +60,14 @@ const Redis = (
 	const { data: auth } = api.user.get.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
+	const { data: environments } = api.environment.byProjectId.useQuery({
+		projectId: data?.environment?.projectId || "",
+	});
+	const environmentDropdownItems =
+		environments?.map((env) => ({
+			name: env.name,
+			href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
+		})) || [];
 
 	return (
 		<div className="pb-10">
@@ -72,7 +80,7 @@ const Redis = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
+						dropdownItems: environmentDropdownItems,
 					},
 					{
 						name: data?.name || "",

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

@@ -87,7 +87,7 @@ export const mariadbRouter = createTRPCRouter({
 					type: "volume",
 				});
 
-				return true;
+				return newMariadb;
 			} catch (error) {
 				if (error instanceof TRPCError) {
 					throw error;

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

@@ -87,7 +87,7 @@ export const mongoRouter = createTRPCRouter({
 					type: "volume",
 				});
 
-				return true;
+				return newMongo;
 			} catch (error) {
 				if (error instanceof TRPCError) {
 					throw error;

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

@@ -89,7 +89,7 @@ export const mysqlRouter = createTRPCRouter({
 					type: "volume",
 				});
 
-				return true;
+				return newMysql;
 			} catch (error) {
 				if (error instanceof TRPCError) {
 					throw error;

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

@@ -91,7 +91,7 @@ export const postgresRouter = createTRPCRouter({
 					type: "volume",
 				});
 
-				return true;
+				return newPostgres;
 			} catch (error) {
 				if (error instanceof TRPCError) {
 					throw error;

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

@@ -15,6 +15,7 @@ import {
 	apiFindOneRegistry,
 	apiRemoveRegistry,
 	apiTestRegistry,
+	apiTestRegistryById,
 	apiUpdateRegistry,
 	registry,
 } from "@/server/db/schema";
@@ -109,6 +110,67 @@ export const registryRouter = createTRPCRouter({
 					});
 				}
 
+				return true;
+			} catch (error) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message:
+						error instanceof Error
+							? error.message
+							: "Error testing the registry",
+					cause: error,
+				});
+			}
+		}),
+	testRegistryById: protectedProcedure
+		.input(apiTestRegistryById)
+		.mutation(async ({ input, ctx }) => {
+			try {
+				// Get the full registry with password from database
+				const registryData = await db.query.registry.findFirst({
+					where: eq(registry.registryId, input.registryId ?? ""),
+				});
+
+				if (!registryData) {
+					throw new TRPCError({
+						code: "NOT_FOUND",
+						message: "Registry not found",
+					});
+				}
+
+				if (registryData.organizationId !== ctx.session.activeOrganizationId) {
+					throw new TRPCError({
+						code: "UNAUTHORIZED",
+						message: "You are not allowed to test this registry",
+					});
+				}
+
+				const args = [
+					"login",
+					registryData.registryUrl,
+					"--username",
+					registryData.username,
+					"--password-stdin",
+				];
+
+				if (IS_CLOUD && !input.serverId) {
+					throw new TRPCError({
+						code: "NOT_FOUND",
+						message: "Select a server to test the registry",
+					});
+				}
+
+				if (input.serverId && input.serverId !== "none") {
+					await execAsyncRemote(
+						input.serverId,
+						`echo ${registryData.password} | docker ${args.join(" ")}`,
+					);
+				} else {
+					await execFileAsync("docker", args, {
+						input: Buffer.from(registryData.password).toString(),
+					});
+				}
+
 				return true;
 			} catch (error) {
 				throw new TRPCError({

packages/server/src/db/schema/registry.ts

@@ -80,6 +80,14 @@ export const apiTestRegistry = createSchema.pick({}).extend({
 	serverId: z.string().optional(),
 });
 
+export const apiTestRegistryById = createSchema
+	.pick({
+		registryId: true,
+	})
+	.extend({
+		serverId: z.string().optional(),
+	});
+
 export const apiRemoveRegistry = createSchema
 	.pick({
 		registryId: true,

packages/server/src/lib/auth.ts

@@ -42,7 +42,7 @@ const { handler, api } = betterAuth({
 				},
 			});
 
-			if (admin) {
+			if (admin?.user) {
 				return [
 					...(admin.user.serverIp
 						? [`http://${admin.user.serverIp}:3000`]

packages/server/src/templates/processors.ts

@@ -170,12 +170,12 @@ export function processValue(
 		}
 
 		// If not a utility function, try to get from variables
-		return variables[varName] || match;
+		return varName in variables ? (variables[varName] ?? match) : match;
 	});
 
 	// Then replace any remaining ${var} with their values from variables
 	processedValue = processedValue.replace(/\${([^}]+)}/g, (match, varName) => {
-		return variables[varName] || match;
+		return varName in variables ? (variables[varName] ?? match) : match;
 	});
 
 	return processedValue;

packages/server/src/utils/databases/mongo.ts

@@ -54,7 +54,7 @@ if [ "$REPLICA_STATUS" != "1" ]; then
 	mongosh --eval '
 	rs.initiate({
 		_id: "rs0",
-		members: [{ _id: 0, host: "localhost:27017", priority: 1 }]
+		members: [{ _id: 0, host: "${appName}:27017", priority: 1 }]
 	});
 
     // Wait for the replica set to initialize

packages/server/src/utils/docker/utils.ts

@@ -146,17 +146,17 @@ export const getContainerByName = (name: string): Promise<ContainerInfo> => {
 };
 
 /**
- * Docker commands passed through this method are held during Docker's build or pull process.
+ * Docker commands sent using this method are held in a hold when Docker is busy.
  *
  * https://github.com/Dokploy/dokploy/pull/3064
- * https://github.com/fir4tozden
  */
-export const dockerSafeExec = (exec: string) => `CHECK_INTERVAL=10
+export const dockerSafeExec = (exec: string) => `
+CHECK_INTERVAL=10
 
 echo "Preparing for execution..."
 
 while true; do
-    PROCESSES=$(ps aux | grep -E "docker build|docker pull" | grep -v grep)
+    PROCESSES=$(ps aux | grep -E "^.*docker [A-Za-z]" | grep -v grep)
 
     if [ -z "$PROCESSES" ]; then
         echo "Docker is idle. Starting execution..."
@@ -169,14 +169,15 @@ done
 
 ${exec}
 
-echo "Execution completed."`;
+echo "Execution completed."
+`;
 
 const cleanupCommands = {
 	containers: "docker container prune --force",
 	images: "docker image prune --all --force",
+	volumes: "docker volume prune --all --force",
 	builders: "docker builder prune --all --force",
 	system: "docker system prune --all --force",
-	volumes: "docker volume prune --all --force",
 };
 
 export const cleanupContainers = async (serverId?: string) => {
@@ -257,24 +258,48 @@ export const cleanupSystem = async (serverId?: string) => {
 	}
 };
 
+/**
+ * Volume cleanup should always be performed manually by the user. The reason is that during automatic cleanup, a volume may be deleted due to a stopped container, which is a dangerous situation.
+ *
+ * https://github.com/Dokploy/dokploy/pull/3267
+ */
+const excludedCleanupAllCommands: (keyof typeof cleanupCommands)[] = [
+	"volumes",
+];
+
 export const cleanupAll = async (serverId?: string) => {
-	await cleanupContainers(serverId);
-	await cleanupImages(serverId);
-	await cleanupBuilders(serverId);
-	await cleanupSystem(serverId);
+	for (const [key, command] of Object.entries(cleanupCommands) as [
+		keyof typeof cleanupCommands,
+		string,
+	][]) {
+		if (excludedCleanupAllCommands.includes(key)) continue;
+
+		try {
+			if (serverId) {
+				await execAsyncRemote(serverId, dockerSafeExec(command));
+			} else {
+				await execAsync(dockerSafeExec(command));
+			}
+		} catch {}
+	}
 };
 
 export const cleanupAllBackground = async (serverId?: string) => {
 	Promise.allSettled(
-		Object.values(cleanupCommands).map(async (command) => {
-			try {
+		(
+			Object.entries(cleanupCommands) as [
+				keyof typeof cleanupCommands,
+				string,
+			][]
+		)
+			.filter(([key]) => !excludedCleanupAllCommands.includes(key))
+			.map(async ([, command]) => {
 				if (serverId) {
 					await execAsyncRemote(serverId, dockerSafeExec(command));
 				} else {
 					await execAsync(dockerSafeExec(command));
 				}
-			} catch (error) {}
-		}),
+			}),
 	)
 		.then((results) => {
 			const failed = results.filter((r) => r.status === "rejected");