chore: release 1.7.0

* feat: add-valkey engine

* fix: README.md with Valkey content

---------

Co-authored-by: charles-gauthereau <charles.gauthereau@soluce-technologies.com>

.github/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-contact@soluce-technologies.com.
+contact@portabase.io.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/SECURITY.md

@@ -18,7 +18,7 @@ We take security seriously and aim to support the following versions of the proj
 If you discover a security vulnerability in this project, we appreciate your help in disclosing it responsibly.
 
 1. **Contact Us**  
-   Please report the vulnerability by emailing **[contact@soluce-technologies.com](mailto:contact@soluce-technologies.com)**. Include the following details:
+   Please report the vulnerability by emailing **[contact@portabase.io](mailto:contact@portabase.io)**. Include the following details:
     - A detailed description of the issue.
     - Steps to reproduce the vulnerability (if applicable).
     - Any potential impacts or risks.

.github/workflows/auto-release.yml

@@ -1,46 +0,0 @@
-name: Auto Release bot
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - main
-
-jobs:
-  release:
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ vars.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ steps.app-token.outputs.token }}
-          ref: ${{ github.base_ref }}
-
-      - uses: pnpm/action-setup@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: "pnpm"
-
-      - run: pnpm install --frozen-lockfile
-
-      - run: git config --global user.name 'github-actions[bot]'
-      - run: git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-
-      - name: Run release-it
-        run: |
-          git pull origin main
-          pnpm exec release-it --ci
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/discord.yml

@@ -3,6 +3,9 @@ name: Discord Notification
 on:
   workflow_call:
     inputs:
+      release_tag:
+        required: true
+        type: string
       discord_title:
         required: true
         type: string
@@ -27,10 +30,10 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
-          RELEASE_INFO=$(gh release view "${{ github.ref_name }}" -R ${{ github.repository }} --json name,url,body,author)
+          RELEASE_INFO=$(gh release view "${{ inputs.release_tag }}" -R ${{ github.repository }} --json name,url,body,author)
 
           RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r .name)
-          if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ github.ref_name }}"; fi
+          if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ inputs.release_tag }}"; fi
 
           RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r .url)
           RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r .body)

.github/workflows/docker.yml

@@ -3,6 +3,12 @@ name: Docker Publish
 on:
   workflow_call:
     inputs:
+      version:
+        required: true
+        type: string
+      ref:
+        required: true
+        type: string
       image_name:
         required: false
         type: string
@@ -32,10 +38,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [linux/amd64, linux/arm64]
+        platform: [ linux/amd64, linux/arm64 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          fetch-depth: 0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -50,9 +59,10 @@ jobs:
         id: prep
         run: |
           ARCH=${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
-          echo "image=${{ inputs.image_name }}:${GITHUB_REF#refs/tags/}-$ARCH" >> $GITHUB_OUTPUT
+          echo "image=${{ inputs.image_name }}:${{inputs.version}}-$ARCH" >> $GITHUB_OUTPUT
           echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
 
+
       - name: Build and push image
         uses: docker/build-push-action@v6
         with:
@@ -95,20 +105,38 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Generate semantic tags
+        id: tags
+        run: |
+          VERSION="${{ inputs.version }}"
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
+          
+          echo "VERSION_TAG=$VERSION" >> $GITHUB_OUTPUT
+          if [ -n "$MINOR" ]; then
+            echo "MINOR_TAG=$MAJOR.$MINOR" >> $GITHUB_OUTPUT
+          fi
+          if [ -n "$MAJOR" ]; then
+            echo "MAJOR_TAG=$MAJOR" >> $GITHUB_OUTPUT
+          fi
+          if [ "${{ inputs.add_latest }}" = "true" ]; then
+            echo "LATEST_TAG=latest" >> $GITHUB_OUTPUT
+          fi
+
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ inputs.image_name }}
           tags: |
-            type=semver,pattern={{version}}
+            type=raw,value=${{ steps.tags.outputs.VERSION_TAG }}
-            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=${{ steps.tags.outputs.MINOR_TAG }}
-            type=semver,pattern={{major}}
+            type=raw,value=${{ steps.tags.outputs.MAJOR_TAG }}
-            type=raw,value=latest,enable=${{ inputs.add_latest }}
+            type=raw,value=${{ steps.tags.outputs.LATEST_TAG }}
 
       - name: Create and push manifest list
         working-directory: /tmp/digests
         run: |
           DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
           TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
-          docker buildx imagetools create $DOCKER_IMAGES $TAG_ARGS
+          echo $TAG_ARGS
+          docker buildx imagetools create $TAG_ARGS $DOCKER_IMAGES

.github/workflows/helm.yml

@@ -0,0 +1,37 @@
+name: Publish Helm Chart
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+    secrets:
+      GH_TOKEN:
+        required: true
+
+jobs:
+  publish-helm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+
+      - name: Package Helm chart
+        run: |
+          mkdir -p ./helm-packages
+          helm package helm \
+            --version ${{ inputs.version }} \
+            --app-version ${{ inputs.version }} \
+            --destination ./helm-packages
+
+      - name: Authenticate to GitHub Packages
+        run: |
+          echo "${{ secrets.GH_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push Helm chart to GitHub Packages (OCI)
+        run: |
+          helm push ./helm-packages/portabase-${{ inputs.version }}.tgz oci://ghcr.io/portabase/charts

.github/workflows/pr-checker.yml

@@ -1,47 +0,0 @@
-name: PR Checker
-
-on:
-  pull_request:
-    branches:
-      - main
-      - dev
-
-jobs:
-  validate-code:
-    name: Code Integrity Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Check code formatting
-        run: pnpm run format:check
-        continue-on-error: true
-
-      - name: Run Linter
-        run: pnpm run lint
-        continue-on-error: true
-
-      - name: Type Check
-        run: pnpm run typecheck
-        continue-on-error: true
-
-      - name: Run Tests
-        run: pnpm run test
-        continue-on-error: true
-
-      - name: Test Application Build
-        run: pnpm run build

.github/workflows/release.yml

@@ -1,31 +1,143 @@
-name: Publish Docker image for release
+name: Auto Release & Publish
 
 on:
-  push:
+  pull_request:
-    tags:
+    types: [ closed ]
-      - "*.*.*"
+    branches:
-      - "!*-*"
+      - main
 
 permissions:
-  contents: read
+  contents: write
   packages: write
 
 jobs:
-  docker_publish:
+
+  check-skip:
+    runs-on: ubuntu-latest
+    outputs:
+      skip: ${{ steps.set-skip.outputs.skip }}
+    steps:
+      - name: Determine if release should be skipped
+        id: set-skip
+        run: |
+          TITLE="${{ github.event.pull_request.title }}"
+          echo "PR title: $TITLE"
+
+          if [[ "$TITLE" == *"[skip-release]"* ]]; then
+            echo "PR title contains [skip-release], skipping release jobs."
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+
+  create-release:
+    needs: check-skip
+    if: ${{ needs.check-skip.outputs.skip == 'false' }}
+    runs-on: ubuntu-latest
+    outputs:
+      draft_tag: ${{ steps.release_step.outputs.draft_tag }}
+      version: ${{ steps.release_step.outputs.version }}
+    steps:
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+          ref: main
+
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: "pnpm"
+
+      - run: pnpm install --frozen-lockfile
+
+      - run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+
+      - name: Run release-it
+        id: release_step
+        run: |
+          git pull origin main
+          
+          VERSION=$(pnpm exec release-it --ci --release-version)
+          echo $VERSION
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          
+          OUTPUT=$(pnpm exec release-it --ci)
+          echo "$OUTPUT"
+          
+          DRAFT_TAG=$(echo "$OUTPUT" | grep -oE 'untagged-[a-z0-9]+')
+          echo $DRAFT_TAG
+          echo "draft_tag=$DRAFT_TAG" >> $GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+
+
+  publish-docker:
+    needs: create-release
+    if: ${{ needs.create-release.result == 'success' }}
     uses: ./.github/workflows/docker.yml
     with:
+      version: ${{ needs.create-release.outputs.version }}
+      ref: ${{ needs.create-release.outputs.version }}
       add_latest: true
     secrets:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
 
-  discord_notification:
+  publish-helm:
-    needs: docker_publish
+    needs: create-release
+    if: ${{ needs.create-release.result == 'success' }}
+    uses: ./.github/workflows/helm.yml
+    with:
+      version: ${{ needs.create-release.outputs.version }}
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  finalize-release:
+    needs:
+      - create-release
+      - publish-docker
+      - publish-helm
+    runs-on: ubuntu-latest
+    outputs:
+      release_tag: ${{ steps.publish_release_step.outputs.release_tag }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Publish GitHub Release
+        id: publish_release_step
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          OUTPUT=$(gh release edit ${{ needs.create-release.outputs.draft_tag }} --draft=false)
+          echo "$OUTPUT"
+          RELEASE_TAG=$(echo "$OUTPUT" | sed -E 's|.*/releases/tag/||')
+          echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
+
+  notify-discord:
+    needs:
+      - publish-docker
+      - publish-helm
+      - create-release
+      - finalize-release
     uses: ./.github/workflows/discord.yml
     with:
-      discord_title: "New Release: ${{ github.ref_name }}"
+      release_tag: ${{ needs.create-release.outputs.version }}
+      discord_title: "New Release"
       discord_color: 3066993
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.release-it.json

@@ -1,16 +1,17 @@
 {
+  "github": {
+    "release": true,
+    "draft": true,
+    "tokenRef": "GITHUB_TOKEN"
+  },
   "git": {
     "commit": true,
-    "commitMessage": "chore: release v${version}",
+    "commitMessage": "chore: release ${version}",
     "requireCleanWorkingDir": true,
     "tag": true,
     "tagName": "${version}",
     "push": true
   },
-  "github": {
-    "release": true,
-    "tokenRef": "GITHUB_TOKEN"
-  },
   "plugins": {
     "@release-it/conventional-changelog": {
       "preset": {

CITATION.cff

@@ -31,5 +31,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.4.13
+version: 1.7.0
 date-released: '2026-03-02'

README.md

@@ -12,7 +12,7 @@
 
 
 [![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
-[![Docker Pulls](https://img.shields.io/docker/pulls/solucetechnologies/portabase?color=brightgreen)](https://hub.docker.com/r/solucetechnologies/portabase)
+[![Docker Pulls](https://img.shields.io/docker/pulls/portabase/portabase?color=brightgreen)](https://hub.docker.com/r/portabase/portabase)
 [![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/Portabase/portabase)
 [![Support Portabase](https://img.shields.io/badge/Support-Portabase-orange)](https://www.buymeacoffee.com/portabase)
 
@@ -20,6 +20,8 @@
 [![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)](https://www.mysql.com/)
 [![MariaDB](https://img.shields.io/badge/MariaDB-003545?logo=mariadb&logoColor=white)](https://mariadb.org/)
 [![SQLite](https://img.shields.io/badge/-SQLite-blue?logo=sqlite&logoColor=white)](https://sqlite.org/)
+[![Redis](https://img.shields.io/badge/Redis-DC382D?style=flat&logo=Redis&logoColor=white)](https://redis.io/)
+[![Valkey](https://img.shields.io/badge/Valkey-6284fc?style=flat&logo=Valkey&logoColor=white)](https://valkey.io/)
 [![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?logo=mongodb&logoColor=white)](https://www.mongodb.com/)
 [![Self Hosted](https://img.shields.io/badge/self--hosted-yes-brightgreen)](https://github.com/Portabase/portabase)
 [![Open Source](https://img.shields.io/badge/open%20source-❤️-red)](https://github.com/Portabase/portabase)
@@ -53,11 +55,26 @@ You have 4 ways to install Portabase:
 - Automated CLI (recommended) - [details](https://portabase.io/docs/dashboard/setup#cli)
 - Docker Run - [details](https://portabase.io/docs/dashboard/setup#docker)
 - Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker-compose)
-- Kubernetes with Helm (soon)
+- Kubernetes with Helm [details](https://portabase.io/docs/dashboard/setup#helm)
 - Development setup - [details](https://portabase.io/docs/dashboard/setup#development)
 
 **Ensure Docker is installed on your machine before getting started.**
 
+## Supported databases
+
+| Engine             | Support   | Supported Versions                | Restore |
+|:-------------------|:----------|:----------------------------------|:--------|
+| **PostgreSQL**     | ✅ Stable  | 12, 13, 14, 15, 16, 17 et 18      | Yes     |
+| **MySQL**          | ✅ Stable  | 5.7, 8 et 9                       | Yes     |
+| **MariaDB**        | ✅ Stable  | 10 et 11                          | Yes     |
+| **MongoDB**        | ✅ Stable  | 4, 5, 6, 7 et 8                   | Yes     |
+| **SQLite**         | ✅ Stable  | 3.x                               | Yes     |
+| **Redis**          | ✅ Stable  | 2.8+                              | No      |
+| **Valkey**         | ✅ Stable  | 7.2+                              | No      |
+| **MSSQL Server**   | ❌ Ongoing | -                                 | Yes     |
+
+See the [Database Servers documentation](https://portabase.io/docs/agent/db) for version-specific backup and restore details.
+
 ## Contributors
 
 [![Contributors](https://contrib.rocks/image?repo=Portabase/portabase)](https://github.com/Portabase/portabase/graphs/contributors)

app/api/agent/[agentId]/restore/route.ts

@@ -66,8 +66,8 @@ export async function POST(
         await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
 
         const response = {
-            message: true,
+            status: true,
-            details: "Restoration successfully updated"
+            message: "Restoration successfully updated"
         }
 
 

helm/.helmignore

@@ -0,0 +1,17 @@
+.DS_Store
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+.project
+.idea/
+*.tmproj
+.vscode/

helm/Chart.yaml

@@ -0,0 +1,28 @@
+apiVersion: v2
+name: portabase
+description: Helm chart for Portabase
+type: application
+version: 0.0.0
+appVersion: "latest"
+keywords:
+  - postgresql
+  - mariadb
+  - mongodb
+  - mysql
+  - sqlite
+  - backup
+  - database
+  - restore
+home: https://github.com/Portabase/portabase
+
+sources:
+  - https://github.com/Portabase/portabase
+  - https://github.com/Portabase/portabase/tree/main/helm
+
+maintainers:
+  - name: Charles Gauthereau
+    url: https://github.com/RambokDev
+  - name: Killian Larcher
+    url: https://github.com/KillianLarcher
+
+icon: https://raw.githubusercontent.com/Portabase/portabase/main/.github/assets/logo.png

helm/README.md

@@ -0,0 +1,32 @@
+# Development Notes
+
+## Check that Kubernetes is reachable locally
+
+```bash
+kubectl get nodes
+```
+
+## Install the local Portabase Helm chart
+
+```bash
+helm install portabase . \
+--set project.secret=$(openssl rand -hex 32)
+```
+
+## Check the pods
+
+```bash
+kubectl get pods
+```
+
+## Check the services
+
+```bash
+kubectl get svc
+```
+
+## If the service type is ClusterIP, expose it locally using port forwarding:
+
+```bash
+kubectl port-forward svc/portabase 8887:80
+```

helm/templates/deployment.yaml

@@ -0,0 +1,33 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: portabase
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: portabase
+  template:
+    metadata:
+      labels:
+        app: portabase
+    spec:
+      containers:
+        - name: portabase
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          ports:
+            - containerPort: 80
+          env:
+            - name: TZ
+              value: {{ .Values.timezone }}
+            - name: PROJECT_URL
+              value: {{ .Values.project.url }}
+            - name: PROJECT_SECRET
+              value: {{ .Values.project.secret }}
+          volumeMounts:
+            - name: data
+              mountPath: /data
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: portabase-data

helm/templates/pvc.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: portabase-data
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}

helm/templates/service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: portabase
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    app: portabase
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: 80
+      nodePort: {{ .Values.service.nodePort }}

helm/values.yaml

@@ -0,0 +1,47 @@
+image:
+  repository: portabase/portabase
+  tag: latest
+  pullPolicy: Always
+
+replicaCount: 1
+
+service:
+  type: ClusterIP
+  port: 80
+  targetPort: 80
+
+resources:
+  requests:
+    memory: "1Gi"
+    cpu: "1"
+  limits:
+    memory: "1Gi"
+    cpu: "1"
+
+timezone: Europe/Paris
+
+project:
+  url: http://localhost:8887
+  secret: "change_me_generate_secure_secret"
+
+persistence:
+  enabled: true
+  storageClassName: ""
+  accessMode: ReadWriteOnce
+  size: 10Gi
+  mountPath: /data
+
+ingress:
+  enabled: false
+  className: nginx
+  hosts:
+    - host: portabase.example.com
+      paths:
+        - path: /
+          pathType: Prefix
+  tls: []
+
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    partition: 0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "portabase",
-  "version": "1.4.13",
+  "version": "1.7.0",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack -p 8887",
@@ -50,7 +50,6 @@
     "@t3-oss/env-nextjs": "^0.13.10",
     "@tanstack/react-query": "^5.90.21",
     "@tanstack/react-table": "^8.21.3",
-    "@types/express": "^5.0.6",
     "@types/nodemailer": "^6.4.23",
     "@types/ws": "^8.18.1",
     "@zenstackhq/runtime": "2.14.2",

pnpm-lock.yaml

@@ -113,9 +113,6 @@ importers:
       '@tanstack/react-table':
         specifier: ^8.21.3
         version: 8.21.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@types/express':
-        specifier: ^5.0.6
-        version: 5.0.6
       '@types/nodemailer':
         specifier: ^6.4.23
         version: 6.4.23
@@ -3143,12 +3140,6 @@ packages:
   '@tybys/wasm-util@0.10.1':
     resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
-  '@types/body-parser@1.19.6':
-    resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==}
-
-  '@types/connect@3.4.38':
-    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
-
   '@types/cors@2.8.19':
     resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
 
@@ -3191,15 +3182,6 @@ packages:
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
-  '@types/express-serve-static-core@5.1.1':
-    resolution: {integrity: sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A==}
-
-  '@types/express@5.0.6':
-    resolution: {integrity: sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==}
-
-  '@types/http-errors@2.0.5':
-    resolution: {integrity: sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==}
-
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
@@ -3237,12 +3219,6 @@ packages:
   '@types/prismjs@1.26.6':
     resolution: {integrity: sha512-vqlvI7qlMvcCBbVe0AKAb4f97//Hy0EBTaiW8AalRnG/xAN5zOiWWyrNqNXeq8+KAuvRewjCVY1+IPxk4RdNYw==}
 
-  '@types/qs@6.14.0':
-    resolution: {integrity: sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==}
-
-  '@types/range-parser@1.2.7':
-    resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
-
   '@types/react-dom@19.0.4':
     resolution: {integrity: sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==}
     peerDependencies:
@@ -3259,12 +3235,6 @@ packages:
   '@types/react@19.2.14':
     resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==}
 
-  '@types/send@1.2.1':
-    resolution: {integrity: sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==}
-
-  '@types/serve-static@2.2.0':
-    resolution: {integrity: sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==}
-
   '@types/webpack@5.28.5':
     resolution: {integrity: sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==}
 
@@ -10490,15 +10460,6 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
-  '@types/body-parser@1.19.6':
-    dependencies:
-      '@types/connect': 3.4.38
-      '@types/node': 22.19.11
-
-  '@types/connect@3.4.38':
-    dependencies:
-      '@types/node': 22.19.11
-
   '@types/cors@2.8.19':
     dependencies:
       '@types/node': 22.19.11
@@ -10543,21 +10504,6 @@ snapshots:
 
   '@types/estree@1.0.8': {}
 
-  '@types/express-serve-static-core@5.1.1':
-    dependencies:
-      '@types/node': 22.19.11
-      '@types/qs': 6.14.0
-      '@types/range-parser': 1.2.7
-      '@types/send': 1.2.1
-
-  '@types/express@5.0.6':
-    dependencies:
-      '@types/body-parser': 1.19.6
-      '@types/express-serve-static-core': 5.1.1
-      '@types/serve-static': 2.2.0
-
-  '@types/http-errors@2.0.5': {}
-
   '@types/json-schema@7.0.15': {}
 
   '@types/json5@0.0.29': {}
@@ -10598,10 +10544,6 @@ snapshots:
 
   '@types/prismjs@1.26.6': {}
 
-  '@types/qs@6.14.0': {}
-
-  '@types/range-parser@1.2.7': {}
-
   '@types/react-dom@19.0.4(@types/react@19.0.10)':
     dependencies:
       '@types/react': 19.0.10
@@ -10618,15 +10560,6 @@ snapshots:
     dependencies:
       csstype: 3.2.3
 
-  '@types/send@1.2.1':
-    dependencies:
-      '@types/node': 22.19.11
-
-  '@types/serve-static@2.2.0':
-    dependencies:
-      '@types/http-errors': 2.0.5
-      '@types/node': 22.19.11
-
   '@types/webpack@5.28.5(esbuild@0.25.10)':
     dependencies:
       '@types/node': 22.19.11

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/storages/forms/s3.schema.ts

@@ -6,6 +6,10 @@ export const S3ChannelConfigSchema = z.object({
     accessKey: z.string().min(1, "Access Key is required"),
     secretKey: z.string().min(1, "Secret Key is required"),
     bucketName: z.string().min(1, "Bucket name is required"),
-    port: z.coerce.number().optional(),
+    port: z.union([
+        z.literal("").transform(() => ""),
+        z.literal("").transform(() => ""),
+        z.coerce.number()
+    ]).optional(),
     ssl: z.boolean().optional().default(true),
 });

src/components/wrappers/dashboard/admin/notifications/logs/notification-log-modal.tsx

@@ -1,62 +1,241 @@
-"use client"
+"use client";
-import {Eye} from "lucide-react";
-
-import {useState} from "react";
 import {
-    Dialog,
+  AlertCircle,
-    DialogContent,
+  Braces,
-    DialogDescription,
+  Database,
-    DialogHeader,
+  ExternalLink,
-    DialogTitle,
+  Eye,
-    DialogTrigger
+  Hash,
+  Server,
+  Sparkles,
+} from "lucide-react";
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
 } from "@/components/ui/dialog";
-import {Button} from "@/components/ui/button";
+import type { NotificationLogWithRelations } from "@/db/services/notification-log";
-import {Separator} from "@/components/ui/separator";
-import {NotificationLogWithRelations} from "@/db/services/notification-log";
 
 type NotificationLogModalProps = {
-    notificationLog: NotificationLogWithRelations;
+  notificationLog: NotificationLogWithRelations;
-}
+};
 
-export const NotificationLogModal = ({notificationLog}: NotificationLogModalProps) => {
+const getTroubleshootingForError = (errorMsg?: any) => {
-    const [open, setOpen] = useState(false);
+  if (!errorMsg || String(errorMsg).toLowerCase() === "null") return null;
 
-    return (
+  const msg = String(errorMsg).toLowerCase();
-        <Dialog open={open} onOpenChange={setOpen}>
-            <DialogTrigger asChild>
-                <Button variant="outline" onClick={() => setOpen(true)} className="relative">
-                    <Eye/>
-                </Button>
-            </DialogTrigger>
-            <DialogContent>
-                <DialogHeader>
-                    <DialogTitle>Notification details</DialogTitle>
-                    <DialogDescription>
-                        Details of the notification sent
-                    </DialogDescription>
-                    <Separator className="mt-3 mb-3"/>
 
-                    <div className="space-y-2 mb-4">
+  if (msg.includes("database connection") || msg.includes("agent")) {
-                        <div>
+    return {
-                            <span className="font-semibold">Title:</span>{" "}
+      title: "Agent Connection Issue",
-                            <span>{notificationLog.content.title}</span>
+      resolution:
-                        </div>
+        "It appears the agent cannot reach the database. Please ensure that your agent is actively running, your PostgreSQL credentials are correct, and port 5432 is open on your firewall.",
-                        <div>
+      docLink:
-                            <span className="font-semibold">Message:</span>{" "}
+        "https://portabase.io/docs/agent/troubleshooting/agent-connection",
-                            <span>{notificationLog.content.message}</span>
+    };
-                        </div>
+  }
+
+  if (msg.includes("timeout")) {
+    return {
+      title: "Timeout",
+      resolution:
+        "The agent is taking too long to respond. This could be due to high server load, network issues, or a large database.",
+      docLink: "https://portabase.io/docs/agent/troubleshooting/timeout",
+    };
+  }
+
+  return {
+    title: "Unexpected Execution Error",
+    resolution:
+      "An unexpected error occurred during execution. Please review the raw system logs or contact support if the issue persists.",
+    docLink: "https://discord.gg/Wgv7xZ8fWJ",
+  };
+};
+
+const getIconForKey = (key: string, value: any) => {
+  const isActualError =
+    key.toLowerCase().includes("error") &&
+    value !== null &&
+    String(value).toLowerCase() !== "null";
+
+  if (key.toLowerCase().includes("id"))
+    return <Hash className="w-3.5 h-3.5 text-muted-foreground" />;
+  if (key.toLowerCase().includes("host"))
+    return <Server className="w-3.5 h-3.5 text-muted-foreground" />;
+  if (isActualError)
+    return <AlertCircle className="w-3.5 h-3.5 text-destructive" />;
+  return <Database className="w-3.5 h-3.5 text-muted-foreground" />;
+};
+
+export const NotificationLogModal = ({
+  notificationLog,
+}: NotificationLogModalProps) => {
+  const [open, setOpen] = useState(false);
+
+  // TODO : to be fixed
+  // @ts-ignore
+  const payloadError = notificationLog.payload?.error;
+  const troubleshooting = getTroubleshootingForError(payloadError);
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>
+        <Button
+          variant="outline"
+          onClick={() => setOpen(true)}
+          className="relative"
+        >
+          <Eye className="w-4 h-4" />
+        </Button>
+      </DialogTrigger>
+      <DialogContent className="sm:max-w-xl bg-background">
+        <DialogHeader>
+          <DialogTitle>Notification Details</DialogTitle>
+          <DialogDescription>Execution logs and payload data</DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-4 mt-2 max-h-[70vh] overflow-y-auto px-1 pb-2">
+          <div className="relative border rounded-xl bg-card shadow-sm flex flex-col">
+            <div className="bg-primary/5 border-b px-4 py-2.5 flex items-center gap-2 rounded-t-xl">
+              <div className="p-1 bg-primary/10 rounded-md">
+                <Database className="w-4 h-4 text-primary" />
+              </div>
+              <span className="font-semibold text-sm text-primary">
+                Event Trigger
+              </span>
+            </div>
+            <div className="p-4 flex flex-col gap-4">
+              <div className="flex flex-col sm:flex-row sm:items-start justify-between gap-1 sm:gap-4">
+                <span className="text-xs font-medium text-muted-foreground min-w-20 pt-0.5">
+                  Title
+                </span>
+                <span className="text-sm sm:text-right flex-1 wrap-break-words">
+                  {notificationLog.content.title}
+                </span>
+              </div>
+              <div className="flex flex-col sm:flex-row sm:items-start justify-between gap-1 sm:gap-4">
+                <span className="text-xs font-medium text-muted-foreground min-w-20 pt-0.5">
+                  Message
+                </span>
+                <span className="text-sm sm:text-right flex-1 wrap-break-word text-muted-foreground">
+                  {notificationLog.content.message}
+                </span>
+              </div>
+            </div>
+            {notificationLog.payload && (
+            <div className="absolute -bottom-1.5 left-1/2 -translate-x-1/2 w-3 h-3 bg-primary rounded-full border-2 border-background z-10" />
+                )}
+          </div>
+
+          <div className="w-px h-6 bg-border mx-auto -my-4 relative z-0" />
+
+          {notificationLog.payload &&
+            Object.keys(notificationLog.payload).length > 0 && (
+              <div className="relative border rounded-xl bg-card shadow-sm flex flex-col">
+                <div className="absolute -top-1.5 left-1/2 -translate-x-1/2 w-3 h-3 bg-primary rounded-full border-2 border-background z-10" />
+
+                <div className="bg-primary/5 border-b px-4 py-2.5 flex items-center justify-between rounded-t-xl">
+                  <div className="flex items-center gap-2">
+                    <div className="p-1 bg-primary/10 rounded-md">
+                      <Braces className="w-4 h-4 text-primary" />
                     </div>
+                    <span className="font-semibold text-sm text-primary">
+                      JSON Payload
+                    </span>
+                  </div>
+                </div>
 
-                    {notificationLog.payload && (
+                <div className="flex flex-col">
-                        <>
+                  {Object.entries(notificationLog.payload).map(
-                            <Separator className="mb-3" />
+                    ([key, value], index, arr) => {
-                            <div className="text-sm font-mono bg-gray-100 dark:bg-gray-800 dark:text-gray-200 p-4 rounded-md overflow-auto">
+                      const isActualError =
-                                {JSON.stringify(notificationLog.payload, null, 2)}
+                        key === "error" &&
-                            </div>
+                        value !== null &&
-                        </>
+                        String(value).toLowerCase() !== "null";
-                    )}
+
-                </DialogHeader>
+                      return (
-            </DialogContent>
+                        <div
-        </Dialog>
+                          key={key}
-    )
+                          className={`flex flex-col sm:flex-row sm:items-center justify-between gap-2 px-4 py-3 hover:bg-muted/50 transition-colors ${
-}
+                            index !== arr.length - 1
+                              ? "border-b border-border/50"
+                              : ""
+                          }`}
+                        >
+                          <div className="flex items-center gap-2 min-w-[150px]">
+                            {getIconForKey(key, value)}
+                            <span className="text-sm font-medium">{key}</span>
+                          </div>
+                          <div className="flex-1 sm:text-right">
+                            {isActualError ? (
+                              <span className="inline-flex items-center px-2 py-1 rounded-md bg-destructive/10 text-destructive text-xs font-mono break-all">
+                                {String(value)}
+                              </span>
+                            ) : (
+                              <span className="text-sm text-muted-foreground font-mono bg-muted px-2 py-1 rounded-md break-all">
+                                {String(value)}
+                              </span>
+                            )}
+                          </div>
+                        </div>
+                      );
+                    },
+                  )}
+                </div>
+
+                {troubleshooting && (
+                  <div className="absolute -bottom-1.5 left-1/2 -translate-x-1/2 w-3 h-3 bg-primary rounded-full border-2 border-background z-10" />
+                )}
+              </div>
+            )}
+
+          {troubleshooting && (
+            <>
+              <div className="w-px h-6 bg-border mx-auto -my-4 relative z-0" />
+
+              <div className="relative border border-destructive/20 rounded-xl bg-gradient-to-b from-destructive/5 to-transparent shadow-sm flex flex-col">
+                <div className="absolute -top-1.5 left-1/2 -translate-x-1/2 w-3 h-3 bg-destructive rounded-full border-2 border-background z-10" />
+
+                <div className="bg-destructive/10 border-b border-destructive/10 px-4 py-2.5 flex items-center justify-between rounded-t-xl">
+                  <div className="flex items-center gap-2">
+                    <div className="p-1 bg-destructive/20 rounded-md">
+                      <Sparkles className="w-4 h-4 text-destructive" />
+                    </div>
+                    <span className="font-semibold text-sm text-destructive">
+                      Suggested Resolution
+                    </span>
+                  </div>
+                </div>
+
+                <div className="p-4 flex flex-col gap-2">
+                  <h4 className="text-sm font-semibold text-foreground">
+                    {troubleshooting.title}
+                  </h4>
+                  <p className="text-sm text-muted-foreground leading-relaxed">
+                    {troubleshooting.resolution}
+                  </p>
+                  <div className="mt-2">
+                    <a
+                      href={troubleshooting.docLink}
+                      target="_blank"
+                      rel="noreferrer"
+                      className="inline-flex items-center gap-1.5 text-xs font-semibold text-destructive hover:text-destructive/80 transition-colors"
+                    >
+                      Read the documentation{" "}
+                      <ExternalLink className="w-3.5 h-3.5" />
+                    </a>
+                  </div>
+                </div>
+              </div>
+            </>
+          )}
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+};

src/components/wrappers/dashboard/database/backup/actions/backup-actions-cell.tsx

@@ -21,14 +21,14 @@ interface DatabaseActionsCellProps {
     backup: BackupWith;
     activeMember: MemberWithUser;
     isAlreadyRestore: boolean;
+    isBackupOnly: boolean;
 }
 
-export function DatabaseActionsCell({backup, activeMember, isAlreadyRestore}: DatabaseActionsCellProps) {
+export function DatabaseActionsCell({backup, activeMember, isAlreadyRestore, isBackupOnly}: DatabaseActionsCellProps) {
     const {openModal} = useBackupModal();
 
     if (backup.deletedAt || activeMember.role === "member") return null;
 
-
     return (
         <div className={cn("flex items-center space-x-2")}>
             <DropdownMenu>
@@ -40,18 +40,19 @@ export function DatabaseActionsCell({backup, activeMember, isAlreadyRestore}: Da
                 </DropdownMenuTrigger>
                 <DropdownMenuContent align="end">
                     <DropdownMenuLabel>Actions</DropdownMenuLabel>
-
                     {backup.status == "success" ? (
                         <>
-                            <TooltipCustom disabled={isAlreadyRestore}
+                            {!isBackupOnly && (
-                                           text="Already a restoration waiting">
+                                <TooltipCustom disabled={isAlreadyRestore}
-                                <DropdownMenuItem
+                                               text="Already a restoration waiting">
-                                    disabled={isAlreadyRestore}
+                                    <DropdownMenuItem
-                                    onSelect={() => openModal("restore", backup)}
+                                        disabled={isAlreadyRestore}
-                                >
+                                        onSelect={() => openModal("restore", backup)}
-                                    <ReloadIcon/> Restore
+                                    >
-                                </DropdownMenuItem>
+                                        <ReloadIcon/> Restore
-                            </TooltipCustom>
+                                    </DropdownMenuItem>
+                                </TooltipCustom>
+                            )}
                             <DropdownMenuItem
                                 onSelect={() => openModal("download", backup)}
                             >

src/components/wrappers/dashboard/database/channels-policy/policy-form.tsx

@@ -22,6 +22,7 @@ import {
 } from "@/components/wrappers/dashboard/admin/channels/helpers/common";
 import {StorageChannel} from "@/db/schema/12_storage-channel";
 import {
+    EVENT_KIND_BACKUP_ONLY_OPTIONS,
     EVENT_KIND_OPTIONS,
     PoliciesSchema,
     PoliciesType,
@@ -31,6 +32,7 @@ import {
     createAlertPoliciesAction, createStoragePoliciesAction, deleteAlertPoliciesAction, deleteStoragePoliciesAction,
     updateAlertPoliciesAction, updateStoragePoliciesAction
 } from "@/components/wrappers/dashboard/database/channels-policy/policy.action";
+import {backupOnly} from "@/components/wrappers/dashboard/projects/database/database-tabs";
 
 type ChannelPoliciesFormProps = {
     onSuccess?: () => void;
@@ -53,6 +55,9 @@ export const ChannelPoliciesForm = ({
     const isMobile = useIsMobile();
     const channelText = getChannelTextBasedOnKind(kind);
 
+    const isBackupOnly = backupOnly.some((type) => database.dbms === type);
+
+
     const organizationChannels = channels.map(c => c.id);
 
     const filterByChannel = <T, K extends keyof T>(
@@ -300,7 +305,7 @@ export const ChannelPoliciesForm = ({
                                                         <FormControl>
                                                             <div className="max-w-full overflow-hidden">
                                                                 <MultiSelect
-                                                                    options={EVENT_KIND_OPTIONS}
+                                                                    options={isBackupOnly ? EVENT_KIND_BACKUP_ONLY_OPTIONS : EVENT_KIND_OPTIONS}
                                                                     onValueChange={field.onChange}
                                                                     defaultValue={field.value ?? []}
                                                                     placeholder={isMobile ? "Select events..." : "Select events to trigger notifications..."}

src/components/wrappers/dashboard/database/channels-policy/policy.schema.ts

@@ -23,5 +23,10 @@ export const EVENT_KIND_OPTIONS = [
     {label: "Error Restore", value: "error_restore"},
     {label: "Success Restore", value: "success_restore"},
     {label: "Success Backup", value: "success_backup"},
-    {label: "Weekly Report", value: "weekly_report"},
+    // {label: "Weekly Report", value: "weekly_report"},
+];
+
+export const EVENT_KIND_BACKUP_ONLY_OPTIONS = [
+    {label: "Error Backup", value: "error_backup"},
+    {label: "Success Backup", value: "success_backup"},
 ];

src/components/wrappers/dashboard/projects/database/database-tabs.tsx

@@ -18,6 +18,8 @@ export type DatabaseTabsProps = {
     activeMember: MemberWithUser
 };
 
+export const backupOnly = ["redis", "valkey"];
+
 export const DatabaseTabs = (props: DatabaseTabsProps) => {
     const router = useRouter();
     const searchParams = useSearchParams();
@@ -26,6 +28,7 @@ export const DatabaseTabs = (props: DatabaseTabsProps) => {
 
     useEffect(() => {
         const newTab = searchParams.get("tab") ?? "backup";
+        // eslint-disable-next-line react-hooks/set-state-in-effect
         setTab(newTab);
     }, [searchParams]);
 
@@ -33,13 +36,13 @@ export const DatabaseTabs = (props: DatabaseTabsProps) => {
         router.push(`?tab=${value}`);
     };
 
+
+    const isBackupOnly = backupOnly.some((type) => props.database.dbms === type)
+
+
     return (
-        <Tabs className="flex flex-col flex-1" value={tab} onValueChange={handleChangeTab}>
+        <>
-            <TabsList className="grid w-full grid-cols-2">
+            {isBackupOnly ?
-                <TabsTrigger value="backup">Backup</TabsTrigger>
-                <TabsTrigger value="restore">Restoration</TabsTrigger>
-            </TabsList>
-            <TabsContent className="h-full justify-between" value="backup">
                 <DatabaseBackupList
                     isAlreadyRestore={props.isAlreadyRestore}
                     settings={props.settings}
@@ -47,15 +50,33 @@ export const DatabaseTabs = (props: DatabaseTabsProps) => {
                     backups={props.backups}
                     activeMember={props.activeMember}
                 />
-            </TabsContent>
+                :
-            <TabsContent className="h-full justify-between" value="restore">
+                <Tabs className="flex flex-col flex-1" value={tab} onValueChange={handleChangeTab}>
-                <DatabaseRestoreList
+                    <TabsList className="grid w-full grid-cols-2">
-                    isAlreadyRestore={props.isAlreadyRestore}
+                        <TabsTrigger value="backup">Backup</TabsTrigger>
-                    restorations={props.restorations}
+                        <TabsTrigger value="restore">Restoration</TabsTrigger>
-                    activeMember={props.activeMember}
+                    </TabsList>
-                    databaseId={props.database.id}
+                    <TabsContent className="h-full justify-between" value="backup">
-                />
+                        <DatabaseBackupList
-            </TabsContent>
+                            isAlreadyRestore={props.isAlreadyRestore}
-        </Tabs>
+                            settings={props.settings}
+                            database={props.database}
+                            backups={props.backups}
+                            activeMember={props.activeMember}
+                        />
+                    </TabsContent>
+                    <TabsContent className="h-full justify-between" value="restore">
+                        <DatabaseRestoreList
+                            isAlreadyRestore={props.isAlreadyRestore}
+                            restorations={props.restorations}
+                            activeMember={props.activeMember}
+                            databaseId={props.database.id}
+                        />
+                    </TabsContent>
+                </Tabs>
+            }
+
+        </>
+
     );
 };

src/db/migrations/0038_misty_red_hulk.sql

@@ -0,0 +1 @@
+ALTER TYPE "public"."dbms_status" ADD VALUE 'redis';

src/db/migrations/0039_conscious_solo.sql

@@ -0,0 +1 @@
+ALTER TYPE "public"."dbms_status" ADD VALUE 'valkey';

src/db/migrations/meta/_journal.json

@@ -267,6 +267,20 @@
       "when": 1772200831628,
       "tag": "0037_neat_talon",
       "breakpoints": true
+    },
+    {
+      "idx": 38,
+      "version": "7",
+      "when": 1773433992397,
+      "tag": "0038_misty_red_hulk",
+      "breakpoints": true
+    },
+    {
+      "idx": 39,
+      "version": "7",
+      "when": 1773659096498,
+      "tag": "0039_conscious_solo",
+      "breakpoints": true
     }
   ]
 }

src/db/schema/types.ts

@@ -2,7 +2,7 @@ import {pgEnum} from "drizzle-orm/pg-core";
 import {createSelectSchema} from "drizzle-zod";
 import {z} from "zod";
 
-export const dbmsEnum = pgEnum("dbms_status", ["postgresql", "mysql", "mongodb", "sqlite"]);
+export const dbmsEnum = pgEnum("dbms_status", ["postgresql", "mysql", "mongodb", "sqlite", "redis", "valkey"]);
 export const statusEnum = pgEnum("status", ["waiting", "ongoing", "failed", "success"]);
 export const typeStorageEnum = pgEnum("type_storage", ["local", "s3"]);
 

src/features/dashboard/backup/columns.tsx

@@ -11,6 +11,7 @@ import {formatLocalizedDate} from "@/utils/date-formatting";
 import {formatBytes} from "@/utils/text";
 import {DatabaseActionsCell} from "@/components/wrappers/dashboard/database/backup/actions/backup-actions-cell";
 import { Badge as BadgeC } from "@/components/ui/badge";
+import {backupOnly} from "@/components/wrappers/dashboard/projects/database/database-tabs";
 
 export function backupColumns(
     isAlreadyRestore: boolean,
@@ -18,6 +19,10 @@ export function backupColumns(
     database: DatabaseWith,
     activeMember: MemberWithUser
 ): ColumnDef<Backup>[] {
+
+    const isBackupOnly = backupOnly.some((type) => database.dbms === type)
+
+
     return [
         {
             id: "availability",
@@ -90,137 +95,7 @@ export function backupColumns(
         },
         {
             id: "actions",
-            cell: ({row}) => <DatabaseActionsCell isAlreadyRestore={isAlreadyRestore} activeMember={activeMember} backup={row.original}/>,
+            cell: ({row}) => <DatabaseActionsCell isAlreadyRestore={isAlreadyRestore} activeMember={activeMember} backup={row.original} isBackupOnly={isBackupOnly}/>,
         },
-        // {
-        //     id: "actions",
-        //     cell: ({row, table}) => {
-        //         const status = row.getValue("status");
-        //         const rowData: Backup = row.original;
-        //         const fileName = rowData.file;
-        //
-        //         const router = useRouter();
-        //
-        //         const mutationRestore = useMutation({
-        //             mutationFn: async () => {
-        //                 const restoration = await createRestorationAction({
-        //                     backupId: rowData.id,
-        //                     databaseId: rowData.databaseId,
-        //                 });
-        //                 // @ts-ignore
-        //                 if (restoration.data.success) {
-        //                     // @ts-ignore
-        //                     toast.success(restoration.data.actionSuccess?.message || "Restoration created successfully!");
-        //                     router.refresh();
-        //                 } else {
-        //                     // @ts-ignore
-        //                     toast.error(restoration.serverError || "Failed to create restoration.");
-        //                 }
-        //             },
-        //         });
-        //
-        //         const mutationDeleteBackup = useMutation({
-        //             mutationFn: async () => {
-        //                 const deletion = await deleteBackupAction({
-        //                     backupId: rowData.id,
-        //                     databaseId: rowData.databaseId,
-        //                     status: rowData.status,
-        //                     file: rowData.file ?? "",
-        //                     projectSlug: database.project?.slug!
-        //                 });
-        //                 // @ts-ignore
-        //                 if (deletion.data.success) {
-        //                     // @ts-ignore
-        //                     toast.success(deletion.data.actionSuccess.message);
-        //                     router.refresh();
-        //                 } else {
-        //                     // @ts-ignore
-        //                     toast.error(deletion.data.actionError.message);
-        //                 }
-        //             },
-        //         });
-        //
-        //         const handleRestore = async () => {
-        //             await mutationRestore.mutateAsync();
-        //         };
-        //
-        //         const handleDelete = async () => {
-        //             await mutationDeleteBackup.mutateAsync();
-        //         };
-        //
-        //         const handleDownload = async (fileName: string) => {
-        //
-        //             let url: string = "";
-        //             let data: SafeActionResult<string, ZodString, readonly [], {
-        //                 _errors?: string[] | undefined;
-        //             }, readonly [], ServerActionResult<string>, object> | undefined
-        //
-        //             if (settings.storage == "local") {
-        //                 data = await getFileUrlPresignedLocal({fileName: fileName!})
-        //             } else if (settings.storage == "s3") {
-        //                 data = await getFileUrlPreSignedS3Action(`backups/${database.project?.slug}/${fileName}`);
-        //             }
-        //             if (data?.data?.success) {
-        //                 url = data.data.value ?? "";
-        //             } else {
-        //                 // @ts-ignore
-        //                 const errorMessage = data?.data?.actionError?.message || "Failed to get file!";
-        //                 toast.error(errorMessage);
-        //             }
-        //
-        //             window.open(url, "_self");
-        //         };
-        //
-        //         return (
-        //             <>
-        //                 {(rowData.deletedAt == null && activeMember.role != "member") && (
-        //                     <DropdownMenu>
-        //                         <DropdownMenuTrigger asChild>
-        //                             <Button variant="ghost" className="h-8 w-8 p-0">
-        //                                 <span className="sr-only">Open menu</span>
-        //                                 <MoreHorizontal className="h-4 w-4"/>
-        //                             </Button>
-        //                         </DropdownMenuTrigger>
-        //                         <DropdownMenuContent align="end">
-        //                             <DropdownMenuLabel>Actions</DropdownMenuLabel>
-        //                             {status == "success" ? (
-        //                                 <>
-        //                                     <TooltipCustom disabled={isAlreadyRestore}
-        //                                                    text="Already a restoration waiting">
-        //                                         <DropdownMenuItem
-        //                                             disabled={mutationRestore.isPending || isAlreadyRestore}
-        //                                             onClick={async () => {
-        //                                                 await handleRestore();
-        //                                             }}
-        //                                         >
-        //                                             <ReloadIcon/> Restore
-        //                                         </DropdownMenuItem>
-        //                                     </TooltipCustom>
-        //                                     <DropdownMenuItem
-        //                                         onClick={async () => {
-        //                                             await handleDownload(fileName ?? "");
-        //                                         }}
-        //                                     >
-        //                                         <Download/> Download
-        //                                     </DropdownMenuItem>
-        //                                 </>
-        //                             ) : null}
-        //                             <DropdownMenuSeparator/>
-        //                             <DropdownMenuItem
-        //                                 className="text-red-600"
-        //                                 onClick={async () => {
-        //                                     await handleDelete();
-        //                                 }}
-        //                             >
-        //                                 <Trash2/> Delete
-        //                             </DropdownMenuItem>
-        //                         </DropdownMenuContent>
-        //                     </DropdownMenu>
-        //                 )}
-        //             </>
-        //
-        //         );
-        //     },
-        // },
     ];
 }