Merge pull request #1530 from Dokploy/feat/add-date-to-restore-item

feat(backup): enhance RestoreBackup component and API to include serv…

Author: Siumauricio

apps/dokploy/components/dashboard/database/backups/restore-backup.tsx

@@ -48,6 +48,7 @@ import { toast } from "sonner";
 interface Props {
 	databaseId: string;
 	databaseType: Exclude<ServiceType, "application" | "redis">;
+	serverId: string | null;
 }
 
 const RestoreBackupSchema = z.object({
@@ -76,7 +77,11 @@ const RestoreBackupSchema = z.object({
 
 type RestoreBackup = z.infer<typeof RestoreBackupSchema>;
 
-export const RestoreBackup = ({ databaseId, databaseType }: Props) => {
+export const RestoreBackup = ({
+	databaseId,
+	databaseType,
+	serverId,
+}: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const [search, setSearch] = useState("");
 
@@ -101,6 +106,7 @@ export const RestoreBackup = ({ databaseId, databaseType }: Props) => {
 		{
 			destinationId: destionationId,
 			search,
+			serverId: serverId ?? "",
 		},
 		{
 			enabled: isOpen && !!destionationId,
@@ -304,7 +310,9 @@ export const RestoreBackup = ({ databaseId, databaseType }: Props) => {
 																		form.setValue("backupFile", file);
 																	}}
 																>
-																	{file}
+																	<div className="flex w-full justify-between">
+																		<span>{file}</span>
+																	</div>
 																	<CheckIcon
 																		className={cn(
 																			"ml-auto h-4 w-4",

apps/dokploy/components/dashboard/database/backups/show-backups.tsx

@@ -74,7 +74,11 @@ export const ShowBackups = ({ id, type }: Props) => {
 				{postgres && postgres?.backups?.length > 0 && (
 					<div className="flex flex-col lg:flex-row gap-4 w-full lg:w-auto">
 						<AddBackup databaseId={id} databaseType={type} refetch={refetch} />
-						<RestoreBackup databaseId={id} databaseType={type} />
+						<RestoreBackup
+							databaseId={id}
+							databaseType={type}
+							serverId={postgres.serverId}
+						/>
 					</div>
 				)}
 			</CardHeader>
@@ -108,7 +112,11 @@ export const ShowBackups = ({ id, type }: Props) => {
 										databaseType={type}
 										refetch={refetch}
 									/>
-									<RestoreBackup databaseId={id} databaseType={type} />
+									<RestoreBackup
+										databaseId={id}
+										databaseType={type}
+										serverId={postgres.serverId}
+									/>
 								</div>
 							</div>
 						) : (

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

@@ -31,7 +31,10 @@ import {
 
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
-import { execAsync } from "@dokploy/server/utils/process/execAsync";
+import {
+	execAsync,
+	execAsyncRemote,
+} from "@dokploy/server/utils/process/execAsync";
 import { getS3Credentials } from "@dokploy/server/utils/backups/utils";
 import { findDestinationById } from "@dokploy/server/services/destination";
 import {
@@ -229,6 +232,7 @@ export const backupRouter = createTRPCRouter({
 			z.object({
 				destinationId: z.string(),
 				search: z.string(),
+				serverId: z.string().optional(),
 			}),
 		)
 		.query(async ({ input }) => {
@@ -250,7 +254,16 @@ export const backupRouter = createTRPCRouter({
 				const searchPath = baseDir ? `${bucketPath}/${baseDir}` : bucketPath;
 				const listCommand = `rclone lsf ${rcloneFlags.join(" ")} "${searchPath}" | head -n 100`;
 
-				const { stdout } = await execAsync(listCommand);
+				let stdout = "";
+
+				if (input.serverId) {
+					const result = await execAsyncRemote(listCommand, input.serverId);
+					stdout = result.stdout;
+				} else {
+					const result = await execAsync(listCommand);
+					stdout = result.stdout;
+				}
+
 				const files = stdout.split("\n").filter(Boolean);
 
 				const results = baseDir