chore: release 1.22.4

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

.env.example

@@ -78,3 +78,9 @@ TRUSTED_DOMAINS="http://localhost:8887, http://localhost:3055, http://localhost:
 #OPENAPI_ENABLED=true
 #API_ENABLED=true
 #MCP_ENABLED=true
+
+# Default to false
+#TUSD_BEHIND_PROXY=true
+
+#Skip the onboarding on fresh instance
+#SKIP_ONBOARDING=true

.eslintrc.json

@@ -1,11 +1,7 @@
 {
-  "extends": [
-    "next/core-web-vitals",
-    "plugin:tailwindcss/recommended"
-  ],
+  "extends": ["next/core-web-vitals", "plugin:tailwindcss/recommended"],
   "rules": {
     "react/no-unescaped-entities": "off",
     "react-hooks/rules-of-hooks": "off"
-
   }
 }

.github/CONTRIBUTING.md

@@ -14,8 +14,9 @@ Please take a moment to review this guide. It will help you understand how to co
 2. [Reporting Issues](#reporting-issues)
 3. [Submitting Changes](#submitting-changes)
 4. [Code Style Guidelines](#code-style-guidelines)
-5. [Pull Request Process](#pull-request-process)
-6. [Community Guidelines](#community-guidelines)
+5. [E2E Tests](#e2e-tests)
+6. [Pull Request Process](#pull-request-process)
+7. [Community Guidelines](#community-guidelines)
 
 ---
 
@@ -88,6 +89,14 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 ---
 
+## E2E Tests
+
+E2E tests now live in a dedicated repository: [Portabase/e2e-tests](https://github.com/Portabase/e2e-tests).
+
+If your contribution needs corresponding end-to-end test coverage, add it there instead of this repo.
+
+---
+
 ## Pull Request Process
 
 1. Ensure your code passes all tests and linters.

.github/workflows/docker.yml

@@ -73,7 +73,7 @@ jobs:
           tags: ${{ steps.prep.outputs.image }}
           target: ${{ inputs.target }}
           cache-from: type=gha,scope=build-${{ matrix.platform }}
-          cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }},ignore-error=true
 
       - name: Save image name for manifest
         run: echo "${{ steps.prep.outputs.image }}" > image.txt

.github/workflows/e2e.yml

@@ -4,114 +4,83 @@ on:
   pull_request:
     branches: [main]
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
-  build-and-test:
+  build-image:
     runs-on: ubuntu-latest
     if: github.event.pull_request.head.repo.full_name == github.repository
+    outputs:
+      image: ${{ steps.image.outputs.ref }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+      - name: Compute image reference
+        id: image
+        run: echo "ref=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/portabase:${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
         with:
-          node-version: 22
-          cache: 'pnpm'
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Build Docker image
+      - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/dockerfile/Dockerfile
-          push: false
-          load: true
-          tags: portabase/portabase:test
+          push: true
+          tags: ${{ steps.image.outputs.ref }}
+          target: prod
 
-      - name: Run app container
-        run: |
-          docker run -d --name myapp \
-            -p 8887:80 \
-            -e NODE_ENV=production \
-            -e PROJECT_URL=http://localhost:8887 \
-            -e PROJECT_SECRET=80af5e4c875dfded3a6ba511c6ed8b0160cad723f848ee0851403ed6141f6ba1 \
-            portabase/portabase:test
-
-      - name: Wait for app port to be listening
-        run: |
-          for i in {1..40}; do
-          
-            if curl -fsS http://localhost:8887/ >/dev/null; then
-              echo "App is responding on port 8887"
-              exit 0
-            fi
-            echo "Waiting for app readiness... ($i/40)"
-            sleep 2
-          done
-          echo "Timeout: app never became ready"
-          docker logs myapp
-          exit 1
-
-      - name: Install Playwright browsers
-        run: pnpm exec playwright install --with-deps chromium
-
-      - name: Run Playwright tests
-        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()
-        uses: actions/upload-artifact@v4
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 7
-
-      - name: Cleanup
-        if: always()
-        run: docker stop myapp && docker rm myapp || true
+  run-e2e:
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    needs: build-image
+    uses: portabase/e2e-tests/.github/workflows/run-e2e.yml@main
+    with:
+      server_image: ${{ needs.build-image.outputs.image }}
+    secrets:
+      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_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 }}

.gitignore

@@ -9,6 +9,8 @@
 
 # testing
 /coverage
+gcs-data/
+gcs-storage/
 
 # next.js
 /.next/
@@ -28,6 +30,8 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env
+**/.env
 
 # vercel
 .vercel
@@ -60,3 +64,4 @@ certificates
 .codex
 /docs
 .worktrees
+.superpowers

CITATION.cff

@@ -33,5 +33,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.18.0
+version: 1.22.4
 date-released: '2026-03-02'

Makefile

@@ -47,16 +47,10 @@ export-keycloak:
 	@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."
+seed-blob:
+	@chmod +x seeds/azurite/azurite-seed.sh
+	@bash seeds/azurite/azurite-seed.sh
 
-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."
+list-blob:
+	@chmod +x seeds/azurite/azurite-list.sh
+	@bash seeds/azurite/azurite-list.sh

README.md

@@ -54,12 +54,13 @@
 
 ## Installation
 
-You have 4 ways to install Portabase:
+You have 5 ways to install Portabase:
 
 - Automated CLI (recommended) - [details](https://portabase.io/docs/dashboard/setup#cli)
 - Docker Run - [details](https://portabase.io/docs/dashboard/setup#docker)
 - Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker-compose)
-- Kubernetes with Helm [details](https://portabase.io/docs/dashboard/setup#helm)
+- Unraid Community Apps - [details](https://ca.unraid.net/apps/portabase-dashboard-1sdc97m05ufd7q) - [unraid support thread](https://forums.unraid.net/topic/199072-support-portabase-dashboard-agent-dockers/)
+- Kubernetes with Helm - [details](https://portabase.io/docs/dashboard/setup#helm)
 - Development setup - [details](https://portabase.io/docs/dashboard/setup#development)
 
 **Ensure Docker is installed on your machine before getting started.**
@@ -77,6 +78,7 @@ You have 4 ways to install Portabase:
 | **Valkey**         | ✅ Stable  | 7.2+                          | No      |
 | **Firebird**       | ✅ Stable  | 3.0, 4.0, 5.0                 | Yes     |
 | **MSSQL Server**   | ✅ Stable  | 2017, 2019, 2022, Azure SQL         | Yes     |
+| **Docker Volume**  | ✅ Stable  | Docker Engine 20.10+  | 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,9 +1,9 @@
 import { CardContent, CardHeader } from "@/components/ui/card";
 
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { ForgotPasswordForm } from "@/features/auth/forgot-password-form";
+import { ForgotPasswordForm } from "@/features/auth/components/forgot-password-form";
 import { env } from "@/env.mjs";
-import { CardAuth } from "@/features/layout/card-auth";
+import { CardAuth } from "@/features/layout/components/card-auth";
 import { redirect } from "next/navigation";
 
 export default async function RoutePage(props: { searchParams: Promise<{ callbackUrl: string | undefined }> }) {

app/(auth)/guard/page.tsx

@@ -1,9 +1,9 @@
 import {CardContent, CardHeader} from "@/components/ui/card";
 import {TooltipProvider} from "@/components/ui/tooltip";
-import {GuardForm} from "@/features/auth/guard-form";
+import {GuardForm} from "@/features/auth/components/guard-form";
 import {cookies} from "next/headers";
 import {redirect} from "next/navigation";
-import {CardAuth} from "@/features/layout/card-auth";
+import {CardAuth} from "@/features/layout/components/card-auth";
 
 export default async function GuardPage() {
 

app/(auth)/layout.tsx

@@ -1,7 +1,9 @@
 import React from "react";
 import { redirect } from "next/navigation";
 import { currentUser } from "@/lib/auth/current-user";
-import { AuthLogoSection } from "@/features/auth/auth-logo-section";
+import { isOnboardingDone } from "@/db/services/setting";
+import { AuthLogoSection } from "@/features/auth/components/auth-logo-section";
+import { env } from "@/env.mjs";
 import { Heart } from "lucide-react";
 
 export default async function Layout({
@@ -9,6 +11,10 @@ export default async function Layout({
 }: {
   children: React.ReactNode;
 }) {
+  if (env.SKIP_ONBOARDING !== "true" && !(await isOnboardingDone())) {
+    redirect("/welcome");
+  }
+
   const user = await currentUser();
 
   if (user && !user.banned && user.role !== "pending") {

app/(auth)/login/page.tsx

@@ -1,12 +1,12 @@
-import { LoginForm } from "@/features/auth/login-form";
+import { LoginForm } from "@/features/auth/components/login-form";
 import { Metadata } from "next";
 import { SUPPORTED_PROVIDERS } from "@/lib/auth/config";
-import { SocialAuthButtons } from "@/features/auth/social-buttons";
+import { SocialAuthButtons } from "@/features/auth/components/social-buttons";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { CardContent, CardHeader } from "@/components/ui/card";
 import Link from "next/link";
 import { Separator } from "@/components/ui/separator";
-import { CardAuth } from "@/features/layout/card-auth";
+import { CardAuth } from "@/features/layout/components/card-auth";
 import { env } from "@/env.mjs";
 
 export const metadata: Metadata = {

app/(auth)/register/page.tsx

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

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

@@ -1,10 +1,10 @@
 import { CardContent, CardHeader } from "@/components/ui/card";
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { ResetPasswordForm } from "@/features/auth/reset-password-form";
+import { ResetPasswordForm } from "@/features/auth/components/reset-password-form";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth/auth";
 import { Avatar, AvatarImage, AvatarFallback } from "@radix-ui/react-avatar";
-import { CardAuth } from "@/features/layout/card-auth";
+import { CardAuth } from "@/features/layout/components/card-auth";
 import { env } from "@/env.mjs";
 
 export default async function RoutePage(props: { searchParams: Promise<{ token: string | undefined }> }) {

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

@@ -3,8 +3,8 @@ import {eq} from "drizzle-orm";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {PageParams} from "@/types/next";
-import {Page} from "@/features/layout/page";
-import {OrganizationManagement} from "@/features/organizations/admin-organization-management";
+import {Page} from "@/features/layout/components/page";
+import {OrganizationManagement} from "@/features/organizations/components/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

@@ -1,10 +1,10 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {db} from "@/db";
 import {
     AdminOrganizationAddModal
-} from "@/features/organizations/admin-organization-add-modal";
-import {AdminOrganizationList} from "@/features/organizations/admin-organization-list";
+} from "@/features/organizations/components/admin-organization-add-modal";
+import {AdminOrganizationList} from "@/features/organizations/components/admin-organization-list";
 import {isNull} from "drizzle-orm";
 
 export default async function RoutePage(props: PageParams<{}>) {

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

@@ -1,9 +1,9 @@
 import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {db} from "@/db";
 import {logger} from "@/lib/logger";
 import {notFound} from "next/navigation";
-import {SettingsTabs} from "@/features/settings/settings-tabs";
+import {SettingsTabs} from "@/features/settings/components/settings-tabs";
 import {desc, isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {StorageChannelWith} from "@/db/schema/12_storage-channel";

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

@@ -1,21 +1,28 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {db} from "@/db";
 import {desc, isNull} from "drizzle-orm";
-import {AdminUserList} from "@/features/users/admin-user-list";
-import {AdminUserAddModal} from "@/features/users/admin-user-add-modal";
+import {AdminUserList} from "@/features/users/components/admin-user-list";
+import {AdminUserAddModal} from "@/features/users/components/admin-user-add-modal";
 import {SUPPORTED_PROVIDERS} from "@/lib/auth/config";
+import {getSettings} from "@/db/services/setting";
+import {resolveAvatarUrl} from "@/utils/resolve-avatar-url";
 
 export default async function RoutePage(props: PageParams<{}>) {
 
-    const users = await db.query.user.findMany({
-        where: (fields) => isNull(fields.deletedAt),
-        with: {
-            accounts: true
-        },
-        orderBy: (fields) => desc(fields.createdAt),
+    const [settings, users] = await Promise.all([
+        getSettings(),
+        db.query.user.findMany({
+            where: (fields) => isNull(fields.deletedAt),
+            with: { accounts: true },
+            orderBy: (fields) => desc(fields.createdAt),
+        }),
+    ]);
+
+    const avatarUrls = Object.fromEntries(
+        users.map((u) => [u.id, resolveAvatarUrl(u, settings)])
+    );
 
-    });
     const organizations = await db.query.organization.findMany({
         with: {
             members: true,
@@ -38,7 +45,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">
-                <AdminUserList users={users} isPasswordAuthEnabled={isPasswordAuthEnabled}/>
+                <AdminUserList users={users} isPasswordAuthEnabled={isPasswordAuthEnabled} avatarUrls={avatarUrls}/>
             </PageContent>
         </Page>
     );

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

@@ -4,17 +4,17 @@ import {
   PageContent,
   PageDescription,
   PageTitle,
-} from "@/features/layout/page";
+} from "@/features/layout/components/page";
 import { db } from "@/db";
 import * as drizzleDb from "@/db";
 import {eq, isNull} from "drizzle-orm";
 import { notFound } from "next/navigation";
-import { ButtonDeleteAgent } from "@/features/agents/agent-delete-button";
+import { ButtonDeleteAgent } from "@/features/agents/components/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 { AgentContentPage } from "@/features/agents/components/agent-content";
+import { AgentDialog } from "@/features/agents/components/agent-dialog";
 
 
 export default async function RoutePage(
@@ -81,7 +81,7 @@ export default async function RoutePage(
         </PageDescription>
       )}
       <PageContent className="flex flex-col w-full h-full justify-between gap-6">
-        <AgentContentPage agent={agent} edgeKey={edgeKey} />
+        <AgentContentPage agent={agent} edgeKey={edgeKey} canDeleteDatabases={true} />
       </PageContent>
     </Page>
   );

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

@@ -1,13 +1,13 @@
 import {PageParams} from "@/types/next";
-import {AgentCard} from "@/features/agents/agent-card";
+import {AgentCard} from "@/features/agents/components/agent-card";
 import {CardsWithPagination} from "@/components/common/cards-with-pagination";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {and, desc, eq, isNull, not} from "drizzle-orm";
 import {Metadata} from "next";
-import {AgentDialog} from "@/features/agents/agent-dialog";
+import {AgentDialog} from "@/features/agents/components/agent-dialog";
 
 export const metadata: Metadata = {
     title: "Agents",

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

@@ -1,11 +1,11 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 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 "@/features/channel/channels-section";
-import {ChannelAddEditModal} from "@/features/channel/channel-add-edit-modal";
+import {ChannelsSection} from "@/features/channel/components/channels-section";
+import {ChannelAddEditModal} from "@/features/channel/components/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 {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Metadata} from "next";
-import {NotificationLogsList} from "@/features/notifications/notification-logs-list";
+import {NotificationLogsList} from "@/features/notifications/components/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 {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Metadata} from "next";
-import {ChannelsSection} from "@/features/channel/channels-section";
+import {ChannelsSection} from "@/features/channel/components/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 "@/features/channel/channel-add-edit-modal";
+import {ChannelAddEditModal} from "@/features/channel/components/channel-add-edit-modal";
 
 export const metadata: Metadata = {
     title: "Storage Channels",

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

@@ -1,10 +1,10 @@
 import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/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";
+import {MigrationTool} from "@/features/migration/components/migration-tool";
 
 export const metadata: Metadata = {
     title: "Projects",

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

@@ -1,122 +1,128 @@
-import {PageParams} from "@/types/next";
-import {notFound, redirect} from "next/navigation";
-import {Page} from "@/features/layout/page";
-import {db} from "@/db";
-import {eq, and, inArray} from "drizzle-orm";
+import { PageParams } from "@/types/next";
+import { notFound, redirect } from "next/navigation";
+import { Page } from "@/features/layout/components/page";
+import { db } from "@/db";
+import { eq, and, inArray, isNull } from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {getOrganizationProjectDatabases} from "@/db/services/project";
-import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {BackupModalProvider} from "@/features/database/backup-modal-context";
-import {DatabaseContent} from "@/features/database/database-content";
-import {getHealthLast12hLogs} from "@/db/services/healthcheck";
-import {LogsModalProvider} from "@/features/logs/logs-modal-context";
+import { getOrganizationProjectDatabases } from "@/db/services/project";
+import { getActiveMember, getOrganization } from "@/lib/auth/auth";
+import { BackupModalProvider } from "@/features/database/components/backup-modal-context";
+import { DatabaseContent } from "@/features/database/components/database-content";
+import { getHealthLast12hLogs } from "@/db/services/healthcheck";
+import { LogsModalProvider } from "@/features/logs/components/logs-modal-context";
 
-export default async function RoutePage(props: PageParams<{
+export default async function RoutePage(
+  props: PageParams<{
     projectId: string;
-    databaseId: string
-}>) {
-    const {projectId, databaseId} = await props.params;
+    databaseId: string;
+  }>,
+) {
+  const { projectId, databaseId } = await props.params;
 
-    const organization = await getOrganization({});
-    const activeMember = await getActiveMember()
+  const organization = await getOrganization({});
+  const activeMember = await getActiveMember();
 
-    if (!organization || !activeMember) {
-        notFound();
-    }
+  if (!organization || !activeMember) {
+    notFound();
+  }
 
-    const databasesProject = await getOrganizationProjectDatabases({
-        organizationSlug: organization.slug,
-        projectId: projectId
-    })
+  const databasesProject = await getOrganizationProjectDatabases({
+    organizationSlug: organization.slug,
+    projectId: projectId,
+  });
 
-    const dbItem = await db.query.database.findFirst({
-        where: and(inArray(drizzleDb.schemas.backup.id, databasesProject.ids ?? []), eq(drizzleDb.schemas.database.id, databaseId), eq(drizzleDb.schemas.database.projectId, projectId)),
-        with: {
-            project: true,
-            retentionPolicy: true,
-            alertPolicies: true,
-            storagePolicies: true,
-        }
-    });
+  const dbItem = await db.query.database.findFirst({
+    where: and(
+      inArray(drizzleDb.schemas.backup.id, databasesProject.ids ?? []),
+      eq(drizzleDb.schemas.database.id, databaseId),
+      eq(drizzleDb.schemas.database.projectId, projectId),
+    ),
+    with: {
+      project: true,
+      retentionPolicy: true,
+      alertPolicies: true,
+      storagePolicies: true,
+    },
+  });
 
-    if (!dbItem) {
-        redirect("/dashboard/projects");
-    }
+  if (!dbItem) {
+    redirect("/dashboard/projects");
+  }
 
-    const backups = await db.query.backup.findMany({
-        where: eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
-        with: {
-            restorations: true,
-            storages: {
-                with: {
-                    storageChannel: true
-                }
-            },
-            logs: true
-        },
-        orderBy: (b, {desc}) => [desc(b.createdAt)],
-    });
+  const totalBackups = await db
+    .select({ count: drizzleDb.schemas.backup.id })
+    .from(drizzleDb.schemas.backup)
+    .where(eq(drizzleDb.schemas.backup.databaseId, dbItem.id))
+    .then((rows) => rows.length);
 
-    const restorations = await db.query.restoration.findMany({
-        where: eq(drizzleDb.schemas.restoration.databaseId, dbItem.id),
-        with: {
-            logs: true
-        },
-        orderBy: (r, {desc}) => [desc(r.createdAt)],
-    });
+  const availableBackups = await db
+    .select({ count: drizzleDb.schemas.backup.id })
+    .from(drizzleDb.schemas.backup)
+    .where(
+      and(
+        eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
+        isNull(drizzleDb.schemas.backup.deletedAt),
+      ),
+    )
+    .then((rows) => rows.length);
 
-    const isAlreadyBackup = backups.some((b) => b.status === "waiting" || b.status === "ongoing");
-    const isAlreadyRestore = restorations.some((r) => r.status === "waiting");
+  const successfulBackups = await db
+    .select({ count: drizzleDb.schemas.backup.id })
+    .from(drizzleDb.schemas.backup)
+    .where(
+      and(
+        eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
+        eq(drizzleDb.schemas.backup.status, "success"),
+      ),
+    )
+    .then((rows) => rows.length);
 
-    const totalBackups = await db.select({count: drizzleDb.schemas.backup.id})
-        .from(drizzleDb.schemas.backup)
-        .where(eq(drizzleDb.schemas.backup.databaseId, dbItem.id))
-        .then(rows => rows.length);
+  const isAlreadyRestore = await db
+    .select({ count: drizzleDb.schemas.restoration.id })
+    .from(drizzleDb.schemas.restoration)
+    .where(
+      and(
+        eq(drizzleDb.schemas.restoration.databaseId, dbItem.id),
+        eq(drizzleDb.schemas.restoration.status, "waiting"),
+      ),
+    )
+    .then((rows) => rows.length > 0);
 
-    const availableBackups = backups.filter(b => !b.deletedAt).length;
+  const [settings] = await db
+    .select()
+    .from(drizzleDb.schemas.setting)
+    .where(eq(drizzleDb.schemas.setting.name, "system"))
+    .limit(1);
+  if (!settings) {
+    notFound();
+  }
 
-    const successfulBackups = await db.select({count: drizzleDb.schemas.backup.id})
-        .from(drizzleDb.schemas.backup)
-        .where(and(
-            eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
-            eq(drizzleDb.schemas.backup.status, "success")
-        ))
-        .then(rows => rows.length);
+  const databaseHealthLogs = dbItem
+    ? await getHealthLast12hLogs({ id: dbItem.id })
+    : [];
 
+  const successRate =
+    totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
 
-    const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
-    if (!settings) {
-        notFound();
-    }
-
-    const databaseHealthLogs = dbItem ? await getHealthLast12hLogs({id: dbItem.id}) : []
-
-
-    const successRate = totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
-
-    const isMember = activeMember?.role === "member";
-
-    return (
-        <Page>
-            <LogsModalProvider>
-                <BackupModalProvider>
-                    <DatabaseContent
-                        activeMember={activeMember}
-                        settings={settings}
-                        database={dbItem}
-                        databaseHealthLogs={databaseHealthLogs}
-                        isAlreadyRestore={isAlreadyRestore}
-                        restorations={restorations}
-                        backups={backups}
-                        totalBackups={totalBackups}
-                        availableBackups={availableBackups}
-                        successRate={successRate}
-                        organizationId={organization.id}
-                        activeOrganizationChannels={[]}
-                        activeOrganizationStorageChannels={[]}
-                    />
-                </BackupModalProvider>
-            </LogsModalProvider>
-        </Page>
-    );
-}
+  return (
+    <Page>
+      <LogsModalProvider>
+        <BackupModalProvider>
+          <DatabaseContent
+            activeMember={activeMember}
+            settings={settings}
+            database={dbItem}
+            databaseHealthLogs={databaseHealthLogs}
+            isAlreadyRestore={isAlreadyRestore}
+            totalBackups={totalBackups}
+            availableBackups={availableBackups}
+            successRate={successRate}
+            organizationId={organization.id}
+            activeOrganizationChannels={[]}
+            activeOrganizationStorageChannels={[]}
+          />
+        </BackupModalProvider>
+      </LogsModalProvider>
+    </Page>
+  );
+}

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

@@ -1,108 +1,123 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageTitle} from "@/features/layout/page";
-import {
-    ButtonDeleteProject
-} 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 { PageParams } from "@/types/next";
+import { Page, PageContent, PageTitle } from "@/features/layout/components/page";
+import { ButtonDeleteProject } from "@/features/projects/components/project-delete-button";
+import { CardsWithPagination } from "@/components/common/cards-with-pagination";
+import { ProjectDatabaseCard } from "@/features/projects/components/project-database-card";
+import { ProjectDatabaseSelection } from "@/features/projects/components/project-database-selection";
+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/project-dialog";
-import {ProjectWith} from "@/db/schema/06_project";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {getOrganizationAvailableDatabases} from "@/db/services/database";
+import { capitalizeFirstLetter, isUUID } from "@/utils/text";
+import { ProjectDialog } from "@/features/projects/components/project-dialog";
+import { ProjectWith } from "@/db/schema/06_project";
+import { getOrganizationAvailableDatabases } from "@/db/services/database";
 
+export default async function RoutePage(
+  props: PageParams<{
+    projectId: string;
+  }>,
+) {
+  const { projectId } = await props.params;
 
-export default async function RoutePage(props: PageParams<{
-    projectId: string
-}>) {
-    const {
-        projectId
-    } = await props.params;
+  if (!isUUID(projectId)) {
+    notFound();
+  }
 
-    if (!isUuidv4(projectId)) {
-        notFound()
-    }
+  const organization = await getOrganization({});
+  const activeMember = await getActiveMember();
 
-    const organization = await getOrganization({});
-    const activeMember = await getActiveMember()
+  if (!organization) {
+    notFound();
+  }
+  const org = await db.query.organization.findFirst({
+    where: eq(drizzleDb.schemas.organization.slug, organization.slug),
+  });
 
-    if (!organization) {
-        notFound();
-    }
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, organization.slug),
-    });
+  if (!org) notFound();
 
-    if (!org) notFound();
+  const proj = await db.query.project.findFirst({
+    where: (proj, { and, eq, not }) =>
+      and(
+        eq(proj.id, projectId),
+        eq(proj.organizationId, org.id),
+        not(eq(proj.isArchived, true)),
+      ),
+    with: {
+      databases: true,
+    },
+  });
 
-    const proj = await db.query.project.findFirst({
-        where: (proj, {
-            and,
-            eq,
-            not
-        }) => and(eq(proj.id, projectId), eq(proj.organizationId, org.id), not(eq(proj.isArchived, true))),
-        with: {
-            databases: true,
-        },
-    });
+  if (!proj) {
+    redirect("/dashboard/projects");
+  }
 
-    if (!proj) {
-        redirect("/dashboard/projects");
-    }
+  const availableDatabases = await getOrganizationAvailableDatabases(
+    organization.id,
+    proj.id,
+  );
+  const isMember = activeMember?.role === "member";
 
-    const availableDatabases = await getOrganizationAvailableDatabases(organization.id, proj.id)
-    const isMember = activeMember?.role === "member";
-
-    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(proj.name)}
-                    </div>
-                    {!isMember && (
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
-                            <div className="flex items-center gap-2">
-                                <ProjectDialog
-                                    databases={availableDatabases}
-                                    organization={org}
-                                    project={proj as ProjectWith}
-                                    isEdit={true}
-                                />
-                            </div>
-                            <div className="flex items-center gap-2">
-                                <ButtonDeleteProject projectId={projectId} text={"Delete Project"}/>
-                            </div>
-                        </div>
-                    )}
-                </PageTitle>
+  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(proj.name)}
+          </div>
+          {!isMember && (
+            <div className="flex items-center gap-2 md:justify-between w-full ">
+              <div className="flex items-center gap-2">
+                <ProjectDialog
+                  databases={availableDatabases}
+                  organization={org}
+                  project={proj as ProjectWith}
+                  isEdit={true}
+                />
+              </div>
+              <div className="flex items-center gap-2">
+                <ButtonDeleteProject
+                  projectId={projectId}
+                  text={"Delete Project"}
+                />
+              </div>
             </div>
-            <PageContent className="flex flex-col w-full h-full">
-                {proj.databases.length > 0 ? (
-                    <CardsWithPagination
-                        data={[...proj.databases].sort((a, b) =>
-                            new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
-                        )}
-                        organizationSlug={organization.slug}
-                        // @ts-ignore
-                        cardItem={ProjectDatabaseCard}
-                        cardsPerPage={20}
-                        numberOfColumns={3}
-                        pageSizeOptions={[10, 20, 50]}
-                        extendedProps={proj}
-                    />
-                ) : (
-                    <div className="flex flex-col items-center justify-center h-full text-muted-foreground py-20">
-                        <p className="text-lg font-medium">No databases found</p>
-                        <p className="text-sm mt-2">You haven’t added any databases to this project yet.</p>
-                    </div>
-                )}
-            </PageContent>
-        </Page>
-    );
-}
+          )}
+        </PageTitle>
+      </div>
+      <PageContent className="flex flex-col w-full h-full">
+        {proj.databases.length > 0 ? (
+          isMember ? (
+            <CardsWithPagination
+              data={[...proj.databases].sort(
+                (a, b) =>
+                  new Date(b.createdAt).getTime() -
+                  new Date(a.createdAt).getTime(),
+              )}
+              organizationSlug={organization.slug}
+              // @ts-ignore
+              cardItem={ProjectDatabaseCard}
+              cardsPerPage={20}
+              numberOfColumns={3}
+              pageSizeOptions={[10, 20, 50]}
+              extendedProps={proj}
+            />
+          ) : (
+            <ProjectDatabaseSelection
+              projectId={proj.id}
+              databases={proj.databases}
+            />
+          )
+        ) : (
+          <div className="flex flex-col items-center justify-center h-full text-muted-foreground py-20">
+            <p className="text-lg font-medium">No databases found</p>
+            <p className="text-sm mt-2">
+              You haven’t added any databases to this project yet.
+            </p>
+          </div>
+        )}
+      </PageContent>
+    </Page>
+  );
+}

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

@@ -1,13 +1,13 @@
 import {PageParams} from "@/types/next";
 import {CardsWithPagination} from "@/components/common/cards-with-pagination";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectCard} from "@/features/projects/project-card";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
+import {ProjectCard} from "@/features/projects/components/project-card";
 import {db} from "@/db";
 import {notFound} from "next/navigation";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import {EmptyStatePlaceholder} from "@/components/common/empty-state-placeholder";
 import {Metadata} from "next";
-import {ProjectDialog} from "@/features/projects/project-dialog";
+import {ProjectDialog} from "@/features/projects/components/project-dialog";
 import {DatabaseWith} from "@/db/schema/07_database";
 import {getOrganizationAvailableDatabases} from "@/db/services/database";
 

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

@@ -4,17 +4,17 @@ import {
     PageContent,
     PageDescription,
     PageTitle,
-} from "@/features/layout/page";
+} from "@/features/layout/components/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 {ButtonDeleteAgent} from "@/features/agents/components/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 {AgentContentPage} from "@/features/agents/components/agent-content";
+import {AgentDialog} from "@/features/agents/components/agent-dialog";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import {currentUser} from "@/lib/auth/current-user";
 import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
@@ -94,7 +94,7 @@ export default async function RoutePage(
                 </PageDescription>
             )}
             <PageContent className="flex flex-col w-full h-full justify-between gap-6">
-                <AgentContentPage agent={agent} edgeKey={edgeKey}/>
+                <AgentContentPage agent={agent} edgeKey={edgeKey} canDeleteDatabases={!!agent.organizationId}/>
             </PageContent>
         </Page>
     );

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

@@ -4,17 +4,17 @@ import {
     PageContent,
     PageHeader,
     PageTitle,
-} from "@/features/layout/page";
+} from "@/features/layout/components/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 "@/features/organizations/organization-tabs";
+import {OrganizationTabs} from "@/features/organizations/components/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 {DeleteOrganizationButton} from "@/features/organizations/components/organization-delete-button";
+import {EditOrganizationDialog} from "@/features/organizations/components/organization-edit-dialog";
 import {db} from "@/db";
 import {isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
@@ -47,7 +47,9 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
     const organizationWithMembers = await db.query.organization.findFirst({
         where: eq(drizzleDb.schemas.organization.id, organization.id),
         with: {
-            projects: true,
+            projects: {
+                where: eq(drizzleDb.schemas.project.isArchived, false),
+            },
             members: {
                 with: {
                     user: true,

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 {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
-import {EvolutionLineChart} from "@/features/statistics/evolution-line-chart";
-import {PercentageLineChart} from "@/features/statistics/percentage-line-chart";
+import {EvolutionLineChart} from "@/features/statistics/components/evolution-line-chart";
+import {PercentageLineChart} from "@/features/statistics/components/percentage-line-chart";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import {and, asc, count, eq, inArray} from "drizzle-orm";
@@ -29,7 +29,7 @@ export default async function RoutePage(props: PageParams<{}>) {
     if (!org) notFound();
 
     const projects = await db.query.project.findMany({
-        where: eq(drizzleDb.schemas.project.organizationId, org.id),
+        where: and(eq(drizzleDb.schemas.project.organizationId, org.id), eq(drizzleDb.schemas.project.isArchived, false))
     });
 
     const projectIds = projects.map(project => project.id);

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

@@ -1,11 +1,12 @@
 import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
 import {Building2, Database, DatabaseBackup, Folder, RefreshCcw, Server, Workflow} from "lucide-react";
 import {currentUser} from "@/lib/auth/current-user";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
-import {and, asc, eq, inArray} from "drizzle-orm";
+
+import {and, asc, eq, inArray, not} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {listOrganizations} from "@/lib/auth/auth";
 import {Metadata} from "next";
@@ -23,7 +24,9 @@ export default async function RoutePage(props: PageParams<{}>) {
 
     const organizationIds = organizations.map(project => project.id);
 
-    const agents = await db.query.agent.findMany({});
+    const agents = await db.query.agent.findMany({
+        where: not(eq(drizzleDb.schemas.agent.isArchived, true)),
+    });
 
     const projects = await db.query.project.findMany({
         where: and(inArray(drizzleDb.schemas.project.organizationId, organizationIds), eq(drizzleDb.schemas.project.isArchived, false)),

app/(customer)/dashboard/layout.tsx

@@ -2,21 +2,25 @@ import { ReactNode } from "react";
 import { redirect } from "next/navigation";
 
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
-import { AppSidebar } from "@/features/layout/app-sidebar";
-import { Header } from "@/features/layout/header";
+import { AppSidebar } from "@/features/layout/components/app-sidebar";
+import { Header } from "@/features/layout/components/header";
 import { currentUser } from "@/lib/auth/current-user";
-import { ThemeMetaUpdater } from "@/features/theme/theme-meta-updater";
-import { ModeToggle } from "@/features/theme/mode-toggle";
-import { UpdateNotification } from "@/features/updates/update-notification";
+import { isOnboardingDone } from "@/db/services/setting";
+import { env } from "@/env.mjs";
+import { ModeToggle } from "@/features/theme/components/mode-toggle";
+import { UpdateNotification } from "@/features/updates/components/update-notification";
 
 export default async function Layout({ children }: { children: ReactNode }) {
+  if (env.SKIP_ONBOARDING !== "true" && !(await isOnboardingDone())) {
+    redirect("/welcome");
+  }
+
   const user = await currentUser();
   if (!user) redirect("/login");
 
   return (
     <SidebarProvider>
       <div className="flex flex-col lg:flex-row w-full">
-        <ThemeMetaUpdater />
         <AppSidebar updateNotification={<UpdateNotification />} />
         <SidebarInset>
           <Header actions={<ModeToggle />} />

app/(landing)/page.tsx

@@ -1,8 +1,14 @@
 import { redirect } from "next/navigation";
-import { getCurrentOrganizationSlug } from "@/features/organizations/organization-cookie";
+import { getCurrentOrganizationSlug } from "@/features/organizations/utils/organization-cookie";
 import { currentUser } from "@/lib/auth/current-user";
+import { isOnboardingDone } from "@/db/services/setting";
+import { env } from "@/env.mjs";
 
 export default async function Index() {
+    if (env.SKIP_ONBOARDING !== "true" && !(await isOnboardingDone())) {
+        redirect("/welcome");
+    }
+
     const user = await currentUser();
     if (user) {
         const currentOrganizationSlug = await getCurrentOrganizationSlug();

app/(welcome)/welcome/onboarding-client.tsx

@@ -0,0 +1,29 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { OnboardingProvider } from "@onboardjs/react";
+import { onboardingSteps } from "@/features/onboarding/onboarding-steps";
+import { OnboardingShell } from "@/features/onboarding/onboarding-shell";
+import type { OnboardingFlowData } from "@/features/onboarding/types";
+
+type Props = {
+    initialStepId: string;
+    initialFlowData: Partial<OnboardingFlowData>;
+};
+
+export const OnboardingClient = ({ initialStepId, initialFlowData }: Props) => {
+    const router = useRouter();
+
+    return (
+        <OnboardingProvider
+            steps={onboardingSteps}
+            initialStepId={initialStepId}
+            initialContext={{ flowData: initialFlowData }}
+            onFlowComplete={async () => {
+                router.push("/dashboard/home");
+            }}
+        >
+            <OnboardingShell />
+        </OnboardingProvider>
+    );
+};

app/(welcome)/welcome/page.tsx

@@ -0,0 +1,19 @@
+import { redirect } from "next/navigation";
+import { resolveOnboardingState } from "@/features/onboarding/onboarding-state";
+import { OnboardingClient } from "./onboarding-client";
+
+export default async function WelcomePage() {
+    const result = await resolveOnboardingState();
+
+    if ("redirect" in result) {
+        redirect(result.redirect);
+    }
+
+    return (
+        <OnboardingClient
+            key={result.stepId}
+            initialStepId={result.stepId}
+            initialFlowData={result.flowData}
+        />
+    );
+}

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

@@ -6,8 +6,8 @@ import {getDatabaseOrThrow, withAgentCheck} from "./helpers";
 import {Backup} from "@/db/schema/07_database";
 import {withUpdatedAt} from "@/db/utils";
 import {eventEmitter} from "@/lib/event";
-import {sendNotificationsBackupRestore} from "@/features/notifications/notifications.helpers";
-import {EventKind} from "@/features/notifications/notifications.types";
+import {sendNotificationsBackupRestore} from "@/features/notifications/utils/notifications.helpers";
+import {EventKind} from "@/features/notifications/types";
 import {logger} from "@/lib/logger";
 import {JobLogEntry} from "@/features/logs/types";
 
@@ -108,7 +108,6 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
 }) => {
     try {
         const body: BodyPatch = await request.json();
-        log.info({data: body}, "Body from PATH in backup route");
 
         const status = body.status
         const backupId = body.backupId

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

@@ -1,79 +1,86 @@
-import {NextResponse} from "next/server";
-import {and, eq} from "drizzle-orm";
+import { NextResponse } from "next/server";
+import { and, eq } from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {db} from "@/db";
-import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {eventEmitter} from "@/lib/event";
-import {logger} from "@/lib/logger";
+import { db } from "@/db";
+import { getDatabaseOrThrow, withAgentCheck } from "../../helpers";
+import { eventEmitter } from "@/lib/event";
+import { logger } from "@/lib/logger";
+import { isUUID } from "@/utils/text";
 
-const log = logger.child({module: "api/agent/backup/upload/init"});
+const log = logger.child({ module: "api/agent/backup/upload/init" });
 
 export type Body = {
-    generatedId: string
-    storageChannelId: string
-    backupId: string
-}
-export const POST = withAgentCheck(async (request: Request, {params, agent}: {
-    params: Promise<{ agentId: string }>,
-    agent: any
-}) => {
+  generatedId: string;
+  storageChannelId: string;
+  backupId: string;
+};
+export const POST = withAgentCheck(
+  async (
+    request: Request,
+    {
+      params,
+      agent,
+    }: {
+      params: Promise<{ agentId: string }>;
+      agent: any;
+    },
+  ) => {
     try {
-        const body: Body = await request.json();
+      const body: Body = await request.json();
 
-        log.info({data: body}, "Body for backup upload init");
+      log.info({ data: body }, "Body for backup upload init");
 
-        const generatedId = body.generatedId;
-        const storageChannelId = body.storageChannelId;
-        const backupId = body.backupId;
-
-        if (!generatedId || !isUuidv4(generatedId)) {
-            return NextResponse.json(
-                {error: "generatedId is not a valid UUID"},
-                {status: 400}
-            );
-        }
-
-        const database = await getDatabaseOrThrow(generatedId);
-
-        const backup = await db.query.backup.findFirst({
-            where: and(
-                eq(drizzleDb.schemas.backup.id, backupId),
-                eq(drizzleDb.schemas.backup.databaseId, database.id),
-            ),
-        });
-
-        if (!backup) {
-            return NextResponse.json(
-                {error: "Unable to find the corresponding backup"},
-                {status: 404}
-            );
-        }
-
-        const [backupStorage] = await db
-            .insert(drizzleDb.schemas.backupStorage)
-            .values({
-                backupId: backup.id,
-                storageChannelId: storageChannelId,
-                status: "pending",
-            })
-            .returning();
-
-        eventEmitter.emit('modification', {update: true});
+      const generatedId = body.generatedId;
+      const storageChannelId = body.storageChannelId;
+      const backupId = body.backupId;
 
+      if (!generatedId || !isUUID(generatedId)) {
         return NextResponse.json(
-            {
-                message: "Backup storage successfully created",
-                backupStorage: backupStorage
-            },
-            {status: 200}
+          { error: "generatedId is not a valid UUID" },
+          { status: 400 },
         );
+      }
+
+      const database = await getDatabaseOrThrow(generatedId);
+
+      const backup = await db.query.backup.findFirst({
+        where: and(
+          eq(drizzleDb.schemas.backup.id, backupId),
+          eq(drizzleDb.schemas.backup.databaseId, database.id),
+        ),
+      });
+
+      if (!backup) {
+        return NextResponse.json(
+          { error: "Unable to find the corresponding backup" },
+          { status: 404 },
+        );
+      }
+
+      const [backupStorage] = await db
+        .insert(drizzleDb.schemas.backupStorage)
+        .values({
+          backupId: backup.id,
+          storageChannelId: storageChannelId,
+          status: "pending",
+        })
+        .returning();
+
+      eventEmitter.emit("modification", { update: true });
+
+      return NextResponse.json(
+        {
+          message: "Backup storage successfully created",
+          backupStorage: backupStorage,
+        },
+        { status: 200 },
+      );
     } catch (error) {
-        log.error({error: error}, "Error in POST for INIT backup");
-        return NextResponse.json(
-            {error: "Internal server error"},
-            {status: 500}
-        );
+      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

@@ -1,110 +1,124 @@
-import {NextResponse} from "next/server";
-import {isUuidv4} from "@/utils/verify-uuid";
+import { NextResponse } from "next/server";
 import * as drizzleDb from "@/db";
-import {db as dbClient, db} from "@/db";
-import {and, eq} from "drizzle-orm";
-import {sendNotificationsBackupRestore} from "@/features/notifications/notifications.helpers";
-import {logger} from "@/lib/logger";
-import {withUpdatedAt} from "@/db/utils";
-import {JobLogEntry} from "@/features/logs/types";
+import { db as dbClient, db } from "@/db";
+import { and, eq } from "drizzle-orm";
+import { sendNotificationsBackupRestore } from "@/features/notifications/utils/notifications.helpers";
+import { logger } from "@/lib/logger";
+import { withUpdatedAt } from "@/db/utils";
+import { JobLogEntry } from "@/features/logs/types";
+import { isUUID } from "@/utils/text";
 
-const log = logger.child({module: "api/agent/restore"});
+const log = logger.child({ module: "api/agent/restore" });
 
 export type BodyResultRestore = {
-    generatedId: string
-    status: string
-    logs: JobLogEntry[]
-    durationMs: number
-}
-type RestorationStatus = 'waiting' | 'ongoing' | 'failed' | 'success';
-
+  generatedId: string;
+  status: string;
+  logs: JobLogEntry[];
+  durationMs: number;
+};
+type RestorationStatus = "waiting" | "ongoing" | "failed" | "success";
 
 export async function POST(
-    request: Request,
-    {params}: { params: Promise<{ agentId: string }> }
+  request: Request,
+  { params }: { params: Promise<{ agentId: string }> },
 ) {
+  try {
+    const agentId = (await params).agentId;
+    const body: BodyResultRestore = await request.json();
 
-    try {
-
-        const agentId = (await params).agentId
-        const body: BodyResultRestore = await request.json();
-
-
-        if (!isUuidv4(body.generatedId)) {
-            return NextResponse.json(
-                {error: "generatedId is not a valid uuid"},
-                {status: 500}
-            );
-        }
-
-        const agent = await db.query.agent.findFirst({
-            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})
-        }
-
-        const database = await db.query.database.findFirst({
-            where: eq(drizzleDb.schemas.database.agentDatabaseId, body.generatedId),
-            with: {
-                alertPolicies: true
-            }
-        })
-
-        if (!database) {
-            return NextResponse.json({error: "Database associated with generatedId provided not found"}, {status: 404})
-        }
-
-        const restoration = await db.query.restoration.findFirst({
-            where: and(eq(drizzleDb.schemas.restoration.status, "ongoing"), eq(drizzleDb.schemas.restoration.databaseId, database.id),)
-        })
-
-        if (!restoration) {
-            return NextResponse.json({error: "Unable to fin the corresponding restoration"}, {status: 404})
-        }
-
-        const [restorationUpdated] = await db
-            .update(drizzleDb.schemas.restoration)
-            .set(withUpdatedAt({status: body.status as RestorationStatus, durationMs: body.durationMs}))
-            .where(eq(drizzleDb.schemas.restoration.id, restoration.id)).returning();
-
-
-        const logsToInsert = body.logs.map((entry) => ({
-            backupId: null,
-            restorationId: restorationUpdated.id,
-
-            loggedAt: new Date(entry.timestamp),
-
-            entryType: entry.type,
-            level: entry.level,
-
-            message: entry.message,
-            command: entry.command ?? null,
-            output: entry.output ?? null,
-
-            exitCode: entry.exit_code ?? null,
-            durationMs: entry.duration_ms ?? null,
-        }));
-
-        if (logsToInsert.length > 0) {
-            await dbClient
-                .insert(drizzleDb.schemas.jobLog)
-                .values(logsToInsert);
-        }
-
-        await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
-
-        const response = {
-            status: true,
-            message: "Restoration successfully updated"
-        }
-
-        return Response.json(response, {status: 200})
-    } catch (error) {
-        log.error({error: error}, "Error in POST handler")
-        return NextResponse.json(
-            {error: 'Internal server error'},
-            {status: 500}
-        );
+    if (!isUUID(body.generatedId)) {
+      return NextResponse.json(
+        { error: "generatedId is not a valid uuid" },
+        { status: 500 },
+      );
     }
-}
+
+    const agent = await db.query.agent.findFirst({
+      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 });
+    }
+
+    const database = await db.query.database.findFirst({
+      where: eq(drizzleDb.schemas.database.agentDatabaseId, body.generatedId),
+      with: {
+        alertPolicies: true,
+      },
+    });
+
+    if (!database) {
+      return NextResponse.json(
+        { error: "Database associated with generatedId provided not found" },
+        { status: 404 },
+      );
+    }
+
+    const restoration = await db.query.restoration.findFirst({
+      where: and(
+        eq(drizzleDb.schemas.restoration.status, "ongoing"),
+        eq(drizzleDb.schemas.restoration.databaseId, database.id),
+      ),
+    });
+
+    if (!restoration) {
+      return NextResponse.json(
+        { error: "Unable to fin the corresponding restoration" },
+        { status: 404 },
+      );
+    }
+
+    const [restorationUpdated] = await db
+      .update(drizzleDb.schemas.restoration)
+      .set(
+        withUpdatedAt({
+          status: body.status as RestorationStatus,
+          durationMs: body.durationMs,
+        }),
+      )
+      .where(eq(drizzleDb.schemas.restoration.id, restoration.id))
+      .returning();
+
+    const logsToInsert = body.logs.map((entry) => ({
+      backupId: null,
+      restorationId: restorationUpdated.id,
+
+      loggedAt: new Date(entry.timestamp),
+
+      entryType: entry.type,
+      level: entry.level,
+
+      message: entry.message,
+      command: entry.command ?? null,
+      output: entry.output ?? null,
+
+      exitCode: entry.exit_code ?? null,
+      durationMs: entry.duration_ms ?? null,
+    }));
+
+    if (logsToInsert.length > 0) {
+      await dbClient.insert(drizzleDb.schemas.jobLog).values(logsToInsert);
+    }
+
+    await sendNotificationsBackupRestore(
+      database,
+      body.status == "failed" ? "error_restore" : "success_restore",
+    );
+
+    const response = {
+      status: true,
+      message: "Restoration successfully updated",
+    };
+
+    return Response.json(response, { status: 200 });
+  } catch (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

@@ -1,24 +1,24 @@
 import {NextResponse} from "next/server";
 import {Body} from "./route";
-import {isUuidv4} from "@/utils/verify-uuid";
 import {Agent} from "@/db/schema/08_agent";
 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 {and, eq, inArray, desc, sql} from "drizzle-orm";
 import {dbmsEnumSchema, EDbmsSchema} from "@/db/schema/types";
 import {withUpdatedAt} from "@/db/utils";
-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";
+import {isUUID} from "@/utils/text";
+import {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/utils/storages.dispatch";
 
 const log = logger.child({module: "api/agent/status/helpers"});
 
 export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) {
     const databasesResponse = [];
 
-    const formatDatabase = (database: DatabaseWith, backupAction: boolean, restoreAction: boolean, UrlBackup: string | null, storages: PingDatabaseStorageChannels[], urlMeta: string | null) => ({
+    const formatDatabase = (database: DatabaseWith, backupAction: boolean, restoreAction: boolean, UrlBackup: string | null, storages: PingDatabaseStorageChannels[], urlMeta: string | null, backupSize: number | null) => ({
         generatedId: database.agentDatabaseId,
         dbms: database.dbms,
         storages: storages,
@@ -31,7 +31,8 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             restore: {
                 action: restoreAction,
                 file: UrlBackup,
-                metaFile: urlMeta
+                metaFile: urlMeta,
+                size: backupSize
             },
         },
     });
@@ -49,9 +50,10 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
         let restoreAction: boolean = false
         let urlBackup: string | null = null;
         let urlMeta: string | null = null
+        let backupSize: number | null = null
 
         if (!existingDatabase) {
-            if (!isUuidv4(db.generatedId)) {
+            if (!isUUID(db.generatedId)) {
                 return NextResponse.json(
                     {error: "generatedId is not a valid uuid"},
                     {status: 500}
@@ -75,10 +77,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 })
                 .returning();
 
-
             if (databaseCreated) {
-
-
                 await dbClient
                     .insert(drizzleDb.schemas.healthcheckLog)
                     .values({
@@ -90,7 +89,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
 
                 const storages = await getDatabaseStorageChannels(databaseCreated.id)
 
-                databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null));
+                databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null, null));
             }
         } else {
 
@@ -121,7 +120,11 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 where: and(
                     eq(drizzleDb.schemas.backup.databaseId, databaseUpdated.id),
                     inArray(drizzleDb.schemas.backup.status, ["waiting", "ongoing"])
-                )
+                ),
+                orderBy: [
+                    sql`case when ${drizzleDb.schemas.backup.status} = 'waiting' then 0 else 1 end`,
+                    desc(drizzleDb.schemas.backup.createdAt)
+                ]
             })
 
             const restoration = await dbClient.query.restoration.findFirst({
@@ -180,6 +183,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     if (result.success) {
                         urlBackup = result.url ?? null;
                         urlMeta = resultMeta.url ?? null
+                        backupSize = restoration.backupStorage.size
                     } else {
                         await dbClient
                             .update(drizzleDb.schemas.restoration)
@@ -205,7 +209,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
             }
             const storages = await getDatabaseStorageChannels(databaseUpdated.id)
-            databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup, storages, urlMeta));
+            databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup, storages, urlMeta, backupSize));
         }
     }
     return databasesResponse;

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

@@ -1,99 +1,107 @@
-import {NextResponse} from "next/server";
-import {handleDatabases} from "./helpers";
+import { NextResponse } from "next/server";
+import { handleDatabases } from "./helpers";
 import * as drizzleDb from "@/db";
-import {db} from "@/db";
-import {EDbmsSchema} from "@/db/schema/types";
-import {and, eq} from "drizzle-orm";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {withUpdatedAt} from "@/db/utils";
-import {logger} from "@/lib/logger";
-
-
-const log = logger.child({module: "api/agent/status/route"});
+import { db } from "@/db";
+import { EDbmsSchema } from "@/db/schema/types";
+import { and, eq } from "drizzle-orm";
+import { withUpdatedAt } from "@/db/utils";
+import { logger } from "@/lib/logger";
+import { isUUID } from "@/utils/text";
 
+const log = logger.child({ module: "api/agent/status/route" });
 
 export type databaseAgent = {
-    name: string,
-    dbms: EDbmsSchema,
-    generatedId: string
-    pingStatus: boolean
-}
+  name: string;
+  dbms: EDbmsSchema;
+  generatedId: string;
+  pingStatus: boolean;
+};
 
 export type Body = {
-    version: string,
-    databases: databaseAgent[]
-}
-
+  version: string;
+  databases: databaseAgent[];
+};
 
 export async function POST(
-    request: Request,
-    {params}: { params: Promise<{ agentId: string }> }
+  request: Request,
+  { params }: { params: Promise<{ agentId: string }> },
 ) {
-    try {
-        const agentId = (await params).agentId
-        log.debug(`Agent ID: ${agentId}`)
-        const body: Body = await request.json();
-        const lastContact = new Date();
-        let message: string
+  try {
+    const agentId = (await params).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"
-            log.error({error: message}, "An error occurred")
-            return NextResponse.json(
-                {error: "agentId is not a valid uuid"},
-                {status: 500}
-            );
-        }
-
-        const agent = await db.query.agent.findFirst({
-            where: and(eq(drizzleDb.schemas.agent.id, agentId), eq(drizzleDb.schemas.agent.isArchived, false)),
-        })
-
-        if (!agent) {
-            message = "Agent not found"
-            return NextResponse.json({error: message}, {status: 404})
-        }
-
-        const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
-        if (!settings) {
-            return NextResponse.json({error: "An error occured"}, {status: 404})
-        }
-
-        const databasesResponse = await handleDatabases(body, agent, lastContact, settings)
-
-        await db
-            .update(drizzleDb.schemas.agent)
-            .set(withUpdatedAt({
-                version: body.version,
-                lastContact: lastContact,
-                healthErrorCount: null
-            }))
-            .where(eq(drizzleDb.schemas.agent.id, agentId));
-
-        await db
-            .insert(drizzleDb.schemas.healthcheckLog)
-            .values({
-                kind: "agent",
-                status: "success",
-                objectId: agentId,
-                date: lastContact
-            })
-
-        const response = {
-            agent: {
-                id: agentId,
-                lastContact: lastContact
-            },
-            databases: databasesResponse
-        }
-
-        return Response.json(response)
-    } catch (error) {
-        log.error({error: error}, "Error in POST handler")
-        return NextResponse.json(
-            {error: 'Internal server error'},
-            {status: 500}
-        );
+    if (!isUUID(agentId)) {
+      message = "agentId is not a valid uuid";
+      log.error({ error: message }, "An error occurred");
+      return NextResponse.json(
+        { error: "agentId is not a valid uuid" },
+        { status: 500 },
+      );
     }
-}
 
+    const agent = await db.query.agent.findFirst({
+      where: and(
+        eq(drizzleDb.schemas.agent.id, agentId),
+        eq(drizzleDb.schemas.agent.isArchived, false),
+      ),
+    });
+
+    if (!agent) {
+      message = "Agent not found";
+      return NextResponse.json({ error: message }, { status: 404 });
+    }
+
+    const [settings] = await db
+      .select()
+      .from(drizzleDb.schemas.setting)
+      .where(eq(drizzleDb.schemas.setting.name, "system"))
+      .limit(1);
+    if (!settings) {
+      return NextResponse.json({ error: "An error occured" }, { status: 404 });
+    }
+
+    const databasesResponse = await handleDatabases(
+      body,
+      agent,
+      lastContact,
+      settings,
+    );
+
+    await db
+      .update(drizzleDb.schemas.agent)
+      .set(
+        withUpdatedAt({
+          version: body.version,
+          lastContact: lastContact,
+          healthErrorCount: null,
+        }),
+      )
+      .where(eq(drizzleDb.schemas.agent.id, agentId));
+
+    await db.insert(drizzleDb.schemas.healthcheckLog).values({
+      kind: "agent",
+      status: "success",
+      objectId: agentId,
+      date: lastContact,
+    });
+
+    const response = {
+      agent: {
+        id: agentId,
+        lastContact: lastContact,
+      },
+      databases: databasesResponse,
+    };
+
+    return Response.json(response);
+  } catch (error) {
+    log.error({ error: error }, "Error in POST handler");
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}

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

@@ -5,31 +5,33 @@ import { headers } from "next/headers";
 
 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 }
-        );
-    }
+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);
+  return authHandler.GET(req);
 }
 
 export async function POST(req: NextRequest) {
-    const guard = await blockApiKeyCreateForRestrictedUsers(req);
-    if (guard) return guard;
-    return authHandler.POST(req);
+  const guard = await blockApiKeyCreateForRestrictedUsers(req);
+  if (guard) return guard;
+  return authHandler.POST(req);
 }

app/api/files/backups/route.ts

@@ -1,7 +1,7 @@
 import {NextResponse} from "next/server";
 import path from "path";
-import type {StorageInput} from "@/features/storages/storages.types";
-import {dispatchStorage} from "@/features/storages/storages.dispatch";
+import type {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/utils/storages.dispatch";
 import {Readable} from "node:stream";
 import {logger} from "@/lib/logger";
 

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

@@ -1,8 +1,8 @@
 import {NextResponse} from "next/server";
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
-import {StorageInput} from "@/features/storages/storages.types";
-import {dispatchStorage} from "@/features/storages/storages.dispatch";
+import {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/utils/storages.dispatch";
 import {Readable} from "node:stream";
 import {logger} from "@/lib/logger";
 

app/api/tus/hooks/route.ts

@@ -1,11 +1,16 @@
 import {NextResponse} from "next/server";
 import fs from "fs";
 import path from "path";
+import {and, eq} from "drizzle-orm";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
 import {env} from "@/env.mjs";
 import {logger} from "@/lib/logger";
 
 const log = logger.child({module: "api/tus/hooks"});
 
+const FILE_PATH_RE = /^backups\/\d{4}-\d{2}-\d{2}\/[A-Za-z0-9._-]+$/;
+
 export async function POST(request: Request) {
     try {
         const body = await request.json();
@@ -24,17 +29,61 @@ export async function POST(request: Request) {
                 event.Upload.Offset === event.Upload.Size
             ) {
                 const id = event.Upload.ID;
-                const fileName = headers["X-File-Name"]?.[0];
                 const filePath = headers["X-File-Path"]?.[0];
 
-                if (!filePath) {
-                    return NextResponse.json({error: "Missing X-File-Path"}, {status: 500});
+                if (!filePath || !FILE_PATH_RE.test(filePath)) {
+                    log.warn({filePath}, "Rejected invalid X-File-Path in TUS hook");
+                    return NextResponse.json({error: "Invalid file path"}, {status: 400});
+                }
+
+                const generatedId = headers["X-Generated-Id"]?.[0];
+                const backupStorageId = headers["X-Backup-Storage-Id"]?.[0];
+
+
+                console.log(`Backup Storage ID : ${backupStorageId}`);
+                console.log(`generatedId : ${generatedId}`);
+
+                if (backupStorageId) {
+                    if (!generatedId) {
+                        log.warn("Missing X-Generated-Id in TUS hook");
+                        return NextResponse.json({error: "Forbidden"}, {status: 403});
+                    }
+
+                    const database = await db.query.database.findFirst({
+                        where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
+                    });
+
+                    if (!database) {
+                        log.warn({generatedId}, "No database for X-Generated-Id in TUS hook");
+                        return NextResponse.json({error: "Forbidden"}, {status: 403});
+                    }
+
+                    const storage = await db.query.backupStorage.findFirst({
+                        where: and(
+                            eq(drizzleDb.schemas.backupStorage.id, backupStorageId),
+                        ),
+                        with: {backup: true},
+                    });
+
+                    if (!storage || storage.backup?.databaseId !== database.id) {
+                        log.warn({backupStorageId, generatedId}, "No pending backup storage matches TUS hook");
+                        return NextResponse.json({error: "Forbidden"}, {status: 403});
+                    }
+                } else {
+                    log.warn("TUS hook without X-Backup-Storage-Id (legacy agent)");
                 }
 
                 const uploadDir = path.join(env.PRIVATE_PATH!, "/uploads/");
 
                 const oldFilePath = path.join(uploadDir, "tmp", id);
-                const newFilePath = path.join(uploadDir, filePath);
+
+                const resolvedBase = path.resolve(uploadDir);
+                const newFilePath = path.resolve(resolvedBase, filePath);
+                const rel = path.relative(resolvedBase, newFilePath);
+                if (rel.startsWith("..") || path.isAbsolute(rel)) {
+                    log.warn({filePath}, "Rejected path traversal in TUS hook");
+                    return NextResponse.json({error: "Invalid file path"}, {status: 400});
+                }
 
                 fs.mkdirSync(path.dirname(newFilePath), {recursive: true});
 
@@ -74,7 +123,7 @@ export async function POST(request: Request) {
         }
         return NextResponse.json({});
     } catch (error) {
-        log.error({error: error},"TUS Hook error");
+        log.error({error: error}, "TUS Hook error");
         return NextResponse.json({error: "Internal server error"}, {status: 500});
     }
-}
+}

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

@@ -3,7 +3,7 @@ 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";
+import {deleteAgentService} from "@/features/agents/actions/agent-delete.action";
 
 const log = logger.child({module: "api/v1/agents/[id]"});
 

app/api/v1/agents/route.ts

@@ -5,7 +5,7 @@ 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 {createAgentService} from "@/features/agents/actions/agents.action";
 import { ActionError } from "@/lib/safe-actions/actions";
 import {getAccessibleAgentIds} from "@/lib/api-v1/services/agents";
 import {ApiKeyContext} from "@/lib/api-v1/types";

app/not-found.tsx

@@ -1,4 +1,5 @@
-import BackButton from "@/components/common/back-button";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 export default async function NotFound() {
   return (
@@ -12,7 +13,9 @@ export default async function NotFound() {
             The content you are trying to view is not available.
           </p>
         </div>
-        <BackButton>Go home</BackButton>
+        <Button asChild>
+          <Link href="/">Go home</Link>
+        </Button>
       </div>
     </div>
   );

app/providers.tsx

@@ -5,8 +5,8 @@ import { type PropsWithChildren, Suspense } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
 import { ErrorLayout } from "@/components/common/error-layout";
-import { ThemeMetaUpdaterRoot } from "@/features/theme/theme-meta-updater-root";
-import { ThemeProvider } from "@/features/theme/theme-provider";
+import { ThemeMetaUpdater } from "@/features/theme/components/theme-meta-updater";
+import { ThemeProvider } from "@/features/theme/components/theme-provider";
 
 export type ProviderProps = PropsWithChildren<{}>;
 const queryClient = new QueryClient();
@@ -14,8 +14,13 @@ const queryClient = new QueryClient();
 export const Providers = (props: ProviderProps) => {
   return (
     <Suspense fallback={null}>
-      <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-        <ThemeMetaUpdaterRoot />
+      <ThemeProvider
+        attribute="class"
+        defaultTheme="light"
+        enableSystem
+        storageKey="portabase_theme"
+      >
+        <ThemeMetaUpdater />
         <QueryClientProvider client={queryClient}>
           <ErrorLayout>
             <Toaster />

docker-compose.e2e.yml

@@ -1,37 +0,0 @@
-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,12 +1,12 @@
 services:
   app:
-#    build:
-#      context: .
-#      dockerfile: docker/dockerfile/Dockerfile
-#      target: prod
-    image: portabase/portabase:1
+    build:
+     context: .
+     dockerfile: docker/dockerfile/Dockerfile
+     target: prod
+#    image: portabase/portabase:1
     ports:
-      - '8887:80'
+      - "8887:80"
     environment:
       TZ: "Europe/Paris"
     env_file:
@@ -35,7 +35,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

docker-compose.yml

@@ -41,5 +41,118 @@ services:
       - "8025:8025"
       - "1025:1025"
 
+  azurite:
+    image: mcr.microsoft.com/azure-storage/azurite
+    command: azurite --blobHost 0.0.0.0 --skipApiVersionCheck
+    ports:
+      - "10000:10000"
+    volumes:
+      - azurite-data:/data
+    extra_hosts:
+      - "localhost:host-gateway"
+    networks:
+      - portabase
+
+    #  DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;
+
+  gcs:
+    image: fsouza/fake-gcs-server:latest
+    container_name: fake-gcs
+    ports:
+      - "4443:4443"
+    command:
+      - "-scheme"
+      - "http"
+      - "-port"
+      - "4443"
+      - "-public-host"
+      - "localhost:4443"
+      - "-external-url"
+      - "http://localhost:4443"
+      - "-backend"
+      - "filesystem"
+      - "-filesystem-root"
+      - "/storage"
+    volumes:
+      - gcs-data:/data
+      - gcs-storage:/storage
+    networks:
+      - portabase
+
+  gcs-init:
+    image: curlimages/curl:latest
+    depends_on:
+      - gcs
+    entrypoint: ["/bin/sh", "-c"]
+    command: >
+      'until curl -fsS http://gcs:4443/storage/v1/b >/dev/null; do sleep 1; done;
+      curl -fsS http://gcs:4443/storage/v1/b/portabase >/dev/null
+      || curl -fsS -X POST "http://gcs:4443/storage/v1/b?project=local"
+      -H "Content-Type: application/json"
+      -d "{\"name\":\"portabase\"}"'
+    networks:
+      - portabase
+
+  #   curl http://localhost:4443/storage/v1/b
+  #   projectId: "test-project",
+  #   bucketName: "portabase",
+  #   clientEmail: "fake@test.iam.gserviceaccount.com",
+  #   privateKey: "unused-when-emulated",
+
+  rustfs:
+    image: rustfs/rustfs:latest
+    container_name: rustfs
+    environment:
+      - RUSTFS_ROOT_USER=admin
+      - RUSTFS_ROOT_PASSWORD=root-password
+      - RUSTFS_ACCESS_KEY=access-key
+      - RUSTFS_SECRET_KEY=secret-key
+      - RUSTFS_VOLUMES=/data
+      - RUSTFS_ADDRESS=:9000
+      - RUSTFS_CONSOLE_ENABLE=true
+      - RUSTFS_CONSOLE_ADDRESS=:9001
+    volumes:
+      - rustfs-data:/data
+    healthcheck:
+      test: [ "CMD", "curl", "-sf", "http://localhost:9000/health" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    ports:
+      - "9001:9001"
+      - "9000:9000"
+    extra_hosts:
+      - "localhost:host-gateway"
+    networks:
+      - portabase
+
+  rustfs-init:
+    image: rustfs/rc:latest
+    container_name: rustfs-init
+    depends_on:
+      rustfs:
+        condition: service_healthy
+    entrypoint: >
+      /bin/sh -c "
+      until (/usr/bin/rc alias set rustfs http://rustfs:9000 access-key secret-key) do echo '...waiting...' && sleep 1; done;
+      /usr/bin/rc mb rustfs/portabase;
+      echo 'RustFS initialization complete';
+      tail -f /dev/null
+      "
+    networks:
+      - portabase
+
+
+
 volumes:
   postgres-data:
+  azurite-data:
+  gcs-data:
+  gcs-storage:
+  rustfs-data:
+
+networks:
+  portabase:
+    name: portabase_network
+    external: true

docker/dockerfile/Dockerfile

@@ -1,11 +1,33 @@
-FROM --platform=$BUILDPLATFORM node:22-bullseye AS base
+FROM --platform=$BUILDPLATFORM node:22-slim AS runtime-base
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
     ca-certificates \
     bash \
     tzdata \
     libc6 \
+    nginx \
+    gnupg \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" \
+    > /etc/apt/sources.list.d/pgdg.list
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    postgresql-18 \
+    postgresql-client-18 \
+    postgresql-contrib-18 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV PATH="/usr/lib/postgresql/18/bin:${PATH}"
+
+
+FROM runtime-base AS build-base
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     g++ \
     make \
@@ -13,25 +35,9 @@ RUN apt-get update && apt-get install -y \
     automake \
     libtool \
     git \
-    nginx \
     && rm -rf /var/lib/apt/lists/*
 
 
-RUN mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
-    | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" \
-    > /etc/apt/sources.list.d/pgdg.list
-
-RUN apt-get update && apt-get install -y \
-    postgresql-18 \
-    postgresql-client-18 \
-    postgresql-contrib-18 \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV PATH="/usr/lib/postgresql/18/bin:${PATH}"
-
-
 FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS tusd-base
 
 ARG TUSD_VERSION=2.8.0
@@ -51,7 +57,7 @@ FROM scratch AS tusd-dist
 COPY --from=tusd-base /tusddist/tusd /tusd
 
 
-FROM base AS build-env
+FROM build-base AS build-env
 
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
@@ -83,7 +89,7 @@ COPY . .
 ENV NEXT_TELEMETRY_DISABLED=1
 RUN pnpm run build
 
-FROM base AS prod
+FROM runtime-base AS prod
 
 WORKDIR /app
 ENV NODE_ENV=production
@@ -92,6 +98,7 @@ ENV PORT=80
 ENV HOSTNAME="0.0.0.0"
 ENV PGDATA=/data/postgres
 ENV PRIVATE_PATH=/data/private
+ENV TUSD_BEHIND_PROXY=false
 
 
 RUN addgroup --system --gid 1001 nodejs
@@ -104,7 +111,6 @@ COPY --from=builder /app/drizzle.config.ts ./
 COPY --from=builder --chown=1001:1001 /app/.next/standalone ./
 COPY --from=builder --chown=1001:1001 /app/.next/static ./.next/static
 COPY --chown=1001:1001 src/db ./src/db
-COPY --from=deps /app/node_modules ./node_modules
 
 COPY --from=tusd-dist /tusd /usr/local/bin/tusd
 RUN chmod +x /usr/local/bin/tusd

docker/entrypoints/app-prod-entrypoint.sh

@@ -72,7 +72,18 @@ fi
 
 mkdir -p /data/private/uploads/tmp
 echo "▶ Starting tusd server..."
-tusd --base-path /tus/files/ --upload-dir /data/private/uploads/tmp --hooks-http http://127.0.0.1:3000/api/tus/hooks --port 1080 --max-size 21474836480 &
+TUSD_BEHIND_PROXY_FLAG=""
+if [ "${TUSD_BEHIND_PROXY:-false}" = "true" ]; then
+    TUSD_BEHIND_PROXY_FLAG="--behind-proxy"
+    echo "[INFO] TUSD_BEHIND_PROXY=true, enabling tusd proxy mode"
+fi
+tusd \
+    --base-path /tus/files/ \
+    --upload-dir /data/private/uploads/tmp \
+    --hooks-http http://127.0.0.1:3000/api/tus/hooks \
+    --port 1080 \
+    --max-size 21474836480 \
+    $TUSD_BEHIND_PROXY_FLAG &
 
 echo "▶ Starting Next.js server..."
 PORT=3000 node server.js &

docker/nginx/nginx.conf

@@ -1,6 +1,11 @@
 events {}
 
 http {
+    map $http_x_forwarded_proto $forwarded_proto {
+        default $scheme;
+        "~*^\s*(https?)\s*(?:,|$)" $1;
+    }
+
     client_max_body_size 20G;
     ignore_invalid_headers  off;
 
@@ -18,13 +23,18 @@ http {
 
             proxy_set_header Host $http_host;
             proxy_set_header X-Forwarded-Host $http_host;
-            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Proto $forwarded_proto;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
             proxy_set_header         Upgrade $http_upgrade;
             proxy_set_header         Connection "upgrade";
         }
 
+        location = /api/tus/hooks {
+            deny all;
+            return 404;
+        }
+
         location / {
             proxy_pass http://127.0.0.1:3000;
 
@@ -34,7 +44,7 @@ http {
 
             proxy_set_header Host $http_host;
             proxy_set_header X-Forwarded-Host $http_host;
-            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Proto $forwarded_proto;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
     }

e2e/access-management.spec.ts

@@ -1,74 +0,0 @@
-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

@@ -1,116 +0,0 @@
-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,104 +0,0 @@
-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
-
-test.use({storageState: LOCAL_STORAGE_PATH})
-
-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", {timeout: TIMEOUT});
-    });
-
-    test('Password too short', async ({page}) => {
-        await page.goto('')
-        await page.click('text=Sign up')
-        await expect(page).toHaveURL('/register')
-
-        let password = '123456'
-        await register(page, users["admin"].username, users["admin"].email, password, password)
-
-        const toast = page.locator('text=Must have at least 8 character')
-        await expect(toast).toBeVisible()
-    })
-
-    test('Password too simple', async ({page}) => {
-        await page.goto('')
-        await page.click('text=Sign up')
-        await expect(page).toHaveURL('/register')
-
-        let password = '12345678'
-        await register(page, users["admin"].username, users["admin"].email, password, password)
-
-        const toast = page.locator('text=Your password must contain at least one uppercase letter, one lowercase letter, one number, and one special character.')
-        await expect(toast).toBeVisible()
-    })
-
-    test('Password and confirm password mismatch', async ({page}) => {
-        await page.goto('/')
-        await page.click('text=Sign up')
-        await expect(page).toHaveURL('/register')
-
-        let password = 'testPASS123456!'
-        let confirmPassword = 'testPASS123456!!'
-        await register(page, users["admin"].username, users["admin"].email, password, confirmPassword)
-
-        const toast = page.locator('text=The passwords did not match')
-        await expect(toast).toBeVisible()
-    })
-
-    test('Successful register for admin', async ({page}) => {
-        await page.goto('/')
-
-        await page.click('text=Sign up')
-        await expect(page).toHaveURL('/register')
-
-        await register(page, users["admin"].username, users["admin"].email, users["admin"].password, users["admin"].password)
-
-        await expect(page).toHaveURL('/login', {timeout: TIMEOUT})
-    })
-
-    test('User already exists.', async ({page}) => {
-        await page.goto('/')
-
-        await page.click('text=Sign up')
-        await expect(page).toHaveURL('/register')
-
-        await register(page, users["admin"].username, users["admin"].email, users["admin"].password, users["admin"].password)
-
-        const toast = page.locator('text=User already exists. Use another email.')
-        await expect(toast).toBeVisible()
-    })
-
-    test('Successful register for normal', async ({page}) => {
-        await page.goto('/')
-
-        await page.click('text=Sign up')
-        await expect(page).toHaveURL('/register')
-
-        await register(page, users["normal"].username, users["normal"].email, users["normal"].password, users["normal"].password)
-
-        await expect(page).toHaveURL('/login', {timeout: TIMEOUT})
-    })
-
-    test('Failed login because account not active', async ({page}) => {
-        await page.goto('/login')
-        await login(page, users["normal"].email, users["normal"].password)
-
-        const toast = page.locator('text=Your account is not active.')
-        await expect(toast).toBeVisible()
-    })
-
-    test('Successful login', async ({page}) => {
-        await page.goto('/login')
-        await login(page, users["admin"].email, users["admin"].password)
-
-        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})
-    })
-})

e2e/cleanup.spec.ts

@@ -1,32 +0,0 @@
-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

@@ -1,70 +0,0 @@
-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

@@ -1,107 +0,0 @@
-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

@@ -1,66 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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

@@ -1,62 +0,0 @@
-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

@@ -1,94 +0,0 @@
-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

@@ -1,59 +0,0 @@
-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

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

e2e/helpers/storage.ts

@@ -1,103 +0,0 @@
-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

@@ -1,71 +0,0 @@
-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

@@ -1,66 +0,0 @@
-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

@@ -1,73 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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

@@ -1,72 +0,0 @@
-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

@@ -1,72 +0,0 @@
-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

@@ -1,73 +0,0 @@
-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

@@ -1,59 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,60 +0,0 @@
-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

@@ -1,121 +0,0 @@
-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

@@ -24,6 +24,8 @@ spec:
               value: {{ .Values.project.url }}
             - name: PROJECT_SECRET
               value: {{ .Values.project.secret }}
+            - name: TUSD_BEHIND_PROXY
+              value: {{ .Values.project.behindProxy | quote }}
           volumeMounts:
             - name: data
               mountPath: /data

helm/values.yaml

@@ -23,6 +23,7 @@ timezone: Europe/Paris
 project:
   url: http://localhost:8887
   secret: "change_me_generate_secure_secret"
+  behindProxy: false
 
 persistence:
   enabled: true

knip.json

@@ -0,0 +1,3 @@
+{
+  "ignoreDependencies": ["pino-pretty"]
+}

next.config.ts

@@ -1,102 +1,100 @@
-import type {NextConfig} from "next";
-import {PORTABASE_DEFAULT_SETTINGS} from "./portabase.config";
+import type { NextConfig } from "next";
+import { PORTABASE_DEFAULT_SETTINGS } from "./portabase.config";
 
 const isDev = process.env.NODE_ENV === "development";
 
-
 function buildCSPHeader(): string {
-    const {CSP} = PORTABASE_DEFAULT_SETTINGS.SECURITY;
+  const { CSP } = PORTABASE_DEFAULT_SETTINGS.SECURITY;
 
-    const directives = [
-        `default-src ${CSP.DEFAULT_SRC.join(" ")}`,
-        `script-src ${CSP.SCRIPT_SRC.join(" ")}`,
-        `style-src ${CSP.STYLE_SRC.join(" ")}`,
-        `img-src ${CSP.IMG_SRC.join(" ")}`,
-        `font-src ${CSP.FONT_SRC.join(" ")}`,
-        `object-src ${CSP.OBJECT_SRC.join(" ")}`,
-        `connect-src ${CSP.CONNECT_SRC.join(" ")}`,
-        `base-uri ${CSP.BASE_URI.join(" ")}`,
-        `form-action ${CSP.FORM_ACTION.join(" ")}`,
-        `frame-ancestors ${CSP.FRAME_ANCESTORS.join(" ")}`,
-    ];
+  const directives = [
+    `default-src ${CSP.DEFAULT_SRC.join(" ")}`,
+    `script-src ${CSP.SCRIPT_SRC.join(" ")}`,
+    `style-src ${CSP.STYLE_SRC.join(" ")}`,
+    `img-src ${CSP.IMG_SRC.join(" ")}`,
+    `font-src ${CSP.FONT_SRC.join(" ")}`,
+    `object-src ${CSP.OBJECT_SRC.join(" ")}`,
+    `connect-src ${CSP.CONNECT_SRC.join(" ")}`,
+    `base-uri ${CSP.BASE_URI.join(" ")}`,
+    `form-action ${CSP.FORM_ACTION.join(" ")}`,
+    `frame-ancestors ${CSP.FRAME_ANCESTORS.join(" ")}`,
+  ];
 
-    if (CSP.BLOCK_ALL_MIXED_CONTENT) {
-        directives.push("block-all-mixed-content");
-    }
+  if (CSP.BLOCK_ALL_MIXED_CONTENT) {
+    directives.push("block-all-mixed-content");
+  }
 
-    if (CSP.UPGRADE_INSECURE_REQUESTS) {
-        directives.push("upgrade-insecure-requests");
-    }
+  if (CSP.UPGRADE_INSECURE_REQUESTS) {
+    directives.push("upgrade-insecure-requests");
+  }
 
-    return directives.join("; ");
+  return directives.join("; ");
 }
 
 function buildPermissionsPolicy(): string {
-    return Object.entries(PORTABASE_DEFAULT_SETTINGS.SECURITY.PERMISSIONS_POLICY)
-        .map(([feature, values]) => `${feature.toLowerCase()}=${values.join(", ")}`)
-        .join(", ");
+  return Object.entries(PORTABASE_DEFAULT_SETTINGS.SECURITY.PERMISSIONS_POLICY)
+    .map(([feature, values]) => `${feature.toLowerCase()}=${values.join(", ")}`)
+    .join(", ");
 }
 
-
 const nextConfig: NextConfig = {
-    output: "standalone",
-    typescript: {
-        ignoreBuildErrors: true,
+  output: "standalone",
+  devIndicators: false,
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+  logging: {
+    browserToTerminal: false,
+  },
+  experimental: {
+    serverActions: {
+      bodySizeLimit: "10gb",
     },
-    logging: {
-        browserToTerminal: false,
-    },
-    experimental: {
-        serverActions: {
-            bodySizeLimit: "10gb",
-        },
-        proxyClientMaxBodySize: '10gb',
-    },
-    async rewrites() {
-        if (!isDev) return [];
+    proxyClientMaxBodySize: "10gb",
+  },
+  async rewrites() {
+    if (!isDev) return [];
 
-        return [
-            {
-                source: "/tus/:path*",
-                destination: "http://localhost:1080/tus/:path*",
-            },
-        ];
-    },
+    return [
+      {
+        source: "/tus/:path*",
+        destination: "http://localhost:1080/tus/:path*",
+      },
+    ];
+  },
 
-    async headers() {
-        return [
-            {
-                source: "/(.*)",
-                headers: [
-                    {
-                        key: "Content-Security-Policy",
-                        value: buildCSPHeader(),
-                    },
-                    {
-                        key: "Permissions-Policy",
-                        value: buildPermissionsPolicy(),
-                    },
-                    {
-                        key: 'X-Content-Type-Options',
-                        value: 'nosniff',
-                    },
-                    {
-                        key: 'X-Frame-Options',
-                        value: 'DENY',
-                    },
-                    {
-                        key: 'Referrer-Policy',
-                        value: 'strict-origin-when-cross-origin',
-                    },
-                    {
-                        key: 'Strict-Transport-Security',
-                        value: 'max-age=63072000; includeSubDomains; preload',
-                    }
-                    // ...other security headers
-                ],
-            },
-        ];
-    },
+  async headers() {
+    return [
+      {
+        source: "/(.*)",
+        headers: [
+          {
+            key: "Content-Security-Policy",
+            value: buildCSPHeader(),
+          },
+          {
+            key: "Permissions-Policy",
+            value: buildPermissionsPolicy(),
+          },
+          {
+            key: "X-Content-Type-Options",
+            value: "nosniff",
+          },
+          {
+            key: "X-Frame-Options",
+            value: "DENY",
+          },
+          {
+            key: "Referrer-Policy",
+            value: "strict-origin-when-cross-origin",
+          },
+          {
+            key: "Strict-Transport-Security",
+            value: "max-age=63072000; includeSubDomains; preload",
+          },
+        ],
+      },
+    ];
+  },
 };
 
 export default nextConfig;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "portabase",
-  "version": "1.18.0",
+  "version": "1.22.4",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack -p 8887",
@@ -16,59 +16,49 @@
   },
   "dependencies": {
     "@asteasolutions/zod-to-openapi": "^8.5.0",
+    "@azure/storage-blob": "^12.32.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",
+    "@google-cloud/storage": "^7.19.0",
     "@hookform/resolvers": "^5.4.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
+    "@onboardjs/react": "1.0.0-rc.5",
     "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
-    "@radix-ui/react-aspect-ratio": "^1.1.8",
     "@radix-ui/react-avatar": "^1.1.11",
     "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-collapsible": "^1.1.12",
-    "@radix-ui/react-context-menu": "^2.2.16",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
-    "@radix-ui/react-hover-card": "^1.1.15",
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-label": "^2.1.8",
-    "@radix-ui/react-menubar": "^1.1.16",
-    "@radix-ui/react-navigation-menu": "^1.2.14",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-progress": "^1.1.8",
     "@radix-ui/react-radio-group": "^1.3.8",
     "@radix-ui/react-scroll-area": "^1.2.10",
     "@radix-ui/react-select": "^2.2.6",
     "@radix-ui/react-separator": "^1.1.8",
-    "@radix-ui/react-slider": "^1.3.6",
     "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-switch": "^1.2.6",
     "@radix-ui/react-tabs": "^1.1.13",
-    "@radix-ui/react-toast": "^1.2.15",
     "@radix-ui/react-toggle": "^1.1.10",
-    "@radix-ui/react-toggle-group": "^1.1.11",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@react-email/components": "^0.0.41",
     "@t3-oss/env-nextjs": "^0.13.11",
     "@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.6.11",
+    "canvas-confetti": "^1.9.4",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.3.0",
-    "dockerode": "^4.0.12",
     "dotenv": "^16.6.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",
@@ -78,66 +68,47 @@
     "next-safe-action": "^7.10.8",
     "next-themes": "^0.4.6",
     "node-cron": "^4.2.1",
-    "node-forge": "^1.4.0",
     "nodemailer": "8.0.5",
-    "npm-check-updates": "^18.3.1",
     "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.6",
     "react-dropzone": "^14.4.1",
     "react-email": "^4.3.2",
     "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",
     "recharts": "^2.15.4",
+    "server-only": "^0.0.1",
     "sharp": "^0.34.5",
-    "socket.io": "^4.8.3",
-    "socket.io-client": "^4.8.3",
     "sonner": "^2.0.7",
-    "swiper": "^12.1.4",
     "tailwind-merge": "^3.6.0",
     "uuid": "^11.1.1",
-    "vaul": "^1.1.2",
-    "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.8",
     "@release-it/bumper": "^7.0.5",
     "@release-it/conventional-changelog": "^10.0.6",
     "@tailwindcss/postcss": "^4.3.0",
-    "@types/eslint-plugin-tailwindcss": "^3.17.0",
+    "@types/canvas-confetti": "^1.9.0",
     "@types/node": "^22.19.19",
-    "@types/node-forge": "^1.3.14",
     "@types/pg": "^8.20.0",
     "@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.32",
     "drizzle-kit": "^0.31.10",
-    "esbuild": "^0.27.7",
     "eslint": "^9.39.4",
     "eslint-config-next": "^16.2.6",
-    "eslint-plugin-tailwindcss": "^3.18.3",
     "framer-motion": "^12.40.0",
-    "node-pty": "^1.1.0",
+    "pino-pretty": "^13.1.3",
     "postcss": "8.5.10",
+    "postcss-load-config": "^6.0.1",
     "release-it": "^19.2.4",
     "tailwindcss": "^4.3.0",
-    "tsx": "^4.22.3",
     "tw-animate-css": "^1.4.0",
-    "typescript": "^5.9.3",
-    "zenstack": "2.14.2"
+    "typescript": "^5.9.3"
   },
-  "packageManager": "pnpm@11.5.2+sha512.71c631e382066efc25625d5cf029075de07b61b37f6e27350fbd84b1bda5864c8c1967adc280776b45c30a715c0359a3be08fef42d5bb09e2b99029979692916"
+  "packageManager": "pnpm@11.8.0+sha512.c1f5e7c4cb241c8f174b743851d82f42b802324afc8b0f116b96adb15aa06664948dde36960a3ba1079ba5b4b29dd0140135b94b5b5f5263592249d68e555f26"
 }

playwright.config.ts

@@ -1,79 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-import dotenv from 'dotenv';
-import path from 'path';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './e2e',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    ...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 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: 'project',
-            testMatch: '**/project.spec.ts',
-            dependencies: ['access-management'],
-        },
-        {
-            name: 'cleanup',
-            testMatch: '**/cleanup.spec.ts',
-            dependencies: ['agent', 'storage', 'notification', 'project'],
-        },
-    ]
-
-});

portabase.config.ts

@@ -46,7 +46,7 @@ export const PORTABASE_DEFAULT_SETTINGS = {
                 "https://api.iconify.design",
                 "https://code.iconify.design",
                 "https://api.github.com",
-
+                "https://api.dicebear.com",
             ],
             OBJECT_SRC: ["'none'"],
             BASE_URI: ["'self'"],

proxy.ts

@@ -4,7 +4,7 @@ import { errorHandler } from "@/middleware/errorHandler";
 import { auth } from "@/lib/auth/auth";
 import { headers } from "next/headers";
 import { env } from "@/env.mjs";
-import {User} from "@/db/schema/02_user";
+import { User } from "@/db/schema/02_user";
 
 export async function proxy(request: NextRequest) {
   const url = request.nextUrl.clone();
@@ -19,7 +19,7 @@ export async function proxy(request: NextRequest) {
         new URL(`/login?redirect=${redirectUrl}`, request.url),
       );
     }
-    const user = session.user as User
+    const user = session.user as User;
 
     if (user.banned) {
       await auth.api.signOut({ headers: await headers() });
@@ -104,6 +104,7 @@ function checkRouteExists(pathname: string) {
     /^\/api\/config\/?$/,
     /^\/api\/health\/?$/,
     /^\/api\/google\/drive\/callback\/?$/,
+    /^\/api\/avatar\/?$/,
     // v1 external API
     /^\/api\/v1\/mcp\/?$/,
     /^\/api\/v1\/docs\/?$/,

seeds/azurite/azurite-list.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+#
+# azurite-list.sh — enumerate every container and blob in a local Azurite emulator.
+#
+# Usage:
+#   ./azurite-list.sh            # list containers + blobs
+#   ./azurite-list.sh -v         # also print blob size, last-modified, content-type
+#
+
+set -euo pipefail
+
+export AZURE_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
+
+VERBOSE=0
+[[ "${1:-}" == "-v" || "${1:-}" == "--verbose" ]] && VERBOSE=1
+
+command -v az >/dev/null 2>&1 || { echo "ERROR: 'az' CLI not found in PATH." >&2; exit 1; }
+command -v jq >/dev/null 2>&1 || { echo "ERROR: 'jq' not found in PATH." >&2; exit 1; }
+
+if ! az storage container list --num-results 1 >/dev/null 2>&1; then
+  echo "ERROR: Cannot reach Azurite at 127.0.0.1:10000. Is the container running?" >&2
+  echo "       Start it with: docker start azurite" >&2
+  exit 1
+fi
+
+containers=$(az storage container list --query "[].name" -o tsv)
+
+if [[ -z "$containers" ]]; then
+  echo "(no containers found in this emulator)"
+  exit 0
+fi
+
+while IFS= read -r container; do
+  echo "📦 container: $container"
+
+  if [[ "$VERBOSE" -eq 1 ]]; then
+    az storage blob list --container-name "$container" \
+      --query "[].{name:name, bytes:properties.contentLength, modified:properties.lastModified, type:properties.contentSettings.contentType}" \
+      -o json \
+    | jq -r '.[] | "   • \(.name)  [\(.bytes) bytes]  \(.type // "?")  \(.modified)"'
+  else
+    az storage blob list --container-name "$container" \
+      --query "[].{name:name, bytes:properties.contentLength}" \
+      -o json \
+    | jq -r '.[] | "   • \(.name)  [\(.bytes) bytes]"'
+  fi
+
+  count=$(az storage blob list --container-name "$container" --query "length(@)" -o tsv)
+  [[ "$count" -eq 0 ]] && echo "   (empty)"
+  echo
+done <<< "$containers"

seeds/azurite/azurite-seed.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+#
+# azurite-seed.sh — seed a local Azurite emulator with a container + sample blob.
+#
+# Usage:
+#   ./azurite-seed.sh                 # create container "portabase" + sample blob
+#   ./azurite-seed.sh my-container    # override container name
+#
+
+set -euo pipefail
+
+export AZURE_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
+
+CONTAINER="${1:-portabase}"
+BLOB_NAME="hello.txt"
+
+command -v az >/dev/null 2>&1 || { echo "ERROR: 'az' CLI not found in PATH." >&2; exit 1; }
+
+# Reachability check — surface the real az error instead of guessing "container down".
+if ! err=$(az storage container list --num-results 1 2>&1 >/dev/null); then
+  echo "ERROR: Azurite query failed:" >&2
+  printf '%s\n' "$err" | sed 's/^/       /' >&2
+  echo "       Is Azurite up? Start it with: docker compose up -d azurite" >&2
+  exit 1
+fi
+
+# Create container (idempotent — az returns created:false if it already exists).
+az storage container create --name "$CONTAINER" -o none
+echo "📦 container ready: $CONTAINER"
+
+# Upload a sample blob from a temp file.
+tmp=$(mktemp)
+trap 'rm -f "$tmp"' EXIT
+printf 'hello from azurite seed — %s\n' "$(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$tmp"
+
+az storage blob upload \
+  --container-name "$CONTAINER" \
+  --name "$BLOB_NAME" \
+  --file "$tmp" \
+  --overwrite true \
+  --no-progress \
+  -o none
+echo "   • uploaded blob: $BLOB_NAME"
+
+echo
+echo "Seed complete. Verify with: make list-blob"

seeds/keycloak/master-realm.json

@@ -351,6 +351,14 @@
         "clientRole" : true,
         "containerId" : "18b5dfb2-44d4-448e-98df-9652daef1a22",
         "attributes" : { }
+      } ],
+      "exemple-client" : [ {
+        "id" : "67766209-57dd-45c7-940d-ed3313473101",
+        "name" : "uma_protection",
+        "composite" : false,
+        "clientRole" : true,
+        "containerId" : "248d3eaa-466f-4b85-8903-9242959e67ba",
+        "attributes" : { }
       } ]
     }
   },
@@ -458,8 +466,8 @@
       "id" : "b1cedcac-5207-4479-bc29-065ba849e414",
       "type" : "password",
       "userLabel" : "My password",
-      "createdDate" : 1772179391727,
-      "secretData" : "{\"value\":\"IXr6L3pvO2BAkn/cH3rh3v2tg1R83u2f8SWEZK2fq5E=\",\"salt\":\"XWV8/yKm7Rw/YXiwXZZUig==\",\"additionalParameters\":{}}",
+      "createdDate" : 1782393421785,
+      "secretData" : "{\"value\":\"L585pLqSeHaNW4HzOu+GzZm+VJWWBO3Df+rPs04gUGk=\",\"salt\":\"w3pmQ0hsMDJnCX+qJ3K+zQ==\",\"additionalParameters\":{}}",
       "credentialData" : "{\"hashIterations\":5,\"algorithm\":\"argon2\",\"additionalParameters\":{\"hashLength\":[\"32\"],\"memory\":[\"7168\"],\"type\":[\"id\"],\"version\":[\"1.3\"],\"parallelism\":[\"1\"]}}"
     } ],
     "disableableCredentialTypes" : [ ],
@@ -467,6 +475,23 @@
     "realmRoles" : [ "admin", "default-roles-master" ],
     "notBefore" : 0,
     "groups" : [ "/Admin" ]
+  }, {
+    "id" : "8c749a0c-f2ed-4bc7-9f54-4e0bcbc36626",
+    "username" : "service-account-exemple-client",
+    "emailVerified" : false,
+    "enabled" : true,
+    "createdTimestamp" : 1772190246795,
+    "totp" : false,
+    "serviceAccountClientId" : "exemple-client",
+    "credentials" : [ ],
+    "disableableCredentialTypes" : [ ],
+    "requiredActions" : [ ],
+    "realmRoles" : [ "default-roles-master" ],
+    "clientRoles" : {
+      "exemple-client" : [ "uma_protection" ]
+    },
+    "notBefore" : 0,
+    "groups" : [ ]
   }, {
     "id" : "718dfe46-dbef-41a3-9120-78aeac240431",
     "username" : "service-account-portabase",
@@ -625,6 +650,57 @@
     "nodeReRegistrationTimeout" : 0,
     "defaultClientScopes" : [ "web-origins", "acr", "profile", "roles", "basic", "email" ],
     "optionalClientScopes" : [ "address", "phone", "organization", "offline_access", "microprofile-jwt" ]
+  }, {
+    "id" : "248d3eaa-466f-4b85-8903-9242959e67ba",
+    "clientId" : "exemple-client",
+    "name" : "Exemple Client",
+    "description" : "",
+    "rootUrl" : "https://your-instance.portabase.io",
+    "adminUrl" : "https://your-instance.portabase.io",
+    "baseUrl" : "https://your-instance.portabase.io",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "secret" : "lFZY6fXzh9uxCXwvucw9JtXGhNRKgnnj",
+    "redirectUris" : [ "https://your-instance.portabase.io/api/auth/sso/callback/exemple-client" ],
+    "webOrigins" : [ "https://your-instance.portabase.io" ],
+    "notBefore" : 0,
+    "bearerOnly" : false,
+    "consentRequired" : false,
+    "standardFlowEnabled" : true,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : false,
+    "serviceAccountsEnabled" : true,
+    "authorizationServicesEnabled" : true,
+    "publicClient" : false,
+    "frontchannelLogout" : true,
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "realm_client" : "false",
+      "oidc.ciba.grant.enabled" : "false",
+      "client.secret.creation.time" : "1772190246",
+      "backchannel.logout.session.required" : "true",
+      "standard.token.exchange.enabled" : "false",
+      "post.logout.redirect.uris" : "https://your-instance.portabase.io",
+      "oauth2.device.authorization.grant.enabled" : "true",
+      "pkce.code.challenge.method" : "S256",
+      "backchannel.logout.revoke.offline.tokens" : "false",
+      "dpop.bound.access.tokens" : "false"
+    },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : true,
+    "nodeReRegistrationTimeout" : -1,
+    "defaultClientScopes" : [ "web-origins", "service_account", "acr", "profile", "roles", "basic", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "organization", "offline_access", "microprofile-jwt" ],
+    "authorizationSettings" : {
+      "allowRemoteResourceManagement" : true,
+      "policyEnforcementMode" : "ENFORCING",
+      "resources" : [ ],
+      "policies" : [ ],
+      "scopes" : [ ],
+      "decisionStrategy" : "UNANIMOUS"
+    }
   }, {
     "id" : "6022c206-5f1f-45b7-af07-74ce6804cbc7",
     "clientId" : "master-realm",

src/components/common/back-button.tsx

@@ -1,18 +0,0 @@
-"use client";
-import React from "react";
-import { useRouter } from "next/navigation";
-import { Button } from "@/components/ui/button";
-
-type BackButtonProps = React.ComponentProps<typeof Button> & {
-    children: React.ReactNode;
-};
-
-export default function BackButton({ children, ...props }: BackButtonProps) {
-    const router = useRouter();
-
-    return (
-        <Button onClick={() => router.back()} aria-label={children?.toString()} {...props}>
-            {children}
-        </Button>
-    );
-}

src/components/common/data-table.tsx

@@ -9,6 +9,8 @@ import {
     SortingState,
     ColumnFiltersState,
     getFilteredRowModel,
+    PaginationState,
+    OnChangeFn,
 } from "@tanstack/react-table";
 
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
@@ -42,6 +44,13 @@ interface DataTableProps<TData, TValue> {
     };
     highlightRow?: (row: TData) => boolean;
     selectedActions?: (rows: TData[]) => ReactNode;
+    manualPagination?: boolean;
+    rowCount?: number;
+    paginationState?: { pageIndex: number; pageSize: number };
+    onPaginationChange?: OnChangeFn<PaginationState>;
+    sorting?: SortingState;
+    onSortingChange?: OnChangeFn<SortingState>;
+    isFetching?: boolean;
 
 }
 
@@ -56,10 +65,19 @@ export function DataTable<TData, TValue>({
                                              emptyButton,
                                              highlightRow,
                                              selectedActions,
+                                             manualPagination = false,
+                                             rowCount,
+                                             paginationState,
+                                             onPaginationChange,
+                                             sorting: controlledSorting,
+                                             onSortingChange: controlledOnSortingChange,
+                                             isFetching = false,
 
 
                                          }: DataTableProps<TData, TValue>) {
-    const [sorting, setSorting] = useState<SortingState>([]);
+    const [internalSorting, setInternalSorting] = useState<SortingState>([]);
+    const sorting = controlledSorting ?? internalSorting;
+    const setSorting = controlledOnSortingChange ?? setInternalSorting;
     const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
     const [rowSelection, setRowSelection] = useState({});
 
@@ -96,7 +114,7 @@ export function DataTable<TData, TValue>({
         data,
         columns: finalColumns,
         getCoreRowModel: getCoreRowModel(),
-        getPaginationRowModel: getPaginationRowModel(),
+        getPaginationRowModel: manualPagination ? undefined : getPaginationRowModel(),
         onSortingChange: setSorting,
         getSortedRowModel: getSortedRowModel(),
         onColumnFiltersChange: setColumnFilters,
@@ -106,10 +124,15 @@ export function DataTable<TData, TValue>({
         autoResetPageIndex: false,
         autoResetExpanded: false,
         enableRowSelection: true,
+        manualPagination,
+        manualSorting: manualPagination,
+        rowCount: manualPagination ? rowCount : undefined,
+        onPaginationChange: manualPagination ? onPaginationChange : undefined,
         state: {
             sorting,
             columnFilters,
             rowSelection,
+            ...(manualPagination && paginationState ? { pagination: paginationState } : {}),
         },
     });
     const router = useRouter();
@@ -194,18 +217,22 @@ export function DataTable<TData, TValue>({
                             selected.
                         </div>
                     )}
-                    {enablePagination && table.getFilteredRowModel().rows.length >= 1 && (
+                    {enablePagination && (manualPagination ? (rowCount ?? 0) > 0 : table.getFilteredRowModel().rows.length >= 1) && (
                         <TablePagination
                             table={table}
                             maxVisiblePages={paginationOptions?.pageVisible}
-                            pageSizeOptions={(() => {
-                                const rowCount = table.getFilteredRowModel().rows.length;
-                                const allSizes = paginationOptions.pageSize.sort((a, b) => a - b);
-                                const validSizes = allSizes.filter((size) => size <= rowCount);
-                                const nextSize = allSizes.find((size) => size > rowCount);
-                                if (nextSize) validSizes.push(nextSize);
-                                return validSizes;
-                            })()}
+                            pageSizeOptions={
+                                manualPagination
+                                    ? paginationOptions.pageSize
+                                    : (() => {
+                                        const rowCountLocal = table.getFilteredRowModel().rows.length;
+                                        const allSizes = paginationOptions.pageSize.sort((a, b) => a - b);
+                                        const validSizes = allSizes.filter((size) => size <= rowCountLocal);
+                                        const nextSize = allSizes.find((size) => size > rowCountLocal);
+                                        if (nextSize) validSizes.push(nextSize);
+                                        return validSizes;
+                                    })()
+                            }
                             className={paginationOptions.className}
                         />
                     )}

src/components/common/database-card.tsx

@@ -1,6 +1,4 @@
 "use client";
-
-import Link from "next/link";
 import Image from "next/image";
 import {useState} from "react";
 import {Card} from "@/components/ui/card";
@@ -8,28 +6,54 @@ import {ConnectionIndicator} from "@/components/common/connection-indicator";
 import {formatDateLastContact} from "@/utils/date-formatting";
 import {Database} from "@/db/schema/07_database";
 import {ChevronRight, Activity, Fingerprint, Copy, Check} from "lucide-react";
+import {cn} from "@/lib/utils";
 
 export type DatabaseCardProps = {
     data: Database;
     withDetails?: boolean;
+    selectable?: boolean;
+    selected?: boolean;
+    onToggleSelect?: (databaseId: string) => void;
+    deleteButton?: React.ReactNode;
 };
 
 export const DatabaseCard = (props: DatabaseCardProps) => {
-    const {data: database, withDetails = true} = props;
+    const {data: database, withDetails = true, selectable = false, selected = false, onToggleSelect, deleteButton} = props;
     const [isCopied, setIsCopied] = useState(false);
 
     const handleCopy = (e: React.MouseEvent) => {
         e.preventDefault();
         e.stopPropagation();
-        navigator.clipboard.writeText(database.agentDatabaseId);
+        navigator.clipboard.writeText(database.agentDatabaseId ?? "");
         setIsCopied(true);
         setTimeout(() => setIsCopied(false), 2000);
     };
 
     return (
         <Card
-            className="relative h-full flex flex-col p-4 transition-all border-border/50 bg-card hover:bg-accent/50 hover:border-primary/50 group-hover:shadow-lg overflow-hidden gap-0">
-            <div className="flex items-start justify-between mb-2">
+            className={cn(
+                "relative h-full flex flex-col p-4 transition-all border-border/50 bg-card hover:bg-accent/50 hover:border-primary/50 group-hover:shadow-lg overflow-hidden gap-0",
+                selected && "ring-1 ring-primary border-primary",
+            )}>
+            {selectable && (
+                <button
+                    type="button"
+                    aria-pressed={selected}
+                    aria-label={selected ? "Deselect database" : "Select database"}
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        onToggleSelect?.(database.id);
+                    }}
+                    className={cn(
+                        "absolute top-3 left-3 z-20 w-5 h-5 rounded-md border-2 flex items-center justify-center transition-colors",
+                        selected ? "bg-primary border-primary text-primary-foreground" : "border-muted-foreground/50 bg-background/70",
+                    )}
+                >
+                    {selected && <Check className="w-3 h-3" />}
+                </button>
+            )}
+            <div className={cn("flex items-start justify-between mb-2", selectable && "pl-7")}>
                 <div
                     className="relative w-12 h-12 p-2 bg-background rounded-xl border border-border/50 shadow-sm flex items-center justify-center group-hover:border-primary/30 transition-all duration-300 group-hover:scale-105">
                     <Image
@@ -82,7 +106,12 @@ export const DatabaseCard = (props: DatabaseCardProps) => {
                 </div>
             </div>
 
-            {withDetails && (
+            {deleteButton ? (
+                <div className="mt-4 flex items-center justify-end pt-3 border-t border-border/50"
+                     onClick={(e) => e.preventDefault()}>
+                    {deleteButton}
+                </div>
+            ) : withDetails ? (
                 <div className="mt-4 flex items-center justify-between pt-3 border-t border-border/50">
                 <span
                     className="text-[10px] font-black uppercase tracking-widest text-primary opacity-0 group-hover:opacity-100 transition-all duration-300 transform translate-x-[-10px] group-hover:translate-x-0">Open</span>
@@ -93,7 +122,7 @@ export const DatabaseCard = (props: DatabaseCardProps) => {
                         <ChevronRight className="w-3.5 h-3.5 group-hover:translate-x-1 transition-transform"/>
                     </div>
                 </div>
-            )}
+            ) : null}
         </Card>
     );
 };

src/components/common/theme-selector.tsx

@@ -0,0 +1,122 @@
+"use client";
+
+import { cn } from "@/lib/utils";
+
+export type ThemeKey = "dark" | "light" | "system";
+
+const themes: { value: ThemeKey }[] = [
+  { value: "light" },
+  { value: "dark" },
+  { value: "system" },
+];
+
+const THEME_TEXT: Record<ThemeKey, string> = {
+  dark: "Dark",
+  light: "Light",
+  system: "System",
+};
+
+interface ThemeSelectorProps {
+  value?: string;
+  onSelect: (value: ThemeKey) => void;
+  className?: string;
+}
+
+export function ThemeSelector({
+  value,
+  onSelect,
+  className,
+}: ThemeSelectorProps) {
+  return (
+    <div
+      className={cn("grid grid-cols-1 sm:grid-cols-3 gap-4 w-full", className)}
+    >
+      {themes.map((item) => {
+        const isDark = item.value === "dark";
+        const isSystem = item.value === "system";
+        const isActive = value === item.value;
+
+        return (
+          <div
+            key={item.value}
+            className={cn(
+              "border-2 rounded-xl p-1 cursor-pointer transition-all hover:bg-accent/50 space-y-2",
+              isActive ? "border-primary bg-primary/5" : "border-muted/40",
+            )}
+            onClick={() => onSelect(item.value)}
+          >
+            <div
+              className={cn(
+                "p-2 rounded-lg aspect-4/3 flex flex-col gap-2 relative overflow-hidden border",
+                isDark
+                  ? "bg-slate-950 border-slate-800"
+                  : "bg-white border-slate-200",
+                isSystem && "bg-linear-to-br from-white to-slate-950",
+              )}
+            >
+              <div
+                className={cn(
+                  "h-3 w-full rounded-sm shadow-sm opacity-80",
+                  isDark ? "bg-slate-800" : "bg-slate-100",
+                )}
+              />
+              <div className="flex gap-2 flex-1 relative">
+                <div
+                  className={cn(
+                    "w-1/4 h-full rounded-sm shadow-sm opacity-80",
+                    isDark ? "bg-slate-800" : "bg-slate-100",
+                  )}
+                />
+                <div className="flex-1 flex flex-col gap-2">
+                  <div
+                    className={cn(
+                      "h-3 w-full rounded-sm shadow-sm opacity-80",
+                      isDark ? "bg-slate-800" : "bg-slate-100",
+                    )}
+                  />
+                  <div
+                    className={cn(
+                      "flex-1 rounded-sm shadow-sm p-1 space-y-2 opacity-50",
+                      isDark ? "bg-slate-800" : "bg-slate-100",
+                    )}
+                  >
+                    <div
+                      className={cn(
+                        "h-2 w-3/4 rounded-full",
+                        isDark ? "bg-slate-700" : "bg-slate-300",
+                      )}
+                    />
+                    <div
+                      className={cn(
+                        "h-2 w-full rounded-full",
+                        isDark ? "bg-slate-700" : "bg-slate-300",
+                      )}
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div className="flex items-center justify-between p-1 px-2">
+              <span className="font-medium text-sm">
+                {THEME_TEXT[item.value]}
+              </span>
+              <div
+                className={cn(
+                  "w-4 h-4 rounded-full border flex items-center justify-center transition-all",
+                  isActive
+                    ? "border-primary bg-primary"
+                    : "border-muted-foreground/30",
+                )}
+              >
+                {isActive && (
+                  <div className="w-1.5 h-1.5 rounded-full bg-primary-foreground" />
+                )}
+              </div>
+            </div>
+          </div>
+        );
+      })}
+    </div>
+  );
+}

src/components/emails/email-notification.tsx

@@ -1,7 +1,7 @@
 // import * as React from "react";
 // import EmailLayout from "./email-layout";
 // import {Text, Section, Button} from "@react-email/components";
-// import type {EventPayload} from "@/features/notifications/notifications.types";
+// import type {EventPayload} from "@/features/notifications/types";
 //
 // export interface EmailNotificationProps {
 //     payload: EventPayload
@@ -48,7 +48,7 @@
 import * as React from "react";
 import EmailLayout from "./email-layout";
 import {Text, Section, Button} from "@react-email/components";
-import type {EventPayload} from "@/features/notifications/notifications.types";
+import type {EventPayload} from "@/features/notifications/types";
 
 export interface EmailNotificationProps {
     payload: EventPayload;