chore: update versions (#3355)

This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @nhost/hasura-auth-js@2.12.0

### Minor Changes

-   39b10a2: feat (dashboard): Add multi-factor authentication

## @nhost/react@3.11.0

### Minor Changes

-   39b10a2: feat (dashboard): Add multi-factor authentication
-   4b84780: feat (dashboard): Add Webauthn to dashboard

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost/apollo@8.0.9

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost/react-apollo@18.0.0

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0
    -   @nhost/apollo@8.0.9

## @nhost/react-urql@15.0.0

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0

## @nhost/nextjs@2.2.8

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0

## @nhost/nhost-js@3.2.9

### Patch Changes

-   Updated dependencies [39b10a2]
    -   @nhost/hasura-auth-js@2.12.0

## @nhost/vue@2.9.6

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost/dashboard@2.31.0

### Minor Changes

-   39b10a2: feat (dashboard): Add multi-factor authentication
-   4b84780: feat (dashboard): Add Webauthn to dashboard

### Patch Changes

-   61eb6cd: fix (dashboard): Fix update project e2e test
    -   @nhost/react-apollo@18.0.0
    -   @nhost/nextjs@2.2.8

## @nhost-examples/cli@0.3.22

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost-examples/codegen-react-apollo@0.8.1

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0
    -   @nhost/react-apollo@18.0.0

## @nhost-examples/codegen-react-query@0.8.1

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0

## @nhost-examples/codegen-react-urql@0.7.1

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0
    -   @nhost/react-urql@15.0.0

## @nhost-examples/multi-tenant-one-to-many@2.2.23

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost-examples/nextjs@0.4.8

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0
    -   @nhost/react-apollo@18.0.0
    -   @nhost/nextjs@2.2.8

## @nhost-examples/node-storage@0.2.22

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost-examples/nextjs-server-components@0.6.1

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost-examples/sveltekit@0.8.1

### Patch Changes

-   @nhost/nhost-js@3.2.9

## @nhost-examples/react-apollo@1.6.1

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0
    -   @nhost/react-apollo@18.0.0

## @nhost-examples/react-gqty@1.6.1

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0

## @nhost-examples/react-native@0.1.9

### Patch Changes

-   Updated dependencies [39b10a2]
-   Updated dependencies [4b84780]
    -   @nhost/react@3.11.0
    -   @nhost/react-apollo@18.0.0

## @nhost-examples/vue-apollo@0.12.1

### Patch Changes

-   @nhost/nhost-js@3.2.9
-   @nhost/apollo@8.0.9
-   @nhost/vue@2.9.6

## @nhost-examples/vue-quickstart@0.6.1

### Patch Changes

-   @nhost/apollo@8.0.9
-   @nhost/vue@2.9.6

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/actions/install-dependencies/action.yaml

@@ -14,22 +14,30 @@ runs:
   steps:
     - uses: pnpm/action-setup@v4
       with:
-        version: 8.10.5
+        version: 10.1.0
         run_install: false
     - name: Get pnpm cache directory
       id: pnpm-cache-dir
       shell: bash
       run: echo "dir=$(pnpm store path)" >> $GITHUB_OUTPUT
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       id: pnpm-cache
       with:
         path: ${{ steps.pnpm-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
         restore-keys: ${{ runner.os }}-node-
-    - name: Use Node.js v18
+    - name: Use Node.js v20
       uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 20
+    - shell: bash
+      name: Use Latest Corepack
+      run: |
+        echo "Before: corepack version => $(corepack --version || echo 'not installed')"
+        npm install -g corepack@latest
+        echo "After : corepack version => $(corepack --version)"
+        corepack enable
+        pnpm --version
     - shell: bash
       name: Install packages
       run: pnpm install --frozen-lockfile

.github/actions/nhost-cli/action.yaml

@@ -1,6 +1,9 @@
 name: Nhost CLI
 description: 'Action to install the Nhost CLI and to run an application'
 inputs:
+  init:
+    description: 'Initialize the application'
+    default: 'false'
   start:
     description: "Start the application. If false, the application won't be started"
     default: 'false'
@@ -16,6 +19,9 @@ inputs:
   version:
     description: 'Version of the Nhost CLI'
     default: 'latest'
+  dashboard-image:
+    description: 'Image of the dashboard'
+    default: 'nhost/dashboard:latest'
   config:
     description: 'Values to be injected into nhost/config.yaml'
 
@@ -40,6 +46,13 @@ runs:
         timeout_minutes: 3
         max_attempts: 10
         command: bash <(curl --silent -L https://raw.githubusercontent.com/nhost/cli/main/get.sh) ${{ inputs.version }}
+    - name: Initialize a new project from scratch
+      if: ${{ inputs.init == 'true' }}
+      shell: bash
+      working-directory: ${{ inputs.path }}
+      run: |
+        rm -rf ./*
+        nhost init
     - name: Set custom configuration
       if: ${{ inputs.config }}
       shell: bash
@@ -50,7 +63,12 @@ runs:
       shell: bash
       working-directory: ${{ inputs.path }}
       run: |
-        cp .secrets.example .secrets
+        if [ -n "${{ inputs.dashboard-image }}" ]; then
+          export NHOST_DASHBOARD_VERSION=${{ inputs.dashboard-image }}
+        fi
+        if [ -f .secrets.example ]; then
+          cp .secrets.example .secrets
+        fi
         nhost up
     - name: Log on failure
       if: steps.wait.outcome == 'failure'

.github/labeler.yml

@@ -1,24 +1,25 @@
 dashboard:
-  - dashboard/**/*
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: ['dashboard/**/*']
 
 documentation:
-  - any:
-      - docs/**/*
+  - any: ['docs/**/*']
 
 examples:
-  - examples/**/*
+  - any: ['examples/**/*']
 
 sdk:
-  - packages/**/*
+  - any: ['packages/**/*']
 
 integrations:
-  - integrations/**/*
+  - any: ['integrations/**/*']
 
 react:
-  - '{packages,examples,integrations}/*react*/**/*'
+  - any: ['{packages,examples,integrations}/*react*/**/*']
 
 nextjs:
-  - '{packages,examples}/*next*/**/*'
+  - any: ['{packages,examples}/*next*/**/*']
 
 vue:
-  - '{packages,examples,integrations}/*vue*/**/*'
+  - any: ['{packages,examples,integrations}/*vue*/**/*']

.github/workflows/changesets.yaml

@@ -65,29 +65,13 @@ jobs:
 
   publish-vercel:
     name: Publish to Vercel
-    runs-on: ubuntu-latest
     needs:
       - test
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install Node and dependencies
-        uses: ./.github/actions/install-dependencies
-        with:
-          TURBO_TOKEN: ${{ env.TURBO_TOKEN }}
-          TURBO_TEAM: ${{ env.TURBO_TEAM }}
-      - name: Setup Vercel CLI
-        run: pnpm add -g vercel
-      - name: Trigger a Vercel deployment
-        env:
-          VERCEL_ORG_ID: ${{ secrets.DASHBOARD_VERCEL_TEAM_ID }}
-          VERCEL_PROJECT_ID: ${{ secrets.DASHBOARD_VERCEL_PROJECT_ID }}
-        run: |
-          vercel pull --environment=production --token=${{ secrets.DASHBOARD_VERCEL_DEPLOY_TOKEN }}
-          vercel build --prod --token=${{ secrets.DASHBOARD_VERCEL_DEPLOY_TOKEN }}
-          vercel deploy --prebuilt --prod --token=${{ secrets.DASHBOARD_VERCEL_DEPLOY_TOKEN }}
+    uses: ./.github/workflows/deploy-dashboard.yaml
+    with:
+      git_ref: ${{ github.ref_name }}
+      environment: production
+    secrets: inherit
 
   publish-docker:
     name: Publish to Docker Hub

.github/workflows/ci.yaml

@@ -7,20 +7,20 @@ on:
       - 'assets/**'
       - '**.md'
       - 'LICENSE'
+      - 'docs/**'
   pull_request:
     types: [opened, synchronize]
     paths-ignore:
       - 'assets/**'
       - '**.md'
       - 'LICENSE'
+      - 'docs/**'
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: nhost
   NEXT_PUBLIC_ENV: dev
   NEXT_TELEMETRY_DISABLED: 1
-  NEXT_PUBLIC_NHOST_BACKEND_URL: http://localhost:1337
   NHOST_TEST_DASHBOARD_URL: ${{ vars.NHOST_TEST_DASHBOARD_URL }}
-  NHOST_TEST_WORKSPACE_NAME: ${{ vars.NHOST_TEST_WORKSPACE_NAME }}
   NHOST_TEST_PROJECT_NAME: ${{ vars.NHOST_TEST_PROJECT_NAME }}
   NHOST_TEST_ORGANIZATION_NAME: ${{ vars.NHOST_TEST_ORGANIZATION_NAME }}
   NHOST_TEST_ORGANIZATION_SLUG: ${{ vars.NHOST_TEST_ORGANIZATION_SLUG }}
@@ -29,7 +29,8 @@ env:
   NHOST_PRO_TEST_PROJECT_NAME: ${{ vars.NHOST_PRO_TEST_PROJECT_NAME }}
   NHOST_TEST_USER_EMAIL: ${{ secrets.NHOST_TEST_USER_EMAIL }}
   NHOST_TEST_USER_PASSWORD: ${{ secrets.NHOST_TEST_USER_PASSWORD }}
-  NHOST_TEST_PROJECT_ADMIN_SECRET: ${{ secrets.NHOST_TEST_PROJECT_ADMIN_SECRET }}
+  NHOST_TEST_PROJECT_ADMIN_SECRET: '${{ secrets.NHOST_TEST_PROJECT_ADMIN_SECRET }}'
+  NHOST_TEST_FREE_USER_EMAILS: ${{ secrets.NHOST_TEST_FREE_USER_EMAILS }}
 
 jobs:
   build:
@@ -108,6 +109,9 @@ jobs:
         with:
           TURBO_TOKEN: ${{ env.TURBO_TOKEN }}
           TURBO_TEAM: ${{ env.TURBO_TEAM }}
+      - name: Enforce Prettier formatting in dashboard
+        working-directory: ./dashboard
+        run: pnpm prettier --check "./**/*.tsx" --config prettier.config.js
       # * Run every `lint` script in the workspace . Dependencies build is cached by Turborepo
       - name: Lint
         run: pnpm run lint:all
@@ -132,10 +136,27 @@ jobs:
         with:
           TURBO_TOKEN: ${{ env.TURBO_TOKEN }}
           TURBO_TEAM: ${{ env.TURBO_TEAM }}
+      # * Build Dashboard image to test it locally
+      - name: Build Dashboard local image
+        if: matrix.package.path == 'dashboard'
+        run: |
+          docker build -t nhost/dashboard:0.0.0-dev -f ${{ matrix.package.path }}/Dockerfile .
+          mkdir -p nhost-test-project
       # * Install Nhost CLI if a `nhost/config.yaml` file is found
       - name: Install Nhost CLI
-        if: hashFiles(format('{0}/nhost/config.yaml', matrix.package.path)) != ''
+        if: hashFiles(format('{0}/nhost/config.yaml', matrix.package.path)) != '' && matrix.package.path != 'dashboard'
         uses: ./.github/actions/nhost-cli
+      # * Install Nhost CLI to test Dashboard locally
+      - name: Install Nhost CLI (Local Dashboard tests)
+        timeout-minutes: 5
+        if: matrix.package.path == 'dashboard'
+        uses: ./.github/actions/nhost-cli
+        with:
+          init: 'true' # Initialize the application
+          start: 'true' # Start the application
+          path: ./nhost-test-project
+          wait: 'true' # Wait until the application is ready
+          dashboard-image: 'nhost/dashboard:0.0.0-dev'
       - name: Fetch Dashboard Preview URL
         id: fetch-dashboard-preview-url
         uses: zentered/vercel-preview-url@v1.1.9
@@ -151,10 +172,28 @@ jobs:
       - name: Set Dashboard Preview URL
         if: steps.fetch-dashboard-preview-url.outputs.preview_url != ''
         run: echo "NHOST_TEST_DASHBOARD_URL=https://${{ steps.fetch-dashboard-preview-url.outputs.preview_url }}" >> $GITHUB_ENV
+      - name: Run Upgrade project Dashboard e2e tests
+        if: matrix.package.path == 'dashboard'
+        timeout-minutes: 10
+        run: pnpm --filter="${{ matrix.package.name }}" run e2e:upgrade-project
       # * Run the `ci` script of the current package of the matrix. Dependencies build is cached by Turborepo
       - name: Run e2e tests
         timeout-minutes: 20
         run: pnpm --filter="${{ matrix.package.name }}" run e2e
+      # * Run the `e2e-local` script of the dashboard
+      - name: Run Local Dashboard e2e tests
+        if: matrix.package.path == 'dashboard'
+        timeout-minutes: 5
+        run: pnpm --filter="${{ matrix.package.name }}" run e2e:local
+
+      - name: Stop Nhost CLI
+        if: matrix.package.path == 'dashboard'
+        working-directory: ./nhost-test-project
+        run: nhost down
+      - name: Stop Nhost CLI for packages
+        if: always() && (matrix.package.path == 'packages/hasura-auth-js' || matrix.package.path == 'packages/hasura-storage-js')
+        working-directory: ./${{ matrix.package.path }}
+        run: nhost down
       - id: file-name
         if: ${{ failure() }}
         name: Transform package name into a valid file name
@@ -164,7 +203,7 @@ jobs:
       # * Run this step only if the previous step failed, and Playwright generated a report
       - name: Upload Playwright Report
         if: ${{ failure() && hashFiles(format('{0}/playwright-report/**', matrix.package.path)) != ''}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: playwright-${{ steps.file-name.outputs.fileName }}
           path: ${{format('{0}/playwright-report/**', matrix.package.path)}}

.github/workflows/dashboard.yaml

@@ -8,7 +8,6 @@ env:
   TURBO_TEAM: nhost
   NEXT_PUBLIC_ENV: dev
   NEXT_TELEMETRY_DISABLED: 1
-  NEXT_PUBLIC_NHOST_BACKEND_URL: http://localhost:1337
 
 jobs:
   build:

.github/workflows/deploy-dashboard.yaml

@@ -0,0 +1,86 @@
+name: 'dashboard: release form'
+
+on:
+  workflow_dispatch:
+    inputs:
+      git_ref:
+        type: string
+        description: 'Branch, tag, or commit SHA'
+        required: true
+
+      environment:
+        type: choice
+        description: 'Deployment environment'
+        required: true
+        default: staging
+        options:
+          - staging
+          - production
+
+  workflow_call:
+    inputs:
+      git_ref:
+        required: true
+        type: string
+      environment:
+        required: true
+        type: string
+
+jobs:
+  publish-vercel:
+    name: Publish to Vercel
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.git_ref }}
+          fetch-depth: 0
+
+      - name: Install Node and dependencies
+        uses: ./.github/actions/install-dependencies
+        with:
+          TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+          TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+
+      - name: Setup Vercel CLI
+        run: pnpm add -g vercel
+
+      - name: Trigger Vercel deployment
+        env:
+          VERCEL_ORG_ID: ${{ secrets.DASHBOARD_VERCEL_TEAM_ID }}
+          VERCEL_PROJECT_ID: ${{ inputs.environment == 'production' && secrets.DASHBOARD_VERCEL_PROJECT_ID || secrets.DASHBOARD_STAGING_VERCEL_PROJECT_ID }}
+        run: |
+          echo "Deploying to: ${{ inputs.environment }}..."
+          vercel pull --environment=production --token=${{ secrets.DASHBOARD_VERCEL_DEPLOY_TOKEN }}
+          vercel build --prod --token=${{ secrets.DASHBOARD_VERCEL_DEPLOY_TOKEN }}
+          vercel deploy --prebuilt --prod --token=${{ secrets.DASHBOARD_VERCEL_DEPLOY_TOKEN }}
+
+      - name: Send Discord notification (success)
+        if: success()
+        uses: tsickert/discord-webhook@v7.0.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_PRODUCTION }}
+          embed-title: "Dashboard Deployment"
+          embed-description: |
+            **Status**: success
+            **Triggered by**: ${{ github.actor }}
+
+            **Inputs**:
+            - Git Ref: ${{ inputs.git_ref }}
+          embed-color: '5763719'
+
+      - name: Send Discord notification (failure)
+        if: failure()
+        uses: tsickert/discord-webhook@v7.0.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_PRODUCTION }}
+          embed-title: "Dashboard Deployment"
+          embed-description: |
+            **Status**: failure
+            **Triggered by**: ${{ github.actor }}
+
+            **Inputs**:
+            - Git Ref: ${{ inputs.git_ref }}
+          embed-color: '15548997'

.github/workflows/gen_ai_review.yaml

@@ -12,12 +12,11 @@ jobs:
     permissions:
       issues: write
       pull-requests: write
-      contents: write
     name: Run pr agent on every pull request, respond to user comments
     steps:
       - name: PR Agent action step
         id: pragent
-        uses: Codium-ai/pr-agent@v0.24
+        uses: Codium-ai/pr-agent@v0.26
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           OPENAI_KEY: ${{ secrets.OPENAI_API_KEY }}

.github/workflows/labeler.yaml

@@ -3,13 +3,12 @@ on:
   - pull_request_target
 
 jobs:
-  triage:
+  labeler:
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5
         with:
-          repo-token: '${{ secrets.GH_PAT }}'
-          sync-labels: ''
+          repo-token: ${{ secrets.GH_PAT }}

.github/workflows/test-nhost-cli-action.yaml

@@ -25,10 +25,10 @@ jobs:
       - name: Install the Nhost CLI and start the application
         uses: ./.github/actions/nhost-cli
         with:
-          path: packages/nhost-js
+          init: true
           start: true
       - name: should be running
-        run: curl -sSf 'https://local.hasura.nhost.run' > /dev/null
+        run: curl -sSf 'https://local.hasura.local.nhost.run/' > /dev/null
 
   stop:
     runs-on: ubuntu-latest
@@ -37,7 +37,7 @@ jobs:
       - name: Install the Nhost CLI, start and stop the application
         uses: ./.github/actions/nhost-cli
         with:
-          path: packages/nhost-js
+          init: true
           start: true
           stop: true
       - name: should have no live docker container
@@ -55,12 +55,13 @@ jobs:
       - name: Install the Nhost CLI and run the application
         uses: ./.github/actions/nhost-cli
         with:
-          path: packages/nhost-js
+          init: true
+          version: v1.29.3
           start: true
       - name: should find the injected hasura-auth version
         run: |
-          VERSION=$(curl -sSf 'https://local.auth.nhost.run/v1/version')
-          EXPECTED_VERSION='{"version":"v0.20.1"}'
+          VERSION=$(curl -sSf 'https://local.auth.local.nhost.run/v1/version')
+          EXPECTED_VERSION='{"version":"0.36.1"}'
           if [ "$VERSION" != "$EXPECTED_VERSION" ]; then
             echo "Expected version $EXPECTED_VERSION but got $VERSION"
             exit 1
@@ -73,6 +74,6 @@ jobs:
       - name: Install the Nhost CLI
         uses: ./.github/actions/nhost-cli
         with:
-          version: v1.0.1
+          version: v1.27.2
       - name: should find the correct version
-        run: nhost --version | head -n 1 | grep v1.0.1 || exit 1
+        run: nhost --version | head -n 1 | grep v1.27.2 || exit 1

.gitignore

@@ -63,3 +63,5 @@ out/
 # Nix
 .envrc
 .direnv/
+
+/.vscode/

CONTRIBUTING.md

@@ -31,7 +31,7 @@ PRs to our libraries are always welcome and can be a quick way to get your fix o
 - Only fix/add the functionality in question **OR** address wide-spread whitespace/style issues, not both.
 - Add unit or integration tests for fixed or changed functionality (if a test suite exists).
 - Address a single concern in the least number of changed lines as possible.
-- Include documentation in the repo or on our [docs site](https://docs.nhost.io/get-started).
+- Include documentation in the repo or on our [docs site](https://docs.nhost.io).
 - Be accompanied by a complete Pull Request template (loaded automatically when a PR is created).
 
 For changes that address core functionality or require breaking changes (e.g., a major release), it's best to open an Issue to discuss your proposal first. This is not required but can save time creating and reviewing changes.

DEVELOPERS.md

@@ -2,9 +2,7 @@
 
 ## Requirements
 
-### Node.js v18
-
-_⚠️ Node.js v16 is also supported for the time being but support will be dropped in the near future_.
+### Node.js v20 or later
 
 ### [pnpm](https://pnpm.io/) package manager
 
@@ -14,10 +12,10 @@ The easiest way to install `pnpm` if it's not installed on your machine yet is t
 $ npm install -g pnpm
 ```
 
-### [Nhost CLI](https://docs.nhost.io/cli)
+### [Nhost CLI](https://docs.nhost.io/platform/cli/local-development)
 
 - The CLI is primarily used for running the E2E tests
-- Please refer to the [installation guide](https://docs.nhost.io/get-started/cli-workflow/install-cli) if you have not installed it yet
+- Please refer to the [installation guide](https://docs.nhost.io/platform/cli/local-development) if you have not installed it yet
 
 ## File Structure
 

README.md

@@ -4,7 +4,7 @@
 
 # Nhost
 
-<a href="https://docs.nhost.io/#quickstart">Quickstart</a>
+<a href="https://docs.nhost.io/getting-started/overview">Quickstart</a>
 <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
 <a href="http://nhost.io/">Website</a>
 <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
@@ -15,6 +15,8 @@
 <a href="https://twitter.com/nhost">Twitter</a>
 <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
 <a href="https://nhost.io/discord">Discord</a>
+<span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
+<a href="https://gurubase.io/g/nhost">Ask Nhost Guru (third party, unofficial)</a>
 <br />
 
   <hr />
@@ -34,7 +36,7 @@ Nhost consists of open source software:
 - Authentication: [Hasura Auth](https://github.com/nhost/hasura-auth/)
 - Storage: [Hasura Storage](https://github.com/nhost/hasura-storage)
 - Serverless Functions: Node.js (JavaScript and TypeScript)
-- [Nhost CLI](https://docs.nhost.io/cli) for local development
+- [Nhost CLI](https://docs.nhost.io/platform/cli/local-development) for local development
 
 ## Architecture of Nhost
 
@@ -71,7 +73,7 @@ const nhost = new NhostClient({
   region: '<your-region>'
 })
 
-await nhost.auth.signIn({ email: 'elon@musk.com', password: 'spaceX' })
+await nhost.auth.signIn({ email: 'user@domain.com', password: 'userPassword' })
 
 await nhost.graphql.request(`{
   users {
@@ -87,25 +89,25 @@ await nhost.graphql.request(`{
 Nhost is frontend agnostic, which means Nhost works with all frontend frameworks.
 
 <div align="center">
-  <a href="https://docs.nhost.io/platform/quickstarts/nextjs"><img src="assets/nextjs.svg"/></a>
-  <a href="https://docs.nhost.io/reference/javascript"><img src="assets/nuxtjs.svg"/></a>
-  <a href="https://docs.nhost.io/platform/quickstarts/react"><img src="assets/react.svg"/></a>
-  <a href="https://docs.nhost.io/reference/javascript"><img src="assets/react-native.svg"/></a>
-  <a href="https://docs.nhost.io/reference/javascript"><img src="assets/svelte.svg"/></a>
-  <a href="https://docs.nhost.io/platform/quickstarts/vue"><img src="assets/vuejs.svg"/></a>
+  <a href="https://docs.nhost.io/getting-started/quickstart/nextjs"><img src="assets/nextjs.svg"/></a>
+  <a href="https://docs.nhost.io/reference/javascript/nhost-js/nhost-client"><img src="assets/nuxtjs.svg"/></a>
+  <a href="https://docs.nhost.io/getting-started/quickstart/react"><img src="assets/react.svg"/></a>
+  <a href="https://docs.nhost.io/getting-started/quickstart/reactnative"><img src="assets/react-native.svg"/></a>
+  <a href="https://docs.nhost.io/reference/javascript/nhost-js/nhost-client"><img src="assets/svelte.svg"/></a>
+  <a href="https://docs.nhost.io/getting-started/quickstart/vue"><img src="assets/vuejs.svg"/></a>
 </div>
 
 # Resources
 
-- Start developing locally with the [Nhost CLI](https://docs.nhost.io/cli)
+- Start developing locally with the [Nhost CLI](https://docs.nhost.io/platform/cli/local-development)
 
 ## Nhost Clients
 
-- [JavaScript/TypeScript](https://docs.nhost.io/reference/javascript)
+- [JavaScript/TypeScript](https://docs.nhost.io/reference/javascript/nhost-js/nhost-client)
 - [Dart and Flutter](https://github.com/nhost/nhost-dart)
-- [React](https://docs.nhost.io/reference/react)
-- [Next.js](https://docs.nhost.io/reference/nextjs)
-- [Vue](https://docs.nhost.io/reference/vue)
+- [React](https://docs.nhost.io/reference/react/nhost-client)
+- [Next.js](https://docs.nhost.io/reference/nextjs/nhost-client)
+- [Vue](https://docs.nhost.io/reference/vue/nhost-client)
 
 ## Integrations
 
@@ -138,7 +140,7 @@ This repository, and most of our other open source projects, are licensed under
 
 Here are some ways of contributing to making Nhost better:
 
-- **[Try out Nhost](https://docs.nhost.io/get-started/quick-start)**, and think of ways to make the service better. Let us know here on GitHub.
+- **[Try out Nhost](https://docs.nhost.io)**, and think of ways to make the service better. Let us know here on GitHub.
 - Join our [Discord](https://discord.com/invite/9V7Qb2U) and connect with other members to share and learn from.
 - Send a pull request to any of our [open source repositories](https://github.com/nhost) on Github. Check our [contribution guide](https://github.com/nhost/nhost/blob/main/CONTRIBUTING.md) and our [developers guide](https://github.com/nhost/nhost/blob/main/DEVELOPERS.md) for more details about how to contribute. We're looking forward to your contribution!
 

audit-ci.jsonc

@@ -2,5 +2,5 @@
   // $schema provides code completion hints to IDEs.
   "$schema": "https://github.com/IBM/audit-ci/raw/main/docs/schema.json",
   "moderate": true,
-  "allowlist": ["vue-template-compiler", "micromatch", "path-to-regexp"]
+  "allowlist": ["vue-template-compiler", { "id": "CVE-2025-48068", "path": "next" }]
 }

dashboard/.env.example

@@ -3,18 +3,19 @@ NEXT_PUBLIC_ENV=dev
 NEXT_PUBLIC_NHOST_PLATFORM=false
 
 # Environment Variables for Self Hosting and Local Development
-NEXT_PUBLIC_NHOST_AUTH_URL=https://local.auth.nhost.run/v1
-NEXT_PUBLIC_NHOST_FUNCTIONS_URL=https://local.functions.nhost.run/v1
-NEXT_PUBLIC_NHOST_GRAPHQL_URL=https://local.graphql.nhost.run/v1
-NEXT_PUBLIC_NHOST_STORAGE_URL=https://local.storage.nhost.run/v1
-NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL=https://local.hasura.nhost.run
-NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL=https://local.hasura.nhost.run/v1/migrations
-NEXT_PUBLIC_NHOST_HASURA_API_URL=https://local.hasura.nhost.run
+NEXT_PUBLIC_NHOST_AUTH_URL=https://local.auth.nhost.local.run/v1
+NEXT_PUBLIC_NHOST_FUNCTIONS_URL=https://local.functions.local.nhost.run/v1
+NEXT_PUBLIC_NHOST_GRAPHQL_URL=https://local.graphql.local.nhost.run/v1
+NEXT_PUBLIC_NHOST_STORAGE_URL=https://local.storage.local.nhost.run/v1
+NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL=https://local.hasura.local.nhost.run
+NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL=https://local.hasura.local.nhost.run/v1/migrations
+NEXT_PUBLIC_NHOST_HASURA_API_URL=https://local.hasura.local.nhost.run
 
 # Environment Variables when running the Nhost Dashboard against the Nhost Backend
 NEXT_PUBLIC_STRIPE_PK=<nhost_stripe_public_key>
 NEXT_PUBLIC_GITHUB_APP_INSTALL_URL=<github_app_install_url>
 NEXT_PUBLIC_ANALYTICS_WRITE_KEY=<analytics_write_key>
+NEXT_PUBLIC_SEGMENT_CDN_URL=<segment_cdn_url>
 NEXT_PUBLIC_NHOST_BRAGI_WEBSOCKET=<nhost_bragi_websocket>
 
 NEXT_PUBLIC_ZENDESK_URL=
@@ -22,6 +23,8 @@ NEXT_PUBLIC_ZENDESK_API_KEY=
 NEXT_PUBLIC_ZENDESK_USER_EMAIL=
 
 
-CODEGEN_GRAPHQL_URL=https://local.graphql.nhost.run/v1
+CODEGEN_GRAPHQL_URL=https://local.graphql.local.nhost.run/v1
 CODEGEN_HASURA_ADMIN_SECRET=nhost-admin-secret
-NEXT_PUBLIC_TURNSTILE_SITE_KEY=FIXME
+NEXT_PUBLIC_TURNSTILE_SITE_KEY=FIXME
+
+NEXT_PUBLIC_SOC2_REPORT_FILE_ID=

dashboard/.eslintrc.js

@@ -76,6 +76,13 @@ module.exports = {
         ],
       },
     ],
+    'jsx-a11y/label-has-associated-control': [
+      2,
+      {
+        controlComponents: ['Input'],
+        depth: 3,
+      },
+    ],
   },
   overrides: [
     {

dashboard/.storybook/main.js

@@ -42,7 +42,6 @@ module.exports = {
   env: (config) => ({
     ...config,
     NEXT_PUBLIC_ENV: 'dev',
-    NEXT_PUBLIC_NHOST_BACKEND_URL: 'http://localhost:1337',
     NEXT_PUBLIC_NHOST_PLATFORM: 'false',
   }),
 };

dashboard/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true
+    "source.organizeImports": "explicit"
   }
 }

dashboard/CHANGELOG.md

@@ -1,5 +1,197 @@
 # @nhost/dashboard
 
+## 2.31.0
+
+### Minor Changes
+
+- 39b10a2: feat (dashboard): Add multi-factor authentication
+- 4b84780: feat (dashboard): Add Webauthn to dashboard
+
+### Patch Changes
+
+- 61eb6cd: fix (dashboard): Fix update project e2e test
+  - @nhost/react-apollo@18.0.0
+  - @nhost/nextjs@2.2.8
+
+## 2.30.0
+
+### Minor Changes
+
+- f6947a2: fix: fetch job-backup services logs using Live filter
+- 44a3e6b: fix: collapsed main navigation sidebar overlaps mobile navbar
+- 99b78f1: feat: dashboard: add download button for soc2 report
+- 9acae7d: fix: e2e tests, stop on error when refreshing metadata
+
+### Patch Changes
+
+- 31e636a: fix (dashboard): Use the correct payload to reset metadata before the e2e tests
+
+## 2.29.0
+
+### Minor Changes
+
+- c97b43f: fix: update vite to address vulnerability audit
+- a0931e2: fix: improve logs time range and filter selection
+- c0635ae: feat (dashboard): Add information about that free organization cannot be upgraded.
+- e87505c: fix: can downsize postgres storage capacity using local dashboard
+
+## 2.28.0
+
+### Minor Changes
+
+- 8552678: feat: dashboard: add additional events to segment
+- 0bf2808: chore: refresh metadata before end-to-end tests
+- 72a365c: fix: correct graphql page roles dropdown's source
+- cef6471: fix: dashboard: add anonid to user's metadata
+
+### Patch Changes
+
+- d9eb906: fix: update vite and nextjs because of vulnerability
+- 233232b: feat (dashboard): improve Upgrade project dialog
+- Updated dependencies [d9eb906]
+  - @nhost/nextjs@2.2.7
+  - @nhost/react-apollo@17.0.4
+
+## 2.27.0
+
+### Minor Changes
+
+- 013e1c1: fix: update vite and image-size dependencies to address security audit vulnerabilities
+- 4fd176b: chore: re-add user event ci tests, updated sveltekit example tests to e2e suite
+
+### Patch Changes
+
+- a1333df: fix: update vite because of vulnerability
+- 0420e4f: fix (dashboard): Display the selected date's month in the datetime picker component
+  - @nhost/react-apollo@17.0.3
+  - @nhost/nextjs@2.2.6
+
+## 2.26.0
+
+### Minor Changes
+
+- 7b9cdf1: chore: remove legacy workspaces
+- 1c4f321: fix: update vite to fix audit vulnerabilities
+
+## 2.25.0
+
+### Minor Changes
+
+- 34fdcb8: chore: add prettier plugins as devDependencies to root of monorepo
+- 4937c5e: fix: stop content overflowing in projects and database permissions page
+- 1542132: fix: update babel dependencies to address security audit vulnerabilities
+
+### Patch Changes
+
+- 78436ca: chore (dashboard): add tests and small updates to PiTR settings and restore page
+- b5a3895: chore (dashboard): update page context after each navigation
+- 9b24807: chore: fix link to PiTR documentation
+- ea65846: chore (dashboard): update nextjs to fix middleware exploit
+
+## 2.17.0
+
+### Minor Changes
+
+- fd59918: fix: redirect to 404 with nhost cli dashboard
+
+## 2.16.0
+
+### Minor Changes
+
+- f8e6b61: fix: can add rule groups in table permissions
+- 9e404c8: fix: not redirect to 404 page if using local Nhost backend
+- ac4aa01: fix: can delete column in database page
+- 4385524: fix: update url to check service health in local dashboard
+
+### Patch Changes
+
+- @nhost/react-apollo@16.0.1
+- @nhost/nextjs@2.2.2
+
+## 2.15.0
+
+### Minor Changes
+
+- f1052a8: fix: improve stability of the dashboard when pausing projects
+- 30daa41: fix: update links to docs in overview page
+- 7537237: feat: add image preview toggle in storage
+
+## 2.14.0
+
+### Minor Changes
+
+- d43931e: fix: invalid organization slug/project subdomain doesn't open 404 page
+- 5df6fa2: feat: add unencrypted disk warning in storage capacity settings
+
+### Patch Changes
+
+- 44c1e17: chore: update `msw` to v1.3.5 to fix vulnerabilities
+  - @nhost/react-apollo@16.0.0
+  - @nhost/nextjs@2.2.1
+
+## 2.13.0
+
+### Minor Changes
+
+- 21e90da: chore: remove restrictions on SMTP sender so My Name <name@acme.com> can be added
+- 865dd93: fix: duplicate Run placeholders when there is an error in the backend
+- 6902a36: fix: can remove resources if postgres capacity is higher than 10
+- a535aa3: fix: fetch user roles locally in auth section
+- 0c50816: fix: allow decimal numbers in database row insert
+- aea6d18: chore: add warning when pausing a project about losing Run services persistent volume data
+- d3b4fc3: feat: allow to change postgres settings if project is paused
+- 29d27e1: chore: update `next` to v14.2.22 to fix vulnerabilities
+- c9dca09: feat: add reset password form
+- b3bcacb: fix: paused project banner cannot read null project name
+
+### Patch Changes
+
+- Updated dependencies [46fc520]
+- Updated dependencies [29d27e1]
+  - @nhost/nextjs@2.2.0
+  - @nhost/react-apollo@15.0.1
+
+## 2.12.0
+
+### Minor Changes
+
+- eb95562: fix: show all available permission variables in permission dropdown select
+
+### Patch Changes
+
+- 8b5c4a0: chore: cleanup layout and add disable duplicate atom key checking in development mode
+
+## 2.11.3
+
+### Patch Changes
+
+- 714dffa: fix: improve project polling logic and unify usage across components
+
+## 2.11.2
+
+### Patch Changes
+
+- 6a34f89: fix: improve project polling logic and unify usage across components
+
+## 2.11.1
+
+### Patch Changes
+
+- 0f6ce52: fix: consolidate useProject hook and fix jwt expired error
+
+## 2.11.0
+
+### Minor Changes
+
+- cea3ef5: Feat: add org and project placeholders
+
+## 2.10.0
+
+### Minor Changes
+
+- 86ecf27: feat: add support for additional metrics in overview
+- 21708be: feat: dashboard: add support for storage buckets to AI assistants
+
 ## 1.30.0
 
 ### Minor Changes

dashboard/Dockerfile

@@ -1,13 +1,13 @@
-FROM node:18-alpine AS pruner
+FROM node:20-alpine AS pruner
 RUN apk add --no-cache libc6-compat
 RUN apk update
 WORKDIR /app
 
-RUN yarn global add turbo@1.11.3
+RUN yarn global add turbo@2.2.3
 COPY . .
 RUN turbo prune --scope="@nhost/dashboard" --docker
 
-FROM node:18-alpine AS builder
+FROM node:20-alpine AS builder
 ARG TURBO_TOKEN
 ARG TURBO_TEAM
 
@@ -15,25 +15,25 @@ RUN apk add --no-cache libc6-compat python3 make g++
 RUN apk update
 WORKDIR /app
 
-ENV NEXT_TELEMETRY_DISABLED 1
-ENV NEXT_PUBLIC_ENV dev
-ENV NEXT_PUBLIC_NHOST_PLATFORM false
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_PUBLIC_ENV=dev
+ENV NEXT_PUBLIC_NHOST_PLATFORM=false
 
 # placeholders for URLs, will be replaced on runtime by entrypoint script
-ENV NEXT_PUBLIC_NHOST_ADMIN_SECRET __NEXT_PUBLIC_NHOST_ADMIN_SECRET__
-ENV NEXT_PUBLIC_NHOST_AUTH_URL __NEXT_PUBLIC_NHOST_AUTH_URL__
-ENV NEXT_PUBLIC_NHOST_FUNCTIONS_URL __NEXT_PUBLIC_NHOST_FUNCTIONS_URL__
-ENV NEXT_PUBLIC_NHOST_GRAPHQL_URL __NEXT_PUBLIC_NHOST_GRAPHQL_URL__
-ENV NEXT_PUBLIC_NHOST_STORAGE_URL __NEXT_PUBLIC_NHOST_STORAGE_URL__
-ENV NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL __NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL__
-ENV NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL __NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL__
-ENV NEXT_PUBLIC_NHOST_HASURA_API_URL __NEXT_PUBLIC_NHOST_HASURA_API_URL__
-ENV NEXT_PUBLIC_NHOST_CONFIGSERVER_URL __NEXT_PUBLIC_NHOST_CONFIGSERVER_URL__
+ENV NEXT_PUBLIC_NHOST_ADMIN_SECRET=__NEXT_PUBLIC_NHOST_ADMIN_SECRET__
+ENV NEXT_PUBLIC_NHOST_AUTH_URL=__NEXT_PUBLIC_NHOST_AUTH_URL__
+ENV NEXT_PUBLIC_NHOST_FUNCTIONS_URL=__NEXT_PUBLIC_NHOST_FUNCTIONS_URL__
+ENV NEXT_PUBLIC_NHOST_GRAPHQL_URL=__NEXT_PUBLIC_NHOST_GRAPHQL_URL__
+ENV NEXT_PUBLIC_NHOST_STORAGE_URL=__NEXT_PUBLIC_NHOST_STORAGE_URL__
+ENV NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL=__NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL__
+ENV NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL=__NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL__
+ENV NEXT_PUBLIC_NHOST_HASURA_API_URL=__NEXT_PUBLIC_NHOST_HASURA_API_URL__
+ENV NEXT_PUBLIC_NHOST_CONFIGSERVER_URL=__NEXT_PUBLIC_NHOST_CONFIGSERVER_URL__
 
-RUN yarn global add pnpm@8.10.5
+RUN yarn global add pnpm@9.15.0
 COPY .gitignore .gitignore
 COPY --from=pruner /app/out/json/ .
-COPY --from=pruner /app/out/pnpm-*.yaml .
+COPY --from=pruner /app/out/pnpm-*.yaml ./
 RUN pnpm install --frozen-lockfile
 
 COPY --from=pruner /app/out/full/ .
@@ -41,7 +41,7 @@ COPY turbo.json turbo.json
 COPY config/ config/
 RUN pnpm build:dashboard
 
-FROM node:18-alpine AS runner
+FROM node:20-alpine AS runner
 WORKDIR /app
 
 RUN addgroup --system --gid 1001 nodejs
@@ -58,4 +58,4 @@ COPY --from=builder --chown=nextjs:nodejs /app/dashboard/.next/standalone/app ./
 COPY --from=builder --chown=nextjs:nodejs /app/dashboard/.next/static ./dashboard/.next/static
 
 ENTRYPOINT ["./docker-entrypoint.sh"]
-CMD ["node", "dashboard/server.js"]
+CMD ["node", "dashboard/server.js"]

dashboard/README.md

@@ -38,7 +38,7 @@ These files are added to `.gitignore`, so you don't need to worry about committi
 
 ### Enable Local Development
 
-You can connect the Nhost Dashboard to your **locally running** Nhost backend in a few steps. Make sure you have the [Nhost CLI installed](https://docs.nhost.io/platform/cli#installation).
+You can connect the Nhost Dashboard to your **locally running** Nhost backend in a few steps. Make sure you have the [Nhost CLI installed](https://docs.nhost.io/platform/cli/local-development).
 
 First, you need to run the following command to start your backend locally:
 
@@ -51,13 +51,13 @@ You can connect the Nhost Dashboard to your locally running backend by setting t
 ```bash
 NEXT_PUBLIC_ENV=dev
 NEXT_PUBLIC_NHOST_PLATFORM=false
-NEXT_PUBLIC_NHOST_AUTH_URL=https://local.auth.nhost.run/v1
-NEXT_PUBLIC_NHOST_FUNCTIONS_URL=https://local.functions.nhost.run/v1
-NEXT_PUBLIC_NHOST_GRAPHQL_URL=https://local.graphql.nhost.run/v1
-NEXT_PUBLIC_NHOST_STORAGE_URL=https://local.storage.nhost.run/v1
-NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL=https://local.hasura.nhost.run
-NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL=https://local.hasura.nhost.run/v1/migrations
-NEXT_PUBLIC_NHOST_HASURA_API_URL=https://local.hasura.nhost.run
+NEXT_PUBLIC_NHOST_AUTH_URL=https://local.auth.local.nhost.run/v1
+NEXT_PUBLIC_NHOST_FUNCTIONS_URL=https://local.functions.local.nhost.run/v1
+NEXT_PUBLIC_NHOST_GRAPHQL_URL=https://local.graphql.local.nhost.run/v1
+NEXT_PUBLIC_NHOST_STORAGE_URL=https://local.storage.local.nhost.run/v1
+NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL=https://local.hasura.local.nhost.run
+NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL=https://local.hasura.local.nhost.run/v1/migrations
+NEXT_PUBLIC_NHOST_HASURA_API_URL=https://local.hasura.local.nhost.run
 ```
 
 This will connect the Nhost Dashboard to your locally running Nhost backend.
@@ -100,7 +100,6 @@ pnpm storybook --port 6007
 
 | Name                                    | Description                                                                                 |
 | --------------------------------------- | ------------------------------------------------------------------------------------------- |
-| `NEXT_PUBLIC_NHOST_BACKEND_URL`         | Backend URL. This is only used if `NEXT_PUBLIC_NHOST_PLATFORM` is `true`.                   |
 | `NEXT_PUBLIC_STRIPE_PK`                 | Stripe public key. This is only used if `NEXT_PUBLIC_NHOST_PLATFORM` is `true`.             |
 | `NEXT_PUBLIC_GITHUB_APP_INSTALL_URL`    | URL of the GitHub application. This is only used if `NEXT_PUBLIC_NHOST_PLATFORM` is `true`. |
 | `NEXT_PUBLIC_ANALYTICS_WRITE_KEY`       | Analytics key. This is only used if `NEXT_PUBLIC_NHOST_PLATFORM` is `true`.                 |
@@ -150,8 +149,11 @@ Next, you need to create a project. Create a `.env.test` file with the following
 NHOST_TEST_DASHBOARD_URL=<test_dashboard_url>
 NHOST_TEST_USER_EMAIL=<test_user_email>
 NHOST_TEST_USER_PASSWORD=<test_user_password>
-NHOST_TEST_WORKSPACE_NAME=<test_workspace_name>
+NHOST_TEST_ORGANIZATION_NAME=<test_organization_name>
+NHOST_TEST_ORGANIZATION_SLUG=<test_organization_slug>
+NHOST_TEST_PERSONAL_ORG_SLUG=<test_personal_org_slug>
 NHOST_TEST_PROJECT_NAME=<test_project_name>
+NHOST_TEST_PROJECT_SUBDOMAIN=<test_project_subdomain>
 NHOST_TEST_PROJECT_ADMIN_SECRET=<test_project_admin_secret>
 ```
 
@@ -160,11 +162,14 @@ NHOST_TEST_PROJECT_ADMIN_SECRET=<test_project_admin_secret>
 - `NHOST_TEST_DASHBOARD_URL`: The URL to run the tests against (e.g: http://localhost:3000 or https://staging.app.nhost.io)
 - `NHOST_TEST_USER_EMAIL`: Email address of the test user that owns the test project
 - `NHOST_TEST_USER_PASSWORD`: Password of the test user that owns the test project
-- `NHOST_TEST_WORKSPACE_NAME`: Name of the workspace that contains the test project
+- `NHOST_TEST_ORGANIZATION_NAME`: Name of the organization that contains the test project
+- `NHOST_TEST_ORGANIZATION_SLUG`: Slug of the organization that contains the test project
+- `NHOST_TEST_PERSONAL_ORG_SLUG`: Slug of the personal organization that contains the test project
 - `NHOST_TEST_PROJECT_NAME`: Name of the test project
+- `NHOST_TEST_PROJECT_SUBDOMAIN`: Subdomain of the test project
 - `NHOST_TEST_PROJECT_ADMIN_SECRET`: Admin secret of the test project
 
-Make sure to copy the workspace and project information from the [Nhost Dashboard](https://app.nhost.io/).
+Make sure to copy the organization and project information from the [Nhost Dashboard](https://app.nhost.io/).
 
 End-to-end tests are written using [Playwright](https://playwright.dev/). To run the tests, run the following command:
 

dashboard/e2e/account/pat/manage-pat.test.ts

@@ -1,22 +1,10 @@
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+
 import { faker } from '@faker-js/faker';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
 
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
-});
-
-test.beforeEach(async () => {
-  await page.goto('/');
-});
-
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should be able to create then delete a personal access token', async () => {
+test('should be able to create then delete a personal access token', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.waitForTimeout(1000);
   await page.getByRole('banner').getByRole('button').last().click();
   await page.getByRole('link', { name: /account settings/i }).click();

dashboard/e2e/ai/assistants.test.ts

@@ -1,17 +1,8 @@
 import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { expect, test } from '@/e2e/fixtures/auth-hook';
 import { navigateToProject } from '@/e2e/utils';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
-});
-
-test.beforeEach(async () => {
-  await page.goto('/');
 
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
   await navigateToProject({
     page,
     orgSlug: TEST_ORGANIZATION_SLUG,
@@ -23,11 +14,9 @@ test.beforeEach(async () => {
   await page.waitForURL(AIRoute);
 });
 
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should create and delete an Assistant', async () => {
+test('should create and delete an Assistant', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('link', { name: 'Assistants' }).click();
 
   await expect(page.getByText(/no assistants are configured/i)).toBeVisible();

dashboard/e2e/ai/auto-embeddings.test.ts

@@ -1,17 +1,9 @@
 import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
 import { navigateToProject } from '@/e2e/utils';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
 
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
-});
-
-test.beforeEach(async () => {
-  await page.goto('/');
+import { expect, test } from '@/e2e/fixtures/auth-hook';
 
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
   await navigateToProject({
     page,
     orgSlug: TEST_ORGANIZATION_SLUG,
@@ -23,11 +15,9 @@ test.beforeEach(async () => {
   await page.waitForURL(AIRoute);
 });
 
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should create and delete an Auto-Embeddings', async () => {
+test('should create and delete an Auto-Embeddings', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: 'Add a new Auto-Embeddings' }).click();
 
   await page.getByLabel('Name').fill('test');

dashboard/e2e/auth/ban-user.test.ts

@@ -1,13 +1,14 @@
-import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import { createUser, generateTestEmail } from '@/e2e/utils';
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import { createUser, generateTestEmail, gotoAuthURL } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
-import test, { expect } from '@playwright/test';
 
-test('should be able to ban and unban a user', async ({ page }) => {
-  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
-  await page.goto(authUrl);
-  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
+  await gotoAuthURL(page);
+});
 
+test('should be able to ban and unban a user', async ({
+  authenticatedNhostPage: page,
+}) => {
   const email = generateTestEmail();
   const password = faker.internet.password();
 

dashboard/e2e/auth/create-user.test.ts

@@ -1,26 +1,12 @@
-import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import { createUser, generateTestEmail } from '@/e2e/utils';
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import { createUser, generateTestEmail, gotoAuthURL } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
-import type { Page } from '@playwright/test';
-import test, { expect } from '@playwright/test';
 
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
+  await gotoAuthURL(page);
 });
 
-test.beforeEach(async () => {
-  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
-  await page.goto(authUrl);
-  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
-});
-
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should create a user', async () => {
+test('should create a user', async ({ authenticatedNhostPage: page }) => {
   const email = generateTestEmail();
   const password = faker.internet.password();
 
@@ -31,7 +17,9 @@ test('should create a user', async () => {
   ).toBeVisible();
 });
 
-test('should not be able to create a user with an existing email', async () => {
+test('should not be able to create a user with an existing email', async ({
+  authenticatedNhostPage: page,
+}) => {
   const email = generateTestEmail();
   const password = faker.internet.password();
 

dashboard/e2e/auth/delete-user.test.ts

@@ -1,26 +1,15 @@
-import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import { createUser, generateTestEmail } from '@/e2e/utils';
+import { createUser, generateTestEmail, gotoAuthURL } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
-import type { Page } from '@playwright/test';
-import test, { expect } from '@playwright/test';
 
-let page: Page;
+import { expect, test } from '@/e2e/fixtures/auth-hook';
 
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
+  await gotoAuthURL(page);
 });
 
-test.beforeEach(async () => {
-  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
-  await page.goto(authUrl);
-  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
-});
-
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should be able to delete a user', async () => {
+test('should be able to delete a user', async ({
+  authenticatedNhostPage: page,
+}) => {
   const email = generateTestEmail();
   const password = faker.internet.password();
 
@@ -52,7 +41,9 @@ test('should be able to delete a user', async () => {
   ).not.toBeVisible();
 });
 
-test('should be able to delete a user from the details page', async () => {
+test('should be able to delete a user from the details page', async ({
+  authenticatedNhostPage: page,
+}) => {
   const email = generateTestEmail();
   const password = faker.internet.password();
 

dashboard/e2e/auth/edit-user.test.ts

@@ -0,0 +1,31 @@
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import { createUser, generateTestEmail, gotoAuthURL } from '@/e2e/utils';
+import { faker } from '@faker-js/faker';
+
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
+  await gotoAuthURL(page);
+});
+
+test('should be able to edit user roles from the details page', async ({
+  authenticatedNhostPage: page,
+}) => {
+  const email = generateTestEmail();
+  const password = faker.internet.password();
+
+  await createUser({ page, email, password });
+
+  await page
+    .getByRole('button', { name: `View ${email}`, exact: true })
+    .click();
+
+  await page.locator('#defaultRole').click();
+  await page.getByRole('option', { name: /anonymous/i }).click();
+
+  await page.getByLabel('anonymous').click();
+
+  await page.getByRole('button', { name: /save/i }).click();
+
+  await expect(
+    page.getByText('User settings have been updated successfully.'),
+  ).toBeVisible();
+});

dashboard/e2e/auth/verify-user.test.ts

@@ -1,26 +1,14 @@
-import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import { createUser, generateTestEmail } from '@/e2e/utils';
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import { createUser, generateTestEmail, gotoAuthURL } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
 
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
+  await gotoAuthURL(page);
 });
 
-test.beforeEach(async () => {
-  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
-  await page.goto(authUrl);
-  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
-});
-
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should be able to verify the email of a user', async () => {
+test('should be able to verify the email of a user', async ({
+  authenticatedNhostPage: page,
+}) => {
   const email = generateTestEmail();
   const password = faker.internet.password();
 
@@ -50,7 +38,9 @@ test('should be able to verify the email of a user', async () => {
   ).toBeChecked();
 });
 
-test('should be able to verify the phone number of a user', async () => {
+test('should be able to verify the phone number of a user', async ({
+  authenticatedNhostPage: page,
+}) => {
   const email = generateTestEmail();
   const password = faker.internet.password();
   const phoneNumber = faker.phone.number();

dashboard/e2e/cli-local-dashboard/cli-local-dashboard.test.ts

@@ -0,0 +1,21 @@
+import { expect, test } from '@playwright/test';
+
+test.describe('Local Dashboard CLI e2e tests', () => {
+  test('should redirect / to the correct project URL', async ({ page }) => {
+    await page.goto('https://local.dashboard.local.nhost.run/');
+    await page.waitForURL(
+      'https://local.dashboard.local.nhost.run/orgs/local/projects/local',
+    );
+    expect(page.url()).toBe(
+      'https://local.dashboard.local.nhost.run/orgs/local/projects/local',
+    );
+  });
+
+  test('should load the project URL correctly', async ({ page }) => {
+    const projectUrl =
+      'https://local.dashboard.local.nhost.run/orgs/local/projects/local';
+    await page.goto(projectUrl);
+    await expect(page).toHaveURL(projectUrl);
+    await expect(page.getByText(/Subdomain/i)).toBeVisible();
+  });
+});

dashboard/e2e/database/create-table.test.ts

@@ -1,35 +1,18 @@
 import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import { navigateToProject, prepareTable } from '@/e2e/utils';
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import { prepareTable } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
 import { snakeCase } from 'snake-case';
 
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
-});
-
-test.beforeEach(async () => {
-  await page.goto('/');
-
-  await navigateToProject({
-    page,
-    orgSlug: TEST_ORGANIZATION_SLUG,
-    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
-  });
-
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
   const databaseRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default`;
   await page.goto(databaseRoute);
   await page.waitForURL(databaseRoute);
 });
 
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should create a simple table', async () => {
+test('should create a simple table', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
@@ -57,7 +40,9 @@ test('should create a simple table', async () => {
   ).toBeVisible();
 });
 
-test('should create a table with unique constraints', async () => {
+test('should create a table with unique constraints', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
@@ -86,7 +71,9 @@ test('should create a table with unique constraints', async () => {
   ).toBeVisible();
 });
 
-test('should create a table with nullable columns', async () => {
+test('should create a table with nullable columns', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
@@ -115,7 +102,9 @@ test('should create a table with nullable columns', async () => {
   ).toBeVisible();
 });
 
-test('should create a table with an identity column', async () => {
+test('should create a table with an identity column', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
@@ -148,7 +137,9 @@ test('should create a table with an identity column', async () => {
   ).toBeVisible();
 });
 
-test('should create table with foreign key constraint', async () => {
+test('should create table with foreign key constraint', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
@@ -221,7 +212,9 @@ test('should create table with foreign key constraint', async () => {
   ).toBeVisible();
 });
 
-test('should not be able to create a table with a name that already exists', async () => {
+test('should not be able to create a table with a name that already exists', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 

dashboard/e2e/database/delete-table.test.ts

@@ -1,35 +1,17 @@
 import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import { deleteTable, navigateToProject, prepareTable } from '@/e2e/utils';
+import { deleteTable, prepareTable } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
+
+import { expect, test } from '@/e2e/fixtures/auth-hook';
 import { snakeCase } from 'snake-case';
 
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
-});
-
-test.beforeEach(async () => {
-  await page.goto('/');
-
-  await navigateToProject({
-    page,
-    orgSlug: TEST_ORGANIZATION_SLUG,
-    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
-  });
-
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
   const databaseRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default`;
   await page.goto(databaseRoute);
   await page.waitForURL(databaseRoute);
 });
 
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should delete a table', async () => {
+test('should delete a table', async ({ authenticatedNhostPage: page }) => {
   const tableName = snakeCase(faker.lorem.words(3));
 
   await page.getByRole('button', { name: /new table/i }).click();
@@ -65,7 +47,10 @@ test('should delete a table', async () => {
   ).not.toBeVisible();
 });
 
-test('should not be able to delete a table if other tables have foreign keys referencing it', async () => {
+test('should not be able to delete a table if other tables have foreign keys referencing it', async ({
+  authenticatedNhostPage: page,
+}) => {
+  test.setTimeout(60000);
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 

dashboard/e2e/database/permissions-table.test.ts

@@ -0,0 +1,130 @@
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import { clickPermissionButton, prepareTable } from '@/e2e/utils';
+import { faker } from '@faker-js/faker';
+import { snakeCase } from 'snake-case';
+
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
+  const databaseRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default`;
+  await page.goto(databaseRoute);
+  await page.waitForURL(databaseRoute);
+});
+
+test('should create a table with role permissions to select row', async ({
+  authenticatedNhostPage: page,
+}) => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const tableName = snakeCase(faker.lorem.words(3));
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text' },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: tableName, exact: true }),
+  ).toBeVisible();
+
+  // Press three horizontal dots more options button next to the table name
+  await page
+    .locator(`li:has-text("${tableName}") #table-management-menu button`)
+    .click();
+
+  await page.getByRole('menuitem', { name: /edit permissions/i }).click();
+
+  await clickPermissionButton({ page, role: 'user', permission: 'Select' });
+
+  await page.getByLabel('Without any checks').click();
+  await page.getByRole('button', { name: /select all/i }).click();
+
+  await page.getByRole('button', { name: /save/i }).click();
+
+  await expect(
+    page.getByText(/permission has been saved successfully/i),
+  ).toBeVisible();
+});
+
+test('should create a table with role permissions and a custom check to select rows', async ({
+  authenticatedNhostPage: page,
+}) => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const tableName = snakeCase(faker.lorem.words(3));
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text' },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: tableName, exact: true }),
+  ).toBeVisible();
+
+  // Press three horizontal dots more options button next to the table name
+  await page
+    .locator(`li:has-text("${tableName}") #table-management-menu button`)
+    .click();
+
+  await page.getByRole('menuitem', { name: /edit permissions/i }).click();
+
+  await clickPermissionButton({ page, role: 'user', permission: 'Select' });
+
+  await page.getByLabel('With custom check').click();
+
+  // await page.getByRole('combobox', { name: /select a column/i }).click();
+  await page.getByText('Select a column', { exact: true }).click();
+
+  const columnSelector = page.locator('input[role="combobox"]');
+
+  await columnSelector.fill('id');
+
+  await columnSelector.press('Enter');
+
+  await expect(page.getByText(/_eq/i)).toBeVisible();
+
+  // limit on number of rows fetched per request.
+  await page.locator('#limit').fill('100');
+
+  await page.getByText('Select variable...', { exact: true }).click();
+
+  const variableSelector = await page.locator('input[role="combobox"]');
+
+  await variableSelector.fill('X-Hasura-User-Id');
+
+  await variableSelector.press('Enter');
+
+  await page.getByRole('button', { name: /select all/i }).click();
+
+  await page.getByRole('button', { name: /save/i }).click();
+
+  await expect(
+    page.getByText(/permission has been saved successfully/i),
+  ).toBeVisible();
+});

dashboard/e2e/env.ts

@@ -4,7 +4,7 @@
 export const TEST_DASHBOARD_URL = process.env.NHOST_TEST_DASHBOARD_URL;
 
 /**
- * Name of the workspace to test against.
+ * Name of the organization to test against.
  */
 export const TEST_ORGANIZATION_NAME = process.env.NHOST_TEST_ORGANIZATION_NAME;
 
@@ -40,3 +40,7 @@ export const TEST_USER_EMAIL = process.env.NHOST_TEST_USER_EMAIL;
 export const TEST_USER_PASSWORD = process.env.NHOST_TEST_USER_PASSWORD;
 
 export const TEST_PERSONAL_ORG_SLUG = process.env.NHOST_TEST_PERSONAL_ORG_SLUG;
+
+const freeUserEmails = process.env.NHOST_TEST_FREE_USER_EMAILS;
+
+export const TEST_FREE_USER_EMAILS = JSON.parse(freeUserEmails);

dashboard/e2e/fixtures/auth-hook.ts

@@ -0,0 +1,22 @@
+import { TEST_DASHBOARD_URL, TEST_PERSONAL_ORG_SLUG } from '@/e2e/env';
+import { type Page, test as base } from '@playwright/test';
+
+export const AUTH_CONTEXT = 'e2e/.auth/user.json';
+
+export const test = base.extend<{ authenticatedNhostPage: Page }>({
+  authenticatedNhostPage: async ({ browser }, use) => {
+    const context = await browser.newContext({ storageState: AUTH_CONTEXT });
+    const page = await context.newPage();
+    await page.goto('/');
+    await page.waitForURL(
+      `${TEST_DASHBOARD_URL}/orgs/${TEST_PERSONAL_ORG_SLUG}/projects`,
+      { waitUntil: 'networkidle' },
+    );
+    await use(page);
+    // update the context to get the new refresh token
+    await page.context().storageState({ path: AUTH_CONTEXT });
+    await page.close();
+  },
+});
+
+export { expect } from '@playwright/test';

dashboard/e2e/overview/overview.test.ts

@@ -1,15 +1,8 @@
 import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-import { navigateToProject } from '../utils';
-
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
-
-  await page.goto('/');
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import { navigateToProject } from '@/e2e/utils';
 
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
   await navigateToProject({
     page,
     orgSlug: TEST_ORGANIZATION_SLUG,
@@ -17,11 +10,9 @@ test.beforeAll(async ({ browser }) => {
   });
 });
 
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should show the navtree with all links visible', async () => {
+test('should show the navtree with all links visible', async ({
+  authenticatedNhostPage: page,
+}) => {
   const navLocator = page.getByLabel('Navigation Tree');
   await expect(navLocator).toBeVisible();
 
@@ -42,16 +33,20 @@ test('should show the navtree with all links visible', async () => {
     'Settings',
   ];
 
+  // eslint-disable-next-line no-restricted-syntax
   for (const linkName of links) {
     const link =
       linkName === 'Settings'
         ? page.getByRole('link', { name: linkName }).first()
         : page.getByRole('link', { name: linkName });
+    // eslint-disable-next-line no-await-in-loop
     await expect(link).toBeVisible();
   }
 });
 
-test("should show the project's region and subdomain", async () => {
+test("should show the project's region and subdomain", async ({
+  authenticatedNhostPage: page,
+}) => {
   await expect(page.locator('p:has-text("Region") + div p').nth(0)).toHaveText(
     /frankfurt \(eu-central-1\)/i,
   );
@@ -60,7 +55,9 @@ test("should show the project's region and subdomain", async () => {
   ).toHaveText(/[a-z]{20}/i);
 });
 
-test('should not have a GitHub repository connected', async () => {
+test('should not have a GitHub repository connected', async ({
+  authenticatedNhostPage: page,
+}) => {
   await expect(
     page.getByRole('button', { name: /connect to github/i }).first(),
   ).toBeVisible();

dashboard/e2e/run/run.test.ts

@@ -1,33 +1,15 @@
 import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-import { navigateToProject } from '../utils';
-
-let page: Page;
-
-test.beforeAll(async ({ browser }) => {
-  page = await browser.newPage();
-});
-
-test.beforeEach(async () => {
-  await page.goto('/');
-
-  await navigateToProject({
-    page,
-    orgSlug: TEST_ORGANIZATION_SLUG,
-    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
-  });
+import { expect, test } from '@/e2e/fixtures/auth-hook';
 
+test.beforeEach(async ({ authenticatedNhostPage: page }) => {
   const runRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/run`;
   await page.goto(runRoute);
   await page.waitForURL(runRoute);
 });
 
-test.afterAll(async () => {
-  await page.close();
-});
-
-test('should create and delete a run service', async () => {
+test('should create and delete a run service', async ({
+  authenticatedNhostPage: page,
+}) => {
   await page.getByRole('button', { name: 'Add service' }).first().click();
   await expect(page.getByText(/create a new service/i)).toBeVisible();
   await page.getByPlaceholder(/service name/i).click();

dashboard/e2e/setup/refresh-metadata.setup.ts

@@ -0,0 +1,55 @@
+/* eslint-disable no-console */
+import { TEST_PROJECT_ADMIN_SECRET, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { test as setup } from '@playwright/test';
+
+setup('refresh metadata', async () => {
+  try {
+    const response = await fetch(
+      `https://${TEST_PROJECT_SUBDOMAIN}.hasura.eu-central-1.staging.nhost.run/v1/metadata`,
+      {
+        method: 'POST',
+        headers: {
+          'x-hasura-admin-secret': TEST_PROJECT_ADMIN_SECRET,
+        },
+        body: JSON.stringify({
+          args: [
+            {
+              type: 'reload_metadata',
+              args: {
+                reload_sources: false,
+              },
+            },
+            {
+              args: {},
+              type: 'get_inconsistent_metadata',
+            },
+          ],
+          source: 'default',
+          type: 'bulk',
+        }),
+      },
+    );
+    const body = await response.json();
+
+    if (!response.ok) {
+      const message = `[${body.code}]:${body.error}`;
+      throw new Error(message);
+    } else {
+      const isConsistent = body[0].is_consistent;
+      if (isConsistent) {
+        console.log('Metadata is consistent.');
+      } else {
+        console.error('Metadata is not consistent.');
+        console.error(body[0].inconsistent_objects);
+        throw new Error('Metadata is not consistent');
+      }
+    }
+  } catch (error) {
+    // Log safe error information
+    console.error(
+      'Failed to refresh metadata:',
+      error instanceof Error ? error.message : 'Unknown error',
+    );
+    throw new Error('Failed to refresh metadata');
+  }
+});

dashboard/e2e/teardown/database.teardown.ts

@@ -0,0 +1,36 @@
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { expect, test as teardown } from '@/e2e/fixtures/auth-hook';
+
+teardown.beforeEach(async ({ authenticatedNhostPage: page }) => {
+  const databaseRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default`;
+  await page.goto(databaseRoute);
+  await page.waitForURL(databaseRoute);
+});
+
+teardown(
+  'clean up database tables',
+  async ({ authenticatedNhostPage: page }) => {
+    await page.getByRole('link', { name: /sql editor/i }).click();
+
+    await page.waitForURL(
+      `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/editor`,
+    );
+
+    const inputField = page.locator('[contenteditable]');
+    await inputField.fill(`
+      DO $$ DECLARE
+        tablename text;
+      BEGIN
+        FOR tablename IN
+          SELECT table_name FROM information_schema.tables
+          WHERE table_schema = 'public'
+        LOOP
+          EXECUTE 'DROP TABLE IF EXISTS public.' || quote_ident(tablename) || ' CASCADE';
+        END LOOP;
+      END $$;
+    `);
+
+    await page.locator('button[type="button"]', { hasText: /run/i }).click();
+    await expect(page.getByText(/success/i)).toBeVisible();
+  },
+);

dashboard/e2e/upgrade-project/upgrade-project.test.ts

@@ -0,0 +1,142 @@
+import { expect, test } from '@/e2e/fixtures/auth-hook';
+import {
+  getCardExpiration,
+  getFreeUserStarterOrgSlug,
+  getNewOrgSlug,
+  getNewProjectName,
+  getNewProjectSlug,
+  getOrgSlugFromUrl,
+  getProjectSlugFromUrl,
+  gotoUrl,
+  loginWithFreeUser,
+  setNewOrgSlug,
+  setNewProjectName,
+  setNewProjectSlug,
+} from '@/e2e/utils';
+import { faker } from '@faker-js/faker';
+import type { Page } from '@playwright/test';
+
+let page: Page;
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+  await loginWithFreeUser(page);
+});
+
+test('should create a new project', async () => {
+  await gotoUrl(page, `/orgs/${getFreeUserStarterOrgSlug()}/projects/new`);
+  const projectName = faker.lorem.words(3);
+
+  await page.getByLabel('Project Name').fill(projectName);
+  await page.getByText('Create Project').click();
+
+  expect(page.getByText('Creating the project...')).toBeVisible();
+  expect(page.getByText('Internal info')).toBeVisible();
+
+  await page.waitForSelector('button:has-text("Upgrade project")', {
+    timeout: 120000,
+  });
+
+  const newProjectSlug = getProjectSlugFromUrl(page.url());
+  setNewProjectSlug(newProjectSlug);
+  setNewProjectName(projectName);
+});
+
+test('should upgrade the project', async () => {
+  await gotoUrl(
+    page,
+    `/orgs/${getFreeUserStarterOrgSlug()}/projects/${getNewProjectSlug()}`,
+  );
+  const upgradeProject = page.getByText('Upgrade project');
+  expect(upgradeProject).toBeVisible();
+
+  await upgradeProject.click();
+
+  await page.waitForSelector('h2:has-text("Upgrade project")');
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await page.waitForSelector('h2:has-text("New Organization")');
+
+  const newOrgName = faker.lorem.words(3);
+  await page.getByLabel('Organization Name').fill(newOrgName);
+
+  await page.getByText('Create organization').click();
+  await page.waitForSelector('button:has-text("Create organization")', {
+    state: 'hidden',
+  });
+  const stripeFrame = page
+    .frameLocator('iframe[name="embedded-checkout"]')
+    .first();
+  stripeFrame.getByText('Subscribe to Nhost');
+  await stripeFrame.getByLabel('Email').fill(faker.internet.email());
+
+  await stripeFrame
+    .getByPlaceholder('1234 1234 1234 1234')
+    .fill('4242424242424242');
+
+  await stripeFrame.getByPlaceholder('MM / YY').fill(getCardExpiration());
+  await stripeFrame.getByPlaceholder('CVC').fill('123');
+  await stripeFrame
+    .getByPlaceholder('Full name on card')
+    .fill('EndyTo EndyTest');
+  await stripeFrame.locator('#billingCountry').scrollIntoViewIfNeeded();
+  // Need to comment out for local testing START
+  await stripeFrame.getByPlaceholder('Address', { exact: true }).click();
+  stripeFrame.locator('span:has-text("Enter address manually")');
+  await stripeFrame.getByText('Enter address manually').click();
+  await stripeFrame
+    .getByPlaceholder('Address line 1', { exact: true })
+    .fill('123 Main Street');
+  await stripeFrame
+    .getByPlaceholder('City', { exact: true })
+    .fill('Springfield');
+  await stripeFrame.getByPlaceholder('ZIP', { exact: true }).fill('62701');
+  await stripeFrame.locator('#enableStripePass').click({ force: true });
+  // local Comment end
+  await stripeFrame
+    .getByTestId('hosted-payment-submit-button')
+    .scrollIntoViewIfNeeded();
+  await stripeFrame
+    .getByTestId('hosted-payment-submit-button')
+    .click({ force: true });
+
+  await page.waitForSelector('h2:has-text("Upgrade project")');
+  await page.waitForSelector(
+    'div:has-text("Organization created successfully.")',
+  );
+  await page.waitForSelector(
+    'div:has-text("Project has been upgraded successfully!")',
+  );
+
+  page.getByRole('button', { name: 'Create project' });
+
+  await page.waitForSelector(`div:has-text("${newOrgName}")`);
+  await page.waitForSelector(`p:has-text("${getNewProjectName()}")`);
+
+  setNewOrgSlug(getOrgSlugFromUrl(page.url()));
+});
+
+test('should delete the new organization', async () => {
+  await gotoUrl(page, `/orgs/${getNewOrgSlug()}/projects`);
+  await page.getByRole('link', { name: 'Settings' }).click();
+
+  await page.waitForSelector('h3:has-text("Delete Organization")');
+  await page.getByRole('button', { name: 'Delete' }).click();
+
+  await page.waitForSelector('h2:has-text("Delete Organization")');
+  expect(page.getByTestId('deleteOrgButton')).toBeDisabled();
+
+  await page.getByLabel("I'm sure I want to delete this Organization").click();
+  expect(page.getByTestId('deleteOrgButton')).toBeDisabled();
+  await page.getByLabel('I understand this action cannot be undone').click();
+  expect(page.getByTestId('deleteOrgButton')).not.toBeDisabled();
+
+  await page.getByTestId('deleteOrgButton').click();
+
+  await page.waitForSelector('div:has-text("Deleting the organization")');
+  await page.waitForSelector(
+    'div:has-text("Successfully deleted the organization")',
+  );
+
+  await page.waitForSelector(`div:has-text("Personal Organization")`);
+});

dashboard/e2e/utils.ts

@@ -1,5 +1,12 @@
+import {
+  TEST_FREE_USER_EMAILS,
+  TEST_ORGANIZATION_SLUG,
+  TEST_PROJECT_SUBDOMAIN,
+  TEST_USER_PASSWORD,
+} from '@/e2e/env';
 import { faker } from '@faker-js/faker';
-import type { Page } from '@playwright/test';
+import { type Page, expect } from '@playwright/test';
+import { add, format } from 'date-fns-v4';
 
 /**
  * Open a project by navigating to the project's overview page.
@@ -191,3 +198,117 @@ export function generateTestEmail(prefix: string = 'Nhost_Test_') {
 
   return [prefix, email].join('');
 }
+
+export async function clickPermissionButton({
+  page,
+  role,
+  permission,
+}: {
+  page: Page;
+  role: string;
+  permission: 'Insert' | 'Select' | 'Update' | 'Delete';
+}) {
+  const permissionIndex =
+    ['Insert', 'Select', 'Update', 'Delete'].indexOf(permission) + 1;
+
+  await page
+    .locator('tr', { hasText: role })
+    .locator('td')
+    .nth(permissionIndex)
+    .locator('button')
+    .click();
+}
+
+export async function gotoAuthURL(page: Page) {
+  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
+  await page.goto(authUrl);
+  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
+}
+
+export async function gotoUrl(page: Page, url: string) {
+  await page.url;
+  await page.goto(url);
+  await page.waitForURL(url, { waitUntil: 'networkidle' });
+}
+
+let newOrgSlug: string;
+
+export function getNewOrgSlug() {
+  return newOrgSlug;
+}
+
+export function setNewOrgSlug(slug: string) {
+  newOrgSlug = slug;
+}
+
+let freeUserStarterOrgSlug: string;
+
+export function getFreeUserStarterOrgSlug() {
+  return freeUserStarterOrgSlug;
+}
+
+export function setFreeUserStarterOrgSlug(slug: string) {
+  freeUserStarterOrgSlug = slug;
+}
+
+let newProjectSlug: string;
+
+export function getNewProjectSlug() {
+  return newProjectSlug;
+}
+
+export function setNewProjectSlug(slug: string) {
+  newProjectSlug = slug;
+}
+
+export function getProjectSlugFromUrl(url: string) {
+  const [, projectSlug] = url.split('/projects/');
+
+  return projectSlug;
+}
+
+export function getOrgSlugFromUrl(url: string) {
+  const orgSlug = url.split('/orgs/')[1].replace('/projects', '');
+  return orgSlug;
+}
+
+export function getCardExpiration() {
+  const now = add(new Date(), { years: 3 });
+  return format(now, 'MMyy');
+}
+
+let newProjectName: string;
+
+export function getNewProjectName() {
+  return newProjectName;
+}
+
+export function setNewProjectName(name: string) {
+  newProjectName = name;
+}
+
+function getRandomUserIndex(): number {
+  return Math.floor(Math.random() * 5);
+}
+
+export async function loginWithFreeUser(page: Page) {
+  const userIndex = getRandomUserIndex();
+
+  const freeUserEmail = TEST_FREE_USER_EMAILS[userIndex];
+
+  // eslint-disable-next-line no-console
+  console.log(`Selected userIndex: ${userIndex}`);
+  await page.goto('/');
+  await page.waitForURL('/signin');
+  await page.getByRole('link', { name: /continue with email/i }).click();
+
+  await page.waitForURL('/signin/email');
+  await page.getByLabel('Email').fill(freeUserEmail);
+  await page.getByLabel('Password').fill(TEST_USER_PASSWORD);
+  await page.getByRole('button', { name: /sign in/i }).click();
+  expect(
+    await page.getByRole('button', { name: 'Create project' }),
+  ).not.toBeVisible();
+  await page.waitForSelector('h2:has-text("Welcome to")', { timeout: 20000 });
+  setFreeUserStarterOrgSlug(getOrgSlugFromUrl(await page.url()));
+}

dashboard/global-teardown.ts

@@ -1,67 +0,0 @@
-import {
-  TEST_DASHBOARD_URL,
-  TEST_ORGANIZATION_SLUG,
-  TEST_PROJECT_ADMIN_SECRET,
-  TEST_PROJECT_SUBDOMAIN,
-} from '@/e2e/env';
-import { navigateToProject } from '@/e2e/utils';
-import { chromium } from '@playwright/test';
-
-async function globalTeardown() {
-  const browser = await chromium.launch({ slowMo: 1000 });
-
-  const context = await browser.newContext({
-    baseURL: TEST_DASHBOARD_URL,
-    storageState: 'e2e/.auth/user.json',
-  });
-
-  const page = await context.newPage();
-
-  await navigateToProject({
-    page,
-    orgSlug: TEST_ORGANIZATION_SLUG,
-    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
-  });
-
-  const pagePromise = context.waitForEvent('page');
-
-  await page.getByRole('link', { name: /hasura/i }).click();
-  await page.getByRole('link', { name: /open hasura/i }).click();
-
-  const hasuraPage = await pagePromise;
-  await hasuraPage.waitForLoadState();
-
-  const adminSecretInput = hasuraPage.getByPlaceholder(/enter admin-secret/i);
-
-  // note: a more ideal way would be to paste from clipboard, but Playwright
-  // doesn't support that yet
-  await adminSecretInput.fill(TEST_PROJECT_ADMIN_SECRET);
-  await adminSecretInput.press('Enter');
-
-  // note: getByRole doesn't work here
-  await hasuraPage.locator('a', { hasText: /data/i }).nth(0).click();
-  await hasuraPage.locator('[data-test="sql-link"]').click();
-
-  // Set the value of the Ace code editor using JavaScript evaluation in the browser context
-  await hasuraPage.evaluate(() => {
-    const editor = ace.edit('raw_sql');
-
-    editor.setValue(`
-        DO $$ DECLARE
-          tablename text;
-        BEGIN
-          FOR tablename IN
-            SELECT table_name FROM information_schema.tables
-            WHERE table_schema = 'public'
-          LOOP
-            EXECUTE 'DROP TABLE IF EXISTS public.' || quote_ident(tablename) || ' CASCADE';
-          END LOOP;
-        END $$;
-     `);
-  });
-
-  await hasuraPage.getByRole('button', { name: /run!/i }).click();
-  await hasuraPage.getByText(/sql executed!/i).waitFor();
-}
-
-export default globalTeardown;

dashboard/graphite.graphql.config.yaml

@@ -1,5 +1,5 @@
 schema:
-  - https://local.graphql.nhost.run/v1:
+  - https://local.graphql.local.nhost.run/v1:
       headers:
         x-hasura-admin-secret: nhost-admin-secret
 generates:

dashboard/next.config.js

@@ -7,7 +7,7 @@ const { version } = require('./package.json');
 const cspHeader = `
     default-src 'self' *.nhost.run ws://*.nhost.run nhost.run ws://nhost.run;
     script-src 'self' 'unsafe-eval' 'unsafe-inline' cdn.segment.com js.stripe.com;
-    connect-src 'self' *.nhost.run ws://*.nhost.run nhost.run ws://nhost.run discord.com;
+    connect-src 'self' *.nhost.run ws://*.nhost.run nhost.run ws://nhost.run discord.com api.segment.io api.segment.com cdn.segment.com nhost.zendesk.com;
     style-src 'self' 'unsafe-inline';
     img-src 'self' blob: data: avatars.githubusercontent.com s.gravatar.com *.nhost.run nhost.run;
     font-src 'self' data:;
@@ -16,6 +16,8 @@ const cspHeader = `
     form-action 'self';
     frame-ancestors 'none';
     frame-src 'self' js.stripe.com;
+    block-all-mixed-content;
+    upgrade-insecure-requests;
 `;
 
 module.exports = withBundleAnalyzer({
@@ -36,9 +38,13 @@ module.exports = withBundleAnalyzer({
       {
         source: '/(.*)',
         headers: [
+          // {
+          //   key: 'Content-Security-Policy',
+          //   hgvalue: cspHeader.replace(/\s+/g, ' ').trim(),
+          // },
           {
             key: 'X-Frame-Options',
-            value: 'SAMEORIGIN',
+            value: 'DENY',
           },
         ],
       },

dashboard/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@nhost/dashboard",
-  "version": "2.7.1",
+  "version": "2.31.0",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "dev": "next dev",
+    "dev": "RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED=false next dev",
     "build": "next build --no-lint",
     "analyze": "ANALYZE=true pnpm build --no-lint",
     "start": "next start",
@@ -16,13 +16,17 @@
     "storybook": "start-storybook -p 6006 -s public",
     "build-storybook": "build-storybook",
     "install-browsers": "pnpm playwright install && pnpm playwright install-deps",
-    "e2e": "pnpm install-browsers && pnpm playwright test"
+    "e2e:tests": "pnpm install-browsers && pnpm playwright test --config=playwright.config.ts -x",
+    "e2e": "pnpm e2e:tests --project=main",
+    "e2e:local": "pnpm e2e:tests --project=local",
+    "e2e:upgrade-project": "pnpm e2e:tests --project=upgrade-project"
   },
   "dependencies": {
     "@apollo/client": "^3.9.9",
     "@codemirror/lang-sql": "^6.6.2",
     "@codemirror/language": "^6.10.1",
     "@codemirror/legacy-modes": "^6.4.0",
+    "@date-fns/tz": "^1.2.0",
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.4",
     "@emotion/server": "^11.11.0",
@@ -35,6 +39,7 @@
     "@heroicons/react": "^1.0.6",
     "@hookform/resolvers": "^3.9.0",
     "@iarna/toml": "^2.2.5",
+    "@icons-pack/react-simple-icons": "^9.6.0",
     "@marsidev/react-turnstile": "^1.0.2",
     "@mui/base": "5.0.0-beta.31",
     "@mui/material": "^5.15.14",
@@ -55,24 +60,25 @@
     "@radix-ui/react-select": "^2.1.2",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-tabs": "^1.1.3",
     "@radix-ui/react-tooltip": "^1.1.2",
-    "@segment/snippet": "^4.16.2",
+    "@segment/analytics-next": "^1.77.0",
     "@stripe/react-stripe-js": "^2.6.2",
     "@stripe/stripe-js": "^1.54.2",
     "@tailwindcss/forms": "^0.5.7",
     "@tanstack/react-query": "^4.36.1",
     "@tanstack/react-table": "^8.15.3",
-    "@tanstack/react-virtual": "^3.2.0",
+    "@tanstack/react-virtual": "^3.5.0",
     "@uidotdev/usehooks": "^2.4.1",
     "@uiw/codemirror-theme-bbedit": "^4.22.2",
     "@uiw/codemirror-theme-github": "^4.21.25",
     "@uiw/react-codemirror": "^4.21.25",
-    "analytics-node": "^6.2.0",
     "bcryptjs": "^2.4.3",
     "class-variance-authority": "^0.7.0",
     "clsx": "^1.2.1",
     "cmdk": "1.0.0",
     "date-fns": "^2.30.0",
+    "date-fns-v4": "npm:date-fns@4.1.0",
     "dequal": "^2.0.3",
     "framer-motion": "^10.18.0",
     "generate-password": "^1.7.1",
@@ -84,7 +90,7 @@
     "just-kebab-case": "^4.2.0",
     "lodash.debounce": "^4.0.8",
     "lucide-react": "^0.416.0",
-    "next": "^14.2.10",
+    "next": "^14.2.26",
     "next-nprogress-bar": "^2.3.13",
     "next-seo": "^6.5.0",
     "next-themes": "^0.3.0",
@@ -93,6 +99,7 @@
     "react": "18.2.0",
     "react-children-utilities": "^2.10.0",
     "react-complex-tree": "^2.4.5",
+    "react-day-picker": "9.6.3",
     "react-dom": "18.2.0",
     "react-error-boundary": "^4.0.13",
     "react-hook-form": "^7.53.0",
@@ -108,11 +115,11 @@
     "recoil-persist": "^5.1.0",
     "rehype-highlight": "^7.0.0",
     "remark-gfm": "^4.0.0",
-    "shell-quote": "^1.8.1",
     "slugify": "^1.6.6",
     "stripe": "^10.17.0",
     "tailwind-merge": "^1.14.0",
     "tailwindcss-animate": "^1.0.7",
+    "timezones-list": "^3.1.0",
     "utility-types": "^3.11.0",
     "uuid": "^9.0.1",
     "validator": "^13.11.0",
@@ -152,7 +159,6 @@
     "@types/react": "^18.2.73",
     "@types/react-dom": "^18.2.23",
     "@types/react-table": "^7.7.20",
-    "@types/shell-quote": "^1.7.5",
     "@types/testing-library__jest-dom": "^5.14.9",
     "@types/uuid": "^9.0.8",
     "@types/validator": "^13.11.9",
@@ -177,13 +183,13 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jsdom": "^22.1.0",
     "lint-staged": "^15.2.2",
-    "msw": "^1.3.3",
+    "msw": "^1.3.5",
     "msw-storybook-addon": "^1.10.0",
     "node-fetch": "^3.3.2",
     "postcss": "^8.4.38",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "prettier-plugin-organize-imports": "^4.1.0",
-    "prettier-plugin-tailwindcss": "^0.6.6",
+    "prettier-plugin-tailwindcss": "^0.6.11",
     "react-date-fns-hooks": "^0.9.4",
     "require-from-string": "^2.0.2",
     "snake-case": "^3.0.4",
@@ -191,7 +197,7 @@
     "tailwindcss": "^3.4.12",
     "ts-node": "^10.9.2",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
-    "vite": "^5.4.6",
+    "vite": "^5.4.19",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^0.32.4"
   },

dashboard/playwright.config.ts

@@ -6,19 +6,18 @@ dotenv.config({ path: path.resolve(__dirname, '.env.test') });
 
 export default defineConfig({
   testDir: './e2e',
-  timeout: 40 * 1000,
+  timeout: 60 * 1000,
   expect: {
-    timeout: 5000,
+    timeout: 10000,
   },
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   workers: 1,
   reporter: 'html',
-  globalTeardown: require.resolve('./global-teardown'),
   use: {
     actionTimeout: 0,
-    trace: 'on-first-retry',
+    trace: 'retain-on-failure',
     baseURL: process.env.NHOST_TEST_DASHBOARD_URL,
     launchOptions: {
       slowMo: 500,
@@ -28,14 +27,35 @@ export default defineConfig({
     {
       name: 'setup',
       testMatch: ['**/setup/*.setup.ts'],
+      teardown: 'teardown',
     },
     {
-      name: 'chromium',
+      name: 'teardown',
+      testMatch: ['**/teardown/*.teardown.ts'],
+    },
+    {
+      name: 'main',
       use: {
         ...devices['Desktop Chrome'],
         storageState: 'e2e/.auth/user.json',
       },
       dependencies: ['setup'],
+      testIgnore: ['upgrade-project.test.ts', 'cli-local-dashboard.test.ts'],
+    },
+    {
+      name: 'local',
+      use: {
+        ...devices['Desktop Chrome'],
+        baseURL: '', // Local dashboard URL
+      },
+      testMatch: 'cli-local-dashboard.test.ts',
+    },
+    {
+      name: 'upgrade-project',
+      testMatch: 'upgrade-project.test.ts',
+      use: {
+        ...devices['Desktop Chrome'],
+      },
     },
   ],
 });

dashboard/src/components/analytics/analytics.tsx

@@ -0,0 +1,30 @@
+import { useCurrentOrg } from '@/features/orgs/projects/hooks/useCurrentOrg';
+import { useProject } from '@/features/orgs/projects/hooks/useProject';
+import { analytics } from '@/lib/segment';
+import { useRouter } from 'next/router';
+import { useEffect } from 'react';
+
+export default function Analytics() {
+  const router = useRouter();
+  const { org } = useCurrentOrg();
+  const { project } = useProject();
+
+  useEffect(() => {
+    const customProperties = {
+      organizationSlug: org?.slug || '',
+      projectSubdomain: project?.subdomain || '',
+    };
+
+    analytics.page(customProperties);
+
+    const handleRouteChange = () => analytics.page(customProperties);
+
+    router.events.on('routeChangeComplete', handleRouteChange);
+
+    return () => {
+      router.events.off('routeChangeComplete', handleRouteChange);
+    };
+  }, [router.events, org?.slug, project?.subdomain]);
+
+  return null;
+}

dashboard/src/components/common/ApplyLocalSettingsDialog/ApplyLocalSettingsDialog.tsx

@@ -10,7 +10,7 @@ export default function ApplyLocalSettingsDialog() {
       <div className="flex flex-col gap-2">
         <Text color="secondary">
           Run{' '}
-          <code className="px-1 py-px mx-1 rounded-md bg-slate-500 text-slate-100">
+          <code className="mx-1 rounded-md bg-slate-500 px-1 py-px text-slate-100">
             $ nhost up
           </code>{' '}
           using the cli to apply your changes

dashboard/src/components/common/ContactUs/ContactUs.tsx

@@ -1,102 +0,0 @@
-import { Link } from '@/components/ui/v2/Link';
-import { Text } from '@/components/ui/v2/Text';
-import type { DetailedHTMLProps, HTMLProps } from 'react';
-import { twMerge } from 'tailwind-merge';
-
-export interface ContactUsProps
-  extends DetailedHTMLProps<HTMLProps<HTMLDivElement>, HTMLDivElement> {
-  isTeam?: boolean;
-  isOwner?: boolean;
-}
-
-export default function FeedbackForm({
-  className,
-  isTeam,
-  isOwner,
-  ...props
-}: ContactUsProps) {
-  return (
-    <div
-      className={twMerge(
-        'grid max-w-md grid-flow-row gap-2 py-4 px-5',
-        className,
-      )}
-      {...props}
-    >
-      <Text variant="h3" component="h2">
-        Contact us
-      </Text>
-
-      {isTeam && isOwner && (
-        <Text>
-          If this is a new Team project, or you need to manage members, reach
-          out to us on discord or via email at{' '}
-          <Link
-            href="mailto:support@nhost.io"
-            target="_blank"
-            rel="noopener noreferrer"
-            underline="hover"
-          >
-            support@nhost.io
-          </Link>{' '}
-          so we can have your dedicated channel set up.
-        </Text>
-      )}
-
-      {isTeam && !isOwner && (
-        <Text>
-          As part of a team plan you can reach out to us on the private channel
-          for this workspace. If you haven&apos;t been added to the channel, ask
-          the workspace owner to add you.
-        </Text>
-      )}
-
-      <Text>
-        To report issues with Nhost, please open a GitHub issue in the{' '}
-        <Link
-          href="https://github.com/nhost/nhost/issues/new"
-          target="_blank"
-          rel="noopener noreferrer"
-          underline="hover"
-        >
-          nhost/nhost
-        </Link>{' '}
-        repository.
-      </Text>
-      <Text>
-        For issues related to the CLI, please visit the{' '}
-        <Link
-          href="https://github.com/nhost/cli/issues/new"
-          target="_blank"
-          rel="noopener noreferrer"
-          underline="hover"
-        >
-          nhost/cli
-        </Link>{' '}
-        repository.
-      </Text>
-      <Text>
-        If you need assistance or have any questions, feel free to join us on{' '}
-        <Link
-          href="https://discord.com/invite/9V7Qb2U"
-          target="_blank"
-          rel="noopener noreferrer"
-          underline="hover"
-        >
-          Discord
-        </Link>
-        . Alternatively, if you prefer, you can also open a{' '}
-        <Link
-          href="https://github.com/nhost/nhost/discussions/new/choose"
-          target="_blank"
-          rel="noopener noreferrer"
-          underline="hover"
-        >
-          GitHub discussion
-        </Link>
-        .
-      </Text>
-      <Text>We&apos;re here to help, so don&apos;t hesitate to reach out!</Text>
-    </div>
-  );
-}

dashboard/src/components/common/ContactUs/index.ts

@@ -1,2 +0,0 @@
-export * from './ContactUs';
-export { default as ContactUs } from './ContactUs';

dashboard/src/components/common/DateTimePicker/DateTimePicker.test.tsx

@@ -0,0 +1,177 @@
+import { isTZDate } from '@/components/common/TimePicker/time-picker-utils';
+import { render, screen, TestUserEvent, waitFor } from '@/tests/testUtils';
+import { isBefore, startOfDay } from 'date-fns-v4';
+import { useState } from 'react';
+import { TZDate } from 'react-day-picker';
+import { vi } from 'vitest';
+import DateTimePicker, { type DateTimePickerProps } from './DateTimePicker';
+
+vi.mock('@/utils/timezoneUtils', async () => {
+  const actualTimezoneUtils = await vi.importActual<any>(
+    '@/utils/timezoneUtils',
+  );
+  return {
+    ...actualTimezoneUtils,
+    guessTimezone: () => 'Europe/Helsinki',
+  };
+});
+
+const earliestBackupDate = '2025-03-13T02:00:05.000Z';
+
+function TestComponent(
+  props: Omit<DateTimePickerProps, 'dateTime' | 'onDateTimeChange'>,
+) {
+  const [dateTime, setDateTime] = useState(earliestBackupDate);
+
+  function isCalendarDayDisabled(date: Date | TZDate) {
+    if (isTZDate(date)) {
+      const utcDay = new Date(date.getTime()).toISOString();
+      const tzDate = new TZDate(utcDay, date.timeZone);
+      const earliestBackupDateInTz = new TZDate(
+        earliestBackupDate,
+        date.timeZone,
+      );
+      return isBefore(startOfDay(tzDate), startOfDay(earliestBackupDateInTz));
+    }
+
+    return isBefore(
+      startOfDay(new Date(date.getTime()).toISOString()),
+      startOfDay(earliestBackupDate),
+    );
+  }
+
+  return (
+    <>
+      <h1 data-testid="utcDate">{dateTime}</h1>
+      <DateTimePicker
+        {...props}
+        isCalendarDayDisabled={isCalendarDayDisabled}
+        dateTime={dateTime}
+        onDateTimeChange={setDateTime}
+      />
+    </>
+  );
+}
+
+describe('DateTimePicker', () => {
+  test('when the date changes datetime is emitted in utc string format', async () => {
+    render(<TestComponent />);
+    const user = new TestUserEvent();
+
+    await user.click(await screen.findByTestId('dateTimePickerTrigger'));
+
+    expect(
+      await screen.findByRole('button', { name: 'Select' }),
+    ).toBeInTheDocument();
+
+    expect(await screen.getByText('March 2025')).toBeInTheDocument();
+
+    await user.click(
+      screen.getByRole('button', { name: 'Go to the Next Month' }),
+    );
+    expect(screen.getByText('April 2025')).toBeInTheDocument();
+
+    await user.click(await screen.getByText('13'));
+
+    const hoursInput = await screen.getByLabelText('Hours');
+    await user.type(hoursInput, '11');
+
+    const minutesInput = await screen.getByLabelText('Minutes');
+    await user.type(minutesInput, '12');
+
+    const secondsInput = await screen.getByLabelText('Seconds');
+    await user.type(secondsInput, '13');
+
+    await user.click(await screen.getByRole('button', { name: 'Select' }));
+
+    await waitFor(async () =>
+      expect(
+        await screen.queryByRole('button', { name: 'Select' }),
+      ).not.toBeInTheDocument(),
+    );
+
+    expect(screen.getByTestId('utcDate')).toHaveTextContent(
+      '2025-04-13T08:12:13.000Z',
+    );
+  });
+
+  test('timezone can be changed and the calendar is updated', async () => {
+    await waitFor(() => render(<TestComponent withTimezone />));
+    const user = new TestUserEvent();
+
+    await user.click(await screen.findByTestId('dateTimePickerTrigger'));
+
+    expect(await screen.findByText(/Timezone:/)).toBeInTheDocument();
+
+    expect(
+      await screen.findByTestId('timezoneSettingsButton'),
+    ).toBeInTheDocument();
+
+    expect(await screen.findByText(/Timezone: /i)).toHaveTextContent(
+      'Timezone: UTC+02:00',
+    );
+    expect(await screen.getByText('12')).toBeDisabled();
+
+    await user.click(await screen.findByTestId('timezoneSettingsButton'));
+    const tzInput = await screen.findByPlaceholderText('Search timezones...');
+    expect(tzInput).toBeInTheDocument();
+
+    await user.type(tzInput, 'America/Chicago{ArrowDown}{Enter}');
+
+    expect(
+      await screen.queryByPlaceholderText('Search timezones...'),
+    ).not.toBeInTheDocument();
+
+    expect(await screen.findByText(/Timezone: /i)).toHaveTextContent(
+      'Timezone: UTC-05:00',
+    );
+
+    const selectedDay = screen.getByText('12');
+    expect(selectedDay).not.toBeDisabled();
+    expect(await screen.getByText('11')).toBeDisabled();
+    const gridCell = selectedDay.closest('[role="gridcell"]');
+    expect(gridCell).toHaveClass('[&>button]:bg-primary');
+  });
+
+  test('Displays the correct time zone offset when changing the selected date from standard time (ST) to daylight saving time (DST)', async () => {
+    await waitFor(() => render(<TestComponent withTimezone />));
+    const user = new TestUserEvent();
+
+    await user.click(await screen.findByTestId('dateTimePickerTrigger'));
+
+    expect(await screen.findByText(/Timezone:/)).toBeInTheDocument();
+    expect(
+      await screen.findByTestId('timezoneSettingsButton'),
+    ).toBeInTheDocument();
+
+    expect(await screen.findByText(/Timezone: /i)).toHaveTextContent(
+      'Timezone: UTC+02:00',
+    );
+
+    expect(await screen.getByText('March 2025')).toBeInTheDocument();
+
+    await user.click(
+      screen.getByRole('button', { name: 'Go to the Next Month' }),
+    );
+
+    expect(screen.getByText('April 2025')).toBeInTheDocument();
+
+    await user.click(await screen.getByText('18'));
+
+    expect(await screen.findByText(/Timezone: /i)).toHaveTextContent(
+      'Timezone: UTC+03:00',
+    );
+
+    await user.click(
+      screen.getByRole('button', { name: 'Go to the Previous Month' }),
+    );
+
+    expect(await screen.getByText('March 2025')).toBeInTheDocument();
+
+    await user.click(await screen.getByText('21'));
+
+    expect(await screen.findByText(/Timezone: /i)).toHaveTextContent(
+      'Timezone: UTC+02:00',
+    );
+  });
+});

dashboard/src/components/common/DateTimePicker/DateTimePicker.tsx

@@ -0,0 +1,173 @@
+'use client';
+
+import { TimePicker } from '@/components/common/TimePicker';
+
+import { Button } from '@/components/ui/v3/button';
+import { Calendar } from '@/components/ui/v3/calendar';
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@/components/ui/v3/popover';
+import { cn } from '@/lib/utils';
+import { guessTimezone } from '@/utils/timezoneUtils';
+import { TZDate } from '@date-fns/tz';
+import { add, format, parseISO } from 'date-fns-v4';
+import { Calendar as CalendarIcon } from 'lucide-react';
+import { useState } from 'react';
+import TimezoneSettings from './TimezoneSettings';
+
+export interface DateTimePickerProps {
+  dateTime: string;
+  onDateTimeChange: (newDate: string) => void;
+  withTimezone?: boolean;
+  defaultTimezone?: string;
+  formatDateFn?: (date: Date | string) => string;
+  isCalendarDayDisabled?: (date: Date) => boolean;
+  align?: 'start' | 'center' | 'end';
+  validateDateFn?: (date: Date) => string;
+}
+
+function DateTimePicker({
+  dateTime,
+  withTimezone = false,
+  defaultTimezone,
+  formatDateFn,
+  onDateTimeChange,
+  isCalendarDayDisabled,
+  align = 'start',
+  validateDateFn,
+}: DateTimePickerProps) {
+  const [date, setDate] = useState(() => {
+    if (withTimezone) {
+      const tz = defaultTimezone || guessTimezone();
+      return new TZDate(dateTime, tz);
+    }
+    return parseISO(dateTime);
+  });
+  const [open, setOpen] = useState(false);
+
+  const [timezone, setTimezone] = useState(
+    () => defaultTimezone || guessTimezone(),
+  );
+
+  function emitNewDateTime() {
+    onDateTimeChange(new Date(date.getTime()).toISOString());
+  }
+
+  /**
+   * carry over the current time when a user clicks a new day
+   * instead of resetting to 00:00
+   */
+  function handleSelect(newDay: Date | undefined) {
+    if (!newDay) {
+      return;
+    }
+    if (!date) {
+      setDate(newDay);
+      return;
+    }
+    const diff = newDay.getTime() - date.getTime();
+    const diffInDays = diff / (1000 * 60 * 60 * 24);
+    const newDateFull = add(date, { days: Math.ceil(diffInDays) });
+    setDate(newDateFull);
+  }
+
+  function handleTimezoneChange(newTimezone: string) {
+    const newDateWithTimezone = new TZDate(date.toISOString(), newTimezone);
+    setTimezone(newTimezone);
+    setDate(newDateWithTimezone);
+  }
+
+  function handleOpenChange(newOpenState: boolean) {
+    if (!newOpenState) {
+      if (withTimezone) {
+        const tz = defaultTimezone || guessTimezone();
+        setTimezone(tz);
+        setDate(new TZDate(dateTime, tz));
+      }
+      setDate(parseISO(dateTime));
+    }
+    setOpen(newOpenState);
+  }
+
+  function onSelect() {
+    emitNewDateTime();
+    setOpen(false);
+  }
+
+  const selectedDateInUTC = new Date(date.getTime()).toISOString();
+
+  const dateString = formatDateFn?.(date) || format(date, 'PPP HH:mm:ss');
+
+  const errorText = validateDateFn?.(date);
+  const hasError = !!errorText;
+
+  return (
+    <Popover open={open} onOpenChange={handleOpenChange}>
+      <PopoverTrigger asChild>
+        <Button
+          data-testid="dateTimePickerTrigger"
+          variant="outline"
+          className={cn(
+            'w-full justify-between text-left font-normal',
+            !date && 'text-muted-foreground',
+            { 'border-destructive': hasError },
+          )}
+          onClick={() => setOpen(true)}
+        >
+          {date ? dateString : <span>Pick a date</span>}
+          <CalendarIcon className="h-4 w-4" />
+        </Button>
+      </PopoverTrigger>
+
+      <PopoverContent className="w-auto p-0" align={align}>
+        <div className="flex">
+          <div className="flex">
+            <Calendar
+              mode="single"
+              selected={date}
+              defaultMonth={date}
+              onSelect={(d) => handleSelect(d)}
+              disabled={isCalendarDayDisabled}
+              timeZone={timezone}
+            />
+            <div className="flex flex-col justify-between">
+              <div>
+                <div className="border-t border-border p-3">
+                  <TimePicker setDate={setDate} date={date} />
+                </div>
+                {withTimezone && (
+                  <div className="border-t border-border p-3">
+                    <TimezoneSettings
+                      dateTime={selectedDateInUTC}
+                      onTimezoneChange={handleTimezoneChange}
+                    />
+                  </div>
+                )}
+              </div>
+              <div className="flex flex-row justify-between gap-5 p-3">
+                <Button
+                  className="w-full"
+                  onClick={onSelect}
+                  disabled={hasError}
+                >
+                  Select
+                </Button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          className={cn('p-3 text-center text-[11px] text-destructive', {
+            invisible: !hasError,
+          })}
+        >
+          {errorText}
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+export default DateTimePicker;

dashboard/src/components/common/DateTimePicker/TimezoneSettings.tsx

@@ -0,0 +1,46 @@
+import { TimezonePicker } from '@/components/common/TimezonePicker';
+import { Button } from '@/components/ui/v3/button';
+import { getUTCOffsetInHours, guessTimezone } from '@/utils/timezoneUtils';
+import { Settings2 } from 'lucide-react';
+import { useState } from 'react';
+
+interface Props {
+  dateTime: string;
+  onTimezoneChange: (timezone: string) => void;
+}
+
+function TimezoneSettings({ dateTime, onTimezoneChange }: Props) {
+  const [selectedTimezone, setTimezone] = useState<string>(() =>
+    guessTimezone(),
+  );
+
+  function handleTimezoneSelect(tz: { value: string; label: string }) {
+    setTimezone(tz.value);
+    onTimezoneChange?.(tz.value);
+  }
+
+  const utcOffset = getUTCOffsetInHours(selectedTimezone, dateTime, 'OOOO');
+
+  return (
+    <div className="flex w-full items-center justify-between">
+      <span>Timezone: {utcOffset}</span>
+      <TimezonePicker
+        dateTime={dateTime}
+        selectedTimezone={selectedTimezone}
+        onTimezoneSelect={handleTimezoneSelect}
+        button={
+          <Button
+            variant="ghost"
+            size="icon"
+            aria-label="Open timezone settings"
+            data-testid="timezoneSettingsButton"
+          >
+            <Settings2 className="h-4 w-4 dark:text-foreground" />
+          </Button>
+        }
+      />
+    </div>
+  );
+}
+
+export default TimezoneSettings;

dashboard/src/components/common/DateTimePicker/index.ts

@@ -0,0 +1 @@
+export { default as DateTimePicker } from './DateTimePicker';

dashboard/src/components/common/IconLink/IconLink.tsx

@@ -24,7 +24,7 @@ function IconLink(
     return (
       <span
         className={twMerge(
-          'grid cursor-default grid-flow-row justify-items-center gap-1 rounded-md py-2.5 px-0.5 text-center text-[10px] font-medium opacity-40',
+          'grid cursor-default grid-flow-row justify-items-center gap-1 rounded-md px-0.5 py-2.5 text-center text-[10px] font-medium opacity-40',
           className,
         )}
       >
@@ -68,7 +68,7 @@ function IconLink(
       href={href}
       underline="none"
       className={twMerge(
-        'grid grid-flow-row justify-items-center gap-1 rounded-md py-2.5 px-0.5 text-center font-medium motion-safe:transition-colors',
+        'grid grid-flow-row justify-items-center gap-1 rounded-md px-0.5 py-2.5 text-center font-medium motion-safe:transition-colors',
         className,
       )}
       sx={{

dashboard/src/components/common/InviteNotification/InviteNotification.tsx

@@ -1,200 +0,0 @@
-import { Box } from '@/components/ui/v2/Box';
-import { Button } from '@/components/ui/v2/Button';
-import { Text } from '@/components/ui/v2/Text';
-import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
-import {
-  GetAllWorkspacesAndProjectsDocument,
-  GetWorkspaceMemberInvitesToManageDocument,
-  useGetWorkspaceMemberInvitesToManageQuery,
-} from '@/generated/graphql';
-import { useSubmitState } from '@/hooks/useSubmitState';
-import { nhost } from '@/utils/nhost';
-import { triggerToast } from '@/utils/toast';
-import { useApolloClient } from '@apollo/client';
-import { alpha } from '@mui/system';
-import { useUserData } from '@nhost/nextjs';
-import { useRouter } from 'next/router';
-import { useEffect } from 'react';
-
-export default function InviteNotification() {
-  const user = useUserData();
-
-  const isPlatform = useIsPlatform();
-  const client = useApolloClient();
-  const router = useRouter();
-  const { submitState, setSubmitState } = useSubmitState();
-  const { submitState: ignoreState, setSubmitState: setIgnoreState } =
-    useSubmitState();
-
-  // @FIX: We probably don't want to poll every ten seconds for possible invites. (We can change later depending on how it works in production.) Maybe just on the workspace page?
-  const {
-    data,
-    loading,
-    error,
-    refetch: refetchInvitations,
-    startPolling,
-  } = useGetWorkspaceMemberInvitesToManageQuery({
-    variables: {
-      userId: user?.id,
-    },
-    skip: !isPlatform || !user,
-  });
-
-  useEffect(() => {
-    startPolling(15000);
-  }, [startPolling]);
-
-  if (loading) {
-    return null;
-  }
-
-  if (error) {
-    // TODO: Throw error instead and wrap this component in an ErrorBoundary
-    // that would handle the error
-    return null;
-  }
-
-  if (!data || data.workspaceMemberInvites.length === 0) {
-    return null;
-  }
-
-  const handleInviteAccept = async (
-    _event: React.SyntheticEvent<HTMLButtonElement>,
-    invite: typeof data.workspaceMemberInvites[number],
-  ) => {
-    setSubmitState({
-      error: null,
-      loading: true,
-    });
-    const { res, error: acceptError } = await nhost.functions.call(
-      '/accept-workspace-invite',
-      {
-        workspaceMemberInviteId: invite.id,
-        isAccepted: true,
-      },
-    );
-
-    if (res?.status !== 200) {
-      triggerToast('An error occurred when trying to accept the invitation.');
-
-      return setSubmitState({
-        error: new Error(acceptError.message),
-        loading: false,
-      });
-    }
-
-    await client.refetchQueries({
-      include: [
-        GetAllWorkspacesAndProjectsDocument,
-        GetWorkspaceMemberInvitesToManageDocument,
-      ],
-    });
-    await router.push(`/${invite.workspace.slug}`);
-    await refetchInvitations();
-    triggerToast('Workspace invite accepted');
-    return setSubmitState({
-      error: null,
-      loading: false,
-    });
-  };
-
-  async function handleIgnoreInvitation(
-    inviteId: typeof data.workspaceMemberInvites[number]['id'],
-  ) {
-    setIgnoreState({
-      loading: true,
-      error: null,
-    });
-
-    const { error: ignoreError } = await nhost.functions.call(
-      '/accept-workspace-invite',
-      {
-        workspaceMemberInviteId: inviteId,
-        isAccepted: false,
-      },
-    );
-
-    if (ignoreError) {
-      triggerToast('An error occurred when trying to ignore the invitation.');
-
-      setIgnoreState({
-        loading: false,
-        error: new Error(ignoreError.message),
-      });
-
-      return;
-    }
-
-    // just refetch all data
-    await client.refetchQueries({
-      include: [
-        GetAllWorkspacesAndProjectsDocument,
-        GetWorkspaceMemberInvitesToManageDocument,
-      ],
-    });
-
-    setIgnoreState({
-      loading: false,
-      error: null,
-    });
-  }
-
-  return (
-    <Box
-      className="absolute right-10 z-50 mt-14 w-workspaceSidebar rounded-lg px-6 py-6 text-left"
-      sx={{
-        backgroundColor: (theme) =>
-          theme.palette.mode === 'dark' ? 'grey.200' : 'grey.700',
-        borderWidth: (theme) => (theme.palette.mode === 'dark' ? 1 : 0),
-        borderColor: (theme) =>
-          theme.palette.mode === 'dark' ? theme.palette.grey[400] : 'none',
-      }}
-    >
-      {data?.workspaceMemberInvites?.map(
-        (invite: typeof data.workspaceMemberInvites[number]) => (
-          <div key={invite.id} className="grid grid-flow-row gap-4 text-center">
-            <div className="grid grid-flow-row gap-1">
-              <Text variant="h3" component="h2" sx={{ color: 'common.white' }}>
-                You have been invited to
-              </Text>
-              <Text variant="h3" component="p" sx={{ color: 'common.white' }}>
-                {invite.workspace.name}
-              </Text>
-            </div>
-
-            <div className="grid grid-flow-row gap-2">
-              <Button
-                onClick={(e: React.SyntheticEvent<HTMLButtonElement>) =>
-                  handleInviteAccept(e, invite)
-                }
-                loading={submitState.loading}
-              >
-                Accept Invite
-              </Button>
-
-              <Button
-                variant="outlined"
-                color="secondary"
-                sx={{
-                  color: 'common.white',
-                  '&:hover': {
-                    backgroundColor: (theme) =>
-                      alpha(theme.palette.common.white, 0.05),
-                  },
-                  '&:focus': {
-                    backgroundColor: (theme) =>
-                      alpha(theme.palette.common.white, 0.1),
-                  },
-                }}
-                onClick={() => handleIgnoreInvitation(invite.id)}
-                loading={ignoreState.loading}
-              >
-                Ignore Invite
-              </Button>
-            </div>
-          </div>
-        ),
-      )}
-    </Box>
-  );
-}

dashboard/src/components/common/InviteNotification/index.ts

@@ -1 +0,0 @@
-export { default as InviteNotification } from './InviteNotification';

dashboard/src/components/common/MfaOtpForm/MfaOtpForm.tsx

@@ -0,0 +1,61 @@
+import { Button } from '@/components/ui/v3/button';
+import { Input } from '@/components/ui/v3/input';
+import { type ChangeEvent, useEffect, useRef, useState } from 'react';
+
+interface Props {
+  sendMfaOtp: (code: string) => Promise<any>;
+  loading: boolean;
+}
+
+function MfaOtpForm({ sendMfaOtp, loading }: Props) {
+  const [otpValue, setOtpValue] = useState<string>('');
+  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  useEffect(() => {
+    if (inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, []);
+
+  async function sendMfa(code: string) {
+    if (code.length === 6 && !isSubmitting) {
+      setIsSubmitting(true);
+      const result = await sendMfaOtp(code);
+      if (!result) {
+        setTimeout(() => {
+          inputRef.current?.focus();
+        }, 10);
+      }
+    }
+    setIsSubmitting(false);
+  }
+
+  async function handleChange(event: ChangeEvent<HTMLInputElement>) {
+    const code = event.target.value.replace(/[^0-9]/g, '').slice(0, 6);
+    setOtpValue(code);
+
+    sendMfa(code);
+  }
+
+  const isInputDisabled = loading || isSubmitting;
+  const isButtonDisabled = isInputDisabled || otpValue.length !== 6;
+
+  return (
+    <div className="relative grid w-full grid-flow-row gap-4 bg-transparent">
+      <Input
+        ref={inputRef}
+        value={otpValue}
+        placeholder="Enter TOTP"
+        className="!bg-transparent"
+        disabled={isInputDisabled}
+        onChange={handleChange}
+      />
+      <Button disabled={isButtonDisabled}>
+        {loading ? 'Verifying...' : 'Verify'}
+      </Button>
+    </div>
+  );
+}
+
+export default MfaOtpForm;

dashboard/src/components/common/MfaOtpForm/index.ts

@@ -0,0 +1 @@
+export { default as MfaOtpForm } from './MfaOtpForm';

dashboard/src/components/common/OpenTransferDialogButton/OpenTransferDialogButton.tsx

@@ -0,0 +1,40 @@
+import { useDialog } from '@/components/common/DialogProvider';
+import { Button } from '@/components/ui/v2/Button';
+import { Text } from '@/components/ui/v2/Text';
+import { useIsCurrentUserOwner } from '@/features/orgs/projects/common/hooks/useIsCurrentUserOwner';
+
+interface Props {
+  buttonText?: string;
+  onClick?: () => void;
+}
+
+function OpenTransferDialogButton({ buttonText, onClick }: Props) {
+  const text = buttonText ?? 'Transfer Project';
+  const isOwner = useIsCurrentUserOwner();
+  const { openAlertDialog } = useDialog();
+  const handleClick = () => {
+    if (isOwner) {
+      onClick();
+    } else {
+      openAlertDialog({
+        title: "You can't migrate this project",
+        payload: (
+          <Text variant="subtitle1" component="span">
+            Ask an owner of this organization to migrate the project.
+          </Text>
+        ),
+        props: {
+          secondaryButtonText: 'I understand',
+          hidePrimaryAction: true,
+        },
+      });
+    }
+  };
+  return (
+    <Button className="max-w-xs lg:w-auto" onClick={handleClick}>
+      {text}
+    </Button>
+  );
+}
+
+export default OpenTransferDialogButton;

dashboard/src/components/common/OpenTransferDialogButton/index.ts

@@ -0,0 +1 @@
+export { default as OpenTransferDialogButton } from './OpenTransferDialogButton';

dashboard/src/components/common/SelectOrg/SelectOrg.tsx

@@ -0,0 +1,128 @@
+import { RetryableErrorBoundary } from '@/components/presentational/RetryableErrorBoundary';
+import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
+import { Box } from '@/components/ui/v2/Box';
+import { Button } from '@/components/ui/v2/Button';
+import { Input } from '@/components/ui/v2/Input';
+import { List } from '@/components/ui/v2/List';
+import { ListItem } from '@/components/ui/v2/ListItem';
+import { Text } from '@/components/ui/v2/Text';
+import { useOrgs } from '@/features/orgs/projects/hooks/useOrgs';
+import {} from '@/utils/__generated__/graphql';
+import { Divider } from '@mui/material';
+import debounce from 'lodash.debounce';
+import Image from 'next/image';
+import { useRouter } from 'next/router';
+import type { ChangeEvent } from 'react';
+import { Fragment, useEffect, useMemo, useState } from 'react';
+
+export default function SelectOrganizationAndProject() {
+  const { orgs, loading } = useOrgs();
+  const router = useRouter();
+
+  const organizations = orgs.map((org) => ({
+    name: org.name,
+    value: `/orgs/${org.slug}`,
+  }));
+
+  const [filter, setFilter] = useState('');
+
+  const handleFilterChange = useMemo(
+    () =>
+      debounce((event: ChangeEvent<HTMLInputElement>) => {
+        setFilter(event.target.value);
+      }, 200),
+    [],
+  );
+
+  useEffect(() => () => handleFilterChange.cancel(), [handleFilterChange]);
+
+  const goToOrgPage = async (org: { name: string; value: string }) => {
+    const { slug } = router.query;
+    await router.push({
+      pathname: `${org.value}/${(() => {
+        if (!slug) {
+          return '';
+        }
+        return Array.isArray(slug) ? slug.join('/') : slug;
+      })()}`,
+    });
+  };
+
+  const orgsToDisplay = filter
+    ? organizations.filter((org) =>
+        org.name.toLowerCase().includes(filter.toLowerCase()),
+      )
+    : organizations;
+
+  if (loading) {
+    return (
+      <div className="flex w-full justify-center">
+        <ActivityIndicator delay={500} label="Loading organizations..." />
+      </div>
+    );
+  }
+
+  return (
+    <div className="mx-auto flex h-full w-full flex-col items-start bg-background px-5 py-4">
+      <div className="mx-auto flex h-full w-full max-w-[760px] flex-col gap-4 py-6 sm:py-14">
+        <Text variant="h2" component="h1" className="">
+          Select an Organization
+        </Text>
+
+        <div>
+          <div className="mb-2 flex w-full">
+            <Input
+              placeholder="Search..."
+              onChange={handleFilterChange}
+              fullWidth
+              autoFocus
+            />
+          </div>
+          <RetryableErrorBoundary>
+            {orgsToDisplay.length === 0 ? (
+              <Box className="h-import py-2">
+                <Text variant="subtitle2">No results found.</Text>
+              </Box>
+            ) : (
+              <List className="h-import overflow-y-auto">
+                {orgsToDisplay.map((org, index) => (
+                  <Fragment key={org.value}>
+                    <ListItem.Root
+                      className="grid grid-flow-col justify-start gap-2 py-2.5"
+                      secondaryAction={
+                        <Button
+                          variant="borderless"
+                          color="primary"
+                          onClick={() => goToOrgPage(org)}
+                        >
+                          Select
+                        </Button>
+                      }
+                    >
+                      <ListItem.Avatar>
+                        <span className="inline-block h-6 w-6 overflow-hidden rounded-md">
+                          <Image
+                            src="/logos/new.svg"
+                            alt="Nhost Logo"
+                            width={24}
+                            height={24}
+                          />
+                        </span>
+                      </ListItem.Avatar>
+                      <ListItem.Text
+                        primary={org.name}
+                        secondary={`${org.name} / ${org.name}`}
+                      />
+                    </ListItem.Root>
+
+                    {index < orgs.length - 1 && <Divider component="li" />}
+                  </Fragment>
+                ))}
+              </List>
+            )}
+          </RetryableErrorBoundary>
+        </div>
+      </div>
+    </div>
+  );
+}

dashboard/src/components/common/SelectOrg/index.ts

@@ -0,0 +1 @@
+export { default as SelectOrg } from './SelectOrg';

dashboard/src/components/common/SelectOrgAndProject/SelectOrgAndProject.tsx

@@ -1,5 +1,3 @@
-import { AuthenticatedLayout } from '@/components/layout/AuthenticatedLayout';
-import { Container } from '@/components/layout/Container';
 import { RetryableErrorBoundary } from '@/components/presentational/RetryableErrorBoundary';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Box } from '@/components/ui/v2/Box';
@@ -8,38 +6,23 @@ import { Input } from '@/components/ui/v2/Input';
 import { List } from '@/components/ui/v2/List';
 import { ListItem } from '@/components/ui/v2/ListItem';
 import { Text } from '@/components/ui/v2/Text';
-import {
-  useGetAllWorkspacesAndProjectsQuery,
-  type GetAllWorkspacesAndProjectsQuery,
-} from '@/utils/__generated__/graphql';
+import { useOrgs } from '@/features/orgs/projects/hooks/useOrgs';
 import { Divider } from '@mui/material';
-import { useUserData } from '@nhost/nextjs';
 import debounce from 'lodash.debounce';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import type { ChangeEvent, ReactElement } from 'react';
+import type { ChangeEvent } from 'react';
 import { Fragment, useEffect, useMemo, useState } from 'react';
 
-type Workspace = Omit<
-  GetAllWorkspacesAndProjectsQuery['workspaces'][0],
-  '__typename'
->;
-
-export default function SelectWorkspaceAndProject() {
-  const user = useUserData();
+export default function SelectOrganizationAndProject() {
+  const { orgs, loading } = useOrgs();
   const router = useRouter();
 
-  const { data, loading } = useGetAllWorkspacesAndProjectsQuery({
-    skip: !user,
-  });
-
-  const workspaces: Workspace[] = data?.workspaces || [];
-
-  const projects = workspaces.flatMap((workspace) =>
-    workspace.projects.map((project) => ({
-      workspaceName: workspace.name,
-      projectName: project.name,
-      value: `${workspace.slug}/${project.slug}`,
+  const projects = orgs.flatMap((org) =>
+    org.apps.map((app) => ({
+      organizationName: org.name,
+      projectName: app.name,
+      value: `/orgs/${org.slug}/projects/${app.subdomain}`,
     })),
   );
 
@@ -56,16 +39,18 @@ export default function SelectWorkspaceAndProject() {
   useEffect(() => () => handleFilterChange.cancel(), [handleFilterChange]);
 
   const goToProjectPage = async (project: {
-    workspaceName: string;
+    organizationName: string;
     projectName: string;
     value: string;
   }) => {
     const { slug } = router.query;
-
     await router.push({
-      pathname: `/${project.value}/${
-        Array.isArray(slug) ? slug.join('/') : slug
-      }`,
+      pathname: `${project.value}/${(() => {
+        if (!slug) {
+          return '';
+        }
+        return Array.isArray(slug) ? slug.join('/') : slug;
+      })()}`,
     });
   };
 
@@ -80,15 +65,15 @@ export default function SelectWorkspaceAndProject() {
       <div className="flex w-full justify-center">
         <ActivityIndicator
           delay={500}
-          label="Loading workspaces and projects..."
+          label="Loading organizations and projects..."
         />
       </div>
     );
   }
 
   return (
-    <Container>
-      <div className="mx-auto grid max-w-[760px] grid-flow-row gap-4 py-6 sm:py-14">
+    <div className="mx-auto flex h-full w-full flex-col items-start bg-background px-5 py-4">
+      <div className="mx-auto flex h-full w-full max-w-[760px] flex-col gap-4 py-6 sm:py-14">
         <Text variant="h2" component="h1" className="">
           Select a Project
         </Text>
@@ -112,7 +97,7 @@ export default function SelectWorkspaceAndProject() {
                 {projectsToDisplay.map((project, index) => (
                   <Fragment key={project.value}>
                     <ListItem.Root
-                      className="grid grid-flow-col justify-start gap-2  py-2.5"
+                      className="grid grid-flow-col justify-start gap-2 py-2.5"
                       secondaryAction={
                         <Button
                           variant="borderless"
@@ -135,7 +120,7 @@ export default function SelectWorkspaceAndProject() {
                       </ListItem.Avatar>
                       <ListItem.Text
                         primary={project.projectName}
-                        secondary={`${project.workspaceName} / ${project.projectName}`}
+                        secondary={`${project.organizationName} / ${project.projectName}`}
                       />
                     </ListItem.Root>
 
@@ -147,12 +132,6 @@ export default function SelectWorkspaceAndProject() {
           </RetryableErrorBoundary>
         </div>
       </div>
-    </Container>
+    </div>
   );
 }
-
-SelectWorkspaceAndProject.getLayout = function getLayout(page: ReactElement) {
-  return (
-    <AuthenticatedLayout title="Select a Project">{page}</AuthenticatedLayout>
-  );
-};

dashboard/src/components/common/SelectOrgAndProject/index.ts

@@ -0,0 +1,2 @@
+
+export { default as SelectOrgAndProject } from './SelectOrgAndProject';

dashboard/src/components/common/TimePicker/TimePicker.test.tsx

@@ -0,0 +1,104 @@
+import { render, screen, TestUserEvent } from '@/tests/testUtils';
+import { guessTimezone } from '@/utils/timezoneUtils';
+import { TZDate } from '@date-fns/tz';
+import { parseISO } from 'date-fns';
+import { format } from 'date-fns-v4';
+import { useState } from 'react';
+import TimePicker from './TimePicker';
+
+function TestComponent({
+  dateTime,
+  withTimezone,
+}: {
+  dateTime: string;
+  withTimezone?: boolean;
+}) {
+  const [date, setDate] = useState(() => {
+    if (withTimezone) {
+      const tz = guessTimezone();
+      return new TZDate(dateTime, tz);
+    }
+    return parseISO(dateTime);
+  });
+
+  return (
+    <>
+      <h1>Time: {format(date, 'HH:mm:ss')}</h1>
+      <h1>Date class: {date instanceof TZDate ? 'TZDate' : 'Date'}</h1>
+      <TimePicker date={date} setDate={setDate} />
+    </>
+  );
+}
+describe('TimePicker', () => {
+  test('Updates only the hour of the date object', async () => {
+    render(<TestComponent dateTime="2025-03-10T03:00:05" />);
+    expect(await screen.getByText(/Time:/i)).toHaveTextContent(
+      'Time: 03:00:05',
+    );
+    const user = new TestUserEvent();
+    const hoursInput = await screen.getByLabelText('Hours');
+    await user.type(hoursInput, '18');
+    expect(await screen.getByText(/Time:/i)).toHaveTextContent(
+      'Time: 18:00:05',
+    );
+  });
+
+  test('only valid hours(0-23), minutes(0-59) and seconds(0-59) are allowed', async () => {
+    render(<TestComponent dateTime="2025-03-10T03:00:05" />);
+    const user = new TestUserEvent();
+    const hoursInput = await screen.getByLabelText('Hours');
+    await user.type(hoursInput, '30');
+    expect(await screen.getByText(/Time:/i)).toHaveTextContent(
+      'Time: 23:00:05',
+    );
+    const minutesInput = await screen.getByLabelText('Minutes');
+    await user.type(minutesInput, '66');
+    expect(await screen.getByText(/Time:/i)).toHaveTextContent(
+      'Time: 23:59:05',
+    );
+  });
+
+  test('Updates only the minutes of the date object', async () => {
+    render(<TestComponent dateTime="2025-03-10T03:00:05" />);
+    const user = new TestUserEvent();
+    const minutesInput = await screen.getByLabelText('Minutes');
+    await user.type(minutesInput, '44');
+    expect(await screen.getByText(/Time:/i)).toHaveTextContent(
+      'Time: 03:44:05',
+    );
+  });
+
+  test('Updates only the seconds of the date object', async () => {
+    render(<TestComponent dateTime="2025-03-10T03:00:05" />);
+    const user = new TestUserEvent();
+    const secondsInput = await screen.getByLabelText('Seconds');
+    await user.type(secondsInput, '11');
+    expect(await screen.getByText(/Time:/i)).toHaveTextContent(
+      'Time: 03:00:11',
+    );
+  });
+
+  test("will preserve the date's class after changing the date", async () => {
+    render(<TestComponent dateTime="2025-03-10T03:00:05" withTimezone />);
+    expect(await screen.getByText(/Date class:/i)).toHaveTextContent(
+      'Date class: TZDate',
+    );
+    const user = new TestUserEvent();
+
+    const hoursInput = await screen.getByLabelText('Hours');
+    await user.type(hoursInput, '18');
+    expect(await screen.getByText(/Date class:/i)).toHaveTextContent(
+      'Date class: TZDate',
+    );
+    const secondsInput = await screen.getByLabelText('Seconds');
+    await user.type(secondsInput, '11');
+    expect(await screen.getByText(/Date class:/i)).toHaveTextContent(
+      'Date class: TZDate',
+    );
+    const minutesInput = await screen.getByLabelText('Minutes');
+    await user.type(minutesInput, '44');
+    expect(await screen.getByText(/Date class:/i)).toHaveTextContent(
+      'Date class: TZDate',
+    );
+  });
+});

dashboard/src/components/common/TimePicker/TimePicker.tsx

@@ -0,0 +1,64 @@
+'use client';
+
+import { Label } from '@/components/ui/v3/label';
+import { Clock } from 'lucide-react';
+import * as React from 'react';
+import { TimePickerInput } from './TimePickerInput';
+
+interface TimePickerProps {
+  date: Date | undefined;
+  setDate: (date: Date | undefined) => void;
+}
+
+function TimePicker({ date, setDate }: TimePickerProps) {
+  const minuteRef = React.useRef<HTMLInputElement>(null);
+  const hourRef = React.useRef<HTMLInputElement>(null);
+  const secondRef = React.useRef<HTMLInputElement>(null);
+
+  return (
+    <div className="flex items-end gap-2">
+      <div className="grid gap-1 text-center">
+        <Label htmlFor="hours" className="text-xs">
+          Hours
+        </Label>
+        <TimePickerInput
+          picker="hours"
+          date={date}
+          setDate={setDate}
+          ref={hourRef}
+          onRightFocus={() => minuteRef.current?.focus()}
+        />
+      </div>
+      <div className="grid gap-1 text-center">
+        <Label htmlFor="minutes" className="text-xs">
+          Minutes
+        </Label>
+        <TimePickerInput
+          picker="minutes"
+          date={date}
+          setDate={setDate}
+          ref={minuteRef}
+          onLeftFocus={() => hourRef.current?.focus()}
+          onRightFocus={() => secondRef.current?.focus()}
+        />
+      </div>
+      <div className="grid gap-1 text-center">
+        <Label htmlFor="seconds" className="text-xs">
+          Seconds
+        </Label>
+        <TimePickerInput
+          picker="seconds"
+          date={date}
+          setDate={setDate}
+          ref={secondRef}
+          onLeftFocus={() => minuteRef.current?.focus()}
+        />
+      </div>
+      <div className="flex h-10 items-center">
+        <Clock className="ml-2 h-4 w-4" />
+      </div>
+    </div>
+  );
+}
+
+export default TimePicker;

dashboard/src/components/common/TimePicker/TimePickerInput.tsx

@@ -0,0 +1,148 @@
+import { Input } from '@/components/ui/v3/input';
+
+import { cn } from '@/lib/utils';
+import React from 'react';
+import {
+  copyDate,
+  getArrowByType,
+  getDateByType,
+  setDateByType,
+  type Period,
+  type TimePickerType,
+} from './time-picker-utils';
+
+export interface TimePickerInputProps
+  extends React.InputHTMLAttributes<HTMLInputElement> {
+  picker: TimePickerType;
+  date: Date | undefined;
+  setDate: (date: Date | undefined) => void;
+  period?: Period;
+  onRightFocus?: () => void;
+  onLeftFocus?: () => void;
+}
+
+const TimePickerInput = React.forwardRef<
+  HTMLInputElement,
+  TimePickerInputProps
+>(
+  (
+    {
+      className,
+      type = 'tel',
+      value,
+      id,
+      name,
+      date = new Date(new Date().setHours(0, 0, 0, 0)),
+      setDate,
+      onChange,
+      onKeyDown,
+      picker,
+      period,
+      onLeftFocus,
+      onRightFocus,
+      ...props
+    },
+    ref,
+  ) => {
+    const [flag, setFlag] = React.useState<boolean>(false);
+    const [prevIntKey, setPrevIntKey] = React.useState<string>('0');
+
+    /**
+     * allow the user to enter the second digit within 2 seconds
+     * otherwise start again with entering first digit
+     */
+    // eslint-disable-next-line consistent-return
+    React.useEffect(() => {
+      if (flag) {
+        const timer = setTimeout(() => {
+          setFlag(false);
+        }, 2000);
+
+        return () => clearTimeout(timer);
+      }
+    }, [flag]);
+
+    const calculatedValue = React.useMemo(
+      () => getDateByType(date, picker),
+      [date, picker],
+    );
+
+    const calculateNewValue = (key: string) => {
+      /*
+       * If picker is '12hours' and the first digit is 0, then the second digit is automatically set to 1.
+       * The second entered digit will break the condition and the value will be set to 10-12.
+       */
+      if (picker === '12hours') {
+        if (flag && calculatedValue.slice(1, 2) === '1' && prevIntKey === '0') {
+          return `0${key}`;
+        }
+      }
+
+      return !flag ? `0${key}` : calculatedValue.slice(1, 2) + key;
+    };
+
+    const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Tab') {
+        return;
+      }
+      e.preventDefault();
+      if (e.key === 'ArrowRight') {
+        onRightFocus?.();
+      }
+      if (e.key === 'ArrowLeft') {
+        onLeftFocus?.();
+      }
+      if (['ArrowUp', 'ArrowDown'].includes(e.key)) {
+        const step = e.key === 'ArrowUp' ? 1 : -1;
+        const newValue = getArrowByType(calculatedValue, step, picker);
+        if (flag) {
+          setFlag(false);
+        }
+
+        const tempDate = copyDate(date);
+        setDate(setDateByType(tempDate, newValue, picker, period));
+      }
+      if (e.key >= '0' && e.key <= '9') {
+        if (picker === '12hours') {
+          setPrevIntKey(e.key);
+        }
+
+        const newValue = calculateNewValue(e.key);
+        if (flag) {
+          onRightFocus?.();
+        }
+        setFlag((prev) => !prev);
+        const tempDate = copyDate(date);
+        setDate(setDateByType(tempDate, newValue, picker, period));
+      }
+    };
+
+    return (
+      <Input
+        ref={ref}
+        id={id || picker}
+        name={name || picker}
+        className={cn(
+          'w-[48px] text-center font-mono text-base tabular-nums focus:bg-accent focus:text-accent-foreground [&::-webkit-inner-spin-button]:appearance-none',
+          className,
+        )}
+        value={value || calculatedValue}
+        onChange={(e) => {
+          e.preventDefault();
+          onChange?.(e);
+        }}
+        type={type}
+        inputMode="decimal"
+        onKeyDown={(e) => {
+          onKeyDown?.(e);
+          handleKeyDown(e);
+        }}
+        {...props}
+      />
+    );
+  },
+);
+
+TimePickerInput.displayName = 'TimePickerInput';
+
+export { TimePickerInput };

dashboard/src/components/common/TimePicker/index.ts

@@ -0,0 +1 @@
+export { default as TimePicker } from './TimePicker';

dashboard/src/components/common/TimePicker/time-picker-utils.test.ts

@@ -0,0 +1,336 @@
+import { vi } from 'vitest';
+import {
+  convert12HourTo24Hour,
+  display12HourValue,
+  getArrowByType,
+  getDateByType,
+  getValid12Hour,
+  getValidArrow12Hour,
+  getValidArrowHour,
+  getValidArrowMinuteOrSecond,
+  getValidArrowNumber,
+  getValidHour,
+  getValidMinuteOrSecond,
+  getValidNumber,
+  isValid12Hour,
+  isValidHour,
+  isValidMinuteOrSecond,
+  set12Hours,
+  setDateByType,
+  setHours,
+  setMinutes,
+  setSeconds,
+  type TimePickerType,
+} from './time-picker-utils';
+
+// Mock TZDate if needed
+vi.mock('@date-fns/tz', () => ({
+  TZDate: class MockTZDate extends Date {
+    timeZone: string;
+
+    constructor(date: string | Date, timeZone: string) {
+      super(date);
+      this.timeZone = timeZone;
+    }
+  },
+}));
+
+describe('time-picker-utils', () => {
+  describe('validation functions', () => {
+    test('isValidHour validates hour format correctly', () => {
+      // Valid hours
+      expect(isValidHour('00')).toBe(true);
+      expect(isValidHour('01')).toBe(true);
+      expect(isValidHour('12')).toBe(true);
+      expect(isValidHour('23')).toBe(true);
+
+      // Invalid hours
+      expect(isValidHour('24')).toBe(false);
+      expect(isValidHour('-1')).toBe(false);
+      expect(isValidHour('1')).toBe(false); // not padded
+      expect(isValidHour('ab')).toBe(false);
+    });
+
+    test('isValid12Hour validates 12-hour format correctly', () => {
+      // Valid 12-hour values
+      expect(isValid12Hour('01')).toBe(true);
+      expect(isValid12Hour('09')).toBe(true);
+      expect(isValid12Hour('12')).toBe(true);
+
+      // Invalid 12-hour values
+      expect(isValid12Hour('00')).toBe(false);
+      expect(isValid12Hour('13')).toBe(false);
+      expect(isValid12Hour('1')).toBe(false); // not padded
+      expect(isValid12Hour('ab')).toBe(false);
+    });
+
+    test('isValidMinuteOrSecond validates minute/second format correctly', () => {
+      // Valid minutes/seconds
+      expect(isValidMinuteOrSecond('00')).toBe(true);
+      expect(isValidMinuteOrSecond('01')).toBe(true);
+      expect(isValidMinuteOrSecond('30')).toBe(true);
+      expect(isValidMinuteOrSecond('59')).toBe(true);
+
+      // Invalid minutes/seconds
+      expect(isValidMinuteOrSecond('60')).toBe(false);
+      expect(isValidMinuteOrSecond('-1')).toBe(false);
+      expect(isValidMinuteOrSecond('1')).toBe(false); // not padded
+      expect(isValidMinuteOrSecond('ab')).toBe(false);
+    });
+  });
+
+  describe('number validation and correction functions', () => {
+    test('getValidNumber handles number validation correctly', () => {
+      // Basic validation
+      expect(getValidNumber('5', { max: 10 })).toBe('05');
+      expect(getValidNumber('15', { max: 10 })).toBe('10');
+      expect(getValidNumber('-1', { max: 10, min: 0 })).toBe('00');
+
+      // With looping
+      expect(getValidNumber('15', { max: 10, min: 0, loop: true })).toBe('00');
+      expect(getValidNumber('-1', { max: 10, min: 0, loop: true })).toBe('10');
+
+      // Invalid input
+      expect(getValidNumber('abc', { max: 10 })).toBe('00');
+    });
+
+    test('getValidHour returns valid 24-hour format', () => {
+      expect(getValidHour('12')).toBe('12');
+      expect(getValidHour('23')).toBe('23');
+      expect(getValidHour('24')).toBe('23'); // Capped at 23
+      expect(getValidHour('-1')).toBe('00'); // Min is 0
+      expect(getValidHour('abc')).toBe('00'); // Invalid input
+    });
+
+    test('getValid12Hour returns valid 12-hour format', () => {
+      // expect(getValid12Hour('06')).toBe('06');
+      // expect(getValid12Hour('12')).toBe('12');
+      expect(getValid12Hour('00')).toBe('01'); // Min is 1
+      expect(getValid12Hour('13')).toBe('12'); // Capped at 12
+      expect(getValid12Hour('abc')).toBe('00'); // Invalid input defaults to 00
+    });
+
+    test('getValidMinuteOrSecond returns valid minute/second format', () => {
+      expect(getValidMinuteOrSecond('30')).toBe('30');
+      expect(getValidMinuteOrSecond('59')).toBe('59');
+      expect(getValidMinuteOrSecond('60')).toBe('59'); // Capped at 59
+      expect(getValidMinuteOrSecond('-1')).toBe('00'); // Min is 0
+      expect(getValidMinuteOrSecond('abc')).toBe('00'); // Invalid input
+    });
+  });
+
+  describe('arrow navigation functions', () => {
+    test('getValidArrowNumber handles arrow navigation with looping', () => {
+      // Incrementing
+      expect(getValidArrowNumber('05', { min: 0, max: 10, step: 1 })).toBe(
+        '06',
+      );
+      expect(getValidArrowNumber('10', { min: 0, max: 10, step: 1 })).toBe(
+        '00',
+      ); // Loops back to min
+
+      // Decrementing
+      expect(getValidArrowNumber('05', { min: 0, max: 10, step: -1 })).toBe(
+        '04',
+      );
+      expect(getValidArrowNumber('00', { min: 0, max: 10, step: -1 })).toBe(
+        '10',
+      ); // Loops to max
+
+      // Invalid input
+      expect(getValidArrowNumber('abc', { min: 0, max: 10, step: 1 })).toBe(
+        '00',
+      );
+    });
+
+    test('getValidArrowHour handles hour navigation correctly', () => {
+      expect(getValidArrowHour('05', 1)).toBe('06');
+      expect(getValidArrowHour('23', 1)).toBe('00'); // Loops to 0
+      expect(getValidArrowHour('00', -1)).toBe('23'); // Loops to 23
+    });
+
+    test('getValidArrow12Hour handles 12-hour navigation correctly', () => {
+      expect(getValidArrow12Hour('05', 1)).toBe('06');
+      expect(getValidArrow12Hour('12', 1)).toBe('01'); // Loops to 1
+      expect(getValidArrow12Hour('01', -1)).toBe('12'); // Loops to 12
+    });
+
+    test('getValidArrowMinuteOrSecond handles minute/second navigation correctly', () => {
+      expect(getValidArrowMinuteOrSecond('30', 1)).toBe('31');
+      expect(getValidArrowMinuteOrSecond('59', 1)).toBe('00'); // Loops to 0
+      expect(getValidArrowMinuteOrSecond('00', -1)).toBe('59'); // Loops to 59
+    });
+  });
+
+  describe('date manipulation functions', () => {
+    test('setMinutes sets minutes correctly on a Date object', () => {
+      const date = new Date(2023, 0, 1, 12, 0, 0);
+      setMinutes(date, '30');
+      expect(date.getMinutes()).toBe(30);
+
+      // Invalid values are corrected
+      setMinutes(date, '60');
+      expect(date.getMinutes()).toBe(59);
+    });
+
+    test('setSeconds sets seconds correctly on a Date object', () => {
+      const date = new Date(2023, 0, 1, 12, 30, 0);
+      setSeconds(date, '45');
+      expect(date.getSeconds()).toBe(45);
+
+      // Invalid values are corrected
+      setSeconds(date, '60');
+      expect(date.getSeconds()).toBe(59);
+    });
+
+    test('setHours sets hours correctly on a Date object', () => {
+      const date = new Date(2023, 0, 1, 12, 30, 0);
+      setHours(date, '14');
+      expect(date.getHours()).toBe(14);
+
+      // Invalid values are corrected
+      setHours(date, '24');
+      expect(date.getHours()).toBe(23);
+    });
+
+    test('convert12HourTo24Hour converts 12-hour to 24-hour format correctly', () => {
+      // AM conversions
+      expect(convert12HourTo24Hour(1, 'AM')).toBe(1);
+      expect(convert12HourTo24Hour(11, 'AM')).toBe(11);
+      expect(convert12HourTo24Hour(12, 'AM')).toBe(0); // 12 AM is 00:00
+
+      // PM conversions
+      expect(convert12HourTo24Hour(1, 'PM')).toBe(13);
+      expect(convert12HourTo24Hour(11, 'PM')).toBe(23);
+      expect(convert12HourTo24Hour(12, 'PM')).toBe(12); // 12 PM is 12:00
+    });
+
+    test('set12Hours sets 12-hour format correctly on a Date object', () => {
+      const date = new Date(2023, 0, 1, 0, 0, 0);
+
+      // Morning hours (AM)
+      set12Hours(date, '09', 'AM');
+      expect(date.getHours()).toBe(9);
+
+      // 12 AM
+      set12Hours(date, '12', 'AM');
+      expect(date.getHours()).toBe(0);
+
+      // Afternoon/evening hours (PM)
+      set12Hours(date, '03', 'PM');
+      expect(date.getHours()).toBe(15);
+
+      // 12 PM
+      set12Hours(date, '12', 'PM');
+      expect(date.getHours()).toBe(12);
+    });
+
+    test('display12HourValue converts 24-hour to 12-hour display format', () => {
+      expect(display12HourValue(0)).toBe('12'); // 00:00 -> 12 AM
+      expect(display12HourValue(1)).toBe('01'); // 01:00 -> 1 AM
+      expect(display12HourValue(11)).toBe('11'); // 11:00 -> 11 AM
+      expect(display12HourValue(12)).toBe('12'); // 12:00 -> 12 PM
+      expect(display12HourValue(13)).toBe('01'); // 13:00 -> 1 PM
+      expect(display12HourValue(23)).toBe('11'); // 23:00 -> 11 PM
+      expect(display12HourValue(22)).toBe('10'); // 22:00 -> 10 PM
+    });
+  });
+  describe('integrated date manipulation functions', () => {
+    test('getDateByType returns date component according to the picker type', () => {
+      const date = new Date(2023, 0, 1, 14, 30, 45);
+
+      // Test hours
+      expect(getDateByType(date, 'hours')).toBe('14');
+
+      // Test minutes
+      expect(getDateByType(date, 'minutes')).toBe('30');
+
+      // Test seconds
+      expect(getDateByType(date, 'seconds')).toBe('45');
+
+      // Test 12-hour format
+      expect(getDateByType(date, '12hours')).toBe('02'); // 14:00 -> 2 PM
+
+      // Test 12 noon and midnight special cases
+      const noon = new Date(2023, 0, 1, 12, 0, 0);
+      expect(getDateByType(noon, '12hours')).toBe('12');
+
+      const midnight = new Date(2023, 0, 1, 0, 0, 0);
+      expect(getDateByType(midnight, '12hours')).toBe('12');
+
+      // Test with invalid picker type
+      expect(getDateByType(date, 'invalid' as TimePickerType)).toBe('00');
+    });
+
+    test('getArrowByType handles arrow navigation based on picker type', () => {
+      // Test hours
+      expect(getArrowByType('14', 1, 'hours')).toBe('15');
+      expect(getArrowByType('23', 1, 'hours')).toBe('00'); // Loops back to 00
+
+      // Test minutes
+      expect(getArrowByType('30', 1, 'minutes')).toBe('31');
+      expect(getArrowByType('59', 1, 'minutes')).toBe('00'); // Loops back to 00
+
+      // Test seconds
+      expect(getArrowByType('45', 1, 'seconds')).toBe('46');
+      expect(getArrowByType('59', 1, 'seconds')).toBe('00'); // Loops back to 00
+
+      // Test 12-hour format
+      expect(getArrowByType('09', 1, '12hours')).toBe('10');
+      expect(getArrowByType('12', 1, '12hours')).toBe('01'); // Loops back to 01
+
+      // Test with invalid picker type
+      expect(getArrowByType('14', 1, 'invalid' as TimePickerType)).toBe('00');
+    });
+
+    test('setDateByType updates date according to the picker type', () => {
+      const date = new Date(2023, 0, 1, 12, 30, 45);
+
+      // Test updating hours
+      const hourDate = setDateByType(date, '14', 'hours');
+      expect(hourDate.getHours()).toBe(14);
+      expect(hourDate.getMinutes()).toBe(30); // Other fields unchanged
+      expect(hourDate.getSeconds()).toBe(45); // Other fields unchanged
+
+      // Test updating minutes
+      const minuteDate = setDateByType(date, '15', 'minutes');
+      expect(minuteDate.getHours()).toBe(14); // Other fields unchanged
+      expect(minuteDate.getMinutes()).toBe(15);
+      expect(minuteDate.getSeconds()).toBe(45); // Other fields unchanged
+
+      // Test updating seconds
+      const secondDate = setDateByType(date, '20', 'seconds');
+      expect(secondDate.getHours()).toBe(14); // Other fields unchanged
+      expect(secondDate.getMinutes()).toBe(15); // Other fields unchanged
+      expect(secondDate.getSeconds()).toBe(20);
+
+      // Test updating 12-hour format with AM
+      const amDate = setDateByType(date, '09', '12hours', 'AM');
+      expect(amDate.getHours()).toBe(9);
+
+      // Test updating 12-hour format with PM
+      const pmDate = setDateByType(date, '09', '12hours', 'PM');
+      expect(pmDate.getHours()).toBe(21);
+
+      // Test 12 AM (midnight)
+      const midnightDate = setDateByType(date, '12', '12hours', 'AM');
+      expect(midnightDate.getHours()).toBe(0);
+
+      // Test 12 PM (noon)
+      const noonDate = setDateByType(date, '12', '12hours', 'PM');
+      expect(noonDate.getHours()).toBe(12);
+
+      // Test with missing period for 12-hour format
+      const missingPeriodDate = setDateByType(date, '09', '12hours');
+      expect(missingPeriodDate).toBe(date); // Should return original date unchanged
+
+      // Test with invalid picker type
+      const invalidTypeDate = setDateByType(
+        date,
+        '14',
+        'invalid' as TimePickerType,
+      );
+      expect(invalidTypeDate).toBe(date); // Should return original date unchanged
+    });
+  });
+});

dashboard/src/components/common/TimePicker/time-picker-utils.ts

@@ -0,0 +1,244 @@
+import { TZDate } from '@date-fns/tz';
+
+/**
+ * regular expression to check for valid hour format (01-23)
+ */
+export function isValidHour(value: string) {
+  return /^(0[0-9]|1[0-9]|2[0-3])$/.test(value);
+}
+
+/**
+ * regular expression to check for valid 12 hour format (01-12)
+ */
+export function isValid12Hour(value: string) {
+  return /^(0[1-9]|1[0-2])$/.test(value);
+}
+
+/**
+ * regular expression to check for valid minute format (00-59)
+ */
+export function isValidMinuteOrSecond(value: string) {
+  return /^[0-5][0-9]$/.test(value);
+}
+
+type GetValidNumberConfig = { max: number; min?: number; loop?: boolean };
+
+export function getValidNumber(
+  value: string,
+  { max, min = 0, loop = false }: GetValidNumberConfig,
+) {
+  let numericValue = parseInt(value, 10);
+
+  if (!Number.isNaN(numericValue)) {
+    if (!loop) {
+      if (numericValue > max) {
+        numericValue = max;
+      }
+      if (numericValue < min) {
+        numericValue = min;
+      }
+    } else {
+      if (numericValue > max) {
+        numericValue = min;
+      }
+      if (numericValue < min) {
+        numericValue = max;
+      }
+    }
+    return numericValue.toString().padStart(2, '0');
+  }
+
+  return '00';
+}
+
+export function getValidHour(value: string) {
+  if (isValidHour(value)) {
+    return value;
+  }
+  return getValidNumber(value, { max: 23 });
+}
+
+export function getValid12Hour(value: string) {
+  if (isValid12Hour(value)) {
+    return value;
+  }
+  return getValidNumber(value, { min: 1, max: 12 });
+}
+
+export function getValidMinuteOrSecond(value: string) {
+  if (isValidMinuteOrSecond(value)) {
+    return value;
+  }
+  return getValidNumber(value, { max: 59 });
+}
+
+type GetValidArrowNumberConfig = {
+  min: number;
+  max: number;
+  step: number;
+};
+
+export function getValidArrowNumber(
+  value: string,
+  { min, max, step }: GetValidArrowNumberConfig,
+) {
+  let numericValue = parseInt(value, 10);
+  if (!Number.isNaN(numericValue)) {
+    numericValue += step;
+    return getValidNumber(String(numericValue), { min, max, loop: true });
+  }
+  return '00';
+}
+
+export function getValidArrowHour(value: string, step: number) {
+  return getValidArrowNumber(value, { min: 0, max: 23, step });
+}
+
+export function getValidArrow12Hour(value: string, step: number) {
+  return getValidArrowNumber(value, { min: 1, max: 12, step });
+}
+
+export function getValidArrowMinuteOrSecond(value: string, step: number) {
+  return getValidArrowNumber(value, { min: 0, max: 59, step });
+}
+
+export function setMinutes(date: Date, value: string) {
+  const minutes = getValidMinuteOrSecond(value);
+  date.setMinutes(parseInt(minutes, 10));
+  return date;
+}
+
+export function setSeconds(date: Date, value: string) {
+  const seconds = getValidMinuteOrSecond(value);
+  date.setSeconds(parseInt(seconds, 10));
+  return date;
+}
+
+export function setHours(date: Date, value: string) {
+  const hours = getValidHour(value);
+  date.setHours(parseInt(hours, 10));
+  return date;
+}
+
+/**
+ * handles value change of 12-hour input
+ * 12:00 PM is 12:00
+ * 12:00 AM is 00:00
+ */
+export function convert12HourTo24Hour(hour: number, period: Period) {
+  if (period === 'PM') {
+    if (hour <= 11) {
+      return hour + 12;
+    }
+    return hour;
+  }
+  if (period === 'AM') {
+    if (hour === 12) {
+      return 0;
+    }
+    return hour;
+  }
+  return hour;
+}
+
+export function set12Hours(date: Date, value: string, period: Period) {
+  const hours = parseInt(getValid12Hour(value), 10);
+  const convertedHours = convert12HourTo24Hour(hours, period);
+  date.setHours(convertedHours);
+  return date;
+}
+
+export type TimePickerType = 'minutes' | 'seconds' | 'hours' | '12hours';
+export type Period = 'AM' | 'PM';
+
+export function setDateByType(
+  date: Date,
+  value: string,
+  type: TimePickerType,
+  period?: Period,
+) {
+  switch (type) {
+    case 'minutes':
+      return setMinutes(date, value);
+    case 'seconds':
+      return setSeconds(date, value);
+    case 'hours':
+      return setHours(date, value);
+    case '12hours': {
+      if (!period) {
+        return date;
+      }
+      return set12Hours(date, value, period);
+    }
+    default:
+      return date;
+  }
+}
+
+/**
+ * time is stored in the 24-hour form,
+ * but needs to be displayed to the user
+ * in its 12-hour representation
+ */
+export function display12HourValue(hours: number) {
+  if (hours === 0 || hours === 12) {
+    return '12';
+  }
+  if (hours >= 22) {
+    return `${hours - 12}`;
+  }
+  if (hours % 12 > 9) {
+    return `${hours}`;
+  }
+  return `0${hours % 12}`;
+}
+
+export function getDateByType(date: Date, type: TimePickerType) {
+  switch (type) {
+    case 'minutes':
+      return getValidMinuteOrSecond(String(date.getMinutes()));
+    case 'seconds':
+      return getValidMinuteOrSecond(String(date.getSeconds()));
+    case 'hours':
+      return getValidHour(String(date.getHours()));
+    case '12hours': {
+      const hours = display12HourValue(date.getHours());
+      return getValid12Hour(String(hours));
+    }
+    default:
+      return '00';
+  }
+}
+
+export function getArrowByType(
+  value: string,
+  step: number,
+  type: TimePickerType,
+) {
+  switch (type) {
+    case 'minutes':
+      return getValidArrowMinuteOrSecond(value, step);
+    case 'seconds':
+      return getValidArrowMinuteOrSecond(value, step);
+    case 'hours':
+      return getValidArrowHour(value, step);
+    case '12hours':
+      return getValidArrow12Hour(value, step);
+    default:
+      return '00';
+  }
+}
+
+export function isTZDate(date: Date | TZDate): date is TZDate {
+  return date instanceof TZDate;
+}
+
+export function copyDate(date: Date | TZDate) {
+  if (isTZDate(date)) {
+    const { timeZone } = date;
+    const dateTime = date.toISOString();
+    return new TZDate(dateTime, timeZone);
+  }
+
+  return new Date(date);
+}

dashboard/src/components/common/TimezonePicker/TimezonePicker.tsx

@@ -0,0 +1,56 @@
+import { VirtualizedCombobox } from '@/components/common/VirtualizedCombobox';
+import { createTimezoneOptions } from '@/utils/timezoneUtils';
+import { memo, useMemo } from 'react';
+
+interface Props {
+  selectedTimezone: string;
+  onTimezoneSelect: (timezone: { value: string; label: string }) => void;
+  button?: React.JSX.Element;
+  dateTime: string;
+}
+
+function getOrderedTimezones(dateTime: string, selectedTimezone: string) {
+  const [utcTimezone, browserTimezone, ...timezones] =
+    createTimezoneOptions(dateTime);
+  let orderedTimezones = [...timezones];
+  if (
+    selectedTimezone !== browserTimezone.value &&
+    selectedTimezone !== 'UTC'
+  ) {
+    const selectedTimezoneOption = timezones.find(
+      (tz) => tz.value === selectedTimezone,
+    );
+    orderedTimezones = [
+      selectedTimezoneOption,
+      ...timezones.filter((tz) => tz.value !== selectedTimezone),
+    ];
+  }
+
+  return [utcTimezone, browserTimezone, ...orderedTimezones];
+}
+
+function TimezonePicker({
+  selectedTimezone,
+  onTimezoneSelect,
+  button,
+  dateTime,
+}: Props) {
+  const timezoneOptions = useMemo(
+    () => getOrderedTimezones(dateTime, selectedTimezone),
+    [dateTime, selectedTimezone],
+  );
+
+  return (
+    <VirtualizedCombobox
+      options={timezoneOptions}
+      selectedOption={selectedTimezone}
+      onSelectOption={onTimezoneSelect}
+      searchPlaceholder="Search timezones..."
+      button={button}
+      side="right"
+      width="370px"
+    />
+  );
+}
+
+export default memo(TimezonePicker);

dashboard/src/components/common/TimezonePicker/index.ts

@@ -0,0 +1 @@
+export { default as TimezonePicker } from './TimezonePicker';

dashboard/src/components/common/UpgradeToProBanner/UpgradeToProBanner.tsx

@@ -1,14 +1,13 @@
-import { useDialog } from '@/components/common/DialogProvider';
 import { NhostIcon } from '@/components/presentational/NhostIcon';
 import { Box } from '@/components/ui/v2/Box';
-import { Button } from '@/components/ui/v2/Button';
 import { ArrowSquareOutIcon } from '@/components/ui/v2/icons/ArrowSquareOutIcon';
 import { Link } from '@/components/ui/v2/Link';
 import { Text } from '@/components/ui/v2/Text';
-import { TransferProjectDialog } from '@/features/orgs/components/common/TransferProjectDialog';
-import { useIsCurrentUserOwner } from '@/features/orgs/projects/common/hooks/useIsCurrentUserOwner';
+import { TransferOrUpgradeProjectDialog } from '@/features/orgs/components/common/TransferOrUpgradeProjectDialog';
 import { useState } from 'react';
 
+import { OpenTransferDialogButton } from '@/components/common/OpenTransferDialogButton';
+
 import Image from 'next/image';
 import { type ReactNode } from 'react';
 
@@ -21,11 +20,11 @@ export default function UpgradeToProBanner({
   title,
   description,
 }: UpgradeToProBannerProps) {
-  const isOwner = useIsCurrentUserOwner();
-  const { openAlertDialog } = useDialog();
   const [transferProjectDialogOpen, setTransferProjectDialogOpen] =
     useState(false);
 
+  const handleTransferDialogOpen = () => setTransferProjectDialogOpen(true);
+
   return (
     <Box
       sx={{ backgroundColor: 'primary.light' }}
@@ -51,30 +50,8 @@ export default function UpgradeToProBanner({
         </div>
 
         <div className="flex flex-col gap-2 space-y-2 lg:flex-row lg:items-center lg:space-x-2 lg:space-y-0">
-          <Button
-            className="max-w-xs lg:w-auto"
-            onClick={() => {
-              if (isOwner) {
-                setTransferProjectDialogOpen(true);
-              } else {
-                openAlertDialog({
-                  title: "You can't migrate this project",
-                  payload: (
-                    <Text variant="subtitle1" component="span">
-                      Ask an owner of this organization to migrate the project.
-                    </Text>
-                  ),
-                  props: {
-                    secondaryButtonText: 'I understand',
-                    hidePrimaryAction: true,
-                  },
-                });
-              }
-            }}
-          >
-            Transfer Project
-          </Button>
-          <TransferProjectDialog
+          <OpenTransferDialogButton onClick={handleTransferDialogOpen} />
+          <TransferOrUpgradeProjectDialog
             open={transferProjectDialogOpen}
             setOpen={setTransferProjectDialogOpen}
           />

dashboard/src/components/common/VirtualizedCombobox/VirtualizedCombobox.tsx

@@ -0,0 +1,243 @@
+import { Button } from '@/components/ui/v3/button';
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from '@/components/ui/v3/command';
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@/components/ui/v3/popover';
+import { cn } from '@/lib/utils';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { Check, ChevronsUpDown } from 'lucide-react';
+import * as React from 'react';
+
+type Option = {
+  value: string;
+  label: string;
+  key?: string;
+};
+
+interface VirtualizedCommandProps<O extends Option> {
+  height: string;
+  options: O[];
+  placeholder: string;
+  selectedOption: string;
+  onSelectOption?: (option: O) => void;
+  emptyText?: string;
+}
+
+function VirtualizedCommand<O extends Option>({
+  height,
+  options,
+  placeholder,
+  selectedOption,
+  onSelectOption,
+  emptyText,
+}: VirtualizedCommandProps<O>) {
+  const [filteredOptions, setFilteredOptions] = React.useState<O[]>(options);
+  const [focusedIndex, setFocusedIndex] = React.useState(0);
+  const [isKeyboardNavActive, setIsKeyboardNavActive] = React.useState(false);
+
+  const parentRef = React.useRef(null);
+
+  const virtualizer = useVirtualizer({
+    count: filteredOptions.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 35,
+  });
+
+  const virtualOptions = virtualizer.getVirtualItems();
+
+  const scrollToIndex = (index: number) => {
+    virtualizer.scrollToIndex(index, {
+      align: 'center',
+    });
+  };
+
+  const handleSearch = (search: string) => {
+    setIsKeyboardNavActive(false);
+    setFilteredOptions(
+      options.filter((option) =>
+        option.label.toLowerCase().includes(search.toLowerCase()),
+      ),
+    );
+  };
+
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    switch (event.key) {
+      case 'ArrowDown': {
+        event.preventDefault();
+        setIsKeyboardNavActive(true);
+        setFocusedIndex((prev) => {
+          const newIndex =
+            prev === -1 ? 0 : Math.min(prev + 1, filteredOptions.length - 1);
+          scrollToIndex(newIndex);
+          return newIndex;
+        });
+        break;
+      }
+      case 'ArrowUp': {
+        event.preventDefault();
+        setIsKeyboardNavActive(true);
+        setFocusedIndex((prev) => {
+          const newIndex =
+            prev === -1 ? filteredOptions.length - 1 : Math.max(prev - 1, 0);
+          scrollToIndex(newIndex);
+          return newIndex;
+        });
+        break;
+      }
+      case 'Enter': {
+        event.preventDefault();
+        if (filteredOptions[focusedIndex]) {
+          onSelectOption?.(filteredOptions[focusedIndex]);
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  };
+
+  return (
+    <Command
+      shouldFilter={false}
+      onKeyDown={handleKeyDown}
+      value={selectedOption}
+    >
+      <CommandInput onValueChange={handleSearch} placeholder={placeholder} />
+      <CommandList
+        ref={parentRef}
+        style={{
+          height,
+          width: '100%',
+          overflow: 'auto',
+        }}
+        onMouseDown={() => setIsKeyboardNavActive(false)}
+        onMouseMove={() => setIsKeyboardNavActive(false)}
+      >
+        <CommandEmpty>{emptyText || 'No item found.'}</CommandEmpty>
+        <CommandGroup>
+          <div
+            style={{
+              height: `${virtualizer.getTotalSize()}px`,
+              width: '100%',
+              position: 'relative',
+            }}
+          >
+            {virtualOptions.map((virtualOption) => (
+              <CommandItem
+                key={
+                  filteredOptions[virtualOption.index].key ??
+                  filteredOptions[virtualOption.index].value
+                }
+                className={cn(
+                  'absolute left-0 top-0 w-full bg-transparent',
+                  focusedIndex === virtualOption.index &&
+                    'bg-accent text-accent-foreground',
+                  isKeyboardNavActive &&
+                    focusedIndex !== virtualOption.index &&
+                    'aria-selected:bg-transparent aria-selected:text-primary',
+                )}
+                style={{
+                  height: `${virtualOption.size}px`,
+                  transform: `translateY(${virtualOption.start}px)`,
+                }}
+                value={filteredOptions[virtualOption.index].value}
+                onMouseEnter={() =>
+                  !isKeyboardNavActive && setFocusedIndex(virtualOption.index)
+                }
+                onMouseLeave={() => !isKeyboardNavActive && setFocusedIndex(-1)}
+                onSelect={() => onSelectOption?.(filteredOptions[focusedIndex])}
+              >
+                <Check
+                  className={cn(
+                    'mr-2 h-4 w-4',
+                    selectedOption ===
+                      filteredOptions[virtualOption.index].value
+                      ? 'opacity-100'
+                      : 'opacity-0',
+                  )}
+                />
+                {filteredOptions[virtualOption.index].label}
+              </CommandItem>
+            ))}
+          </div>
+        </CommandGroup>
+      </CommandList>
+    </Command>
+  );
+}
+
+interface VirtualizedComboboxProps<O extends Option> {
+  options: O[];
+  searchPlaceholder?: string;
+  width?: string;
+  height?: string;
+  button?: React.JSX.Element;
+  onSelectOption?: (option: O) => void;
+  selectedOption: string;
+  align?: 'start' | 'center' | 'end';
+  side?: 'right' | 'top' | 'bottom' | 'left';
+}
+
+function VirtualizedCombobox<O extends Option>({
+  options,
+  searchPlaceholder = 'Search items...',
+  width,
+  height,
+  button,
+  onSelectOption,
+  selectedOption,
+  align = 'start',
+  side,
+}: VirtualizedComboboxProps<O>) {
+  const [open, setOpen] = React.useState(false);
+  const defaultButton = (
+    <Button
+      variant="outline"
+      role="combobox"
+      aria-expanded={open}
+      className="justify-between"
+      style={{
+        width,
+      }}
+    >
+      {selectedOption
+        ? options.find((option) => option.value === selectedOption).value
+        : searchPlaceholder}
+      <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+    </Button>
+  );
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>{button || defaultButton}</PopoverTrigger>
+      <PopoverContent
+        className="p-0"
+        style={{ width }}
+        align={align}
+        side={side}
+      >
+        <VirtualizedCommand
+          height={height}
+          options={options}
+          placeholder={searchPlaceholder}
+          selectedOption={selectedOption}
+          onSelectOption={(currentValue) => {
+            onSelectOption(currentValue);
+            setOpen(false);
+          }}
+        />
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+export default VirtualizedCombobox;

dashboard/src/components/common/VirtualizedCombobox/index.ts

@@ -0,0 +1 @@
+export { default as VirtualizedCombobox } from './VirtualizedCombobox';

dashboard/src/components/dataGrid/DataGrid/DataGrid.test.tsx

@@ -1,67 +0,0 @@
-import { render, screen } from '@/tests/testUtils';
-import type { Column } from 'react-table';
-import { expect, test } from 'vitest';
-import DataGrid from './DataGrid';
-
-interface MockDataDetails {
-  id: number;
-  name: string;
-}
-
-const mockColumns: Column<MockDataDetails>[] = [
-  { id: 'id', Header: 'ID', accessor: 'id' },
-  { id: 'name', Header: 'Name', accessor: 'name' },
-];
-
-const mockData: MockDataDetails[] = [
-  { id: 1, name: 'foo' },
-  { id: 2, name: 'bar' },
-];
-
-test('should render an empty state if columns are not available', () => {
-  render(<DataGrid columns={[]} data={[]} />);
-
-  expect(screen.getByText(/columns not found/i)).toBeInTheDocument();
-});
-
-test('should render columns and empty state message if data is unavailable', () => {
-  render(<DataGrid columns={mockColumns} data={[]} />);
-
-  expect(screen.getByRole('table')).toBeInTheDocument();
-
-  expect(screen.getByRole('columnheader', { name: /id/i })).toBeInTheDocument();
-  expect(
-    screen.getByRole('columnheader', { name: /name/i }),
-  ).toBeInTheDocument();
-
-  expect(screen.getByText(/no data is available/i)).toBeInTheDocument();
-});
-
-test('should render custom empty state message if data is unavailable', () => {
-  const customEmptyStateMessage = 'custom empty state message';
-
-  render(
-    <DataGrid
-      columns={mockColumns}
-      data={[]}
-      emptyStateMessage={customEmptyStateMessage}
-    />,
-  );
-
-  expect(screen.getByText(customEmptyStateMessage)).toBeInTheDocument();
-});
-
-test('should display a loading indicator', async () => {
-  render(<DataGrid columns={mockColumns} data={[]} loading />);
-
-  // Activity indicator is not immediately displayed, so we need to wait
-  expect(await screen.findByRole('progressbar')).toBeInTheDocument();
-});
-
-test('should render data if provided', () => {
-  render(<DataGrid columns={mockColumns} data={mockData} />);
-
-  expect(screen.getAllByRole('row')).toHaveLength(2);
-  expect(screen.getByRole('cell', { name: /1/i })).toBeInTheDocument();
-  expect(screen.getByRole('cell', { name: /foo/i })).toBeInTheDocument();
-});

dashboard/src/components/dataGrid/DataGrid/DataGrid.tsx

@@ -1,185 +0,0 @@
-import type { UseDataGridOptions } from '@/components/dataGrid/DataGrid/useDataGrid';
-import { DataGridBody } from '@/components/dataGrid/DataGridBody';
-import { DataGridConfigProvider } from '@/components/dataGrid/DataGridConfigProvider';
-import { DataGridFrame } from '@/components/dataGrid/DataGridFrame';
-import type { DataGridHeaderProps } from '@/components/dataGrid/DataGridHeader';
-import { DataGridHeader } from '@/components/dataGrid/DataGridHeader';
-import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
-import { Box } from '@/components/ui/v2/Box';
-import { DataBrowserEmptyState } from '@/features/database/dataGrid/components/DataBrowserEmptyState';
-import type { DataBrowserGridColumn } from '@/features/database/dataGrid/types/dataBrowser';
-import type { ForwardedRef } from 'react';
-import { forwardRef, useEffect, useRef } from 'react';
-import mergeRefs from 'react-merge-refs';
-import type { Column, Row, SortingRule, TableOptions } from 'react-table';
-import { twMerge } from 'tailwind-merge';
-import useDataGrid from './useDataGrid';
-
-export interface DataGridProps<TColumnData extends object>
-  extends Omit<UseDataGridOptions<TColumnData>, 'tableRef'> {
-  /**
-   * Available columns.
-   */
-  columns: Column<TColumnData>[];
-  /**
-   * Data to be displayed in the table.
-   */
-  data: any[];
-  /**
-   * Text to be displayed when no data is available in the data grid.
-   *
-   * @default null
-   */
-  emptyStateMessage?: string;
-  /**
-   * Additional configuration options for the `react-table` hook.
-   */
-  options?: Omit<TableOptions<TColumnData>, 'columns' | 'data'>;
-  /**
-   * Additional data grid controls. This component will be part of the Data Grid
-   * context, so it can use Data Grid configuration.
-   */
-  controls?:
-    | React.ReactNode
-    | ((selectedFlatRows: Row<TColumnData>[]) => React.ReactNode);
-  /**
-   * Function to be called when columns are sorted in the table.
-   */
-  onSort?: (args: SortingRule<TColumnData>[]) => void;
-  /**
-   * Function to be called when the user wants to insert a new row.
-   */
-  onInsertRow?: VoidFunction;
-  /**
-   * Function to be called when the user wants to insert a new column.
-   */
-  onInsertColumn?: VoidFunction;
-  /**
-   * Function to be called when the user wants to remove a column.
-   */
-  onRemoveColumn?: (column: DataBrowserGridColumn<TColumnData>) => void;
-  /**
-   * Function to be called when the user wants to edit a column.
-   */
-  onEditColumn?: (column: DataBrowserGridColumn<TColumnData>) => void;
-  /**
-   * Determines whether or not data is loading.
-   */
-  loading?: boolean;
-  /**
-   * Class name to be applied to the data grid.
-   */
-  className?: string;
-  /**
-   * Sort configuration.
-   */
-  sortBy?: SortingRule<TColumnData>[];
-  /**
-   * Props to be passed to the `DataGridHeader` component.
-   */
-  headerProps?: DataGridHeaderProps<TColumnData>;
-}
-
-function DataGrid<TColumnData extends object>(
-  {
-    columns,
-    data,
-    allowSelection,
-    allowSort,
-    allowResize,
-    emptyStateMessage,
-    options = {},
-    headerProps,
-    controls,
-    sortBy,
-    onSort,
-    onInsertRow,
-    onInsertColumn,
-    onEditColumn,
-    onRemoveColumn,
-    loading,
-    className,
-  }: DataGridProps<TColumnData>,
-  ref: ForwardedRef<HTMLDivElement>,
-) {
-  const tableRef = useRef<HTMLDivElement>();
-  const { toggleAllRowsSelected, setSortBy, ...dataGridProps } =
-    useDataGrid<TColumnData>({
-      columns: columns || [],
-      data: data || [],
-      allowSelection,
-      allowSort,
-      allowResize,
-      ...options,
-    });
-
-  useEffect(() => {
-    if (!sortBy && setSortBy) {
-      setSortBy([]);
-    }
-  }, [setSortBy, sortBy]);
-
-  useEffect(() => {
-    if (onSort && allowSort) {
-      onSort(dataGridProps.state.sortBy);
-
-      if (toggleAllRowsSelected) {
-        toggleAllRowsSelected(false);
-      }
-    }
-  }, [allowSort, dataGridProps.state.sortBy, onSort, toggleAllRowsSelected]);
-
-  return (
-    <DataGridConfigProvider
-      toggleAllRowsSelected={toggleAllRowsSelected}
-      setSortBy={setSortBy}
-      tableRef={tableRef}
-      {...dataGridProps}
-    >
-      <>
-        {controls}
-
-        {columns.length === 0 && !loading && (
-          <DataBrowserEmptyState
-            title="Columns not found"
-            description="Please create a column before adding data to the table."
-          />
-        )}
-
-        {columns.length > 0 && (
-          <Box
-            ref={mergeRefs([ref, tableRef])}
-            sx={{ backgroundColor: 'background.default' }}
-            className={twMerge(
-              'overflow-x-auto',
-              !loading && 'h-full',
-              className,
-            )}
-          >
-            <DataGridFrame>
-              <DataGridHeader
-                onInsertColumn={onInsertColumn}
-                onEditColumn={onEditColumn}
-                onRemoveColumn={onRemoveColumn}
-                {...headerProps}
-              />
-
-              <DataGridBody
-                emptyStateMessage={emptyStateMessage}
-                loading={loading}
-                onInsertRow={onInsertRow}
-                allowInsertColumn={Boolean(onRemoveColumn)}
-              />
-            </DataGridFrame>
-          </Box>
-        )}
-
-        {loading && <ActivityIndicator delay={1000} className="my-4" />}
-      </>
-    </DataGridConfigProvider>
-  );
-}
-
-export default forwardRef(DataGrid) as <TColumnData extends object>(
-  props: DataGridProps<TColumnData> & { ref?: ForwardedRef<HTMLDivElement> },
-) => ReturnType<typeof DataGrid>;

dashboard/src/components/dataGrid/DataGrid/index.ts

@@ -1,4 +0,0 @@
-export * from './DataGrid';
-export { default as DataGrid } from './DataGrid';
-export * from './useDataGrid';
-export { default as useDataGrid } from './useDataGrid';

dashboard/src/components/dataGrid/DataGrid/useDataGrid.tsx

@@ -1,110 +0,0 @@
-import { Checkbox } from '@/components/ui/v2/Checkbox';
-import type { MutableRefObject } from 'react';
-import { useMemo } from 'react';
-import type { PluginHook, TableInstance, TableOptions } from 'react-table';
-import {
-  useBlockLayout,
-  useResizeColumns,
-  useRowSelect,
-  useSortBy,
-  useTable,
-} from 'react-table';
-
-export interface UseDataGridBaseOptions {
-  /**
-   * Determines whether data grid columns are selectable.
-   *
-   * @default false
-   */
-  allowSelection?: boolean;
-  /**
-   * Determines whether data grid columns are sortable.
-   *
-   * @default false
-   */
-  allowSort?: boolean;
-  /**
-   * Determine whether data grid columns are resizable.
-   *
-   * @default false
-   */
-  allowResize?: boolean;
-  /**
-   * Reference to the data grid root element.
-   */
-  tableRef?: MutableRefObject<HTMLDivElement>;
-}
-
-export type UseDataGridOptions<T extends object = {}> = TableOptions<T> &
-  UseDataGridBaseOptions;
-export type UseDataGridReturn<T extends object = {}> = TableInstance<T> &
-  UseDataGridBaseOptions;
-
-export default function useDataGrid<T extends object>(
-  { allowSelection, allowSort, allowResize, ...options }: UseDataGridOptions<T>,
-  ...plugins: PluginHook<T>[]
-): UseDataGridReturn<T> {
-  const defaultColumn = useMemo(
-    () => ({
-      width: 32,
-      minWidth: 32,
-      Cell: ({ value }: { value: any }) => (
-        <span className="truncate">
-          {typeof value === 'object' ? JSON.stringify(value) : value}
-        </span>
-      ),
-    }),
-    [],
-  );
-
-  const pluginHooks = [
-    useBlockLayout,
-    useResizeColumns,
-    useSortBy,
-    useRowSelect,
-  ];
-
-  const tableData = useTable<T>(
-    {
-      defaultColumn,
-      ...options,
-    },
-    ...pluginHooks,
-    ...plugins,
-    (hooks) =>
-      allowSelection
-        ? hooks.visibleColumns.push((columns) => [
-            {
-              id: 'selection',
-              Header: ({ rows, getToggleAllRowsSelectedProps }: any) => (
-                <Checkbox
-                  disabled={rows.length === 0}
-                  {...getToggleAllRowsSelectedProps({ style: null })}
-                  style={{
-                    ...getToggleAllRowsSelectedProps().style,
-                    cursor: rows.length === 0 ? 'default' : 'pointer',
-                  }}
-                />
-              ),
-              Cell: ({ row }: any) => {
-                const originalValue = row.original as any;
-
-                return (
-                  <Checkbox
-                    {...row.getToggleRowSelectedProps()}
-                    // disable selection if row is just a upload preview
-                    checked={originalValue.uploading ? false : row.isSelected}
-                    disabled={originalValue.uploading}
-                  />
-                );
-              },
-              disableSortBy: true,
-              disableResizing: true,
-            },
-            ...columns,
-          ])
-        : hooks.visibleColumns,
-  );
-
-  return { ...tableData, allowSort, allowResize, allowSelection };
-}

dashboard/src/components/dataGrid/DataGridBody/DataGridBody.tsx

@@ -1,315 +0,0 @@
-import type { DataGridProps } from '@/components/dataGrid/DataGrid';
-import { DataGridCell } from '@/components/dataGrid/DataGridCell';
-import { useDataGridConfig } from '@/components/dataGrid/DataGridConfigProvider';
-import type { BoxProps } from '@/components/ui/v2/Box';
-import { Box } from '@/components/ui/v2/Box';
-import { Button } from '@/components/ui/v2/Button';
-import { PlusIcon } from '@/components/ui/v2/icons/PlusIcon';
-import type { DataBrowserGridColumn } from '@/features/database/dataGrid/types/dataBrowser';
-import type { DetailedHTMLProps, HTMLProps, KeyboardEvent } from 'react';
-import { Fragment, useMemo, useRef } from 'react';
-import type { Row } from 'react-table';
-import { twMerge } from 'tailwind-merge';
-
-export interface DataGridBodyProps<T extends object>
-  extends Omit<
-      DetailedHTMLProps<HTMLProps<HTMLDivElement>, HTMLDivElement>,
-      'children'
-    >,
-    Pick<DataGridProps<T>, 'onInsertRow' | 'emptyStateMessage' | 'loading'> {
-  /**
-   * Determines whether column insertion is allowed.
-   */
-  allowInsertColumn?: boolean;
-}
-
-interface InsertPlaceholderTableRowProps extends BoxProps {
-  /**
-   * Function to be called when the user wants to insert a new row.
-   */
-  onInsertRow: VoidFunction;
-}
-
-function InsertPlaceholderTableRow({
-  onInsertRow,
-  ...props
-}: InsertPlaceholderTableRowProps) {
-  return (
-    <Box className="h-12 border-b-1 border-r-1" {...props}>
-      <Button
-        onClick={onInsertRow}
-        variant="borderless"
-        color="secondary"
-        className="h-full w-full justify-start rounded-none px-2 py-3 text-xs font-normal hover:shadow-none focus:shadow-none focus:outline-none"
-        startIcon={
-          <PlusIcon className="h-4 w-4" sx={{ color: 'text.secondary' }} />
-        }
-      >
-        Insert New Row
-      </Button>
-    </Box>
-  );
-}
-
-// TODO: Get rid of Data Browser related code from here. This component should
-// be generic and not depend on Data Browser related data types and logic.
-export default function DataGridBody<T extends object>({
-  emptyStateMessage = 'No data is available',
-  loading,
-  onInsertRow,
-  allowInsertColumn,
-  ...props
-}: DataGridBodyProps<T>) {
-  const { getTableBodyProps, totalColumnsWidth, rows, prepareRow, columns } =
-    useDataGridConfig<T>();
-
-  const SELECTION_CELL_WIDTH = 32;
-  const ADD_COLUMN_CELL_WIDTH = 100;
-  const bodyRef = useRef<HTMLDivElement>();
-
-  const primaryAndUniqueKeys = useMemo(
-    () =>
-      columns
-        .filter(
-          (column: DataBrowserGridColumn<T>) =>
-            column.isPrimary || column.isUnique,
-        )
-        .map((column) => column.id),
-    [columns],
-  );
-
-  function handleKeyDown(event: KeyboardEvent<HTMLDivElement>, row: Row<T>) {
-    const { id: rowId } = row;
-    const cellId = document.activeElement.id;
-
-    const currentRow = bodyRef.current.children.namedItem(rowId);
-
-    if (event.key === 'ArrowUp') {
-      event.preventDefault();
-
-      if (!currentRow.previousElementSibling) {
-        return;
-      }
-
-      const cellInPreviousRow =
-        currentRow.previousElementSibling.children.namedItem(cellId);
-
-      if (cellInPreviousRow instanceof HTMLElement) {
-        cellInPreviousRow.scrollIntoView({
-          block: 'nearest',
-        });
-        cellInPreviousRow.focus();
-      }
-    }
-
-    if (event.key === 'ArrowDown') {
-      event.preventDefault();
-
-      if (!currentRow.nextElementSibling) {
-        return;
-      }
-
-      const cellInNextRow =
-        currentRow.nextElementSibling.children.namedItem(cellId);
-
-      if (cellInNextRow instanceof HTMLElement) {
-        cellInNextRow.scrollIntoView({ block: 'nearest' });
-        cellInNextRow.focus();
-      }
-    }
-
-    if (event.key === 'ArrowLeft' || (event.shiftKey && event.key === 'Tab')) {
-      let previousFocusableCellInRow: HTMLElement;
-      let previousFocusableCellInRowFound = false;
-
-      currentRow.childNodes.forEach((node) => {
-        if (node === currentRow.children.namedItem(cellId)) {
-          previousFocusableCellInRowFound = true;
-        }
-
-        if (
-          node instanceof HTMLElement &&
-          node.tabIndex > -1 &&
-          !previousFocusableCellInRowFound
-        ) {
-          previousFocusableCellInRow = node;
-        }
-      });
-
-      if (previousFocusableCellInRow) {
-        event.preventDefault();
-
-        previousFocusableCellInRow.scrollIntoView({
-          block: 'nearest',
-          inline: 'center',
-        });
-        previousFocusableCellInRow.focus();
-      }
-    }
-
-    if (
-      event.key === 'ArrowRight' ||
-      (!event.shiftKey && event.key === 'Tab')
-    ) {
-      let nextFocusableCellInRow: HTMLElement;
-      let nextFocusableCellInRowFound = false;
-
-      currentRow.childNodes.forEach((node) => {
-        if (
-          node instanceof HTMLElement &&
-          node.tabIndex > -1 &&
-          parseInt(node.id, 10) > parseInt(cellId, 10) &&
-          !nextFocusableCellInRowFound
-        ) {
-          nextFocusableCellInRowFound = true;
-          nextFocusableCellInRow = node;
-        }
-      });
-
-      if (nextFocusableCellInRow) {
-        event.preventDefault();
-
-        nextFocusableCellInRow.scrollIntoView({
-          block: 'nearest',
-          inline: 'center',
-        });
-        nextFocusableCellInRow.focus();
-      }
-    }
-  }
-
-  const getBackgroundCellColor = (
-    row: Row<T>,
-    column: DataBrowserGridColumn<T>,
-  ) => {
-    // Grey out files not uploaded
-    if (!row.values.isUploaded) {
-      return 'grey.200';
-    }
-
-    if (column.isDisabled) {
-      return 'grey.100';
-    }
-
-    return 'background.paper';
-  };
-
-  return (
-    <div {...getTableBodyProps()} ref={bodyRef} {...props}>
-      {rows.length === 0 && !loading && (
-        <div className="flex flex-nowrap pr-5">
-          {onInsertRow ? (
-            <InsertPlaceholderTableRow
-              style={{
-                width: allowInsertColumn
-                  ? totalColumnsWidth + ADD_COLUMN_CELL_WIDTH
-                  : totalColumnsWidth - SELECTION_CELL_WIDTH,
-              }}
-              onInsertRow={onInsertRow}
-            />
-          ) : (
-            <Box
-              className="inline-flex h-12 items-center border-b-1 border-r-1 px-2 py-1.5 text-xs"
-              sx={{ color: 'text.secondary' }}
-              style={{
-                width: allowInsertColumn
-                  ? totalColumnsWidth + ADD_COLUMN_CELL_WIDTH
-                  : totalColumnsWidth,
-              }}
-            >
-              {emptyStateMessage}
-            </Box>
-          )}
-        </div>
-      )}
-
-      {rows.map((row, index) => {
-        let rowKey = index.toString();
-
-        if (primaryAndUniqueKeys && primaryAndUniqueKeys.length > 0) {
-          rowKey = primaryAndUniqueKeys
-            .map((key) => row.values[key])
-            .filter(Boolean)
-            .join('-');
-        } else {
-          rowKey = `${index}-${Object.keys(row.values)
-            .map((key) => String(row.values[key]))
-            .join('-')}`;
-        }
-
-        prepareRow(row);
-
-        const rowProps = row.getRowProps({
-          style: {
-            width: allowInsertColumn
-              ? totalColumnsWidth + ADD_COLUMN_CELL_WIDTH
-              : totalColumnsWidth,
-          },
-        });
-
-        return (
-          <Fragment key={rowKey.toString()}>
-            <div
-              {...rowProps}
-              id={row.id}
-              className="flex scroll-mt-10"
-              role="row"
-              onKeyDown={(event) => handleKeyDown(event, row)}
-              tabIndex={-1}
-            >
-              {row.cells.map((cell, cellIndex) => {
-                const column = cell.column as DataBrowserGridColumn<T>;
-                const isCellDisabled =
-                  cell.value !== 0 &&
-                  !cell.value &&
-                  column.type !== 'boolean' &&
-                  column.id !== 'selection' &&
-                  column.isDisabled;
-
-                return (
-                  <DataGridCell
-                    {...cell.getCellProps({
-                      style: {
-                        display: 'inline-flex',
-                        alignItems: 'center',
-                      },
-                    })}
-                    cell={cell}
-                    sx={{
-                      backgroundColor: getBackgroundCellColor(row, column),
-                      color: isCellDisabled ? 'text.secondary' : 'text.primary',
-                    }}
-                    className={twMerge(
-                      'h-12 font-display text-xs motion-safe:transition-colors',
-                      'border-b-1 border-r-1',
-                      'scroll-ml-8 scroll-mt-[57px]',
-                      column.id === 'selection' &&
-                        'sticky left-0 z-20 justify-center px-0',
-                    )}
-                    isEditable={!column.isDisabled && column.isEditable}
-                    id={cellIndex.toString()}
-                    key={column.id}
-                  >
-                    {cell.render('Cell')}
-                  </DataGridCell>
-                );
-              })}
-
-              {allowInsertColumn && (
-                <Box className="h-12 w-25 border-b-1 border-r-1" />
-              )}
-            </div>
-
-            {onInsertRow && index === rows.length - 1 && (
-              <InsertPlaceholderTableRow
-                {...rowProps}
-                key=""
-                onInsertRow={onInsertRow}
-              />
-            )}
-          </Fragment>
-        );
-      })}
-    </div>
-  );
-}

dashboard/src/components/dataGrid/DataGridBody/index.ts

@@ -1,2 +0,0 @@
-export * from './DataGridBody';
-export { default as DataGridBody } from './DataGridBody';

dashboard/src/components/dataGrid/DataGridBooleanCell/DataGridBooleanCell.tsx

@@ -1,121 +0,0 @@
-import type { CommonDataGridCellProps } from '@/components/dataGrid/DataGridCell';
-import { useDataGridCell } from '@/components/dataGrid/DataGridCell';
-import { ReadOnlyToggle } from '@/components/presentational/ReadOnlyToggle';
-import { Dropdown } from '@/components/ui/v2/Dropdown';
-import type { KeyboardEvent as ReactKeyboardEvent, MouseEvent } from 'react';
-import { twMerge } from 'tailwind-merge';
-
-export type DataGridBooleanCellProps<TData extends object> =
-  CommonDataGridCellProps<TData, boolean | null>;
-
-export default function DataGridBooleanCell<TData extends object>({
-  onSave,
-  optimisticValue,
-  temporaryValue,
-  onTemporaryValueChange,
-  cell: {
-    column: { isNullable },
-  },
-}: DataGridBooleanCellProps<TData>) {
-  const {
-    inputRef,
-    isEditing,
-    focusCell,
-    editCell,
-    cancelEditCell,
-    isSelected,
-  } = useDataGridCell<HTMLInputElement>();
-
-  async function handleMenuClick(
-    event: MouseEvent<HTMLLIElement> | ReactKeyboardEvent<HTMLLIElement>,
-    value: boolean | null,
-  ) {
-    event.stopPropagation();
-    await onSave(value);
-    cancelEditCell();
-  }
-
-  async function handleMenuKeyDown(event: ReactKeyboardEvent<HTMLDivElement>) {
-    if (
-      event.key === 'ArrowLeft' ||
-      event.key === 'ArrowRight' ||
-      event.key === 'ArrowUp' ||
-      event.key === 'ArrowDown'
-    ) {
-      event.stopPropagation();
-    }
-
-    // We need to restore the temporary value, because editing was cancelled
-    if (event.key === 'Escape' && onTemporaryValueChange) {
-      event.stopPropagation();
-
-      onTemporaryValueChange(optimisticValue);
-      cancelEditCell();
-    }
-
-    if (event.key === 'Tab' && onSave) {
-      await onSave(temporaryValue);
-      cancelEditCell();
-    }
-  }
-
-  function handleTemporaryValueChange(value: boolean | null) {
-    if (onTemporaryValueChange) {
-      onTemporaryValueChange(value);
-    }
-  }
-
-  return isSelected ? (
-    <Dropdown.Root id="boolean-data-editor" className="h-full w-full">
-      <Dropdown.Trigger
-        id="boolean-trigger"
-        className={twMerge(
-          'h-full w-full border-none p-0 outline-none',
-          isEditing && 'p-1.5',
-        )}
-        ref={inputRef}
-        onClick={editCell}
-        autoFocus={false}
-        sx={{ '&:hover': { backgroundColor: 'transparent !important' } }}
-      >
-        <ReadOnlyToggle checked={optimisticValue} />
-      </Dropdown.Trigger>
-
-      <Dropdown.Content
-        menu
-        disablePortal
-        onKeyDown={handleMenuKeyDown}
-        PaperProps={{ className: 'w-[200px]' }}
-        TransitionProps={{ onExited: focusCell }}
-      >
-        <Dropdown.Item
-          selected={optimisticValue === true}
-          onKeyUp={() => handleTemporaryValueChange(true)}
-          onClick={(event) => handleMenuClick(event, true)}
-        >
-          <ReadOnlyToggle checked />
-        </Dropdown.Item>
-
-        <Dropdown.Item
-          selected={optimisticValue === false}
-          onKeyUp={() => handleTemporaryValueChange(false)}
-          onClick={(event) => handleMenuClick(event, false)}
-        >
-          <ReadOnlyToggle checked={false} />
-        </Dropdown.Item>
-
-        {isNullable && (
-          <Dropdown.Item
-            selected={optimisticValue === null}
-            onKeyUp={() => handleTemporaryValueChange(null)}
-            onClick={(event) => handleMenuClick(event, null)}
-          >
-            <ReadOnlyToggle checked={null} />
-          </Dropdown.Item>
-        )}
-      </Dropdown.Content>
-    </Dropdown.Root>
-  ) : (
-    <ReadOnlyToggle checked={optimisticValue} />
-  );
-}

dashboard/src/components/dataGrid/DataGridBooleanCell/index.ts

@@ -1,2 +0,0 @@
-export * from './DataGridBooleanCell';
-export { default as DataGridBooleanCell } from './DataGridBooleanCell';

dashboard/src/components/dataGrid/DataGridCell/DataGridCell.tsx

@@ -1,381 +0,0 @@
-import { useDialog } from '@/components/common/DialogProvider';
-import type { BoxProps } from '@/components/ui/v2/Box';
-import { Box } from '@/components/ui/v2/Box';
-import { Tooltip, useTooltip } from '@/components/ui/v2/Tooltip';
-import type {
-  ColumnType,
-  DataBrowserGridCell,
-  DataBrowserGridCellProps,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { triggerToast } from '@/utils/toast';
-import type {
-  FocusEvent,
-  JSXElementConstructor,
-  KeyboardEvent,
-  MouseEvent,
-  ReactElement,
-  ReactNode,
-  ReactPortal,
-} from 'react';
-import {
-  Children,
-  cloneElement,
-  isValidElement,
-  useEffect,
-  useState,
-} from 'react';
-import { twMerge } from 'tailwind-merge';
-import DataGridCellProvider from './DataGridCellProvider';
-import useDataGridCell from './useDataGridCell';
-
-export interface CommonDataGridCellProps<TData extends object, TValue = any>
-  extends DataBrowserGridCellProps<TData, TValue> {
-  /**
-   * Function that is called when the cell is saved.
-   */
-  onSave?: (value: TValue, options?: { reset: boolean }) => Promise<void>;
-  /**
-   * Optimistic value for the cell.
-   */
-  optimisticValue?: TValue;
-  /**
-   * Function to be called when the optimistic value should be changed.
-   */
-  onOptimisticValueChange?: (value: TValue) => void;
-  /**
-   * Temporary value for the cell. This is used for storing the current input
-   * value, that should be later saved as an optimistic value before saving the
-   * data.
-   */
-  temporaryValue?: TValue;
-  /**
-   * Function to be called when the temporary value should be changed.
-   */
-  onTemporaryValueChange?: (value: TValue) => void;
-}
-
-export interface DataGridCellProps<TData extends object, TValue = unknown>
-  extends BoxProps {
-  /**
-   * Current cell's props.
-   */
-  cell: DataBrowserGridCell<TData, TValue>;
-  /**
-   * Determines whether the cell is editable.
-   */
-  isEditable?: boolean;
-  /**
-   * Determines the column's type.
-   */
-  columnType?: ColumnType;
-}
-
-function DataGridCellContent<TData extends object = {}, TValue = unknown>({
-  isEditable,
-  children,
-  className,
-  cell: {
-    value: originalValue,
-    column: { onCellEdit, id, isNullable, isPrimary, type },
-    row,
-  },
-  ...props
-}: DataGridCellProps<TData, TValue>) {
-  const { openAlertDialog } = useDialog();
-
-  const {
-    title: tooltipTitle,
-    open: tooltipOpen,
-    openTooltip,
-    closeTooltip,
-    resetTooltipTitle,
-  } = useTooltip();
-
-  const [optimisticValue, setOptimisticValue] = useState<TValue>(originalValue);
-  const [temporaryValue, setTemporaryValue] = useState<TValue>(originalValue);
-
-  useEffect(() => {
-    setOptimisticValue(originalValue);
-    setTemporaryValue(originalValue);
-  }, [originalValue]);
-
-  const {
-    cellRef,
-    inputRef,
-    focusCell,
-    focusInput,
-    blurInput,
-    clickInput,
-    isEditing,
-    isSelected,
-    selectCell,
-    deselectCell,
-    cancelEditCell,
-    editCell,
-    focusPrevCell,
-    focusNextCell,
-  } = useDataGridCell();
-
-  function activateInput() {
-    if (isPrimary) {
-      openTooltip("Primary keys can't be edited.");
-
-      return;
-    }
-
-    editCell();
-
-    if (type === 'boolean') {
-      clickInput();
-    } else {
-      focusInput();
-    }
-  }
-
-  async function handleClick(event: MouseEvent<HTMLDivElement>) {
-    if (!isEditable || isEditing || isPrimary) {
-      return;
-    }
-
-    if (event.detail === 2 && type !== 'boolean') {
-      editCell();
-      await focusInput();
-    }
-  }
-
-  function handleFocus() {
-    if (!isEditable) {
-      return;
-    }
-
-    selectCell();
-  }
-
-  async function handleSave(
-    value: TValue,
-    options: { reset: boolean } = { reset: false },
-  ) {
-    if (!onCellEdit) {
-      return;
-    }
-
-    const normalizedValue =
-      value !== null && typeof value === 'object'
-        ? JSON.stringify(value)
-        : String(value);
-
-    const normalizedOptimisticValue =
-      optimisticValue !== null && typeof optimisticValue === 'object'
-        ? JSON.stringify(optimisticValue)
-        : String(optimisticValue);
-
-    // We are making sure that optimistic value is not equal to the current
-    // value. If it is, we are not going to save the value.
-    if (
-      normalizedValue.replace(/\n/gi, '\\n') ===
-        normalizedOptimisticValue.replace(/\n/gi, '\\n') &&
-      !options.reset
-    ) {
-      return;
-    }
-
-    // In case of an error, we need to reset optimistic value
-    const latestOptimisticValue = optimisticValue;
-
-    setOptimisticValue(value);
-
-    try {
-      const data = await onCellEdit({
-        row,
-        columnsToUpdate: {
-          [id]: {
-            value: !options.reset ? value : undefined,
-            reset: options.reset,
-          },
-        },
-      });
-
-      // Syncing optimistic value with server-side value
-      setTemporaryValue(data.original[id.toString()]);
-      setOptimisticValue(data.original[id.toString()]);
-    } catch (error) {
-      triggerToast(`Error: ${error.message || 'Unknown error occurred.'}`);
-
-      // Resetting values
-      setTemporaryValue(latestOptimisticValue);
-      setOptimisticValue(latestOptimisticValue);
-    }
-  }
-
-  async function handleBlur(event: FocusEvent<HTMLDivElement>) {
-    // We are deselecting cell only if focus target is not a descendant of it.
-    if (!isEditable || event.currentTarget.contains(event.relatedTarget)) {
-      return;
-    }
-
-    await handleSave(temporaryValue);
-    closeTooltip();
-    deselectCell();
-  }
-
-  function resetCell() {
-    if (isPrimary) {
-      openTooltip('Primary keys are non-nullable.');
-
-      return;
-    }
-
-    if (!isNullable) {
-      openTooltip(
-        <span>
-          <strong>{id}</strong>
-          is non-nullable.
-        </span>,
-      );
-
-      return;
-    }
-
-    openAlertDialog({
-      title: 'Set value to null',
-      payload: (
-        <p>
-          Are you sure you want to set this cell to <strong>null</strong>?
-        </p>
-      ),
-      props: {
-        primaryButtonText: 'Set to null',
-        primaryButtonColor: 'error',
-        onPrimaryAction: async () => {
-          await handleSave(null, { reset: true });
-          focusCell();
-        },
-      },
-    });
-  }
-
-  async function handleKeyDown(event: KeyboardEvent<HTMLDivElement>) {
-    if (!isEditable) {
-      return;
-    }
-
-    if (event.key === 'Escape') {
-      closeTooltip();
-    }
-
-    // Resetting temporary value and focusing cell on Escape when input field is
-    // focused
-    if (event.key === 'Escape' && event.target === inputRef.current) {
-      setTemporaryValue(optimisticValue);
-      await focusCell();
-      cancelEditCell();
-    }
-
-    // Activating input field on Enter
-    if (event.key === 'Enter' && event.target === cellRef.current) {
-      activateInput();
-    }
-
-    // Focusing next cell on Tab
-    if (event.key === 'Tab' && !event.shiftKey) {
-      event.stopPropagation();
-      const nextCellAvailable = focusNextCell();
-
-      if (!nextCellAvailable) {
-        event.preventDefault();
-        event.stopPropagation();
-        await blurInput();
-        await focusCell();
-      }
-    }
-
-    // Focusing previous cell on Shift-Tab
-    if (event.key === 'Tab' && event.shiftKey) {
-      event.stopPropagation();
-      const prevCellAvailable = focusPrevCell();
-
-      if (!prevCellAvailable) {
-        event.preventDefault();
-        event.stopPropagation();
-        await blurInput();
-        await focusCell();
-      }
-    }
-
-    // Initiating cell reset when cell is focused
-    if (event.key === 'Backspace' && event.target === cellRef.current) {
-      resetCell();
-    }
-  }
-
-  const content = (
-    <Box
-      ref={cellRef}
-      className={twMerge(
-        'relative grid h-full w-full cursor-default grid-flow-col items-center gap-1',
-        isEditable &&
-          'focus-within:outline-none focus-within:ring-0 focus:ring-0',
-        isSelected && 'shadow-outline',
-        isEditing ? 'p-0.5 shadow-outline-dark' : 'px-2 py-1.5',
-        className,
-      )}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      onKeyDown={handleKeyDown}
-      tabIndex={isEditable ? 0 : undefined}
-      onClick={handleClick}
-      role="textbox"
-      sx={{ backgroundColor: 'transparent' }}
-      {...props}
-    >
-      {Children.map(
-        children,
-        (
-          child:
-            | ReactNode
-            | ReactPortal
-            | ReactElement<unknown, string | JSXElementConstructor<any>>,
-        ) => {
-          if (!isValidElement(child)) {
-            return null;
-          }
-
-          return cloneElement(child, {
-            ...child.props,
-            onSave: handleSave,
-            optimisticValue,
-            onOptimisticValueChange: setOptimisticValue,
-            temporaryValue,
-            onTemporaryValueChange: setTemporaryValue,
-          });
-        },
-      )}
-    </Box>
-  );
-
-  if (isEditable) {
-    return (
-      <Tooltip
-        disableHoverListener
-        disableFocusListener
-        open={tooltipOpen}
-        title={tooltipTitle || ''}
-        TransitionProps={{ onExited: resetTooltipTitle }}
-      >
-        {content}
-      </Tooltip>
-    );
-  }
-
-  return content;
-}
-
-export default function DataGridCell<TData extends object, TValue = unknown>(
-  props: DataGridCellProps<TData, TValue>,
-) {
-  return (
-    <DataGridCellProvider>
-      <DataGridCellContent {...props} />
-    </DataGridCellProvider>
-  );
-}

dashboard/src/components/dataGrid/DataGridCell/DataGridCellProvider.tsx

@@ -1,238 +0,0 @@
-import type { MutableRefObject, PropsWithChildren } from 'react';
-import { createContext, useCallback, useMemo, useReducer, useRef } from 'react';
-
-export interface DataGridCellContextProps<T extends HTMLElement> {
-  /**
-   * This `ref` should be attached to the cell element.
-   */
-  cellRef: MutableRefObject<HTMLDivElement>;
-  /**
-   * This `ref` should be attached to the input element inside the data grid cell.
-   */
-  inputRef: MutableRefObject<T>;
-  /**
-   * Determines whether or not the cell is currently being edited.
-   */
-  isEditing: boolean;
-  /**
-   * Determines whether or not the cell is currently selected.
-   */
-  isSelected: boolean;
-  /**
-   * Function to be called to start editing.
-   */
-  editCell: VoidFunction;
-  /**
-   * Function to be called to cancel editing.
-   */
-  cancelEditCell: VoidFunction;
-  /**
-   * Function to be called to select the cell, but not start editing.
-   */
-  selectCell: VoidFunction;
-  /**
-   * Function to be called to deselect cell and cancel editing.
-   */
-  deselectCell: VoidFunction;
-  /**
-   * Function to be called to focus cell.
-   */
-  focusCell: () => Promise<void>;
-  /**
-   * Function to be called to blur cell.
-   */
-  blurCell: () => Promise<void>;
-  /**
-   * Function to be called to programatically focus the input in the cell.
-   */
-  focusInput: () => Promise<void>;
-  /**
-   * Function to be called to programatically blur the input in the cell.
-   */
-  blurInput: () => Promise<void>;
-  /**
-   * Function to be called to programmatically click the input in the cell.
-   */
-  clickInput: () => Promise<void>;
-  /**
-   * Function to be called to navigate to next cell if available.
-   *
-   * @returns `true` if there is a next cell to focus, `false` otherwise.
-   */
-  focusNextCell: () => boolean;
-  /**
-   * Function to be called to navigate to previous cell if available.
-   *
-   * @returns `true` if there is a previous cell to focus, `false` otherwise.
-   */
-  focusPrevCell: () => boolean;
-}
-
-export const DataGridCellContext =
-  createContext<DataGridCellContextProps<any>>(null);
-
-interface EditAndSelectState {
-  isEditing: boolean;
-  isSelected: boolean;
-}
-
-type EditAndSelectAction =
-  | { type: 'EDIT' }
-  | { type: 'CANCEL_EDIT' }
-  | { type: 'SELECT' }
-  | { type: 'DESELECT' };
-
-function editAndSelectCellReducer(
-  state: EditAndSelectState,
-  action: EditAndSelectAction,
-): EditAndSelectState {
-  switch (action.type) {
-    case 'EDIT':
-      return { ...state, isEditing: true, isSelected: true };
-    case 'CANCEL_EDIT':
-      return { ...state, isEditing: false };
-    case 'SELECT':
-      return { ...state, isSelected: true };
-    case 'DESELECT':
-      return { ...state, isEditing: false, isSelected: false };
-    default:
-      return { ...state };
-  }
-}
-
-export default function DataGridCellProvider<TInput extends HTMLElement>({
-  children,
-}: PropsWithChildren<unknown>) {
-  const cellRef = useRef<HTMLDivElement>();
-  const inputRef = useRef<TInput>();
-  const [{ isEditing, isSelected }, dispatch] = useReducer(
-    editAndSelectCellReducer,
-    {
-      isEditing: false,
-      isSelected: false,
-    },
-  );
-
-  function focusCell() {
-    return new Promise<void>((resolve) => {
-      requestAnimationFrame(() => {
-        cellRef.current?.focus();
-
-        resolve();
-      });
-    });
-  }
-
-  function deselectCell() {
-    dispatch({ type: 'DESELECT' });
-  }
-
-  const focusPrevCell = useCallback(() => {
-    const prevCellAvailable =
-      cellRef.current.previousElementSibling instanceof HTMLElement &&
-      cellRef.current.previousElementSibling.tabIndex > -1;
-
-    requestAnimationFrame(() => {
-      if (prevCellAvailable) {
-        (cellRef.current.previousElementSibling as HTMLElement).focus();
-        deselectCell();
-      }
-    });
-
-    return prevCellAvailable;
-  }, []);
-
-  const focusNextCell = useCallback(() => {
-    const nextCellAvailable =
-      cellRef.current.nextElementSibling instanceof HTMLElement &&
-      cellRef.current.nextElementSibling.tabIndex > -1;
-
-    requestAnimationFrame(() => {
-      if (nextCellAvailable) {
-        (cellRef.current.nextElementSibling as HTMLElement).focus();
-        deselectCell();
-      }
-    });
-
-    return nextCellAvailable;
-  }, []);
-
-  function blurCell() {
-    return new Promise<void>((resolve) => {
-      requestAnimationFrame(() => {
-        cellRef.current?.blur();
-
-        resolve();
-      });
-    });
-  }
-
-  function focusInput() {
-    return new Promise<void>((resolve) => {
-      requestAnimationFrame(() => {
-        inputRef.current?.focus();
-
-        resolve();
-      });
-    });
-  }
-
-  function blurInput() {
-    return new Promise<void>((resolve) => {
-      requestAnimationFrame(() => {
-        inputRef.current?.blur();
-
-        resolve();
-      });
-    });
-  }
-
-  function clickInput() {
-    return new Promise<void>((resolve) => {
-      requestAnimationFrame(() => {
-        inputRef.current?.click();
-
-        resolve();
-      });
-    });
-  }
-
-  function editCell() {
-    dispatch({ type: 'EDIT' });
-  }
-
-  function cancelEditCell() {
-    dispatch({ type: 'CANCEL_EDIT' });
-  }
-
-  function selectCell() {
-    dispatch({ type: 'SELECT' });
-  }
-
-  const value = useMemo(
-    () => ({
-      focusCell,
-      blurCell,
-      focusInput,
-      blurInput,
-      clickInput,
-      isEditing,
-      isSelected,
-      editCell,
-      cancelEditCell,
-      selectCell,
-      deselectCell,
-      cellRef,
-      inputRef,
-      focusPrevCell,
-      focusNextCell,
-    }),
-    [focusNextCell, focusPrevCell, isEditing, isSelected],
-  );
-
-  return (
-    <DataGridCellContext.Provider value={value}>
-      {children}
-    </DataGridCellContext.Provider>
-  );
-}

dashboard/src/components/dataGrid/DataGridCell/index.ts

@@ -1,5 +0,0 @@
-export * from './DataGridCell';
-export { default as DataGridCell } from './DataGridCell';
-export * from './DataGridCellProvider';
-export { default as DataGridCellProvider } from './DataGridCellProvider';
-export { default as useDataGridCell } from './useDataGridCell';

dashboard/src/components/dataGrid/DataGridCell/useDataGridCell.ts

@@ -1,10 +0,0 @@
-import { useContext } from 'react';
-import type { DataGridCellContextProps } from './DataGridCellProvider';
-import { DataGridCellContext } from './DataGridCellProvider';
-
-export default function useDataGridCell<TInput extends HTMLElement>() {
-  const context =
-    useContext<DataGridCellContextProps<TInput>>(DataGridCellContext);
-
-  return context;
-}

dashboard/src/components/dataGrid/DataGridConfigProvider/DataGridConfigContext.ts

@@ -1,6 +0,0 @@
-import type { UseDataGridReturn } from '@/components/dataGrid/DataGrid';
-import { createContext } from 'react';
-
-const DataGridConfigContext = createContext<Partial<UseDataGridReturn>>(null);
-
-export default DataGridConfigContext;

dashboard/src/components/dataGrid/DataGridConfigProvider/DataGridConfigProvider.tsx

@@ -1,16 +0,0 @@
-import type { UseDataGridReturn } from '@/components/dataGrid/DataGrid';
-import type { PropsWithChildren } from 'react';
-import DataGridConfigContext from './DataGridConfigContext';
-
-export default function DataGridConfigProvider<T extends object = {}>({
-  children,
-  ...value
-}: PropsWithChildren<UseDataGridReturn<T>>) {
-  return (
-    <DataGridConfigContext.Provider
-      value={value as unknown as UseDataGridReturn<{}>}
-    >
-      {children}
-    </DataGridConfigContext.Provider>
-  );
-}

dashboard/src/components/dataGrid/DataGridConfigProvider/index.ts

@@ -1,3 +0,0 @@
-export { default as DataGridConfigContext } from './DataGridConfigContext';
-export { default as DataGridConfigProvider } from './DataGridConfigProvider';
-export { default as useDataGridConfig } from './useDataGridConfig';

dashboard/src/components/dataGrid/DataGridConfigProvider/useDataGridConfig.ts

@@ -1,15 +0,0 @@
-import type { UseDataGridReturn } from '@/components/dataGrid/DataGrid';
-import { useContext } from 'react';
-import DataGridConfigContext from './DataGridConfigContext';
-
-export default function useDataGridConfig<T extends object = {}>() {
-  const context = useContext(DataGridConfigContext);
-
-  if (!context) {
-    throw new Error(
-      `useDataGridConfig must be used within a DataGridConfigContext`,
-    );
-  }
-
-  return context as unknown as UseDataGridReturn<T>;
-}

dashboard/src/components/dataGrid/DataGridDateCell/DataGridDateCell.tsx

@@ -1,166 +0,0 @@
-import type { CommonDataGridCellProps } from '@/components/dataGrid/DataGridCell';
-import { useDataGridCell } from '@/components/dataGrid/DataGridCell';
-import { Input, inputClasses } from '@/components/ui/v2/Input';
-import type { TextProps } from '@/components/ui/v2/Text';
-import { Text } from '@/components/ui/v2/Text';
-import { getDateComponents } from '@/utils/getDateComponents';
-import type { ChangeEvent, KeyboardEvent } from 'react';
-import { twMerge } from 'tailwind-merge';
-
-export interface DataGridDateCellProps<TData extends object>
-  extends CommonDataGridCellProps<TData, string> {
-  /**
-   * Props to be passed to date display.
-   */
-  dateProps?: TextProps;
-  /**
-   * Props to be passed to time display.
-   */
-  timeProps?: TextProps;
-}
-
-export default function DataGridDateCell<TData extends object>({
-  onSave,
-  optimisticValue,
-  temporaryValue,
-  onTemporaryValueChange,
-  cell: {
-    column: { specificType },
-  },
-  dateProps,
-  timeProps,
-  className,
-}: DataGridDateCellProps<TData>) {
-  const { className: dateClassName, ...restDateProps } = dateProps || {};
-  const { className: timeClassName, ...restTimeProps } = timeProps || {};
-
-  // Note: No date (year-month-day) is saved for time / timetz columns, so we
-  // need to add it manually.
-  const date =
-    optimisticValue && specificType !== 'interval'
-      ? new Date(
-          specificType === 'time' || specificType === 'timetz'
-            ? `1970-01-01 ${optimisticValue}`
-            : optimisticValue,
-        )
-      : undefined;
-
-  const { year, month, day, hour, minute, second } = getDateComponents(date, {
-    adjustTimezone: ['date', 'timetz', 'timestamptz'].includes(specificType),
-  });
-
-  const { inputRef, focusCell, isEditing, cancelEditCell } =
-    useDataGridCell<HTMLInputElement>();
-
-  async function handleSave() {
-    if (onSave) {
-      await onSave(temporaryValue || '');
-    }
-  }
-
-  async function handleKeyDown(event: KeyboardEvent<HTMLInputElement>) {
-    if (
-      event.key === 'ArrowLeft' ||
-      event.key === 'ArrowRight' ||
-      event.key === 'ArrowUp' ||
-      event.key === 'ArrowDown' ||
-      event.key === 'Backspace'
-    ) {
-      event.stopPropagation();
-    }
-
-    if (event.key === 'Tab') {
-      await handleSave();
-    }
-
-    if (event.key === 'Enter') {
-      await handleSave();
-      await focusCell();
-      cancelEditCell();
-    }
-  }
-
-  function handleChange(event: ChangeEvent<HTMLInputElement>) {
-    if (event.target instanceof HTMLInputElement && onTemporaryValueChange) {
-      onTemporaryValueChange(event.target.value);
-    }
-  }
-
-  if (isEditing) {
-    return (
-      <Input
-        ref={inputRef}
-        value={
-          temporaryValue !== null && typeof temporaryValue !== 'undefined'
-            ? temporaryValue
-            : ''
-        }
-        onKeyDown={handleKeyDown}
-        onChange={handleChange}
-        fullWidth
-        className="absolute top-0 z-10 -mx-0.5 h-full place-content-stretch"
-        sx={{
-          [`&.${inputClasses.focused}`]: {
-            boxShadow: `inset 0 0 0 1.5px rgba(0, 82, 205, 1)`,
-            borderColor: 'transparent !important',
-            borderRadius: 0,
-            backgroundColor: (theme) =>
-              theme.palette.mode === 'dark'
-                ? `${theme.palette.secondary[100]} !important`
-                : `${theme.palette.common.white} !important`,
-          },
-          [`& .${inputClasses.input}`]: {
-            backgroundColor: 'transparent',
-          },
-        }}
-        slotProps={{
-          inputWrapper: { className: 'h-full' },
-          input: { className: 'h-full' },
-          inputRoot: {
-            className:
-              'resize-none outline-none focus:outline-none !text-xs focus:ring-0',
-          },
-        }}
-      />
-    );
-  }
-
-  if (!optimisticValue) {
-    return (
-      <Text className="truncate text-xs" color="secondary">
-        null
-      </Text>
-    );
-  }
-
-  if (specificType === 'interval') {
-    return <Text className="truncate text-xs">{optimisticValue}</Text>;
-  }
-
-  return (
-    <div className={twMerge('grid grid-flow-row', className)}>
-      {specificType !== 'time' && specificType !== 'timetz' && (
-        <Text
-          className={twMerge('truncate text-xs', dateClassName)}
-          {...restDateProps}
-        >
-          {[year, month, day].filter(Boolean).join('-')}
-        </Text>
-      )}
-
-      {specificType !== 'date' && (
-        <Text
-          className={twMerge('truncate text-xs', timeClassName)}
-          color={
-            specificType === 'time' || specificType === 'timetz'
-              ? 'primary'
-              : 'secondary'
-          }
-          {...restTimeProps}
-        >
-          {[hour, minute, second].filter(Boolean).join(':')}
-        </Text>
-      )}
-    </div>
-  );
-}

dashboard/src/components/dataGrid/DataGridDateCell/index.ts

@@ -1,2 +0,0 @@
-export * from './DataGridDateCell';
-export { default as DataGridDateCell } from './DataGridDateCell';

dashboard/src/components/dataGrid/DataGridFrame/DataGridFrame.tsx

@@ -1,29 +0,0 @@
-import { useDataGridConfig } from '@/components/dataGrid/DataGridConfigProvider';
-import clsx from 'clsx';
-import type { DetailedHTMLProps, HTMLProps } from 'react';
-
-export type DataGridFrameProps = DetailedHTMLProps<
-  HTMLProps<HTMLDivElement>,
-  HTMLDivElement
->;
-
-export default function DataGridFrame<T extends object>({
-  style,
-  children,
-  className,
-  ...props
-}: DataGridFrameProps) {
-  const { getTableProps } = useDataGridConfig<T>();
-  const { style: reactTableStyle, ...restTableProps } = getTableProps();
-
-  return (
-    <div
-      {...restTableProps}
-      {...props}
-      className={clsx('min-w-min', className)}
-      style={{ ...reactTableStyle, minWidth: undefined, ...style }}
-    >
-      {children}
-    </div>
-  );
-}

dashboard/src/components/dataGrid/DataGridFrame/index.ts

@@ -1,2 +0,0 @@
-export * from './DataGridFrame';
-export { default as DataGridFrame } from './DataGridFrame';

dashboard/src/components/dataGrid/DataGridHeader/DataGridHeader.tsx

@@ -1,233 +0,0 @@
-import type { DataGridProps } from '@/components/dataGrid/DataGrid';
-import { useDataGridConfig } from '@/components/dataGrid/DataGridConfigProvider';
-import { Box } from '@/components/ui/v2/Box';
-import { Button } from '@/components/ui/v2/Button';
-import { Divider } from '@/components/ui/v2/Divider';
-import { Dropdown } from '@/components/ui/v2/Dropdown';
-import { ArrowDownIcon } from '@/components/ui/v2/icons/ArrowDownIcon';
-import { ArrowUpIcon } from '@/components/ui/v2/icons/ArrowUpIcon';
-import { PencilIcon } from '@/components/ui/v2/icons/PencilIcon';
-import { PlusIcon } from '@/components/ui/v2/icons/PlusIcon';
-import { TrashIcon } from '@/components/ui/v2/icons/TrashIcon';
-import type { DataBrowserGridColumn } from '@/features/database/dataGrid/types/dataBrowser';
-import type { DetailedHTMLProps, HTMLProps } from 'react';
-import { twMerge } from 'tailwind-merge';
-
-export interface HeaderActionProps
-  extends DetailedHTMLProps<HTMLProps<HTMLElement>, HTMLElement> {}
-
-export interface DataGridHeaderProps<T extends object>
-  extends Omit<
-      DetailedHTMLProps<HTMLProps<HTMLDivElement>, HTMLDivElement>,
-      'children'
-    >,
-    Pick<
-      DataGridProps<T>,
-      'onRemoveColumn' | 'onEditColumn' | 'onInsertColumn'
-    > {
-  /**
-   * Props to be passed to component slots.
-   */
-  componentsProps?: {
-    /**
-     * Props to be passed to the `Edit Column` header action item.
-     */
-    editActionProps?: HeaderActionProps;
-    /**
-     * Props to be passed to the `Delete Column` header action item.
-     */
-    deleteActionProps?: HeaderActionProps;
-    /**
-     * Props to be passed to the `Delete Column` header action item.
-     */
-    insertActionProps?: HeaderActionProps;
-  };
-}
-
-// TODO: Get rid of Data Browser related code from here. This component should
-// be generic and not depend on Data Browser related data types and logic.
-export default function DataGridHeader<T extends object>({
-  className,
-  onRemoveColumn,
-  onEditColumn,
-  onInsertColumn,
-  componentsProps,
-  ...props
-}: DataGridHeaderProps<T>) {
-  const { flatHeaders, allowSort, allowResize } = useDataGridConfig<T>();
-
-  return (
-    <div
-      className={twMerge(
-        'sticky top-0 z-30 inline-flex w-full items-center pr-5',
-        className,
-      )}
-      {...props}
-    >
-      {flatHeaders.map((column: DataBrowserGridColumn<T>) => {
-        const headerProps = column.getHeaderProps({
-          style: { display: 'inline-grid' },
-        });
-
-        return (
-          <Dropdown.Root
-            sx={{
-              backgroundColor: (theme) =>
-                column.isDisabled
-                  ? theme.palette.background.default
-                  : theme.palette.background.paper,
-              color: 'text.primary',
-              borderColor: 'grey.300',
-            }}
-            className={twMerge(
-              'group relative inline-flex self-stretch overflow-hidden font-display text-xs font-bold focus:outline-none focus-visible:outline-none',
-              'border-b-1 border-r-1',
-              column.id === 'selection' && 'sticky left-0 max-w-2',
-            )}
-            style={{
-              ...headerProps.style,
-              maxWidth:
-                column.id === 'selection' ? 32 : headerProps.style?.maxWidth,
-              width:
-                column.id === 'selection' ? '100%' : headerProps.style?.width,
-              zIndex:
-                column.id === 'selection' ? 10 : headerProps.style?.zIndex,
-              position: null,
-            }}
-            key={column.id}
-          >
-            {column.id === 'selection' ? (
-              <span
-                {...headerProps}
-                className="relative grid w-full grid-flow-col items-center justify-between p-2"
-              >
-                {column.render('Header')}
-              </span>
-            ) : (
-              <Dropdown.Trigger
-                className={twMerge(
-                  'focus:outline-none motion-safe:transition-colors',
-                )}
-                disabled={
-                  column.isDisabled || (column.disableSortBy && !onRemoveColumn)
-                }
-                hideChevron
-              >
-                <span
-                  {...headerProps}
-                  className="relative grid w-full grid-flow-col items-center justify-between p-2"
-                >
-                  {column.render('Header')}
-
-                  {allowSort && (
-                    <Box component="span" sx={{ color: 'text.primary' }}>
-                      {column.isSorted && !column.isSortedDesc && (
-                        <ArrowUpIcon className="h-3 w-3" />
-                      )}
-
-                      {column.isSorted && column.isSortedDesc && (
-                        <ArrowDownIcon className="h-3 w-3" />
-                      )}
-                    </Box>
-                  )}
-                </span>
-
-                {allowResize && !column.disableResizing && (
-                  <span
-                    {...column.getResizerProps({
-                      onClick: (event: Event) => event.stopPropagation(),
-                    })}
-                    className="absolute -right-0.5 bottom-0 top-0 z-10 h-full w-1.5 group-hover:bg-slate-900 group-hover:bg-opacity-20 group-active:bg-slate-900 group-active:bg-opacity-20 motion-safe:transition-colors"
-                  />
-                )}
-              </Dropdown.Trigger>
-            )}
-
-            <Dropdown.Content
-              menu
-              PaperProps={{ className: 'w-52 mt-1' }}
-              className="p-0"
-            >
-              {onEditColumn && (
-                <Dropdown.Item
-                  onClick={() => onEditColumn(column)}
-                  className="grid grid-flow-col items-center gap-2 p-2 text-sm+ font-medium"
-                  disabled={componentsProps?.editActionProps?.disabled}
-                >
-                  <PencilIcon
-                    className="h-4 w-4"
-                    sx={{ color: 'text.secondary' }}
-                  />
-
-                  <span>Edit Column</span>
-                </Dropdown.Item>
-              )}
-
-              {onEditColumn && <Divider component="li" sx={{ margin: 0 }} />}
-
-              {!column.disableSortBy && (
-                <Dropdown.Item
-                  onClick={() => column.toggleSortBy(false)}
-                  className="grid grid-flow-col items-center gap-2 p-2 text-sm+ font-medium"
-                >
-                  <ArrowUpIcon
-                    className="h-4 w-4"
-                    sx={{ color: 'text.secondary' }}
-                  />
-
-                  <span>Sort Ascending</span>
-                </Dropdown.Item>
-              )}
-
-              {!column.disableSortBy && (
-                <Dropdown.Item
-                  onClick={() => column.toggleSortBy(true)}
-                  className="grid grid-flow-col items-center gap-2 p-2 text-sm+ font-medium"
-                >
-                  <ArrowDownIcon
-                    className="h-4 w-4"
-                    sx={{ color: 'text.secondary' }}
-                  />
-
-                  <span>Sort Descending</span>
-                </Dropdown.Item>
-              )}
-
-              {onRemoveColumn && !column.isPrimary && (
-                <Divider component="li" className="my-1" />
-              )}
-
-              {onRemoveColumn && !column.isPrimary && (
-                <Dropdown.Item
-                  onClick={() => onRemoveColumn(column)}
-                  className="grid grid-flow-col items-center gap-2 p-2 text-sm+ font-medium"
-                  disabled={componentsProps?.deleteActionProps?.disabled}
-                  sx={{ color: 'error.main' }}
-                >
-                  <TrashIcon className="h-4 w-4" sx={{ color: 'error.main' }} />
-
-                  <span>Delete Column</span>
-                </Dropdown.Item>
-              )}
-            </Dropdown.Content>
-          </Dropdown.Root>
-        );
-      })}
-
-      {onInsertColumn && (
-        <Box className="group relative inline-flex w-25 self-stretch overflow-hidden border-b-1 border-r-1 font-display text-xs font-bold focus:outline-none focus-visible:outline-none">
-          <Button
-            onClick={onInsertColumn}
-            variant="borderless"
-            color="secondary"
-            className="h-full w-full rounded-none text-xs hover:shadow-none focus:shadow-none focus:outline-none"
-            aria-label="Insert New Column"
-            disabled={componentsProps?.insertActionProps?.disabled}
-          >
-            <PlusIcon className="h-4 w-4" sx={{ color: 'text.disabled' }} />
-          </Button>
-        </Box>
-      )}
-    </div>
-  );
-}

dashboard/src/components/dataGrid/DataGridHeader/index.ts

@@ -1,2 +0,0 @@
-export * from './DataGridHeader';
-export { default as DataGridHeader } from './DataGridHeader';

dashboard/src/components/dataGrid/DataGridNumericCell/index.ts

@@ -1,2 +0,0 @@
-export * from './DataGridNumericCell';
-export { default as DataGridNumericCell } from './DataGridNumericCell';