Ready for rc-1.1.3

docker-compose.yml

@@ -52,22 +52,22 @@ services:
 #        depends_on:
 #            - db
 
-    s3:
+#    s3:
-        container_name: s3-portabase-dev
+#        container_name: s3-portabase-dev
-        image: docker.io/bitnami/minio:latest
+#        image: docker.io/bitnami/minio:latest
-        ports:
+#        ports:
-            - "9000:9000"
+#            - "9000:9000"
-            - "9001:9001"
+#            - "9001:9001"
-        volumes:
+#        volumes:
-            - minio_data:/data
+#            - minio_data:/data
-
+#
-        environment:
+#        environment:
-            - MINIO_ROOT_USER=${S3_ACCESS_KEY}
+#            - MINIO_ROOT_USER=${S3_ACCESS_KEY}
-            - MINIO_ROOT_PASSWORD=${S3_SECRET_KEY}
+#            - MINIO_ROOT_PASSWORD=${S3_SECRET_KEY}
-            - MINIO_DEFAULT_BUCKETS=${S3_BUCKET_NAME}
+#            - MINIO_DEFAULT_BUCKETS=${S3_BUCKET_NAME}
-            - MINIO_BROWSER=on
+#            - MINIO_BROWSER=on
 
 volumes:
     postgres-data:
-    minio_data:
+#    minio_data:
 #    pgadmin-data:

package.json

@@ -1,6 +1,6 @@
 {
     "name": "portabase",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "private": true,
     "scripts": {
         "dev": "next dev --turbopack -p 8887",

src/components/wrappers/dashboard/projects/database/database-backup-list.tsx

@@ -68,6 +68,7 @@ export const DatabaseBackupList = (props: DatabaseBackupListProps) => {
                         const backupDeleted = await deleteBackupAction({
                             backupId: backup.id,
                             databaseId: backup.databaseId,
+                            status: backup.status,
                             file: backup.file!,
                             projectSlug: props.database?.project?.slug!
                         });

src/features/dashboard/backup/columns.tsx

@@ -104,6 +104,7 @@ export function backupColumns(isAlreadyRestore: boolean, settings: Setting, data
                         const deletion = await deleteBackupAction({
                             backupId: rowData.id,
                             databaseId: rowData.databaseId,
+                            status: rowData.status,
                             file: rowData.file ?? "",
                             projectSlug: database.project?.slug!
                         });

src/features/dashboard/restore/restore.action.ts

@@ -58,6 +58,7 @@ export const deleteBackupAction = userAction
             backupId: z.string(),
             databaseId: z.string(),
             projectSlug: z.string(),
+            status: z.enum(["ongoing", "failed", "success", "waiting"]),
             file: z.string(),
         })
     )
@@ -82,6 +83,7 @@ export const deleteBackupAction = userAction
                 .update(drizzleDb.schemas.backup)
                 .set(withUpdatedAt({
                     deletedAt: new Date(),
+                    status: parsedInput.status == "ongoing" ? "failed" : parsedInput.status
                 }))
                 .where(and(eq(drizzleDb.schemas.backup.id, parsedInput.backupId), eq(drizzleDb.schemas.backup.databaseId, parsedInput.databaseId)))