refactor: adjust queries

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

@@ -0,0 +1,119 @@
+import { Button } from "@/components/ui/button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { PenBoxIcon, Plus, SquarePen } from "lucide-react";
+import { useEffect, useState } from "react";
+import { api } from "@/utils/api";
+import { toast } from "sonner";
+
+interface Props {
+	organizationId?: string;
+	children?: React.ReactNode;
+}
+export function AddOrganization({ organizationId, children }: Props) {
+	const utils = api.useUtils();
+	const { data: organization } = api.organization.one.useQuery(
+		{
+			organizationId: organizationId ?? "",
+		},
+		{
+			enabled: !!organizationId,
+		},
+	);
+	const { mutateAsync, isLoading } = organizationId
+		? api.organization.update.useMutation()
+		: api.organization.create.useMutation();
+	const [open, setOpen] = useState(false);
+	const [name, setName] = useState("");
+
+	useEffect(() => {
+		if (organization) {
+			setName(organization.name);
+		}
+	}, [organization]);
+	const handleSubmit = async () => {
+		await mutateAsync({ name, organizationId: organizationId ?? "" })
+			.then(() => {
+				setOpen(false);
+				toast.success(
+					`Organization ${organizationId ? "updated" : "created"} successfully`,
+				);
+				utils.organization.all.invalidate();
+			})
+			.catch((error) => {
+				console.error(error);
+				toast.error(
+					`Failed to ${organizationId ? "update" : "create"} organization`,
+				);
+			});
+	};
+	return (
+		<Dialog open={open} onOpenChange={setOpen}>
+			<DialogTrigger asChild>
+				{organizationId ? (
+					<DropdownMenuItem
+						className="group cursor-pointer hover:bg-blue-500/10"
+						onSelect={(e) => e.preventDefault()}
+					>
+						<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
+					</DropdownMenuItem>
+				) : (
+					<DropdownMenuItem
+						className="gap-2 p-2"
+						onClick={() => {
+							setOpen(true);
+						}}
+						onSelect={(e) => e.preventDefault()}
+					>
+						<div className="flex size-6 items-center justify-center rounded-md border bg-background">
+							<Plus className="size-4" />
+						</div>
+						<div className="font-medium text-muted-foreground">
+							Add organization
+						</div>
+					</DropdownMenuItem>
+				)}
+			</DialogTrigger>
+			<DialogContent className="sm:max-w-[425px]">
+				<DialogHeader>
+					<DialogTitle>
+						{organizationId ? "Update organization" : "Add organization"}
+					</DialogTitle>
+					<DialogDescription>
+						{organizationId
+							? "Update the organization name"
+							: "Create a new organization to manage your projects."}
+					</DialogDescription>
+				</DialogHeader>
+				<div className="grid gap-4 py-4">
+					<div className="grid grid-cols-4 items-center gap-4">
+						<Label htmlFor="name" className="text-right">
+							Name
+						</Label>
+						<Input
+							id="name"
+							value={name}
+							onChange={(e) => setName(e.target.value)}
+							className="col-span-3"
+						/>
+					</div>
+				</div>
+				<DialogFooter>
+					<Button type="submit" onClick={handleSubmit} isLoading={isLoading}>
+						{organizationId ? "Update organization" : "Create organization"}
+					</Button>
+				</DialogFooter>
+			</DialogContent>
+		</Dialog>
+	);
+}

apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx

@@ -86,6 +86,7 @@ export const AddCertificate = () => {
 			privateKey: data.privateKey,
 			autoRenew: data.autoRenew,
 			serverId: data.serverId,
+			organizationId: "",
 		})
 			.then(async () => {
 				toast.success("Certificate Created");

apps/dokploy/components/dashboard/settings/ssh-keys/handle-ssh-keys.tsx

@@ -78,6 +78,7 @@ export const HandleSSHKeys = ({ sshKeyId }: Props) => {
 	const onSubmit = async (data: SSHKey) => {
 		await mutateAsync({
 			...data,
+			organizationId: "",
 			sshKeyId: sshKeyId || "",
 		})
 			.then(async () => {

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

@@ -76,10 +76,11 @@ export const ShowUsers = () => {
 											<TableHeader>
 												<TableRow>
 													<TableHead className="w-[100px]">Email</TableHead>
-													<TableHead className="text-center">Status</TableHead>
+													<TableHead className="text-center">Role</TableHead>
 													<TableHead className="text-center">2FA</TableHead>
+													{/* <TableHead className="text-center">Status</TableHead> */}
 													<TableHead className="text-center">
-														Expiration
+														Created At
 													</TableHead>
 													<TableHead className="text-right">Actions</TableHead>
 												</TableRow>
@@ -89,30 +90,32 @@ export const ShowUsers = () => {
 													return (
 														<TableRow key={user.userId}>
 															<TableCell className="w-[100px]">
-																{user.auth.email}
+																{user.user.email}
 															</TableCell>
 															<TableCell className="text-center">
 																<Badge
 																	variant={
-																		user.isRegistered ? "default" : "secondary"
+																		user.role === "owner"
+																			? "default"
+																			: "secondary"
 																	}
 																>
-																	{user.isRegistered
-																		? "Registered"
-																		: "Not Registered"}
+																	{user.role}
 																</Badge>
 															</TableCell>
 															<TableCell className="text-center">
-																{user.auth.is2FAEnabled
+																{user.user.is2FAEnabled
 																	? "2FA Enabled"
 																	: "2FA Not Enabled"}
 															</TableCell>
+															{/* <TableCell className="text-right">
+																<span className="text-sm text-muted-foreground">
+																	{format(new Date(user.createdAt), "PPpp")}
+																</span>
+															</TableCell> */}
 															<TableCell className="text-right">
 																<span className="text-sm text-muted-foreground">
-																	{format(
-																		new Date(user.expirationDate),
-																		"PPpp",
-																	)}
+																	{format(new Date(user.createdAt), "PPpp")}
 																</span>
 															</TableCell>
 
@@ -131,7 +134,7 @@ export const ShowUsers = () => {
 																		<DropdownMenuLabel>
 																			Actions
 																		</DropdownMenuLabel>
-																		{!user.isRegistered && (
+																		{/* {!user.isRegistered && (
 																			<DropdownMenuItem
 																				className="w-full cursor-pointer"
 																				onSelect={(e) => {
@@ -145,42 +148,44 @@ export const ShowUsers = () => {
 																			>
 																				Copy Invitation
 																			</DropdownMenuItem>
-																		)}
+																		)} */}
 
-																		{user.isRegistered && (
+																		{/* {user.isRegistered && (
 																			<AddUserPermissions
 																				userId={user.userId}
 																			/>
-																		)}
+																		)} */}
 
-																		<DialogAction
-																			title="Delete User"
-																			description="Are you sure you want to delete this user?"
-																			type="destructive"
-																			onClick={async () => {
-																				await mutateAsync({
-																					authId: user.authId,
-																				})
-																					.then(() => {
-																						toast.success(
-																							"User deleted successfully",
-																						);
-																						refetch();
+																		{user.role !== "owner" && (
+																			<DialogAction
+																				title="Delete User"
+																				description="Are you sure you want to delete this user?"
+																				type="destructive"
+																				onClick={async () => {
+																					await mutateAsync({
+																						userId: user.userId,
 																					})
-																					.catch(() => {
-																						toast.error(
-																							"Error deleting destination",
-																						);
-																					});
-																			}}
-																		>
-																			<DropdownMenuItem
-																				className="w-full cursor-pointer text-red-500 hover:!text-red-600"
-																				onSelect={(e) => e.preventDefault()}
+																						.then(() => {
+																							toast.success(
+																								"User deleted successfully",
+																							);
+																							refetch();
+																						})
+																						.catch(() => {
+																							toast.error(
+																								"Error deleting destination",
+																							);
+																						});
+																				}}
 																			>
-																				Delete User
-																			</DropdownMenuItem>
-																		</DialogAction>
+																				<DropdownMenuItem
+																					className="w-full cursor-pointer text-red-500 hover:!text-red-600"
+																					onSelect={(e) => e.preventDefault()}
+																				>
+																					Delete User
+																				</DropdownMenuItem>
+																			</DialogAction>
+																		)}
 																	</DropdownMenuContent>
 																</DropdownMenu>
 															</TableCell>

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

@@ -52,7 +52,7 @@ type AddServerDomain = z.infer<typeof addServerDomain>;
 
 export const WebDomain = () => {
 	const { t } = useTranslation("settings");
-	const { data: user, refetch } = api.admin.one.useQuery();
+	const { data, refetch } = api.auth.get.useQuery();
 	const { mutateAsync, isLoading } =
 		api.settings.assignDomainServer.useMutation();
 
@@ -65,14 +65,14 @@ export const WebDomain = () => {
 		resolver: zodResolver(addServerDomain),
 	});
 	useEffect(() => {
-		if (user) {
+		if (data) {
 			form.reset({
-				domain: user?.host || "",
-				certificateType: user?.certificateType,
-				letsEncryptEmail: user?.letsEncryptEmail || "",
+				domain: data?.user?.host || "",
+				certificateType: data?.user?.certificateType,
+				letsEncryptEmail: data?.user?.letsEncryptEmail || "",
 			});
 		}
-	}, [form, form.reset, user]);
+	}, [form, form.reset, data]);
 
 	const onSubmit = async (data: AddServerDomain) => {
 		await mutateAsync({