fix: also add for restoration

src/features/database/backup-get-data.action.ts

@@ -4,7 +4,7 @@ import {z} from "zod";
 import {db} from "@/db";
 import {eq} from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {BackupWith, Restoration} from "@/db/schema/07_database";
+import {BackupWith, Restoration, RestorationWith} from "@/db/schema/07_database";
 import {getOrganizationChannels} from "@/db/services/notification-channel";
 import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
 import {getHealthLast12hLogs} from "@/db/services/healthcheck";
@@ -44,8 +44,11 @@ export const getDatabaseDataAction = userAction
 
         const restorations = await db.query.restoration.findMany({
             where: eq(drizzleDb.schemas.restoration.databaseId, databaseId),
+            with: {
+                logs: true
+            },
             orderBy: (r, {desc}) => [desc(r.createdAt)],
-        }) as Restoration[];
+        }) as RestorationWith[];
 
         const totalBackups = backups.length;
         const availableBackups = backups.filter(b => !b.deletedAt).length;

src/features/database/database-content.tsx

@@ -2,7 +2,7 @@
 import {DatabaseBackupActionsModal} from "@/features/database/backup-actions-modal";
 import {DatabaseTabs} from "@/features/database/database-tabs";
 import {Setting} from "@/db/schema/01_setting";
-import {BackupWith, DatabaseWith, Restoration} from "@/db/schema/07_database";
+import {BackupWith, DatabaseWith, RestorationWith} from "@/db/schema/07_database";
 import {MemberWithUser} from "@/db/schema/03_organization";
 import {useBackupModal} from "@/features/database/backup-modal-context";
 import {DatabaseKpi} from "@/features/database/database-kpi";
@@ -28,7 +28,7 @@ import {LogsModal} from "@/features/logs/logs-modal";
 export type DatabaseContentProps = {
     settings: Setting;
     backups: BackupWith[];
-    restorations: Restoration[];
+    restorations: RestorationWith[];
     isAlreadyRestore: boolean;
     database: DatabaseWith;
     activeMember: MemberWithUser;

src/features/database/restore-columns.tsx

@@ -13,7 +13,7 @@ import { Button } from "@/components/ui/button";
 import { Check, MoreHorizontal, Trash2, X } from "lucide-react";
 import { ReloadIcon } from "@radix-ui/react-icons";
 import { StatusBadge } from "@/components/common/status-badge";
-import { Restoration } from "@/db/schema/07_database";
+import {Restoration, RestorationWith} from "@/db/schema/07_database";
 import { formatLocalizedDate } from "@/utils/date-formatting";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import {
@@ -24,11 +24,13 @@ import { toast } from "sonner";
 import { TooltipCustom } from "@/components/common/tooltip-custom";
 import { MemberWithUser } from "@/db/schema/03_organization";
 import { ButtonWithConfirm } from "@/components/common/button-with-confirm";
+import {LogsModalTrigger} from "@/features/logs/logs-modal-trigger";
+import {formatDuration} from "@/utils/text";
 
 export function restoreColumns(
   isAlreadyRestore: boolean,
   activeMember: MemberWithUser,
-): ColumnDef<Restoration>[] {
+): ColumnDef<RestorationWith>[] {
   return [
     {
       accessorKey: "id",
@@ -48,6 +50,22 @@ export function restoreColumns(
         return <StatusBadge status={row.getValue("status")} />;
       },
     },
+    {
+      accessorKey: "durationMs",
+      header: "Duration",
+      cell: ({row}) => {
+        const durationMs = row.getValue("durationMs");
+        return durationMs ? formatDuration(row.getValue("durationMs")) : "-"
+      },
+    },
+    {
+      accessorKey: "logs",
+      header: "Logs",
+      cell: ({row}) => {
+        const logs = row.original.logs ?? [];
+        return <LogsModalTrigger logs={logs}/>;
+      },
+    },
     {
       id: "actions",
       cell: ({ row }) => {

src/features/database/restore.action.ts

@@ -21,6 +21,9 @@ export const deleteRestoreAction = userAction
                 .where(and(eq(drizzleDb.schemas.restoration.id, parsedInput.restorationId)))
                 .execute();
 
+            await db
+                .delete(drizzleDb.schemas.jobLog)
+                .where(eq(drizzleDb.schemas.jobLog.restorationId, parsedInput.restorationId));
 
             return {
                 success: true,
@@ -50,14 +53,16 @@ export const rerunRestorationAction = userAction
     )
     .action(async ({parsedInput}): Promise<ServerActionResult<Restoration>> => {
         try {
-            const updateResult = await db
+            const [updatedRestoration] = await db
                 .update(drizzleDb.schemas.restoration)
                 .set({status: "waiting"})
                 .where(eq(drizzleDb.schemas.restoration.id, parsedInput.restorationId))
                 .returning()
                 .execute();
 
-            const updatedRestoration = updateResult[0];
+            await db
+                .delete(drizzleDb.schemas.jobLog)
+                .where(eq(drizzleDb.schemas.jobLog.restorationId, parsedInput.restorationId));
 
             if (!updatedRestoration) {
                 return {