refactor(dokploy): add flag to prevent run commands when is cloud

apps/dokploy/components/dashboard/settings/cluster/registry/add-self-docker-registry.tsx

@@ -1,181 +0,0 @@
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { AlertTriangle, Container } from "lucide-react";
-import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-
-const AddRegistrySchema = z.object({
-	username: z
-		.string()
-		.min(1, {
-			message: "Username is required",
-		})
-		.regex(/^[a-zA-Z0-9]+$/, {
-			message: "Username can only contain letters and numbers",
-		}),
-	password: z.string().min(1, {
-		message: "Password is required",
-	}),
-	registryUrl: z.string().min(1, {
-		message: "Registry URL is required",
-	}),
-});
-
-type AddRegistry = z.infer<typeof AddRegistrySchema>;
-
-export const AddSelfHostedRegistry = () => {
-	const utils = api.useUtils();
-	const [isOpen, setIsOpen] = useState(false);
-	const { mutateAsync, error, isError, isLoading } =
-		api.registry.enableSelfHostedRegistry.useMutation();
-	const router = useRouter();
-	const form = useForm<AddRegistry>({
-		defaultValues: {
-			username: "",
-			password: "",
-			registryUrl: "",
-		},
-		resolver: zodResolver(AddRegistrySchema),
-	});
-
-	useEffect(() => {
-		form.reset({
-			registryUrl: "",
-			username: "",
-			password: "",
-		});
-	}, [form, form.reset, form.formState.isSubmitSuccessful]);
-
-	const onSubmit = async (data: AddRegistry) => {
-		await mutateAsync({
-			registryUrl: data.registryUrl,
-			username: data.username,
-			password: data.password,
-		})
-			.then(async (data) => {
-				await utils.registry.all.invalidate();
-				toast.success("Self Hosted Registry Created");
-				setIsOpen(false);
-			})
-			.catch(() => {
-				toast.error("Error to create a self hosted registry");
-			});
-	};
-
-	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
-				<Button className="max-sm:w-full">
-					<Container className="h-4 w-4" />
-					Enable Self Hosted Registry
-				</Button>
-			</DialogTrigger>
-			<DialogContent className="sm:m:max-w-lg ">
-				<DialogHeader>
-					<DialogTitle>Add a self hosted registry</DialogTitle>
-					<DialogDescription>
-						Fill the next fields to add a self hosted registry.
-					</DialogDescription>
-				</DialogHeader>
-				{isError && (
-					<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">
-							{error?.message}
-						</span>
-					</div>
-				)}
-				<Form {...form}>
-					<form
-						onSubmit={form.handleSubmit(onSubmit)}
-						className="grid w-full gap-4"
-					>
-						<div className="flex flex-col gap-4">
-							<FormField
-								control={form.control}
-								name="username"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Username</FormLabel>
-										<FormControl>
-											<Input placeholder="Username" {...field} />
-										</FormControl>
-
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-						<div className="flex flex-col gap-4">
-							<FormField
-								control={form.control}
-								name="password"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Password</FormLabel>
-										<FormControl>
-											<Input
-												placeholder="Password"
-												{...field}
-												type="password"
-											/>
-										</FormControl>
-
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-						<div className="flex flex-col gap-4">
-							<FormField
-								control={form.control}
-								name="registryUrl"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Registry URL</FormLabel>
-										<FormControl>
-											<Input placeholder="registry.dokploy.com" {...field} />
-										</FormControl>
-										<FormDescription>
-											Point a DNS record to the VPS IP address.
-										</FormDescription>
-
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-						<DialogFooter>
-							<Button isLoading={isLoading} type="submit">
-								Create
-							</Button>
-						</DialogFooter>
-					</form>
-				</Form>
-			</DialogContent>
-		</Dialog>
-	);
-};

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

@@ -8,7 +8,6 @@ import {
 import { api } from "@/utils/api";
 import { Server } from "lucide-react";
 import { AddRegistry } from "./add-docker-registry";
-import { AddSelfHostedRegistry } from "./add-self-docker-registry";
 import { DeleteRegistry } from "./delete-registry";
 import { UpdateDockerRegistry } from "./update-docker-registry";
 
@@ -31,8 +30,6 @@ export const ShowRegistry = () => {
 					<div className="flex flex-row gap-2">
 						{data && data?.length > 0 && (
 							<>
-								{!haveSelfHostedRegistry && <AddSelfHostedRegistry />}
-
 								<AddRegistry />
 							</>
 						)}
@@ -47,7 +44,6 @@ export const ShowRegistry = () => {
 							</span>
 
 							<div className="flex flex-row md:flex-row gap-2 flex-wrap w-full justify-center">
-								<AddSelfHostedRegistry />
 								<AddRegistry />
 							</div>
 						</div>

apps/dokploy/components/dashboard/settings/destination/add-destination.tsx

@@ -18,6 +18,16 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectGroup,
+	SelectItem,
+	SelectLabel,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect } from "react";
@@ -32,12 +42,15 @@ const addDestination = z.object({
 	bucket: z.string(),
 	region: z.string(),
 	endpoint: z.string(),
+	serverId: z.string().optional(),
 });
 
 type AddDestination = z.infer<typeof addDestination>;
 
 export const AddDestination = () => {
 	const utils = api.useUtils();
+	const { data: servers } = api.server.withSSHKey.useQuery();
+	const { data: isCloud } = api.settings.isCloud.useQuery();
 
 	const { mutateAsync, isError, error, isLoading } =
 		api.destination.create.useMutation();
@@ -189,30 +202,106 @@ export const AddDestination = () => {
 						/>
 					</form>
 
-					<DialogFooter className="flex w-full flex-row !justify-between pt-3">
-						<Button
-							isLoading={isLoadingConnection}
-							type="button"
-							variant="secondary"
-							onClick={async () => {
-								await testConnection({
-									accessKey: form.getValues("accessKeyId"),
-									bucket: form.getValues("bucket"),
-									endpoint: form.getValues("endpoint"),
-									name: "Test",
-									region: form.getValues("region"),
-									secretAccessKey: form.getValues("secretAccessKey"),
-								})
-									.then(async () => {
-										toast.success("Connection Success");
+					<DialogFooter
+						className={cn(
+							isCloud ? "!flex-col" : "flex-row",
+							"flex w-full  !justify-between pt-3 gap-4",
+						)}
+					>
+						{isCloud ? (
+							<div className="flex flex-col gap-4 border p-2 rounded-lg">
+								<span className="text-sm text-muted-foreground">
+									Select a server to test the destination. If you don't have a
+									server choose the default one.
+								</span>
+								<FormField
+									control={form.control}
+									name="serverId"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Server (Optional)</FormLabel>
+											<FormControl>
+												<Select
+													onValueChange={field.onChange}
+													defaultValue={field.value}
+												>
+													<SelectTrigger className="w-full">
+														<SelectValue placeholder="Select a server" />
+													</SelectTrigger>
+													<SelectContent>
+														<SelectGroup>
+															<SelectLabel>Servers</SelectLabel>
+															{servers?.map((server) => (
+																<SelectItem
+																	key={server.serverId}
+																	value={server.serverId}
+																>
+																	{server.name}
+																</SelectItem>
+															))}
+															<SelectItem value={"none"}>None</SelectItem>
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+											</FormControl>
+
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+								<Button
+									type="button"
+									variant={"secondary"}
+									isLoading={isLoading}
+									onClick={async () => {
+										await testConnection({
+											accessKey: form.getValues("accessKeyId"),
+											bucket: form.getValues("bucket"),
+											endpoint: form.getValues("endpoint"),
+											name: "Test",
+											region: form.getValues("region"),
+											secretAccessKey: form.getValues("secretAccessKey"),
+											serverId: form.getValues("serverId"),
+										})
+											.then(async () => {
+												toast.success("Connection Success");
+											})
+											.catch((e) => {
+												toast.error("Error to connect the provider", {
+													description: e.message,
+												});
+											});
+									}}
+								>
+									Test Connection
+								</Button>
+							</div>
+						) : (
+							<Button
+								isLoading={isLoadingConnection}
+								type="button"
+								variant="secondary"
+								onClick={async () => {
+									await testConnection({
+										accessKey: form.getValues("accessKeyId"),
+										bucket: form.getValues("bucket"),
+										endpoint: form.getValues("endpoint"),
+										name: "Test",
+										region: form.getValues("region"),
+										secretAccessKey: form.getValues("secretAccessKey"),
 									})
-									.catch(() => {
-										toast.error("Error to connect the provider");
-									});
-							}}
-						>
-							Test connection
-						</Button>
+										.then(async () => {
+											toast.success("Connection Success");
+										})
+										.catch(() => {
+											toast.error("Error to connect the provider");
+										});
+								}}
+							>
+								Test connection
+							</Button>
+						)}
+
 						<Button
 							isLoading={isLoading}
 							form="hook-form-destination-add"

apps/dokploy/components/dashboard/settings/destination/update-destination.tsx

@@ -18,6 +18,16 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectGroup,
+	SelectItem,
+	SelectLabel,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { PenBoxIcon } from "lucide-react";
@@ -33,6 +43,7 @@ const updateDestination = z.object({
 	bucket: z.string(),
 	region: z.string(),
 	endpoint: z.string(),
+	serverId: z.string().optional(),
 });
 
 type UpdateDestination = z.infer<typeof updateDestination>;
@@ -43,6 +54,8 @@ interface Props {
 
 export const UpdateDestination = ({ destinationId }: Props) => {
 	const utils = api.useUtils();
+	const { data: servers } = api.server.withSSHKey.useQuery();
+	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const [isOpen, setIsOpen] = useState(false);
 	const { data, refetch } = api.destination.one.useQuery(
 		{
@@ -220,34 +233,107 @@ export const UpdateDestination = ({ destinationId }: Props) => {
 						</div>
 					</form>
 
-					<DialogFooter className="flex w-full flex-row !justify-between pt-3">
-						<Button
-							isLoading={isLoadingConnection}
-							type="button"
-							variant="secondary"
-							onClick={async () => {
-								await testConnection({
-									accessKey: form.getValues("accessKeyId"),
-									bucket: form.getValues("bucket"),
-									endpoint: form.getValues("endpoint"),
-									name: "Test",
-									region: form.getValues("region"),
-									secretAccessKey: form.getValues("secretAccessKey"),
-								})
-									.then(async () => {
-										toast.success("Connection Success");
+					<DialogFooter
+						className={cn(
+							isCloud ? "!flex-col" : "flex-row",
+							"flex w-full  !justify-between pt-3 gap-4",
+						)}
+					>
+						{isCloud ? (
+							<div className="flex flex-col gap-4 border p-2 rounded-lg">
+								<span className="text-sm text-muted-foreground">
+									Select a server to test the destination. If you don't have a
+									server choose the default one.
+								</span>
+								<FormField
+									control={form.control}
+									name="serverId"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Server (Optional)</FormLabel>
+											<FormControl>
+												<Select
+													onValueChange={field.onChange}
+													defaultValue={field.value}
+												>
+													<SelectTrigger className="w-full">
+														<SelectValue placeholder="Select a server" />
+													</SelectTrigger>
+													<SelectContent>
+														<SelectGroup>
+															<SelectLabel>Servers</SelectLabel>
+															{servers?.map((server) => (
+																<SelectItem
+																	key={server.serverId}
+																	value={server.serverId}
+																>
+																	{server.name}
+																</SelectItem>
+															))}
+															<SelectItem value={"none"}>None</SelectItem>
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+											</FormControl>
+
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+								<Button
+									type="button"
+									variant={"secondary"}
+									onClick={async () => {
+										await testConnection({
+											accessKey: form.getValues("accessKeyId"),
+											bucket: form.getValues("bucket"),
+											endpoint: form.getValues("endpoint"),
+											name: "Test",
+											region: form.getValues("region"),
+											secretAccessKey: form.getValues("secretAccessKey"),
+											serverId: form.getValues("serverId"),
+										})
+											.then(async () => {
+												toast.success("Connection Success");
+											})
+											.catch(() => {
+												toast.error("Error to connect the provider");
+											});
+									}}
+								>
+									Test Connection
+								</Button>
+							</div>
+						) : (
+							<Button
+								isLoading={isLoadingConnection}
+								type="button"
+								variant="secondary"
+								onClick={async () => {
+									await testConnection({
+										accessKey: form.getValues("accessKeyId"),
+										bucket: form.getValues("bucket"),
+										endpoint: form.getValues("endpoint"),
+										name: "Test",
+										region: form.getValues("region"),
+										secretAccessKey: form.getValues("secretAccessKey"),
 									})
-									.catch(() => {
-										toast.error("Error to connect the provider");
-									});
-							}}
-						>
-							Test connection
-						</Button>
+										.then(async () => {
+											toast.success("Connection Success");
+										})
+										.catch(() => {
+											toast.error("Error to connect the provider");
+										});
+								}}
+							>
+								Test connection
+							</Button>
+						)}
+
 						<Button
-							isLoading={form.formState.isSubmitting}
 							form="hook-form"
 							type="submit"
+							isLoading={form.formState.isSubmitting}
 						>
 							Update
 						</Button>