Merge pull request #1454 from nhost/changeset-release/main

chore: update versions

.changeset/config.json

@@ -2,9 +2,22 @@
   "$schema": "https://unpkg.com/@changesets/config@1.6.0/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "linked": [],
+  "linked": [
+    [
+      "@nhost/nextjs",
+      "@nhost/react",
+      "@nhost/vue",
+      "@nhost/nhost-js",
+      "@nhost/hasura-auth-js",
+      "@nhost/hasura-storage-js"
+    ],
+    [
+      "@nhost/react-apollo",
+      "@nhost/apollo"
+    ]
+  ],
   "access": "restricted",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": []
-}
+}

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

@@ -35,8 +35,11 @@ runs:
         fi
     - name: Install Nhost CLI
       if: ${{ steps.check-nhost-cli.outputs.installed == 'false' }}
-      shell: bash
+      uses: nick-fields/retry@v2
-      run: bash <(curl --silent -L https://raw.githubusercontent.com/nhost/cli/main/get.sh) ${{ inputs.version }}
+      with:
+        timeout_minutes: 3
+        max_attempts: 3
+        command: bash <(curl --silent -L https://raw.githubusercontent.com/nhost/cli/main/get.sh) ${{ inputs.version }}
     - name: Set custom configuration
       if: ${{ inputs.config }}
       shell: bash

.github/labeler.yml

@@ -12,11 +12,14 @@ examples:
 sdk:
   - packages/**/*
 
+integrations:
+  - integrations/**/*
+
 react:
-  - '{packages,examples}/*react*/**/*'
+  - '{packages,examples,integrations}/*react*/**/*'
 
 nextjs:
   - '{packages,examples}/*next*/**/*'
 
 vue:
-  - '{packages,examples}/*vue*/**/*'
+  - '{packages,examples,integrations}/*vue*/**/*'

.github/renovate.json

@@ -8,9 +8,16 @@
   },
   "ignoreDeps": [
     "pnpm",
-    "node"
+    "node",
+    "@types/node"
   ],
   "labels": [
     "dependencies"
+  ],
+  "enabledManagers": [
+    "npm",
+    "dockerfile",
+    "docker-compose",
+    "github-actions"
   ]
 }

.github/workflows/ci.yaml

@@ -38,7 +38,7 @@ jobs:
           BUILD: 'all'
       - name: Check if the pnpm lockfile changed
         id: changed-lockfile
-        uses: tj-actions/changed-files@v34
+        uses: tj-actions/changed-files@v35
         with:
           files: pnpm-lock.yaml
       # * Determine a pnpm filter argument for packages that have been modified.

.github/workflows/contributors.yaml

@@ -1,15 +0,0 @@
-name: Add contributors
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  contrib-readme-job:
-    runs-on: ubuntu-latest
-    name: A job to automate contrib in readme
-    steps:
-      - name: Contribute List
-        uses: akhilmhdh/contributors-readme-action@v2.3.6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/renovate.yaml

@@ -21,6 +21,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          token: ${{ secrets.GH_PAT }}
       # * Install Node and dependencies. Package downloads will be cached for the next jobs.
       - name: Install Node and dependencies
         uses: ./.github/actions/install-dependencies
@@ -61,8 +62,28 @@ jobs:
 
           ${{ github.event.pull_request.title }}
           EOF
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Create Pull Request
-        if: steps.bumps.outputs.result != ''
+        id: cpr
+        uses: peter-evans/create-pull-request@v4
         with:
-          commit_message: ${{ github.event.pull_request.title }}
+          token: ${{ secrets.GH_PAT }}
-          branch: main
+          commit-message: ${{ github.event.pull_request.title }}
+          branch: renovate-changesets
+          delete-branch: true
+          title: 'chore: create changesest from Renovate bumps'
+          labels: |
+            dependencies
+          body: |
+            This PR creates the changesets from the Renovate dependencies that have been merged to main.
+      - name: Enable Pull Request Automerge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v2
+        with:
+          token: ${{ secrets.GH_PAT }}
+          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
+      - name: Auto approve
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        uses: juliangruber/approve-pull-request-action@v2
+        with:
+          github-token: ${{ secrets.GH_PAT }}
+          number: ${{ steps.cpr.outputs.pull-request-number }}

README.md

@@ -101,14 +101,17 @@ Nhost is frontend agnostic, which means Nhost works with all frontend frameworks
 
 ## Nhost Clients
 
-- [JavaScript/TypeScript SDK](https://docs.nhost.io/reference/javascript)
+- [JavaScript/TypeScript](https://docs.nhost.io/reference/javascript)
-- [Dart and Flutter SDK](https://github.com/nhost/nhost-dart)
+- [Dart and Flutter](https://github.com/nhost/nhost-dart)
-- [Nhost React](https://docs.nhost.io/reference/react)
+- [React](https://docs.nhost.io/reference/react)
-- [Nhost Next.js](https://docs.nhost.io/reference/nextjs)
+- [Next.js](https://docs.nhost.io/reference/nextjs)
-- [Nhost Vue](https://docs.nhost.io/reference/vue)
+- [Vue](https://docs.nhost.io/reference/vue)
 
 ## Integrations
 
+- [Apollo](./integrations/apollo#nhostapollo)
+- [React Apollo](./integrations/react-apollo#nhostreact-apollo)
+- [React URQL](./integrations/react-urql#nhostreact-urql)
 - [Stripe GraphQL API](./integrations/stripe-graphql-js#nhoststripe-graphql-js)
 - [Google Translation GraphQL API](./integrations/google-translation#nhostgoogle-translation)
 
@@ -127,8 +130,8 @@ Also, follow Nhost on [GitHub Discussions](https://github.com/nhost/nhost/discus
 
 This repository, and most of our other open source projects, are licensed under the MIT license.
 
-<a href="https://runacap.com/ross-index/q1-2022/" target="_blank" rel="noopener">
+<a href="https://runacap.com/ross-index/" target="_blank" rel="noopener" >
-    <img style="width: 260px; height: 56px" src="https://runacap.com/wp-content/uploads/2022/06/ROSS_badge_black_Q1_2022.svg" alt="ROSS Index - Fastest Growing Open-Source Startups in Q1 2022 | Runa Capital" width="260" height="56" />
+    <img style="width: 260px; height: 56px" src="https://runacap.com/wp-content/uploads/2022/06/ROSS_black_edition_badge.svg" alt="ROSS Index - Fastest Growing Open-Source Startups | Runa Capital" width="260" height="56" />
 </a>
 
 ### How to contribute
@@ -141,437 +144,8 @@ Here are some ways of contributing to making Nhost better:
 
 ### Contributors
 
-<!-- readme: contributors -start -->
+<a href="https://github.com/nhost/nhost/graphs/contributors">
-<table>
+  <p align="center">
-<tr>
+    <img width="720" src="https://contrib.rocks/image?repo=nhost/nhost" alt="A table of avatars from the project's contributors" />
-    <td align="center">
+  </p>
-        <a href="https://github.com/plmercereau">
+</a>
-            <img src="https://avatars.githubusercontent.com/u/24897252?v=4" width="100;" alt="plmercereau"/>
-            <br />
-            <sub><b>Pilou</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/elitan">
-            <img src="https://avatars.githubusercontent.com/u/331818?v=4" width="100;" alt="elitan"/>
-            <br />
-            <sub><b>Johan Eliasson</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/szilarddoro">
-            <img src="https://avatars.githubusercontent.com/u/310881?v=4" width="100;" alt="szilarddoro"/>
-            <br />
-            <sub><b>Szilárd Dóró</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/nunopato">
-            <img src="https://avatars.githubusercontent.com/u/1523504?v=4" width="100;" alt="nunopato"/>
-            <br />
-            <sub><b>Nuno Pato</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/gdangelo">
-            <img src="https://avatars.githubusercontent.com/u/4352286?v=4" width="100;" alt="gdangelo"/>
-            <br />
-            <sub><b>Grégory D'Angelo</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/ejkkan">
-            <img src="https://avatars.githubusercontent.com/u/32518962?v=4" width="100;" alt="ejkkan"/>
-            <br />
-            <sub><b>Erik Magnusson</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/guicurcio">
-            <img src="https://avatars.githubusercontent.com/u/20285232?v=4" width="100;" alt="guicurcio"/>
-            <br />
-            <sub><b>Guido Curcio</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/subatuba21">
-            <img src="https://avatars.githubusercontent.com/u/34824571?v=4" width="100;" alt="subatuba21"/>
-            <br />
-            <sub><b>Subha Das</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/sebagudelo">
-            <img src="https://avatars.githubusercontent.com/u/43288271?v=4" width="100;" alt="sebagudelo"/>
-            <br />
-            <sub><b>Sebagudelo</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/mrinalwahal">
-            <img src="https://avatars.githubusercontent.com/u/9859731?v=4" width="100;" alt="mrinalwahal"/>
-            <br />
-            <sub><b>Mrinal Wahal</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/timpratim">
-            <img src="https://avatars.githubusercontent.com/u/32492961?v=4" width="100;" alt="timpratim"/>
-            <br />
-            <sub><b>Pratim</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/chrtze">
-            <img src="https://avatars.githubusercontent.com/u/3797215?v=4" width="100;" alt="chrtze"/>
-            <br />
-            <sub><b>Christopher Möller</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/GavanWilhite">
-            <img src="https://avatars.githubusercontent.com/u/2085119?v=4" width="100;" alt="GavanWilhite"/>
-            <br />
-            <sub><b>Gavan Wilhite</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/FuzzyReason">
-            <img src="https://avatars.githubusercontent.com/u/62517920?v=4" width="100;" alt="FuzzyReason"/>
-            <br />
-            <sub><b>Vadim Smirnov</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/macmac49">
-            <img src="https://avatars.githubusercontent.com/u/831190?v=4" width="100;" alt="macmac49"/>
-            <br />
-            <sub><b>Macmac49</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/subhendukundu">
-            <img src="https://avatars.githubusercontent.com/u/20059141?v=4" width="100;" alt="subhendukundu"/>
-            <br />
-            <sub><b>Subhendu Kundu</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/badgifter">
-            <img src="https://avatars.githubusercontent.com/u/50094885?v=4" width="100;" alt="badgifter"/>
-            <br />
-            <sub><b>Bad Gifter</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/heygambo">
-            <img src="https://avatars.githubusercontent.com/u/449438?v=4" width="100;" alt="heygambo"/>
-            <br />
-            <sub><b>Christian Gambardella</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/dbarrosop">
-            <img src="https://avatars.githubusercontent.com/u/6246622?v=4" width="100;" alt="dbarrosop"/>
-            <br />
-            <sub><b>David Barroso</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/hajek-raven">
-            <img src="https://avatars.githubusercontent.com/u/7288737?v=4" width="100;" alt="hajek-raven"/>
-            <br />
-            <sub><b>Filip Hájek</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/MelodicCrypter">
-            <img src="https://avatars.githubusercontent.com/u/18341500?v=4" width="100;" alt="MelodicCrypter"/>
-            <br />
-            <sub><b>Hugh Caluscusin</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/jerryjappinen">
-            <img src="https://avatars.githubusercontent.com/u/1101002?v=4" width="100;" alt="jerryjappinen"/>
-            <br />
-            <sub><b>Jerry Jäppinen</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/wollerman">
-            <img src="https://avatars.githubusercontent.com/u/1610241?v=4" width="100;" alt="wollerman"/>
-            <br />
-            <sub><b>Matt Wollerman</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/mdp18">
-            <img src="https://avatars.githubusercontent.com/u/11698527?v=4" width="100;" alt="mdp18"/>
-            <br />
-            <sub><b>Max</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/mustafa-hanif">
-            <img src="https://avatars.githubusercontent.com/u/30019262?v=4" width="100;" alt="mustafa-hanif"/>
-            <br />
-            <sub><b>Mustafa Hanif</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/nbourdin">
-            <img src="https://avatars.githubusercontent.com/u/5602476?v=4" width="100;" alt="nbourdin"/>
-            <br />
-            <sub><b>Nicolas Bourdin</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/piromsurang">
-            <img src="https://avatars.githubusercontent.com/u/17776837?v=4" width="100;" alt="piromsurang"/>
-            <br />
-            <sub><b>Piromsurang Rungserichai</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/Savinvadim1312">
-            <img src="https://avatars.githubusercontent.com/u/16936043?v=4" width="100;" alt="Savinvadim1312"/>
-            <br />
-            <sub><b>Savin Vadim</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/Svarto">
-            <img src="https://avatars.githubusercontent.com/u/24279217?v=4" width="100;" alt="Svarto"/>
-            <br />
-            <sub><b>Svarto</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/muttenzer">
-            <img src="https://avatars.githubusercontent.com/u/49474412?v=4" width="100;" alt="muttenzer"/>
-            <br />
-            <sub><b>Muttenzer</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/alexander-mart">
-            <img src="https://avatars.githubusercontent.com/u/14993551?v=4" width="100;" alt="alexander-mart"/>
-            <br />
-            <sub><b>Alexander Mart</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/ahmic">
-            <img src="https://avatars.githubusercontent.com/u/13452362?v=4" width="100;" alt="ahmic"/>
-            <br />
-            <sub><b>Amir Ahmic</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/akd-io">
-            <img src="https://avatars.githubusercontent.com/u/30059155?v=4" width="100;" alt="akd-io"/>
-            <br />
-            <sub><b>Anders Kjær Damgaard</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/Sonichigo">
-            <img src="https://avatars.githubusercontent.com/u/53110238?v=4" width="100;" alt="Sonichigo"/>
-            <br />
-            <sub><b>Animesh Pathak</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/chrisli-03">
-            <img src="https://avatars.githubusercontent.com/u/11177048?v=4" width="100;" alt="chrisli-03"/>
-            <br />
-            <sub><b>Chris</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/massless">
-            <img src="https://avatars.githubusercontent.com/u/44389?v=4" width="100;" alt="massless"/>
-            <br />
-            <sub><b>Chris Wetherell</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/rustyb">
-            <img src="https://avatars.githubusercontent.com/u/53086?v=4" width="100;" alt="rustyb"/>
-            <br />
-            <sub><b>Colin Broderick</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/daguitosama">
-            <img src="https://avatars.githubusercontent.com/u/34744883?v=4" width="100;" alt="daguitosama"/>
-            <br />
-            <sub><b>Dago</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/dminkovsky">
-            <img src="https://avatars.githubusercontent.com/u/218725?v=4" width="100;" alt="dminkovsky"/>
-            <br />
-            <sub><b>Dmitry Minkovsky</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/dohomi">
-            <img src="https://avatars.githubusercontent.com/u/489221?v=4" width="100;" alt="dohomi"/>
-            <br />
-            <sub><b>Dominic Garms</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/gaurav1999">
-            <img src="https://avatars.githubusercontent.com/u/20752142?v=4" width="100;" alt="gaurav1999"/>
-            <br />
-            <sub><b>Gaurav Agrawal</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/alveshelio">
-            <img src="https://avatars.githubusercontent.com/u/8176422?v=4" width="100;" alt="alveshelio"/>
-            <br />
-            <sub><b>Helio Alves</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/nkhdo">
-            <img src="https://avatars.githubusercontent.com/u/26102306?v=4" width="100;" alt="nkhdo"/>
-            <br />
-            <sub><b>Hoang Do</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/iangabrielsanchez">
-            <img src="https://avatars.githubusercontent.com/u/9511946?v=4" width="100;" alt="iangabrielsanchez"/>
-            <br />
-            <sub><b>Ian Gabriel Sanchez</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/eltociear">
-            <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="100;" alt="eltociear"/>
-            <br />
-            <sub><b>Ikko Ashimine</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/jladuval">
-            <img src="https://avatars.githubusercontent.com/u/1935359?v=4" width="100;" alt="jladuval"/>
-            <br />
-            <sub><b>Jacob Duval</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/leothorp">
-            <img src="https://avatars.githubusercontent.com/u/12928449?v=4" width="100;" alt="leothorp"/>
-            <br />
-            <sub><b>Leo Thorp</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/LucasBois1">
-            <img src="https://avatars.githubusercontent.com/u/44686060?v=4" width="100;" alt="LucasBois1"/>
-            <br />
-            <sub><b>Lucas Bois</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/MarcelloTheArcane">
-            <img src="https://avatars.githubusercontent.com/u/21159570?v=4" width="100;" alt="MarcelloTheArcane"/>
-            <br />
-            <sub><b>Max Reynolds</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/nachoaldamav">
-            <img src="https://avatars.githubusercontent.com/u/22749943?v=4" width="100;" alt="nachoaldamav"/>
-            <br />
-            <sub><b>Nacho Aldama</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/ghoshnirmalya">
-            <img src="https://avatars.githubusercontent.com/u/6391763?v=4" width="100;" alt="ghoshnirmalya"/>
-            <br />
-            <sub><b>Nirmalya Ghosh</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/quentin-decre">
-            <img src="https://avatars.githubusercontent.com/u/1137511?v=4" width="100;" alt="quentin-decre"/>
-            <br />
-            <sub><b>Quentin Decré</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/elephant3">
-            <img src="https://avatars.githubusercontent.com/u/48279149?v=4" width="100;" alt="elephant3"/>
-            <br />
-            <sub><b>Siarhei Lipchyk</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/altschuler">
-            <img src="https://avatars.githubusercontent.com/u/956928?v=4" width="100;" alt="altschuler"/>
-            <br />
-            <sub><b>Simon Altschuler</b></sub>
-        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/atapas">
-            <img src="https://avatars.githubusercontent.com/u/3633137?v=4" width="100;" alt="atapas"/>
-            <br />
-            <sub><b>Tapas Adhikary</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/uulwake">
-            <img src="https://avatars.githubusercontent.com/u/22399181?v=4" width="100;" alt="uulwake"/>
-            <br />
-            <sub><b>Ulrich Wake</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/kwarabei">
-            <img src="https://avatars.githubusercontent.com/u/102731455?v=4" width="100;" alt="kwarabei"/>
-            <br />
-            <sub><b>Vadim</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/TheRedLancer">
-            <img src="https://avatars.githubusercontent.com/u/58493767?v=4" width="100;" alt="TheRedLancer"/>
-            <br />
-            <sub><b>Zach Burnaby</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/komninoschat">
-            <img src="https://avatars.githubusercontent.com/u/29049104?v=4" width="100;" alt="komninoschat"/>
-            <br />
-            <sub><b>Komninos</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/meesvandongen">
-            <img src="https://avatars.githubusercontent.com/u/35409045?v=4" width="100;" alt="meesvandongen"/>
-            <br />
-            <sub><b>Meesvandongen</b></sub>
-        </a>
-    </td></tr>
-</table>
-<!-- readme: contributors -end -->

config/tsconfig.base.json

@@ -40,7 +40,7 @@
     ],
     "paths": {
       "@nhost/apollo": [
-        "../packages/apollo/src/index.ts"
+        "../integrations/apollo/src/index.ts"
       ],
       "@nhost/docgen": [
         "../packages/docgen/src/index.ts"
@@ -61,10 +61,7 @@
         "../packages/react/src/index.ts"
       ],
       "@nhost/react-apollo": [
-        "../packages/react-apollo/src/index.ts"
+        "../integrations/react-apollo/src/index.ts"
-      ],
-      "@nhost/react-auth": [
-        "../packages/react-auth/src/index.ts"
       ],
       "@nhost/vue": [
         "../packages/vue/src/index.ts"

config/vite.lib.config.js

@@ -1,3 +1,4 @@
+import replace from '@rollup/plugin-replace'
 import fs from 'fs'
 import path from 'path'
 
@@ -18,7 +19,9 @@ export default defineConfig({
     tsconfigPaths(),
     dts({
       exclude: ['**/*.spec.ts', '**/*.test.ts', '**/tests/**'],
-      entryRoot: 'src'
+      entryRoot: 'src',
+      // Was defaulting to true until version 1.7
+      skipDiagnostics: true
     })
   ],
   test: {
@@ -41,6 +44,12 @@ export default defineConfig({
     },
     rollupOptions: {
       external: (id) => deps.some((dep) => id.startsWith(dep)),
+      plugins: [
+        replace({
+          preventAssignment: true,
+          'exports.hasOwnProperty(': 'Object.prototype.hasOwnProperty.call(exports,'
+        })
+      ],
       output: {
         globals: {
           graphql: 'graphql',

dashboard/.storybook/main.js

@@ -6,6 +6,7 @@ module.exports = {
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',
+    'storybook-addon-next-router',
     {
       /**
        * Fix Storybook issue with PostCSS@8
@@ -38,4 +39,10 @@ module.exports = {
       },
     };
   },
+  env: (config) => ({
+    ...config,
+    NEXT_PUBLIC_ENV: 'dev',
+    NEXT_PUBLIC_NHOST_BACKEND_URL: 'http://localhost:1337',
+    NEXT_PUBLIC_NHOST_PLATFORM: 'false',
+  }),
 };

dashboard/.storybook/preview.js

@@ -2,9 +2,25 @@ import '@fontsource/inter';
 import '@fontsource/inter/500.css';
 import '@fontsource/inter/700.css';
 import { CssBaseline, ThemeProvider } from '@mui/material';
+import { NhostApolloProvider } from '@nhost/react-apollo';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { Buffer } from 'buffer';
+import { initialize, mswDecorator } from 'msw-storybook-addon';
+import { RouterContext } from 'next/dist/shared/lib/router-context';
+import '../src/styles/globals.css';
 import defaultTheme from '../src/theme/default';
 
+global.Buffer = Buffer;
+
+initialize({ onUnhandledRequest: 'bypass' });
+
+const queryClient = new QueryClient();
+
 export const parameters = {
+  nextRouter: {
+    Provider: RouterContext.Provider,
+    isReady: true,
+  },
   actions: { argTypesRegex: '^on[A-Z].*' },
   controls: {
     matchers: {
@@ -14,11 +30,25 @@ export const parameters = {
   },
 };
 
-export const withMuiTheme = (Story) => (
+export const decorators = [
-  <ThemeProvider theme={defaultTheme}>
+  (Story) => (
-    <CssBaseline />
+    <ThemeProvider theme={defaultTheme}>
-    <Story />
+      <CssBaseline />
-  </ThemeProvider>
+      <Story />
-);
+    </ThemeProvider>
-
+  ),
-export const decorators = [withMuiTheme];
+  (Story) => (
+    <QueryClientProvider client={queryClient}>
+      <Story />
+    </QueryClientProvider>
+  ),
+  (Story) => (
+    <NhostApolloProvider
+      fetchPolicy="cache-first"
+      graphqlUrl="http://localhost:1337/v1/graphql"
+    >
+      <Story />
+    </NhostApolloProvider>
+  ),
+  mswDecorator,
+];

dashboard/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @nhost/dashboard
 
+## 0.8.0
+
+### Minor Changes
+
+- 9a1aa7bb: add functions to the log dashboard
+- f29abe62: feat(dashboard): Users Management v2
+
+### Patch Changes
+
+- 7766624b: feat(dashboard): add JWT secret editor modal
+  - @nhost/react-apollo@4.12.1
+  - @nhost/nextjs@1.12.1
+
+## 0.7.13
+
+### Patch Changes
+
+- dd0738d5: fix(dashboard): provisioning status polling
+
+## 0.7.12
+
+### Patch Changes
+
+- b21222b3: chore(deps): update dependency @types/node to v16
+- 9e0486a3: fix(dashboard): close modals when navigating
+- Updated dependencies [b21222b3]
+- Updated dependencies [65687bee]
+- Updated dependencies [54df0df4]
+  - @nhost/nextjs@1.12.0
+  - @nhost/react-apollo@4.12.0
+
+## 0.7.11
+
+### Patch Changes
+
+- d6527122: fix(dashboard): use correct service URLs
+
 ## 0.7.10
 
 ### Patch Changes

dashboard/README.md

@@ -37,6 +37,14 @@ NEXT_PUBLIC_ENV=dev
 NEXT_PUBLIC_NHOST_PLATFORM=false
 ```
 
+### Storybook
+
+Components are documented using [Storybook](https://storybook.js.org/). To run Storybook, run the following command:
+
+```bash
+pnpm storybook
+```
+
 ### Full list of environment variables
 
 | Name                                      | Description                                                                                                                                          |

dashboard/next.config.js

@@ -66,6 +66,11 @@ module.exports = withBundleAnalyzer({
         destination: '/:workspaceSlug/:appSlug/settings/environment-variables',
         permanent: true,
       },
+      {
+        source: '/:workspaceSlug/:appSlug/users/:userId',
+        destination: '/:workspaceSlug/:appSlug/users?userId=:userId',
+        permanent: true,
+      },
     ];
   },
 });

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.7.10",
+  "version": "0.8.0",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -13,11 +13,11 @@
     "codegen": "graphql-codegen --config graphql.config.yaml --errors-only",
     "nhost:dev": "nhost dev -d",
     "format": "prettier --write \"src/**/*.{js,ts,tsx,jsx,json,md}\" --plugin-search-dir=.",
-    "storybook": "start-storybook -p 6006",
+    "storybook": "start-storybook -p 6006 -s public",
     "build-storybook": "build-storybook"
   },
   "dependencies": {
-    "@apollo/client": "^3.6.2",
+    "@apollo/client": "^3.7.3",
     "@codemirror/language": "^6.3.0",
     "@emotion/cache": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -35,8 +35,6 @@
     "@mui/system": "^5.10.14",
     "@mui/x-date-pickers": "^5.0.8",
     "@nhost/nextjs": "workspace:*",
-    "@nhost/nhost-js": "workspace:*",
-    "@nhost/react": "workspace:*",
     "@nhost/react-apollo": "workspace:*",
     "@segment/snippet": "^4.15.3",
     "@stripe/react-stripe-js": "^1.10.0",
@@ -90,21 +88,21 @@
     "@graphql-codegen/typescript-operations": "^2.5.1",
     "@graphql-codegen/typescript-react-apollo": "^3.3.1",
     "@next/bundle-analyzer": "^12.3.1",
-    "@storybook/addon-actions": "^6.5.13",
+    "@storybook/addon-actions": "^6.5.14",
-    "@storybook/addon-essentials": "^6.5.13",
+    "@storybook/addon-essentials": "^6.5.14",
-    "@storybook/addon-interactions": "^6.5.13",
+    "@storybook/addon-interactions": "^6.5.14",
-    "@storybook/addon-links": "^6.5.13",
+    "@storybook/addon-links": "^6.5.14",
     "@storybook/addon-postcss": "^2.0.0",
-    "@storybook/builder-webpack5": "^6.5.13",
+    "@storybook/builder-webpack5": "^6.5.14",
-    "@storybook/manager-webpack5": "^6.5.13",
+    "@storybook/manager-webpack5": "^6.5.14",
-    "@storybook/react": "^6.5.13",
+    "@storybook/react": "^6.5.14",
     "@storybook/testing-library": "^0.0.13",
     "@testing-library/dom": "^8.19.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/lodash.debounce": "^4.0.7",
-    "@types/node": "^18.11.9",
+    "@types/node": "^16.11.7",
     "@types/pluralize": "^0.0.29",
     "@types/react": "18.0.25",
     "@types/react-dom": "18.0.9",
@@ -113,8 +111,8 @@
     "@types/validator": "^13.7.10",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
-    "@vitejs/plugin-react": "^2.2.0",
+    "@vitejs/plugin-react": "^3.0.0",
-    "@vitest/coverage-c8": "^0.25.2",
+    "@vitest/coverage-c8": "^0.26.0",
     "autoprefixer": "^10.4.13",
     "babel-loader": "^8.3.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
@@ -131,19 +129,21 @@
     "jsdom": "^20.0.3",
     "lint-staged": ">=13",
     "msw": "^0.49.0",
+    "msw-storybook-addon": "^1.6.3",
     "postcss": "^8.4.19",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.2.0",
     "prettier-plugin-tailwindcss": "^0.2.0",
     "react-date-fns-hooks": "^0.9.4",
     "require-from-string": "^2.0.2",
+    "storybook-addon-next-router": "^4.0.1",
     "tailwindcss": "^3.1.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "typescript": "^4.8.4",
-    "vite": "^3.2.4",
+    "vite": "^4.0.2",
-    "vite-tsconfig-paths": "^3.6.0",
+    "vite-tsconfig-paths": "^4.0.3",
-    "vitest": "^0.25.2",
+    "vitest": "^0.26.2",
     "webpack": "^5.75.0"
   },
   "browserslist": {
@@ -157,5 +157,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "msw": {
+    "workerDirectory": "public"
   }
 }

dashboard/public/mockServiceWorker.js

@@ -0,0 +1,303 @@
+/* eslint-disable */
+/* tslint:disable */
+
+/**
+ * Mock Service Worker (0.49.0).
+ * @see https://github.com/mswjs/msw
+ * - Please do NOT modify this file.
+ * - Please do NOT serve this file on production.
+ */
+
+const INTEGRITY_CHECKSUM = '3d6b9f06410d179a7f7404d4bf4c3c70'
+const activeClientIds = new Set()
+
+self.addEventListener('install', function () {
+  self.skipWaiting()
+})
+
+self.addEventListener('activate', function (event) {
+  event.waitUntil(self.clients.claim())
+})
+
+self.addEventListener('message', async function (event) {
+  const clientId = event.source.id
+
+  if (!clientId || !self.clients) {
+    return
+  }
+
+  const client = await self.clients.get(clientId)
+
+  if (!client) {
+    return
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
+
+  switch (event.data) {
+    case 'KEEPALIVE_REQUEST': {
+      sendToClient(client, {
+        type: 'KEEPALIVE_RESPONSE',
+      })
+      break
+    }
+
+    case 'INTEGRITY_CHECK_REQUEST': {
+      sendToClient(client, {
+        type: 'INTEGRITY_CHECK_RESPONSE',
+        payload: INTEGRITY_CHECKSUM,
+      })
+      break
+    }
+
+    case 'MOCK_ACTIVATE': {
+      activeClientIds.add(clientId)
+
+      sendToClient(client, {
+        type: 'MOCKING_ENABLED',
+        payload: true,
+      })
+      break
+    }
+
+    case 'MOCK_DEACTIVATE': {
+      activeClientIds.delete(clientId)
+      break
+    }
+
+    case 'CLIENT_CLOSED': {
+      activeClientIds.delete(clientId)
+
+      const remainingClients = allClients.filter((client) => {
+        return client.id !== clientId
+      })
+
+      // Unregister itself when there are no more clients
+      if (remainingClients.length === 0) {
+        self.registration.unregister()
+      }
+
+      break
+    }
+  }
+})
+
+self.addEventListener('fetch', function (event) {
+  const { request } = event
+  const accept = request.headers.get('accept') || ''
+
+  // Bypass server-sent events.
+  if (accept.includes('text/event-stream')) {
+    return
+  }
+
+  // Bypass navigation requests.
+  if (request.mode === 'navigate') {
+    return
+  }
+
+  // Opening the DevTools triggers the "only-if-cached" request
+  // that cannot be handled by the worker. Bypass such requests.
+  if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
+    return
+  }
+
+  // Bypass all requests when there are no active clients.
+  // Prevents the self-unregistered worked from handling requests
+  // after it's been deleted (still remains active until the next reload).
+  if (activeClientIds.size === 0) {
+    return
+  }
+
+  // Generate unique request ID.
+  const requestId = Math.random().toString(16).slice(2)
+
+  event.respondWith(
+    handleRequest(event, requestId).catch((error) => {
+      if (error.name === 'NetworkError') {
+        console.warn(
+          '[MSW] Successfully emulated a network error for the "%s %s" request.',
+          request.method,
+          request.url,
+        )
+        return
+      }
+
+      // At this point, any exception indicates an issue with the original request/response.
+      console.error(
+        `\
+[MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
+        request.method,
+        request.url,
+        `${error.name}: ${error.message}`,
+      )
+    }),
+  )
+})
+
+async function handleRequest(event, requestId) {
+  const client = await resolveMainClient(event)
+  const response = await getResponse(event, client, requestId)
+
+  // Send back the response clone for the "response:*" life-cycle events.
+  // Ensure MSW is active and ready to handle the message, otherwise
+  // this message will pend indefinitely.
+  if (client && activeClientIds.has(client.id)) {
+    ;(async function () {
+      const clonedResponse = response.clone()
+      sendToClient(client, {
+        type: 'RESPONSE',
+        payload: {
+          requestId,
+          type: clonedResponse.type,
+          ok: clonedResponse.ok,
+          status: clonedResponse.status,
+          statusText: clonedResponse.statusText,
+          body:
+            clonedResponse.body === null ? null : await clonedResponse.text(),
+          headers: Object.fromEntries(clonedResponse.headers.entries()),
+          redirected: clonedResponse.redirected,
+        },
+      })
+    })()
+  }
+
+  return response
+}
+
+// Resolve the main client for the given event.
+// Client that issues a request doesn't necessarily equal the client
+// that registered the worker. It's with the latter the worker should
+// communicate with during the response resolving phase.
+async function resolveMainClient(event) {
+  const client = await self.clients.get(event.clientId)
+
+  if (client?.frameType === 'top-level') {
+    return client
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
+
+  return allClients
+    .filter((client) => {
+      // Get only those clients that are currently visible.
+      return client.visibilityState === 'visible'
+    })
+    .find((client) => {
+      // Find the client ID that's recorded in the
+      // set of clients that have registered the worker.
+      return activeClientIds.has(client.id)
+    })
+}
+
+async function getResponse(event, client, requestId) {
+  const { request } = event
+  const clonedRequest = request.clone()
+
+  function passthrough() {
+    // Clone the request because it might've been already used
+    // (i.e. its body has been read and sent to the client).
+    const headers = Object.fromEntries(clonedRequest.headers.entries())
+
+    // Remove MSW-specific request headers so the bypassed requests
+    // comply with the server's CORS preflight check.
+    // Operate with the headers as an object because request "Headers"
+    // are immutable.
+    delete headers['x-msw-bypass']
+
+    return fetch(clonedRequest, { headers })
+  }
+
+  // Bypass mocking when the client is not active.
+  if (!client) {
+    return passthrough()
+  }
+
+  // Bypass initial page load requests (i.e. static assets).
+  // The absence of the immediate/parent client in the map of the active clients
+  // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
+  // and is not ready to handle requests.
+  if (!activeClientIds.has(client.id)) {
+    return passthrough()
+  }
+
+  // Bypass requests with the explicit bypass header.
+  // Such requests can be issued by "ctx.fetch()".
+  if (request.headers.get('x-msw-bypass') === 'true') {
+    return passthrough()
+  }
+
+  // Notify the client that a request has been intercepted.
+  const clientMessage = await sendToClient(client, {
+    type: 'REQUEST',
+    payload: {
+      id: requestId,
+      url: request.url,
+      method: request.method,
+      headers: Object.fromEntries(request.headers.entries()),
+      cache: request.cache,
+      mode: request.mode,
+      credentials: request.credentials,
+      destination: request.destination,
+      integrity: request.integrity,
+      redirect: request.redirect,
+      referrer: request.referrer,
+      referrerPolicy: request.referrerPolicy,
+      body: await request.text(),
+      bodyUsed: request.bodyUsed,
+      keepalive: request.keepalive,
+    },
+  })
+
+  switch (clientMessage.type) {
+    case 'MOCK_RESPONSE': {
+      return respondWithMock(clientMessage.data)
+    }
+
+    case 'MOCK_NOT_FOUND': {
+      return passthrough()
+    }
+
+    case 'NETWORK_ERROR': {
+      const { name, message } = clientMessage.data
+      const networkError = new Error(message)
+      networkError.name = name
+
+      // Rejecting a "respondWith" promise emulates a network error.
+      throw networkError
+    }
+  }
+
+  return passthrough()
+}
+
+function sendToClient(client, message) {
+  return new Promise((resolve, reject) => {
+    const channel = new MessageChannel()
+
+    channel.port1.onmessage = (event) => {
+      if (event.data && event.data.error) {
+        return reject(event.data.error)
+      }
+
+      resolve(event.data)
+    }
+
+    client.postMessage(message, [channel.port2])
+  })
+}
+
+function sleep(timeMs) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, timeMs)
+  })
+}
+
+async function respondWithMock(response) {
+  await sleep(response.delay)
+  return new Response(response.body, response)
+}

dashboard/src/components/applications/ApplicationMigrating.tsx

@@ -15,7 +15,7 @@ import {
   useInsertFeatureFlagMutation,
   useUpdateApplicationMutation,
 } from '@/utils/__generated__/graphql';
-import { useUserEmail } from '@nhost/react';
+import { useUserEmail } from '@nhost/nextjs';
 import { useEffect, useState } from 'react';
 
 /**

dashboard/src/components/applications/ApplicationPaused.tsx

@@ -11,7 +11,7 @@ import Text from '@/ui/v2/Text';
 import { discordAnnounce } from '@/utils/discordAnnounce';
 import { triggerToast } from '@/utils/toast';
 import { updateOwnCache } from '@/utils/updateOwnCache';
-import { useUserData } from '@nhost/react';
+import { useUserData } from '@nhost/nextjs';
 import Image from 'next/image';
 import { useState } from 'react';
 import { RemoveApplicationModal } from './RemoveApplicationModal';

dashboard/src/components/applications/ApplicationUnknown.tsx

@@ -5,7 +5,7 @@ import { Modal } from '@/ui/Modal';
 import Button from '@/ui/v2/Button';
 import { Dropdown } from '@/ui/v2/Dropdown';
 import Text from '@/ui/v2/Text';
-import { useUserData } from '@nhost/react';
+import { useUserData } from '@nhost/nextjs';
 import Image from 'next/image';
 import { useState } from 'react';
 import ApplicationInfo from './ApplicationInfo';

dashboard/src/components/applications/ConnectGithubModal.tsx

@@ -32,9 +32,12 @@ export default function ConnectGithubModal({ close }: ConnectGithubModalProps) {
     useState<ConnectGithubModalState>('CONNECTING');
   const [selectedRepoId, setSelectedRepoId] = useState<string | null>(null);
 
-  const { data, loading, error } = useGetGithubRepositoriesQuery({
+  const { data, loading, error, startPolling } =
-    pollInterval: 2000,
+    useGetGithubRepositoriesQuery();
-  });
+
+  useEffect(() => {
+    startPolling(2000);
+  }, [startPolling]);
 
   const handleSelectAnotherRepository = () => {
     setSelectedRepoId(null);

dashboard/src/components/applications/HasuraData.tsx

@@ -1,12 +1,16 @@
 import { ConnectionDetail } from '@/components/applications/ConnectionDetail';
 import { LoadingScreen } from '@/components/common/LoadingScreen';
+import useIsPlatform from '@/hooks/common/useIsPlatform';
 import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
 import Button from '@/ui/v2/Button';
 import ArrowSquareOutIcon from '@/ui/v2/icons/ArrowSquareOutIcon';
 import Link from '@/ui/v2/Link';
 import Text from '@/ui/v2/Text';
+import generateAppServiceUrl, {
+  defaultLocalBackendSlugs,
+  defaultRemoteBackendSlugs,
+} from '@/utils/common/generateAppServiceUrl';
 import { LOCAL_HASURA_URL } from '@/utils/env';
-import { generateAppServiceUrl } from '@/utils/helpers';
 import Image from 'next/image';
 
 interface HasuraDataProps {
@@ -15,6 +19,7 @@ interface HasuraDataProps {
 
 export function HasuraData({ close }: HasuraDataProps) {
   const { currentApplication } = useCurrentWorkspaceAndApplication();
+  const isPlatform = useIsPlatform();
 
   if (
     !currentApplication?.subdomain ||
@@ -24,13 +29,15 @@ export function HasuraData({ close }: HasuraDataProps) {
   }
 
   const hasuraUrl =
-    process.env.NEXT_PUBLIC_ENV === 'dev'
+    process.env.NEXT_PUBLIC_ENV === 'dev' || !isPlatform
-      ? LOCAL_HASURA_URL
+      ? `${LOCAL_HASURA_URL}/console`
-      : `${generateAppServiceUrl(
+      : generateAppServiceUrl(
           currentApplication?.subdomain,
           currentApplication?.region.awsName,
           'hasura',
-        )}/console`;
+          defaultLocalBackendSlugs,
+          { ...defaultRemoteBackendSlugs, hasura: '/console' },
+        );
 
   return (
     <div className="mx-auto w-full max-w-md px-6 py-4 text-left">

dashboard/src/components/applications/functions/FunctionLogsTerminalFromPage.tsx

@@ -13,14 +13,17 @@ export function FunctionsLogsTerminalPage({ functionName }: any) {
   const { currentApplication } = useCurrentWorkspaceAndApplication();
   const [normalizedFunctionData, setNormalizedFunctionData] = useState(null);
 
-  const { data } = useGetFunctionLogQuery({
+  const { data, startPolling } = useGetFunctionLogQuery({
     variables: {
       subdomain: currentApplication.subdomain,
       functionPaths: [functionName?.split('/').slice(1, 3).join('/')],
     },
-    pollInterval: 3000,
   });
 
+  useEffect(() => {
+    startPolling(3000);
+  }, [startPolling]);
+
   useEffect(() => {
     if (!data || data.getFunctionLogs.length === 0) {
       return;

dashboard/src/components/applications/graphql/UserSelect.tsx

@@ -2,7 +2,7 @@ import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLCl
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Option from '@/ui/v2/Option';
 import Select from '@/ui/v2/Select';
-import type { RemoteAppGetUsersQuery } from '@/utils/__generated__/graphql';
+import type { RemoteAppGetUsersCustomQuery } from '@/utils/__generated__/graphql';
 import { useRemoteAppGetUsersCustomQuery } from '@/utils/__generated__/graphql';
 import { DEFAULT_ROLES } from './utils';
 
@@ -57,7 +57,7 @@ export function UserSelect({ onUserChange, ...props }: UserSelectProps) {
           return;
         }
 
-        const user: RemoteAppGetUsersQuery['users'][number] = users.find(
+        const user: RemoteAppGetUsersCustomQuery['users'][0] = users.find(
           ({ id }) => id === userId,
         );
 

dashboard/src/components/common/ControlledAutocomplete/ControlledAutocomplete.tsx

@@ -37,20 +37,27 @@ function ControlledAutocomplete(
   }: ControlledAutocompleteProps<AutocompleteOption>,
   ref: ForwardedRef<HTMLInputElement>,
 ) {
-  const { setValue } = useFormContext();
+  const form = useFormContext();
   const { field } = useController({
-    ...controllerProps,
+    ...(controllerProps || {}),
     name: controllerProps?.name || name || '',
     control: controllerProps?.control || control,
   });
 
+  if (!form) {
+    throw new Error('ControlledAutocomplete must be used in a FormContext.');
+  }
+
+  const { setValue } = form || {};
+
   return (
     <Autocomplete
       {...props}
       {...field}
+      inputValue={typeof field.value === 'string' ? field.value : undefined}
       ref={mergeRefs([field.ref, ref])}
       onChange={(event, options, reason, details) => {
-        setValue(controllerProps?.name || name, options);
+        setValue?.(controllerProps?.name || name, options);
 
         if (props.onChange) {
           props.onChange(event, options, reason, details);

dashboard/src/components/common/DataGrid/DataGrid.tsx

@@ -2,11 +2,11 @@ import DataGridBody from '@/components/common/DataGridBody';
 import DataGridFrame from '@/components/common/DataGridFrame';
 import type { DataGridHeaderProps } from '@/components/common/DataGridHeader';
 import DataGridHeader from '@/components/common/DataGridHeader';
-import DataBrowserEmptyState from '@/components/data-browser/DataBrowserEmptyState';
+import DataBrowserEmptyState from '@/components/dataBrowser/DataBrowserEmptyState';
 import { DataGridProvider } from '@/context/DataGridContext';
 import type { UseDataGridOptions } from '@/hooks/useDataGrid';
 import useDataGrid from '@/hooks/useDataGrid';
-import type { DataBrowserGridColumn } from '@/types/data-browser';
+import type { DataBrowserGridColumn } from '@/types/dataBrowser';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import type { ForwardedRef } from 'react';
 import { forwardRef, useEffect, useRef } from 'react';

dashboard/src/components/common/DataGridBody/DataGridBody.tsx

@@ -1,7 +1,7 @@
 import type { DataGridProps } from '@/components/common/DataGrid';
 import DataGridCell from '@/components/common/DataGridCell';
 import useDataGridConfig from '@/hooks/useDataGridConfig';
-import type { DataBrowserGridColumn } from '@/types/data-browser';
+import type { DataBrowserGridColumn } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import PlusIcon from '@/ui/v2/icons/PlusIcon';
 import type { DetailedHTMLProps, HTMLProps, KeyboardEvent } from 'react';
@@ -35,15 +35,15 @@ function InsertPlaceholderTableRow({
 }: InsertPlaceholderTableRowProps) {
   return (
     <div
-      className="h-12 border-r-1 border-b-1 border-gray-200 bg-white"
+      className="h-12 bg-white border-gray-200 border-r-1 border-b-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"
+        className="justify-start w-full h-full px-2 py-3 text-xs font-normal rounded-none hover:shadow-none focus:shadow-none focus:outline-none"
-        startIcon={<PlusIcon className="h-4 w-4 text-greyscaleGrey" />}
+        startIcon={<PlusIcon className="w-4 h-4 text-greyscaleGrey" />}
       >
         Insert New Row
       </Button>
@@ -181,7 +181,7 @@ export default function DataGridBody<T extends object>({
   return (
     <div {...getTableBodyProps()} ref={bodyRef} {...props}>
       {rows.length === 0 && !loading && (
-        <div className="flex flex-nowrap pr-5">
+        <div className="flex pr-5 flex-nowrap">
           {onInsertRow ? (
             <InsertPlaceholderTableRow
               style={{
@@ -279,7 +279,7 @@ export default function DataGridBody<T extends object>({
               })}
 
               {allowInsertColumn && (
-                <div className="h-12 w-25 border-r-1 border-b-1 border-gray-200 bg-white" />
+                <div className="h-12 bg-white border-gray-200 w-25 border-r-1 border-b-1" />
               )}
             </div>
 

dashboard/src/components/common/DataGridCell/DataGridCell.tsx

@@ -3,7 +3,7 @@ import type {
   ColumnType,
   DataBrowserGridCell,
   DataBrowserGridCellProps,
-} from '@/types/data-browser';
+} from '@/types/dataBrowser';
 import Tooltip, { useTooltip } from '@/ui/v2/Tooltip';
 import { triggerToast } from '@/utils/toast';
 import type {

dashboard/src/components/common/DataGridHeader/DataGridHeader.tsx

@@ -1,6 +1,6 @@
 import type { DataGridProps } from '@/components/common/DataGrid';
 import useDataGridConfig from '@/hooks/useDataGridConfig';
-import type { DataBrowserGridColumn } from '@/types/data-browser';
+import type { DataBrowserGridColumn } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import Divider from '@/ui/v2/Divider';
 import { Dropdown } from '@/ui/v2/Dropdown';

dashboard/src/components/common/DialogProvider/DialogContext.ts

@@ -15,10 +15,14 @@ export type DialogType =
   | 'EDIT_FOREIGN_KEY'
   | 'CREATE_ROLE'
   | 'EDIT_ROLE'
+  | 'CREATE_USER'
   | 'CREATE_PERMISSION_VARIABLE'
   | 'EDIT_PERMISSION_VARIABLE'
   | 'CREATE_ENVIRONMENT_VARIABLE'
-  | 'EDIT_ENVIRONMENT_VARIABLE';
+  | 'EDIT_ENVIRONMENT_VARIABLE'
+  | 'EDIT_USER'
+  | 'EDIT_USER_PASSWORD'
+  | 'EDIT_JWT_SECRET';
 
 export interface DialogConfig<TPayload = unknown> {
   /**

dashboard/src/components/common/DialogProvider/DialogProvider.tsx

@@ -1,24 +1,36 @@
 import RetryableErrorBoundary from '@/components/common/RetryableErrorBoundary';
-import CreateForeignKeyForm from '@/components/data-browser/CreateForeignKeyForm';
+import CreateForeignKeyForm from '@/components/dataBrowser/CreateForeignKeyForm';
-import EditForeignKeyForm from '@/components/data-browser/EditForeignKeyForm';
+import EditForeignKeyForm from '@/components/dataBrowser/EditForeignKeyForm';
 import CreateEnvironmentVariableForm from '@/components/settings/environmentVariables/CreateEnvironmentVariableForm';
 import EditEnvironmentVariableForm from '@/components/settings/environmentVariables/EditEnvironmentVariableForm';
+import EditJwtSecretForm from '@/components/settings/environmentVariables/EditJwtSecretForm';
 import CreatePermissionVariableForm from '@/components/settings/permissions/CreatePermissionVariableForm';
 import EditPermissionVariableForm from '@/components/settings/permissions/EditPermissionVariableForm';
 import CreateRoleForm from '@/components/settings/roles/CreateRoleForm';
 import EditRoleForm from '@/components/settings/roles/EditRoleForm';
+import CreateUserForm from '@/components/users/CreateUserForm';
+import EditUserForm from '@/components/users/EditUserForm';
+import EditUserPasswordForm from '@/components/users/EditUserPasswordForm';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import AlertDialog from '@/ui/v2/AlertDialog';
 import { BaseDialog } from '@/ui/v2/Dialog';
 import Drawer from '@/ui/v2/Drawer';
 import dynamic from 'next/dynamic';
+import { useRouter } from 'next/router';
 import type {
   BaseSyntheticEvent,
   DetailedHTMLProps,
   HTMLProps,
   PropsWithChildren,
 } from 'react';
-import { useCallback, useMemo, useReducer, useRef, useState } from 'react';
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+} from 'react';
 import { twMerge } from 'tailwind-merge';
 import type { DialogConfig, DialogType } from './DialogContext';
 import DialogContext from './DialogContext';
@@ -49,31 +61,33 @@ function LoadingComponent({
 }
 
 const CreateRecordForm = dynamic(
-  () => import('@/components/data-browser/CreateRecordForm'),
+  () => import('@/components/dataBrowser/CreateRecordForm'),
   { ssr: false, loading: () => LoadingComponent() },
 );
 
 const CreateColumnForm = dynamic(
-  () => import('@/components/data-browser/CreateColumnForm'),
+  () => import('@/components/dataBrowser/CreateColumnForm'),
   { ssr: false, loading: () => LoadingComponent() },
 );
 
 const EditColumnForm = dynamic(
-  () => import('@/components/data-browser/EditColumnForm'),
+  () => import('@/components/dataBrowser/EditColumnForm'),
   { ssr: false, loading: () => LoadingComponent() },
 );
 
 const CreateTableForm = dynamic(
-  () => import('@/components/data-browser/CreateTableForm'),
+  () => import('@/components/dataBrowser/CreateTableForm'),
   { ssr: false, loading: () => LoadingComponent() },
 );
 
 const EditTableForm = dynamic(
-  () => import('@/components/data-browser/EditTableForm'),
+  () => import('@/components/dataBrowser/EditTableForm'),
   { ssr: false, loading: () => LoadingComponent() },
 );
 
 function DialogProvider({ children }: PropsWithChildren<unknown>) {
+  const router = useRouter();
+
   const [
     {
       open: dialogOpen,
@@ -161,26 +175,29 @@ function DialogProvider({ children }: PropsWithChildren<unknown>) {
     alertDialogDispatch({ type: 'CLEAR_ALERT_CONTENT' });
   }
 
-  function openDirtyConfirmation(config?: Partial<DialogConfig<string>>) {
+  const openDirtyConfirmation = useCallback(
-    const { props, ...restConfig } = config || {};
+    (config?: Partial<DialogConfig<string>>) => {
+      const { props, ...restConfig } = config || {};
 
-    openAlertDialog({
+      setShowDirtyConfirmation(true);
-      ...config,
+      openAlertDialog({
-      title: 'Unsaved changes',
+        ...config,
-      payload:
+        title: 'Unsaved changes',
-        'You have unsaved local changes. Are you sure you want to discard them?',
+        payload:
-      props: {
+          'You have unsaved local changes. Are you sure you want to discard them?',
-        ...props,
+        props: {
-        primaryButtonText: 'Discard',
+          ...props,
-        primaryButtonColor: 'error',
+          primaryButtonText: 'Discard',
-      },
+          primaryButtonColor: 'error',
-      ...restConfig,
+        },
-    });
+        ...restConfig,
-  }
+      });
+    },
+    [],
+  );
 
   function closeDrawerWithDirtyGuard(event?: BaseSyntheticEvent) {
     if (isDrawerDirty.current && event?.type !== 'submit') {
-      setShowDirtyConfirmation(true);
       openDirtyConfirmation({ props: { onPrimaryAction: closeDrawer } });
       return;
     }
@@ -190,7 +207,6 @@ function DialogProvider({ children }: PropsWithChildren<unknown>) {
 
   function closeDialogWithDirtyGuard(event?: BaseSyntheticEvent) {
     if (isDialogDirty.current && event?.type !== 'submit') {
-      setShowDirtyConfirmation(true);
       openDirtyConfirmation({ props: { onPrimaryAction: closeDialog } });
       return;
     }
@@ -248,6 +264,32 @@ function DialogProvider({ children }: PropsWithChildren<unknown>) {
     onCancel: closeDrawerWithDirtyGuard,
   };
 
+  useEffect(() => {
+    function handleCloseDrawerAndDialog() {
+      if (isDrawerDirty.current || isDialogDirty.current) {
+        openDirtyConfirmation({
+          props: {
+            onPrimaryAction: () => {
+              closeDialog();
+              closeDrawer();
+            },
+          },
+        });
+
+        throw new Error('Unsaved changes');
+      }
+
+      closeDrawer();
+      closeDialog();
+    }
+
+    router?.events?.on?.('routeChangeStart', handleCloseDrawerAndDialog);
+
+    return () => {
+      router?.events?.off?.('routeChangeStart', handleCloseDrawerAndDialog);
+    };
+  }, [closeDialog, closeDrawer, openDirtyConfirmation, router.events]);
+
   return (
     <DialogContext.Provider value={contextValue}>
       <AlertDialog
@@ -315,6 +357,10 @@ function DialogProvider({ children }: PropsWithChildren<unknown>) {
             <EditRoleForm {...sharedDialogProps} />
           )}
 
+          {activeDialogType === 'CREATE_USER' && (
+            <CreateUserForm {...sharedDialogProps} />
+          )}
+
           {activeDialogType === 'CREATE_PERMISSION_VARIABLE' && (
             <CreatePermissionVariableForm {...sharedDialogProps} />
           )}
@@ -330,6 +376,17 @@ function DialogProvider({ children }: PropsWithChildren<unknown>) {
           {activeDialogType === 'EDIT_ENVIRONMENT_VARIABLE' && (
             <EditEnvironmentVariableForm {...sharedDialogProps} />
           )}
+
+          {activeDialogType === 'EDIT_USER_PASSWORD' && (
+            <EditUserPasswordForm
+              {...sharedDialogProps}
+              user={sharedDialogProps?.user}
+            />
+          )}
+
+          {activeDialogType === 'EDIT_JWT_SECRET' && (
+            <EditJwtSecretForm {...sharedDialogProps} />
+          )}
         </RetryableErrorBoundary>
       </BaseDialog>
 
@@ -375,6 +432,10 @@ function DialogProvider({ children }: PropsWithChildren<unknown>) {
               schema={drawerPayload?.schema}
             />
           )}
+
+          {activeDrawerType === 'EDIT_USER' && (
+            <EditUserForm {...sharedDrawerProps} {...drawerPayload} />
+          )}
         </RetryableErrorBoundary>
       </Drawer>
 

dashboard/src/components/common/Pagination/Pagination.tsx

@@ -0,0 +1,138 @@
+import type { ButtonProps } from '@/ui/v2/Button';
+import Button from '@/ui/v2/Button';
+import Input from '@/ui/v2/Input';
+import Text from '@/ui/v2/Text';
+import ChevronLeftIcon from '@/ui/v2/icons/ChevronLeftIcon';
+import ChevronRightIcon from '@/ui/v2/icons/ChevronRightIcon';
+import type { DetailedHTMLProps, HTMLProps } from 'react';
+import { twMerge } from 'tailwind-merge';
+
+export type PaginationProps = DetailedHTMLProps<
+  HTMLProps<HTMLDivElement>,
+  HTMLDivElement
+> & {
+  /**
+   * Total number of pages.
+   */
+  totalNrOfPages: number;
+  /**
+   * Number of total elements per page.
+   */
+  elementsPerPage?: number;
+  /**
+   * Total number of elements.
+   */
+  totalNrOfElements: number;
+  /**
+   * Current page number.
+   */
+  currentPageNumber: number;
+  /**
+   * Function to be called when navigating to the previous page.
+   */
+  onPrevPageClick: VoidFunction;
+  /**
+   * Function to be called when navigating to the next page.
+   */
+  onNextPageClick: VoidFunction;
+  /**
+   * Function to be called when a new page number is submitted.
+   */
+  onPageChange: (page: number) => void;
+  /**
+   * Props for component slots.
+   */
+  slotProps?: {
+    /**
+     * Props to be passed to the next button component.
+     */
+    nextButton?: Partial<ButtonProps>;
+    /**
+     * Props to be passed to the previous button component.
+     */
+    prevButton?: Partial<ButtonProps>;
+  };
+};
+
+export default function Pagination({
+  className,
+  totalNrOfPages,
+  currentPageNumber,
+  onPrevPageClick,
+  onNextPageClick,
+  slotProps,
+  elementsPerPage,
+  onPageChange,
+  totalNrOfElements,
+  ...props
+}: PaginationProps) {
+  return (
+    <div
+      className={twMerge('grid grid-flow-col items-center gap-2', className)}
+      {...props}
+    >
+      <div className="grid justify-start grid-flow-col gap-2">
+        <Button
+          variant="outlined"
+          color="secondary"
+          className="block text-xs"
+          disabled={currentPageNumber === 1}
+          aria-label="Previous page"
+          onClick={onPrevPageClick}
+        >
+          <ChevronLeftIcon className="w-4 h-4" />
+          Back
+        </Button>
+
+        <div className="grid items-center grid-cols-3 gap-1 text-center grid-col !text-greyscaleGreyDark">
+          <Text className="text-xs align-middle ">Page</Text>
+          <Input
+            value={currentPageNumber}
+            onChange={(e) => {
+              const page = parseInt(e.target.value, 10);
+              if (page > 0 && page <= totalNrOfPages) {
+                onPageChange(page);
+              }
+            }}
+            disabled={totalNrOfPages === 1}
+            color="secondary"
+            slotProps={{
+              inputRoot: {
+                className: 'w-4 h-2.5 text-center !text-[11.5px]',
+              },
+            }}
+          />
+          <Text className="self-center text-xs align-middle text-greyscaleGreyDark">
+            of {totalNrOfPages}
+          </Text>
+        </div>
+
+        <Button
+          variant="outlined"
+          color="secondary"
+          className="text-xs"
+          aria-label="Next page"
+          disabled={currentPageNumber === totalNrOfPages}
+          onClick={onNextPageClick}
+          {...slotProps?.nextButton}
+        >
+          Next
+          <ChevronRightIcon className="w-4 h-4" />
+        </Button>
+      </div>
+      <div className="flex flex-row items-center justify-end text-center gap-x-1">
+        <Text className="text-xs text-greyscaleGreyDark">
+          {currentPageNumber === 1 && currentPageNumber}
+          {currentPageNumber === 2 && elementsPerPage + currentPageNumber - 1}
+          {currentPageNumber > 2 &&
+            (currentPageNumber - 1) * elementsPerPage + 1}{' '}
+          -{' '}
+          {totalNrOfElements < currentPageNumber * elementsPerPage
+            ? totalNrOfElements
+            : currentPageNumber * elementsPerPage}{' '}
+          of {totalNrOfElements} users
+        </Text>
+      </div>
+    </div>
+  );
+}

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

@@ -0,0 +1,3 @@
+export * from './Pagination';
+export { default } from './Pagination';
+

dashboard/src/components/common/ReadOnlyToggle/ReadOnlyToggle.stories.tsx

@@ -0,0 +1,48 @@
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { PropsWithoutRef } from 'react';
+
+import type { ReadOnlyToggleProps } from './ReadOnlyToggle';
+import ReadOnlyToggle from './ReadOnlyToggle';
+
+export default {
+  title: 'Common Components / ReadOnlyToggle',
+  component: ReadOnlyToggle,
+  argTypes: {
+    checked: {
+      options: [null, true, false],
+      control: { type: 'radio' },
+    },
+  },
+} as ComponentMeta<typeof ReadOnlyToggle>;
+
+const Template: ComponentStory<typeof ReadOnlyToggle> = function Template(
+  args: PropsWithoutRef<ReadOnlyToggleProps>,
+) {
+  return <ReadOnlyToggle {...args} />;
+};
+
+export const Null = Template.bind({});
+Null.args = {
+  checked: null,
+};
+
+export const True = Template.bind({});
+True.args = {
+  checked: true,
+};
+
+export const False = Template.bind({});
+False.args = {
+  checked: false,
+};
+
+export const CustomClasses = Template.bind({});
+CustomClasses.args = {
+  checked: true,
+  className: '!bg-red',
+  slotProps: {
+    label: {
+      className: '!text-sm !text-white',
+    },
+  },
+};

dashboard/src/components/common/ReadOnlyToggle/ReadOnlyToggle.tsx

@@ -1,39 +1,79 @@
-import type { ForwardedRef } from 'react';
+import type { TextProps } from '@/ui/v2/Text';
+import Text from '@/ui/v2/Text';
+import type { DetailedHTMLProps, ForwardedRef, HTMLProps } from 'react';
 import { forwardRef } from 'react';
 import { twMerge } from 'tailwind-merge';
 
-const ReadOnlyToggle = forwardRef(
+export interface ReadOnlyToggleProps
-  (
+  extends DetailedHTMLProps<HTMLProps<HTMLSpanElement>, HTMLSpanElement> {
-    { checked }: { checked: boolean | null },
+  /**
-    ref: ForwardedRef<HTMLSpanElement>,
+   * Determines whether the toggle is checked or not.
-  ) => (
+   */
+  checked?: boolean | null;
+  /**
+   * Props passed to specific component slots.
+   */
+  slotProps?: {
+    /**
+     * Props passed to the root `<span />` element.
+     */
+    root?: DetailedHTMLProps<HTMLProps<HTMLSpanElement>, HTMLSpanElement>;
+    /**
+     * Props passed to the label.
+     */
+    label?: TextProps;
+  };
+}
+
+function ReadOnlyToggle(
+  { checked, className, slotProps = {}, ...props }: ReadOnlyToggleProps,
+  ref: ForwardedRef<HTMLSpanElement>,
+) {
+  return (
     <span
-      className="inline-grid h-full w-full grid-flow-col items-center justify-start gap-1.5"
+      {...props}
+      {...(slotProps?.root || {})}
+      className={twMerge(
+        'inline-grid h-full w-full grid-flow-col items-center justify-start gap-1.5',
+        slotProps?.root?.className,
+        className,
+      )}
       ref={ref}
     >
       <span
         className={twMerge(
           'box-border inline-grid h-3 w-5 items-center rounded-full px-0.5',
-          checked === true && 'justify-end bg-greyscaleDark',
+          checked === true &&
+            'border-1 border-transparent justify-end bg-greyscaleDark',
           checked === false && 'border-1 border-greyscaleDark',
           checked === null && 'border-1 border-greyscaleDark',
         )}
       >
         <span
           className={twMerge(
-            'inline rounded-full',
+            'inline-block rounded-full',
             checked === true && 'h-2 w-2 bg-white',
             checked === false && 'h-2 w-2 bg-greyscaleDark',
-            checked === null && 'h-px w-2 justify-self-center bg-greyscaleDark',
+            checked === null &&
+              'h-px my-px w-2 justify-self-center bg-greyscaleDark',
           )}
         />
       </span>
 
-      <span className="truncate text-xs font-normal">{String(checked)}</span>
+      <Text
+        {...(slotProps?.label || {})}
+        component="span"
+        className={twMerge(
+          'truncate !text-xs font-normal',
+          slotProps?.label?.className,
+        )}
+      >
+        {String(checked)}
+      </Text>
     </span>
-  ),
+  );
-);
+}
 
 ReadOnlyToggle.displayName = 'NhostReadOnlyToggle';
 
-export default ReadOnlyToggle;
+export default forwardRef(ReadOnlyToggle);

dashboard/src/components/dataBrowser/BaseColumnForm/BaseColumnForm.tsx

@@ -3,7 +3,7 @@ import ControlledCheckbox from '@/components/common/ControlledCheckbox';
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
 import InlineCode from '@/components/common/InlineCode';
-import type { ColumnType, DatabaseColumn } from '@/types/data-browser';
+import type { ColumnType, DatabaseColumn } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import Input from '@/ui/v2/Input';
 import { OptionBase } from '@/ui/v2/Option';

dashboard/src/components/dataBrowser/BaseColumnForm/ForeignKeyEditor.tsx

@@ -1,6 +1,6 @@
 import { useDialog } from '@/components/common/DialogProvider';
-import type { BaseForeignKeyFormValues } from '@/components/data-browser/BaseForeignKeyForm';
+import type { BaseForeignKeyFormValues } from '@/components/dataBrowser/BaseForeignKeyForm';
-import type { DatabaseColumn } from '@/types/data-browser';
+import type { DatabaseColumn } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import ArrowRightIcon from '@/ui/v2/icons/ArrowRightIcon';
 import LinkIcon from '@/ui/v2/icons/LinkIcon';

dashboard/src/components/dataBrowser/BaseForeignKeyForm/BaseForeignKeyForm.tsx

@@ -2,7 +2,7 @@ import ControlledSelect from '@/components/common/ControlledSelect';
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
 import useDatabaseQuery from '@/hooks/dataBrowser/useDatabaseQuery';
-import type { DatabaseColumn, ForeignKeyRelation } from '@/types/data-browser';
+import type { DatabaseColumn, ForeignKeyRelation } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import Divider from '@/ui/v2/Divider';
 import Option from '@/ui/v2/Option';

dashboard/src/components/dataBrowser/BaseForeignKeyForm/ReferencedSchemaSelect.tsx

@@ -1,6 +1,6 @@
 import type { ControlledSelectProps } from '@/components/common/ControlledSelect';
 import ControlledSelect from '@/components/common/ControlledSelect';
-import type { NormalizedQueryDataRow } from '@/types/data-browser';
+import type { NormalizedQueryDataRow } from '@/types/dataBrowser';
 import Option from '@/ui/v2/Option';
 import type { ForwardedRef, PropsWithoutRef } from 'react';
 import { forwardRef } from 'react';

dashboard/src/components/dataBrowser/BaseForeignKeyForm/ReferencedTableSelect.tsx

@@ -1,5 +1,5 @@
 import ControlledSelect from '@/components/common/ControlledSelect';
-import type { NormalizedQueryDataRow } from '@/types/data-browser';
+import type { NormalizedQueryDataRow } from '@/types/dataBrowser';
 import Option from '@/ui/v2/Option';
 import { useFormContext, useFormState, useWatch } from 'react-hook-form';
 import type { BaseForeignKeyFormValues } from './BaseForeignKeyForm';

dashboard/src/components/dataBrowser/BaseRecordForm/BaseRecordForm.tsx

@@ -1,10 +1,10 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
-import DatabaseRecordInputGroup from '@/components/data-browser/DatabaseRecordInputGroup';
+import DatabaseRecordInputGroup from '@/components/dataBrowser/DatabaseRecordInputGroup';
 import type {
   ColumnInsertOptions,
   DataBrowserGridColumn,
-} from '@/types/data-browser';
+} from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import { useEffect } from 'react';
 import { useFormContext } from 'react-hook-form';

dashboard/src/components/dataBrowser/BaseTableForm/BaseTableForm.tsx

@@ -1,7 +1,7 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
-import { baseColumnValidationSchema } from '@/components/data-browser/BaseColumnForm';
+import { baseColumnValidationSchema } from '@/components/dataBrowser/BaseColumnForm';
-import type { DatabaseTable, ForeignKeyRelation } from '@/types/data-browser';
+import type { DatabaseTable, ForeignKeyRelation } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import Input from '@/ui/v2/Input';
 import { useEffect } from 'react';

dashboard/src/components/dataBrowser/BaseTableForm/ColumnEditorRow.tsx

@@ -1,7 +1,7 @@
 import ControlledAutocomplete from '@/components/common/ControlledAutocomplete';
 import ControlledCheckbox from '@/components/common/ControlledCheckbox';
 import InlineCode from '@/components/common/InlineCode';
-import type { ColumnType, ForeignKeyRelation } from '@/types/data-browser';
+import type { ColumnType, ForeignKeyRelation } from '@/types/dataBrowser';
 import type { ButtonProps } from '@/ui/v2/Button';
 import type { CheckboxProps } from '@/ui/v2/Checkbox';
 import IconButton from '@/ui/v2/IconButton';

dashboard/src/components/dataBrowser/BaseTableForm/ForeignKeyEditorRow.tsx

@@ -1,4 +1,4 @@
-import type { ForeignKeyRelation } from '@/types/data-browser';
+import type { ForeignKeyRelation } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import ArrowRightIcon from '@/ui/v2/icons/ArrowRightIcon';
 import LinkIcon from '@/ui/v2/icons/LinkIcon';

dashboard/src/components/dataBrowser/BaseTableForm/ForeignKeyEditorSection.tsx

@@ -1,6 +1,6 @@
 import { useDialog } from '@/components/common/DialogProvider';
-import type { BaseForeignKeyFormValues } from '@/components/data-browser/BaseForeignKeyForm';
+import type { BaseForeignKeyFormValues } from '@/components/dataBrowser/BaseForeignKeyForm';
-import type { DatabaseColumn, ForeignKeyRelation } from '@/types/data-browser';
+import type { DatabaseColumn, ForeignKeyRelation } from '@/types/dataBrowser';
 import Button from '@/ui/v2/Button';
 import PlusIcon from '@/ui/v2/icons/PlusIcon';
 import InputLabel from '@/ui/v2/InputLabel';

dashboard/src/components/dataBrowser/BaseTableForm/IdentityColumnSelect.tsx

@@ -1,5 +1,5 @@
 import ControlledSelect from '@/components/common/ControlledSelect';
-import type { ColumnType, DatabaseColumn } from '@/types/data-browser';
+import type { ColumnType, DatabaseColumn } from '@/types/dataBrowser';
 import Option from '@/ui/v2/Option';
 import { identityTypes } from '@/utils/dataBrowser/postgresqlConstants';
 import { useMemo } from 'react';

dashboard/src/components/dataBrowser/BaseTableForm/PrimaryKeySelect.tsx

@@ -1,5 +1,5 @@
 import ControlledSelect from '@/components/common/ControlledSelect';
-import type { DatabaseColumn } from '@/types/data-browser';
+import type { DatabaseColumn } from '@/types/dataBrowser';
 import Option from '@/ui/v2/Option';
 import { useMemo } from 'react';
 import { useFormState, useWatch } from 'react-hook-form';

dashboard/src/components/dataBrowser/ColumnAutocomplete/ColumnAutocomplete.stories.tsx

@@ -0,0 +1,129 @@
+import Form from '@/components/common/Form';
+import Button from '@/ui/v2/Button';
+import Text from '@/ui/v2/Text';
+import hasuraMetadataQuery from '@/utils/msw/mocks/rest/hasuraMetadataQuery';
+import tableQuery from '@/utils/msw/mocks/rest/tableQuery';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
+import { useState } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import type { ColumnAutocompleteProps } from './ColumnAutocomplete';
+import ColumnAutocomplete from './ColumnAutocomplete';
+
+export default {
+  title: 'Data Browser / ColumnAutocomplete',
+  component: ColumnAutocomplete,
+  parameters: {
+    docs: {
+      source: {
+        type: 'code',
+      },
+    },
+  },
+} as ComponentMeta<typeof ColumnAutocomplete>;
+
+const defaultParameters = {
+  nextRouter: {
+    path: '/[workspaceSlug]/[appSlug]/database/browser/[dataSourceSlug]/[schemaSlug]/[tableSlug]',
+    asPath: '/workspace/app/database/browser/default/public/users',
+    query: {
+      workspaceSlug: 'workspace',
+      appSlug: 'app',
+      dataSourceSlug: 'default',
+      schemaSlug: 'public',
+      tableSlug: 'books',
+    },
+  },
+  msw: {
+    handlers: [tableQuery, hasuraMetadataQuery],
+  },
+};
+
+const Template: ComponentStory<typeof ColumnAutocomplete> = function Template(
+  args: ColumnAutocompleteProps,
+) {
+  const [submittedValues, setSubmittedValues] = useState<string>('');
+
+  const form = useForm<{ firstReference: string; secondReference: string }>({
+    defaultValues: {
+      firstReference: null,
+      secondReference: null,
+    },
+  });
+
+  function handleSubmit(values: {
+    firstReference: string;
+    secondReference: string;
+  }) {
+    setSubmittedValues(JSON.stringify(values, null, 2));
+  }
+
+  return (
+    <div className="grid grid-flow-row gap-2">
+      <FormProvider {...form}>
+        <Form onSubmit={handleSubmit} className="grid grid-flow-row gap-2">
+          <ColumnAutocomplete
+            {...args}
+            name="firstReference"
+            label="First Reference"
+            onChange={(_event, newValue) =>
+              form.setValue('firstReference', newValue.value, {
+                shouldDirty: true,
+              })
+            }
+            onInitialized={(newValue) => {
+              form.setValue('firstReference', newValue.value, {
+                shouldDirty: true,
+              });
+            }}
+          />
+          <ColumnAutocomplete
+            {...args}
+            name="secondReference"
+            label="Second Reference"
+            onChange={(_event, newValue) =>
+              form.setValue('secondReference', newValue.value, {
+                shouldDirty: true,
+              })
+            }
+            onInitialized={(newValue) => {
+              form.setValue('secondReference', newValue.value, {
+                shouldDirty: true,
+              });
+            }}
+          />
+
+          <Button type="submit" className="justify-self-start">
+            Submit
+          </Button>
+        </Form>
+      </FormProvider>
+
+      <Text component="pre" className="!font-mono !text-gray-700">
+        {submittedValues || 'The form has not been submitted yet.'}
+      </Text>
+    </div>
+  );
+};
+
+export const Basic = Template.bind({});
+Basic.args = {
+  schema: 'public',
+  table: 'books',
+};
+Basic.parameters = defaultParameters;
+
+export const DefaultValue = Template.bind({});
+DefaultValue.args = {
+  schema: 'public',
+  table: 'books',
+  value: 'author.id',
+};
+DefaultValue.parameters = defaultParameters;
+
+export const DisabledRelationships = Template.bind({});
+DisabledRelationships.args = {
+  schema: 'public',
+  table: 'books',
+  disableRelationships: true,
+};
+DisabledRelationships.parameters = defaultParameters;

dashboard/src/components/dataBrowser/ColumnAutocomplete/ColumnAutocomplete.test.tsx

@@ -0,0 +1,33 @@
+import customClaimsQuery from '@/utils/msw/mocks/graphql/customClaimsQuery';
+import hasuraMetadataQuery from '@/utils/msw/mocks/rest/hasuraMetadataQuery';
+import tableQuery from '@/utils/msw/mocks/rest/tableQuery';
+import { render, screen } from '@/utils/testUtils';
+import { setupServer } from 'msw/node';
+import { test, vi } from 'vitest';
+import ColumnAutocomplete from './ColumnAutocomplete';
+
+const server = setupServer(tableQuery, hasuraMetadataQuery, customClaimsQuery);
+
+beforeAll(() => server.listen({ onUnhandledRequest: 'warn' }));
+afterEach(() => server.resetHandlers());
+afterAll(() => {
+  server.close();
+  vi.restoreAllMocks();
+});
+
+test('should render a combobox', () => {
+  render(
+    <ColumnAutocomplete
+      schema="public"
+      table="books"
+      label="Column Autocomplete"
+    />,
+  );
+
+  expect(
+    screen.getByRole('combobox', { name: /column autocomplete/i }),
+  ).toBeInTheDocument();
+});
+
+// Note: Network requests don't go through in tests, so we can't test the
+// autocomplete functionality for now.

dashboard/src/components/dataBrowser/ColumnAutocomplete/ColumnAutocomplete.tsx

@@ -0,0 +1,382 @@
+import InlineCode from '@/components/common/InlineCode';
+import useMetadataQuery from '@/hooks/dataBrowser/useMetadataQuery';
+import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
+import ActivityIndicator from '@/ui/v2/ActivityIndicator';
+import type { AutocompleteOption } from '@/ui/v2/Autocomplete';
+import { AutocompletePopper } from '@/ui/v2/Autocomplete';
+import IconButton from '@/ui/v2/IconButton';
+import ArrowLeftIcon from '@/ui/v2/icons/ArrowLeftIcon';
+import type { InputProps } from '@/ui/v2/Input';
+import Input from '@/ui/v2/Input';
+import List from '@/ui/v2/List';
+import { OptionBase } from '@/ui/v2/Option';
+import { OptionGroupBase } from '@/ui/v2/OptionGroup';
+import Text from '@/ui/v2/Text';
+import getTruncatedText from '@/utils/common/getTruncatedText';
+import type { AutocompleteGroupedOption } from '@mui/base/AutocompleteUnstyled';
+import { useAutocomplete } from '@mui/base/AutocompleteUnstyled';
+import type { AutocompleteRenderGroupParams } from '@mui/material/Autocomplete';
+import { autocompleteClasses } from '@mui/material/Autocomplete';
+import type {
+  ForwardedRef,
+  HTMLAttributes,
+  PropsWithoutRef,
+  SyntheticEvent,
+} from 'react';
+import { forwardRef, useEffect, useState } from 'react';
+import { twMerge } from 'tailwind-merge';
+import type { UseAsyncInitialValueOptions } from './useAsyncInitialValue';
+import useAsyncInitialValue from './useAsyncInitialValue';
+import type { UseColumnGroupsOptions } from './useColumnGroups';
+import useColumnGroups from './useColumnGroups';
+
+export interface ColumnAutocompleteProps
+  extends Omit<PropsWithoutRef<InputProps>, 'onChange'> {
+  /**
+   * Schema where the `table` is located.
+   */
+  schema: string;
+  /**
+   * Table to get the columns from.
+   */
+  table: string;
+  /**
+   * Function to be called when the value changes.
+   */
+  onChange?: (
+    event: SyntheticEvent,
+    value: {
+      value: string;
+      columnMetadata?: Record<string, any>;
+      disableReset?: boolean;
+    },
+  ) => void;
+  /**
+   * Function to be called when the input is asynchronously initialized.
+   */
+  onInitialized?: UseAsyncInitialValueOptions['onInitialized'];
+  /**
+   * Class name to be applied to the root element.
+   */
+  rootClassName?: string;
+  /**
+   * Determines if the autocomplete should allow relationships.
+   */
+  disableRelationships?: UseColumnGroupsOptions['disableRelationships'];
+}
+
+function renderGroup(params: AutocompleteRenderGroupParams) {
+  return (
+    <li key={params.key}>
+      <OptionGroupBase>{params.group}</OptionGroupBase>
+
+      <List>{params.children}</List>
+    </li>
+  );
+}
+
+function renderOption(
+  option: AutocompleteOption<string>,
+  optionProps: HTMLAttributes<HTMLLIElement>,
+) {
+  return (
+    <OptionBase
+      {...optionProps}
+      className="grid grid-flow-col items-baseline justify-start justify-items-start gap-1.5"
+    >
+      <span>{option.label}</span>
+
+      {option.group === 'columns' && (
+        <InlineCode>{option.metadata?.type || option.value}</InlineCode>
+      )}
+    </OptionBase>
+  );
+}
+
+function ColumnAutocomplete(
+  {
+    rootClassName,
+    schema: defaultSchema,
+    table: defaultTable,
+    value: externalValue,
+    disableRelationships,
+    onChange,
+    onInitialized,
+    ...props
+  }: ColumnAutocompleteProps,
+  ref: ForwardedRef<HTMLInputElement>,
+) {
+  const [open, setOpen] = useState(false);
+  const [activeRelationship, setActiveRelationship] = useState<any>();
+  const selectedSchema = activeRelationship?.schema || defaultSchema;
+  const selectedTable = activeRelationship?.table || defaultTable;
+
+  const {
+    data: tableData,
+    status: tableStatus,
+    error: tableError,
+    isFetching: isTableFetching,
+  } = useTableQuery([`default.${selectedSchema}.${selectedTable}`], {
+    schema: selectedSchema,
+    table: selectedTable,
+    queryOptions: { refetchOnWindowFocus: false },
+  });
+
+  const {
+    data: metadata,
+    status: metadataStatus,
+    error: metadataError,
+    isFetching: isMetadataFetching,
+  } = useMetadataQuery([`default.metadata`], {
+    queryOptions: { refetchOnWindowFocus: false },
+  });
+
+  const {
+    initialized,
+    inputValue,
+    setInputValue,
+    selectedColumn,
+    setSelectedColumn,
+    selectedRelationships,
+    setSelectedRelationships,
+    relationshipDotNotation,
+    activeRelationship: asyncActiveRelationship,
+  } = useAsyncInitialValue({
+    selectedSchema,
+    selectedTable,
+    initialValue: externalValue as string,
+    isTableLoading: tableStatus === 'loading' || isTableFetching,
+    isMetadataLoading: metadataStatus === 'loading' || isMetadataFetching,
+    tableData,
+    metadata,
+    onInitialized,
+  });
+
+  useEffect(() => {
+    setActiveRelationship(asyncActiveRelationship);
+  }, [asyncActiveRelationship]);
+
+  function isOptionEqualToValue(
+    option: AutocompleteOption,
+    value: NonNullable<string | AutocompleteOption>,
+  ) {
+    if (!value) {
+      return false;
+    }
+
+    if (typeof value === 'string') {
+      return option.value === value;
+    }
+
+    return option.value === value.value && option.custom === value.custom;
+  }
+
+  function handleChange(
+    event: SyntheticEvent,
+    value: NonNullable<string | AutocompleteOption>,
+  ) {
+    if (typeof value === 'string' || Array.isArray(value) || !value) {
+      return;
+    }
+
+    if ('group' in value && value.group === 'columns') {
+      setSelectedColumn(value);
+      setOpen(false);
+      setInputValue(value.value);
+
+      onChange?.(event, {
+        value:
+          selectedRelationships.length > 0
+            ? [relationshipDotNotation, value.value].join('.')
+            : value.value,
+        columnMetadata: value.metadata,
+      });
+
+      return;
+    }
+
+    setInputValue('');
+    setSelectedColumn(null);
+    setSelectedRelationships((currentRelationships) => [
+      ...currentRelationships,
+      value.metadata?.target,
+    ]);
+  }
+
+  const options = useColumnGroups({
+    selectedSchema,
+    selectedTable,
+    tableData,
+    metadata,
+    disableRelationships,
+  });
+
+  const {
+    popupOpen,
+    anchorEl,
+    setAnchorEl,
+    getRootProps,
+    getInputLabelProps,
+    getInputProps,
+    getListboxProps,
+    getOptionProps,
+    groupedOptions,
+  } = useAutocomplete({
+    open,
+    inputValue,
+    options,
+    id: props?.name,
+    openOnFocus: true,
+    disableCloseOnSelect: true,
+    value: selectedColumn,
+    onClose: () => setOpen(false),
+    groupBy: (option) => option.group,
+    isOptionEqualToValue,
+    onChange: handleChange,
+  });
+
+  return (
+    <>
+      <div {...getRootProps()} className={rootClassName}>
+        <Input
+          {...props}
+          ref={ref}
+          fullWidth
+          slotProps={{
+            ...(props.slotProps || {}),
+            label: getInputLabelProps(),
+            input: { ...(props.slotProps?.input || {}), ref: setAnchorEl },
+            inputRoot: {
+              ...getInputProps(),
+              className: twMerge(
+                Boolean(selectedColumn) || Boolean(relationshipDotNotation)
+                  ? '!pl-0'
+                  : null,
+                props.slotProps?.inputRoot?.className,
+              ),
+            },
+          }}
+          onFocus={() => setOpen(true)}
+          onClick={() => setOpen(true)}
+          error={Boolean(tableError || metadataError)}
+          helperText={String(tableError || metadataError || '')}
+          onChange={(event) => setInputValue(event.target.value)}
+          value={inputValue}
+          startAdornment={
+            selectedColumn || relationshipDotNotation ? (
+              <Text className="!ml-2 lg:max-w-[200px] flex-shrink-0 truncate">
+                <span className="text-greyscaleGrey">{defaultTable}</span>.
+                {relationshipDotNotation && (
+                  <>
+                    <span className="hidden lg:inline">
+                      {getTruncatedText(relationshipDotNotation, 15, 'start')}.
+                    </span>
+
+                    <span className="inline lg:hidden">
+                      {relationshipDotNotation}.
+                    </span>
+                  </>
+                )}
+              </Text>
+            ) : null
+          }
+          endAdornment={
+            tableStatus === 'loading' ||
+            metadataStatus === 'loading' ||
+            !initialized ? (
+              <ActivityIndicator className="mr-2" delay={500} />
+            ) : null
+          }
+        />
+      </div>
+
+      <AutocompletePopper
+        onMouseDown={(event) => event.preventDefault()}
+        modifiers={[{ name: 'offset', options: { offset: [0, 10] } }]}
+        placement="bottom-start"
+        open={popupOpen}
+        anchorEl={anchorEl}
+        style={{ width: anchorEl?.parentElement?.clientWidth }}
+      >
+        <div className={autocompleteClasses.paper}>
+          <div className="px-3 py-2.5 border-b-1 border-greyscale-100 grid grid-flow-col gap-2 justify-start items-center">
+            {selectedRelationships.length > 0 && (
+              <IconButton
+                variant="borderless"
+                color="secondary"
+                onClick={(event) => {
+                  event.stopPropagation();
+
+                  setInputValue('');
+                  setSelectedColumn(null);
+                  setSelectedRelationships((activeRelationships) =>
+                    activeRelationships.slice(0, -1),
+                  );
+                }}
+              >
+                <ArrowLeftIcon className="w-4 h-4" />
+              </IconButton>
+            )}
+
+            <Text className="truncate direction-rtl text-left">
+              <span className="!text-greyscaleMedium">{defaultTable}</span>
+
+              {relationshipDotNotation && (
+                <>
+                  <span className="hidden lg:inline">
+                    .{getTruncatedText(relationshipDotNotation, 20, 'start')}
+                  </span>
+
+                  <span className="inline lg:hidden">
+                    .{relationshipDotNotation}
+                  </span>
+                </>
+              )}
+            </Text>
+          </div>
+
+          {(tableStatus === 'loading' ||
+            metadataStatus === 'loading' ||
+            !initialized) && (
+            <div className="p-2">
+              <ActivityIndicator label="Loading..." />
+            </div>
+          )}
+
+          {groupedOptions.length > 0 && (
+            <List
+              {...getListboxProps()}
+              className={autocompleteClasses.listbox}
+            >
+              {(
+                groupedOptions as AutocompleteGroupedOption<
+                  typeof options[number]
+                >[]
+              ).map((optionGroup) =>
+                renderGroup({
+                  key: `${optionGroup.key}`,
+                  group: optionGroup.group,
+                  children: optionGroup.options.map((option, index) =>
+                    renderOption(
+                      option,
+                      getOptionProps({
+                        option,
+                        index: optionGroup.index + index,
+                      }),
+                    ),
+                  ),
+                }),
+              )}
+            </List>
+          )}
+
+          {groupedOptions.length === 0 && Boolean(anchorEl) && (
+            <Text className={autocompleteClasses.noOptions}>No options</Text>
+          )}
+        </div>
+      </AutocompletePopper>
+    </>
+  );
+}
+
+export default forwardRef(ColumnAutocomplete);

dashboard/src/components/dataBrowser/ColumnAutocomplete/index.ts

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

dashboard/src/components/dataBrowser/ColumnAutocomplete/useAsyncInitialValue.ts

@@ -0,0 +1,263 @@
+import type { FetchMetadataReturnType } from '@/hooks/dataBrowser/useMetadataQuery';
+import type { FetchTableReturnType } from '@/hooks/dataBrowser/useTableQuery';
+import type { HasuraMetadataTable } from '@/types/dataBrowser';
+import type { AutocompleteOption } from '@/ui/v2/Autocomplete';
+import { useEffect, useState } from 'react';
+
+export interface UseAsyncInitialValueOptions {
+  /**
+   * Selected schema to be used to determine the initial value.
+   */
+  selectedSchema?: string;
+  /**
+   * Selected table to be used to determine the initial value.
+   */
+  selectedTable?: string;
+  /**
+   * Initial value to be used before the async value is loaded.
+   */
+  initialValue?: string;
+  /**
+   * Determines whether or not the table data is loading.
+   */
+  isTableLoading?: boolean;
+  /**
+   * Determines whether or not the metadata is loading.
+   */
+  isMetadataLoading?: boolean;
+  /**
+   * Table data to be used to determine the initial value.
+   */
+  tableData?: FetchTableReturnType;
+  /**
+   * Metadata to be used to determine the initial value.
+   */
+  metadata?: FetchMetadataReturnType;
+  /**
+   * Function to be called when the input is asynchronously initialized.
+   */
+  onInitialized?: (value: {
+    value: string;
+    columnMetadata?: Record<string, any>;
+  }) => void;
+}
+
+export default function useAsyncInitialValue({
+  selectedSchema,
+  selectedTable,
+  initialValue,
+  isTableLoading,
+  isMetadataLoading,
+  tableData,
+  metadata,
+  onInitialized,
+}: UseAsyncInitialValueOptions) {
+  const currentTablePath = `${selectedSchema}.${selectedTable}`;
+  const [inputValue, setInputValue] = useState('');
+  const [initialized, setInitialized] = useState(false);
+  // We might not going to have the most up-to-date table data because the
+  // relationship is loaded asynchronously, so we need to make sure we don't
+  // look for the column in a stale table when initializing
+  const [asyncTablePath, setAsyncTablePath] = useState(currentTablePath);
+  const [remainingColumnPath, setRemainingColumnPath] = useState(
+    initialValue?.split('.') || [],
+  );
+  const [selectedRelationships, setSelectedRelationships] = useState<
+    { schema: string; table: string; name: string }[]
+  >([]);
+  const relationshipDotNotation =
+    initialized && selectedRelationships?.length > 0
+      ? selectedRelationships.map((relationship) => relationship.name).join('.')
+      : '';
+  const [selectedColumn, setSelectedColumn] =
+    useState<AutocompleteOption>(null);
+  const activeRelationship =
+    selectedRelationships[selectedRelationships.length - 1];
+
+  useEffect(() => {
+    if (remainingColumnPath?.length > 0 || initialized) {
+      return;
+    }
+
+    setInitialized(true);
+
+    if (!selectedColumn) {
+      return;
+    }
+
+    onInitialized?.({
+      value:
+        selectedRelationships.length > 0
+          ? [relationshipDotNotation, selectedColumn.value].join('.')
+          : selectedColumn.value,
+      columnMetadata: selectedColumn.metadata,
+    });
+  }, [
+    initialized,
+    onInitialized,
+    relationshipDotNotation,
+    remainingColumnPath?.length,
+    selectedColumn,
+    selectedRelationships.length,
+  ]);
+
+  useEffect(() => {
+    if (
+      remainingColumnPath?.length !== 1 ||
+      isTableLoading ||
+      !tableData?.columns ||
+      asyncTablePath !== currentTablePath
+    ) {
+      return;
+    }
+
+    const [activeColumn] = remainingColumnPath;
+
+    // If there is a single column in the path, it means that we can look for it
+    // in the table columns
+    if (
+      !tableData?.columns.some((column) => column.column_name === activeColumn)
+    ) {
+      setRemainingColumnPath([]);
+
+      return;
+    }
+
+    setSelectedColumn({
+      value: activeColumn,
+      label: activeColumn,
+      group: 'columns',
+      metadata: tableData.columns.find(
+        (column) => column.column_name === activeColumn,
+      ),
+    });
+    setRemainingColumnPath((columnPath) => columnPath.slice(1));
+    setInputValue(activeColumn);
+  }, [
+    remainingColumnPath,
+    isTableLoading,
+    tableData?.columns,
+    asyncTablePath,
+    currentTablePath,
+  ]);
+
+  useEffect(() => {
+    if (
+      remainingColumnPath.length < 2 ||
+      isTableLoading ||
+      isMetadataLoading ||
+      !tableData?.columns
+    ) {
+      return;
+    }
+
+    const metadataMap = metadata.tables.reduce(
+      (map, metadataTable) =>
+        map.set(
+          `${metadataTable.table.schema}.${metadataTable.table.name}`,
+          metadataTable,
+        ),
+      new Map<string, HasuraMetadataTable>(),
+    );
+
+    const [nextPath] = remainingColumnPath.slice(
+      0,
+      remainingColumnPath.length - 1,
+    );
+
+    const tableMetadata = metadataMap.get(`${selectedSchema}.${selectedTable}`);
+    const currentRelationship = [
+      ...(tableMetadata.object_relationships || []),
+      ...(tableMetadata.array_relationships || []),
+    ].find(({ name }) => name === nextPath);
+
+    if (!currentRelationship) {
+      setRemainingColumnPath([]);
+      return;
+    }
+
+    const { foreign_key_constraint_on: metadataConstraint } =
+      currentRelationship.using || {};
+
+    // In some cases the metadata already contains the schema and table name
+    if (typeof metadataConstraint !== 'string') {
+      setAsyncTablePath(
+        `${metadataConstraint.table.schema || 'public'}.${
+          metadataConstraint.table.name
+        }`,
+      );
+
+      setSelectedRelationships((currentRelationships) => [
+        ...currentRelationships,
+        {
+          schema: metadataConstraint.table.schema || 'public',
+          table: metadataConstraint.table.name,
+          name: nextPath,
+        },
+      ]);
+
+      setRemainingColumnPath((columnPath) => columnPath.slice(1));
+
+      return;
+    }
+
+    const foreignKeyRelation = tableData?.foreignKeyRelations?.find(
+      ({ columnName }) => {
+        const { foreign_key_constraint_on } = currentRelationship.using || {};
+
+        if (!foreign_key_constraint_on) {
+          return false;
+        }
+
+        if (typeof foreign_key_constraint_on === 'string') {
+          return foreign_key_constraint_on === columnName;
+        }
+
+        return foreign_key_constraint_on.column === columnName;
+      },
+    );
+
+    if (!foreignKeyRelation) {
+      setRemainingColumnPath([]);
+      return;
+    }
+
+    setAsyncTablePath(
+      `${foreignKeyRelation.referencedSchema || 'public'}.${
+        foreignKeyRelation.referencedTable
+      }`,
+    );
+
+    setSelectedRelationships((currentRelationships) => [
+      ...currentRelationships,
+      {
+        schema: foreignKeyRelation.referencedSchema || 'public',
+        table: foreignKeyRelation.referencedTable,
+        name: nextPath,
+      },
+    ]);
+
+    setRemainingColumnPath((columnPath) => columnPath.slice(1));
+  }, [
+    selectedSchema,
+    selectedTable,
+    metadata?.tables,
+    tableData?.columns,
+    tableData?.foreignKeyRelations,
+    remainingColumnPath,
+    isTableLoading,
+    isMetadataLoading,
+  ]);
+
+  return {
+    initialized,
+    inputValue,
+    setInputValue,
+    activeRelationship,
+    selectedRelationships: initialized ? selectedRelationships : [],
+    selectedColumn: initialized ? selectedColumn : null,
+    setSelectedRelationships,
+    setSelectedColumn,
+    relationshipDotNotation,
+  };
+}

dashboard/src/components/dataBrowser/ColumnAutocomplete/useColumnGroups.ts

@@ -0,0 +1,102 @@
+import type { FetchMetadataReturnType } from '@/hooks/dataBrowser/useMetadataQuery';
+import type { FetchTableReturnType } from '@/hooks/dataBrowser/useTableQuery';
+import type { AutocompleteOption } from '@/ui/v2/Autocomplete';
+
+export interface UseColumnGroupsOptions {
+  /**
+   * Selected schema to be used to determines the column groups.
+   */
+  selectedSchema?: string;
+  /**
+   * Selected table to be used to determine the column groups.
+   */
+  selectedTable?: string;
+  /**
+   * Table data to be used to determine the column groups.
+   */
+  tableData?: FetchTableReturnType;
+  /**
+   * Metadata to be used to determine the column groups.
+   */
+  metadata?: FetchMetadataReturnType;
+  /**
+   * Determines whether or not to disable column groups.
+   */
+  disableRelationships?: boolean;
+}
+
+export default function useColumnGroups({
+  selectedTable,
+  selectedSchema,
+  tableData,
+  metadata,
+  disableRelationships,
+}: UseColumnGroupsOptions) {
+  const { columns, foreignKeyRelations } = tableData || {};
+
+  const columnTargetMap = foreignKeyRelations?.reduce(
+    (map, currentRelation) =>
+      map.set(currentRelation.columnName, {
+        schema: currentRelation.referencedSchema || 'public',
+        table: currentRelation.referencedTable,
+      }),
+    new Map<string, { schema: string; table: string }>(),
+  );
+
+  const columnOptions: AutocompleteOption[] =
+    columns?.map((column) => ({
+      label: column.column_name,
+      value: column.column_name,
+      group: 'columns',
+      metadata: column,
+    })) || [];
+
+  if (disableRelationships) {
+    return columnOptions;
+  }
+
+  const { object_relationships, array_relationships } =
+    metadata?.tables?.find(
+      ({ table: metadataTable }) =>
+        metadataTable.name === selectedTable &&
+        metadataTable.schema === selectedSchema,
+    ) || {};
+
+  const objectAndArrayRelationships = [
+    ...(object_relationships || []),
+    ...(array_relationships || []),
+  ].map((relationship) => {
+    const { foreign_key_constraint_on } = relationship?.using || {};
+
+    if (typeof foreign_key_constraint_on === 'string') {
+      return {
+        schema: selectedSchema,
+        table: selectedTable,
+        column: foreign_key_constraint_on,
+        name: relationship.name,
+      };
+    }
+
+    return {
+      schema: foreign_key_constraint_on.table.schema,
+      table: foreign_key_constraint_on.table.name,
+      column: foreign_key_constraint_on.column,
+      name: relationship.name,
+    };
+  });
+
+  return [
+    ...columnOptions,
+    ...objectAndArrayRelationships.map((relationship) => ({
+      label: relationship.name,
+      value: relationship.name,
+      group: 'relationships',
+      metadata: {
+        target: {
+          ...(columnTargetMap?.get(relationship.column) || {}),
+          name: relationship.name,
+        },
+      },
+    })),
+  ];
+}

dashboard/src/components/dataBrowser/CreateColumnForm/CreateColumnForm.tsx

@@ -1,10 +1,10 @@
 import type {
   BaseColumnFormProps,
   BaseColumnFormValues,
-} from '@/components/data-browser/BaseColumnForm';
+} from '@/components/dataBrowser/BaseColumnForm';
 import BaseColumnForm, {
   baseColumnValidationSchema,
-} from '@/components/data-browser/BaseColumnForm';
+} from '@/components/dataBrowser/BaseColumnForm';
 import useCreateColumnMutation from '@/hooks/dataBrowser/useCreateColumnMutation';
 import useTrackForeignKeyRelationsMutation from '@/hooks/dataBrowser/useTrackForeignKeyRelationsMutation';
 import { Alert } from '@/ui/Alert';

dashboard/src/components/dataBrowser/CreateForeignKeyForm/CreateForeignKeyForm.tsx

@@ -1,11 +1,11 @@
 import type {
   BaseForeignKeyFormProps,
   BaseForeignKeyFormValues,
-} from '@/components/data-browser/BaseForeignKeyForm';
+} from '@/components/dataBrowser/BaseForeignKeyForm';
 import {
   BaseForeignKeyForm,
   baseForeignKeyValidationSchema,
-} from '@/components/data-browser/BaseForeignKeyForm';
+} from '@/components/dataBrowser/BaseForeignKeyForm';
 import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
 import { yupResolver } from '@hookform/resolvers/yup';

dashboard/src/components/dataBrowser/CreateRecordForm/CreateRecordForm.tsx

@@ -1,7 +1,7 @@
-import type { BaseRecordFormProps } from '@/components/data-browser/BaseRecordForm';
+import type { BaseRecordFormProps } from '@/components/dataBrowser/BaseRecordForm';
-import BaseRecordForm from '@/components/data-browser/BaseRecordForm';
+import BaseRecordForm from '@/components/dataBrowser/BaseRecordForm';
 import useCreateRecordMutation from '@/hooks/dataBrowser/useCreateRecordMutation';
-import type { ColumnInsertOptions } from '@/types/data-browser';
+import type { ColumnInsertOptions } from '@/types/dataBrowser';
 import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
 import { createDynamicValidationSchema } from '@/utils/dataBrowser/validationSchemaHelpers';

dashboard/src/components/dataBrowser/CreateTableForm/CreateTableForm.tsx

@@ -1,14 +1,14 @@
 import type {
   BaseTableFormProps,
   BaseTableFormValues,
-} from '@/components/data-browser/BaseTableForm';
+} from '@/components/dataBrowser/BaseTableForm';
 import BaseTableForm, {
   baseTableValidationSchema,
-} from '@/components/data-browser/BaseTableForm';
+} from '@/components/dataBrowser/BaseTableForm';
 import useCreateTableMutation from '@/hooks/dataBrowser/useCreateTableMutation';
 import useTrackForeignKeyRelationMutation from '@/hooks/dataBrowser/useTrackForeignKeyRelationsMutation';
 import useTrackTableMutation from '@/hooks/dataBrowser/useTrackTableMutation';
-import type { DatabaseTable } from '@/types/data-browser';
+import type { DatabaseTable } from '@/types/dataBrowser';
 import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
 import { triggerToast } from '@/utils/toast';

dashboard/src/components/dataBrowser/DataBrowserGrid/DataBrowserGrid.tsx

@@ -6,8 +6,8 @@ import DataGridNumericCell from '@/components/common/DataGridNumericCell';
 import DataGridTextCell from '@/components/common/DataGridTextCell';
 import { useDialog } from '@/components/common/DialogProvider';
 import InlineCode from '@/components/common/InlineCode';
-import DataBrowserEmptyState from '@/components/data-browser/DataBrowserEmptyState';
+import DataBrowserEmptyState from '@/components/dataBrowser/DataBrowserEmptyState';
-import DataBrowserGridControls from '@/components/data-browser/DataBrowserGridControls';
+import DataBrowserGridControls from '@/components/dataBrowser/DataBrowserGridControls';
 import useDeleteColumnWithToastMutation from '@/hooks/dataBrowser/useDeleteColumnMutation/useDeleteColumnWithToastMutation';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
 import type { UpdateRecordVariables } from '@/hooks/dataBrowser/useUpdateRecordMutation';
@@ -17,7 +17,7 @@ import useTablePath from '@/hooks/useTablePath';
 import type {
   DataBrowserGridColumn,
   NormalizedQueryDataRow,
-} from '@/types/data-browser';
+} from '@/types/dataBrowser';
 import KeyIcon from '@/ui/v2/icons/KeyIcon';
 import normalizeDefaultValue from '@/utils/dataBrowser/normalizeDefaultValue';
 import {

dashboard/src/components/dataBrowser/DataBrowserGridControls/DataBrowserGridControls.tsx

@@ -4,7 +4,7 @@ import { useDialog } from '@/components/common/DialogProvider';
 import useDeleteRecordMutation from '@/hooks/dataBrowser/useDeleteRecordMutation';
 import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
 import useDataGridConfig from '@/hooks/useDataGridConfig';
-import type { DataBrowserGridColumn } from '@/types/data-browser';
+import type { DataBrowserGridColumn } from '@/types/dataBrowser';
 import Chip from '@/ui/Chip';
 import Button from '@/ui/v2/Button';
 import { Dropdown } from '@/ui/v2/Dropdown';

dashboard/src/components/dataBrowser/DataBrowserLayout/DataBrowserLayout.tsx

@@ -1,5 +1,5 @@
-import type { DataBrowserSidebarProps } from '@/components/data-browser/DataBrowserSidebar';
+import type { DataBrowserSidebarProps } from '@/components/dataBrowser/DataBrowserSidebar';
-import DataBrowserSidebar from '@/components/data-browser/DataBrowserSidebar';
+import DataBrowserSidebar from '@/components/dataBrowser/DataBrowserSidebar';
 import type { ProjectLayoutProps } from '@/components/layout/ProjectLayout';
 import ProjectLayout from '@/components/layout/ProjectLayout';
 import { useRouter } from 'next/router';

dashboard/src/components/dataBrowser/DatabaseRecordInputGroup/DatabaseRecordInputGroup.tsx

@@ -1,6 +1,6 @@
 import InlineCode from '@/components/common/InlineCode';
 import ReadOnlyToggle from '@/components/common/ReadOnlyToggle';
-import type { DataBrowserGridColumn } from '@/types/data-browser';
+import type { DataBrowserGridColumn } from '@/types/dataBrowser';
 import KeyIcon from '@/ui/v2/icons/KeyIcon';
 import Input from '@/ui/v2/Input';
 import Option from '@/ui/v2/Option';
@@ -204,7 +204,7 @@ export default function DatabaseRecordInputGroup({
                 multiline={isMultiline}
                 rows={5}
                 autoFocus={index === 0 && autoFocusFirstInput}
-                componentsProps={{
+                slotProps={{
                   label: commonLabelProps,
                   inputRoot: { step: 1 },
                 }}

dashboard/src/components/dataBrowser/EditColumnForm/EditColumnForm.tsx

@@ -1,13 +1,13 @@
 import type {
   BaseColumnFormProps,
   BaseColumnFormValues,
-} from '@/components/data-browser/BaseColumnForm';
+} from '@/components/dataBrowser/BaseColumnForm';
 import BaseColumnForm, {
   baseColumnValidationSchema,
-} from '@/components/data-browser/BaseColumnForm';
+} from '@/components/dataBrowser/BaseColumnForm';
 import useTrackForeignKeyRelationMutation from '@/hooks/dataBrowser/useTrackForeignKeyRelationsMutation';
 import useUpdateColumnMutation from '@/hooks/dataBrowser/useUpdateColumnMutation';
-import type { DataBrowserGridColumn } from '@/types/data-browser';
+import type { DataBrowserGridColumn } from '@/types/dataBrowser';
 import { Alert } from '@/ui/Alert';
 import type { AutocompleteOption } from '@/ui/v2/Autocomplete';
 import Button from '@/ui/v2/Button';

dashboard/src/components/dataBrowser/EditForeignKeyForm/EditForeignKeyForm.tsx

@@ -1,12 +1,12 @@
 import type {
   BaseForeignKeyFormProps,
   BaseForeignKeyFormValues,
-} from '@/components/data-browser/BaseForeignKeyForm';
+} from '@/components/dataBrowser/BaseForeignKeyForm';
 import {
   BaseForeignKeyForm,
   baseForeignKeyValidationSchema,
-} from '@/components/data-browser/BaseForeignKeyForm';
+} from '@/components/dataBrowser/BaseForeignKeyForm';
-import type { ForeignKeyRelation } from '@/types/data-browser';
+import type { ForeignKeyRelation } from '@/types/dataBrowser';
 import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
 import { yupResolver } from '@hookform/resolvers/yup';

dashboard/src/components/dataBrowser/EditTableForm/EditTableForm.tsx

@@ -1,17 +1,17 @@
 import type {
   BaseTableFormProps,
   BaseTableFormValues,
-} from '@/components/data-browser/BaseTableForm';
+} from '@/components/dataBrowser/BaseTableForm';
 import BaseTableForm, {
   baseTableValidationSchema,
-} from '@/components/data-browser/BaseTableForm';
+} from '@/components/dataBrowser/BaseTableForm';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
 import useTrackForeignKeyRelationsMutation from '@/hooks/dataBrowser/useTrackForeignKeyRelationsMutation';
 import useUpdateTableMutation from '@/hooks/dataBrowser/useUpdateTableMutation';
 import type {
   DatabaseTable,
   NormalizedQueryDataRow,
-} from '@/types/data-browser';
+} from '@/types/dataBrowser';
 import { Alert } from '@/ui/Alert';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Button from '@/ui/v2/Button';

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleEditorRow.tsx

@@ -0,0 +1,208 @@
+import ControlledSelect from '@/components/common/ControlledSelect';
+import ColumnAutocomplete from '@/components/dataBrowser/ColumnAutocomplete';
+import type { HasuraOperator } from '@/types/dataBrowser';
+import Option from '@/ui/v2/Option';
+import Text from '@/ui/v2/Text';
+import { useRouter } from 'next/router';
+import type { DetailedHTMLProps, HTMLProps } from 'react';
+import { useState } from 'react';
+import { useController, useFormContext } from 'react-hook-form';
+import { twMerge } from 'tailwind-merge';
+import RuleRemoveButton from './RuleRemoveButton';
+import RuleValueInput from './RuleValueInput';
+
+export interface RuleEditorRowProps
+  extends DetailedHTMLProps<HTMLProps<HTMLDivElement>, HTMLDivElement> {
+  /**
+   * Name of the parent group editor.
+   */
+  name: string;
+  /**
+   * Index of the rule.
+   */
+  index: number;
+  /**
+   * Function to be called when the remove button is clicked.
+   */
+  onRemove?: VoidFunction;
+  /**
+   * List of operators to be disabled for the rule editor.
+   *
+   * @default []
+   */
+  disabledOperators?: HasuraOperator[];
+}
+
+const commonOperators: {
+  value: HasuraOperator;
+  label?: string;
+  helperText?: string;
+}[] = [
+  { value: '_eq', helperText: 'equal' },
+  { value: '_neq', helperText: 'not equal' },
+  { value: '_in_hasura', label: '_in', helperText: 'in (X-Hasura-)' },
+  { value: '_in', helperText: 'in (array)' },
+  { value: '_nin_hasura', label: '_nin', helperText: 'not in (X-Hasura-)' },
+  { value: '_nin', helperText: 'not in (array)' },
+  { value: '_gt', helperText: 'greater than' },
+  { value: '_lt', helperText: 'lower than' },
+  { value: '_gte', helperText: 'greater than or equal' },
+  { value: '_lte', helperText: 'lower than or equal' },
+  { value: '_ceq', helperText: 'equal to column' },
+  { value: '_cne', helperText: 'not equal to column' },
+  { value: '_cgt', helperText: 'greater than column' },
+  { value: '_clt', helperText: 'lower than column' },
+  { value: '_cgte', helperText: 'greater than or equal to column' },
+  { value: '_clte', helperText: 'lower than or equal to column' },
+  { value: '_is_null', helperText: 'null' },
+];
+
+const textSpecificOperators: typeof commonOperators = [
+  { value: '_like', helperText: 'like' },
+  { value: '_nlike', helperText: 'not like' },
+  { value: '_ilike', helperText: 'like (case-insensitive)' },
+  { value: '_nilike', helperText: 'not like (case-insensitive)' },
+  { value: '_similar', helperText: 'similar' },
+  { value: '_nsimilar', helperText: 'not similar' },
+  { value: '_regex', helperText: 'matches regex' },
+  { value: '_nregex', helperText: `doesn't match regex` },
+  { value: '_iregex', helperText: 'matches case-insensitive regex' },
+  { value: '_niregex', helperText: `doesn't match case-insensitive regex` },
+];
+
+function renderOption({
+  value,
+  label,
+  helperText,
+}: typeof commonOperators[number]) {
+  return (
+    <Option key={value} value={value} className="grid grid-flow-col gap-2">
+      <Text component="span" className="inline-block w-16">
+        {label || value}
+      </Text>
+
+      {helperText && (
+        <Text component="span" className="!text-greyscaleGrey">
+          {helperText}
+        </Text>
+      )}
+    </Option>
+  );
+}
+
+export default function RuleEditorRow({
+  name,
+  index,
+  onRemove,
+  className,
+  disabledOperators = [],
+  ...props
+}: RuleEditorRowProps) {
+  const {
+    query: { schemaSlug, tableSlug },
+  } = useRouter();
+  const { control, setValue } = useFormContext();
+  const rowName = `${name}.rules.${index}`;
+
+  const [selectedTablePath, setSelectedTablePath] = useState<string>('');
+  const [selectedColumnType, setSelectedColumnType] = useState<string>('');
+  const { field: autocompleteField } = useController({
+    name: `${rowName}.column`,
+    control,
+  });
+
+  const disabledOperatorMap = disabledOperators.reduce(
+    (map, currentOperator) => map.set(currentOperator, true),
+    new Map<string, boolean>(),
+  );
+
+  const availableOperators = [
+    ...commonOperators.filter(({ value }) => !disabledOperatorMap.has(value)),
+    ...(selectedColumnType === 'text'
+      ? textSpecificOperators.filter(
+          ({ value }) => !disabledOperatorMap.get(value),
+        )
+      : []),
+  ];
+
+  return (
+    <div
+      className={twMerge(
+        'flex lg:flex-row flex-col items-stretch lg:max-h-10 flex-1 space-y-1 lg:space-y-0',
+        className,
+      )}
+      {...props}
+    >
+      <ColumnAutocomplete
+        {...autocompleteField}
+        schema={schemaSlug as string}
+        table={tableSlug as string}
+        rootClassName="lg:flex-grow-0 lg:flex-shrink-0 lg:flex-[320px] h-10"
+        slotProps={{ input: { className: 'bg-white lg:!rounded-r-none' } }}
+        fullWidth
+        onChange={(_event, { value, columnMetadata, disableReset }) => {
+          setSelectedTablePath(
+            `${columnMetadata.table_schema}.${columnMetadata.table_name}`,
+          );
+          setSelectedColumnType(columnMetadata?.udt_name);
+          setValue(`${rowName}.column`, value, { shouldDirty: true });
+
+          if (disableReset) {
+            return;
+          }
+
+          setValue(`${rowName}.operator`, '_eq', { shouldDirty: true });
+          setValue(`${rowName}.value`, '', { shouldDirty: true });
+        }}
+        onInitialized={({ value, columnMetadata }) => {
+          setSelectedTablePath(
+            `${columnMetadata.table_schema}.${columnMetadata.table_name}`,
+          );
+          setSelectedColumnType(columnMetadata?.udt_name);
+          setValue(`${rowName}.column`, value, { shouldDirty: true });
+        }}
+      />
+
+      <ControlledSelect
+        name={`${rowName}.operator`}
+        className="lg:flex-grow-0 lg:flex-shrink-0 lg:flex-[140px] h-10"
+        slotProps={{ root: { className: 'bg-white lg:!rounded-none' } }}
+        fullWidth
+        onChange={(_event, value: HasuraOperator) => {
+          if (!['_in', '_nin', '_in_hasura', '_nin_hasura'].includes(value)) {
+            return;
+          }
+
+          if (value === '_in_hasura' || value === '_nin_hasura') {
+            setValue(`${rowName}.value`, null, { shouldDirty: true });
+
+            return;
+          }
+
+          setValue(`${rowName}.value`, [], { shouldDirty: true });
+        }}
+        renderValue={(option) => {
+          if (!option?.value) {
+            return <span />;
+          }
+
+          if (option.value === '_in_hasura') {
+            return <span>_in</span>;
+          }
+
+          if (option.value === '_nin_hasura') {
+            return <span>_nin</span>;
+          }
+
+          return <span>{option.value}</span>;
+        }}
+      >
+        {availableOperators.map(renderOption)}
+      </ControlledSelect>
+
+      <RuleValueInput selectedTablePath={selectedTablePath} name={rowName} />
+
+      <RuleRemoveButton onRemove={onRemove} name={name} />
+    </div>
+  );
+}

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleGroupControls.tsx

@@ -0,0 +1,58 @@
+import ControlledSelect from '@/components/common/ControlledSelect';
+import type { RuleGroup } from '@/types/dataBrowser';
+import Option from '@/ui/v2/Option';
+import Text from '@/ui/v2/Text';
+import type { DetailedHTMLProps, HTMLProps } from 'react';
+import { useWatch } from 'react-hook-form';
+import { twMerge } from 'tailwind-merge';
+
+export interface RuleGroupControlsProps
+  extends DetailedHTMLProps<HTMLProps<HTMLDivElement>, HTMLDivElement> {
+  /**
+   * Name of the rule group to control.
+   */
+  name: string;
+  /**
+   * Determines whether or not select should be shown or just a label with the
+   * operator name.
+   */
+  showSelect?: boolean;
+}
+
+const operatorDictionary: Record<RuleGroup['operator'], string> = {
+  _and: 'and',
+  _or: 'or',
+};
+
+export default function RuleGroupControls({
+  name,
+  showSelect,
+  className,
+  ...props
+}: RuleGroupControlsProps) {
+  const currentOperator: RuleGroup['operator'] = useWatch({
+    name: `${name}.operator`,
+  });
+
+  return (
+    <div
+      className={twMerge('grid grid-flow-row gap-2 content-start', className)}
+      {...props}
+    >
+      {showSelect ? (
+        <ControlledSelect
+          name={`${name}.operator`}
+          slotProps={{ root: { className: 'bg-white' } }}
+          fullWidth
+        >
+          <Option value="_and">and</Option>
+          <Option value="_or">or</Option>
+        </ControlledSelect>
+      ) : (
+        <Text className="p-2 !font-medium">
+          {operatorDictionary[currentOperator]}
+        </Text>
+      )}
+    </div>
+  );
+}

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleGroupEditor.stories.tsx

@@ -0,0 +1,91 @@
+import Form from '@/components/common/Form';
+import type { RuleGroup } from '@/types/dataBrowser';
+import Button from '@/ui/v2/Button';
+import Text from '@/ui/v2/Text';
+import customClaimsQuery from '@/utils/msw/mocks/graphql/customClaimsQuery';
+import hasuraMetadataQuery from '@/utils/msw/mocks/rest/hasuraMetadataQuery';
+import tableQuery from '@/utils/msw/mocks/rest/tableQuery';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
+import { useState } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import type { RuleGroupEditorProps } from './RuleGroupEditor';
+import RuleGroupEditor from './RuleGroupEditor';
+
+export default {
+  title: 'Data Browser / RuleGroupEditor',
+  component: RuleGroupEditor,
+  parameters: {
+    docs: {
+      source: {
+        type: 'code',
+      },
+    },
+  },
+} as ComponentMeta<typeof RuleGroupEditor>;
+
+const defaultParameters = {
+  nextRouter: {
+    path: '/[workspaceSlug]/[appSlug]/database/browser/[dataSourceSlug]/[schemaSlug]/[tableSlug]',
+    asPath: '/workspace/app/database/browser/default/public/users',
+    query: {
+      workspaceSlug: 'workspace',
+      appSlug: 'app',
+      dataSourceSlug: 'default',
+      schemaSlug: 'public',
+      tableSlug: 'books',
+    },
+  },
+  msw: {
+    handlers: [tableQuery, hasuraMetadataQuery, customClaimsQuery],
+  },
+};
+
+const Template: ComponentStory<typeof RuleGroupEditor> = function Template(
+  args: RuleGroupEditorProps,
+) {
+  const [submittedValues, setSubmittedValues] = useState<string>();
+
+  const form = useForm<{ ruleGroupEditor: RuleGroup }>({
+    defaultValues: {
+      ruleGroupEditor: {
+        operator: '_and',
+        rules: [{ column: '', operator: '_eq', value: '' }],
+        groups: [],
+      },
+    },
+    reValidateMode: 'onSubmit',
+  });
+
+  function handleSubmit(values: { ruleGroupEditor: RuleGroup }) {
+    setSubmittedValues(JSON.stringify(values, null, 2));
+  }
+
+  // note: Storybook passes `onRemove` as a prop, but we don't want to use it
+  return (
+    <div className="grid grid-flow-row gap-2">
+      <FormProvider {...form}>
+        <Form onSubmit={handleSubmit} className="grid grid-flow-row gap-2">
+          <RuleGroupEditor {...args} name="ruleGroupEditor" onRemove={null} />
+
+          <Button type="submit" className="justify-self-start">
+            Submit
+          </Button>
+        </Form>
+      </FormProvider>
+
+      <Text component="pre" className="!font-mono !text-gray-700">
+        {submittedValues || 'The form has not been submitted yet.'}
+      </Text>
+    </div>
+  );
+};
+
+export const Default = Template.bind({});
+Default.args = {};
+Default.parameters = defaultParameters;
+
+export const DisabledOperators = Template.bind({});
+DisabledOperators.args = {
+  disabledOperators: ['_in_hasura', '_nin_hasura', '_is_null'],
+};
+DisabledOperators.parameters = defaultParameters;

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleGroupEditor.tsx

@@ -0,0 +1,193 @@
+import type { Rule, RuleGroup } from '@/types/dataBrowser';
+import Button from '@/ui/v2/Button';
+import PlusIcon from '@/ui/v2/icons/PlusIcon';
+import Text from '@/ui/v2/Text';
+import type { DetailedHTMLProps, HTMLProps } from 'react';
+import { useFieldArray, useFormContext } from 'react-hook-form';
+import { twMerge } from 'tailwind-merge';
+import type { RuleEditorRowProps } from './RuleEditorRow';
+import RuleEditorRow from './RuleEditorRow';
+import RuleGroupControls from './RuleGroupControls';
+
+export interface RuleGroupEditorProps
+  extends DetailedHTMLProps<HTMLProps<HTMLDivElement>, HTMLDivElement>,
+    Pick<RuleEditorRowProps, 'disabledOperators'> {
+  /**
+   * Name of the group editor.
+   */
+  name: string;
+  /**
+   * Function to be called when the remove button is clicked.
+   */
+  onRemove?: VoidFunction;
+  /**
+   * Determines whether or not remove should be disabled for the rule group.
+   */
+  disableRemove?: boolean;
+  /**
+   * Group editor depth.
+   *
+   * @default 0
+   */
+  depth?: number;
+  /**
+   * Maximum depth of the group editor.
+   *
+   * @default 7
+   */
+  maxDepth?: number;
+}
+
+export default function RuleGroupEditor({
+  onRemove,
+  name,
+  className,
+  disableRemove,
+  disabledOperators = [],
+  depth = 0,
+  maxDepth = 7,
+  ...props
+}: RuleGroupEditorProps) {
+  const form = useFormContext();
+
+  const { control } = form;
+
+  // Note: Reason for the type cast to `never`
+  // https://github.com/react-hook-form/react-hook-form/issues/4055#issuecomment-950145092
+  const {
+    fields: rules,
+    append: appendRule,
+    remove: removeRule,
+  } = useFieldArray({
+    control,
+    name: `${name}.rules`,
+  } as never);
+
+  // Note: Reason for the type cast to `never`
+  // https://github.com/react-hook-form/react-hook-form/issues/4055#issuecomment-950145092
+  const {
+    fields: groups,
+    append: appendGroup,
+    remove: removeGroup,
+  } = useFieldArray({
+    control,
+    name: `${name}.groups`,
+  } as never);
+
+  if (!form) {
+    throw new Error('RuleGroupEditor must be used in a FormContext.');
+  }
+
+  return (
+    <div
+      className={twMerge(
+        'rounded-lg px-2',
+        depth === 0 && 'bg-greyscale-50',
+        depth === 1 && 'bg-greyscale-100',
+        depth === 2 && 'bg-greyscale-200',
+        depth === 3 && 'bg-greyscale-300',
+        depth === 4 && 'bg-greyscale-400',
+        depth === 5 && 'bg-greyscale-500',
+        depth >= 6 && 'bg-greyscale-600',
+        className,
+      )}
+      {...props}
+    >
+      <div className="flex flex-col flex-auto space-y-4 lg:space-y-2 py-4">
+        {(rules as (Rule & { id: string })[]).map((rule, ruleIndex) => (
+          <div className="flex flex-row flex-auto" key={rule.id}>
+            <div className="flex-[70px] flex-grow-0 flex-shrink-0 mr-2">
+              {ruleIndex === 0 && (
+                <Text className="p-2 !font-medium">Where</Text>
+              )}
+
+              {ruleIndex > 0 && (
+                <RuleGroupControls name={name} showSelect={ruleIndex === 1} />
+              )}
+            </div>
+
+            <RuleEditorRow
+              name={name}
+              index={ruleIndex}
+              onRemove={() => removeRule(ruleIndex)}
+              className="flex-auto"
+              disabledOperators={disabledOperators}
+            />
+          </div>
+        ))}
+
+        {(groups as (RuleGroup & { id: string })[]).map(
+          (ruleGroup, ruleGroupIndex) => (
+            <div
+              className="flex flex-row flex-auto items-start mt-2"
+              key={ruleGroup.id}
+            >
+              <div className="flex-[70px] flex-grow-0 flex-shrink-0 mr-2">
+                {rules.length === 0 && ruleGroupIndex === 0 && (
+                  <Text className="p-2 !font-medium">Where</Text>
+                )}
+
+                <RuleGroupControls
+                  name={name}
+                  showSelect={
+                    (rules.length === 0 && ruleGroupIndex === 1) ||
+                    (rules.length === 1 && ruleGroupIndex === 0)
+                  }
+                />
+              </div>
+
+              <RuleGroupEditor
+                onRemove={() => removeGroup(ruleGroupIndex)}
+                disableRemove={rules.length === 0 && groups.length === 1}
+                disabledOperators={disabledOperators}
+                name={`${name}.groups.${ruleGroupIndex}`}
+                className="flex-auto"
+                depth={depth + 1}
+              />
+            </div>
+          ),
+        )}
+      </div>
+
+      <div className="grid grid-flow-row lg:grid-flow-col lg:justify-between gap-2 pb-2">
+        <div className="grid grid-flow-row lg:grid-flow-col gap-2 lg:justify-start">
+          <Button
+            startIcon={<PlusIcon />}
+            variant="borderless"
+            onClick={() =>
+              appendRule({ column: '', operator: '_eq', value: '' })
+            }
+          >
+            New Rule
+          </Button>
+
+          <Button
+            startIcon={<PlusIcon />}
+            variant="borderless"
+            onClick={() =>
+              appendGroup({
+                operator: '_and',
+                rules: [{ column: '', operator: '_eq', value: '' }],
+                groups: [],
+              })
+            }
+            disabled={depth >= maxDepth - 1}
+          >
+            New Group
+          </Button>
+        </div>
+
+        {onRemove && (
+          <Button
+            variant="borderless"
+            color="secondary"
+            onClick={onRemove}
+            disabled={disableRemove}
+          >
+            Delete Group
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleRemoveButton.tsx

@@ -0,0 +1,46 @@
+import type { Rule, RuleGroup } from '@/types/dataBrowser';
+import type { ButtonProps } from '@/ui/v2/Button';
+import Button from '@/ui/v2/Button';
+import XIcon from '@/ui/v2/icons/XIcon';
+import { useWatch } from 'react-hook-form';
+import { twMerge } from 'tailwind-merge';
+
+export interface RuleRemoveButtonProps extends ButtonProps {
+  /**
+   * Name of the parent group editor.
+   */
+  name: string;
+  /**
+   * Function to be called when the remove button is clicked.
+   */
+  onRemove?: VoidFunction;
+}
+
+function RuleRemoveButton({
+  name,
+  onRemove,
+  className,
+  ...props
+}: RuleRemoveButtonProps) {
+  const rules: Rule[] = useWatch({ name: `${name}.rules` });
+  const groups: RuleGroup[] = useWatch({ name: `${name}.groups` });
+
+  return (
+    <Button
+      variant="outlined"
+      color="secondary"
+      className={twMerge(
+        '!bg-white lg:!rounded-l-none lg:flex-grow-0 lg:flex-shrink-0 lg:flex-[40px] !min-w-0 h-10',
+        className,
+      )}
+      disabled={rules.length === 1 && groups.length === 0}
+      aria-label="Remove Rule"
+      {...props}
+      onClick={onRemove}
+    >
+      <XIcon className="!w-4 !h-4" />
+    </Button>
+  );
+}
+
+export default RuleRemoveButton;

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleValueInput.tsx

@@ -0,0 +1,177 @@
+import ControlledAutocomplete from '@/components/common/ControlledAutocomplete';
+import ControlledSelect from '@/components/common/ControlledSelect';
+import ReadOnlyToggle from '@/components/common/ReadOnlyToggle';
+import type { ColumnAutocompleteProps } from '@/components/dataBrowser/ColumnAutocomplete';
+import ColumnAutocomplete from '@/components/dataBrowser/ColumnAutocomplete';
+import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
+import type { HasuraOperator } from '@/types/dataBrowser';
+import ActivityIndicator from '@/ui/v2/ActivityIndicator';
+import Option from '@/ui/v2/Option';
+import getPermissionVariablesArray from '@/utils/settings/getPermissionVariablesArray';
+import { useGetAppCustomClaimsQuery } from '@/utils/__generated__/graphql';
+import { useRouter } from 'next/router';
+import { useController, useFormContext, useWatch } from 'react-hook-form';
+
+export interface RuleValueInputProps {
+  /**
+   * Name of the parent group editor.
+   */
+  name: string;
+  /**
+   * Path of the table selected through the column input.
+   */
+  selectedTablePath?: string;
+}
+
+function ColumnSelectorInput({
+  name,
+  selectedTablePath,
+  schema,
+  table,
+  ...props
+}: ColumnAutocompleteProps & { selectedTablePath: string }) {
+  const { setValue, control } = useFormContext();
+  const { field } = useController({
+    name,
+    control,
+  });
+
+  return (
+    <ColumnAutocomplete
+      {...props}
+      {...field}
+      value={
+        // this array can either be ['$', 'columnName'] or ['columnName']
+        Array.isArray(field.value) ? field.value.slice(-1)[0] : field.value
+      }
+      schema={schema}
+      table={table}
+      disableRelationships
+      rootClassName="flex-auto"
+      slotProps={{
+        input: { className: 'lg:!rounded-none !bg-white !z-10' },
+      }}
+      onChange={(_event, { value }) => {
+        if (selectedTablePath === `${schema}.${table}`) {
+          setValue(name, [value], { shouldDirty: true });
+          return;
+        }
+
+        // For more information, see https://github.com/hasura/graphql-engine/issues/3459#issuecomment-1085666541
+        setValue(name, ['$', value], { shouldDirty: true });
+      }}
+    />
+  );
+}
+
+export default function RuleValueInput({
+  name,
+  selectedTablePath,
+}: RuleValueInputProps) {
+  const { currentApplication } = useCurrentWorkspaceAndApplication();
+  const { setValue } = useFormContext();
+  const inputName = `${name}.value`;
+  const operator: HasuraOperator = useWatch({ name: `${name}.operator` });
+  const isHasuraInput = operator === '_in_hasura' || operator === '_nin_hasura';
+  const {
+    query: { schemaSlug, tableSlug },
+  } = useRouter();
+
+  const { data, loading, error } = useGetAppCustomClaimsQuery({
+    variables: { id: currentApplication?.id },
+    skip: !isHasuraInput,
+  });
+
+  if (operator === '_is_null') {
+    return (
+      <ControlledSelect
+        name={inputName}
+        className="flex-auto"
+        fullWidth
+        slotProps={{ root: { className: 'bg-white lg:!rounded-none h-10' } }}
+      >
+        <Option value="true">
+          <ReadOnlyToggle
+            checked
+            slotProps={{ label: { className: '!text-sm' } }}
+          />
+        </Option>
+
+        <Option value="false">
+          <ReadOnlyToggle
+            checked={false}
+            slotProps={{ label: { className: '!text-sm' } }}
+          />
+        </Option>
+      </ControlledSelect>
+    );
+  }
+
+  if (operator === '_in' || operator === '_nin') {
+    return (
+      <ControlledAutocomplete
+        name={inputName}
+        multiple
+        freeSolo
+        limitTags={5}
+        className="flex-auto"
+        slotProps={{ input: { className: 'lg:!rounded-none !bg-white !z-10' } }}
+        options={[]}
+        fullWidth
+        filterSelectedOptions
+      />
+    );
+  }
+
+  if (['_ceq', '_cne', '_cgt', '_clt', '_cgte', '_clte'].includes(operator)) {
+    return (
+      <ColumnSelectorInput
+        selectedTablePath={selectedTablePath}
+        schema={schemaSlug as string}
+        table={tableSlug as string}
+        name={inputName}
+      />
+    );
+  }
+
+  const availableHasuraPermissionVariables = !loading
+    ? getPermissionVariablesArray(data?.app?.authJwtCustomClaims).map(
+        ({ key }) => ({
+          value: `X-Hasura-${key}`,
+          label: `X-Hasura-${key}`,
+        }),
+      )
+    : [];
+
+  return (
+    <ControlledAutocomplete
+      freeSolo={!isHasuraInput}
+      name={inputName}
+      className="flex-auto"
+      slotProps={{
+        input: { className: 'lg:!rounded-none !bg-white' },
+        formControl: { className: '!bg-transparent' },
+      }}
+      fullWidth
+      loading={loading}
+      loadingText={<ActivityIndicator label="Loading..." />}
+      error={!!error}
+      helperText={error?.message}
+      options={
+        isHasuraInput
+          ? availableHasuraPermissionVariables
+          : [{ value: 'X-Hasura-User-Id', label: 'X-Hasura-User-Id' }]
+      }
+      onChange={(_event, _value, reason, details) => {
+        if (
+          reason !== 'selectOption' &&
+          details.option.value !== 'X-Hasura-User-Id'
+        ) {
+          return;
+        }
+
+        setValue(inputName, details.option.value, { shouldDirty: true });
+      }}
+    />
+  );
+}

dashboard/src/components/dataBrowser/RuleGroupEditor/index.ts

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

dashboard/src/components/home/InviteAnnounce.tsx

@@ -9,6 +9,7 @@ import { updateOwnCache } from '@/utils/updateOwnCache';
 import { useApolloClient } from '@apollo/client';
 import { useUserData } from '@nhost/nextjs';
 import { useRouter } from 'next/router';
+import { useEffect } from 'react';
 
 export function InviteAnnounce() {
   const user = useUserData();
@@ -21,15 +22,18 @@ export function InviteAnnounce() {
     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 } =
+  const { data, loading, error, refetch, startPolling } =
     useGetWorkspaceMemberInvitesToManageQuery({
       variables: {
         userId: user?.id,
       },
-      pollInterval: 15000,
       skip: !isPlatform,
     });
 
+  useEffect(() => {
+    startPolling(15000);
+  }, [startPolling]);
+
   if (loading) {
     return null;
   }

dashboard/src/components/logs/LogsTimePicker/LogsTimePicker.tsx

@@ -61,10 +61,8 @@ function LogsTimePicker({
           value={format(selectedDate, 'HH:mm:ss')}
           style={{ width: '135px' }}
           id="time-picker"
-          componentsProps={{
+          slotProps={{
-            formControl: {
+            formControl: { className: 'grid grid-flow-col gap-x-3' },
-              className: 'grid grid-flow-col gap-x-3',
-            },
             label: { sx: { fontSize: '14px' } },
           }}
           onChange={handleTimePicking}

dashboard/src/components/settings/ResetDatabasePasswordSettings/ResetDatabasePasswordSettings.tsx

@@ -15,7 +15,7 @@ import generateRandomDatabasePassword from '@/utils/settings/generateRandomDatab
 import { resetDatabasePasswordValidationSchema } from '@/utils/settings/resetDatabasePasswordValidationSchema';
 import { triggerToast } from '@/utils/toast';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useUserData } from '@nhost/react';
+import { useUserData } from '@nhost/nextjs';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 
@@ -117,7 +117,7 @@ export default function ResetDatabasePasswordSettings() {
             error={Boolean(errors?.databasePassword)}
             fullWidth
             hideEmptyHelperText
-            componentsProps={{
+            slotProps={{
               input: { className: 'lg:w-1/2' },
               helperText: { component: 'div' },
             }}

dashboard/src/components/settings/environmentVariables/EditJwtSecretForm/EditJwtSecretForm.tsx

@@ -0,0 +1,164 @@
+import { useDialog } from '@/components/common/DialogProvider';
+import Form from '@/components/common/Form';
+import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
+import Button from '@/ui/v2/Button';
+import Input from '@/ui/v2/Input';
+import { toastStyleProps } from '@/utils/settings/settingsConstants';
+import {
+  refetchGetAppInjectedVariablesQuery,
+  useUpdateApplicationMutation,
+} from '@/utils/__generated__/graphql';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import { toast } from 'react-hot-toast';
+import * as Yup from 'yup';
+
+export interface EditJwtSecretFormProps {
+  /**
+   * Initial JWT secret.
+   */
+  jwtSecret: string;
+  /**
+   * Determines whether the form is disabled.
+   */
+  disabled?: boolean;
+  /**
+   * Submit button text.
+   *
+   * @default 'Save'
+   */
+  submitButtonText?: string;
+  /**
+   * Function to be called when the form is submitted.
+   */
+  onSubmit?: () => void;
+  /**
+   * Function to be called when the operation is cancelled.
+   */
+  onCancel?: VoidFunction;
+}
+
+export interface EditJwtSecretFormValues {
+  /**
+   * JWT secret.
+   */
+  jwtSecret: string;
+}
+
+const validationSchema = Yup.object().shape({
+  jwtSecret: Yup.string()
+    .nullable()
+    .required('This field is required.')
+    .test('isJson', 'This is not a valid JSON.', (value) => {
+      try {
+        JSON.parse(value);
+        return true;
+      } catch (error) {
+        return false;
+      }
+    }),
+});
+
+export default function EditJwtSecretForm({
+  disabled,
+  jwtSecret,
+  onSubmit,
+  onCancel,
+  submitButtonText = 'Save',
+}: EditJwtSecretFormProps) {
+  const { currentApplication } = useCurrentWorkspaceAndApplication();
+  const [updateApplication] = useUpdateApplicationMutation({
+    refetchQueries: [
+      refetchGetAppInjectedVariablesQuery({ id: currentApplication?.id }),
+    ],
+  });
+
+  const { onDirtyStateChange } = useDialog();
+  const form = useForm<EditJwtSecretFormValues>({
+    defaultValues: {
+      jwtSecret,
+    },
+    resolver: yupResolver(validationSchema),
+  });
+
+  const {
+    register,
+    formState: { dirtyFields, isSubmitting, errors },
+  } = form;
+  const isDirty = Object.keys(dirtyFields).length > 0;
+
+  useEffect(() => {
+    onDirtyStateChange(isDirty, 'dialog');
+  }, [isDirty, onDirtyStateChange]);
+
+  async function handleSubmit(values: EditJwtSecretFormValues) {
+    const updateAppPromise = updateApplication({
+      variables: {
+        appId: currentApplication?.id,
+        app: {
+          hasuraGraphqlJwtSecret: values.jwtSecret,
+        },
+      },
+    });
+
+    await toast.promise(
+      updateAppPromise,
+      {
+        loading: 'Updating JWT secret...',
+        success: 'JWT secret has been updated successfully.',
+        error: 'An error occurred while updating the JWT secret.',
+      },
+      toastStyleProps,
+    );
+
+    onSubmit?.();
+  }
+
+  return (
+    <FormProvider {...form}>
+      <Form
+        onSubmit={handleSubmit}
+        className="flex flex-auto flex-col content-between overflow-hidden pb-4"
+      >
+        <div className="px-6 overflow-y-auto flex-auto">
+          <Input
+            {...register('jwtSecret')}
+            error={Boolean(errors.jwtSecret?.message)}
+            helperText={errors.jwtSecret?.message}
+            autoFocus={!disabled}
+            disabled={disabled}
+            aria-label="JWT Secret"
+            multiline
+            minRows={4}
+            fullWidth
+            hideEmptyHelperText
+            slotProps={{ inputRoot: { className: 'font-mono !text-sm' } }}
+          />
+        </div>
+
+        <div className="grid flex-shrink-0 grid-flow-row gap-2 px-6 pt-4">
+          {!disabled && (
+            <Button
+              loading={isSubmitting}
+              disabled={isSubmitting}
+              type="submit"
+            >
+              {submitButtonText}
+            </Button>
+          )}
+
+          <Button
+            variant="outlined"
+            color="secondary"
+            onClick={onCancel}
+            tabIndex={isDirty ? -1 : 0}
+            autoFocus={disabled}
+          >
+            {disabled ? 'Close' : 'Cancel'}
+          </Button>
+        </div>
+      </Form>
+    </FormProvider>
+  );
+}

dashboard/src/components/settings/environmentVariables/EditJwtSecretForm/index.ts

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

dashboard/src/components/settings/environmentVariables/SystemEnvironmentVariableSettings/SystemEnvironmentVariableSettings.tsx

@@ -1,6 +1,7 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import InlineCode from '@/components/common/InlineCode';
 import SettingsContainer from '@/components/settings/SettingsContainer';
+import useIsPlatform from '@/hooks/common/useIsPlatform';
 import { useAppClient } from '@/hooks/useAppClient';
 import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
@@ -9,12 +10,15 @@ import Divider from '@/ui/v2/Divider';
 import IconButton from '@/ui/v2/IconButton';
 import EyeIcon from '@/ui/v2/icons/EyeIcon';
 import EyeOffIcon from '@/ui/v2/icons/EyeOffIcon';
-import Input from '@/ui/v2/Input';
 import List from '@/ui/v2/List';
 import { ListItem } from '@/ui/v2/ListItem';
 import Text from '@/ui/v2/Text';
+import generateAppServiceUrl, {
+  defaultLocalBackendSlugs,
+  defaultRemoteBackendSlugs,
+} from '@/utils/common/generateAppServiceUrl';
 import { LOCAL_HASURA_URL } from '@/utils/env';
-import { generateAppServiceUrl, generateRemoteAppUrl } from '@/utils/helpers';
+import { generateRemoteAppUrl } from '@/utils/helpers';
 import { useGetAppInjectedVariablesQuery } from '@/utils/__generated__/graphql';
 import { Fragment, useState } from 'react';
 
@@ -22,13 +26,14 @@ export default function SystemEnvironmentVariableSettings() {
   const [showAdminSecret, setShowAdminSecret] = useState(false);
   const [showWebhookSecret, setShowWebhookSecret] = useState(false);
 
-  const { openAlertDialog } = useDialog();
+  const { openDialog } = useDialog();
   const { currentApplication } = useCurrentWorkspaceAndApplication();
   const { data, loading, error } = useGetAppInjectedVariablesQuery({
     variables: { id: currentApplication?.id },
   });
+  const isPlatform = useIsPlatform();
 
-  const appClient = useAppClient({ start: false });
+  const appClient = useAppClient();
 
   if (loading) {
     return (
@@ -43,30 +48,39 @@ export default function SystemEnvironmentVariableSettings() {
     throw error;
   }
 
-  function showJwtSecret() {
+  function showViewJwtSecretModal() {
-    openAlertDialog({
+    openDialog('EDIT_JWT_SECRET', {
-      title: 'Auth JWT Secret',
+      title: (
-      payload: (
+        <span className="grid grid-flow-row">
-        <div className="grid grid-flow-row gap-2">
+          <span>Auth JWT Secret</span>
-          <Text variant="subtitle2">
+
+          <Text variant="subtitle1" component="span">
             This is the key used for generating JWTs. It&apos;s HMAC-SHA-based
             and the same as configured in Hasura.
           </Text>
-
+        </span>
-          <Input
-            defaultValue={data?.app?.hasuraGraphqlJwtSecret}
-            disabled
-            fullWidth
-            multiline
-            minRows={5}
-            hideEmptyHelperText
-            inputProps={{ className: 'font-mono' }}
-          />
-        </div>
       ),
-      props: {
+      payload: {
-        hidePrimaryAction: true,
+        disabled: true,
-        secondaryButtonText: 'Close',
+        jwtSecret: data?.app?.hasuraGraphqlJwtSecret,
+      },
+    });
+  }
+
+  function showEditJwtSecretModal() {
+    openDialog('EDIT_JWT_SECRET', {
+      title: (
+        <span className="grid grid-flow-row">
+          <span>Edit JWT Secret</span>
+
+          <Text variant="subtitle1" component="span">
+            You can add your custom JWT secret here. Hasura will use it to
+            validate the identity of your users.
+          </Text>
+        </span>
+      ),
+      payload: {
+        jwtSecret: data?.app?.hasuraGraphqlJwtSecret,
       },
     });
   }
@@ -81,13 +95,15 @@ export default function SystemEnvironmentVariableSettings() {
     {
       key: 'NHOST_HASURA_URL',
       value:
-        process.env.NEXT_PUBLIC_ENV === 'dev'
+        process.env.NEXT_PUBLIC_ENV === 'dev' || !isPlatform
-          ? LOCAL_HASURA_URL
+          ? `${LOCAL_HASURA_URL}/console`
-          : `${generateAppServiceUrl(
+          : generateAppServiceUrl(
-              currentApplication.subdomain,
+              currentApplication?.subdomain,
-              currentApplication.region.awsName,
+              currentApplication?.region.awsName,
               'hasura',
-            )}/console`,
+              defaultLocalBackendSlugs,
+              { ...defaultRemoteBackendSlugs, hasura: '/console' },
+            ),
     },
     { key: 'NHOST_AUTH_URL', value: appClient.auth.url },
     { key: 'NHOST_GRAPHQL_URL', value: appClient.graphql.url },
@@ -199,14 +215,25 @@ export default function SystemEnvironmentVariableSettings() {
         <ListItem.Root className="px-4 grid grid-cols-2 lg:grid-cols-3 justify-start">
           <ListItem.Text>NHOST_JWT_SECRET</ListItem.Text>
 
-          <Button
+          <div className="grid grid-flow-row md:grid-flow-col gap-1.5 justify-center text-center lg:text-left lg:justify-start items-center lg:col-span-2">
-            variant="borderless"
+            <Button
-            onClick={showJwtSecret}
+              variant="borderless"
-            size="small"
+              onClick={showViewJwtSecretModal}
-            className="justify-self-start"
+              size="small"
-          >
+            >
-            Show JWT Secret
+              Show JWT Secret
-          </Button>
+            </Button>
+
+            <Text component="span">or</Text>
+
+            <Button
+              variant="borderless"
+              onClick={showEditJwtSecretModal}
+              size="small"
+            >
+              Edit JWT Secret
+            </Button>
+          </div>
         </ListItem.Root>
       </List>
     </SettingsContainer>

dashboard/src/components/settings/permissions/PermissionVariableSettings/PermissionVariableSettings.tsx

@@ -14,7 +14,7 @@ import List from '@/ui/v2/List';
 import { ListItem } from '@/ui/v2/ListItem';
 import Text from '@/ui/v2/Text';
 import Tooltip from '@/ui/v2/Tooltip';
-import getPermissionVariables from '@/utils/settings/getPermissionVariablesArray';
+import getPermissionVariablesArray from '@/utils/settings/getPermissionVariablesArray';
 import { toastStyleProps } from '@/utils/settings/settingsConstants';
 import {
   useGetAppCustomClaimsQuery,
@@ -125,7 +125,7 @@ export default function PermissionVariableSettings() {
     });
   }
 
-  const availablePermissionVariables = getPermissionVariables(
+  const availablePermissionVariables = getPermissionVariablesArray(
     data?.app?.authJwtCustomClaims,
   );
 

dashboard/src/components/settings/roles/BaseRoleForm/BaseRoleForm.tsx

@@ -1,5 +1,6 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
+import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
 import Input from '@/ui/v2/Input';
 import Text from '@/ui/v2/Text';
@@ -55,11 +56,20 @@ export default function BaseRoleForm({
   }, [isDirty, onDirtyStateChange]);
 
   return (
-    <div className="grid grid-flow-row gap-2 px-6 pb-6">
+    <div className="grid grid-flow-row gap-3 px-6 pb-6">
       <Text variant="subtitle1" component="span">
         Enter the name for the role below.
       </Text>
 
+      {submitButtonText !== 'Create' && (
+        <Alert severity="warning" className="text-left">
+          <span className="text-left">
+            <strong>Note:</strong> Changing the name of the role will lose the
+            associated permissions with that role.
+          </span>
+        </Alert>
+      )}
+
       <Form onSubmit={onSubmit} className="grid grid-flow-row gap-4">
         <Input
           {...register('name')}