Working on table data in detabase backups.

app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx

@@ -21,9 +21,6 @@ export default async function RoutePage(props: PageParams<{
 }>) {
     const {projectId, databaseId} = await props.params;
 
-    console.log("ici", projectId);
-    console.log("laa", databaseId);
-
     const organization = await getOrganization({});
 
     if (!organization) {
@@ -100,7 +97,9 @@ export default async function RoutePage(props: PageParams<{
                     <BackupButton disable={isAlreadyBackup} databaseId={databaseId}/>
                 </PageActions>
             </div>
+            {dbItem.description && (
                 <PageDescription className="mt-5 sm:mt-0">{dbItem.description}</PageDescription>
+            )}
             <PageContent className="flex flex-col w-full h-full">
                 <DatabaseKpi successRate={successRate} database={dbItem} availableBackups={availableBackups}
                              totalBackups={totalBackups}/>

docker-compose.yml

@@ -54,7 +54,7 @@ services:
 
     s3:
         container_name: s3-portabase-dev
-        image: minio/minio:latest
+        image: docker.io/bitnami/minio:latest
         ports:
             - "9000:9000"
             - "9001:9001"

docker/entrypoints/app-prod-entrypoint.sh

@@ -1,14 +1,13 @@
 #!/bin/bash
 
-echo "     ____             __        __                        "
+#echo "     ____             __        __                        "
-echo "    / __ \____  _____/ /_____ _/ /_  ____ _________       "
+#echo "    / __ \____  _____/ /_____ _/ /_  ____ _________       "
-echo "   / /_/ / __ \/ ___/ __/ __  / __ \/ __  / ___/ _ \      "
+#echo "   / /_/ / __ \/ ___/ __/ __  / __ \/ __  / ___/ _ \      "
-echo "  / ____/ /_/ / /  / /_/ /_/ / /_/ / /_/ (__  )  __/      "
+#echo "  / ____/ /_/ / /  / /_/ /_/ / /_/ / /_/ (__  )  __/      "
-echo " /_/    \____/_/   \__/\__,_/_.___/\__,_/____/\___/       "
+#echo " /_/    \____/_/   \__/\__,_/_.___/\__,_/____/\___/       "
-echo "                                                          "
+#echo "                                                          "
-echo " Community Edition v1.1.1                                 "
+#echo " Community Edition v1.1.1                                 "
-echo "                                                          "
+#echo "                                                          "
-
 
 node server.js
 

src/features/dashboard/backup/columns.tsx

@@ -141,6 +141,9 @@ export function backupColumns(isAlreadyRestore: boolean, settings: Setting, data
                 };
 
                 return (
+                    <>
+                        {rowData.deletedAt == null && (
+
                             <DropdownMenu>
                                 <DropdownMenuTrigger asChild>
                                     <Button variant="ghost" className="h-8 w-8 p-0">
@@ -152,7 +155,8 @@ export function backupColumns(isAlreadyRestore: boolean, settings: Setting, data
                                     <DropdownMenuLabel>Actions</DropdownMenuLabel>
                                     {status == "success" ? (
                                         <>
-                                    <TooltipCustom disabled={isAlreadyRestore} text="Already a restoration waiting">
+                                            <TooltipCustom disabled={isAlreadyRestore}
+                                                           text="Already a restoration waiting">
                                                 <DropdownMenuItem
                                                     disabled={mutationRestore.isPending || isAlreadyRestore}
                                                     onClick={async () => {
@@ -182,6 +186,9 @@ export function backupColumns(isAlreadyRestore: boolean, settings: Setting, data
                                     </DropdownMenuItem>
                                 </DropdownMenuContent>
                             </DropdownMenu>
+                        )}
+                    </>
+
                 );
             },
         },

src/lib/tasks/database/retention-count.ts

@@ -1,13 +1,13 @@
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
-import {desc, eq} from "drizzle-orm";
+import {and, desc, eq, isNull} from "drizzle-orm";
 import {deleteBackupCronAction} from "@/lib/tasks/database/utils/delete";
 
 export async function enforceRetentionCount(databaseId: string, count: number) {
     const backups = await db.query.backup.findMany({
-        where: eq(drizzleDb.schemas.backup.databaseId, databaseId),
+        where: and(eq(drizzleDb.schemas.backup.databaseId, databaseId), isNull(drizzleDb.schemas.backup.deletedAt)),
         orderBy: desc(drizzleDb.schemas.backup.createdAt),
-        with:{
+        with: {
             database: {
                 with: {
                     project: true
@@ -38,6 +38,5 @@ export async function enforceRetentionCount(databaseId: string, count: number) {
         }
 
 
-
     }
 }

src/lib/tasks/database/utils/delete.ts

@@ -8,6 +8,7 @@ import * as drizzleDb from "@/db";
 import {and, eq} from "drizzle-orm";
 import {deleteFileS3Private, deleteLocalPrivate} from "@/features/upload/private/upload.action";
 import {env} from "@/env.mjs";
+import {withUpdatedAt} from "@/db/utils";
 
 
 export const deleteBackupCronAction = action
@@ -35,16 +36,13 @@ export const deleteBackupCronAction = action
                 };
             }
 
-
             await db
                 .update(drizzleDb.schemas.backup)
-                .set({
+                .set(withUpdatedAt({
                     deletedAt: new Date(),
-                })
+                }))
                 .where(and(eq(drizzleDb.schemas.backup.id, parsedInput.backupId), eq(drizzleDb.schemas.backup.databaseId, parsedInput.databaseId)))
 
-
-
             let success: boolean, message: string;
 
             const result =
@@ -71,12 +69,10 @@ export const deleteBackupCronAction = action
             //     .where(and(eq(drizzleDb.schemas.backup.id, parsedInput.backupId), eq(drizzleDb.schemas.backup.databaseId, parsedInput.databaseId)))
             //     .execute();
 
-
-
             return {
                 success: true,
                 actionSuccess: {
-                    message: "Backup deleted successfully.",
+                    message: `Backup deleted successfully (${parsedInput.backupId}).`,
                 },
             };
 
@@ -85,7 +81,7 @@ export const deleteBackupCronAction = action
             return {
                 success: false,
                 actionError: {
-                    message: "Failed to delete backup.",
+                    message: `Failed to delete backup(${parsedInput.backupId}).`,
                     status: 500,
                     cause: error instanceof Error ? error.message : "Unknown error",
                     messageParams: {message: "Error deleting the backup"},