chore: release 1.17.1

* feat: added the mcp server

* feat: added the mcp server

* fix: api for database not linked to any projects

* fix: added variable to disable MCP

* chore: refactoring

.env.example

@@ -1,6 +1,12 @@
 # Environment
 NODE_ENV=development
 
+# Logging
+# Controls minimum log level. Options: debug | info | warn | error
+# Set to "warn" or "error" in production to suppress health-check ping noise.
+# Use "debug" to see all request logs including agent status pings.
+LOG_LEVEL=info
+
 # Database
 DATABASE_URL=postgresql://devuser:changeme@localhost:5433/devdb?schema=public
 
@@ -9,6 +15,15 @@ PROJECT_NAME="Portabase"
 PROJECT_URL=http://localhost:8887
 PROJECT_SECRET=
 
+AUTH_DEFAULT_USER_NAME="Portabase Admin"
+AUTH_DEFAULT_USER=user@example.com
+# Password must contain at least 8 characters
+# Password must contain at least 1 number
+# Password must contain at least 1 lowercase letter
+# Password must contain at least 1 uppercase letter
+# Password must contain at least 1 special character
+AUTH_DEFAULT_PASSWORD=testPASS123456!
+
 # SMTP (email)
 SMTP_HOST=
 SMTP_PORT=
@@ -39,7 +54,6 @@ AUTH_OIDC_ROLE_MAP=""
 AUTH_ALLOW_LINKING=true
 AUTH_ALLOW_UNLINKING=true
 
-
 # Social OAuth2 Authentification
 AUTH_SOCIAL_ID=""
 AUTH_SOCIAL_TITLE=""
@@ -58,3 +72,9 @@ AUTH_PASSKEY_ENABLED=true
 
 # Retention
 RETENTION_CRON="* * * * *"
+
+TRUSTED_DOMAINS="http://localhost:8887, http://localhost:3055, http://localhost:3056"
+
+#OPENAPI_ENABLED=true
+#API_ENABLED=true
+#MCP_ENABLED=true

.github/workflows/discord.yml

@@ -24,50 +24,86 @@ on:
 jobs:
   notify-discord:
     runs-on: ubuntu-latest
+
     steps:
       - name: Send Discord Notification
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          RELEASE_TAG: ${{ inputs.release_tag }}
+          DISCORD_TITLE: ${{ inputs.discord_title }}
+          DISCORD_COLOR: ${{ inputs.discord_color }}
+          DISCORD_FOOTER: ${{ inputs.discord_footer }}
         run: |
-          RELEASE_INFO=$(gh release view "${{ inputs.release_tag }}" -R ${{ github.repository }} --json name,url,body,author)
+          set -euo pipefail
 
-          RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r .name)
-          if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ inputs.release_tag }}"; fi
+          RELEASE_INFO=$(gh release view "$RELEASE_TAG" -R "${{ github.repository }}" --json name,url,body,author)
 
-          RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r .url)
-          RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r .body)
+          RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r '.name // empty')
+          if [ -z "$RELEASE_TITLE" ]; then
+            RELEASE_TITLE="$RELEASE_TAG"
+          fi
+
+          RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r '.url // empty')
+          RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r '.body // ""')
 
           AUTHOR_NAME="Portabase"
           AUTHOR_ICON="https://github.com/Portabase.png"
 
-          PAYLOAD=$(jq -n \
+          jq -n \
             --arg title "$RELEASE_TITLE" \
             --arg description "$RELEASE_BODY" \
             --arg url "$RELEASE_URL" \
             --arg author "$AUTHOR_NAME" \
             --arg icon "$AUTHOR_ICON" \
-            --arg discord_title "${{ inputs.discord_title }}" \
-            --arg discord_footer "${{ inputs.discord_footer }}" \
-            --argjson discord_color ${{ inputs.discord_color }} \
+            --arg discord_title "$DISCORD_TITLE" \
+            --arg discord_footer "$DISCORD_FOOTER" \
+            --argjson discord_color "$DISCORD_COLOR" \
             '{
-              content: $discord_title,
+              content: (
+                if ($discord_title | length) > 1900
+                then ($discord_title[0:1900] + "...")
+                else $discord_title
+                end
+              ),
               embeds: [{
-                title: $title,
+                title: (
+                  if ($title | length) > 256
+                  then ($title[0:253] + "...")
+                  else $title
+                  end
+                ),
                 url: $url,
-                description: $description,
+                description: (
+                  if ($description | length) > 3800
+                  then ($description[0:3800] + "\n\n...")
+                  else $description
+                  end
+                ),
                 color: $discord_color,
                 author: {
-                  name: $author,
+                  name: (
+                    if ($author | length) > 256
+                    then ($author[0:253] + "...")
+                    else $author
+                    end
+                  ),
                   icon_url: $icon
                 },
                 footer: {
-                  text: $discord_footer
+                  text: (
+                    if ($discord_footer | length) > 512
+                    then ($discord_footer[0:509] + "...")
+                    else $discord_footer
+                    end
+                  )
                 }
               }]
-            }'
-          )
+            }' > payload.json
 
-          curl -H "Content-Type: application/json" \
-               -d "$PAYLOAD" \
-               "$DISCORD_WEBHOOK"
+          cat payload.json | jq .
+
+          curl --fail-with-body -sS \
+            -H "Content-Type: application/json" \
+            -d @payload.json \
+            "$DISCORD_WEBHOOK?wait=true"

.github/workflows/e2e.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.head.repo.full_name == github.repository
 
     steps:
       - uses: actions/checkout@v4
@@ -57,12 +58,51 @@ jobs:
           exit 1
 
       - name: Install Playwright browsers
-        run: pnpm exec playwright install --with-deps chromium firefox webkit
+        run: pnpm exec playwright install --with-deps chromium
 
       - name: Run Playwright tests
-        run: pnpm exec playwright test --project chromium
+        run: pnpm exec playwright test
         env:
           PROJECT_URL: http://localhost:8887
+          # E2E Notification
+          E2E_NOTIFICATION_SMTP_HOST: ${{ secrets.E2E_NOTIFICATION_SMTP_HOST }}
+          E2E_NOTIFICATION_SMTP_PORT: ${{ secrets.E2E_NOTIFICATION_SMTP_PORT }}
+          E2E_NOTIFICATION_SMTP_USER: ${{ secrets.E2E_NOTIFICATION_SMTP_USER }}
+          E2E_NOTIFICATION_SMTP_PASSWORD: ${{ secrets.E2E_NOTIFICATION_SMTP_PASSWORD }}
+          E2E_NOTIFICATION_SMTP_FROM: ${{ secrets.E2E_NOTIFICATION_SMTP_FROM }}
+          E2E_NOTIFICATION_SMTP_TO: ${{ secrets.E2E_NOTIFICATION_SMTP_TO }}
+          E2E_NOTIFICATION_SLACK_WEBHOOK: ${{ secrets.E2E_NOTIFICATION_SLACK_WEBHOOK }}
+          E2E_NOTIFICATION_DISCORD_WEBHOOK: ${{ secrets.E2E_NOTIFICATION_DISCORD_WEBHOOK }}
+          E2E_NOTIFICATION_TELEGRAM_BOT_TOKEN: ${{ secrets.E2E_NOTIFICATION_TELEGRAM_BOT_TOKEN }}
+          E2E_NOTIFICATION_TELEGRAM_CHAT_ID: ${{ secrets.E2E_NOTIFICATION_TELEGRAM_CHAT_ID }}
+          E2E_NOTIFICATION_TELEGRAM_TOPIC_ID: ${{ secrets.E2E_NOTIFICATION_TELEGRAM_TOPIC_ID }}
+          E2E_NOTIFICATION_GOTIFY_SERVER_URL: ${{ secrets.E2E_NOTIFICATION_GOTIFY_SERVER_URL }}
+          E2E_NOTIFICATION_GOTIFY_APP_TOKEN: ${{ secrets.E2E_NOTIFICATION_GOTIFY_APP_TOKEN }}
+          E2E_NOTIFICATION_NTFY_TOPIC: ${{ secrets.E2E_NOTIFICATION_NTFY_TOPIC }}
+          E2E_NOTIFICATION_NTFY_SERVER_URL: ${{ secrets.E2E_NOTIFICATION_NTFY_SERVER_URL }}
+          E2E_NOTIFICATION_NTFY_TOKEN: ${{ secrets.E2E_NOTIFICATION_NTFY_TOKEN }}
+          E2E_NOTIFICATION_NTFY_USERNAME: ${{ secrets.E2E_NOTIFICATION_NTFY_USERNAME }}
+          E2E_NOTIFICATION_NTFY_PASSWORD: ${{ secrets.E2E_NOTIFICATION_NTFY_PASSWORD }}
+          E2E_NOTIFICATION_WEBHOOK_URL: ${{ secrets.E2E_NOTIFICATION_WEBHOOK_URL }}
+          E2E_NOTIFICATION_WEBHOOK_SECRET_HEADER: ${{ secrets.E2E_NOTIFICATION_WEBHOOK_SECRET_HEADER }}
+          E2E_NOTIFICATION_WEBHOOK_SECRET: ${{ secrets.E2E_NOTIFICATION_WEBHOOK_SECRET }}
+
+          # E2E Storage
+          E2E_STORAGE_AWS_S3_ENDPOINT_URL: ${{ secrets.E2E_STORAGE_AWS_S3_ENDPOINT_URL }}
+          E2E_STORAGE_AWS_S3_REGION: ${{ secrets.E2E_STORAGE_AWS_S3_REGION }}
+          E2E_STORAGE_AWS_S3_ACCESS_KEY: ${{ secrets.E2E_STORAGE_AWS_S3_ACCESS_KEY }}
+          E2E_STORAGE_AWS_S3_SECRET_KEY: ${{ secrets.E2E_STORAGE_AWS_S3_SECRET_KEY }}
+          E2E_STORAGE_AWS_S3_BUCKET_NAME: ${{ secrets.E2E_STORAGE_AWS_S3_BUCKET_NAME }}
+          E2E_STORAGE_AWS_S3_PORT: ${{ secrets.E2E_STORAGE_AWS_S3_PORT }}
+          E2E_STORAGE_R2_ENDPOINT_URL: ${{ secrets.E2E_STORAGE_R2_ENDPOINT_URL }}
+          E2E_STORAGE_R2_REGION: ${{ secrets.E2E_STORAGE_R2_REGION }}
+          E2E_STORAGE_R2_ACCESS_KEY: ${{ secrets.E2E_STORAGE_R2_ACCESS_KEY }}
+          E2E_STORAGE_R2_SECRET_KEY: ${{ secrets.E2E_STORAGE_R2_SECRET_KEY }}
+          E2E_STORAGE_R2_BUCKET_NAME: ${{ secrets.E2E_STORAGE_R2_BUCKET_NAME }}
+          E2E_STORAGE_R2_PORT: ${{ secrets.E2E_STORAGE_R2_PORT }}
+          E2E_STORAGE_GOOGLE_DRIVE_CLIENT_ID: ${{ secrets.E2E_STORAGE_GOOGLE_DRIVE_CLIENT_ID }}
+          E2E_STORAGE_GOOGLE_DRIVE_CLIENT_SECRET: ${{ secrets.E2E_STORAGE_GOOGLE_DRIVE_CLIENT_SECRET }}
+          E2E_STORAGE_GOOGLE_DRIVE_FOLDER_ID: ${{ secrets.E2E_STORAGE_GOOGLE_DRIVE_FOLDER_ID }}
 
       - name: Upload report if failed
         if: failure()

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 name: Auto Release & Publish
 
 on:
-  pull_request:
+  pull_request_target:
     types: [ closed ]
     branches:
       - main

.github/workflows/security.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: aquasecurity/trivy-action@0.35.0
+      - uses: aquasecurity/trivy-action@v0.35.0
         with:
           scan-type: 'fs'
           format: 'table'

.gitignore

@@ -54,3 +54,8 @@ certificates
 /blob-report/
 /playwright/.cache/
 /playwright/.auth/
+/e2e/local-storage.json
+
+.claude
+.codex
+/docs

CITATION.cff

@@ -21,6 +21,8 @@ keywords:
   - backups
   - postgresql
   - mysql
+  - firebird
+  - mssql
   - mariadb
   - devops
   - database
@@ -31,5 +33,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.9.2
+version: 1.17.1
 date-released: '2026-03-02'

Makefile

@@ -16,7 +16,7 @@ seed-pocket:
 	@docker compose -f docker-compose.func.yml stop pocket-id >/dev/null 2>&1 || true
 	@docker compose -f docker-compose.func.yml rm -f -s pocket-id >/dev/null 2>&1 || true
 	@docker volume rm portabase-dev-func_pocket-id-data >/dev/null 2>&1 || true
-	@docker compose -f docker-compose.func.yml run --rm -v ./seeds/pocket-id/portabase.zip:/tmp/portabase.zip pocket-id ./pocket-id import --yes --path /tmp/portabase.zip >/dev/null
+	@docker compose -f docker-compose.func.yml run --rm -v $$(pwd)/seeds/pocket-id/portabase.zip:/tmp/portabase.zip pocket-id ./pocket-id import --yes --path /tmp/portabase.zip >/dev/null
 	@docker compose -f docker-compose.func.yml up -d pocket-id
 	@sleep 2
 	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
@@ -46,3 +46,17 @@ export-keycloak:
 	@docker rm -f kc-exporter >/dev/null 2>&1
 	@docker compose -f docker-compose.func.yml start keycloak >/dev/null 2>&1
 	@echo "Keycloak configuration and users exported to seeds/keycloak/*.json"
+
+end-to-end:
+	@echo "Starting E2E testing..."
+	@docker compose -f docker-compose.e2e.yml up -d
+	@CI=true PROJECT_URL=http://localhost:8887 pnpm playwright test --project=chromium || (docker compose -f docker-compose.e2e.yml down --volumes && exit 1)
+	@docker compose -f docker-compose.e2e.yml down --volumes
+	@echo "Finished E2E testing successfully."
+
+e2e-manual:
+	@echo "Starting E2E testing..."
+	@docker compose -f docker-compose.e2e.yml up -d
+	@pnpm playwright test --ui || (docker compose -f docker-compose.e2e.yml down --volumes && exit 1)
+	@docker compose -f docker-compose.e2e.yml down --volumes
+	@echo "Finished E2E testing successfully."

README.md

@@ -13,6 +13,7 @@
 
 [![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
 [![Docker Pulls](https://img.shields.io/docker/pulls/portabase/portabase?color=brightgreen)](https://hub.docker.com/r/portabase/portabase)
+[![Helm Chart](https://img.shields.io/badge/Helm-Kubernetes-326ce5?logo=helm&logoColor=white)](https://github.com/Portabase/portabase/pkgs/container/charts%2Fportabase)
 [![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)
 
@@ -21,8 +22,11 @@
 [![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/)
+[![Valkey](https://img.shields.io/badge/Valkey-6284fc?style=flat&logo=Valkey&logoColor=white)](https://valkey.io/)
+[![Firebird](https://img.shields.io/badge/Firebird-f55b14?style=flat&logo=Firebird&logoColor=white)](https://firebirdsql.org/)
+[![Microsoft SQL Server](https://img.shields.io/badge/Microsoft%20SQL%20Server-CC2927?style=flat&logo=microsoftsqlserver&logoColor=white)](https://www.microsoft.com/en-us/sql-server)
+
 [![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)
 
@@ -62,16 +66,17 @@ You have 4 ways to install Portabase:
 
 ## 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     |
+| Engine             | Support   | Supported Versions            | Restore |
+|:-------------------|:----------|:------------------------------|:--------|
+| **PostgreSQL**     | ✅ Stable  | 12, 13, 14, 15, 16, 17 and 18 | Yes     |
+| **MySQL**          | ✅ Stable  | 5.7, 8 and 9                  | Yes     |
+| **MariaDB**        | ✅ Stable  | 10 and 11                     | Yes     |
+| **MongoDB**        | ✅ Stable  | 4, 5, 6, 7 and 8              | Yes     |
+| **SQLite**         | ✅ Stable  | 3.x                           | Yes     |
+| **Redis**          | ✅ Stable  | 2.8+                          | No      |
+| **Valkey**         | ✅ Stable  | 7.2+                          | No      |
+| **Firebird**       | ✅ Stable  | 3.0, 4.0, 5.0                 | Yes     |
+| **MSSQL Server**   | ✅ Stable  | 2017, 2019, 2022, Azure SQL         | Yes     |
 
 See the [Database Servers documentation](https://portabase.io/docs/agent/db) for version-specific backup and restore details.
 

app/(auth)/forgot-password/page.tsx

@@ -1,7 +1,7 @@
 import { CardContent, CardHeader } from "@/components/ui/card";
 
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { ForgotPasswordForm } from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
+import { ForgotPasswordForm } from "@/features/auth/forgot-password-form";
 import { env } from "@/env.mjs";
 import { CardAuth } from "@/features/layout/card-auth";
 import { redirect } from "next/navigation";

app/(auth)/guard/page.tsx

@@ -1,6 +1,6 @@
 import {CardContent, CardHeader} from "@/components/ui/card";
 import {TooltipProvider} from "@/components/ui/tooltip";
-import {GuardForm} from "@/components/wrappers/auth/guard/guard-form";
+import {GuardForm} from "@/features/auth/guard-form";
 import {cookies} from "next/headers";
 import {redirect} from "next/navigation";
 import {CardAuth} from "@/features/layout/card-auth";

app/(auth)/layout.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { redirect } from "next/navigation";
 import { currentUser } from "@/lib/auth/current-user";
-import { AuthLogoSection } from "@/components/wrappers/auth/auth-logo-section";
+import { AuthLogoSection } from "@/features/auth/auth-logo-section";
 import { Heart } from "lucide-react";
 
 export default async function Layout({

app/(auth)/login/page.tsx

@@ -1,7 +1,7 @@
-import { LoginForm } from "@/components/wrappers/auth/login/login-form/login-form";
+import { LoginForm } from "@/features/auth/login-form";
 import { Metadata } from "next";
 import { SUPPORTED_PROVIDERS } from "@/lib/auth/config";
-import { SocialAuthButtons } from "@/components/wrappers/auth/social-buttons";
+import { SocialAuthButtons } from "@/features/auth/social-buttons";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { CardContent, CardHeader } from "@/components/ui/card";
 import Link from "next/link";

app/(auth)/register/page.tsx

@@ -1,5 +1,5 @@
 import { PageParams } from "@/types/next";
-import { RegisterForm } from "@/components/wrappers/auth/register/register-form/register-form";
+import { RegisterForm } from "@/features/auth/register-form";
 import { Metadata } from "next";
 import { redirect } from "next/navigation";
 import { env } from "@/env.mjs";

app/(auth)/reset-password/page.tsx

@@ -1,6 +1,6 @@
 import { CardContent, CardHeader } from "@/components/ui/card";
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { ResetPasswordForm } from "@/components/wrappers/auth/login/reset-password-form/reset-password-form";
+import { ResetPasswordForm } from "@/features/auth/reset-password-form";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth/auth";
 import { Avatar, AvatarImage, AvatarFallback } from "@radix-ui/react-avatar";

app/(customer)/dashboard/(admin)/admin/organizations/[organizationId]/page.tsx

@@ -4,7 +4,7 @@ import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {PageParams} from "@/types/next";
 import {Page} from "@/features/layout/page";
-import {OrganizationManagement} from "@/components/wrappers/dashboard/admin/organizations/organization/organization-management";
+import {OrganizationManagement} from "@/features/organizations/admin-organization-management";
 import {buildOrganizationWithMembers} from "@/utils/common";
 import {isUUID} from "@/utils/text";
 import {user} from "@/db/schema/02_user";

app/(customer)/dashboard/(admin)/admin/organizations/page.tsx

@@ -3,8 +3,8 @@ import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/
 import {db} from "@/db";
 import {
     AdminOrganizationAddModal
-} from "@/components/wrappers/dashboard/admin/organizations/organization/admin-organization-add-modal";
-import {AdminOrganizationList} from "@/components/wrappers/dashboard/admin/organizations/organization/admin-orgnization-list";
+} from "@/features/organizations/admin-organization-add-modal";
+import {AdminOrganizationList} from "@/features/organizations/admin-organization-list";
 import {isNull} from "drizzle-orm";
 
 export default async function RoutePage(props: PageParams<{}>) {

app/(customer)/dashboard/(admin)/admin/settings/page.tsx

@@ -1,20 +1,23 @@
 import {PageParams} from "@/types/next";
 import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {db} from "@/db";
+import {logger} from "@/lib/logger";
 import {notFound} from "next/navigation";
-import {SettingsTabs} from "@/components/wrappers/dashboard/admin/settings/settings-tabs";
+import {SettingsTabs} from "@/features/settings/settings-tabs";
 import {desc, isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {StorageChannelWith} from "@/db/schema/12_storage-channel";
 import {NotificationChannelWith} from "@/db/schema/09_notification-channel";
 
+const log = logger.child({module: "dashboard/admin/settings"});
+
 export default async function RoutePage(props: PageParams<{}>) {
 
     const settings = await db.query.setting.findFirst({
         where: (fields, {eq}) => eq(fields.name, "system"),
     });
 
-    console.log(settings)
+    log.debug({settings}, "Settings loaded");
 
     const storageChannels = await db.query.storageChannel.findMany({
         with: {
@@ -33,7 +36,7 @@ export default async function RoutePage(props: PageParams<{}>) {
     }) as NotificationChannelWith[]
 
 
-    if (!settings || !storageChannels || !notificationChannels ) {
+    if (!settings || !storageChannels || !notificationChannels) {
         notFound()
     }
 
@@ -45,7 +48,8 @@ export default async function RoutePage(props: PageParams<{}>) {
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">
-                <SettingsTabs storageChannels={storageChannels} notificationChannels={notificationChannels} settings={settings} />
+                <SettingsTabs storageChannels={storageChannels} notificationChannels={notificationChannels}
+                              settings={settings}/>
             </PageContent>
         </Page>
     );

app/(customer)/dashboard/(admin)/admin/users/page.tsx

@@ -2,8 +2,8 @@ import {PageParams} from "@/types/next";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {db} from "@/db";
 import {desc, isNull} from "drizzle-orm";
-import {AdminUserList} from "@/components/wrappers/dashboard/admin/users/admin-user-list";
-import {AdminUserAddModal} from "@/components/wrappers/dashboard/admin/users/admin-user-add-modal";
+import {AdminUserList} from "@/features/users/admin-user-list";
+import {AdminUserAddModal} from "@/features/users/admin-user-add-modal";
 import {SUPPORTED_PROVIDERS} from "@/lib/auth/config";
 
 export default async function RoutePage(props: PageParams<{}>) {
@@ -30,9 +30,11 @@ export default async function RoutePage(props: PageParams<{}>) {
             <PageHeader className="flex flex-col">
                 <div className="flex justify-between">
                     <PageTitle className="mb-3">Active users</PageTitle>
-                    <PageActions>
-                        <AdminUserAddModal organizations={organizations}/>
-                    </PageActions>
+                    {isPasswordAuthEnabled && (
+                        <PageActions>
+                            <AdminUserAddModal organizations={organizations}/>
+                        </PageActions>
+                    )}
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">

app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx

@@ -7,15 +7,15 @@ import {
 } from "@/features/layout/page";
 import { db } from "@/db";
 import * as drizzleDb from "@/db";
-import { eq } from "drizzle-orm";
+import {eq, isNull} from "drizzle-orm";
 import { notFound } from "next/navigation";
-import { ButtonDeleteAgent } from "@/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent";
+import { ButtonDeleteAgent } from "@/features/agents/agent-delete-button";
 import { capitalizeFirstLetter } from "@/utils/text";
 import { generateEdgeKey } from "@/utils/edge_key";
 import { getServerUrl } from "@/utils/get-server-url";
-import { AgentContentPage } from "@/components/wrappers/dashboard/agent/agent-content";
-import { AgentDialog } from "@/features/agents/components/agent.dialog";
-import { AgentType } from "@/features/agents/agents.schema";
+import { AgentContentPage } from "@/features/agents/agent-content";
+import { AgentDialog } from "@/features/agents/agent-dialog";
+
 
 export default async function RoutePage(
   props: PageParams<{ agentId: string }>,
@@ -26,13 +26,30 @@ export default async function RoutePage(
     where: eq(drizzleDb.schemas.agent.id, agentId),
     with: {
       databases: true,
+      organizations: true,
     },
   });
 
+  const organizations = await db.query.organization.findMany({
+    where: (fields) => isNull(fields.deletedAt),
+    with: {
+      members: true,
+    },
+  });
+
+
   if (!agent) {
     notFound();
   }
 
+  const isOwnerByAnOrganization = agent.organizationId
+
+  if (isOwnerByAnOrganization){
+    notFound();
+  }
+
+  const organizationIds = agent.organizations.map(org => org.organizationId)
+
   const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
 
   return (
@@ -45,12 +62,14 @@ export default async function RoutePage(
           <div className="flex items-center gap-2 md:justify-between w-full ">
             <div className="flex items-center gap-2">
               <AgentDialog
-                agent={agent as AgentType & { id: string }}
+                agent={agent}
                 typeTrigger={"edit"}
+                adminView={true}
+                organizations={organizations}
               />
             </div>
             <div className="flex items-center gap-2">
-              <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"} />
+              <ButtonDeleteAgent organizationIds={organizationIds} agentId={agentId} text={"Delete Agent"} />
             </div>
           </div>
         </PageTitle>

app/(customer)/dashboard/(admin)/agents/page.tsx

@@ -1,13 +1,13 @@
 import {PageParams} from "@/types/next";
-import {AgentCard} from "@/components/wrappers/dashboard/agent/agent-card/agent-card";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
+import {AgentCard} from "@/features/agents/agent-card";
+import {CardsWithPagination} from "@/components/common/cards-with-pagination";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
-import {desc, eq, not} from "drizzle-orm";
+import {and, desc, eq, isNull, not} from "drizzle-orm";
 import {Metadata} from "next";
-import {AgentDialog} from "@/features/agents/components/agent.dialog";
+import {AgentDialog} from "@/features/agents/agent-dialog";
 
 export const metadata: Metadata = {
     title: "Agents",
@@ -16,13 +16,13 @@ export const metadata: Metadata = {
 export default async function RoutePage(props: PageParams<{}>) {
 
     const agents = await db.query.agent.findMany({
-        where: not(eq(drizzleDb.schemas.agent.isArchived, true)),
+        where: and(not(eq(drizzleDb.schemas.agent.isArchived, true)),isNull(drizzleDb.schemas.agent.organizationId)),
         with: {
             databases: true
         },
         orderBy: (fields) => desc(fields.lastContact),
     });
-
+    
     if (!agents) {
         notFound();
     }

app/(customer)/dashboard/(admin)/notifications/channels/page.tsx

@@ -4,8 +4,8 @@ import {Metadata} from "next";
 import {db} from "@/db";
 import {notificationChannel, NotificationChannelWith} from "@/db/schema/09_notification-channel";
 import {desc, isNull} from "drizzle-orm";
-import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
-import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+import {ChannelsSection} from "@/features/channel/channels-section";
+import {ChannelAddEditModal} from "@/features/channel/channel-add-edit-modal";
 import * as drizzleDb from "@/db";
 
 export const metadata: Metadata = {

app/(customer)/dashboard/(admin)/notifications/logs/page.tsx

@@ -1,7 +1,7 @@
 import {PageParams} from "@/types/next";
 import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {Metadata} from "next";
-import {NotificationLogsList} from "@/components/wrappers/dashboard/admin/notifications/logs/notification-logs-list";
+import {NotificationLogsList} from "@/features/notifications/notification-logs-list";
 import {notFound} from "next/navigation";
 import {getNotificationHistory} from "@/db/services/notification-log";
 

app/(customer)/dashboard/(admin)/storages/channels/page.tsx

@@ -1,12 +1,12 @@
 import {PageParams} from "@/types/next";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {Metadata} from "next";
-import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
+import {ChannelsSection} from "@/features/channel/channels-section";
 import {db} from "@/db";
 import {desc, eq, isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {StorageChannelWith} from "@/db/schema/12_storage-channel";
-import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+import {ChannelAddEditModal} from "@/features/channel/channel-add-edit-modal";
 
 export const metadata: Metadata = {
     title: "Storage Channels",

app/(customer)/dashboard/(organization)/migration/page.tsx

@@ -0,0 +1,65 @@
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {notFound} from "next/navigation";
+import {getOrganization} from "@/lib/auth/auth";
+import {Metadata} from "next";
+import {db} from "@/db";
+import {MigrationTool} from "@/features/migration/migration-tool";
+
+export const metadata: Metadata = {
+    title: "Projects",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const organization = await getOrganization({});
+
+    if (!organization) {
+        notFound();
+    }
+
+    const projects = await db.query.project.findMany({
+        where: (project, {eq, and, not}) =>
+            and(
+                eq(project.organizationId, organization.id),
+                not(eq(project.isArchived, true))
+            ),
+        with: {
+            organization: true,
+            databases: {
+                where: (database, { isNull, not, inArray, and }) =>
+                    and(
+                        isNull(database.deletedAt),
+                        not(inArray(database.dbms, ["valkey", "redis"]))
+                    ),
+
+                with: {
+                    backups: {
+                        where: (backup, { isNull, eq, and }) =>
+                            and(
+                                isNull(backup.deletedAt),
+                                eq(backup.status, "success")
+                            ),
+                        orderBy: (backup, {desc}) => [desc(backup.createdAt)],
+                        limit: 15,
+                    }
+                }
+            },
+        },
+    });
+    return (
+        <Page>
+            <PageHeader className="flex flex-col items-start justify-between mb-6">
+                <PageTitle className="mb-2">
+                    Database Migration
+                </PageTitle>
+                <p className="text-sm text-muted-foreground">
+                    Import backups from a source project into your target database
+                </p>
+            </PageHeader>
+            <PageContent>
+                <MigrationTool projects={projects}/>
+            </PageContent>
+        </Page>
+    );
+}

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

@@ -4,10 +4,10 @@ import {Page} from "@/features/layout/page";
 import {db} from "@/db";
 import {eq, and, inArray} from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {getOrganizationProjectDatabases} from "@/lib/services";
+import {getOrganizationProjectDatabases} from "@/db/services/project";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
-import {DatabaseContent} from "@/components/wrappers/dashboard/projects/database/database-content";
+import {BackupModalProvider} from "@/features/database/backup-modal-context";
+import {DatabaseContent} from "@/features/database/database-content";
 import {getHealthLast12hLogs} from "@/db/services/healthcheck";
 
 export default async function RoutePage(props: PageParams<{

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

@@ -2,20 +2,19 @@ import {PageParams} from "@/types/next";
 import {Page, PageContent, PageTitle} from "@/features/layout/page";
 import {
     ButtonDeleteProject
-} from "@/components/wrappers/dashboard/projects/button-delete-project/button-delete-project";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {ProjectDatabaseCard} from "@/components/wrappers/dashboard/projects/project-card/project-database-card";
+} from "@/features/projects/project-delete-button";
+import {CardsWithPagination} from "@/components/common/cards-with-pagination";
+import {ProjectDatabaseCard} from "@/features/projects/project-database-card";
 import {notFound, redirect} from "next/navigation";
-
 import {db} from "@/db";
 import {eq} from "drizzle-orm";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import * as drizzleDb from "@/db";
 import {capitalizeFirstLetter} from "@/utils/text";
-import {ProjectDialog} from "@/features/projects/components/project.dialog";
-import {DatabaseWith} from "@/db/schema/07_database";
+import {ProjectDialog} from "@/features/projects/project-dialog";
 import {ProjectWith} from "@/db/schema/06_project";
 import {isUuidv4} from "@/utils/verify-uuid";
+import {getOrganizationAvailableDatabases} from "@/db/services/database";
 
 
 export default async function RoutePage(props: PageParams<{
@@ -56,19 +55,7 @@ export default async function RoutePage(props: PageParams<{
         redirect("/dashboard/projects");
     }
 
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    ) as DatabaseWith[];
-
+    const availableDatabases = await getOrganizationAvailableDatabases(organization.id, proj.id)
     const isMember = activeMember?.role === "member";
 
     return (
@@ -102,8 +89,9 @@ export default async function RoutePage(props: PageParams<{
                         organizationSlug={organization.slug}
                         // @ts-ignore
                         cardItem={ProjectDatabaseCard}
-                        cardsPerPage={6}
+                        cardsPerPage={20}
                         numberOfColumns={3}
+                        pageSizeOptions={[10, 20, 50]}
                         extendedProps={proj}
                     />
                 ) : (

app/(customer)/dashboard/(organization)/projects/page.tsx

@@ -1,14 +1,15 @@
 import {PageParams} from "@/types/next";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
+import {CardsWithPagination} from "@/components/common/cards-with-pagination";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectCard} from "@/components/wrappers/dashboard/projects/project-card/project-card";
+import {ProjectCard} from "@/features/projects/project-card";
 import {db} from "@/db";
 import {notFound} from "next/navigation";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
+import {EmptyStatePlaceholder} from "@/components/common/empty-state-placeholder";
 import {Metadata} from "next";
-import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {ProjectDialog} from "@/features/projects/project-dialog";
 import {DatabaseWith} from "@/db/schema/07_database";
+import {getOrganizationAvailableDatabases} from "@/db/services/database";
 
 export const metadata: Metadata = {
     title: "Projects",
@@ -35,18 +36,7 @@ export default async function RoutePage(props: PageParams<{}>) {
     });
     const isMember = activeMember?.role === "member";
 
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {isNull}) => isNull(db.projectId),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    ).filter((db) => db.project == null) as DatabaseWith[];
+    const availableDatabases = await getOrganizationAvailableDatabases(organization.id)
 
 
     return (
@@ -66,11 +56,12 @@ export default async function RoutePage(props: PageParams<{}>) {
                         organizationSlug={organization.slug}
                         data={projects}
                         cardItem={ProjectCard}
-                        cardsPerPage={9}
+                        cardsPerPage={12}
                         numberOfColumns={3}
+                        pageSizeOptions={[12, 24, 48]}
                     />
                 ) : isMember ? (
-                    <EmptyStatePlaceholder text="No project available"/>
+                    <EmptyStatePlaceholder state={"empty"} text="No project available"/>
                 ) : (
                     <ProjectDialog databases={availableDatabases} organization={organization} isEmpty={true}/>
                 )}

app/(customer)/dashboard/(organization)/settings/agents/[agentId]/page.tsx

@@ -0,0 +1,101 @@
+import {PageParams} from "@/types/next";
+import {
+    Page,
+    PageContent,
+    PageDescription,
+    PageTitle,
+} from "@/features/layout/page";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
+import {eq} from "drizzle-orm";
+import {notFound} from "next/navigation";
+import {ButtonDeleteAgent} from "@/features/agents/agent-delete-button";
+import {capitalizeFirstLetter} from "@/utils/text";
+import {generateEdgeKey} from "@/utils/edge_key";
+import {getServerUrl} from "@/utils/get-server-url";
+import {AgentContentPage} from "@/features/agents/agent-content";
+import {AgentDialog} from "@/features/agents/agent-dialog";
+import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+import {currentUser} from "@/lib/auth/current-user";
+import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
+
+
+export default async function RoutePage(
+    props: PageParams<{ agentId: string }>,
+) {
+    const {agentId} = await props.params;
+
+    const organization = await getOrganization({});
+    const user = await currentUser();
+    const activeMember = await getActiveMember();
+
+    if (!organization || !activeMember || !user) {
+        notFound();
+    }
+
+
+
+    const {canManageAgents} = computeOrganizationPermissions(activeMember);
+
+    if (!canManageAgents){
+        notFound();
+    }
+
+    const agent = await db.query.agent.findFirst({
+        where: eq(drizzleDb.schemas.agent.id, agentId),
+        with: {
+            databases: true,
+            organizations: true,
+        },
+    });
+
+
+    if (!agent) {
+        notFound();
+    }
+
+    const hasAccess =
+        agent.organizationId === organization.id ||
+        agent.organizations.some(org => org.organizationId === organization.id);
+
+    if (!hasAccess) {
+        notFound();
+    }
+
+    const isOwned = agent.organizationId
+    const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
+
+    return (
+        <Page>
+            <div className="justify-between gap-2 sm:flex">
+                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    <div className="min-w-full md:min-w-fit ">
+                        {capitalizeFirstLetter(agent.name)}
+                    </div>
+                    {isOwned && (
+                        <div className="flex items-center gap-2 md:justify-between w-full ">
+                            <div className="flex items-center gap-2">
+                                <AgentDialog
+                                    agent={agent}
+                                    typeTrigger={"edit"}
+                                />
+                            </div>
+                            <div className="flex items-center gap-2">
+                                <ButtonDeleteAgent organizationId={organization.id ?? null} agentId={agentId} text={"Delete Agent"}/>
+                            </div>
+                        </div>
+                    )}
+                </PageTitle>
+            </div>
+
+            {agent.description && (
+                <PageDescription className="mt-5 sm:mt-0">
+                    {agent.description}
+                </PageDescription>
+            )}
+            <PageContent className="flex flex-col w-full h-full justify-between gap-6">
+                <AgentContentPage agent={agent} edgeKey={edgeKey}/>
+            </PageContent>
+        </Page>
+    );
+}

app/(customer)/dashboard/(organization)/settings/agents/page.tsx

@@ -0,0 +1,5 @@
+import { redirect } from "next/navigation";
+
+export default async function RoutePage() {
+    redirect("/dashboard/settings?tab=agents");
+}

app/(customer)/dashboard/(organization)/settings/page.tsx

@@ -1,95 +1,114 @@
-import { PageParams } from "@/types/next";
+import {PageParams} from "@/types/next";
 import {
-  Page,
-  PageActions,
-  PageContent,
-  PageHeader,
-  PageTitle,
+    Page,
+    PageContent,
+    PageHeader,
+    PageTitle,
 } from "@/features/layout/page";
-import { currentUser } from "@/lib/auth/current-user";
-import { getActiveMember, getOrganization } from "@/lib/auth/auth";
-import { notFound } from "next/navigation";
-import { Metadata } from "next";
-import { OrganizationTabs } from "@/components/wrappers/dashboard/organization/tabs/organization-tabs";
-import { getOrganizationChannels } from "@/db/services/notification-channel";
-import { computeOrganizationPermissions } from "@/lib/acl/organization-acl";
-import { getOrganizationStorageChannels } from "@/db/services/storage-channel";
-import { DeleteOrganizationButton } from "@/components/wrappers/dashboard/organization/delete-organization-button";
-import { EditOrganizationDialog } from "@/features/organization/components/edit-organization.dialog";
-import { db } from "@/db";
-import { isNull } from "drizzle-orm";
+import {currentUser} from "@/lib/auth/current-user";
+import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+import {notFound} from "next/navigation";
+import {Metadata} from "next";
+import {OrganizationTabs} from "@/features/organizations/organization-tabs";
+import {getOrganizationChannels} from "@/db/services/notification-channel";
+import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
+import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
+import {DeleteOrganizationButton} from "@/features/organizations/organization-delete-button";
+import {EditOrganizationDialog} from "@/features/organizations/organization-edit-dialog";
+import {db} from "@/db";
+import {isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import { eq } from "drizzle-orm";
+import {eq} from "drizzle-orm";
+import {getOrganizationAgents} from "@/db/services/agent";
+import {Tooltip, TooltipContent, TooltipTrigger} from "@/components/ui/tooltip";
 
 export const metadata: Metadata = {
-  title: "Settings",
+    title: "Settings",
 };
 
 export default async function RoutePage(props: PageParams<{ slug: string }>) {
-  const organization = await getOrganization({});
-  const user = await currentUser();
-  const activeMember = await getActiveMember();
+    const organization = await getOrganization({});
+    const user = await currentUser();
+    const activeMember = await getActiveMember();
 
-  if (!organization || !activeMember || !user) {
-    notFound();
-  }
+    if (!organization || !activeMember || !user) {
+        notFound();
+    }
 
-  const notificationChannels = await getOrganizationChannels(organization.id);
-  const storageChannels = await getOrganizationStorageChannels(organization.id);
-  const permissions = computeOrganizationPermissions(activeMember);
+    const notificationChannels = await getOrganizationChannels(organization.id);
+    const storageChannels = await getOrganizationStorageChannels(organization.id);
+    const agents = await getOrganizationAgents(organization.id);
+    const permissions = computeOrganizationPermissions(activeMember);
 
-  const users = await db.query.user.findMany({
-    where: (fields) => isNull(fields.deletedAt),
-  });
+    const users = await db.query.user.findMany({
+        where: (fields) => isNull(fields.deletedAt),
+    });
 
-  const organizationWithMembers = await db.query.organization.findFirst({
-    where: eq(drizzleDb.schemas.organization.id, organization.id),
-    with: {
-      members: {
+    const organizationWithMembers = await db.query.organization.findFirst({
+        where: eq(drizzleDb.schemas.organization.id, organization.id),
         with: {
-          user: true,
+            projects: true,
+            members: {
+                with: {
+                    user: true,
+                },
+            },
         },
-      },
-    },
-  });
+    });
 
-  if (!organizationWithMembers) notFound();
+    if (!organizationWithMembers) notFound();
 
-  return (
-    <Page>
-      <PageHeader>
-        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-          <div className="min-w-full md:min-w-fit ">Organization settings</div>
-          <div className="flex items-center gap-2 md:justify-between w-full ">
-            <div className="flex items-center gap-2">
-              {permissions.canManageSettings &&
-                organization.slug !== "default" && (
-                  <EditOrganizationDialog
-                    organization={organizationWithMembers}
-                    users={users}
-                    currentUser={user}
-                  />
-                )}
-            </div>
-            <div className="flex items-center gap-2">
-              {permissions.canManageDangerZone &&
-                organization.slug !== "default" && (
-                  <DeleteOrganizationButton
-                    organizationSlug={organization.slug}
-                  />
-                )}
-            </div>
-          </div>
-        </PageTitle>
-      </PageHeader>
-      <PageContent>
-        <OrganizationTabs
-          activeMember={activeMember}
-          organization={organization}
-          notificationChannels={notificationChannels}
-          storageChannels={storageChannels}
-        />
-      </PageContent>
-    </Page>
-  );
+    return (
+        <Page>
+            <PageHeader>
+                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    <div className="min-w-full md:min-w-fit ">Organization settings</div>
+                    <div className="flex items-center gap-2 md:justify-between w-full ">
+                        <div className="flex items-center gap-2">
+                            {permissions.canManageSettings &&
+                                organization.slug !== "default" && (
+                                    <EditOrganizationDialog
+                                        organization={organizationWithMembers}
+                                        users={users}
+                                        currentUser={user}
+                                    />
+                                )}
+                        </div>
+                        <div className="flex items-center gap-2">
+                            {permissions.canManageDangerZone &&
+                                organization.slug !== "default" && (
+
+                                    <Tooltip>
+                                        <TooltipTrigger asChild>
+                                            <div>
+                                                <DeleteOrganizationButton
+                                                    disabled={organizationWithMembers.projects.length > 0}
+                                                    organizationSlug={organization.slug}
+                                                />
+                                            </div>
+
+                                        </TooltipTrigger>
+                                        {organizationWithMembers.projects.length > 0 && (
+                                            <TooltipContent>
+                                                <p>Your organization has some projects associated with it. Please delete them before deleting the organization.</p>
+                                            </TooltipContent>
+                                        )}
+                                    </Tooltip>
+
+                                )}
+                        </div>
+                    </div>
+                </PageTitle>
+            </PageHeader>
+            <PageContent>
+                <OrganizationTabs
+                    activeMember={activeMember}
+                    organization={organization}
+                    notificationChannels={notificationChannels}
+                    storageChannels={storageChannels}
+                    agents={agents}
+                />
+            </PageContent>
+        </Page>
+    );
 }

app/(customer)/dashboard/(organization)/statistics/page.tsx

@@ -1,8 +1,8 @@
 import {PageParams} from "@/types/next";
 import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
-import {EvolutionLineChart} from "@/components/wrappers/dashboard/statistics/charts/evolution-line-chart";
-import {PercentageLineChart} from "@/components/wrappers/dashboard/statistics/charts/percentage-line-chart";
+import {EvolutionLineChart} from "@/features/statistics/evolution-line-chart";
+import {PercentageLineChart} from "@/features/statistics/percentage-line-chart";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import {and, asc, count, eq, inArray} from "drizzle-orm";

app/(customer)/dashboard/home/page.tsx

@@ -5,7 +5,7 @@ import {Building2, Database, DatabaseBackup, Folder, RefreshCcw, Server, Workflo
 import {currentUser} from "@/lib/auth/current-user";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
-import {asc, inArray} from "drizzle-orm";
+import {and, asc, eq, inArray} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {listOrganizations} from "@/lib/auth/auth";
 import {Metadata} from "next";
@@ -26,7 +26,7 @@ export default async function RoutePage(props: PageParams<{}>) {
     const agents = await db.query.agent.findMany({});
 
     const projects = await db.query.project.findMany({
-        where: inArray(drizzleDb.schemas.project.organizationId, organizationIds),
+        where: and(inArray(drizzleDb.schemas.project.organizationId, organizationIds), eq(drizzleDb.schemas.project.isArchived, false)),
     });
 
     const projectIds = projects.map(project => project.id);

app/(customer)/dashboard/layout.tsx

@@ -2,10 +2,12 @@ import { ReactNode } from "react";
 import { redirect } from "next/navigation";
 
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
-import { AppSidebar } from "@/components/wrappers/dashboard/common/sidebar/app-sidebar";
-import { Header } from "@/features/layout/Header";
+import { AppSidebar } from "@/features/layout/app-sidebar";
+import { Header } from "@/features/layout/header";
 import { currentUser } from "@/lib/auth/current-user";
-import { ThemeMetaUpdater } from "@/features/browser/theme-meta-updater";
+import { ThemeMetaUpdater } from "@/features/theme/theme-meta-updater";
+import { ModeToggle } from "@/features/theme/mode-toggle";
+import { UpdateNotification } from "@/features/updates/update-notification";
 
 export default async function Layout({ children }: { children: ReactNode }) {
   const user = await currentUser();
@@ -15,9 +17,9 @@ export default async function Layout({ children }: { children: ReactNode }) {
     <SidebarProvider>
       <div className="flex flex-col lg:flex-row w-full">
         <ThemeMetaUpdater />
-        <AppSidebar />
+        <AppSidebar updateNotification={<UpdateNotification />} />
         <SidebarInset>
-          <Header />
+          <Header actions={<ModeToggle />} />
           <main className="h-full">{children}</main>
         </SidebarInset>
       </div>

app/(customer)/dashboard/loading.tsx

@@ -1,4 +1,4 @@
-import { LoadingSpinner } from "@/components/wrappers/common/loading/loading-spinner";
+import { LoadingSpinner } from "@/components/common/loading-spinner";
 
 export default function Loading() {
     return (

app/(landing)/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { getCurrentOrganizationSlug } from "@/features/dashboard/organization-cookie";
+import { getCurrentOrganizationSlug } from "@/features/organizations/organization-cookie";
 import { currentUser } from "@/lib/auth/current-user";
 
 export default async function Index() {
@@ -9,8 +9,4 @@ export default async function Index() {
         redirect(`/dashboard/home`);
     }
     redirect("/login");
-    //Do not delete
-    // return (
-    //     <Home/>
-    // );
 }

app/api/agent/[agentId]/backup/helpers.ts

@@ -1,7 +1,10 @@
-import { NextResponse } from "next/server";
-import { eq } from "drizzle-orm";
-import { db } from "@/db";
+import {NextResponse} from "next/server";
+import {and, eq} from "drizzle-orm";
+import {db} from "@/db";
 import * as drizzleDb from "@/db";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/helpers"});
 
 export function withAgentCheck(handler: Function) {
     return async (request: Request, context: { params: Promise<{ agentId: string }> }) => {
@@ -9,28 +12,27 @@ export function withAgentCheck(handler: Function) {
             const agentId = (await context.params).agentId;
 
             const agent = await db.query.agent.findFirst({
-                where: eq(drizzleDb.schemas.agent.id, agentId),
+                where: and(eq(drizzleDb.schemas.agent.id, agentId), eq(drizzleDb.schemas.agent.isArchived, false)),
             });
 
             if (!agent) {
                 return NextResponse.json(
-                    { error: "Agent not found" },
-                    { status: 404 }
+                    {error: "Agent not found"},
+                    {status: 404}
                 );
             }
 
-            return handler(request, { ...context, agent });
+            return handler(request, {...context, agent});
         } catch (err) {
-            console.error("Error in agent middleware:", err);
+            log.error({error: err, name: "withAgentCheck"}, "Error in agent middleware");
             return NextResponse.json(
-                { error: "Internal server error" },
-                { status: 500 }
+                {error: "Internal server error"},
+                {status: 500}
             );
         }
     };
 }
 
-
 export async function getDatabaseOrThrow(generatedId: string) {
     const database = await db.query.database.findFirst({
         where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
@@ -43,8 +45,8 @@ export async function getDatabaseOrThrow(generatedId: string) {
 
     if (!database) {
         throw NextResponse.json(
-            { error: "Database associated with generatedId not found" },
-            { status: 404 }
+            {error: "Database associated with generatedId not found"},
+            {status: 404}
         );
     }
 

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

@@ -5,9 +5,12 @@ import {db as dbClient, db} from "@/db";
 import {getDatabaseOrThrow, withAgentCheck} from "./helpers";
 import {Backup} from "@/db/schema/07_database";
 import {withUpdatedAt} from "@/db/utils";
-import {eventEmitter} from "@/features/shared/event";
-import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
-import {EventKind} from "@/features/notifications/types";
+import {eventEmitter} from "@/lib/event";
+import {sendNotificationsBackupRestore} from "@/features/notifications/notifications.helpers";
+import {EventKind} from "@/features/notifications/notifications.types";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/route"});
 
 export type BodyPost = {
     method: "manual" | "automatic"
@@ -77,7 +80,6 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
             }
         }
 
-
         eventEmitter.emit('modification', {update: true});
 
         return NextResponse.json(
@@ -88,7 +90,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
             {status: 200}
         );
     } catch (error) {
-        console.error("Error in POST for INIT backup:", error);
+        log.error({error: error}, "Error in POST for INIT backup");
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}
@@ -102,7 +104,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
 }) => {
     try {
         const body: BodyPatch = await request.json();
-        console.log("body", body);
+        log.info({data: body}, "Body from PATH in backup route");
 
         const status = body.status
         const backupId = body.backupId
@@ -142,9 +144,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
             {status: 200}
         );
     } catch (error) {
-
-
-        console.error("Error in PATCH backup:", error);
+        log.error({error: error}, "Error in PATCH backup")
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}

app/api/agent/[agentId]/backup/upload/init/route.ts

@@ -4,7 +4,10 @@ import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
 import {isUuidv4} from "@/utils/verify-uuid";
-import {eventEmitter} from "@/features/shared/event";
+import {eventEmitter} from "@/lib/event";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/upload/init"});
 
 export type Body = {
     generatedId: string
@@ -18,7 +21,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
     try {
         const body: Body = await request.json();
 
-        console.log("body", body);
+        log.info({data: body}, "Body for backup upload init");
 
         const generatedId = body.generatedId;
         const storageChannelId = body.storageChannelId;
@@ -66,7 +69,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
             {status: 200}
         );
     } catch (error) {
-        console.error("Error in POST for INIT backup:", error);
+        log.error({error: error}, "Error in POST for INIT backup");
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}

app/api/agent/[agentId]/backup/upload/status/route.ts

@@ -4,7 +4,10 @@ import * as drizzleDb from "@/db";
 import {db as dbClient, db} from "@/db";
 import {withUpdatedAt} from "@/db/utils";
 import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
-import {eventEmitter} from "@/features/shared/event";
+import {eventEmitter} from "@/lib/event";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/upload/status"});
 
 export type Body = {
     generatedId: string
@@ -27,8 +30,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
         const backupStorageId = body.backupStorageId;
         const backupId = body.backupId;
 
-
-        console.log("body", body);
+        log.info({data: body}, "Body for backup upload status");
 
         const database = await getDatabaseOrThrow(generatedId);
 
@@ -68,10 +70,10 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
             if (hasSuccessfulStorage && backup.status !== "success") {
                 await db
                     .update(drizzleDb.schemas.backup)
-                    .set({
+                    .set(withUpdatedAt({
                         status: "success",
                         fileSize: fileSize,
-                    })
+                    }))
                     .where(eq(drizzleDb.schemas.backup.id, backup.id));
             }
         }
@@ -85,7 +87,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
             {status: 200}
         );
     } catch (error) {
-        console.error("Error in POST for INIT backup:", error);
+        log.error({error: error},"Error in POST for INIT backup");
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}

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

@@ -3,8 +3,11 @@ import {isUuidv4} from "@/utils/verify-uuid";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {and, eq} from "drizzle-orm";
-import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
-import {eventEmitter} from "@/features/shared/event";
+import {sendNotificationsBackupRestore} from "@/features/notifications/notifications.helpers";
+import {logger} from "@/lib/logger";
+import {withUpdatedAt} from "@/db/utils";
+
+const log = logger.child({module: "api/agent/restore"});
 
 export type BodyResultRestore = {
     generatedId: string
@@ -32,7 +35,7 @@ export async function POST(
         }
 
         const agent = await db.query.agent.findFirst({
-            where: eq(drizzleDb.schemas.agent.id, agentId)
+            where: and(eq(drizzleDb.schemas.agent.id, agentId), eq(drizzleDb.schemas.agent.isArchived, false)),
         })
         if (!agent) {
             return NextResponse.json({error: "Agent not found"}, {status: 404})
@@ -60,7 +63,7 @@ export async function POST(
 
         await db
             .update(drizzleDb.schemas.restoration)
-            .set({status: body.status as RestorationStatus})
+            .set(withUpdatedAt({status: body.status as RestorationStatus}))
             .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
 
         await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
@@ -70,10 +73,9 @@ export async function POST(
             message: "Restoration successfully updated"
         }
 
-
         return Response.json(response, {status: 200})
     } catch (error) {
-        console.error('Error in POST handler:', error);
+        log.error({error: error}, "Error in POST handler")
         return NextResponse.json(
             {error: 'Internal server error'},
             {status: 500}

app/api/agent/[agentId]/status/helpers.ts

@@ -2,15 +2,18 @@ import {NextResponse} from "next/server";
 import {Body} from "./route";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {Agent} from "@/db/schema/08_agent";
-import {Database, DatabaseWith} from "@/db/schema/07_database";
+import {DatabaseWith} from "@/db/schema/07_database";
 import * as drizzleDb from "@/db";
 import {db, db as dbClient} from "@/db";
 import {and, eq, inArray} from "drizzle-orm";
 import {dbmsEnumSchema, EDbmsSchema} from "@/db/schema/types";
 import {withUpdatedAt} from "@/db/utils";
-import type {StorageInput} from "@/features/storages/types";
-import {dispatchStorage} from "@/features/storages/dispatch";
+import type {StorageInput} from "@/features/storages/storages.types";
+import {dispatchStorage} from "@/features/storages/storages.dispatch";
 import {Setting} from "@/db/schema/01_setting";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/status/helpers"});
 
 export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) {
     const databasesResponse = [];
@@ -56,7 +59,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             }
 
             if (!dbmsEnumSchema.safeParse(db.dbms).success) {
-                console.log(`Database type not available: ${db.dbms}`);
+                log.error({name: "handleDatabases"},`Database type not available: ${db.dbms}`);
                 continue;
             }
 
@@ -85,7 +88,6 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                         date: lastContact
                     })
 
-
                 const storages = await getDatabaseStorageChannels(databaseCreated.id)
 
                 databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null));
@@ -181,25 +183,25 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     } else {
                         await dbClient
                             .update(drizzleDb.schemas.restoration)
-                            .set({status: "failed"})
+                            .set(withUpdatedAt({status: "failed"}))
                             .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
 
                         const errorMessage = "Failed to get backup URL";
-                        console.error("Restoration failed: ", errorMessage);
+                        log.error({error: errorMessage, name: "handleDatabases"}, "Restoration failed");
                         continue;
                     }
                 } catch (err) {
-                    console.error("Restoration crashed unexpectedly:", err);
+                    log.error({error: err, name: "handleDatabases"}, "Restoration crashed unexpectedly");
                     await dbClient
                         .update(drizzleDb.schemas.restoration)
-                        .set({status: "failed"})
+                        .set(withUpdatedAt({status: "failed"}))
                         .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
                     continue;
                 }
 
                 await dbClient
                     .update(drizzleDb.schemas.restoration)
-                    .set({status: "ongoing"})
+                    .set(withUpdatedAt({status: "ongoing"}))
                     .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
             }
             const storages = await getDatabaseStorageChannels(databaseUpdated.id)

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

@@ -3,11 +3,14 @@ import {handleDatabases} from "./helpers";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {EDbmsSchema} from "@/db/schema/types";
-import {eq} from "drizzle-orm";
+import {and, eq} from "drizzle-orm";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {withUpdatedAt} from "@/db/utils";
-import {eventEmitter} from "@/features/shared/event";
-import {notFound} from "next/navigation";
+import {logger} from "@/lib/logger";
+
+
+const log = logger.child({module: "api/agent/status/route"});
+
 
 export type databaseAgent = {
     name: string,
@@ -28,14 +31,14 @@ export async function POST(
 ) {
     try {
         const agentId = (await params).agentId
-        console.log(agentId)
+        log.debug(`Agent ID: ${agentId}`)
         const body: Body = await request.json();
         const lastContact = new Date();
         let message: string
 
         if (!isUuidv4(agentId)) {
             message = "agentId is not a valid uuid"
-            console.error(message)
+            log.error({error: message}, "An error occurred")
             return NextResponse.json(
                 {error: "agentId is not a valid uuid"},
                 {status: 500}
@@ -43,7 +46,7 @@ export async function POST(
         }
 
         const agent = await db.query.agent.findFirst({
-            where: eq(drizzleDb.schemas.agent.id, agentId),
+            where: and(eq(drizzleDb.schemas.agent.id, agentId), eq(drizzleDb.schemas.agent.isArchived, false)),
         })
 
         if (!agent) {
@@ -56,7 +59,6 @@ export async function POST(
             return NextResponse.json({error: "An error occured"}, {status: 404})
         }
 
-
         const databasesResponse = await handleDatabases(body, agent, lastContact, settings)
 
         await db
@@ -85,10 +87,9 @@ export async function POST(
             databases: databasesResponse
         }
 
-
         return Response.json(response)
     } catch (error) {
-        console.error('Error in POST handler:', error);
+        log.error({error: error}, "Error in POST handler")
         return NextResponse.json(
             {error: 'Internal server error'},
             {status: 500}

app/api/auth/[...all]/route.ts

@@ -1,4 +1,35 @@
 import { auth } from "@/lib/auth/auth";
 import { toNextJsHandler } from "better-auth/next-js";
+import { NextRequest, NextResponse } from "next/server";
+import { headers } from "next/headers";
 
-export const { GET, POST } = toNextJsHandler(auth.handler);
+const authHandler = toNextJsHandler(auth.handler);
+
+async function blockApiKeyCreateForRestrictedUsers(req: NextRequest): Promise<NextResponse | null> {
+    const url = req.nextUrl;
+    if (req.method !== "POST" || !url.pathname.endsWith("/api-key/create")) {
+        return null;
+    }
+    const session = await auth.api.getSession({ headers: await headers() });
+    if (!session?.user) {
+        return null;
+    }
+    // @ts-ignore
+    if (session.user.banned || (session.user.role as string) === "pending") {
+        return NextResponse.json(
+            { error: "Account not eligible to create API keys" },
+            { status: 403 }
+        );
+    }
+    return null;
+}
+
+export async function GET(req: NextRequest) {
+    return authHandler.GET(req);
+}
+
+export async function POST(req: NextRequest) {
+    const guard = await blockApiKeyCreateForRestrictedUsers(req);
+    if (guard) return guard;
+    return authHandler.POST(req);
+}

app/api/config/route.ts

@@ -4,6 +4,6 @@ export async function GET() {
   return NextResponse.json({
     PROJECT_URL: process.env.PROJECT_URL,
     PROJECT_NAME: process.env.PROJECT_NAME,
-    PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION,
+    PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION
   });
 }

app/api/events/route.ts

@@ -1,7 +1,10 @@
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
 import {NextResponse} from "next/server";
-import {eventEmitter} from "@/features/shared/event";
+import {eventEmitter} from "@/lib/event";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/events"});
 
 export async function GET(request: Request) {
 
@@ -16,9 +19,9 @@ export async function GET(request: Request) {
     return new Response(
         new ReadableStream({
             start(controller) {
-                console.log('Stream started');
+                log.info("Stream started");
                 const handleModification = (data: any) => {
-                    console.log('Modification event triggered:', data);
+                    log.info({data: data},"Modification event triggered");
                     controller.enqueue(`event: modification\n`);
                     controller.enqueue(`data: ${JSON.stringify(data)}\n\n`);
                 };
@@ -26,7 +29,7 @@ export async function GET(request: Request) {
                 eventEmitter.on('modification', handleModification);
 
                 request.signal.addEventListener('abort', () => {
-                    console.log('Client disconnected');
+                    log.info("Client disconnected");
                     controller.close();
                     eventEmitter.off('modification', handleModification);
                 });

app/api/files/backups/route.ts

@@ -1,8 +1,11 @@
 import {NextResponse} from "next/server";
 import path from "path";
-import type {StorageInput} from "@/features/storages/types";
-import {dispatchStorage} from "@/features/storages/dispatch";
+import type {StorageInput} from "@/features/storages/storages.types";
+import {dispatchStorage} from "@/features/storages/storages.dispatch";
 import {Readable} from "node:stream";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/files/backups"});
 
 export async function GET(
     request: Request,
@@ -30,7 +33,7 @@ export async function GET(
         }
     };
 
-    console.debug(input);
+    log.info({input: input}, "Dispatch Storage");
 
     const result = await dispatchStorage(input, undefined, storageId);
 

app/api/files/images/[fileName]/route.ts

@@ -1,12 +1,12 @@
 import {NextResponse} from "next/server";
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
-import {db} from "@/db";
-import * as drizzleDb from "@/db";
-import {eq} from "drizzle-orm";
-import {StorageInput} from "@/features/storages/types";
-import {dispatchStorage} from "@/features/storages/dispatch";
+import {StorageInput} from "@/features/storages/storages.types";
+import {dispatchStorage} from "@/features/storages/storages.dispatch";
 import {Readable} from "node:stream";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/files/images"});
 
 export async function GET(
     req: Request,
@@ -56,7 +56,7 @@ export async function GET(
         const result = await dispatchStorage(input, undefined, storageId);
 
         if (!result.file || !(result.file instanceof Readable)) {
-            console.error(`An error occurred while getting file :`, result);
+            log.error({error: result}, `An error occurred while getting file`);
             return NextResponse.json(
                 {error: "Invalid file payload"},
                 {status: 500}
@@ -82,7 +82,7 @@ export async function GET(
         });
 
     } catch (err) {
-        console.error("Error streaming image:", err);
+        log.error({error: err}, `Error streaming image`);
         return NextResponse.json({error: "Error fetching file"}, {status: 500});
     }
 }

app/api/health/route.ts

@@ -0,0 +1,5 @@
+import { NextResponse } from "next/server";
+
+export async function GET() {
+  return NextResponse.json({ success: true });
+}

app/api/tus/hooks/route.ts

@@ -2,7 +2,9 @@ import {NextResponse} from "next/server";
 import fs from "fs";
 import path from "path";
 import {env} from "@/env.mjs";
+import {logger} from "@/lib/logger";
 
+const log = logger.child({module: "api/tus/hooks"});
 
 export async function POST(request: Request) {
     try {
@@ -13,7 +15,7 @@ export async function POST(request: Request) {
         const uploadOffset = headers["Upload-Offset"]?.[0];
         const status = headers["X-Status"]?.[0];
 
-        console.log(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
+        log.info(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
 
         if (status === "success") {
             if (
@@ -29,9 +31,7 @@ export async function POST(request: Request) {
                     return NextResponse.json({error: "Missing X-File-Path"}, {status: 500});
                 }
 
-
-                // const uploadDir = path.join(process.cwd(), "/private/uploads/");
-                const uploadDir = path.join(env.PRIVATE_PATH, "/uploads/");
+                const uploadDir = path.join(env.PRIVATE_PATH!, "/uploads/");
 
                 const oldFilePath = path.join(uploadDir, "tmp", id);
                 const newFilePath = path.join(uploadDir, filePath);
@@ -74,7 +74,7 @@ export async function POST(request: Request) {
         }
         return NextResponse.json({});
     } catch (error) {
-        console.error("Hook error:", error);
+        log.error({error: error},"TUS Hook error");
         return NextResponse.json({error: "Internal server error"}, {status: 500});
     }
 }

app/api/v1/agents/[id]/key/route.ts

@@ -0,0 +1,34 @@
+import {withApiKey} from "@/lib/api-v1/middleware";
+import {ApiKeyContext} from "@/lib/api-v1/types";
+import {NextResponse} from "next/server";
+import {getAgent, resolveAgentAccess} from "@/lib/api-v1/services/agents";
+import {logger} from "@/lib/logger";
+import {generateEdgeKey} from "@/utils/edge_key";
+import {getServerUrl} from "@/utils/get-server-url";
+
+const log = logger.child({ module: "api/v1/agents/[id]/key" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+        try {
+            const id = params?.id;
+            if (!id) return NextResponse.json({ error: "Not found" }, { status: 404 });
+
+            const access = await resolveAgentAccess(id, ctx.user);
+
+            if (access === "forbidden") return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+            if (access === "not_found") return NextResponse.json({ error: "Not found" }, { status: 404 });
+
+            const agent = await getAgent(id);
+
+            if (!agent) return NextResponse.json({ error: "Agent not found" }, { status: 404 });
+
+            const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
+
+            return NextResponse.json({ data: edgeKey });
+        } catch (error) {
+            log.error({ error }, "Error in GET /api/v1/agents/[id]");
+            return NextResponse.json({ error: "Internal server error" }, { status: 500 });
+        }
+    }
+);

app/api/v1/agents/[id]/route.ts

@@ -0,0 +1,77 @@
+import {NextResponse} from "next/server";
+import {withApiKey} from "@/lib/api-v1/middleware";
+import {logger} from "@/lib/logger";
+import {ApiKeyContext} from "@/lib/api-v1/types";
+import {getAgent, resolveAgentAccess} from "@/lib/api-v1/services/agents";
+import {deleteAgentService} from "@/features/agents/agent-delete.action";
+
+const log = logger.child({module: "api/v1/agents/[id]"});
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+        try {
+            const id = params?.id;
+            if (!id) return NextResponse.json({error: "Not found"}, {status: 404});
+
+            const access = await resolveAgentAccess(id, ctx.user);
+
+            if (access === "forbidden") return NextResponse.json({error: "Forbidden"}, {status: 403});
+            if (access === "not_found") return NextResponse.json({error: "Not found"}, {status: 404});
+
+            const agent = await getAgent(id, {
+                includeDatabases: true,
+                includeOrganizations: false,
+            });
+
+            if (!agent) return NextResponse.json({error: "Not found"}, {status: 404});
+            return NextResponse.json({data: agent});
+        } catch (error) {
+            log.error({error}, "Error in GET /api/v1/agents/[id]");
+            return NextResponse.json({error: "Internal server error"}, {status: 500});
+        }
+    }
+);
+
+export const DELETE = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+        try {
+            const id = params?.id;
+            if (!id) return NextResponse.json({error: "Not found"}, {status: 404});
+
+            const access = await resolveAgentAccess(id, ctx.user);
+            if (access === "forbidden") return NextResponse.json({error: "Forbidden"}, {status: 403});
+            if (access === "not_found") return NextResponse.json({error: "Not found"}, {status: 404});
+
+
+            const agent = await getAgent(id, {
+                includeDatabases: false,
+                includeOrganizations: true,
+            });
+
+            if (!agent) return NextResponse.json({error: "Agent no found"}, {status: 404});
+
+            const organizationIds = agent.organizations.map(org => org.organizationId)
+
+            const canDeleteGlobalAgent =
+                ctx.user.permissions.isAdmin || ctx.user.permissions.isSuperAdmin;
+
+            if (!agent.organizationId && !canDeleteGlobalAgent) {
+                return NextResponse.json(
+                    { error: "Forbidden" },
+                    { status: 403 }
+                );
+            }
+
+            await deleteAgentService({
+                agentId: agent.id,
+                organizationId: agent.organizationId ?? undefined,
+                organizationIds: organizationIds
+            });
+
+            return new Response(null, {status: 204});
+        } catch (error) {
+            log.error({error}, "Error in DELETE /api/v1/agents/[id]");
+            return NextResponse.json({error: "Internal server error"}, {status: 500});
+        }
+    }
+);

app/api/v1/agents/route.ts

@@ -0,0 +1,112 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { inArray, eq, and, or, isNull } from "drizzle-orm";
+import { z } from "zod";
+import { logger } from "@/lib/logger";
+import {createAgentService} from "@/features/agents/agents.action";
+import { ActionError } from "@/lib/safe-actions/actions";
+import {getAccessibleAgentIds} from "@/lib/api-v1/services/agents";
+import {ApiKeyContext} from "@/lib/api-v1/types";
+import {parseJsonBody} from "@/lib/api-v1/validation/json-body";
+
+const log = logger.child({ module: "api/v1/agents" });
+
+export const GET = withApiKey(async (_req: Request, ctx: ApiKeyContext) => {
+  try {
+    const agentIds = await getAccessibleAgentIds(ctx.user);
+
+    if (agentIds.length === 0) {
+      return NextResponse.json({ data: [] });
+    }
+
+    const agents = await db.query.agent.findMany({
+      where: and(
+        inArray(drizzleDb.schemas.agent.id, agentIds),
+        or(
+          eq(drizzleDb.schemas.agent.isArchived, false),
+          isNull(drizzleDb.schemas.agent.isArchived)
+        )
+      ),
+    });
+
+    return NextResponse.json({ data: agents });
+  } catch (error) {
+    log.error({ error }, "Error in GET /api/v1/agents");
+    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
+  }
+});
+
+const CreateAgentSchema = z.object({
+  name: z.string().min(1, "name is required"),
+  organizationId: z.string().uuid("organizationId must be a valid UUID").optional(),
+});
+
+export const POST = withApiKey(
+    async (req: Request, ctx: ApiKeyContext) => {
+      try {
+
+        const body = await parseJsonBody(req, CreateAgentSchema);
+
+        if (!body.ok) {
+          return body.response;
+        }
+
+        const { name, organizationId } = body.data;
+
+        const org = ctx.organizations.find(
+            (org) => org.id === organizationId
+        );
+
+        if (
+            organizationId &&
+            (!org || !org.permissions.canManageAgents)
+        ) {
+          return NextResponse.json(
+              { error: "Forbidden" },
+              { status: 403 }
+          );
+        }
+
+        const canCreateGlobalAgent =
+            ctx.user.permissions.isAdmin || ctx.user.permissions.isSuperAdmin;
+
+        if (!organizationId && !canCreateGlobalAgent) {
+          return NextResponse.json(
+              { error: "Forbidden" },
+              { status: 403 }
+          );
+        }
+
+        const createdAgent = await createAgentService({
+          organizationId,
+          data: {
+            name,
+            description: "",
+          },
+        });
+
+        return NextResponse.json(
+            { data: createdAgent },
+            { status: 201 }
+        );
+      } catch (error: unknown) {
+        if (error instanceof ActionError) {
+          return NextResponse.json(
+              { error: error.message },
+              { status: 400 }
+          );
+        }
+
+        log.error({error},
+            "Error in POST /api/v1/agents"
+        );
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/backup/[backupId]/route.ts

@@ -0,0 +1,61 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { and, eq, isNull } from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({
+  module: "api/v1/databases/[id]/backup/[backupId]",
+});
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+        const backupId = params?.backupId;
+
+        if (!backupId) {
+          return NextResponse.json({ error: "Not found" }, { status: 404 });
+        }
+
+        const backup = await db.query.backup.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backup.id, backupId),
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              isNull(drizzleDb.schemas.backup.deletedAt)
+          ),
+          with: {
+            storages: {
+              where: (backupStorage, { isNull }) =>
+                  isNull(backupStorage.deletedAt),
+            },
+          },
+        });
+
+        if (!backup) {
+          return NextResponse.json({ error: "Not found" }, { status: 404 });
+        }
+
+        return NextResponse.json({ data: backup });
+      } catch (error) {
+        log.error(
+            { error },
+            "Error in GET /api/v1/databases/[id]/backup/[backupId]"
+        );
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/backup/route.ts

@@ -0,0 +1,96 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import {and, desc, eq, inArray, isNull} from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]/backup" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const backups = await db.query.backup.findMany({
+          where: and(
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              isNull(drizzleDb.schemas.backup.deletedAt)
+          ),
+          orderBy: [desc(drizzleDb.schemas.backup.createdAt)],
+        });
+
+        return NextResponse.json({ data: backups });
+      } catch (error) {
+        log.error({ error }, "Error in GET /api/v1/databases/[id]/backup");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);
+
+export const POST = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const existingBackup = await db.query.backup.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              inArray(drizzleDb.schemas.backup.status, ["waiting", "ongoing"])
+          ),
+        });
+
+        if (existingBackup) {
+          return NextResponse.json(
+              {
+                error:
+                    "A backup is already waiting or ongoing for this database",
+              },
+              { status: 409 }
+          );
+        }
+
+        const [createdBackup] = await db
+            .insert(drizzleDb.schemas.backup)
+            .values({
+              databaseId: id,
+              status: "waiting",
+            })
+            .returning();
+
+        if (!createdBackup) {
+          return NextResponse.json(
+              { error: "Failed to create backup" },
+              { status: 500 }
+          );
+        }
+
+        return NextResponse.json({ data: createdBackup }, { status: 201 });
+      } catch (error) {
+        log.error({ error }, "Error in POST /api/v1/databases/[id]/backup");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/restore/route.ts

@@ -0,0 +1,122 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import {and, eq, inArray, isNull} from "drizzle-orm";
+import { z } from "zod";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import { parseJsonBody } from "@/lib/api-v1/validation/json-body";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]/restore" });
+
+const RestoreSchema = z.object({
+  backupId: z.string().uuid("backupId must be a valid UUID"),
+  backupStorageId: z.string().uuid("backupStorageId must be a valid UUID"),
+});
+
+export const POST = withApiKey(
+    async (req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const body = await parseJsonBody(req, RestoreSchema);
+
+        if (!body.ok) {
+          return body.response;
+        }
+
+        const { backupId, backupStorageId } = body.data;
+
+        const backupRecord = await db.query.backup.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backup.id, backupId),
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              isNull(drizzleDb.schemas.backup.deletedAt)
+          ),
+          columns: {
+            id: true,
+          },
+        });
+
+        if (!backupRecord) {
+          return NextResponse.json(
+              { error: "Backup not found for this database" },
+              { status: 404 }
+          );
+        }
+
+        const backupStorage = await db.query.backupStorage.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backupStorage.id, backupStorageId),
+              eq(drizzleDb.schemas.backupStorage.backupId, backupId),
+              isNull(drizzleDb.schemas.backupStorage.deletedAt)
+          ),
+        });
+
+        if (!backupStorage) {
+          return NextResponse.json(
+              { error: "Backup storage not found" },
+              { status: 404 }
+          );
+        }
+
+        if (backupStorage.status !== "success") {
+          return NextResponse.json(
+              { error: "Backup storage is not in a successful state" },
+              { status: 422 }
+          );
+        }
+
+        const existingRestorationBackup = await db.query.restoration.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.restoration.databaseId, id),
+              inArray(drizzleDb.schemas.restoration.status, ["waiting", "ongoing"])
+          ),
+        });
+
+        if (existingRestorationBackup) {
+          return NextResponse.json(
+              {
+                error:
+                    "A restoration is already waiting or ongoing for this database",
+              },
+              { status: 409 }
+          );
+        }
+
+        const [restoration] = await db
+            .insert(drizzleDb.schemas.restoration)
+            .values({
+              databaseId: id,
+              backupId,
+              backupStorageId,
+              status: "waiting",
+            })
+            .returning();
+
+        if (!restoration) {
+          return NextResponse.json(
+              { error: "Failed to create restoration" },
+              { status: 500 }
+          );
+        }
+
+        return NextResponse.json({ data: restoration }, { status: 201 });
+      } catch (error) {
+        log.error({ error }, "Error in POST /api/v1/databases/[id]/restore");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/route.ts

@@ -0,0 +1,44 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { and, eq, isNull } from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const database = await db.query.database.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.database.id, id),
+              isNull(drizzleDb.schemas.database.deletedAt)
+          ),
+        });
+
+        if (!database) {
+          return NextResponse.json({ error: "Not found" }, { status: 404 });
+        }
+
+        return NextResponse.json({ data: database });
+      } catch (error) {
+        log.error({ error }, "Error in GET /api/v1/databases/[id]");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/status/route.ts

@@ -0,0 +1,72 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { and, desc, eq, isNull } from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]/status" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const [database, latestBackup, latestRestoration] = await Promise.all([
+          db.query.database.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.database.id, id),
+                isNull(drizzleDb.schemas.database.deletedAt)
+            ),
+          }),
+
+          db.query.backup.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.backup.databaseId, id),
+                isNull(drizzleDb.schemas.backup.deletedAt)
+            ),
+            orderBy: [desc(drizzleDb.schemas.backup.createdAt)],
+          }),
+
+          db.query.restoration.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.restoration.databaseId, id),
+                isNull(drizzleDb.schemas.restoration.deletedAt)
+            ),
+            orderBy: [desc(drizzleDb.schemas.restoration.createdAt)],
+          }),
+        ]);
+
+        if (!database) {
+          return NextResponse.json(
+              { error: "Database not found" },
+              { status: 404 }
+          );
+        }
+
+        return NextResponse.json({
+          data: {
+            isWaitingForBackup: database.isWaitingForBackup,
+            lastContact: database.lastContact,
+            latestBackup: latestBackup ?? null,
+            latestRestoration: latestRestoration ?? null,
+          },
+        });
+      } catch (error) {
+        log.error({ error }, "Error in GET /api/v1/databases/[id]/status");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/route.ts

@@ -0,0 +1,24 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import { getAccessibleDatabases } from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases" });
+
+export const GET = withApiKey(async (_req: Request, ctx: ApiKeyContext) => {
+  try {
+    const databases = await getAccessibleDatabases(ctx.user);
+
+    return NextResponse.json({
+      data: databases,
+    });
+  } catch (error) {
+    log.error({ error }, "Error in GET /api/v1/databases");
+
+    return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 }
+    );
+  }
+});

app/api/v1/docs/route.ts

@@ -0,0 +1,45 @@
+export const dynamic = "force-dynamic";
+
+const html = `<!DOCTYPE html>
+<html>
+  <head>
+    <title>Portabase API Docs</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.32.6/swagger-ui.css"
+      integrity="sha384-9Q2fpS+xeS4ffJy6CagnwoUl+4ldAYhOs9pgZuEKxypVModhmZFzeMlvVsAjf7uT"
+      crossorigin="anonymous"
+    />
+    <style>
+      body { margin: 0; }
+    </style>
+  </head>
+  <body>
+    <div id="swagger-ui"></div>
+    <script src="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.32.6/swagger-ui-bundle.js" integrity="sha384-EYdOaiRwn44zNjrw+Tfs06qYz9BGQVo2f4/pLY5i7VorbjnZNhdplAbTBk8FXHUJ" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.32.6/swagger-ui-standalone-preset.js" integrity="sha384-49fpFaVrAWI/qdgl9Vv5E/4NXxRUiJX5vGuLws1NUpTWGtEqzWEx8gHTw2UTehFK" crossorigin="anonymous"></script>
+    <script>
+      window.onload = function () {
+        SwaggerUIBundle({
+          url: "/api/v1/openapi",
+          dom_id: "#swagger-ui",
+          presets: [
+            SwaggerUIBundle.presets.apis,
+            SwaggerUIStandalonePreset,
+          ],
+          layout: "StandaloneLayout",
+          persistAuthorization: true,
+          filter: true,
+        });
+      };
+    </script>
+  </body>
+</html>`;
+
+export function GET() {
+  return new Response(html, {
+    headers: { "Content-Type": "text/html; charset=utf-8" },
+  });
+}

app/api/v1/mcp/route.ts

@@ -0,0 +1,31 @@
+import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { createPortabaseMcpServer } from "@/lib/mcp/server";
+import type { ApiKeyContext } from "@/lib/api-v1/types";
+import { env } from "@/env.mjs";
+
+/**
+ * MCP endpoint — Streamable HTTP transport, stateless mode.
+ *
+ * Auth is handled by withApiKey before MCP is ever touched.
+ * The validated key is forwarded by MCP tools to downstream /api/v1 REST calls.
+ */
+const apiEnabled = String(env.API_ENABLED) === "true";
+const mcpEnabled = String(env.MCP_ENABLED) === "true";
+
+export const POST = apiEnabled && mcpEnabled
+  ? withApiKey(async (req: Request, ctx: ApiKeyContext) => {
+      const apiKey = req.headers.get("x-api-key")!;
+
+      const server = createPortabaseMcpServer(ctx, apiKey);
+
+      const transport = new WebStandardStreamableHTTPServerTransport({
+        sessionIdGenerator: undefined,
+      });
+
+      await server.connect(transport);
+
+      return transport.handleRequest(req);
+    })
+  : () => NextResponse.json({ error: "Not found" }, { status: 404 });

app/api/v1/openapi/route.ts

@@ -0,0 +1,8 @@
+import { NextResponse } from "next/server";
+import { buildSpec } from "@/lib/api-v1/openapi/spec";
+
+export const dynamic = "force-dynamic";
+
+export function GET() {
+  return NextResponse.json(buildSpec());
+}

app/layout.tsx

@@ -1,7 +1,7 @@
 import type { Metadata } from "next";
 import type React from "react";
 import "./globals.css";
-import { ConsoleSilencer } from "@/components/wrappers/common/console-silencer";
+import { ConsoleSilencer } from "@/components/common/console-silencer";
 import { author, geistMono, poppins } from "@/fonts/fonts";
 import { cn } from "@/lib/utils";
 import { Providers } from "./providers";

app/not-found.tsx

@@ -1,4 +1,4 @@
-import BackButton from "@/components/wrappers/common/button/back-button";
+import BackButton from "@/components/common/back-button";
 
 export default async function NotFound() {
   return (

app/providers.tsx

@@ -4,8 +4,8 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { type PropsWithChildren, Suspense } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
-import { ErrorLayout } from "@/components/wrappers/common/error-layout";
-import { ThemeMetaUpdaterRoot } from "@/features/browser/theme-meta-updater-root";
+import { ErrorLayout } from "@/components/common/error-layout";
+import { ThemeMetaUpdaterRoot } from "@/features/theme/theme-meta-updater-root";
 import { ThemeProvider } from "@/features/theme/theme-provider";
 
 export type ProviderProps = PropsWithChildren<{}>;

docker-compose.e2e.yml

@@ -0,0 +1,37 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: docker/dockerfile/Dockerfile
+      target: prod
+    ports:
+      - '8887:80'
+    environment:
+      TZ: "Europe/Paris"
+    env_file:
+      - .env
+    volumes:
+      - portabase-e2e-data:/data
+    depends_on:
+      db:
+        condition: service_healthy
+
+  db:
+    image: postgres:18-alpine
+    ports:
+      - "5433:5432"
+    volumes:
+      - postgres-e2e-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=devdb
+      - POSTGRES_USER=devuser
+      - POSTGRES_PASSWORD=changeme
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  portabase-e2e-data:
+  postgres-e2e-data:

docker-compose.prod.yml

@@ -1,10 +1,10 @@
 services:
   app:
-#        build:
-#          context: .
-#          dockerfile: docker/dockerfile/Dockerfile
-#          target: prod
-    image: portabase/portabase:1.7.1
+#    build:
+#      context: .
+#      dockerfile: docker/dockerfile/Dockerfile
+#      target: prod
+    image: portabase/portabase:1
     ports:
       - '8887:80'
     environment:
@@ -17,6 +17,12 @@ services:
       db:
         condition: service_healthy
     container_name: portabase-app-prod
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost/api/health"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 60s
 
   db:
     image: postgres:16-alpine

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - POSTGRES_USER=devuser
       - POSTGRES_PASSWORD=changeme
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
+      test: [ "CMD-SHELL", "pg_isready -U devuser -d devdb" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -32,5 +32,14 @@ services:
       - ./private/uploads/tmp:/data/uploads/tmp
     user: "1000:1000"
 
+  mailpit:
+    image: axllent/mailpit:latest
+    container_name: portabase-mailpit-dev
+    hostname: mailpit
+    restart: unless-stopped
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+
 volumes:
   postgres-data:

e2e/access-management.spec.ts

@@ -0,0 +1,74 @@
+import {expect, test} from "@playwright/test";
+import {users} from "./helpers/auth";
+import {changeUserRole, create, switchToDefault} from "./helpers/access-management";
+import {LOCAL_STORAGE_PATH} from "./helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const firstOrganization = "Organization A";
+const secondOrganization = "Organization B";
+
+test.describe.serial(() => {
+    test("Create an organization from organizations page", async ({page}) => {
+        await page.goto("/dashboard/admin/organizations");
+        await expect(page.getByRole("heading", {name: "Active organizations"})).toBeVisible();
+
+        await create(page, "button", firstOrganization);
+
+        await expect(page.getByText(/Organization has been successfully created\./i)).toBeVisible();
+        await expect(page).toHaveURL("/dashboard/admin/organizations");
+        await expect(page.getByRole("button", {name: firstOrganization, exact: true})).toBeVisible();
+
+        await switchToDefault(page);
+    });
+
+    test("Create an organization from sidebar button", async ({page}) => {
+        await page.goto("/dashboard/home");
+        await expect(page.getByRole("heading", {name: "Dashboard"})).toBeVisible();
+
+        await create(page, "sidebar", secondOrganization);
+
+        await expect(page.getByText(/Organization has been successfully created\./i)).toBeVisible();
+        await expect(page).toHaveURL("/dashboard/home");
+        await expect(page.getByRole("button", {name: secondOrganization, exact: true})).toBeVisible();
+
+        await switchToDefault(page);
+    });
+
+    test("Change John Doe's role from pending to user", async ({page}) => {
+        await page.goto("/dashboard/admin/users");
+        await expect(page.getByText(users.normal.email, {exact: true})).toBeVisible();
+
+        const userRow = page.locator("tr").filter({hasText: users.normal.email}).first();
+        await expect(userRow).toBeVisible();
+        await userRow.locator("button").last().click();
+        await page.getByRole('menuitem', {name: 'Role'}).click();
+
+        await expect(page.getByRole("heading", {name: "Change the user's role"})).toBeVisible();
+
+        await changeUserRole(page, "user")
+
+        await expect(page.getByText("User role changed successfully.")).toBeVisible();
+        await expect(page.locator("tr").filter({hasText: users.normal.email}).getByText("user", {exact: true})).toBeVisible();
+    });
+
+    test("Add John Doe to Organization A", async ({page}) => {
+        await page.goto("/dashboard/admin/organizations");
+        await expect(page.getByRole("heading", {name: "Active organizations"})).toBeVisible();
+
+        const organizationRow = page.locator("tr").filter({hasText: firstOrganization}).first();
+        await expect(organizationRow).toBeVisible();
+        await organizationRow.locator('a[href*="/dashboard/admin/organizations/"], a[href*="organizations/"]').click();
+
+        await expect(page.getByText(firstOrganization, {exact: true})).toBeVisible();
+        await page.getByRole("button", {name: /Add member/i}).click();
+        await expect(page.getByRole("heading", {name: "Add member to your organization"})).toBeVisible();
+
+        await page.getByPlaceholder("Enter a user email").fill(users.normal.email);
+        await page.getByRole("option", {name: new RegExp(users.normal.email, "i")}).click();
+        await page.getByRole("button", {name: "Confirm"}).click();
+
+        await expect(page.getByText("Member successfully added!")).toBeVisible();
+        await expect(page.getByText(users.normal.email, {exact: true})).toBeVisible();
+    });
+});

e2e/agent.spec.ts

@@ -0,0 +1,116 @@
+import {expect, test} from "@playwright/test";
+import {execSync} from "child_process";
+import fs from "fs";
+import os from "os";
+import path from "path";
+import {createAgentWithDockerDatabases} from "./helpers/agent-cli";
+import {create, edit, get, remove} from "./helpers/agent";
+import {LOCAL_STORAGE_PATH} from "./helpers/session";
+
+const agent = {
+    aName: "Agent A",
+    aUpdatedName: "Agent A Updated",
+    bName: "Agent B",
+    description: "Agent created by Playwright E2E",
+    updatedDescription: "Agent updated by Playwright E2E",
+};
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+test.describe.serial(() => {
+    let agentWorkspace: string | null = null;
+
+    test("Create agent A from empty state", async ({page}) => {
+        await page.goto("/dashboard/agents");
+        await expect(page.getByRole("heading", {name: "Agents"})).toBeVisible();
+        await expect(page.getByText("Create new Agent", {exact: true})).toBeVisible();
+        await create(page, "emptyState", agent.aName, agent.description);
+
+        await expect(page.getByText("Success creating agent")).toBeVisible();
+        await expect(get(page, agent.aName)).toBeVisible();
+        await expect(page.getByText("Create new Agent", {exact: true})).toHaveCount(0);
+    });
+
+    test("Edit agent A", async ({page}) => {
+        await page.goto("/dashboard/agents");
+        await expect(page.getByRole("heading", {name: "Agents"})).toBeVisible();
+        await expect(get(page, agent.aName)).toBeVisible();
+
+        await edit(page, agent.aName, agent.aUpdatedName, agent.updatedDescription);
+
+        await expect(page.getByText("Success updating agent")).toBeVisible();
+        await expect(page.getByText(agent.aUpdatedName, {exact: true})).toBeVisible();
+        await expect(page.getByText(agent.updatedDescription, {exact: true})).toBeVisible();
+    });
+
+    test("Create agent B from classic button", async ({page}) => {
+        await page.goto("/dashboard/agents");
+        await expect(page.getByRole("heading", {name: "Agents"})).toBeVisible();
+        await expect(page.getByRole("button", {name: /Create Agent/i})).toBeVisible();
+        await create(page, "button", agent.bName, agent.description);
+
+        await expect(page.getByText("Success creating agent")).toBeVisible();
+        await expect(get(page, agent.bName)).toBeVisible();
+    });
+
+    test("Delete Agent B", async ({page}) => {
+        await page.goto("/dashboard/agents");
+        await expect(page.getByRole("heading", {name: "Agents"})).toBeVisible();
+        await expect(get(page, agent.bName)).toBeVisible();
+        await remove(page, agent.bName);
+
+        await expect(page.getByText("Agent has been successfully deleted.")).toBeVisible();
+        await expect(page).toHaveURL("/dashboard/agents");
+        await expect(page.getByText(agent.bName)).toHaveCount(0);
+    });
+
+    // test("Launch the updated agent", async ({page}) => {
+    //     await page.goto("/dashboard/agents");
+    //     await expect(page.getByRole("heading", {name: "Agents"})).toBeVisible();
+    //     await get(page, agent.aName).click();
+    //
+    //     await expect(page).toHaveURL(/\/dashboard\/agents\/.+/);
+    //     await expect(page.getByText(agent.aName, {exact: true})).toBeVisible();
+    //     await expect(page.getByText("Registration & Setup")).toBeVisible();
+    //
+    //     const commandInput = page.locator("input[readonly]").first();
+    //     await page.locator("input[readonly]").first().locator("xpath=following-sibling::button[1]").click();
+    //     const command = await commandInput.inputValue();
+    //
+    //     agentWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), "portabase-agent-"));
+    //     await createAgentWithDockerDatabases(command, agentWorkspace);
+    //     execSync(`portabase start "${agent.aName}"`, {
+    //         cwd: agentWorkspace,
+    //         stdio: "pipe",
+    //         timeout: 120_000,
+    //     });
+    //
+    //     await expect(page.getByText("Never connected.")).toHaveCount(0, {timeout: 120_000});
+    //     await expect(page.getByText("Action Required")).toHaveCount(0);
+    // });
+
+    test.afterAll(async () => {
+        if (agentWorkspace) {
+            try {
+                execSync(`portabase stop "${agent.aName}"`, {
+                    cwd: agentWorkspace,
+                    stdio: "pipe",
+                    timeout: 30_000,
+                });
+            } catch {
+            }
+
+            try {
+                execSync(`portabase uninstall --force "${agent.aName}"`, {
+                    cwd: agentWorkspace,
+                    stdio: "pipe",
+                    timeout: 30_000,
+                });
+            } catch {
+            }
+
+            fs.rmSync(agentWorkspace, {recursive: true, force: true});
+            agentWorkspace = null;
+        }
+    });
+});

e2e/auth.spec.ts

@@ -1,43 +1,17 @@
-import {test, expect, Page} from '@playwright/test';
+import {test, expect} from '@playwright/test';
+import {login, register, users} from "./helpers/auth";
+import {LOCAL_STORAGE_PATH} from "./helpers/session";
 
+const TIMEOUT = undefined
+// const TIMEOUT = 5000
 
-type UserCredentials = {
-    username: string
-    email: string
-    password: string
-}
+test.use({storageState: LOCAL_STORAGE_PATH})
 
-
-const users: Record<string, UserCredentials> = {
-    admin: {username: 'Admin', email: 'admin@example.com', password: 'testPASS123456!'},
-    normal: {username: 'John Doe', email: 'john.doe@example.com', password: 'testPASS123456!'},
-}
-
-async function register(page: Page, name: string, email: string, password: string, confirmPassword: string) {
-    await page.locator('input[name="name"]').fill(name)
-    await page.locator('input[name="email"]').fill(email)
-    await page.locator('input[name="password"]').fill(password)
-    await page.locator('input[name="confirmPassword"]').fill(confirmPassword)
-
-    await page.click('button[type="submit"]')
-}
-
-async function login(page: Page, email: string, password: string) {
-    await page.locator('input[name="email"]').fill(email)
-    await page.locator('input[name="password"]').fill(password)
-
-    await page.locator('button:has-text("Login")').click()
-}
-
-async function logout() {
-    //TODO
-}
-
-test.describe.serial('User signup and login flows', () => {
+test.describe.serial( () => {
 
     test('Redirect to login if not connected', async ({page}) => {
         await page.goto('/dashboard/projects');
-        await expect(page).toHaveURL("login?redirect=%2Fdashboard%2Fprojects");
+        await expect(page).toHaveURL("login?redirect=%2Fdashboard%2Fprojects", {timeout: TIMEOUT});
     });
 
     test('Password too short', async ({page}) => {
@@ -85,7 +59,7 @@ test.describe.serial('User signup and login flows', () => {
 
         await register(page, users["admin"].username, users["admin"].email, users["admin"].password, users["admin"].password)
 
-        await expect(page).toHaveURL('/login')
+        await expect(page).toHaveURL('/login', {timeout: TIMEOUT})
     })
 
     test('User already exists.', async ({page}) => {
@@ -108,7 +82,7 @@ test.describe.serial('User signup and login flows', () => {
 
         await register(page, users["normal"].username, users["normal"].email, users["normal"].password, users["normal"].password)
 
-        await expect(page).toHaveURL('login')
+        await expect(page).toHaveURL('/login', {timeout: TIMEOUT})
     })
 
     test('Failed login because account not active', async ({page}) => {
@@ -120,16 +94,11 @@ test.describe.serial('User signup and login flows', () => {
     })
 
     test('Successful login', async ({page}) => {
-        await page.goto('login')
+        await page.goto('/login')
         await login(page, users["admin"].email, users["admin"].password)
 
-        await expect(page).toHaveURL('/dashboard/home')
+        await expect(page).toHaveURL('/dashboard/home', {timeout: TIMEOUT})
+        await expect(page.getByRole('link', {name: 'Logo Portabase'})).toBeVisible()
+        await page.context().storageState({path: LOCAL_STORAGE_PATH})
     })
-
 })
-
-
-// test('Successful logout', async ({page}) => {
-//     await logout()
-//     await expect(page).toHaveURL('/login')
-// })

e2e/cleanup.spec.ts

@@ -0,0 +1,32 @@
+import {expect, test} from "@playwright/test";
+import fs from "fs";
+import {logout} from "./helpers/auth";
+import {LOCAL_STORAGE_PATH} from "./helpers/session";
+
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+test.describe( () => {
+    test.afterAll(async () => {
+        if (fs.existsSync(LOCAL_STORAGE_PATH)) {
+            fs.unlinkSync(LOCAL_STORAGE_PATH);
+        }
+    });
+
+    test("Remove shared storage state", async ({page}) => {
+        await test.step("Logout shared authenticated session", async () => {
+            if (!fs.existsSync(LOCAL_STORAGE_PATH)) {
+                return;
+            }
+
+            const content = fs.readFileSync(LOCAL_STORAGE_PATH, "utf-8").trim();
+            if (!content || content === "{}") {
+                return;
+            }
+
+            await page.goto('/dashboard/home');
+            await logout(page);
+            await expect(page).toHaveURL(/\/login(?:\?.*)?$/);
+        });
+    });
+});

e2e/helpers/access-management.ts

@@ -0,0 +1,70 @@
+import {Page} from "@playwright/test";
+
+export function getUserRow(page: Page, email: string) {
+    return page.locator("tr").filter({hasText: email}).first();
+}
+
+export function getOrganizationRow(page: Page, organizationName: string) {
+    return page.locator("tr").filter({hasText: organizationName}).first();
+}
+
+/**
+ * Create an organization from the selected entrypoint.
+ *
+ * Available entrypoints:
+ * - `button`: the organizations page create button.
+ * - `sidebar`: the sidebar organization switcher.
+ *
+ * Executes from:
+ * - `/dashboard/admin/organizations` for "button" entrypoint
+ * - any `/dashboard/**` page for "sidebar" entrypoint
+ */
+export async function create(page: Page, entrypoint: "button" | "sidebar", name: string) {
+    if (entrypoint === "sidebar") {
+        await page.getByRole("button", {name: "Default Organization"}).click();
+        await page.getByText("Create organization", {exact: true}).click();
+    } else {
+        await page.getByRole("button", {name: /Create a new organization/i}).click();
+    }
+
+    await page.getByLabel("Name").fill(name);
+    await page.getByRole("button", {name: "Create"}).click();
+}
+
+/**
+ * Switch the active organization from the sidebar switcher.
+ *
+ * Executes from: any `/dashboard/**` if the sidebar is visible.
+ */
+export async function switchTo(page: Page, name: string) {
+    await page.getByTestId('organization-dropdown').click();
+    await page.getByRole('menuitem', {name: name}).click();
+}
+
+/**
+ * Switch back to the default organization.
+ *
+ * Executes from: any `/dashboard/**` if the sidebar is visible.
+ */
+export async function switchToDefault(page: Page) {
+    await switchTo(page, "Default Organization");
+}
+
+const ROLE_LABELS = {
+    pending: "Pending",
+    user: "User",
+    admin: "Admin",
+} as const;
+
+/**
+ * Change the global role of a user from the admin users role modal.
+ *
+ * Executes from: the "Change the user's role" dialog opened from `/dashboard/admin/users`.
+ */
+export async function changeUserRole(page: Page, role: keyof typeof ROLE_LABELS) {
+    const roleOption = ROLE_LABELS[role];
+
+    await page.getByRole("combobox").click();
+    await page.getByRole("option", {name: roleOption}).click();
+    await page.getByRole("button", {name: "Validate"}).click();
+}

e2e/helpers/agent-cli.ts

@@ -0,0 +1,107 @@
+import * as pty from "node-pty";
+
+type InteractiveStep = {
+    match: RegExp;
+    reply: string;
+};
+
+function normalizeOutput(output: string) {
+    return output.replace(/\u001b\[[0-9;?]*[ -/]*[@-~]/g, "");
+}
+
+/**
+ * Run an interactive CLI command and answer prompts in sequence.
+ * Entry point:
+ * - `command` is the full CLI command executed in the PTY.
+ * - `cwd` is the local workspace where the command is launched.
+ * - `steps` defines which prompt text is matched and which reply is sent.
+ * - `timeoutMs` controls when the command is aborted if it stalls.
+ * Executes from: not page-bound; runs from a local test workspace on the Node.js side.
+ */
+export async function runInteractiveCommand(
+    command: string,
+    cwd: string,
+    steps: InteractiveStep[],
+    timeoutMs: number = 120_000,
+) {
+    await new Promise<void>((resolve, reject) => {
+        const child = pty.spawn("sh", ["-lc", command], {
+            cwd,
+            env: {
+                ...process.env,
+                TERM: "xterm-256color",
+            },
+            cols: 120,
+            rows: 30,
+        });
+
+        let currentStep = 0;
+        let output = "";
+        const timer = setTimeout(() => {
+            child.kill();
+            reject(new Error(`Interactive command timed out.\n\nCommand: ${command}\n\nOutput:\n${normalizeOutput(output)}`));
+        }, timeoutMs);
+
+        const handleChunk = (chunk: string) => {
+            output += chunk;
+            const normalizedOutput = normalizeOutput(output);
+
+            while (currentStep < steps.length && steps[currentStep].match.test(normalizedOutput)) {
+                child.write(steps[currentStep].reply);
+                currentStep += 1;
+            }
+        };
+
+        child.onData(handleChunk);
+        child.onExit(({exitCode}) => {
+            clearTimeout(timer);
+            if (exitCode === 0) {
+                resolve();
+                return;
+            }
+
+            reject(new Error(`Interactive command failed with exit code ${exitCode}.\n\nCommand: ${command}\n\nOutput:\n${normalizeOutput(output)}`));
+        });
+    });
+}
+
+/**
+ * Create and configure a Portabase agent with two Docker-backed databases.
+ * Entry point:
+ * - `command` is the CLI setup command copied from the agent details page.
+ * - `cwd` is the local workspace where the agent is installed.
+ * - this helper answers the wizard for PostgreSQL first, then MariaDB.
+ * Executes from: not page-bound; runs from a local test workspace on the Node.js side.
+ */
+export async function createAgentWithDockerDatabases(command: string, cwd: string) {
+    await runInteractiveCommand(command, cwd, [
+        {
+            match: /configure.*database|add.*database/i,
+            reply: "y\n",
+        },
+        {
+            match: /docker.*new local container|manual.*external|external.*existing/i,
+            reply: "\r",
+        },
+        {
+            match: /postgresql|mariadb/i,
+            reply: "\r",
+        },
+        {
+            match: /another.*database|add.*another|configure.*another/i,
+            reply: "y\n",
+        },
+        {
+            match: /docker.*new local container|manual.*external|external.*existing/i,
+            reply: "\r",
+        },
+        {
+            match: /postgresql|mariadb/i,
+            reply: "\u001B[B\r",
+        },
+        {
+            match: /another.*database|add.*another|configure.*another/i,
+            reply: "n\n",
+        },
+    ]);
+}

e2e/helpers/agent.ts

@@ -0,0 +1,66 @@
+import {Page} from "@playwright/test";
+
+
+/**
+ * Locate an agent card in the list.
+
+ * Executes from: `/dashboard/agents`.
+ */
+export function get(page: Page, name: string) {
+    return page.locator('a[href^="/dashboard/agents"]').filter({hasText: name}).first();
+}
+
+/**
+ * Create an agent from the selected entrypoint.
+ *
+ * Available entrypoints:
+ * - `button`: the classic create button.
+ * - `emptyState`: the empty-state CTA.
+ * - `auto`: uses the classic create button and falls back to the empty-state CTA.
+ *
+ * Executes from: `/dashboard/agents`.
+ */
+export async function create(page: Page, entrypoint: "auto" | "emptyState" | "button" = "auto", agentName: string, description: string) {
+    if (entrypoint === "auto") {
+        const createButton = page.getByRole("button", {name: /Create Agent/i});
+        if (await createButton.isVisible()) await page.getByRole("button", {name: /Create Agent/i}).click();
+        await page.getByText("Create new Agent", {exact: true}).click();
+    } else if (entrypoint === "button") {
+        await page.getByRole("button", {name: /Create Agent/i}).click();
+    } else if (entrypoint === "emptyState") {
+        await page.getByText("Create new Agent", {exact: true}).click();
+    }
+
+    await page.getByLabel("Name").fill(agentName);
+    await page.getByLabel("Description").fill(description);
+    await page.getByRole("button", {name: "Create"}).click();
+}
+
+/**
+ * Edit an existing agent (name and description) from its details page.
+ *
+ * Executes from: `/dashboard/agents/[agentId]`.
+ */
+export async function edit(page: Page, currentName: string, updatedName: string, updatedDescription: string) {
+    await get(page, currentName).click();
+
+    await page
+        .getByRole("button", {name: /Delete Agent/i})
+        .locator("xpath=ancestor::div[1]/preceding-sibling::div[1]/*[1]")
+        .click();
+
+    await page.getByLabel("Name").fill(updatedName);
+    await page.getByLabel("Description").fill(updatedDescription);
+    await page.getByRole("button", {name: "Update"}).click();
+}
+
+/**
+ * Delete an agent from its details page.
+
+ * Executes from: `/dashboard/agents/[agentId]`.
+ */
+export async function remove(page: Page, name: string) {
+    await get(page, name).click();
+    await page.getByRole("button", {name: /Delete Agent/i}).click();
+    await page.getByRole("button", {name: "Delete", exact: true}).click();
+}

e2e/helpers/auth.ts

@@ -0,0 +1,50 @@
+import {Page} from "@playwright/test";
+
+export type UserCredentials = {
+    username: string
+    email: string
+    password: string
+}
+
+export const users: Record<string, UserCredentials> = {
+    admin: {username: "Admin", email: "admin@example.com", password: "testPASS123456!"},
+    normal: {username: "John Doe", email: "john.doe@example.com", password: "testPASS123456!"},
+}
+
+/**
+ * Fill and submit the registration form.
+ *
+ * Executes from: `/register`.
+ */
+export async function register(page: Page, name: string, email: string, password: string, confirmPassword: string) {
+    await page.locator('input[name="name"]').fill(name)
+    await page.locator('input[name="email"]').fill(email)
+    await page.locator('input[name="password"]').fill(password)
+    await page.locator('input[name="confirmPassword"]').fill(confirmPassword)
+
+    await page.click('button[type="submit"]')
+}
+
+/**
+ * Fill and submit the login form.
+ *
+ * Executes from: `/login`.
+ */
+export async function login(page: Page, email: string, password: string) {
+    await page.locator('input[name="email"]').fill(email)
+    await page.locator('input[name="password"]').fill(password)
+
+    await page.locator('button:has-text("Login")').click()
+}
+
+/**
+ * Log out the current authenticated user.
+ *
+ * Executes from: any authenticated `/dashboard/**` page.
+ */
+export async function logout(page: Page) {
+    const profileButton = page.getByTestId('profile-dropdown')
+    await profileButton.first().click();
+
+    await page.getByRole("menuitem").filter({hasText: /Logout/i}).click();
+}

e2e/helpers/env.ts

@@ -0,0 +1,62 @@
+const REQUIRED_E2E_ENV_VARS = [
+    "E2E_NOTIFICATION_SMTP_HOST",
+    "E2E_NOTIFICATION_SMTP_PORT",
+    "E2E_NOTIFICATION_SMTP_USER",
+    "E2E_NOTIFICATION_SMTP_PASSWORD",
+    "E2E_NOTIFICATION_SMTP_FROM",
+    "E2E_NOTIFICATION_SMTP_TO",
+    "E2E_NOTIFICATION_SLACK_WEBHOOK",
+    "E2E_NOTIFICATION_DISCORD_WEBHOOK",
+    "E2E_NOTIFICATION_TELEGRAM_BOT_TOKEN",
+    "E2E_NOTIFICATION_TELEGRAM_CHAT_ID",
+    "E2E_NOTIFICATION_TELEGRAM_TOPIC_ID",
+    "E2E_NOTIFICATION_GOTIFY_SERVER_URL",
+    "E2E_NOTIFICATION_GOTIFY_APP_TOKEN",
+    "E2E_NOTIFICATION_NTFY_TOPIC",
+    "E2E_NOTIFICATION_NTFY_SERVER_URL",
+    "E2E_NOTIFICATION_NTFY_TOKEN",
+    "E2E_NOTIFICATION_NTFY_USERNAME",
+    "E2E_NOTIFICATION_NTFY_PASSWORD",
+    "E2E_NOTIFICATION_WEBHOOK_URL",
+    "E2E_NOTIFICATION_WEBHOOK_SECRET_HEADER",
+    "E2E_NOTIFICATION_WEBHOOK_SECRET",
+    "E2E_STORAGE_AWS_S3_ENDPOINT_URL",
+    "E2E_STORAGE_AWS_S3_REGION",
+    "E2E_STORAGE_AWS_S3_ACCESS_KEY",
+    "E2E_STORAGE_AWS_S3_SECRET_KEY",
+    "E2E_STORAGE_AWS_S3_BUCKET_NAME",
+    "E2E_STORAGE_AWS_S3_PORT",
+    "E2E_STORAGE_R2_ENDPOINT_URL",
+    "E2E_STORAGE_R2_REGION",
+    "E2E_STORAGE_R2_ACCESS_KEY",
+    "E2E_STORAGE_R2_SECRET_KEY",
+    "E2E_STORAGE_R2_BUCKET_NAME",
+    "E2E_STORAGE_R2_PORT",
+    "E2E_STORAGE_GOOGLE_DRIVE_CLIENT_ID",
+    "E2E_STORAGE_GOOGLE_DRIVE_CLIENT_SECRET",
+    "E2E_STORAGE_GOOGLE_DRIVE_FOLDER_ID",
+] as const;
+
+function assertRequiredEnvVars() {
+    const missingVars = REQUIRED_E2E_ENV_VARS.filter((name) => {
+        const value = process.env[name]?.trim();
+        return !value;
+    });
+
+    if (missingVars.length > 0) {
+        throw new Error(
+            `Missing required environment variables:\n${missingVars.map((name) => `- ${name}`).join("\n")}`,
+        );
+    }
+}
+
+assertRequiredEnvVars();
+
+export function getEnv(name: string): string {
+    const value = process.env[name]?.trim();
+    if (!value) {
+        throw new Error(`Missing required environment variable: ${name}`);
+    }
+
+    return value;
+}

e2e/helpers/notification.ts

@@ -0,0 +1,94 @@
+import {Page} from "@playwright/test";
+
+
+/**
+ * Locate a notification channel card in the list.
+ *
+ * Executes from: `/dashboard/notifications/channels`.
+ */
+export function get(page: Page, channelName: string) {
+    return page.locator('div.block.transition-all.duration-200.rounded-xl', {
+        has: page.locator('h3', {hasText: channelName}),
+    }).first();
+}
+
+/**
+ * Open the edit dialog for an existing notification channel.
+ *
+ * Executes from: `/dashboard/notifications/channels`.
+ */
+export async function edit(page: Page, channelName: string) {
+    const card = get(page, channelName);
+    await card.locator("button").nth(1).click();
+}
+
+/**
+ * Delete an existing notification channel.
+ *
+ * Executes from: `/dashboard/notifications/channels`.
+ */
+export async function remove(page: Page, channelName: string) {
+    const card = get(page, channelName);
+    await card.locator("button").nth(2).click();
+    await page.getByRole("button", {name: "Delete"}).click();
+}
+
+/**
+ * Fill the notification channel creation form.
+ *
+ * Available entrypoints:
+ * - `button`: the classic add button.
+ * - `emptyState`: the empty-state CTA.
+ * - `auto` use the classic add button and falls back to the empty-state CTA.
+ *
+ * Executes from: `/dashboard/notifications/channels`.
+ */
+export async function create(
+    page: Page,
+    provider: "Discord" | "Gotify" | "ntfy.sh" | "Slack" | "Email" | "Telegram" | "Webhook",
+    channelName: string,
+    fillConfig: (page: Page) => Promise<void>,
+    entrypoint: "auto" | "emptyState" | "button" = "auto",
+) {
+    if (entrypoint === "auto") {
+        const addButton = page.getByRole("button", {name: /Add notification channel/i});
+        if (await addButton.isVisible()) await page.getByRole("button", {name: /Add notification channel/i}).click();
+        else await page.getByRole("button", {name: /No notification channels configured yet/i}).click();
+    } else if (entrypoint === "button") {
+        await page.getByRole("button", {name: /Add notification channel/i}).click();
+    } else if (entrypoint === "emptyState") {
+        await page.getByRole("button", {name: /No notification channels configured yet/i}).click();
+    }
+
+    await page.getByText(provider, {exact: true}).click();
+    await page.getByLabel(/Channel Name/).fill(channelName);
+    await fillConfig(page);
+}
+
+/**
+ * Submit the notification channel creation form.
+ *
+ * Executes from: the add notification channel dialog opened from `/dashboard/notifications/channels`.
+ */
+export async function submit(page: Page) {
+    await page.getByRole("button", {name: "Add Channel"}).click();
+}
+
+/**
+ * Open the edit dialog for a notification channel and trigger the test action.
+ *
+ * Executes from: `/dashboard/notifications/channels`.
+ */
+export async function testFromEdit(page: Page, channelName: string) {
+    await edit(page, channelName);
+    await page.getByRole("button", {name: /Test Channel/i}).click();
+}
+
+/**
+ * Close the current notification channel dialog without saving.
+ *
+ * Executes from: the add or edit notification channel dialog.
+ */
+export async function cancel(page: Page) {
+    await page.getByRole("button", {name: "Cancel"}).click();
+}

e2e/helpers/project.ts

@@ -0,0 +1,59 @@
+import {Page} from "@playwright/test";
+
+
+/**
+ * Locate a project card in the list.
+ *
+ * Executes from: `/dashboard/projects`.
+ */
+export function get(page: Page, projectName: string) {
+    return page.locator('a[href^="/dashboard/projects/"]').filter({hasText: projectName}).first();
+}
+
+/**
+ * Create a project from the selected entrypoint.
+ *
+ * Available entrypoints:
+ * - `emptyState`: the empty-state CTA.
+ * - `button`: the classic create button.
+ *
+ * * Executes from: `/dashboard/projects`.
+ */
+export async function create(page: Page, entrypoint: "emptyState" | "button", projectName: string) {
+    if (entrypoint === "emptyState") {
+        await page.getByText("Create new Project", {exact: true}).click();
+    } else {
+        await page.getByRole("button", {name: /Create Project/i}).click();
+    }
+
+    await page.getByLabel("Name").fill(projectName);
+    await page.getByRole("button", {name: "Create"}).click();
+}
+
+/**
+ * Edit an existing project from its details page.
+ *
+ * Executes from: `/dashboard/projects/[projectId]`.
+ */
+export async function edit(page: Page, currentName: string, updatedName: string) {
+    await get(page, currentName).click();
+
+    await page
+        .getByRole("button", {name: /Delete Project/i})
+        .locator("xpath=ancestor::div[1]/preceding-sibling::div[1]/*[1]")
+        .click();
+
+    await page.getByLabel("Name").fill(updatedName);
+    await page.getByRole("button", {name: "Update"}).click();
+}
+
+/**
+ * Delete an existing project from its details page.
+ *
+ * Executes from: `/dashboard/projects/[projectId]`.
+ * */
+export async function remove(page: Page, projectName: string) {
+    await get(page, projectName).click();
+    await page.getByRole("button", {name: /Delete Project/i}).click();
+    await page.getByRole("button", {name: "Delete", exact: true}).click();
+}

e2e/helpers/session.ts

@@ -0,0 +1 @@
+export const LOCAL_STORAGE_PATH = "./e2e/local-storage.json";

e2e/helpers/storage.ts

@@ -0,0 +1,103 @@
+import {Page} from "@playwright/test";
+
+
+/**
+ * Locate a storage channel card in the channels list.
+ *
+ * Executes from: `/dashboard/storages/channels`.
+ */
+export function get(page: Page, channelName: string) {
+    return page.locator('div.block.transition-all.duration-200.rounded-xl', {
+        has: page.locator('h3', {hasText: channelName}),
+    }).first();
+}
+
+/**
+ * Fill the storage channel creation form.
+ *
+ * Available entrypoints:
+ * - `button`: the classic add button.
+ * - `emptyState`: the empty-state CTA.
+ * - `auto`: uses the classic add button and falls back to the empty-state CTA.
+ *
+ * Executes from: `/dashboard/storages/channels`.
+ */
+export async function create(
+    page: Page,
+    provider: "S3" | "Google Drive",
+    channelName: string,
+    fillConfig: (page: Page) => Promise<void>,
+    entrypoint: "auto" | "emptyState" | "button" = "auto",
+) {
+    if (entrypoint === "auto") {
+        const addButton = page.getByRole("button", {name: /Add storage channel/i});
+        if (await addButton.isVisible()) await page.getByRole("button", {name: /Add storage channel/i}).click();
+        else await page.getByText("No storage channels configured yet", {exact: true}).click();
+    } else if (entrypoint === "button") {
+        await page.getByRole("button", {name: /Add storage channel/i}).click();
+    } else if (entrypoint === "emptyState") {
+        await page.getByText("No storage channels configured yet", {exact: true}).click();
+    }
+
+    await page.getByText(provider, {exact: true}).click();
+    await page.getByLabel(/Channel Name/).fill(channelName);
+    await fillConfig(page);
+}
+
+/**
+ * Open the edit dialog for an existing storage channel.
+ *
+ * Executes from: `/dashboard/storages/channels`.
+ */
+export async function edit(page: Page, channelName: string) {
+    const card = get(page, channelName);
+    await card.locator("button").nth(1).click();
+}
+
+/**
+ * Delete an existing storage channel.
+ *
+ * Executes from: `/dashboard/storages/channels`.
+ */
+export async function remove(page: Page, channelName: string) {
+    const card = get(page, channelName);
+    await card.locator("button").nth(2).click();
+    await page.getByRole("button", {name: "Delete"}).click();
+}
+
+/**
+ * Trigger the storage connection test in the current dialog.
+ *
+ * Executes from: the add or edit storage channel dialog opened from `/dashboard/storages/channels`.
+ */
+export async function testConnection(page: Page) {
+    await page.getByRole("button", {name: /Test Storage/i}).click();
+}
+
+/**
+ * Submit the storage channel creation form.
+ *
+ * Executes from: the add storage channel dialog opened from `/dashboard/storages/channels`.
+ */
+export async function submit(page: Page) {
+    await page.getByRole("button", {name: "Add Channel"}).click();
+}
+
+/**
+ * Open the edit dialog for a storage channel and trigger the test action.
+ *
+ * Executes from: `/dashboard/storages/channels`.
+ */
+export async function testFromEdit(page: Page, channelName: string) {
+    await edit(page, channelName);
+    await testConnection(page);
+}
+
+/**
+ * Close the current storage channel dialog without saving.
+ *
+ * Executes from: the add or edit storage channel dialog.
+ */
+export async function cancel(page: Page) {
+    await page.getByRole("button", {name: "Cancel"}).click();
+}

e2e/notification/discord.spec.ts

@@ -0,0 +1,71 @@
+import {expect, test} from "@playwright/test";
+import {
+    cancel, create, get, remove, submit, testFromEdit,
+} from "../helpers/notification";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const validChannelName = "Discord E2E Required";
+const invalidChannelName = "Discord E2E Invalid";
+
+// test.describe.serial("Valid channel", () => {
+//     test("Create and test a valid Discord channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Discord", validChannelName, async (page) => {
+//             await page.getByLabel(/Discord Webhook URL/).fill(getEnv("E2E_NOTIFICATION_DISCORD_WEBHOOK"));
+//         });
+//         await expect(page.getByRole("heading", {name: "Add Notification Channel"})).toBeVisible();
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByRole("heading", {name: "Edit Notification Channel"})).toBeVisible();
+//         await expect(page.getByText("Sent to Discord")).toBeVisible();
+//         await cancel(page);
+//         await expect(page.getByRole("heading", {name: "Edit Notification Channel"})).toHaveCount(0);
+//     });
+//
+//     test("Edit and test a valid Discord channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByRole("heading", {name: "Edit Notification Channel"})).toBeVisible();
+//         await expect(page.getByText("Sent to Discord")).toBeVisible();
+//         await cancel(page);
+//         await expect(page.getByRole("heading", {name: "Edit Notification Channel"})).toHaveCount(0);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid Discord channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await create(page, "Discord", invalidChannelName, async (page) => {
+            await page.getByLabel(/Discord Webhook URL/).fill("https://discord.com/api/webhooks/123456789012345678/wrong-discord-webhook-token");
+        });
+        await expect(page.getByRole("heading", {name: "Add Notification Channel"})).toBeVisible();
+        await submit(page);
+        await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+
+        await testFromEdit(page, invalidChannelName);
+        await expect(page.getByRole("heading", {name: "Edit Notification Channel"})).toBeVisible();
+        await expect(page.getByText("An error occurred while testing the notification channel, check your configuration")).toBeVisible();
+        await cancel(page);
+        await expect(page.getByRole("heading", {name: "Edit Notification Channel"})).toHaveCount(0);
+    });
+
+    test("Delete invalid Discord channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Notification channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/notification/gotify.spec.ts

@@ -0,0 +1,66 @@
+import {expect, test} from "@playwright/test";
+import {
+    cancel, create, get, remove, submit, testFromEdit,
+} from "../helpers/notification";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const validChannelName = "Gotify E2E Required";
+const invalidChannelName = "Gotify E2E Invalid";
+
+// test.describe.serial("Valid channel", () => {
+//     test("Create and test a valid Gotify channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Gotify", validChannelName, async (page) => {
+//             await page.getByLabel(/Gotify Server URL/).fill(getEnv("E2E_NOTIFICATION_GOTIFY_SERVER_URL"));
+//             await page.getByLabel(/Application Token/).fill(getEnv("E2E_NOTIFICATION_GOTIFY_APP_TOKEN"));
+//         });
+//         await expect(page.getByRole("heading", {name: "Add Notification Channel"})).toBeVisible();
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByText("Sent to Gotify")).toBeVisible();
+//         await cancel(page);
+//     });
+//
+//     test("Edit and test a valid Gotify channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByText("Sent to Gotify")).toBeVisible();
+//         await cancel(page);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid Gotify channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await create(page, "Gotify", invalidChannelName, async (page) => {
+            await page.getByLabel(/Gotify Server URL/).fill(getEnv("E2E_NOTIFICATION_GOTIFY_SERVER_URL"));
+            await page.getByLabel(/Application Token/).fill("wrong-gotify-app-token");
+        });
+        await expect(page.getByRole("heading", {name: "Add Notification Channel"})).toBeVisible();
+        await submit(page);
+        await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await testFromEdit(page, invalidChannelName);
+        await expect(page.getByText("An error occurred while testing the notification channel, check your configuration")).toBeVisible();
+        await cancel(page);
+    });
+
+    test("Delete invalid Gotify channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Notification channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/notification/ntfy.spec.ts

@@ -0,0 +1,73 @@
+import {expect, test} from "@playwright/test";
+import {
+    cancel, create, get, remove, submit, testFromEdit,
+} from "../helpers/notification";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const requiredChannelName = "Ntfy E2E Required";
+const optionalChannelName = "Ntfy E2E Optional";
+const invalidChannelName = "Ntfy E2E Invalid";
+
+// test.describe.serial("Valid channels", () => {
+//     test("Create and test a valid Ntfy channel with only required fields", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "ntfy.sh", requiredChannelName, async (page) => {
+//             await page.getByLabel(/Topic Name/).fill(getEnv("E2E_NOTIFICATION_NTFY_TOPIC"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, requiredChannelName)).toBeVisible();
+//         await testFromEdit(page, requiredChannelName);
+//         await expect(page.getByText("Sent to ntfy")).toBeVisible();
+//         await cancel(page);
+//     });
+//
+//     test("Create and test a valid Ntfy channel with optional fields", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "ntfy.sh", optionalChannelName, async (page) => {
+//             await page.getByLabel(/Topic Name/).fill(getEnv("E2E_NOTIFICATION_NTFY_TOPIC"));
+//             await page.getByLabel(/^Server URL$/).fill(getEnv("E2E_NOTIFICATION_NTFY_SERVER_URL"));
+//             await page.getByLabel(/^Access Token$/).fill(getEnv("E2E_NOTIFICATION_NTFY_TOKEN"));
+//             await page.getByLabel(/^Basic Auth Username$/).fill(getEnv("E2E_NOTIFICATION_NTFY_USERNAME"));
+//             await page.getByLabel(/^Basic Auth Password$/).fill(getEnv("E2E_NOTIFICATION_NTFY_PASSWORD"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, optionalChannelName)).toBeVisible();
+//         await testFromEdit(page, optionalChannelName);
+//         await expect(page.getByText("Sent to ntfy")).toBeVisible();
+//         await cancel(page);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid Ntfy channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await create(page, "ntfy.sh", invalidChannelName, async (page) => {
+            await page.getByLabel(/Topic Name/).fill("wrong-ntfy-topic");
+            await page.getByLabel(/^Server URL$/).fill(getEnv("E2E_NOTIFICATION_NTFY_SERVER_URL"));
+            await page.getByLabel(/^Access Token$/).fill("wrong-ntfy-token");
+        });
+        await submit(page);
+        await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await testFromEdit(page, invalidChannelName);
+        await expect(page.getByText("An error occurred while testing the notification channel, check your configuration")).toBeVisible();
+        await cancel(page);
+    });
+
+    test("Delete invalid Ntfy channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Notification channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/notification/slack.spec.ts

@@ -0,0 +1,61 @@
+import {expect, test} from "@playwright/test";
+import {
+    cancel, create, get, remove, submit, testFromEdit,
+} from "../helpers/notification";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const validChannelName = "Slack E2E Required";
+const invalidChannelName = "Slack E2E Invalid";
+
+// test.describe.serial("Valid channel", () => {
+//     test("Create and test a valid Slack channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Slack", validChannelName, async (page) => {
+//             await page.getByLabel(/Slack Webhook URL/).fill(getEnv("E2E_NOTIFICATION_SLACK_WEBHOOK"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByText("Sent to Slack")).toBeVisible();
+//         await cancel(page);
+//     });
+//
+//     test("Edit and test a valid Slack E2E channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByText("Sent to Slack")).toBeVisible();
+//         await cancel(page);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid Slack channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await create(page, "Slack", invalidChannelName, async (page) => {
+            await page.getByLabel(/Slack Webhook URL/).fill("https://WRONG_SLACK_WEBHOOK");
+        });
+        await submit(page);
+        await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await testFromEdit(page, invalidChannelName);
+        await expect(page.getByText("An error occurred while testing the notification channel, check your configuration")).toBeVisible();
+        await cancel(page);
+    });
+
+    test("Delete invalid Slack channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Notification channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/notification/smtp.spec.ts

@@ -0,0 +1,72 @@
+import {expect, test} from "@playwright/test";
+import {getEnv} from "../helpers/env";
+import {
+    cancel, create, get, remove, submit, testFromEdit,
+} from "../helpers/notification";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const validChannelName = "SMTP E2E Required";
+const invalidChannelName = "SMTP E2E Invalid";
+const successMessage = `Email sent: ${getEnv("E2E_NOTIFICATION_SMTP_TO")}`;
+
+// test.describe.serial("Valid channel", () => {
+//     test("Create and test a valid SMTP channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Email", validChannelName, async (page) => {
+//             await page.getByLabel(/SMTP Host/).fill(getEnv("E2E_NOTIFICATION_SMTP_HOST"));
+//             await page.getByLabel(/SMTP Port/).fill(getEnv("E2E_NOTIFICATION_SMTP_PORT"));
+//             await page.getByLabel(/Username/).fill(getEnv("E2E_NOTIFICATION_SMTP_USER"));
+//             await page.getByLabel(/Password/).fill(getEnv("E2E_NOTIFICATION_SMTP_PASSWORD"));
+//             await page.getByLabel(/From Email/).fill(getEnv("E2E_NOTIFICATION_SMTP_FROM"));
+//             await page.getByLabel(/To Email/).fill(getEnv("E2E_NOTIFICATION_SMTP_TO"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByText(successMessage)).toBeVisible();
+//         await cancel(page);
+//     });
+//
+//     test("Edit and test a valid SMTP channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await expect(get(page, validChannelName)).toBeVisible();
+//         await testFromEdit(page, validChannelName);
+//         await expect(page.getByText(successMessage)).toBeVisible();
+//         await cancel(page);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid SMTP E2E channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await create(page, "Email", invalidChannelName, async (page) => {
+            await page.getByLabel(/SMTP Host/).fill("smtp.invalid");
+            await page.getByLabel(/SMTP Port/).fill(getEnv("E2E_NOTIFICATION_SMTP_PORT"));
+            await page.getByLabel(/Username/).fill(getEnv("E2E_NOTIFICATION_SMTP_USER"));
+            await page.getByLabel(/Password/).fill("wrong-password");
+            await page.getByLabel(/From Email/).fill(getEnv("E2E_NOTIFICATION_SMTP_FROM"));
+            await page.getByLabel(/To Email/).fill(getEnv("E2E_NOTIFICATION_SMTP_TO"));
+        });
+        await submit(page);
+        await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await testFromEdit(page, invalidChannelName);
+        await expect(page.getByText("An error occurred while testing the notification channel, check your configuration")).toBeVisible();
+        await cancel(page);
+    });
+
+    test("Delete invalid SMTP channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Notification channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/notification/telegram.spec.ts

@@ -0,0 +1,72 @@
+import {expect, test} from "@playwright/test";
+import {
+    cancel, create, get, remove, submit, testFromEdit,
+} from "../helpers/notification";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const requiredChannelName = "Telegram E2E Required";
+const optionalChannelName = "Telegram E2E Optional";
+const invalidChannelName = "Telegram E2E Invalid";
+
+// test.describe.serial("Valid channels", () => {
+//     test("Create and test a valid Telegram channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Telegram", requiredChannelName, async (page) => {
+//             await page.getByLabel(/Telegram Bot Token/).fill(getEnv("E2E_NOTIFICATION_TELEGRAM_BOT_TOKEN"));
+//             await page.getByLabel(/Telegram Chat ID/).fill(getEnv("E2E_NOTIFICATION_TELEGRAM_CHAT_ID"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, requiredChannelName)).toBeVisible();
+//         await testFromEdit(page, requiredChannelName);
+//         await expect(page.getByText("Sent to Telegram")).toBeVisible();
+//         await cancel(page);
+//     });
+//
+//     test("Create and test a valid Telegram channel with Topic ID", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Telegram", optionalChannelName, async (page) => {
+//             await page.getByLabel(/Telegram Bot Token/).fill(getEnv("E2E_NOTIFICATION_TELEGRAM_BOT_TOKEN"));
+//             await page.getByLabel(/Telegram Chat ID/).fill(getEnv("E2E_NOTIFICATION_TELEGRAM_CHAT_ID"));
+//             await page.getByLabel(/Telegram Topic ID/).fill(getEnv("E2E_NOTIFICATION_TELEGRAM_TOPIC_ID"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, optionalChannelName)).toBeVisible();
+//         await testFromEdit(page, optionalChannelName);
+//         await expect(page.getByText("Sent to Telegram")).toBeVisible();
+//         await cancel(page);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid Telegram channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await create(page, "Telegram", invalidChannelName, async (page) => {
+            await page.getByLabel(/Telegram Bot Token/).fill("wrong-telegram-bot-token");
+            await page.getByLabel(/Telegram Chat ID/).fill(getEnv("E2E_NOTIFICATION_TELEGRAM_CHAT_ID"));
+            await page.getByLabel(/Telegram Topic ID/).fill(getEnv("E2E_NOTIFICATION_TELEGRAM_TOPIC_ID"));
+        });
+        await submit(page);
+        await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await testFromEdit(page, invalidChannelName);
+        await expect(page.getByText("An error occurred while testing the notification channel, check your configuration")).toBeVisible();
+        await cancel(page);
+    });
+
+    test("Delete invalid Telegram channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Notification channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/notification/webhook.spec.ts

@@ -0,0 +1,73 @@
+import {expect, test} from "@playwright/test";
+import {
+    cancel, create, get, remove, submit, testFromEdit,
+} from "../helpers/notification";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const requiredChannelName = "Webhook E2E Required";
+const optionalChannelName = "Webhook E2E Optional";
+const invalidChannelName = "Webhook E2E Invalid";
+
+// test.describe.serial("Valid channels", () => {
+//     test("Create and test a valid Webhook channel", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Webhook", requiredChannelName, async (page) => {
+//             await page.getByLabel(/Webhook URL/).fill(getEnv("E2E_NOTIFICATION_WEBHOOK_URL"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, requiredChannelName)).toBeVisible();
+//         await testFromEdit(page, requiredChannelName);
+//         await expect(page.getByText("Sent to Webhook")).toBeVisible();
+//         await cancel(page);
+//     });
+//
+//     test("Create and test a valid Webhook channel with optional header", async ({page}) => {
+//         await page.goto("/dashboard/notifications/channels");
+//         await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+//         await create(page, "Webhook", optionalChannelName, async (page) => {
+//             await page.getByLabel(/Webhook URL/).fill(getEnv("E2E_NOTIFICATION_WEBHOOK_URL"));
+//             await page.getByRole("button", { name: "Add Header" }).click();
+//             await page.getByLabel(/^Header Name$/).fill(getEnv("E2E_NOTIFICATION_WEBHOOK_SECRET_HEADER"));
+//             await page.getByLabel(/^Header Value$/).fill(getEnv("E2E_NOTIFICATION_WEBHOOK_SECRET"));
+//         });
+//         await submit(page);
+//         await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, optionalChannelName)).toBeVisible();
+//         await testFromEdit(page, optionalChannelName);
+//         await expect(page.getByText("Sent to Webhook")).toBeVisible();
+//         await cancel(page);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid Webhook channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await create(page, "Webhook", invalidChannelName, async (page) => {
+            await page.getByLabel(/Webhook URL/).fill("https://webhook.example.com/api/wrong-webhook");
+            await page.getByRole("button", { name: "Add Header" }).click();
+            await page.getByLabel(/^Header Name$/).fill(getEnv("E2E_NOTIFICATION_WEBHOOK_SECRET_HEADER"));
+            await page.getByLabel(/^Header Value$/).fill("wrong-webhook-secret");
+        });
+        await submit(page);
+        await expect(page.getByText("Notification channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await testFromEdit(page, invalidChannelName);
+        await expect(page.getByText("An error occurred while testing the notification channel, check your configuration")).toBeVisible();
+        await cancel(page);
+    });
+
+    test("Delete invalid Webhook E2E channel", async ({page}) => {
+        await page.goto("/dashboard/notifications/channels");
+        await expect(page.getByRole("heading", {name: "Notification channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Notification channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/project.spec.ts

@@ -0,0 +1,59 @@
+import {expect, test} from "@playwright/test";
+import {create, edit, get, remove} from "./helpers/project";
+import {LOCAL_STORAGE_PATH} from "./helpers/session";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const project = {
+    emptyStateName: "Project A",
+    buttonName: "Project B",
+    updatedButtonName: "Project B Updated",
+};
+
+test.describe.serial(() => {
+    test("Create a project from empty state", async ({page}) => {
+        await page.goto("/dashboard/projects");
+        await expect(page.getByRole("heading", {name: "Projects"})).toBeVisible();
+        await expect(page.getByText("Create new Project", {exact: true})).toBeVisible();
+
+        await create(page, "emptyState", project.emptyStateName);
+
+        await expect(page.getByText("Project has been successfully created.")).toBeVisible();
+        await expect(get(page, project.emptyStateName)).toBeVisible();
+        await expect(page.getByText("Create new Project", {exact: true})).toHaveCount(0);
+    });
+
+    test("Create a project from classic button", async ({page}) => {
+        await page.goto("/dashboard/projects");
+        await expect(page.getByRole("heading", {name: "Projects"})).toBeVisible();
+        await expect(get(page, project.emptyStateName)).toBeVisible();
+
+        await create(page, "button", project.buttonName);
+
+        await expect(page.getByText("Project has been successfully created.")).toBeVisible();
+        await expect(get(page, project.buttonName)).toBeVisible();
+    });
+
+    test("Edit the second created project", async ({page}) => {
+        await page.goto("/dashboard/projects");
+        await expect(page.getByRole("heading", {name: "Projects"})).toBeVisible();
+        await expect(get(page, project.buttonName)).toBeVisible();
+
+        await edit(page, project.buttonName, project.updatedButtonName);
+
+        await expect(page.getByText("Project has been successfully updated.")).toBeVisible();
+        await expect(page.getByText(project.updatedButtonName, {exact: true})).toBeVisible();
+    });
+
+    test("Delete the second created project", async ({page}) => {
+        await page.goto("/dashboard/projects");
+        await expect(page.getByRole("heading", {name: "Projects"})).toBeVisible();
+        await expect(get(page, project.updatedButtonName)).toBeVisible();
+
+        await remove(page, project.updatedButtonName);
+
+        await expect(page).toHaveURL("/dashboard/projects");
+        await expect(page.getByText("Projects has been successfully archived.")).toBeVisible();
+        await expect(page.getByText(project.updatedButtonName)).toHaveCount(0);
+    });
+});

e2e/setup.spec.ts

@@ -0,0 +1,13 @@
+import {test} from "@playwright/test";
+import fs from "fs";
+import {LOCAL_STORAGE_PATH} from "./helpers/session";
+
+test.describe(() => {
+    test.beforeAll(async () => {
+        if (fs.existsSync(LOCAL_STORAGE_PATH)) fs.unlinkSync(LOCAL_STORAGE_PATH);
+        fs.writeFileSync(LOCAL_STORAGE_PATH, JSON.stringify({}));
+    });
+
+    test("Prepare shared storage state", async () => {
+    });
+});

e2e/storage/google-drive.spec.ts

@@ -0,0 +1,60 @@
+import {expect, test} from "@playwright/test";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+import {
+    cancel, create, get, remove, submit, testConnection, testFromEdit,
+} from "../helpers/storage";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const requiredChannelName = "Google Drive E2E Required";
+const invalidChannelName = "Google Drive E2E Invalid";
+
+// test.describe.serial("Valid channel", () => {
+//     test("Create and test a valid Google Drive channel", async ({page}) => {
+//         await page.goto("/dashboard/storages/channels");
+//         await expect(page.getByRole("heading", {name: "Storage channels"})).toBeVisible();
+//         await create(page, "Google Drive", requiredChannelName, async (page) => {
+//             await page.getByLabel(/Client ID/).fill(getEnv("E2E_STORAGE_GOOGLE_DRIVE_CLIENT_ID"));
+//             await page.getByLabel(/Client Secret/).fill(getEnv("E2E_STORAGE_GOOGLE_DRIVE_CLIENT_SECRET"));
+//             await page.getByLabel(/Folder ID/).fill(getEnv("E2E_STORAGE_GOOGLE_DRIVE_FOLDER_ID"));
+//         });
+//         await expect(page.getByRole("heading", {name: "Add Storage Channel"})).toBeVisible();
+//         await testConnection(page);
+//         await expect(page.getByText("Successfully connected to storage channel")).toBeVisible();
+//         await submit(page);
+//         await expect(page.getByText("Storage channel has been successfully created.")).toBeVisible();
+//         await expect(get(page, requiredChannelName)).toBeVisible();
+//
+//         await testFromEdit(page, requiredChannelName);
+//         await expect(page.getByRole("heading", {name: "Edit Storage Channel"})).toBeVisible();
+//         await expect(page.getByText("Successfully connected to storage channel")).toBeVisible();
+//         await cancel(page);
+//     });
+// });
+
+test.describe.serial("Invalid channel", () => {
+    test("Create and test invalid Google Drive channel", async ({page}) => {
+        await page.goto("/dashboard/storages/channels");
+        await expect(page.getByRole("heading", {name: "Storage channels"})).toBeVisible();
+        await create(page, "Google Drive", invalidChannelName, async (page) => {
+            await page.getByLabel(/Client ID/).fill(getEnv("E2E_STORAGE_GOOGLE_DRIVE_CLIENT_ID"));
+            await page.getByLabel(/Client Secret/).fill("wrong-google-drive-client-secret");
+            await page.getByLabel(/Folder ID/).fill(getEnv("E2E_STORAGE_GOOGLE_DRIVE_FOLDER_ID"));
+        });
+        await testConnection(page);
+        await expect(page.getByText("An error occurred while testing the storage channel")).toBeVisible();
+        await submit(page);
+        await expect(page.getByText("Storage channel has been successfully created.")).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+    });
+
+    test("Delete invalid Google Drive E2E channel", async ({page}) => {
+        await page.goto("/dashboard/storages/channels");
+        await expect(page.getByRole("heading", {name: "Storage channels"})).toBeVisible();
+        await expect(get(page, invalidChannelName)).toBeVisible();
+        await remove(page, invalidChannelName);
+        await expect(page.getByText("Storage channel has been successfully removed.")).toBeVisible();
+        await expect(page.getByText(invalidChannelName)).toHaveCount(0);
+    });
+});

e2e/storage/s3.spec.ts

@@ -0,0 +1,121 @@
+import {expect, test} from "@playwright/test";
+import {getEnv} from "../helpers/env";
+import {LOCAL_STORAGE_PATH} from "../helpers/session";
+import {
+    cancel, create, get, remove, submit, testConnection, testFromEdit,
+} from "../helpers/storage";
+
+test.use({storageState: LOCAL_STORAGE_PATH});
+
+const providers = [
+    {
+        title: "AWS S3",
+        requiredChannelName: "AWS S3 E2E Required",
+        optionalChannelName: "AWS S3 E2E Optional",
+        invalidChannelName: "AWS S3 E2E Invalid",
+        endpointUrl: getEnv("E2E_STORAGE_AWS_S3_ENDPOINT_URL"),
+        region: getEnv("E2E_STORAGE_AWS_S3_REGION"),
+        accessKey: getEnv("E2E_STORAGE_AWS_S3_ACCESS_KEY"),
+        secretKey: getEnv("E2E_STORAGE_AWS_S3_SECRET_KEY"),
+        bucketName: getEnv("E2E_STORAGE_AWS_S3_BUCKET_NAME"),
+        port: getEnv("E2E_STORAGE_AWS_S3_PORT"),
+        invalidAccessKey: "wrong-aws-access-key",
+        invalidSecretKey: "wrong-aws-secret-key",
+    },
+    {
+        title: "Cloudflare R2",
+        requiredChannelName: "Cloudflare R2 E2E Required",
+        optionalChannelName: "Cloudflare R2 E2E Optional",
+        invalidChannelName: "Cloudflare R2 E2E Invalid",
+        endpointUrl: getEnv("E2E_STORAGE_R2_ENDPOINT_URL"),
+        region: getEnv("E2E_STORAGE_R2_REGION"),
+        accessKey: getEnv("E2E_STORAGE_R2_ACCESS_KEY"),
+        secretKey: getEnv("E2E_STORAGE_R2_SECRET_KEY"),
+        bucketName: getEnv("E2E_STORAGE_R2_BUCKET_NAME"),
+        port: getEnv("E2E_STORAGE_R2_PORT"),
+        invalidAccessKey: "wrong-r2-access-key",
+        invalidSecretKey: "wrong-r2-secret-key",
+    },
+] as const;
+
+for (const provider of providers) {
+    test.describe(provider.title, () => {
+        // test.describe.serial("Valid channels", () => {
+        //     test(`Create and test a valid ${provider.title} channel`, async ({page}) => {
+        //         await page.goto("/dashboard/storages/channels");
+        //         await expect(page.getByRole("heading", {name: "Storage channels"})).toBeVisible();
+        //         await create(page, "S3", provider.requiredChannelName, async (page) => {
+        //             await page.getByLabel(/Endpoint URL/).fill(provider.endpointUrl);
+        //             await page.getByLabel(/Access Key/).fill(provider.accessKey);
+        //             await page.getByLabel(/Secret Key/).fill(provider.secretKey);
+        //             await page.getByLabel(/Bucket name/).fill(provider.bucketName);
+        //         });
+        //         await expect(page.getByRole("heading", {name: "Add Storage Channel"})).toBeVisible();
+        //         await testConnection(page);
+        //         await expect(page.getByText("Successfully connected to storage channel")).toBeVisible();
+        //         await submit(page);
+        //         await expect(page.getByText("Storage channel has been successfully created.")).toBeVisible();
+        //         await expect(get(page, provider.requiredChannelName)).toBeVisible();
+        //
+        //         await testFromEdit(page, provider.requiredChannelName);
+        //         await expect(page.getByRole("heading", {name: "Edit Storage Channel"})).toBeVisible();
+        //         await expect(page.getByText("Successfully connected to storage channel")).toBeVisible();
+        //         await cancel(page);
+        //     });
+        //
+        //     test(`Create and test a valid ${provider.title} channel with optional region and port`, async ({page}) => {
+        //         await page.goto("/dashboard/storages/channels");
+        //         await expect(page.getByRole("heading", {name: "Storage channels"})).toBeVisible();
+        //         await create(page, "S3", provider.optionalChannelName, async (page) => {
+        //             await page.getByLabel(/Endpoint URL/).fill(provider.endpointUrl);
+        //             await page.getByLabel(/^Region$/).fill(provider.region);
+        //             await page.getByLabel(/Access Key/).fill(provider.accessKey);
+        //             await page.getByLabel(/Secret Key/).fill(provider.secretKey);
+        //             await page.getByLabel(/Bucket name/).fill(provider.bucketName);
+        //             await page.getByLabel(/^Port$/).fill(provider.port);
+        //         });
+        //         await expect(page.getByRole("heading", {name: "Add Storage Channel"})).toBeVisible();
+        //         await testConnection(page);
+        //         await expect(page.getByText("Successfully connected to storage channel")).toBeVisible();
+        //         await submit(page);
+        //         await expect(page.getByText("Storage channel has been successfully created.")).toBeVisible();
+        //         await expect(get(page, provider.optionalChannelName)).toBeVisible();
+        //
+        //         await testFromEdit(page, provider.optionalChannelName);
+        //         await expect(page.getByRole("heading", {name: "Edit Storage Channel"})).toBeVisible();
+        //         await expect(page.getByText("Successfully connected to storage channel")).toBeVisible();
+        //         await cancel(page);
+        //     });
+        // });
+
+        test.describe.serial("Invalid channel", () => {
+            test(`Create and test invalid ${provider.title} channel`, async ({page}) => {
+                await page.goto("/dashboard/storages/channels");
+                await expect(page.getByRole("heading", {name: "Storage channels"})).toBeVisible();
+                await create(page, "S3", provider.invalidChannelName, async (page) => {
+                    await page.getByLabel(/Endpoint URL/).fill(provider.endpointUrl);
+                    await page.getByLabel(/^Region$/).fill(provider.region);
+                    await page.getByLabel(/Access Key/).fill(provider.invalidAccessKey);
+                    await page.getByLabel(/Secret Key/).fill(provider.invalidSecretKey);
+                    await page.getByLabel(/Bucket name/).fill(provider.bucketName);
+                    await page.getByLabel(/^Port$/).fill(provider.port);
+                });
+                await expect(page.getByRole("heading", {name: "Add Storage Channel"})).toBeVisible();
+                await testConnection(page);
+                await expect(page.getByText("An error occurred while testing the storage channel")).toBeVisible();
+                await submit(page);
+                await expect(page.getByText("Storage channel has been successfully created.")).toBeVisible();
+                await expect(get(page, provider.invalidChannelName)).toBeVisible();
+            });
+
+            test(`Delete invalid ${provider.title} channel`, async ({page}) => {
+                await page.goto("/dashboard/storages/channels");
+                await expect(page.getByRole("heading", {name: "Storage channels"})).toBeVisible();
+                await expect(get(page, provider.invalidChannelName)).toBeVisible();
+                await remove(page, provider.invalidChannelName);
+                await expect(page.getByText("Storage channel has been successfully removed.")).toBeVisible();
+                await expect(page.getByText(provider.invalidChannelName)).toHaveCount(0);
+            });
+        });
+    });
+}

helm/templates/deployment.yaml

@@ -27,6 +27,30 @@ spec:
           volumeMounts:
             - name: data
               mountPath: /data
+          startupProbe:
+            httpGet:
+              path: /api/health
+              port: 80
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            failureThreshold: 12
+            timeoutSeconds: 5
+          livenessProbe:
+            httpGet:
+              path: /api/health
+              port: 80
+            initialDelaySeconds: 0
+            periodSeconds: 30
+            timeoutSeconds: 5
+            failureThreshold: 3
+          readinessProbe:
+            httpGet:
+              path: /api/health
+              port: 80
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 3
       volumes:
         - name: data
           persistentVolumeClaim:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "portabase",
-  "version": "1.9.2",
+  "version": "1.17.1",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack -p 8887",
@@ -15,9 +15,13 @@
     "release": "release-it"
   },
   "dependencies": {
-    "@better-auth/passkey": "^1.5.6",
-    "@better-auth/sso": "^1.5.6",
-    "@hookform/resolvers": "^5.2.2",
+    "@asteasolutions/zod-to-openapi": "^8.5.0",
+    "@better-auth/api-key": "1.6.11",
+    "@better-auth/core": "1.6.11",
+    "@better-auth/passkey": "1.6.11",
+    "@better-auth/sso": "1.6.11",
+    "@hookform/resolvers": "^5.4.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-aspect-ratio": "^1.1.8",
@@ -48,44 +52,46 @@
     "@radix-ui/react-tooltip": "^1.2.8",
     "@react-email/components": "^0.0.41",
     "@t3-oss/env-nextjs": "^0.13.11",
-    "@tanstack/react-query": "^5.95.2",
+    "@tanstack/react-query": "^5.100.14",
     "@tanstack/react-table": "^8.21.3",
     "@types/nodemailer": "^6.4.23",
     "@types/ws": "^8.18.1",
     "@zenstackhq/runtime": "2.14.2",
     "argon2": "^0.43.1",
     "bcrypt": "^6.0.0",
-    "better-auth": "1.5.6",
+    "better-auth": "1.6.11",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "date-fns": "^4.1.0",
-    "dockerode": "^4.0.10",
+    "date-fns": "^4.3.0",
+    "dockerode": "^4.0.12",
     "dotenv": "^16.6.1",
-    "drizzle-orm": "^0.43.1",
-    "drizzle-zod": "^0.7.1",
+    "drizzle-orm": "0.45.2",
+    "drizzle-zod": "0.8.3",
     "embla-carousel-react": "^8.6.0",
     "googleapis": "^170.1.0",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.553.0",
     "minio": "^8.0.7",
-    "motion": "^12.38.0",
-    "next": "16.2.1",
+    "motion": "^12.40.0",
+    "next": "16.2.3",
     "next-safe-action": "^7.10.8",
     "next-themes": "^0.4.6",
     "node-cron": "^4.2.1",
     "node-forge": "^1.4.0",
-    "nodemailer": "^7.0.13",
+    "nodemailer": "8.0.5",
     "npm-check-updates": "^18.3.1",
-    "pg": "^8.20.0",
-    "prettier": "^3.8.1",
-    "react": "^19.2.4",
+    "pg": "^8.21.0",
+    "pino": "^10.3.1",
+    "pino-pretty": "^13.1.3",
+    "prettier": "^3.8.3",
+    "react": "^19.2.6",
     "react-day-picker": "9.7.0",
-    "react-dom": "^19.2.4",
+    "react-dom": "^19.2.6",
     "react-dropzone": "^14.4.1",
     "react-email": "^4.3.2",
-    "react-hook-form": "^7.72.0",
-    "react-qr-code": "^2.0.18",
+    "react-hook-form": "^7.76.1",
+    "react-qr-code": "^2.0.21",
     "react-resizable-panels": "^3.0.6",
     "react-twc": "^1.5.1",
     "react-use-measure": "^2.1.7",
@@ -94,43 +100,44 @@
     "socket.io": "^4.8.3",
     "socket.io-client": "^4.8.3",
     "sonner": "^2.0.7",
-    "swiper": "^12.1.3",
-    "tailwind-merge": "^3.5.0",
-    "uuid": "^11.1.0",
+    "swiper": "^12.1.4",
+    "tailwind-merge": "^3.6.0",
+    "uuid": "^11.1.1",
     "vaul": "^1.1.2",
-    "ws": "^8.20.0",
-    "zod": "^3.25.76"
+    "ws": "^8.21.0",
+    "zod": "4.3.6"
   },
   "devDependencies": {
     "@iconify/react": "^6.0.2",
     "@playwright/test": "1.58.2",
     "@react-email/preview-server": "4.3.2",
-    "@react-email/render": "^2.0.4",
+    "@react-email/render": "^2.0.8",
     "@release-it/bumper": "^7.0.5",
     "@release-it/conventional-changelog": "^10.0.6",
-    "@tailwindcss/postcss": "^4.2.2",
+    "@tailwindcss/postcss": "^4.3.0",
     "@types/eslint-plugin-tailwindcss": "^3.17.0",
-    "@types/node": "^22.19.15",
+    "@types/node": "^22.19.19",
     "@types/node-forge": "^1.3.14",
     "@types/pg": "^8.20.0",
-    "@types/react": "^19.2.14",
+    "@types/react": "^19.2.15",
     "@types/react-dom": "^19.2.3",
     "@zenstackhq/openapi": "^2.22.1",
     "@zenstackhq/tanstack-query": "^2.22.2",
-    "baseline-browser-mapping": "^2.10.12",
+    "baseline-browser-mapping": "^2.10.32",
     "drizzle-kit": "^0.31.10",
-    "esbuild": "^0.27.4",
+    "esbuild": "^0.27.7",
     "eslint": "^9.39.4",
-    "eslint-config-next": "^16.2.1",
-    "eslint-plugin-tailwindcss": "^3.18.2",
-    "framer-motion": "^12.38.0",
-    "postcss": "^8.5.8",
+    "eslint-config-next": "^16.2.6",
+    "eslint-plugin-tailwindcss": "^3.18.3",
+    "framer-motion": "^12.40.0",
+    "node-pty": "^1.1.0",
+    "postcss": "8.5.10",
     "release-it": "^19.2.4",
-    "tailwindcss": "^4.2.2",
-    "tsx": "^4.21.0",
+    "tailwindcss": "^4.3.0",
+    "tsx": "^4.22.3",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.9.3",
     "zenstack": "2.14.2"
   },
-  "packageManager": "pnpm@10.33.0"
+  "packageManager": "pnpm@11.3.0"
 }

playwright.config.ts

@@ -1,12 +1,12 @@
 import { defineConfig, devices } from '@playwright/test';
+import dotenv from 'dotenv';
+import path from 'path';
 
 /**
  * Read environment variables from file.
  * https://github.com/motdotla/dotenv
  */
-// import dotenv from 'dotenv';
-// import path from 'path';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
+dotenv.config({ path: path.resolve(__dirname, '.env') });
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -25,55 +25,55 @@ export default defineConfig({
   reporter: 'html',
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
-    /* Base URL to use in actions like `await page.goto('')`. */
+    ...devices['Desktop Chrome'],
     baseURL: process.env.PROJECT_URL,
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
   },
 
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
+  /* Configure projects and dependency order */
+    projects: [
+        {
+            name: 'setup',
+            testMatch: '**/setup.spec.ts',
+        },
+        {
+            name: 'auth',
+            testMatch: '**/auth.spec.ts',
+            dependencies: ['setup'],
+        },
+        {
+            name: 'access-management',
+            testMatch: '**/access-management.spec.ts',
+            dependencies: ['auth'],
+        },
+        {
+            name: 'notification',
+            testMatch: '**/notification/**/*.spec.ts',
+            dependencies: ['access-management'],
+        },
+        {
+            name: 'storage',
+            testMatch: '**/storage/**/*.spec.ts',
+            dependencies: ['access-management'],
+        },
+        {
+            name: 'agent',
+            testMatch: '**/agent.spec.ts',
+            dependencies: ['access-management'],
+        },
 
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
+        {
+            name: 'project',
+            testMatch: '**/project.spec.ts',
+            dependencies: ['access-management'],
+        },
+        {
+            name: 'cleanup',
+            testMatch: '**/cleanup.spec.ts',
+            dependencies: ['agent', 'storage', 'notification', 'project'],
+        },
+    ]
 
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'docker compose up -d && make up',
-  //   url: 'http://localhost:8887',
-  //   reuseExistingServer: !process.env.CI,
-  // },
 });

pnpm-workspace.yaml

@@ -1,3 +1,19 @@
+allowBuilds:
+  '@prisma/client': true
+  '@prisma/engines': true
+  argon2: true
+  bcrypt: true
+  cpu-features: true
+  esbuild: true
+  node-pty: true
+  prisma: true
+  protobufjs: true
+  sharp: true
+  ssh2: true
+  unrs-resolver: true
+  zenstack: true
+ignoredBuiltDependencies:
+  - node-pty
 onlyBuiltDependencies:
   - '@prisma/client'
   - '@prisma/engines'