chore: fix lockfile (#3037 )

chore: update versions (#3032 )
This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @nhost/hasura-auth-js@2.7.0 ### Minor Changes - fe6e8e2: feat: add email OTP sign-in functionality - 72899a6: fix: use a unique `broadcastKey` per nhost client for synchronizing authentication state across browser tabs ## @nhost/nhost-js@3.2.0 ### Minor Changes - 72899a6: fix: use a unique `broadcastKey` per nhost client for synchronizing authentication state across browser tabs ### Patch Changes - Updated dependencies [fe6e8e2] - Updated dependencies [72899a6] - @nhost/hasura-auth-js@2.7.0 ## @nhost/react@3.7.0 ### Minor Changes - fe6e8e2: feat: add email OTP sign-in functionality ### Patch Changes - Updated dependencies [72899a6] - @nhost/nhost-js@3.2.0 ## @nhost/vue@2.7.0 ### Minor Changes - fe6e8e2: feat: add email OTP sign-in functionality ### Patch Changes - Updated dependencies [72899a6] - @nhost/nhost-js@3.2.0 ## @nhost/apollo@8.0.0 ### Patch Changes - Updated dependencies [72899a6] - @nhost/nhost-js@3.2.0 ## @nhost/react-apollo@14.0.0 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 - @nhost/apollo@8.0.0 ## @nhost/react-urql@11.0.0 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 ## @nhost/nextjs@2.1.23 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 ## @nhost/dashboard@2.7.1 # @nhost/dashboard ## 1.30.0 ### Minor Changes - 50441a8: feat: add ui for project autoscaler settings and run services autoscaler settings ## 1.29.0 ### Minor Changes - 55d8bb5: feat: integrate turnstile for signup verification - 2a2e54c: fix: update docs url in run services form tooltip - 18f942f: fix: display long error messages in error toast without overflow ### Patch Changes - @nhost/react-apollo@13.0.0 - @nhost/nextjs@2.1.22 ## 1.28.2 ### Patch Changes - 52a38fe: chore: update dependencies to address security vulnerabilities - Updated dependencies [52a38fe] - @nhost/nextjs@2.1.21 ## 1.28.1 ### Patch Changes - 9735fa2: chore: remove broken link ## 1.28.0 ### Minor Changes - 526183a: feat: allow filtering users in "make request as" in graphql section - be3b85b: feat: add conceal errors toggle on auth settings page ### Patch Changes - 35a2f12: fix: prevent run service details from opening when attempting to delete - @nhost/react-apollo@12.0.6 - @nhost/nextjs@2.1.20 ## 1.27.0 ### Minor Changes - a7cd02c: fix: resolve rate limit query ## 1.26.0 ### Minor Changes - 3773ad7: chore: update pricing information - b63250d: fix: not allow run service creation form resubmission while creating a run service - a44a1d4: feat: add rate limits settings page ### Patch Changes - @nhost/react-apollo@12.0.5 - @nhost/nextjs@2.1.19 ## 1.25.0 ### Minor Changes - d1ceede: feat: add setting to migrate postgres major and/or minor versions - e5d3d1a: fix: allow manually typing column for custom check in database row permissions ### Patch Changes - @nhost/react-apollo@12.0.4 - @nhost/nextjs@2.1.18 ## 1.24.1 ### Patch Changes - 49f2e55: fix: use service subdomain in service form and service details dialog - 598b988: fix: use current project subdomain in ServiceDetailsDialog component ## 1.24.0 ### Minor Changes - abb24af: chore: add redirect to support page when project is locked - 18a6455: feat: show contact us info and locked reason when project is locked ### Patch Changes - e31eefa: fix: include ingresses field when updating run services ## 1.23.0 ### Minor Changes - 33284d3: fix: don't show double scrollbar in configuration editor ### Patch Changes - @nhost/react-apollo@12.0.3 - @nhost/nextjs@2.1.17 ## 1.22.0 ### Minor Changes - 998c037: fix: align drop-down list in select component - 807b8c0: fix: show city name in region selection for project creation ## 1.21.0 ### Minor Changes - a2efeed: fix: improve project health error handling, add unknown state and polling interval for health state ## 1.20.0 ### Minor Changes - 8ea4210: fix: error toasts can be closed individually, instead of dismissing all toasts at once - 58919ba: chore: add blink animation when project health service is updating ## 1.19.0 ### Minor Changes - b519862: fix: get configuration in configuration editor using local development environment ## 1.18.0 ### Minor Changes - 502abad: feat: add services health checks indicators to the overview page - b3ff6ad: chore: update title text on service status modal - dbadf59: feat: add project configuration TOML editor to the settings page ## 1.17.0 ### Minor Changes - 77fba27: fix: postgres version validation when activating ai in ai settings page - ac6d1b6: feat: use name instead of awsName ## 1.16.3 ### Patch Changes - 87a37cf: fix: remove unnecessary isPlatform check from verify button disable logic on custom domains - @nhost/react-apollo@12.0.2 - @nhost/nextjs@2.1.16 ## 1.16.2 ### Patch Changes - a9413af: fix: update `GetAllWorkspacesAndProjects` query polling to use exponential backoff - @nhost/react-apollo@12.0.1 - @nhost/nextjs@2.1.15 ## 1.16.1 ### Patch Changes - @nhost/react-apollo@12.0.0 - @nhost/nextjs@2.1.14 ## 1.16.0 ### Minor Changes - c6d5c5c: feat: add toggle switch to enable/disable public access in the database settings ## 1.15.2 ### Patch Changes - @nhost/react-apollo@11.0.4 - @nhost/nextjs@2.1.13 ## 1.15.1 ### Patch Changes - @nhost/react-apollo@11.0.3 - @nhost/nextjs@2.1.12 ## 1.15.0 ### Minor Changes - a7bde37: feat: send metadata in the edit form ### Patch Changes - 1bc615b: feat: improve error message handling in `ErrorToast` component - @nhost/react-apollo@11.0.2 - @nhost/nextjs@2.1.11 ## 1.14.0 ### Minor Changes - a448d7d: feat: allow configuring postmark and delete SMTP settings ## 1.13.3 ### Patch Changes - 5924bc3: fix: include password in `GetSmtpSettings` query - c5ad634: fix: resolved an issue where one-click install links were broken on Safari - 7278991: fix: update graphql auto-embeddings configuration to use String type for model field ## 1.13.2 ### Patch Changes - 026f84f: fix: use configuration server URL from environment variable ## 1.13.1 ### Patch Changes - 7e9a2ce: fix: resolve issue where run services form fails to open ## 1.13.0 ### Minor Changes - dd5d262: feat: add model field to the auto-embeddings form - 09962be: feat: enable settings and run services when running the dashboard locally - 9cdecb6: feat: enable users to update their email address from the account settings page ## 1.12.2 ### Patch Changes - c195c51: fix: send email upon signin for unverified users ## 1.12.1 ### Patch Changes - 93ebdf8: fix: use service urls when initilizaing NhostClient running local dashboard - @nhost/react-apollo@11.0.1 - @nhost/nextjs@2.1.10 ## 1.12.0 ### Minor Changes - f242e4b: feat: add connect with github to the user's account settings - 768ca17: chore: update dependencies - d62bd0f: fix: "Track this" option within the SQL editor now correctly updates the metadata - 91c2bb6: feat: refactor sign-in and sign-up pages to enforce email verification ### Patch Changes - 943831f: fix: resolve an error toast issue when unpausing a project - Updated dependencies [768ca17] - @nhost/react-apollo@11.0.0 - @nhost/nextjs@2.1.9 ## 1.11.2 ### Patch Changes - @nhost/react-apollo@10.0.2 - @nhost/nextjs@2.1.8 ## 1.11.1 ### Patch Changes - 981404f: fix: set default value for healthCheck field validation ## 1.11.0 ### Minor Changes - 7789469: chore: upgrade dependency `@graphql-codegen/cli` to `5.0.2` to address vulnerability - 6c11b75: feat: add update user displayName section in account settings ### Patch Changes - @nhost/react-apollo@10.0.1 - @nhost/nextjs@2.1.7 ## 1.10.0 ### Minor Changes - 49a80c2: chore: update dependencies - 150c04a: feat: add healthcheck config to run services ### Patch Changes - e03f141: fix: allow insert, update and delete on tables in `auth` and `storage` schemas - 28676f4: feat: add min postgres version check to enable the ai service - Updated dependencies [49a80c2] - @nhost/react-apollo@10.0.0 - @nhost/nextjs@2.1.6 ## 1.9.0 ### Minor Changes - d86e5c9: feat: add support for filtering the logs using a RegExp ## 1.8.3 ### Patch Changes - @nhost/react-apollo@9.0.3 - @nhost/nextjs@2.1.5 ## 1.8.2 ### Patch Changes - 6df4f02: fix: use custom error toast and show correct message when sending an invite ## 1.8.1 ### Patch Changes - @nhost/react-apollo@9.0.2 - @nhost/nextjs@2.1.4 ## 1.8.0 ### Minor Changes - 713d53c: feat: add catch-all route for workspace/project - useful for documentation ### Patch Changes - 3db2999: fix: refresh table list after running SQL using the editor - 3c4dd55: fix: handle `Error` objects properly in the `ErrorToast` component - 92b434e: fix: resolve an issue where the checkbox in the data-grid header did not select all rows - @nhost/react-apollo@9.0.1 - @nhost/nextjs@2.1.3 ## 1.7.0 ### Minor Changes - 0d8d0eb: Update docs and dashboard references ## 1.6.9 ### Patch Changes - @nhost/react-apollo@9.0.0 - @nhost/nextjs@2.1.2 ## 1.6.8 ### Patch Changes - @nhost/react-apollo@8.0.1 - @nhost/nextjs@2.1.1 ## 1.6.7 ### Patch Changes - 5ef5189: fix: update `@apollo/client` to `3.9.4` to fix a cache bug ## 1.6.6 ### Patch Changes - 3ba485e: fix: added discord.com to connect-src - e5bab6a: chore: update dependencies - Updated dependencies [b19ffed] - Updated dependencies [e5bab6a] - @nhost/nextjs@2.1.0 - @nhost/react-apollo@8.0.0 ## 1.6.5 ### Patch Changes - ba73bb4: fix: update ErrorToast component to show the internal graphql error - d5337ff: fix: utilize accumulator in the creation of validation schema within data grid utils ## 1.6.4 ### Patch Changes - 7c2a1c2: feat: show error and debug info in the error toast ## 1.6.3 ### Patch Changes - 6b8aad5: fix: add bare nhost.run to CSP ## 1.6.2 ### Patch Changes - b18edc0: feat: added CSP and X-Frame-Options ## 1.6.1 ### Patch Changes - 8d91f71: chore: update deps and enable pnpm audit - 3b8473b: chore: update turbo to `1.11.3` and pnpm to `8.10.5` in Dockerfile - Updated dependencies [8d91f71] - @nhost/react-apollo@7.0.2 - @nhost/nextjs@2.0.2 ## 1.6.0 ### Minor Changes - 3ff1c2b53: fix: show upgrade option for pro projects ## 1.5.0 ### Minor Changes - c2ef17c0a: feat: add support for new Team plan ## 1.4.0 ### Minor Changes - 7883bbcbd: feat: don't show deprecated plans - 44be6dc0a: feat: set redirectTo during sign-in to support preview environments ### Patch Changes - 3c3594898: fix: allow access to graphite when configured running in local dashboard - 32c246b7a: chore: update docs icon ## 1.3.2 ### Patch Changes - 174b4165b: chore: use env variables when running graphql codegen - 7c977e714: chore: change `Allowed Roles` to `Default Allowed Roles` - 46f028b9f: fix: remove hardcoded ai version setting ## 1.3.1 ### Patch Changes - af33c21d1: chore: remove backendUrl deprecation notice and remove all references to `providersUpdated` ## 1.3.0 ### Minor Changes - 04784d880: Fix graphite's default version ## 1.2.0 ### Minor Changes - 5733162ed: feat: add settings and ui for graphite ## 1.1.0 ### Minor Changes - e2b79b5ec: chore: remove sharp from deps ## 1.0.1 ### Patch Changes - @nhost/react-apollo@7.0.1 - @nhost/nextjs@2.0.1 ## 1.0.0 ### Major Changes - bc9eff6e4: chore: remove support for using backendUrl when instantiating the Nhost client ### Patch Changes - Updated dependencies [bc9eff6e4] - @nhost/nextjs@2.0.0 - @nhost/react-apollo@7.0.0 ## 0.21.1 ### Patch Changes - 97ced73a3: fix(dashboard): prevent dashboard from resolving secrets ## 0.21.0 ### Minor Changes - ed1a8d458: Update alert message on increasing PostgreSQL's volume capacity - 2e2248fd4: feat(dashboard): add SQL editor ## 0.20.28 ### Patch Changes - 7c2c31082: feat: add support for users to delete their account - @nhost/react-apollo@6.0.1 - @nhost/nextjs@1.13.40 ## 0.20.27 ### Patch Changes - fa79b7709: chore(dashboard): tweaks and fixes to the service form and dialog - 8df84d782: fix(dashboard): allow resetting custom domains - @nhost/react-apollo@6.0.0 - @nhost/nextjs@1.13.39 ## 0.20.26 ### Patch Changes - 331ba0376: feat(dashboard): add postgres storage capacity modifier in the settings - b7f801874: feat(dashboard): add new settings page for custom domains ## 0.20.25 ### Patch Changes - @nhost/react-apollo@5.0.38 ## 0.20.24 ### Patch Changes - e10389ecf: fix(dashboard): disable run tab when developing locally - @nhost/react-apollo@5.0.37 ## 0.20.23 ### Patch Changes - c01568a7d: chore(dashboard): show alert to update oauth providers ## 0.20.22 ### Patch Changes - c3efb7ec8: feat(dashboard): query latest announcement from platform ## 0.20.21 ### Patch Changes - 3e46d3873: chore: update link to node18 announcement ## 0.20.20 ### Patch Changes - @nhost/react-apollo@5.0.36 - @nhost/nextjs@1.13.38 ## 0.20.19 ### Patch Changes - 75c4c8ae3: feat(dashboard): make env value input multiline ## 0.20.18 ### Patch Changes - 425d485f8: fix(dashboard): make sure dedicated resources pricing follows total resources ## 0.20.17 ### Patch Changes - ae324f67f: fix(dashboard): remove unused graphql fields ## 0.20.16 ### Patch Changes - df5b4302c: chore(dashboard): remove run feature flag - bf4a1f6c2: feat(dashboard): fetch auth, postgres, hasura and storage versions from dashboard - 34fc08ca7: fix(dashboard/run): show correct private registry in service details - 885d10620: chore(dashboard): change feedback to contact us ## 0.20.15 ### Patch Changes - ed16c8b5d: feat(run): add a confirmation dialog when deleting a run service - 216990888: fix(run): center loading indicator when selecting a project ## 0.20.14 ### Patch Changes - 9fbea9787: feat: add node18 announcement ## 0.20.13 ### Patch Changes - e84acf469: fix(run): handle subdomain undefined error when creating a new service ## 0.20.12 ### Patch Changes - b7c799d62: feat(run): add dialog to copy registry and URLs ## 0.20.11 ### Patch Changes - 8903e6abd: fix(dashboard): show correct egress limit in usage stats ## 0.20.10 ### Patch Changes - 666a75a23: feat(dashboard): add functions execution time and egress volume to usage stats ## 0.20.9 ### Patch Changes - 5e1e80aa8: fix(dashboard): show correct locales in user details - @nhost/react-apollo@5.0.35 - @nhost/nextjs@1.13.37 ## 0.20.8 ### Patch Changes - @nhost/react-apollo@5.0.34 - @nhost/nextjs@1.13.36 ## 0.20.7 ### Patch Changes - 4a7ede11e: fix: distinguish files that were not uploaded - 202b64723: feat(nhost-run): add support for one-click-install run services - 074a0fa11: feat(dashboard): add settings toggle to enable/disable antivirus - @nhost/react-apollo@5.0.33 - @nhost/nextjs@1.13.35 ## 0.20.6 ### Patch Changes - b20761e97: feat(services): add pricing info and confirmation dialog - 90df6d81d: fix(services): handle null values when editing a service - aa8508467: fix: query service logs correctly feat: enable multiline support for environment value input ## 0.20.5 ### Patch Changes - 8d7f84b8d: fix: make announcement adapt to theme ## 0.20.4 ### Patch Changes - 3b75bfce2: fix: make announcement close properly - f49819075: fix: show correct values when dedicated resources are disabled ## 0.20.3 ### Patch Changes - e643bd362: fix(services): fix errors when config is null - bcdab66bf: feat: add annoucement for nhost run - f967a2e59: added note about storage not being able to be downsized - 311c7756d: chore(services): consistent naming for compute ## 0.20.2 ### Patch Changes - 9073182d5: chore(dashboard): bump `turbo` to 1.10.11 - ece717d6e: feat(logs): show services in the logs page - 82b335311: feat(metrics): change grafana link to point to the dashboards - b135ef695: fix(services): set command as optional and set min replicas to 0 ## 0.20.1 ### Patch Changes - 3d5c34f4c: fix(auth): fix users pagination limit ## 0.20.0 ### Minor Changes - c99d117d1: feat(services): add support for custom services ## 0.19.2 ### Patch Changes - face99ccd: chore(deps): bump turbo version - cfe527307: style: tweak pull config warning in dark mode - a9d7da8af: chore(deps): update dependency @types/pluralize to ^0.0.30 - 9aa4371ef: chore: add hasura-auth version 0.21.2 - d14e112bf: chore(deps): update dependency prettier-plugin-tailwindcss to ^0.4.0 - d3e8bb94a: chore(deps): update dependency vite-plugin-dts to v3 ## 0.19.1 ### Patch Changes - @nhost/react-apollo@5.0.32 - @nhost/nextjs@1.13.34 ## 0.19.0 ### Minor Changes - 9c61c69a7: chore(dashboard):add postgres 14.6-20230705-1 to the version selector ### Patch Changes - 47bda15ff: feat(settings): add warning to pull config ## 0.18.0 ### Minor Changes - ee0b9b8ed: chore(dashboard):add hasura v2.28.2 and v2.29.0 to the version selector ## 0.17.20 ### Patch Changes - @nhost/react-apollo@5.0.31 - @nhost/nextjs@1.13.33 ## 0.17.19 ### Patch Changes - f866120a6: fix(users): use the password length from the config ## 0.17.18 ### Patch Changes - @nhost/react-apollo@5.0.30 - @nhost/nextjs@1.13.32 ## 0.17.17 ### Patch Changes - ea7b102c0: fix(pat): highlight expired tokens ## 0.17.16 ### Patch Changes - b3b64a3b7: chore(deps): bump `@types/react` to `v18.2.14` and `@types/react-dom` to `v18.2.6` - 32b221f94: chore(deps): bump `graphiql` to `v3` - 3a56c12df: chore(deps): bump `turbo` to `v1.10.6` - Updated dependencies [b3b64a3b7] - @nhost/react-apollo@5.0.29 - @nhost/nextjs@1.13.31 ## 0.17.15 ### Patch Changes - f41fdc12a: chore(deps): bump `turbo` to `1.10.5` - 6199c1c55: fix(projects): don't redirect to 404 page - Updated dependencies [07a45fde0] - @nhost/react-apollo@5.0.28 - @nhost/nextjs@1.13.30 ## 0.17.14 ### Patch Changes - 80b22724d: chore(deps): bump `@types/react` to `v18.2.13`, `@types/react-dom` to `v18.2.6` and `@storybook/testing-library` to `v0.2.0` ## 0.17.13 ### Patch Changes - cc02902cb: chore(docs): update environment variable documentation ## 0.17.12 ### Patch Changes - 660d339e1: fix(storybook): don't break storybook - 660d339e1: fix(tests): prevent warnings during tests - @nhost/react-apollo@5.0.27 - @nhost/nextjs@1.13.29 ## 0.17.11 ### Patch Changes - bd4d0c270: chore(dashboard):add postgres 14.6-20230613-1 to the version selector ## 0.17.10 ### Patch Changes - c8c2a10b2: fix(database): don't break the password reset flow - e70b45498: chore(deps): bump `@types/react` to `v18.2.12` and `@types/react-dom` to `v18.2.5` ## 0.17.9 ### Patch Changes - 842055099: chore(deps): bump `turbo` to `v1.10.3` and `pnpm` to `v8.6.2` - fd12aa0a8: chore(projects): remove the postgres password input from the project creation screen - 022b76e78: chore(deps): bump `@types/react` to `v18.2.11` - 3555ab2b7: chore(deps): bump `vitest` monorepo to `v0.32.0` - c43e54922: feat(backups): add download button to backups ## 0.17.8 ### Patch Changes - d0457fe5c: feat(settings): improve the dashboard and config parity - @nhost/react-apollo@5.0.26 - @nhost/nextjs@1.13.28 ## 0.17.7 ### Patch Changes - 4f0368b95: fix(account): don't break account settings page ## 0.17.6 ### Patch Changes - 64a8f41d0: chore(resources): lower the maximum allowed resources per service ## 0.17.5 ### Patch Changes - @nhost/react-apollo@5.0.25 - @nhost/nextjs@1.13.27 ## 0.17.4 ### Patch Changes - 9b1d0f7a5: fix(deployments): use correct timestamp for deployment details - 6d2963ffa: chore(deps): bump `@types/react` to `v18.2.8` - 8871267b9: chore(deps): downgrade `pnpm` to `v8.5.1` because of no Turborepo support ## 0.17.3 ### Patch Changes - 01eeef9de: chore(misc): under the hood improvements - 21e13db05: chore(deps): bump `@types/react` to `v18.2.7` and `turbo` to `v1.10.1` - f16433ae6: chore(secrets): allow empty secrets and environment variables - aa3c62989: chore(cli): bump Nhost CLI version to v1.0 - @nhost/react-apollo@5.0.24 - @nhost/nextjs@1.13.26 ## 0.17.2 ### Patch Changes - 88a4983f: chore(misc): under the hood improvements ## 0.17.1 ### Patch Changes - 9b0d4dde: feat(secrets): enable secrets ## 0.17.0 ### Minor Changes - 15d84a19: Add postgres 14.6-20230525 ## 0.16.14 ### Patch Changes - 4c626174: chore: updated import paths, improved directory structure - cc047b71: chore(deps): bump `@fontsource` monorepo to `v5.0.0` - 99edd012: feat(account): add support for personal access tokens ## 0.16.13 ### Patch Changes - 78c7109c: feat(settings): allow selecting service versions ## 0.16.12 ### Patch Changes - 399009d6: fix(gql): don't enter an infinite loop when fetching remote app data - 329e5a91: fix(deployments): use the same sorting of deployments everywhere - 6d559d6e: chore(settings): add under the hood improvements to the settings page - 12eb236c: chore(deps): bump `prettier-plugin-tailwindcss` to `v0.3.0` - f9b81a2a: chore(deps): bump `turbo` to `v1.9.8` - 1345741b: fix(projects): don't redirect to 404 on project creation - Updated dependencies [7fea29a8] - @nhost/react-apollo@5.0.23 - @nhost/nextjs@1.13.25 ## 0.16.11 ### Patch Changes - 1230b722: fix(projects): don't redirect to 404 on when the project is renamed - @nhost/react-apollo@5.0.22 - @nhost/nextjs@1.13.24 ## 0.16.10 ### Patch Changes - Updated dependencies [da03bf39] - @nhost/react-apollo@5.0.21 - @nhost/nextjs@1.13.23 ## 0.16.9 ### Patch Changes - 349aac36: fix(settings): use region domain when constructing the postgres connection string ## 0.16.8 ### Patch Changes - 20fb69fa: chore(projects): change the way how API URLs are constructed ## 0.16.7 ### Patch Changes - 49f9b837: chore(docker): bump `pnpm` to `v8.4.0` and `turbo` to `v1.9.3` - 3f478a4e: chore(deps): bump `vitest` to `v0.31.0`, `@types/react` to `v18.2.6` and `@types/react-dom` to `v18.2.4` ## 0.16.6 ### Patch Changes - d926f156: fix(projects): redirect to 404 when an invalid project is opened - 49b99728: fix(projects): disable features for non-owner members of workspaces ## 0.16.5 ### Patch Changes - 12e2855f: chore(deps): bump `jsdom` to v22 - e4972b83: feat(metrics): add Grafana page ## 0.16.4 ### Patch Changes - 3f396a9e: fix(projects): unpause after upgrading a paused project to pro - 3f396a9e: fix(projects): don't redirect to 404 page after project creation ## 0.16.3 ### Patch Changes - Updated dependencies [90c60311] - @nhost/react-apollo@5.0.20 - @nhost/nextjs@1.13.22 ## 0.16.2 ### Patch Changes - 0f34f0c6: fix(projects): disallow downgrading to free plan - 8da291ad: chore(deps): bump `@types/react` to v18.2.0 and `@types/react-dom` to v18.2.1 ## 0.16.1 ### Patch Changes - adc828a5: fix(gql): don't enter an infinite loop when fetching remote app data ## 0.16.0 ### Minor Changes - 2fb1145f: feat(compute): add support for replicas ### Patch Changes - d8ceccec: chore(env): remove deprecated `NHOST_BACKEND_URL` environment variable ## 0.15.2 ### Patch Changes - 84b84ab7: fix(projects): filter projects by workspace ## 0.15.1 ### Patch Changes - 2faf7907: chore(deps): bump `graphql-request` to v6 - f1b5a944: chore(deps): bump `@vitejs/plugin-react` to v4 - 7f1785ac: chore(deps): bump `@types/react` to v18.0.37 - @nhost/react-apollo@5.0.19 ## 0.15.0 ### Minor Changes - 85889ee8: feat(dashboard): add Compute management to the settings ## 0.14.8 ### Patch Changes - 668c8771: chore(dialogs): unify dialog management of payment dialogs ## 0.14.7 ### Patch Changes - d4ccc656: chore: cleanup unused code - @nhost/react-apollo@5.0.18 - @nhost/nextjs@1.13.21 ## 0.14.6 ### Patch Changes - b299cfc9: chore(deps): bump `vitest` to v0.30.0 - 411cb65b: chore(projects): refactor workspace and project hooks - 43b1b144: chore(deps): bump `@types/react` to v18.0.34 and `@types/react-dom` to v18.0.11 - Updated dependencies [43b1b144] - @nhost/react-apollo@5.0.17 - @nhost/nextjs@1.13.20 ## 0.14.5 ### Patch Changes - ba0d57ee: fix(i18n): revert i18n library - 3328ed05: feat(projects): improve overview when there is an error ## 0.14.4 ### Patch Changes - 5e0920ba: chore(deps): bump `next-seo` to v6 - 706c9dc3: chore(deps): bump `@types/react` to 18.0.33 - 99f8f6b3: feat(metrics): show metrics on the overview ## 0.14.3 ### Patch Changes - @nhost/react-apollo@5.0.16 ## 0.14.2 ### Patch Changes - 3cb67300: fix(logs): don't break UI when clearing time picker - 7453bf3b: feat(projects): show project creator info - c166dad0: chore(tests): improve auth page tests - 6a290bb2: chore(deps): bump `@types/react` to 18.0.32 ## 0.14.1 ### Patch Changes - @nhost/react-apollo@5.0.15 - @nhost/nextjs@1.13.19 ## 0.14.0 ### Minor Changes - 6e1f03ea: feat(dashboard): add support for the Azure AD provider ### Patch Changes - 1bd2c373: chore(deps): bump `turbo` to 1.8.6 - d329b621: chore(deps): bump `@types/react` to 18.0.30 - cb248f0d: fix(tests): avoid name collision in database tests - 867c8076: chore(deps): bump `@types/react` to 18.0.29 ## 0.13.10 ### Patch Changes - e93b06ab: fix(dashboard): remove left margin from workspace list on mobile - 1c4806bf: chore(deps): bump `sharp` to 0.32.0 - @nhost/react-apollo@5.0.14 - @nhost/nextjs@1.13.18 ## 0.13.9 ### Patch Changes - 912ed76c: chore(dashboard): bump `@apollo/client` to 3.7.10 - Updated dependencies [912ed76c] - @nhost/react-apollo@5.0.13 ## 0.13.8 ### Patch Changes - 7c127372: chore(dashboard): bump `react-error-boundary` to v4 ## 0.13.7 ### Patch Changes - 9130ab12: chore(dashboard): bump `yup` to v1 and `@hookform/resolvers` to v3 ## 0.13.6 ### Patch Changes - 253dd235: using new mutation to create projects + refactor Create Project page. ## 0.13.5 ### Patch Changes - @nhost/react-apollo@5.0.12 - @nhost/nextjs@1.13.17 ## 0.13.4 ### Patch Changes - b48bc034: fix(dashboard): disable new users - 798e591b: fix(dashboard): show correct date in data grid ## 0.13.3 ### Patch Changes - bfb4c1a6: chore(dashboard): remove `useAxios` property - d8d8394b: Dashboard: allow to override hasura admin secret in docker - Updated dependencies [ce1ee40d] - @nhost/nextjs@1.13.16 - @nhost/react-apollo@5.0.11 ## 0.13.2 ### Patch Changes - beed2eba: Fix docker entrypoint for dashboard - 2c8559a3: fix(dashboard): refresh project list after deleting a project - 4329d048: chore(dashboard): bump `graphiql` dependencies ## 0.13.1 ### Patch Changes - cbb1fc5b: chore(dashboard): cleanup GraphQL operations ## 0.13.0 ### Minor Changes - 088584e7: feat(dashboard): add support for custom local subdomains ### Patch Changes - 2ac90dfd: fix(dashboard): improve mobile responsive layout - Updated dependencies [f375eacc] - @nhost/nextjs@1.13.15 - @nhost/react-apollo@5.0.10 ## 0.12.4 ### Patch Changes - @nhost/react-apollo@5.0.9 - @nhost/nextjs@1.13.14 ## 0.12.3 ### Patch Changes - 2b1338f7: chore(dashboard): bump `turbo` to 1.8.3 - 5223ee93: fix(dashboard): show correct deployment status on the main page - 850a049c: chore(deps): update docker/build-push-action action to v4 - Updated dependencies [850a049c] - @nhost/nextjs@1.13.13 - @nhost/react-apollo@5.0.8 ## 0.12.2 ### Patch Changes - 4bf40995: chore(deps): bump `typescript` to `4.9.5` - 8bb097c9: chore(deps): bump `vitest` - 35d52aab: chore(deps): replace `cross-fetch` with `isomorphic-unfetch` - Updated dependencies [4bf40995] - Updated dependencies [8bb097c9] - Updated dependencies [35d52aab] - @nhost/react-apollo@5.0.7 - @nhost/nextjs@1.13.12 ## 0.12.1 ### Patch Changes - c96d7ccd: fix(dashboard): fix docker builds ## 0.12.0 ### Minor Changes - d1671210: feat(dashboard): use mimir to manage project configuration ### Patch Changes - f65e4de9: chore(deps): bump @graphql-codegen monorepo to v3 ## 0.11.20 ### Patch Changes - 4b4f0d01: chore(dashboard): improve dialog management ## 0.11.19 ### Patch Changes - @nhost/react-apollo@5.0.6 - @nhost/nextjs@1.13.11 ## 0.11.18 ### Patch Changes - 01318860: fix(nhost-js): use correct URL for functions requests - Updated dependencies [01318860] - @nhost/react-apollo@5.0.5 - @nhost/nextjs@1.13.10 ## 0.11.17 ### Patch Changes - f673adea: fix(dashboard): set correct Content-Type for user creation - 445d8ef4: chore(deps): bump `@nhost/react-apollo` to 5.0.4 - 445d8ef4: chore(deps): bump `@nhost/nextjs` to 1.13.9 - 0368663d: fix(dashboard): allow permission editing for auth and storage schemas - Updated dependencies [445d8ef4] - Updated dependencies [445d8ef4] - @nhost/react-apollo@5.0.4 - @nhost/nextjs@1.13.9 ## 0.11.16 ### Patch Changes - b755e908: fix(dashboard): use correct date for last seen - 2d9145f9: chore(deps): revert GraphQL client - 1ddf704c: fix(dashboard): don't show false positive message for failed user creation - @nhost/react-apollo@5.0.3 - @nhost/nextjs@1.13.8 ## 0.11.15 ### Patch Changes - @nhost/react-apollo@5.0.2 - @nhost/nextjs@1.13.7 ## 0.11.14 ### Patch Changes - 2cc18dcb: fix(dashboard): prevent permission editor dropdown from being always open ## 0.11.13 ### Patch Changes - 3343a363: chore(dashboard): bump `@testing-library/react` to v14 and `@testing-library/dom` to v9 - @nhost/react-apollo@5.0.1 - @nhost/nextjs@1.13.6 ## 0.11.12 ### Patch Changes - 87eda76e: chore(dashboard): bump `@types/react` to v18.0.28 and `@types/react-dom` to v18.0.11 - 6f0ac570: feat(dashboard): show dashboard version in account menu ## 0.11.11 ### Patch Changes - bf1e4071: chore(dashboard): bump `react-is` version to `18.2.0` - Updated dependencies [bf1e4071] - Updated dependencies [5013213b] - @nhost/nextjs@1.13.5 - @nhost/react-apollo@4.13.5 ## 0.11.10 ### Patch Changes - a37a430b: fix(dashboard): don't break UI when deployments are unavailable - @nhost/react-apollo@4.13.4 - @nhost/nextjs@1.13.4 ## 0.11.9 ### Patch Changes - 7b970e68: fix(dashboard): fix header link color ## 0.11.8 ### Patch Changes - f33242f2: feat(dashboard): add new sign up, sign in and reset password pages ## 0.11.7 ### Patch Changes - e9c8909c: fix(dashboard): use correct theme color in dark mode ## 0.11.6 ### Patch Changes - 902f486b: fix(dashboard): re-enable Hasura on logs page ## 0.11.5 ### Patch Changes - 1f9720fa: fix(dashboard): apply select permissions properly ## 0.11.4 ### Patch Changes - deb14b51: fix(dashboard): don't break billing form ## 0.11.3 ### Patch Changes - @nhost/react-apollo@4.13.3 - @nhost/nextjs@1.13.3 ## 0.11.2 ### Patch Changes - f143e51d: chore(dashboard): pin Turborepo to 1.6.3 ## 0.11.1 ### Patch Changes - c2b5a41a: chore(dashboard): select system colors by default ## 0.11.0 ### Minor Changes - 1ebaf429: feat(dashboard): introduce Dark Mode 🌚 ### Patch Changes - 63b445c4: fixed duplicated logs bug and made to date count during live mode ## 0.10.1 ### Patch Changes - e146d32e: chore(deps): update dependency @types/react to v18.0.27 - 59347fcd: correct allowed role name - 5b65cac9: updated authentication documentation - 963f9b5e: feat(dashboard): include project info in feedback ## 0.10.0 ### Minor Changes - ed4c7801: chore(dashboard): remove Functions section ## 0.9.10 ### Patch Changes - 4e2f8ccd: fix(dashboard): don't break Auth page in local mode ## 0.9.9 ### Patch Changes - 31abbe5f: fix(dashboard): enable toggle when settings are filled in ## 0.9.8 ### Patch Changes - 5bdd31ad: chore(dashboard): list fewer images per page on the Storage page - 5121851c: fix(dashboard): don't throw validation error for valid permission rules ## 0.9.7 ### Patch Changes - c126b20d: fix(dashboard): correct redeployment button ## 0.9.6 ### Patch Changes - 36c3519c: feat(dashboard): retrigger deployments ## 0.9.5 ### Patch Changes - 200e9f77: chore(deps): update dependency @types/react-dom to v18.0.10 - Updated dependencies [200e9f77] - @nhost/nextjs@1.13.2 - @nhost/react-apollo@4.13.2 ## 0.9.4 ### Patch Changes - dbd3ded5: fix(dashboard): workspaces creation, new form, correct redirects. ## 0.9.3 ### Patch Changes - 85f0f943: fix(dashboard): don't break the table creation process ## 0.9.2 ### Patch Changes - Updated dependencies [d42c27ae] - Updated dependencies [927be4a2] - @nhost/nextjs@1.13.1 - @nhost/react-apollo@4.13.1 ## 0.9.1 ### Patch Changes - d0f80811: fix(dashboard): don't show error when signing out the user ## 0.9.0 ### Minor Changes - d92891b2: feat(dashboard): add Permission Editor to the Database section ### Patch Changes - 3d379128: fix(dashboard): create new user - @nhost/react-apollo@4.13.0 - @nhost/nextjs@1.13.0 ## 0.8.1 ### Patch Changes - 7cadd944: fix(dashboard): display Twitter provider settings ## 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 - Updated dependencies [57db5b83] - @nhost/nextjs@1.11.0 - @nhost/nhost-js@1.7.0 - @nhost/react@0.17.0 - @nhost/react-apollo@4.11.0 ## 0.7.9 ### Patch Changes - a6d31dc2: fix(dashboard): don't break the UI when project is not loaded yet ## 0.7.8 ### Patch Changes - 7f251111: Use `NhostProvider` instead of `NhostReactProvider` and `NhostNextProvider` `NhostReactProvider` and `NhostNextProvider` are now deprecated - f4d70f88: fix(dashboard): do not break when region is nullish - 4a9471cc: Windows Live Provider displayed link updated to match backend url - 594488e4: fix(dashboard): do not show error when submitting Apple provider settings - Updated dependencies [7f251111] - @nhost/nextjs@1.10.0 - @nhost/react@0.16.0 - @nhost/react-apollo@4.10.0 ## 0.7.7 ### Patch Changes - 80b604ad: fix(dashboard): use correct Hasura slug ## 0.7.6 ### Patch Changes - 2d2beb53: fix(dashboard): prevent error on GraphQL page - ac8efcbd: chore(dashboard): deprecate old DNS name ## 0.7.5 ### Patch Changes - 132a4f4b: chore(dashboard): remove unused dependencies - 132a4f4b: chore(deps): synchronize @types/react-dom and @types/react versions - db57572f: fix(dashboard): correct section paddings when no env vars - Updated dependencies [132a4f4b] - @nhost/react@0.15.2 - @nhost/react-apollo@4.9.2 - @nhost/nextjs@1.9.3 ## 0.7.4 ### Patch Changes - 34d85e54: chore(deps): update dependency critters to ^0.0.16 - 9b93cf95: chore(deps): update dependency @netlify/functions to ^0.11.0 - e0439030: chore(deps): update dependency @types/react-dom to v18.0.9 - Updated dependencies [82124329] - @nhost/nextjs@1.9.2 ## 0.7.3 ### Patch Changes - a1193da4: fix(dashboard): remove character limit from env var inputs ## 0.7.2 ### Patch Changes - 44f13f62: chore(dashboard): cleanup unused files ## 0.7.1 ### Patch Changes - e01cb2ed: chore(dashboard): change settings sidebar menu item density ## 0.7.0 ### Minor Changes - db342f45: chore(dashboard): refactor Roles and Permissions settings sections - 8b9fa0b1: feat(dashboard): add Environment Variables page ### Patch Changes - Updated dependencies [66b4f3d0] - Updated dependencies [2e6923dc] - Updated dependencies [ef117c28] - Updated dependencies [aebb8225] - @nhost/core@0.9.4 - @nhost/nhost-js@1.6.2 - @nhost/nextjs@1.9.1 - @nhost/react@0.15.1 - @nhost/react-apollo@4.9.1 ## 0.6.0 ### Minor Changes - eef9c914: feat(dashboard): add Roles and Permissions page ## 0.5.0 ### Minor Changes - a48dd5bf: feat(dashboard): make backend port configurable ## 0.4.3 ### Patch Changes - 5de965d9: fix(dashboard): alphabetic ordering of providers - b9087a4a: fix(dashboard): console -> dashboard terminology - ca012d79: docs(workos): WorkOS Docs ## 0.4.2 ### Patch Changes - 89bd37bc: fix(dashboard): correct redirect URL input opacity - Updated dependencies [4601d84e] - Updated dependencies [843087cb] - @nhost/react@0.15.0 - @nhost/nextjs@1.9.0 - @nhost/react-apollo@4.9.0 ## 0.4.1 ### Patch Changes - 766cb612: fix(dashboard): correct redirect URL for oauth providers - Updated dependencies [53bdc294] - Updated dependencies [f2aaff05] - @nhost/nextjs@1.8.3 - @nhost/core@0.9.3 - @nhost/react@0.14.3 - @nhost/nhost-js@1.6.1 - @nhost/react-apollo@4.8.3 ## 0.4.0 ### Minor Changes - 9211743d: feat(dashboard): migrate Settings page features ## 0.3.0 ### Minor Changes - 73da6a67: fix(dashboard): avoid using BACKEND_URL locally ## 0.2.0 ### Minor Changes - db118f97: feat(dashboard): generate Docker image ## @nhost/docs@2.22.0 ### Minor Changes - 10b0f74: feat: add jwt docs + openapi improvements - fe6e8e2: feat: add signin with otp reference docs - 8f77914: fix: added pg_repack and an extension overview to database guide ## @nhost-examples/react-apollo@1.1.0 ### Minor Changes - fe6e8e2: feat: add signin with otp ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 - @nhost/react-apollo@14.0.0 ## @nhost-examples/vue-apollo@0.7.0 ### Minor Changes - fe6e8e2: feat: add signin with otp ### Patch Changes - Updated dependencies [fe6e8e2] - Updated dependencies [72899a6] - @nhost/vue@2.7.0 - @nhost/nhost-js@3.2.0 - @nhost/apollo@8.0.0 ## @nhost-examples/cli@0.3.13 ### Patch Changes - Updated dependencies [72899a6] - @nhost/nhost-js@3.2.0 ## @nhost-examples/codegen-react-apollo@0.4.14 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 - @nhost/react-apollo@14.0.0 ## @nhost-examples/codegen-react-query@0.4.14 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 ## @nhost-examples/codegen-react-urql@0.3.14 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 - @nhost/react-urql@11.0.0 ## @nhost-examples/multi-tenant-one-to-many@2.2.14 ### Patch Changes - Updated dependencies [72899a6] - @nhost/nhost-js@3.2.0 ## @nhost-examples/nextjs@0.3.14 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 - @nhost/react-apollo@14.0.0 - @nhost/nextjs@2.1.23 ## @nhost-examples/node-storage@0.2.13 ### Patch Changes - Updated dependencies [72899a6] - @nhost/nhost-js@3.2.0 ## @nhost-examples/nextjs-server-components@0.4.15 ### Patch Changes - Updated dependencies [72899a6] - @nhost/nhost-js@3.2.0 ## @nhost-examples/react-gqty@1.2.14 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 ## @nhost-examples/react-native@0.0.7 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/react@3.7.0 - @nhost/react-apollo@14.0.0 ## @nhost-examples/vue-quickstart@0.2.14 ### Patch Changes - Updated dependencies [fe6e8e2] - @nhost/vue@2.7.0 - @nhost/apollo@8.0.0 Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-11-26 16:32:07 +01:00 · 2024-11-26 16:14:47 +01:00 · 2024-11-26 16:08:31 +01:00 · 2024-11-26 16:07:56 +01:00 · 2024-11-26 14:49:35 +01:00 · 2024-11-26 12:42:22 +01:00
334 changed files with 10844 additions and 4107 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -22,6 +22,10 @@ env:
  NHOST_TEST_DASHBOARD_URL: ${{ vars.NHOST_TEST_DASHBOARD_URL }}
  NHOST_TEST_WORKSPACE_NAME: ${{ vars.NHOST_TEST_WORKSPACE_NAME }}
  NHOST_TEST_PROJECT_NAME: ${{ vars.NHOST_TEST_PROJECT_NAME }}
+  NHOST_TEST_ORGANIZATION_NAME: ${{ vars.NHOST_TEST_ORGANIZATION_NAME }}
+  NHOST_TEST_ORGANIZATION_SLUG: ${{ vars.NHOST_TEST_ORGANIZATION_SLUG }}
+  NHOST_TEST_PERSONAL_ORG_SLUG: ${{ vars.NHOST_TEST_PERSONAL_ORG_SLUG }}
+  NHOST_TEST_PROJECT_SUBDOMAIN: ${{ vars.NHOST_TEST_PROJECT_SUBDOMAIN }}
  NHOST_PRO_TEST_PROJECT_NAME: ${{ vars.NHOST_PRO_TEST_PROJECT_NAME }}
  NHOST_TEST_USER_EMAIL: ${{ secrets.NHOST_TEST_USER_EMAIL }}
  NHOST_TEST_USER_PASSWORD: ${{ secrets.NHOST_TEST_USER_PASSWORD }}
--- a/changelog_summary.sh
+++ b/changelog_summary.sh
@@ -0,0 +1,17 @@
+#/usr/bin/env bash
+PREV_MONTH=$(date -d "1 month ago" +%Y-%m)
+
+echo "prev: $PREV_MONTH"
+
+files=$(git log --since="$PREV_MONTH-01" --until="$PREV_MONTH-31" --name-only -- '**/CHANGELOG.md' | grep CHANGE | sort -u)
+
+echo "files: $files"
+
+echo "Below you can find the latest release for each individual package released during this month:"
+echo
+
+for file in $files; do
+  name=$(grep '^# ' $file | awk '{ print substr($0, 4) }')
+  last_release=$(grep '^## ' $file | awk '{ print substr($0, 4) }' | head -n 1)
+  echo "@$name: $last_release [CHANGELOG.md](https://github.com/nhost/nhost/blob/main/$file)"
+done
--- a/dashboard/e2e/ai/assistants.test.ts
+++ b/dashboard/e2e/ai/assistants.test.ts
@@ -1,9 +1,5 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { navigateToProject } from '@/e2e/utils';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';

@@ -16,17 +12,15 @@ test.beforeAll(async ({ browser }) => {
 test.beforeEach(async () => {
  await page.goto('/');

-  await openProject({
+  await navigateToProject({
    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
+    orgSlug: TEST_ORGANIZATION_SLUG,
+    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
  });

-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /ai/i })
-    .click();
+  const AIRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/ai/assistants`;
+  await page.goto(AIRoute);
+  await page.waitForURL(AIRoute);
 });

 test.afterAll(async () => {
--- a/dashboard/e2e/ai/auto-embeddings.test.ts
+++ b/dashboard/e2e/ai/auto-embeddings.test.ts
@@ -1,9 +1,5 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { navigateToProject } from '@/e2e/utils';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';

@@ -16,17 +12,15 @@ test.beforeAll(async ({ browser }) => {
 test.beforeEach(async () => {
  await page.goto('/');

-  await openProject({
+  await navigateToProject({
    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
+    orgSlug: TEST_ORGANIZATION_SLUG,
+    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
  });

-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /ai/i })
-    .click();
+  const AIRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/ai/auto-embeddings`;
+  await page.goto(AIRoute);
+  await page.waitForURL(AIRoute);
 });

 test.afterAll(async () => {
--- a/dashboard/e2e/auth/ban-user.test.ts
+++ b/dashboard/e2e/auth/ban-user.test.ts
@@ -1,30 +1,12 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { createUser, generateTestEmail, openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { createUser, generateTestEmail } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import test, { expect } from '@playwright/test';

 test('should be able to ban and unban a user', async ({ page }) => {
-  await page.goto('/');
-
-  await openProject({
-    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
-  });
-
-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /auth/i })
-    .click();
-
-  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/users`,
-  );
+  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
+  await page.goto(authUrl);
+  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });

  const email = generateTestEmail();
  const password = faker.internet.password();
--- a/dashboard/e2e/auth/create-user.test.ts
+++ b/dashboard/e2e/auth/create-user.test.ts
@@ -1,9 +1,5 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { createUser, generateTestEmail, openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { createUser, generateTestEmail } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 import test, { expect } from '@playwright/test';
@@ -15,23 +11,9 @@ test.beforeAll(async ({ browser }) => {
 });

 test.beforeEach(async () => {
-  await page.goto('/');
-
-  await openProject({
-    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
-  });
-
-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /auth/i })
-    .click();
-
-  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/users`,
-  );
+  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
+  await page.goto(authUrl);
+  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
 });

 test.afterAll(async () => {
--- a/dashboard/e2e/auth/delete-user.test.ts
+++ b/dashboard/e2e/auth/delete-user.test.ts
@@ -1,9 +1,5 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { createUser, generateTestEmail, openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { createUser, generateTestEmail } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 import test, { expect } from '@playwright/test';
@@ -15,23 +11,9 @@ test.beforeAll(async ({ browser }) => {
 });

 test.beforeEach(async () => {
-  await page.goto('/');
-
-  await openProject({
-    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
-  });
-
-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /auth/i })
-    .click();
-
-  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/users`,
-  );
+  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
+  await page.goto(authUrl);
+  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
 });

 test.afterAll(async () => {
--- a/dashboard/e2e/auth/verify-user.test.ts
+++ b/dashboard/e2e/auth/verify-user.test.ts
@@ -1,9 +1,5 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { createUser, generateTestEmail, openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { createUser, generateTestEmail } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
@@ -15,23 +11,9 @@ test.beforeAll(async ({ browser }) => {
 });

 test.beforeEach(async () => {
-  await page.goto('/');
-
-  await openProject({
-    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
-  });
-
-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /auth/i })
-    .click();
-
-  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/users`,
-  );
+  const authUrl = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/users`;
+  await page.goto(authUrl);
+  await page.waitForURL(authUrl, { waitUntil: 'networkidle' });
 });

 test.afterAll(async () => {
--- a/dashboard/e2e/database/create-table.test.ts
+++ b/dashboard/e2e/database/create-table.test.ts
@@ -1,9 +1,5 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { openProject, prepareTable } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { navigateToProject, prepareTable } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
@@ -18,17 +14,15 @@ test.beforeAll(async ({ browser }) => {
 test.beforeEach(async () => {
  await page.goto('/');

-  await openProject({
+  await navigateToProject({
    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
+    orgSlug: TEST_ORGANIZATION_SLUG,
+    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
  });

-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /database/i })
-    .click();
+  const databaseRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default`;
+  await page.goto(databaseRoute);
+  await page.waitForURL(databaseRoute);
 });

 test.afterAll(async () => {
@@ -55,7 +49,7 @@ test('should create a simple table', async () => {
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
  );

  await expect(
@@ -84,7 +78,7 @@ test('should create a table with unique constraints', async () => {
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
  );

  await expect(
@@ -113,7 +107,7 @@ test('should create a table with nullable columns', async () => {
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
  );

  await expect(
@@ -146,7 +140,7 @@ test('should create a table with an identity column', async () => {
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
  );

  await expect(
@@ -174,7 +168,7 @@ test('should create table with foreign key constraint', async () => {
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${firstTableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${firstTableName}`,
  );

  await page.getByRole('button', { name: /new table/i }).click();
@@ -219,7 +213,7 @@ test('should create table with foreign key constraint', async () => {
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${secondTableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${secondTableName}`,
  );

  await expect(
@@ -247,7 +241,7 @@ test('should not be able to create a table with a name that already exists', asy
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
  );

  await page.getByRole('button', { name: /new table/i }).click();
--- a/dashboard/e2e/database/delete-table.test.ts
+++ b/dashboard/e2e/database/delete-table.test.ts
@@ -1,9 +1,5 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { deleteTable, openProject, prepareTable } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
+import { deleteTable, navigateToProject, prepareTable } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
@@ -18,17 +14,15 @@ test.beforeAll(async ({ browser }) => {
 test.beforeEach(async () => {
  await page.goto('/');

-  await openProject({
+  await navigateToProject({
    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
+    orgSlug: TEST_ORGANIZATION_SLUG,
+    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
  });

-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /database/i })
-    .click();
+  const databaseRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default`;
+  await page.goto(databaseRoute);
+  await page.waitForURL(databaseRoute);
 });

 test.afterAll(async () => {
@@ -53,7 +47,7 @@ test('should delete a table', async () => {
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${tableName}`,
  );

  await deleteTable({
@@ -63,7 +57,7 @@ test('should delete a table', async () => {

  // navigate to next URL
  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/**`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/**`,
  );

  await expect(
@@ -91,7 +85,7 @@ test('should not be able to delete a table if other tables have foreign keys ref
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${firstTableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${firstTableName}`,
  );

  await page.getByRole('button', { name: /new table/i }).click();
@@ -138,7 +132,7 @@ test('should not be able to delete a table if other tables have foreign keys ref
  await page.getByRole('button', { name: /create/i }).click();

  await page.waitForURL(
-    `/${TEST_WORKSPACE_SLUG}/${PRO_TEST_PROJECT_SLUG}/database/browser/default/public/${secondTableName}`,
+    `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/database/browser/default/public/${secondTableName}`,
  );

  await expect(
--- a/dashboard/e2e/env.ts
+++ b/dashboard/e2e/env.ts
@@ -1,5 +1,3 @@
-import slugify from 'slugify';
-
 /**
 * URL of the dashboard to test against.
 */
@@ -8,15 +6,12 @@ export const TEST_DASHBOARD_URL = process.env.NHOST_TEST_DASHBOARD_URL;
 /**
 * Name of the workspace to test against.
 */
-export const TEST_WORKSPACE_NAME = process.env.NHOST_TEST_WORKSPACE_NAME;
+export const TEST_ORGANIZATION_NAME = process.env.NHOST_TEST_ORGANIZATION_NAME;

 /**
- * Slugified name of the workspace to test against.
+ * Slug of the organization to test against.
 */
-export const TEST_WORKSPACE_SLUG = slugify(TEST_WORKSPACE_NAME, {
-  lower: true,
-  strict: true,
-});
+export const TEST_ORGANIZATION_SLUG = process.env.NHOST_TEST_ORGANIZATION_SLUG;

 /**
 * Name of the project to test against.
@@ -24,25 +19,9 @@ export const TEST_WORKSPACE_SLUG = slugify(TEST_WORKSPACE_NAME, {
 export const TEST_PROJECT_NAME = process.env.NHOST_TEST_PROJECT_NAME;

 /**
- * Name of the pro test project to test against.
+ * Subdomain of the project to test against.
 */
-export const PRO_TEST_PROJECT_NAME = process.env.NHOST_PRO_TEST_PROJECT_NAME;
-
-/**
- * Slugified name of the project to test against.
- */
-export const TEST_PROJECT_SLUG = slugify(TEST_PROJECT_NAME, {
-  lower: true,
-  strict: true,
-});
-
-/**
- * Slugified name of the pro project to test against.
- */
-export const PRO_TEST_PROJECT_SLUG = slugify(PRO_TEST_PROJECT_NAME, {
-  lower: true,
-  strict: true,
-});
+export const TEST_PROJECT_SUBDOMAIN = process.env.NHOST_TEST_PROJECT_SUBDOMAIN;

 /**
 * Hasura admin secret of the test project to use.
@@ -59,3 +38,5 @@ export const TEST_USER_EMAIL = process.env.NHOST_TEST_USER_EMAIL;
 * Password of the test account to use.
 */
 export const TEST_USER_PASSWORD = process.env.NHOST_TEST_USER_PASSWORD;
+
+export const TEST_PERSONAL_ORG_SLUG = process.env.NHOST_TEST_PERSONAL_ORG_SLUG;
--- a/dashboard/e2e/overview/overview.test.ts
+++ b/dashboard/e2e/overview/overview.test.ts
@@ -1,12 +1,7 @@
-import {
-  TEST_PROJECT_NAME,
-  TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_NAME,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
+import { navigateToProject } from '../utils';

 let page: Page;

@@ -14,11 +9,11 @@ test.beforeAll(async ({ browser }) => {
  page = await browser.newPage();

  await page.goto('/');
-  await openProject({
+
+  await navigateToProject({
    page,
-    projectName: TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: TEST_PROJECT_SLUG,
+    orgSlug: TEST_ORGANIZATION_SLUG,
+    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
  });
 });

@@ -26,60 +21,34 @@ test.afterAll(async () => {
  await page.close();
 });

-test('should show a sidebar with menu items', async () => {
-  const navLocator = page.getByRole('navigation', { name: /main navigation/i });
+test('should show the navtree with all links visible', async () => {
+  const navLocator = page.getByLabel('Navigation Tree');
  await expect(navLocator).toBeVisible();
-  await expect(navLocator.getByRole('list').getByRole('listitem')).toHaveCount(
-    13,
-  );
-  await expect(
-    navLocator.getByRole('link', { name: /overview/i }),
-  ).toBeVisible();
-  await expect(
-    navLocator.getByRole('link', { name: /database/i }),
-  ).toBeVisible();
-  await expect(
-    navLocator.getByRole('link', { name: /graphql/i }),
-  ).toBeVisible();
-  await expect(navLocator.getByRole('link', { name: /hasura/i })).toBeVisible();
-  await expect(navLocator.getByRole('link', { name: /auth/i })).toBeVisible();
-  await expect(
-    navLocator.getByRole('link', { name: /storage/i }),
-  ).toBeVisible();
-  await expect(
-    navLocator.getByRole('link', { name: /deployments/i }),
-  ).toBeVisible();
-  await expect(
-    navLocator.getByRole('link', { name: /backups/i }),
-  ).toBeVisible();
-  await expect(navLocator.getByRole('link', { name: /logs/i })).toBeVisible();
-  await expect(
-    navLocator.getByRole('link', { name: /metrics/i }),
-  ).toBeVisible();
-  await expect(
-    navLocator.getByRole('link', { name: /settings/i }),
-  ).toBeVisible();
-});

-test('should show a header with a logo, the workspace name, and the project name', async () => {
-  await expect(
-    page.getByRole('banner').getByRole('link', { name: TEST_WORKSPACE_NAME }),
-  ).toBeVisible();
+  const links = [
+    'Nhost Automation Test Project',
+    'Overview',
+    'Database',
+    'GraphQL',
+    'Hasura',
+    'Auth',
+    'Storage',
+    'Run',
+    'AI',
+    'Deployments',
+    'Backups',
+    'Logs',
+    'Metrics',
+    'Settings',
+  ];

-  await expect(
-    page.getByRole('banner').getByRole('link', { name: TEST_PROJECT_NAME }),
-  ).toBeVisible();
-});
-
-test("should show the project's name, the Upgrade button and the Settings button", async () => {
-  await expect(
-    page.getByRole('heading', { name: TEST_PROJECT_NAME }),
-  ).toBeVisible();
-  await expect(page.getByText(/starter/i)).toBeVisible();
-  await expect(page.getByRole('button', { name: /upgrade/i })).toBeVisible();
-  await expect(
-    page.getByRole('main').getByRole('link', { name: /settings/i }),
-  ).toBeVisible();
+  for (const linkName of links) {
+    const link =
+      linkName === 'Settings'
+        ? page.getByRole('link', { name: linkName }).first()
+        : page.getByRole('link', { name: linkName });
+    await expect(link).toBeVisible();
+  }
 });

 test("should show the project's region and subdomain", async () => {
@@ -96,27 +65,3 @@ test('should not have a GitHub repository connected', async () => {
    page.getByRole('button', { name: /connect to github/i }).first(),
  ).toBeVisible();
 });
-
-test('should show metrics', async () => {
-  await expect(page.getByText(/cpu usage seconds\d+/i)).toBeVisible();
-  await expect(page.getByText(/total requests\d+/i)).toBeVisible();
-  await expect(page.getByText(/function invocations\d+/i)).toBeVisible();
-  await expect(
-    page.getByText(/egress volume\d+(\.\d+)? [a-zA-Z]+/i),
-  ).toBeVisible();
-  await expect(page.getByText(/logs\d+(\.\d+)? [a-zA-Z]+/i)).toBeVisible();
-});
-
-test('should show proper limits for the free project', async () => {
-  await expect(
-    page.getByText(/database\d+(\.\d+)? [a-zA-Z]+ of \d+(\.\d+)? [a-zA-Z]+/i),
-  ).toBeVisible();
-
-  await expect(
-    page.getByText(/storage\d+(\.\d+)? [a-zA-Z]+ of \d+(\.\d+)? [a-zA-Z]+/i),
-  ).toBeVisible();
-
-  await expect(page.getByText(/users[0-9]+ of [0-9]+/i)).toBeVisible();
-
-  await expect(page.getByText(/functions[0-9]+ of [0-9]+/i)).toBeVisible();
-});
--- a/dashboard/e2e/run/run.test.ts
+++ b/dashboard/e2e/run/run.test.ts
@@ -1,11 +1,7 @@
-import {
-  PRO_TEST_PROJECT_NAME,
-  PRO_TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
-} from '@/e2e/env';
-import { openProject } from '@/e2e/utils';
+import { TEST_ORGANIZATION_SLUG, TEST_PROJECT_SUBDOMAIN } from '@/e2e/env';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
+import { navigateToProject } from '../utils';

 let page: Page;

@@ -16,17 +12,15 @@ test.beforeAll(async ({ browser }) => {
 test.beforeEach(async () => {
  await page.goto('/');

-  await openProject({
+  await navigateToProject({
    page,
-    projectName: PRO_TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: PRO_TEST_PROJECT_SLUG,
+    orgSlug: TEST_ORGANIZATION_SLUG,
+    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
  });

-  await page
-    .getByRole('navigation', { name: /main navigation/i })
-    .getByRole('link', { name: /run/i })
-    .click();
+  const runRoute = `/orgs/${TEST_ORGANIZATION_SLUG}/projects/${TEST_PROJECT_SUBDOMAIN}/run`;
+  await page.goto(runRoute);
+  await page.waitForURL(runRoute);
 });

 test.afterAll(async () => {
@@ -39,6 +33,10 @@ test('should create and delete a run service', async () => {
  await page.getByPlaceholder(/service name/i).click();
  await page.getByPlaceholder(/service name/i).fill('test');

+  await page.getByText('Nhost registry').click();
+  await page.getByPlaceholder('Replicas').click();
+  await page.getByPlaceholder('Replicas').fill('0');
+
  await page.getByRole('button', { name: /create/i }).click();

  await expect(
@@ -47,12 +45,6 @@ test('should create and delete a run service', async () => {

  await page.getByRole('button', { name: /confirm/i }).click();

-  await expect(
-    page.getByRole('heading', { name: /service details/i }),
-  ).toBeVisible();
-
-  await page.getByRole('button', { name: /ok/i }).click();
-
  await expect(page.getByRole('heading', { name: /test/i })).toBeVisible();

  await page.getByLabel(/more options/i).click();
--- a/dashboard/e2e/setup/auth.setup.ts
+++ b/dashboard/e2e/setup/auth.setup.ts
@@ -1,5 +1,6 @@
 import {
  TEST_DASHBOARD_URL,
+  TEST_PERSONAL_ORG_SLUG,
  TEST_USER_EMAIL,
  TEST_USER_PASSWORD,
 } from '@/e2e/env';
@@ -15,6 +16,9 @@ setup('authenticate user', async ({ page }) => {
  await page.getByLabel('Password').fill(TEST_USER_PASSWORD);
  await page.getByRole('button', { name: /sign in/i }).click();

-  await page.waitForURL(TEST_DASHBOARD_URL);
+  await page.waitForURL(
+    `${TEST_DASHBOARD_URL}/orgs/${TEST_PERSONAL_ORG_SLUG}/projects`,
+    { waitUntil: 'networkidle' },
+  );
  await page.context().storageState({ path: 'e2e/.auth/user.json' });
 });
--- a/dashboard/e2e/utils.ts
+++ b/dashboard/e2e/utils.ts
@@ -5,24 +5,27 @@ import type { Page } from '@playwright/test';
 * Open a project by navigating to the project's overview page.
 *
 * @param page - The Playwright page object.
- * @param workspaceSlug - The slug of the workspace that contains the project.
- * @param projectSlug - The slug of the project to open.
- * @param projectName - The name of the project to open.
+ * @param orgSlug - The slug of the organization that contains the project.
+ * @param projectSubdomain - The subdomain of the project to open.
 * @returns A promise that resolves when the project is opened.
 */
-export async function openProject({
+export async function navigateToProject({
  page,
-  projectName,
-  workspaceSlug,
-  projectSlug,
+  orgSlug,
+  projectSubdomain,
 }: {
  page: Page;
-  workspaceSlug: string;
-  projectSlug: string;
-  projectName: string;
+  orgSlug: string;
+  projectSubdomain: string;
 }) {
-  await page.getByRole('link', { name: projectName }).click();
-  await page.waitForURL(`/${workspaceSlug}/${projectSlug}`);
+  const projectUrl = `/orgs/${orgSlug}/projects/${projectSubdomain}`;
+
+  try {
+    await page.goto(projectUrl, { waitUntil: 'networkidle' });
+    await page.waitForURL(projectUrl, { timeout: 10000 });
+  } catch (error) {
+    console.error(`Failed to navigate to project URL: ${projectUrl}`, error);
+  }
 }

 /**
--- a/dashboard/global-teardown.ts
+++ b/dashboard/global-teardown.ts
@@ -1,11 +1,10 @@
 import {
  TEST_DASHBOARD_URL,
+  TEST_ORGANIZATION_SLUG,
  TEST_PROJECT_ADMIN_SECRET,
-  TEST_PROJECT_NAME,
-  TEST_PROJECT_SLUG,
-  TEST_WORKSPACE_SLUG,
+  TEST_PROJECT_SUBDOMAIN,
 } from '@/e2e/env';
-import { openProject } from '@/e2e/utils';
+import { navigateToProject } from '@/e2e/utils';
 import { chromium } from '@playwright/test';

 async function globalTeardown() {
@@ -18,13 +17,10 @@ async function globalTeardown() {

  const page = await context.newPage();

-  await page.goto('/');
-
-  await openProject({
+  await navigateToProject({
    page,
-    projectName: TEST_PROJECT_NAME,
-    workspaceSlug: TEST_WORKSPACE_SLUG,
-    projectSlug: TEST_PROJECT_SLUG,
+    orgSlug: TEST_ORGANIZATION_SLUG,
+    projectSubdomain: TEST_PROJECT_SUBDOMAIN,
  });

  const pagePromise = context.waitForEvent('page');
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/dashboard",
-  "version": "2.2.1",
+  "version": "2.7.1",
  "private": true,
  "scripts": {
    "preinstall": "npx only-allow pnpm",
@@ -128,7 +128,7 @@
    "@graphql-codegen/typescript-operations": "^3.0.4",
    "@graphql-codegen/typescript-react-apollo": "^3.3.7",
    "@next/bundle-analyzer": "^12.3.4",
-    "@playwright/test": "1.41.0",
+    "@playwright/test": "1.47.0",
    "@storybook/addon-actions": "^6.5.16",
    "@storybook/addon-essentials": "^6.5.16",
    "@storybook/addon-interactions": "^6.5.16",
--- a/dashboard/playwright.config.ts
+++ b/dashboard/playwright.config.ts
@@ -6,7 +6,7 @@ dotenv.config({ path: path.resolve(__dirname, '.env.test') });

 export default defineConfig({
  testDir: './e2e',
-  timeout: 30 * 1000,
+  timeout: 40 * 1000,
  expect: {
    timeout: 5000,
  },
@@ -20,6 +20,9 @@ export default defineConfig({
    actionTimeout: 0,
    trace: 'on-first-retry',
    baseURL: process.env.NHOST_TEST_DASHBOARD_URL,
+    launchOptions: {
+      slowMo: 500,
+    },
  },
  projects: [
    {
--- a/dashboard/src/components/layout/Header/Header.tsx
+++ b/dashboard/src/components/layout/Header/Header.tsx
@@ -5,8 +5,8 @@ import { LocalAccountMenu } from '@/components/layout/LocalAccountMenu';
 import { MobileNav } from '@/components/layout/MobileNav';
 import { Logo } from '@/components/presentational/Logo';
 import { Box } from '@/components/ui/v2/Box';
-import { Button } from '@/components/ui/v2/Button';
 import { GraphiteIcon } from '@/components/ui/v2/icons/GraphiteIcon';
+import { Button } from '@/components/ui/v3/button';
 import { DevAssistant as WorkspaceProjectDevAssistant } from '@/features/ai/DevAssistant';
 import { AnnouncementsTray } from '@/features/orgs/components/members/components/AnnouncementsTray';
 import { NotificationsTray } from '@/features/orgs/components/members/components/NotificationsTray';
@@ -74,8 +74,12 @@ export default function Header({ className, ...props }: HeaderProps) {
      <BreadcrumbNav />

      <div className="hidden grid-flow-col items-center gap-1 sm:grid">
-        <Button className="rounded-full" onClick={openDevAssistant}>
-          <GraphiteIcon className="h-4 w-4" />
+        <Button
+          variant="outline"
+          className="h-8 w-8"
+          onClick={openDevAssistant}
+        >
+          <GraphiteIcon className="h-4" />
        </Button>

        <NotificationsTray />
--- a/dashboard/src/components/layout/Header/OrgsComboBox.tsx
+++ b/dashboard/src/components/layout/Header/OrgsComboBox.tsx
@@ -105,7 +105,7 @@ export default function OrgsComboBox() {
        <Button
          size="sm"
          variant="ghost"
-          className="w-full justify-between gap-2 bg-background text-foreground hover:bg-accent dark:hover:bg-muted"
+          className="justify-between w-full gap-2 bg-background text-foreground hover:bg-accent dark:hover:bg-muted"
        >
          {selectedItem ? (
            <div className="flex flex-row items-center justify-center">
@@ -115,7 +115,7 @@ export default function OrgsComboBox() {
          ) : (
            'Select organization / workspace'
          )}
-          <ChevronsUpDown className="h-5 w-5 text-muted-foreground" />
+          <ChevronsUpDown className="w-5 h-5 text-muted-foreground" />
        </Button>
      </PopoverTrigger>
      <PopoverContent className="p-0" side="bottom" align="start">
@@ -129,7 +129,7 @@ export default function OrgsComboBox() {
                  keywords={[option.label]}
                  key={option.value}
                  value={option.value}
-                  className="flex items-center justify-between bg-background text-foreground dark:hover:bg-muted"
+                  className="flex items-center text-foreground dark:hover:bg-muted"
                  onSelect={() => {
                    setSelectedItem(option);
                    setOpen(false);
@@ -144,17 +144,15 @@ export default function OrgsComboBox() {
                    }
                  }}
                >
-                  <div className="flex items-center font-normal">
-                    <Check
-                      className={cn(
-                        'mr-2 h-4 w-4',
-                        selectedItem?.value === option.value
-                          ? 'opacity-100'
-                          : 'opacity-0',
-                      )}
-                    />
-                    <span className="max-w-52 truncate">{option.label}</span>
-                  </div>
+                  <Check
+                    className={cn(
+                      'mr-2 h-4 w-4',
+                      selectedItem?.value === option.value
+                        ? 'opacity-100'
+                        : 'opacity-0',
+                    )}
+                  />
+                  <span className="w-full truncate">{option.label}</span>
                  {renderBadge(option.plan)}
                </CommandItem>
              ))}
@@ -170,7 +168,7 @@ export default function OrgsComboBox() {
                      keywords={[option.label]}
                      key={option.value}
                      value={option.value}
-                      className="flex items-center justify-between bg-background text-foreground hover:bg-accent dark:hover:bg-muted"
+                      className="flex items-center text-foreground dark:hover:bg-muted"
                      onSelect={() => {
                        setSelectedItem(option);
                        setOpen(false);
@@ -185,19 +183,15 @@ export default function OrgsComboBox() {
                        }
                      }}
                    >
-                      <div className="flex items-center">
-                        <Check
-                          className={cn(
-                            'mr-2 h-4 w-4',
-                            selectedItem?.value === option.value
-                              ? 'opacity-100'
-                              : 'opacity-0',
-                          )}
-                        />
-                        <span className="max-w-52 truncate">
-                          {option.label}
-                        </span>
-                      </div>
+                      <Check
+                        className={cn(
+                          'mr-2 h-4 w-4',
+                          selectedItem?.value === option.value
+                            ? 'opacity-100'
+                            : 'opacity-0',
+                        )}
+                      />
+                      <span className="w-full truncate">{option.label}</span>
                      {renderBadge(option.plan)}
                    </CommandItem>
                  ))}
--- a/dashboard/src/components/layout/Header/ProjectSettingsPagesComboBox.tsx
+++ b/dashboard/src/components/layout/Header/ProjectSettingsPagesComboBox.tsx
@@ -38,6 +38,11 @@ const projectSettingsPages = [
    slug: 'authentication',
    route: 'authentication',
  },
+  {
+    name: 'JWT',
+    slug: 'jwt',
+    route: 'jwt',
+  },
  {
    name: 'Sign-In methods',
    slug: 'sign-in-methods',
@@ -68,6 +73,7 @@ const projectSettingsPages = [
    route: 'rate-limiting',
  },
  { name: 'AI', slug: 'ai', route: 'ai' },
+  { name: 'Observability', slug: 'metrics', route: 'metrics' },
  { name: 'Configuration Editor', slug: 'editor', route: 'editor' },
 ].map((item) => ({
  label: item.name,
@@ -125,7 +131,7 @@ export default function ProjectSettingsPagesComboBox() {
          ) : (
            <>Select a page</>
          )}
-          <ChevronsUpDown className="w-5 h-5 text-muted-foreground" />
+          <ChevronsUpDown className="h-5 w-5 text-muted-foreground" />
        </Button>
      </PopoverTrigger>
      <PopoverContent className="p-0" side="bottom" align="start">
@@ -155,7 +161,7 @@ export default function ProjectSettingsPagesComboBox() {
                    )}
                  />
                  <div className="flex flex-row items-center gap-2">
-                    <span className="truncate max-w-52">{option.label}</span>
+                    <span className="max-w-52 truncate">{option.label}</span>
                  </div>
                </CommandItem>
              ))}
--- a/dashboard/src/components/layout/Header/ProjectsComboBox.tsx
+++ b/dashboard/src/components/layout/Header/ProjectsComboBox.tsx
@@ -8,13 +8,20 @@ import {
  CommandItem,
  CommandList,
 } from '@/components/ui/v3/command';
+import {
+  HoverCard,
+  HoverCardContent,
+  HoverCardTrigger,
+} from '@/components/ui/v3/hover-card';
 import {
  Popover,
  PopoverContent,
  PopoverTrigger,
 } from '@/components/ui/v3/popover';
+import { useAppState } from '@/features/orgs/projects/common/hooks/useAppState';
 import { useOrgs } from '@/features/orgs/projects/hooks/useOrgs';
 import { cn } from '@/lib/utils';
+import { ApplicationStatus } from '@/types/application';
 import { Box, Check, ChevronsUpDown } from 'lucide-react';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
@@ -24,17 +31,76 @@ type Option = {
  label: string;
 };

+function ProjectStatusIndicator({ status }: { status: ApplicationStatus }) {
+  const indicatorStyles: Record<
+    number,
+    { className: string; description: string }
+  > = {
+    [ApplicationStatus.Errored]: {
+      className: 'bg-destructive',
+      description: 'Project errored',
+    },
+    [ApplicationStatus.Pausing]: {
+      className: 'bg-primary-main animate-blinking',
+      description: 'Project is pausing',
+    },
+    [ApplicationStatus.Restoring]: {
+      className: 'bg-primary-main animate-blinking',
+      description: 'Project is restoring',
+    },
+    [ApplicationStatus.Paused]: {
+      className: 'bg-slate-400',
+      description: 'Project is paused',
+    },
+    [ApplicationStatus.Unpausing]: {
+      className: 'bg-primary-main animate-blinking',
+      description: 'Project is unpausing',
+    },
+    [ApplicationStatus.Live]: {
+      className: 'bg-primary-main',
+      description: 'Project is live',
+    },
+  };
+  const style = indicatorStyles[status];
+
+  if (style) {
+    return (
+      <HoverCard openDelay={0}>
+        <HoverCardTrigger asChild>
+          <span
+            className={cn('mt-[1px] h-2 w-2 rounded-full', style.className)}
+          />
+        </HoverCardTrigger>
+        <HoverCardContent side="top" className="h-fit w-fit py-2">
+          {style.description}
+        </HoverCardContent>
+      </HoverCard>
+    );
+  }
+
+  return null;
+}
+
 export default function ProjectsComboBox() {
  const {
    query: { appSubdomain },
    push,
  } = useRouter();

+  const { state: appState } = useAppState();
  const { currentOrg: { slug: orgSlug, apps = [] } = {} } = useOrgs();
-  const selectedProjectFromUrl = apps.find(
-    (item) => item.subdomain === appSubdomain,
-  );
+
  const [selectedProject, setSelectedProject] = useState<Option | null>(null);
+  const [open, setOpen] = useState(false);
+
+  const options: Option[] = apps.map((app) => ({
+    label: app.name,
+    value: app.subdomain,
+  }));
+
+  const selectedProjectFromUrl = apps.find(
+    (app) => app.subdomain === appSubdomain,
+  );

  useEffect(() => {
    if (selectedProjectFromUrl) {
@@ -45,68 +111,64 @@ export default function ProjectsComboBox() {
    }
  }, [selectedProjectFromUrl]);

-  const options: Option[] = apps.map((app) => ({
-    label: app.name,
-    value: app.subdomain,
-  }));
-
-  const [open, setOpen] = useState(false);
+  const handleProjectSelect = (option: Option) => {
+    setSelectedProject(option);
+    setOpen(false);
+    push(`/orgs/${orgSlug}/projects/${option.value}`);
+  };

  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild>
-        <Button
-          variant="ghost"
-          size="sm"
-          className="justify-start gap-2 bg-background text-foreground hover:bg-accent dark:hover:bg-muted"
-        >
-          {selectedProject ? (
-            <div className="flex flex-row items-center justify-center gap-1">
-              <Box className="h-4 w-4" />
-              {selectedProject.label}
-              <ProjectStatus />
-            </div>
-          ) : (
-            <>Select a project</>
-          )}
-          <ChevronsUpDown className="h-5 w-5 text-muted-foreground" />
-        </Button>
-      </PopoverTrigger>
-      <PopoverContent className="p-0" side="bottom" align="start">
-        <Command>
-          <CommandInput placeholder="Select a project..." />
-          <CommandList>
-            <CommandEmpty>No results found.</CommandEmpty>
-            <CommandGroup>
-              {options.map((option) => (
-                <CommandItem
-                  keywords={[option.label]}
-                  key={option.value}
-                  value={option.value}
-                  onSelect={() => {
-                    setSelectedProject(option);
-                    setOpen(false);
-                    push(`/orgs/${orgSlug}/projects/${option.value}`);
-                  }}
-                >
-                  <Check
-                    className={cn(
-                      'mr-2 h-4 w-4',
-                      selectedProject?.value === option.value
-                        ? 'opacity-100'
-                        : 'opacity-0',
-                    )}
-                  />
-                  <div className="flex flex-row items-center gap-1">
-                    <Box className="h-4 w-4" />
-                    <span className="max-w-52 truncate">{option.label}</span>
-                  </div>
-                </CommandItem>
-              ))}
-            </CommandGroup>
-          </CommandList>
-        </Command>
-      </PopoverContent>
-    </Popover>
+    <div className="flex items-center gap-1">
+      <Popover open={open} onOpenChange={setOpen}>
+        <PopoverTrigger asChild>
+          <Button
+            variant="ghost"
+            size="sm"
+            className="justify-start gap-2 bg-background text-foreground hover:bg-accent dark:hover:bg-muted"
+          >
+            {selectedProject ? (
+              <div className="flex items-center gap-2">
+                <ProjectStatusIndicator status={appState} />
+                {selectedProject.label}
+                <ProjectStatus />
+              </div>
+            ) : (
+              <>Select a project</>
+            )}
+            <ChevronsUpDown className="h-5 w-5 text-muted-foreground" />
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent className="p-0" side="bottom" align="start">
+          <Command>
+            <CommandInput placeholder="Select a project..." />
+            <CommandList>
+              <CommandEmpty>No results found.</CommandEmpty>
+              <CommandGroup>
+                {options.map((option) => (
+                  <CommandItem
+                    key={option.value}
+                    value={option.value}
+                    onSelect={() => handleProjectSelect(option)}
+                  >
+                    <Check
+                      className={cn(
+                        'mr-2 h-4 w-4',
+                        selectedProject?.value === option.value
+                          ? 'opacity-100'
+                          : 'opacity-0',
+                      )}
+                    />
+                    <div className="flex items-center gap-1">
+                      <Box className="h-4 w-4" />
+                      <span className="max-w-52 truncate">{option.label}</span>
+                    </div>
+                  </CommandItem>
+                ))}
+              </CommandGroup>
+            </CommandList>
+          </Command>
+        </PopoverContent>
+      </Popover>
+    </div>
  );
 }
--- a/dashboard/src/components/layout/MainNav/NavTree.tsx
+++ b/dashboard/src/components/layout/MainNav/NavTree.tsx
@@ -30,73 +30,73 @@ import { useTreeNavState } from './TreeNavStateContext';
 const projectPages = [
  {
    name: 'Overview',
-    icon: <HomeIcon className="w-4 h-4" />,
+    icon: <HomeIcon className="h-4 w-4" />,
    route: '',
    slug: 'overview',
  },
  {
    name: 'Database',
-    icon: <DatabaseIcon className="w-4 h-4" />,
+    icon: <DatabaseIcon className="h-4 w-4" />,
    route: 'database/browser/default',
    slug: 'database',
  },
  {
    name: 'GraphQL',
-    icon: <GraphQLIcon className="w-4 h-4" />,
+    icon: <GraphQLIcon className="h-4 w-4" />,
    route: 'graphql',
    slug: 'graphql',
  },
  {
    name: 'Hasura',
-    icon: <HasuraIcon className="w-4 h-4" />,
+    icon: <HasuraIcon className="h-4 w-4" />,
    route: 'hasura',
    slug: 'hasura',
  },
  {
    name: 'Auth',
-    icon: <UserIcon className="w-4 h-4" />,
+    icon: <UserIcon className="h-4 w-4" />,
    route: 'users',
    slug: 'users',
  },
  {
    name: 'Storage',
-    icon: <StorageIcon className="w-4 h-4" />,
+    icon: <StorageIcon className="h-4 w-4" />,
    route: 'storage',
    slug: 'storage',
  },
  {
    name: 'Run',
-    icon: <ServicesIcon className="w-4 h-4" />,
+    icon: <ServicesIcon className="h-4 w-4" />,
    route: 'run',
    slug: 'run',
  },
  {
    name: 'AI',
-    icon: <AIIcon className="w-4 h-4" />,
+    icon: <AIIcon className="h-4 w-4" />,
    route: 'ai/auto-embeddings',
    slug: 'ai',
  },
  {
    name: 'Deployments',
-    icon: <RocketIcon className="w-4 h-4" />,
+    icon: <RocketIcon className="h-4 w-4" />,
    route: 'deployments',
    slug: 'deployments',
  },
  {
    name: 'Backups',
-    icon: <CloudIcon className="w-4 h-4" />,
+    icon: <CloudIcon className="h-4 w-4" />,
    route: 'backups',
    slug: 'backups',
  },
  {
    name: 'Logs',
-    icon: <FileTextIcon className="w-4 h-4" />,
+    icon: <FileTextIcon className="h-4 w-4" />,
    route: 'logs',
    slug: 'logs',
  },
  {
    name: 'Metrics',
-    icon: <GaugeIcon className="w-4 h-4" />,
+    icon: <GaugeIcon className="h-4 w-4" />,
    route: 'metrics',
    slug: 'metrics',
  },
@@ -121,6 +121,11 @@ const projectSettingsPages = [
    slug: 'authentication',
    route: 'authentication',
  },
+  {
+    name: 'JWT',
+    slug: 'jwt',
+    route: 'jwt',
+  },
  {
    name: 'Sign-In methods',
    slug: 'sign-in-methods',
@@ -151,6 +156,7 @@ const projectSettingsPages = [
    route: 'rate-limiting',
  },
  { name: 'AI', slug: 'ai', route: 'ai' },
+  { name: 'Observability', slug: 'metrics', route: 'metrics' },
  { name: 'Configuration Editor', slug: 'editor', route: 'editor' },
 ];

@@ -203,7 +209,7 @@ const createOrganization = (org: Org, isPlatform: boolean) => {
    data: {
      name: 'New project',
      slug: 'new',
-      icon: <Plus className="w-4 h-4 mr-1 font-bold" strokeWidth={3} />,
+      icon: <Plus className="mr-1 h-4 w-4 font-bold" strokeWidth={3} />,
      targetUrl: `/orgs/${org.slug}/projects/new`,
      disabled: !isPlatform,
    },
@@ -218,7 +224,7 @@ const createOrganization = (org: Org, isPlatform: boolean) => {
      data: {
        name: app.name,
        slug: app.subdomain,
-        icon: <Box className="w-4 h-4" />,
+        icon: <Box className="h-4 w-4" />,
        targetUrl: `/orgs/${org.slug}/projects/${app.subdomain}`,
      },
      children: projectPages.map(
@@ -397,9 +403,9 @@ export default function NavTree() {
            className="h-8 px-1"
          >
            {context.isExpanded ? (
-              <ChevronDown className="w-4 h-4 font-bold" strokeWidth={3} />
+              <ChevronDown className="h-4 w-4 font-bold" strokeWidth={3} />
            ) : (
-              <ChevronRight className="w-4 h-4" strokeWidth={3} />
+              <ChevronRight className="h-4 w-4" strokeWidth={3} />
            )}
          </Button>
        );
@@ -491,9 +497,9 @@ export default function NavTree() {
        }

        return (
-          <div className="flex flex-row w-full">
+          <div className="flex w-full flex-row">
            <div className="flex justify-center px-[12px] pb-3">
-              <div className="w-0 h-full border-r border-dashed" />
+              <div className="h-full w-0 border-r border-dashed" />
            </div>
            <ul {...containerProps} className="w-full">
              {children}
--- a/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx
+++ b/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx
@@ -17,18 +17,18 @@ export default function SettingsLayout({ children }: SettingsLayoutProps) {
  return (
    <Box
      sx={{ backgroundColor: 'background.default' }}
-      className="flex w-full flex-auto flex-col overflow-y-auto overflow-x-hidden"
+      className="flex flex-col flex-auto w-full overflow-x-hidden overflow-y-auto"
    >
      <Box
        sx={{ backgroundColor: 'background.default' }}
-        className="flex h-full flex-col"
+        className="flex flex-col h-full"
      >
        <RetryableErrorBoundary>
          <div className="flex flex-col space-y-2">
            {hasGitRepo && (
              <Alert
                severity="warning"
-                className="grid grid-flow-row place-content-center gap-2"
+                className="grid grid-flow-row gap-2 place-content-center"
              >
                <Text color="warning" className="text-sm">
                  As you have a connected repository, make sure to synchronize
@@ -52,9 +52,9 @@ export default function SettingsLayout({ children }: SettingsLayoutProps) {
                    target="_blank"
                    rel="noopener noreferrer"
                    className="underline"
-                    href="https://docs.nhost.io/cli/overlays"
+                    href="https://docs.nhost.io/guides/cli/configuration-overlays#configuration-overlays"
                  >
-                    docs.nhost.io/cli/overlays
+                    Configuration Overlays
                  </a>{' '}
                  for guidance.
                </Text>
--- a/dashboard/src/components/ui/v3/button.tsx
+++ b/dashboard/src/components/ui/v3/button.tsx
@@ -13,7 +13,7 @@ const buttonVariants = cva(
        destructive:
          'bg-destructive text-destructive-foreground hover:bg-destructive/90',
        outline:
-          'border border-input bg-background hover:bg-accent hover:text-accent-foreground',
+          'border bg-background hover:bg-accent hover:text-accent-foreground',
        secondary:
          'bg-secondary text-secondary-foreground hover:bg-secondary/80',
        ghost: 'hover:bg-accent hover:text-accent-foreground',
--- a/dashboard/src/features/authentication/settings/components/DisableNewUsersSettings/DisableNewUsersSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/DisableNewUsersSettings/DisableNewUsersSettings.tsx
@@ -9,7 +9,6 @@ import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import {
-  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/utils/__generated__/graphql';
@@ -30,7 +29,6 @@ export default function DisableNewUsersSettings() {
  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
-    refetchQueries: [GetAuthenticationSettingsDocument],
    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

@@ -42,14 +40,14 @@ export default function DisableNewUsersSettings() {
  const form = useForm<DisableNewUsersFormValues>({
    reValidateMode: 'onSubmit',
    defaultValues: {
-      disabled: !data?.config?.auth?.signUp?.enabled,
+      disabled: data?.config?.auth?.signUp?.disableNewUsers,
    },
  });

  useEffect(() => {
    if (!loading) {
      form.reset({
-        disabled: !data?.config?.auth?.signUp?.enabled,
+        disabled: data?.config?.auth?.signUp?.disableNewUsers,
      });
    }
  }, [loading, data, form]);
@@ -58,7 +56,7 @@ export default function DisableNewUsersSettings() {
    return (
      <ActivityIndicator
        delay={1000}
-        label="Loading disabled sign up settings..."
+        label="Loading disabled new users settings..."
        className="justify-center"
      />
    );
@@ -79,7 +77,7 @@ export default function DisableNewUsersSettings() {
        config: {
          auth: {
            signUp: {
-              enabled: !values.disabled,
+              disableNewUsers: values.disabled,
            },
          },
        },
@@ -104,10 +102,10 @@ export default function DisableNewUsersSettings() {
        }
      },
      {
-        loadingMessage: 'Disabling new user sign ups...',
-        successMessage: 'New user sign ups have been disabled successfully.',
+        loadingMessage: 'Disabling new users sign ins...',
+        successMessage: 'New users sign ins have been disabled successfully.',
        errorMessage:
-          'An error occurred while trying to disable new user sign ups.',
+          'An error occurred while trying to disable new users sign ins.',
      },
    );
  };
--- a/dashboard/src/features/authentication/settings/gql/getAuthenticationSettings.gql
+++ b/dashboard/src/features/authentication/settings/gql/getAuthenticationSettings.gql
@@ -15,6 +15,7 @@ query GetAuthenticationSettings($appId: uuid!) {
      }
      signUp {
        enabled
+        disableNewUsers
      }
      session {
        accessToken {
--- a/dashboard/src/features/orgs/components/members/components/AnnouncementsTray/AnnouncementsTray.tsx
+++ b/dashboard/src/features/orgs/components/members/components/AnnouncementsTray/AnnouncementsTray.tsx
@@ -1,4 +1,11 @@
+import { Badge } from '@/components/ui/v3/badge';
 import { Button } from '@/components/ui/v3/button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/components/ui/v3/dropdown-menu';
 import {
  Sheet,
  SheetContent,
@@ -7,15 +14,64 @@ import {
  SheetTitle,
  SheetTrigger,
 } from '@/components/ui/v3/sheet';
-import { Announcements } from '@/features/projects/common/components/Announcements';
-import { Megaphone } from 'lucide-react';
+import {
+  useDeleteAnnouncementReadMutation,
+  useGetAnnouncementsQuery,
+  useInsertAnnouncementReadMutation,
+} from '@/utils/__generated__/graphql';
+import { useAuthenticationStatus } from '@nhost/nextjs';
+import { formatDistance } from 'date-fns';
+import { EllipsisVertical, Megaphone } from 'lucide-react';
+import Link from 'next/link';

 export default function AnnouncementsTray() {
+  const { isAuthenticated } = useAuthenticationStatus();
+
+  const {
+    data,
+    loading,
+    refetch: refetchAnnouncements,
+  } = useGetAnnouncementsQuery({
+    skip: !isAuthenticated,
+  });
+
+  const [insertAnnouncementRead] = useInsertAnnouncementReadMutation();
+  const [deleteAnnouncementRead] = useDeleteAnnouncementReadMutation();
+
+  const announcements = data?.announcements ?? [];
+  const unreadAnnouncementsCount = announcements.filter(
+    (ann) => ann.read.length === 0,
+  ).length;
+
+  const handleSetUnread = async (announcementReadId: string) => {
+    await deleteAnnouncementRead({
+      variables: {
+        id: announcementReadId,
+      },
+    });
+
+    await refetchAnnouncements();
+  };
+
+  const handleSetRead = async (announcementID: string) => {
+    await insertAnnouncementRead({
+      variables: { announcementID },
+    });
+
+    await refetchAnnouncements();
+  };
+
  return (
    <Sheet>
      <SheetTrigger asChild>
-        <Button variant="ghost" className="relative h-fit px-3 py-1">
-          <Megaphone className="h-5 w-5" />
+        <Button
+          variant="outline"
+          className="relative flex h-8 items-center gap-2 px-2"
+        >
+          <Megaphone className="h-4.5 w-4.5" />
+          {unreadAnnouncementsCount > 0 && (
+            <Badge variant="destructive">{unreadAnnouncementsCount}</Badge>
+          )}
        </Button>
      </SheetTrigger>
      <SheetContent className="h-full w-full bg-background p-0 text-foreground sm:max-w-[310px]">
@@ -25,8 +81,102 @@ export default function AnnouncementsTray() {
            Latest news and announcements.
          </SheetDescription>
        </SheetHeader>
-        <div className="flex h-full w-full flex-col px-8 pt-3">
-          <Announcements />
+        <div className="flex h-full w-full flex-col">
+          <div className="flex h-12 items-center border-b px-2">
+            <h3 className="font-medium">
+              Latest Announcements{' '}
+              {unreadAnnouncementsCount > 0 && `(${unreadAnnouncementsCount})`}
+            </h3>
+          </div>
+
+          <div className="flex h-full flex-col gap-2 overflow-auto p-2">
+            {!loading && announcements.length === 0 && (
+              <span className="text-muted-foreground">
+                No new announcements
+              </span>
+            )}
+            {announcements.map((announcement) => (
+              <Button
+                key={announcement.id}
+                variant="ghost"
+                asChild
+                className="h-fit w-full items-start gap-2 rounded-md border p-2"
+              >
+                <Link
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  href={announcement.href}
+                  shallow
+                  onClick={() => {
+                    if (announcement.read.length === 0) {
+                      handleSetRead(announcement.id);
+                    }
+                  }}
+                >
+                  {announcement.read.length === 0 ? (
+                    <span className="mt-[5px] h-2 w-2 flex-shrink-0 rounded-full bg-primary" />
+                  ) : (
+                    <span className="mt-[5px] h-2 w-2 flex-shrink-0" />
+                  )}
+                  <div className="flex flex-row">
+                    <div className="flex flex-col gap-1">
+                      <span className="text-xs text-muted-foreground">
+                        {formatDistance(
+                          new Date(announcement.createdAt),
+                          new Date(),
+                          {
+                            addSuffix: true,
+                          },
+                        )}
+                      </span>
+                      <p className="whitespace-normal">
+                        {announcement.content}
+                      </p>
+                    </div>
+                    <DropdownMenu>
+                      <DropdownMenuTrigger asChild>
+                        <Button
+                          variant="ghost"
+                          className="h-8 px-3"
+                          onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                          }}
+                        >
+                          <div className="absolute">
+                            <EllipsisVertical className="h-4 w-4" />
+                          </div>
+                        </Button>
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent
+                        side="bottom"
+                        align="end"
+                        sideOffset={-5}
+                      >
+                        <DropdownMenuItem
+                          disabled={announcement.read.length > 0}
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            handleSetRead(announcement.id);
+                          }}
+                        >
+                          Mark as read
+                        </DropdownMenuItem>
+                        <DropdownMenuItem
+                          disabled={announcement.read.length === 0}
+                          onClick={() =>
+                            handleSetUnread(announcement.read.at(0).id)
+                          }
+                        >
+                          Mark as unread
+                        </DropdownMenuItem>
+                      </DropdownMenuContent>
+                    </DropdownMenu>
+                  </div>
+                </Link>
+              </Button>
+            ))}
+          </div>
        </div>
      </SheetContent>
    </Sheet>
--- a/dashboard/src/features/orgs/components/members/components/NotificationsTray/NotificationsTray.tsx
+++ b/dashboard/src/features/orgs/components/members/components/NotificationsTray/NotificationsTray.tsx
@@ -25,6 +25,7 @@ import {
  useOrganizationMemberInvitesLazyQuery,
  useOrganizationNewRequestsLazyQuery,
  usePostOrganizationRequestMutation,
+  type OrganizationMemberInvitesQuery,
  type PostOrganizationRequestResponse,
 } from '@/utils/__generated__/graphql';
 import { useUserData } from '@nhost/nextjs';
@@ -33,10 +34,13 @@ import { Bell } from 'lucide-react';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';

+type Invite = OrganizationMemberInvitesQuery['organizationMemberInvites'][0];
+
 export default function NotificationsTray() {
  const userData = useUserData();
-  const { asPath, route } = useRouter();
+  const { asPath, route, push } = useRouter();
  const { refetch: refetchOrgs } = useOrgs();
+  const [open, setOpen] = useState(false);

  const [stripeFormDialogOpen, setStripeFormDialogOpen] = useState(false);

@@ -113,17 +117,19 @@ export default function NotificationsTray() {
  const [acceptInvite] = useOrganizationMemberInviteAcceptMutation();
  const [deleteInvite] = useDeleteOrganizationMemberInviteMutation();

-  const handleAccept = async (inviteId: string) => {
+  const handleAccept = async (invite: Invite) => {
    await execPromiseWithErrorToast(
      async () => {
        await acceptInvite({
          variables: {
-            inviteId,
+            inviteId: invite.id,
          },
        });

-        refetchInvites();
-        refetchOrgs();
+        await refetchInvites();
+        await refetchOrgs();
+        await push(`/orgs/${invite?.organization?.slug}/projects`);
+        setOpen(false);
      },
      {
        loadingMessage: `Accepting invite...`,
@@ -154,12 +160,18 @@ export default function NotificationsTray() {

  return (
    <>
-      <Sheet>
+      <Sheet open={open} onOpenChange={setOpen}>
        <SheetTrigger asChild>
-          <Button variant="ghost" className="relative h-fit px-3 py-1">
-            <Bell className="mt-[2px] h-[1.15rem] w-[1.15rem]" />
-            {(pendingOrgRequest || Boolean(invites.length)) && (
-              <div className="absolute right-3 top-2 h-2 w-2 rounded-full bg-red-500" />
+          <Button
+            variant="outline"
+            className="relative flex h-8 items-center gap-2 border px-2"
+            aria-label="Notifications"
+          >
+            <Bell className="h-4.5 w-4.5" />
+            {(pendingOrgRequest || invites.length > 0) && (
+              <Badge variant="destructive">
+                {invites.length + (pendingOrgRequest ? 1 : 0)}
+              </Badge>
            )}
          </Button>
        </SheetTrigger>
@@ -248,7 +260,7 @@ export default function NotificationsTray() {
                    </Button>
                    <Button
                      className="h-fit"
-                      onClick={() => handleAccept(invite.id)}
+                      onClick={() => handleAccept(invite)}
                    >
                      Accept
                    </Button>
--- a/dashboard/src/features/orgs/layout/ProjectLayout/ProjectLayout.tsx
+++ b/dashboard/src/features/orgs/layout/ProjectLayout/ProjectLayout.tsx
@@ -5,6 +5,7 @@ import { Alert } from '@/components/ui/v2/Alert';
 import type { BoxProps } from '@/components/ui/v2/Box';
 import { Box } from '@/components/ui/v2/Box';
 import { ApplicationPaused } from '@/features/orgs/projects/common/components/ApplicationPaused';
+import { ApplicationPausedBanner } from '@/features/orgs/projects/common/components/ApplicationPausedBanner';
 import { ApplicationProvisioning } from '@/features/orgs/projects/common/components/ApplicationProvisioning';
 import { ApplicationRestoring } from '@/features/orgs/projects/common/components/ApplicationRestoring';
 import { ApplicationUnknown } from '@/features/orgs/projects/common/components/ApplicationUnknown';
@@ -15,7 +16,7 @@ import { useProject } from '@/features/orgs/projects/hooks/useProject';
 import { ApplicationStatus } from '@/types/application';
 import { NextSeo } from 'next-seo';
 import { useRouter } from 'next/router';
-import { useMemo } from 'react';
+import { useCallback, useMemo, type ReactNode } from 'react';
 import { twMerge } from 'tailwind-merge';

 export interface ProjectLayoutProps extends AuthenticatedLayoutProps {
@@ -34,11 +35,53 @@ function ProjectLayoutContent({
    query: { appSubdomain },
  } = useRouter();

-  const isPlatform = useIsPlatform();
  const { state } = useAppState();
+  const isPlatform = useIsPlatform();
  const { project, loading, error } = useProject({ poll: true });
+
  const isOnOverviewPage = route === '/orgs/[orgSlug]/projects/[appSubdomain]';

+  const renderPausedProjectContent = useCallback(
+    (_children: ReactNode) => {
+      const baseProjectPageRoute = '/orgs/[orgSlug]/projects/[appSubdomain]/';
+      const blockedPausedProjectPages = [
+        'database',
+        'database/browser/[dataSourceSlug]',
+        'graphql',
+        'hasura',
+        'users',
+        'storage',
+        'ai/auto-embeddings',
+        'ai/assistants',
+        'metrics',
+      ].map((page) => baseProjectPageRoute.concat(page));
+
+      // show an alert box on top of the overview page with a wake up button
+      if (isOnOverviewPage) {
+        return (
+          <>
+            <div className="mx-auto mt-5 flex max-w-7xl p-4 pb-0">
+              <ApplicationPausedBanner
+                alertClassName="flex-row"
+                textContainerClassName="flex flex-col items-center justify-center text-left"
+                wakeUpButtonClassName="w-fit self-center"
+              />
+            </div>
+            {children}
+          </>
+        );
+      }
+
+      // block these pages when the project is paused
+      if (blockedPausedProjectPages.includes(route)) {
+        return <ApplicationPaused />;
+      }
+
+      return _children;
+    },
+    [route, isOnOverviewPage, children],
+  );
+
  // Render application state based on the current state
  const projectPageContent = useMemo(() => {
    if (!appSubdomain || state === undefined) {
@@ -67,7 +110,7 @@ function ProjectLayoutContent({
        return children;
      case ApplicationStatus.Pausing:
      case ApplicationStatus.Paused:
-        return <ApplicationPaused />;
+        return renderPausedProjectContent(children);
      case ApplicationStatus.Unpausing:
        return <ApplicationUnpausing />;
      case ApplicationStatus.Restoring:
@@ -79,7 +122,13 @@ function ProjectLayoutContent({
      default:
        return <ApplicationUnknown />;
    }
-  }, [state, children, appSubdomain, isOnOverviewPage]);
+  }, [
+    state,
+    children,
+    appSubdomain,
+    isOnOverviewPage,
+    renderPausedProjectContent,
+  ]);

  // Handle loading state
  if (loading) {
--- a/dashboard/src/features/orgs/layout/SettingsLayout/SettingsLayout.tsx
+++ b/dashboard/src/features/orgs/layout/SettingsLayout/SettingsLayout.tsx
@@ -52,9 +52,9 @@ export default function SettingsLayout({ children }: SettingsLayoutProps) {
                    target="_blank"
                    rel="noopener noreferrer"
                    className="underline"
-                    href="https://docs.nhost.io/cli/overlays"
+                    href="https://docs.nhost.io/guides/cli/configuration-overlays#configuration-overlays"
                  >
-                    docs.nhost.io/cli/overlays
+                    Configuration Overlays
                  </a>{' '}
                  for guidance.
                </Text>
--- a/dashboard/src/features/orgs/projects/authentication/settings/OTPEmailSettings/OTPEmailSettings.tsx
+++ b/dashboard/src/features/orgs/projects/authentication/settings/OTPEmailSettings/OTPEmailSettings.tsx
@@ -0,0 +1,139 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
+import { useUI } from '@/components/common/UIProvider';
+import { Form } from '@/components/form/Form';
+import { SettingsContainer } from '@/components/layout/SettingsContainer';
+import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
+import { useIsPlatform } from '@/features/orgs/projects/common/hooks/useIsPlatform';
+import { useLocalMimirClient } from '@/features/orgs/projects/hooks/useLocalMimirClient';
+import { useProject } from '@/features/orgs/projects/hooks/useProject';
+import { execPromiseWithErrorToast } from '@/features/orgs/utils/execPromiseWithErrorToast';
+import {
+  useGetSignInMethodsQuery,
+  useUpdateConfigMutation,
+} from '@/generated/graphql';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import * as Yup from 'yup';
+
+const validationSchema = Yup.object({
+  enabled: Yup.boolean(),
+});
+
+export type OTPEmailSettingsFormValues = Yup.InferType<typeof validationSchema>;
+
+export default function OTPEmailSettings() {
+  const { project } = useProject();
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
+
+  const [updateConfig] = useUpdateConfigMutation({
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const { data, loading, error } = useGetSignInMethodsQuery({
+    variables: { appId: project?.id },
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const { enabled } = data?.config?.auth?.method?.otp?.email || {};
+
+  const form = useForm<OTPEmailSettingsFormValues>({
+    reValidateMode: 'onSubmit',
+    defaultValues: {
+      enabled,
+    },
+    resolver: yupResolver(validationSchema),
+  });
+
+  useEffect(() => {
+    if (!loading) {
+      form.reset({ enabled });
+    }
+  }, [loading, enabled, form]);
+
+  if (loading) {
+    return (
+      <ActivityIndicator
+        delay={1000}
+        label="Loading one-time passwords over email settings..."
+        className="justify-center"
+      />
+    );
+  }
+
+  if (error) {
+    throw error;
+  }
+
+  const handleOTPEmailSettingsChange = async (
+    values: OTPEmailSettingsFormValues,
+  ) => {
+    const updateConfigPromise = updateConfig({
+      variables: {
+        appId: project.id,
+        config: {
+          auth: {
+            method: {
+              otp: {
+                email: {
+                  enabled: values.enabled,
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+
+    await execPromiseWithErrorToast(
+      async () => {
+        await updateConfigPromise;
+        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
+      },
+      {
+        loadingMessage:
+          'One-time passwords over email settings are being updated...',
+        successMessage:
+          'One-time passwords over email settings have been updated successfully.',
+        errorMessage:
+          'An error occurred while trying to update one-time passwords over email settings.',
+      },
+    );
+  };
+
+  return (
+    <FormProvider {...form}>
+      <Form onSubmit={handleOTPEmailSettingsChange}>
+        <SettingsContainer
+          title="One-Time Passwords over email"
+          description="Allow users to sign in with a one-time password sent to their email address."
+          slotProps={{
+            submitButton: {
+              disabled: !form.formState.isDirty || maintenanceActive,
+              loading: form.formState.isSubmitting,
+            },
+          }}
+          switchId="enabled"
+          showSwitch
+          className="hidden"
+        />
+      </Form>
+    </FormProvider>
+  );
+}
--- a/dashboard/src/features/orgs/projects/authentication/settings/OTPEmailSettings/index.ts
+++ b/dashboard/src/features/orgs/projects/authentication/settings/OTPEmailSettings/index.ts
@@ -0,0 +1 @@
+export { default as OTPEmailSettings } from './OTPEmailSettings';
--- a/dashboard/src/features/orgs/projects/authentication/settings/components/AppleProviderSettings/AppleProviderSettings.tsx
+++ b/dashboard/src/features/orgs/projects/authentication/settings/components/AppleProviderSettings/AppleProviderSettings.tsx
@@ -50,6 +50,7 @@ const validationSchema = Yup.object({
      is: true,
      then: (schema) => schema.required(),
    }),
+  audience: Yup.string().label('Audience'),
  enabled: Yup.boolean(),
 });

@@ -72,7 +73,7 @@ export default function AppleProviderSettings() {
    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

-  const { clientId, enabled, keyId, privateKey, teamId } =
+  const { clientId, enabled, keyId, privateKey, teamId, audience } =
    data?.config?.auth?.method?.oauth?.apple || {};

  const form = useForm<AppleProviderFormValues>({
@@ -82,6 +83,7 @@ export default function AppleProviderSettings() {
      keyId: keyId || '',
      clientId: clientId || '',
      privateKey: privateKey || '',
+      audience: audience || '',
      enabled: enabled || false,
    },
    resolver: yupResolver(validationSchema),
@@ -94,10 +96,11 @@ export default function AppleProviderSettings() {
        keyId: keyId || '',
        clientId: clientId || '',
        privateKey: privateKey || '',
+        audience: audience || '',
        enabled: enabled || false,
      });
    }
-  }, [loading, teamId, keyId, clientId, privateKey, enabled, form]);
+  }, [loading, teamId, keyId, clientId, privateKey, audience, enabled, form]);

  if (loading) {
    return (
@@ -237,6 +240,18 @@ export default function AppleProviderSettings() {
            error={!!formState.errors?.privateKey}
            helperText={formState.errors?.privateKey?.message}
          />
+          <Input
+            {...register('audience')}
+            name="audience"
+            id="audience"
+            label="Audience (optional)"
+            placeholder="Apple Audience"
+            className="col-span-2"
+            fullWidth
+            hideEmptyHelperText
+            error={!!formState.errors?.audience}
+            helperText={formState.errors?.audience?.message}
+          />
          <Input
            name="redirectUrl"
            id="apple-redirectUrl"
--- a/dashboard/src/features/orgs/projects/authentication/settings/components/DisableNewUsersSettings/DisableNewUsersSettings.tsx
+++ b/dashboard/src/features/orgs/projects/authentication/settings/components/DisableNewUsersSettings/DisableNewUsersSettings.tsx
@@ -42,14 +42,14 @@ export default function DisableNewUsersSettings() {
  const form = useForm<DisableNewUsersFormValues>({
    reValidateMode: 'onSubmit',
    defaultValues: {
-      disabled: !data?.config?.auth?.signUp?.enabled,
+      disabled: data?.config?.auth?.signUp?.disableNewUsers,
    },
  });

  useEffect(() => {
    if (!loading) {
      form.reset({
-        disabled: !data?.config?.auth?.signUp?.enabled,
+        disabled: data?.config?.auth?.signUp?.disableNewUsers,
      });
    }
  }, [loading, data, form]);
@@ -58,7 +58,7 @@ export default function DisableNewUsersSettings() {
    return (
      <ActivityIndicator
        delay={1000}
-        label="Loading disabled sign up settings..."
+        label="Loading disabled new users settings..."
        className="justify-center"
      />
    );
@@ -79,7 +79,7 @@ export default function DisableNewUsersSettings() {
        config: {
          auth: {
            signUp: {
-              enabled: !values.disabled,
+              disableNewUsers: values.disabled,
            },
          },
        },
@@ -104,10 +104,10 @@ export default function DisableNewUsersSettings() {
        }
      },
      {
-        loadingMessage: 'Disabling new user sign ups...',
-        successMessage: 'New user sign ups have been disabled successfully.',
+        loadingMessage: 'Disabling new users sign ins...',
+        successMessage: 'New users sign ins have been disabled successfully.',
        errorMessage:
-          'An error occurred while trying to disable new user sign ups.',
+          'An error occurred while trying to disable new users sign ins.',
      },
    );
  };
--- a/dashboard/src/features/orgs/projects/authentication/settings/components/DisableSignUpsSettings/DisableSignUpsSettings.tsx
+++ b/dashboard/src/features/orgs/projects/authentication/settings/components/DisableSignUpsSettings/DisableSignUpsSettings.tsx
@@ -0,0 +1,134 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
+import { useUI } from '@/components/common/UIProvider';
+import { Form } from '@/components/form/Form';
+import { SettingsContainer } from '@/components/layout/SettingsContainer';
+import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
+import {
+  useGetAuthenticationSettingsQuery,
+  useUpdateConfigMutation,
+} from '@/utils/__generated__/graphql';
+import { useEffect } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import * as Yup from 'yup';
+
+import { useIsPlatform } from '@/features/orgs/projects/common/hooks/useIsPlatform';
+import { useLocalMimirClient } from '@/features/orgs/projects/hooks/useLocalMimirClient';
+import { useProject } from '@/features/orgs/projects/hooks/useProject';
+import { execPromiseWithErrorToast } from '@/features/orgs/utils/execPromiseWithErrorToast';
+
+const validationSchema = Yup.object({
+  disabled: Yup.boolean(),
+});
+
+export type DisableSignUpsFormValues = Yup.InferType<typeof validationSchema>;
+
+export default function DisableSignUpsSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
+  const { project } = useProject();
+  const [updateConfig] = useUpdateConfigMutation({
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const { data, loading, error } = useGetAuthenticationSettingsQuery({
+    variables: { appId: project?.id },
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const form = useForm<DisableSignUpsFormValues>({
+    reValidateMode: 'onSubmit',
+    defaultValues: {
+      disabled: !data?.config?.auth?.signUp?.enabled,
+    },
+  });
+
+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        disabled: !data?.config?.auth?.signUp?.enabled,
+      });
+    }
+  }, [loading, data, form]);
+
+  if (loading) {
+    return (
+      <ActivityIndicator
+        delay={1000}
+        label="Loading disabled sign up settings..."
+        className="justify-center"
+      />
+    );
+  }
+
+  if (error) {
+    throw error;
+  }
+
+  const { formState } = form;
+
+  const handleDisableSignUpsChange = async (
+    values: DisableSignUpsFormValues,
+  ) => {
+    const updateConfigPromise = updateConfig({
+      variables: {
+        appId: project.id,
+        config: {
+          auth: {
+            signUp: {
+              enabled: !values.disabled,
+            },
+          },
+        },
+      },
+    });
+
+    await execPromiseWithErrorToast(
+      async () => {
+        await updateConfigPromise;
+        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
+      },
+      {
+        loadingMessage: 'Disabling new users sign ups...',
+        successMessage: 'New users sign ups have been disabled successfully.',
+        errorMessage:
+          'An error occurred while trying to disable new users sign ups.',
+      },
+    );
+  };
+
+  return (
+    <FormProvider {...form}>
+      <Form onSubmit={handleDisableSignUpsChange}>
+        <SettingsContainer
+          title="Disable Sign Ups"
+          description="If set, new users won't be able to sign up."
+          docsLink="https://docs.nhost.io/guides/auth/overview#disable-sign-ups"
+          switchId="disabled"
+          showSwitch
+          slotProps={{
+            submitButton: {
+              disabled: !formState.isDirty || maintenanceActive,
+              loading: formState.isSubmitting,
+            },
+          }}
+          className="hidden"
+        />
+      </Form>
+    </FormProvider>
+  );
+}
--- a/dashboard/src/features/orgs/projects/authentication/settings/components/DisableSignUpsSettings/index.ts
+++ b/dashboard/src/features/orgs/projects/authentication/settings/components/DisableSignUpsSettings/index.ts
@@ -0,0 +1 @@
+export { default as DisableSignUpsSettings } from './DisableSignUpsSettings';
--- a/dashboard/src/features/orgs/projects/authentication/settings/components/GoogleProviderSettings/GoogleProviderSettings.tsx
+++ b/dashboard/src/features/orgs/projects/authentication/settings/components/GoogleProviderSettings/GoogleProviderSettings.tsx
@@ -9,10 +9,6 @@ import { CopyIcon } from '@/components/ui/v2/icons/CopyIcon';
 import { Input } from '@/components/ui/v2/Input';
 import { InputAdornment } from '@/components/ui/v2/InputAdornment';
 import type { BaseProviderSettingsFormValues } from '@/features/orgs/projects/authentication/settings/components/BaseProviderSettings';
-import {
-  BaseProviderSettings,
-  baseProviderValidationSchema,
-} from '@/features/orgs/projects/authentication/settings/components/BaseProviderSettings';
 import {
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
@@ -28,6 +24,28 @@ import { generateAppServiceUrl } from '@/features/orgs/projects/common/utils/gen
 import { useLocalMimirClient } from '@/features/orgs/projects/hooks/useLocalMimirClient';
 import { useProject } from '@/features/orgs/projects/hooks/useProject';
 import { execPromiseWithErrorToast } from '@/features/orgs/utils/execPromiseWithErrorToast';
+import * as Yup from 'yup';
+
+const googleProviderValidationSchema = Yup.object({
+  clientId: Yup.string()
+    .label('Client ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  clientSecret: Yup.string()
+    .label('Client Secret')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  audience: Yup.string().label('Audience'),
+  enabled: Yup.bool(),
+});
+
+export type GoogleProviderFormValues = Yup.InferType<
+  typeof googleProviderValidationSchema
+>;

 export default function GoogleProviderSettings() {
  const { project } = useProject();
@@ -45,17 +63,18 @@ export default function GoogleProviderSettings() {
    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

-  const { clientId, clientSecret, enabled } =
+  const { clientId, clientSecret, enabled, audience } =
    data?.config?.auth?.method?.oauth?.google || {};

-  const form = useForm<BaseProviderSettingsFormValues>({
+  const form = useForm<GoogleProviderFormValues>({
    reValidateMode: 'onSubmit',
    defaultValues: {
      clientId: clientId || '',
      clientSecret: clientSecret || '',
+      audience: audience || '',
      enabled: enabled || false,
    },
-    resolver: yupResolver(baseProviderValidationSchema),
+    resolver: yupResolver(googleProviderValidationSchema),
  });

  useEffect(() => {
@@ -63,10 +82,11 @@ export default function GoogleProviderSettings() {
      form.reset({
        clientId: clientId || '',
        clientSecret: clientSecret || '',
+        audience: audience || '',
        enabled: enabled || false,
      });
    }
-  }, [loading, clientId, clientSecret, enabled, form]);
+  }, [loading, clientId, clientSecret, audience, enabled, form]);

  if (loading) {
    return (
@@ -82,7 +102,7 @@ export default function GoogleProviderSettings() {
    throw error;
  }

-  const { formState, watch } = form;
+  const { formState, watch, register } = form;
  const authEnabled = watch('enabled');

  async function handleSubmit(formValues: BaseProviderSettingsFormValues) {
@@ -148,11 +168,44 @@ export default function GoogleProviderSettings() {
          switchId="enabled"
          showSwitch
          className={twMerge(
-            'grid-flow-rows grid grid-cols-2 grid-rows-2 gap-x-3 gap-y-4 px-4 py-2',
+            'grid-flow-rows grid grid-cols-2 grid-rows-3 gap-x-3 gap-y-4 px-4 py-2',
            !authEnabled && 'hidden',
          )}
        >
-          <BaseProviderSettings providerName="google" />
+          <Input
+            {...register('clientId')}
+            id="google-clientId"
+            label="Client ID"
+            placeholder="Enter your Client ID"
+            className="col-span-1"
+            fullWidth
+            hideEmptyHelperText
+            error={!!formState.errors?.clientId}
+            helperText={formState.errors?.clientId?.message}
+          />
+          <Input
+            {...register('clientSecret')}
+            id="google-clientSecret"
+            label="Client Secret"
+            placeholder="Enter your Client Secret"
+            className="col-span-1"
+            fullWidth
+            hideEmptyHelperText
+            error={!!formState.errors?.clientSecret}
+            helperText={formState.errors?.clientSecret?.message}
+          />
+          <Input
+            {...register('audience')}
+            name="audience"
+            id="audience"
+            label="Audience (optional)"
+            placeholder="Enter Audience"
+            className="col-span-2"
+            fullWidth
+            hideEmptyHelperText
+            error={!!formState.errors?.audience}
+            helperText={formState.errors?.audience?.message}
+          />
          <Input
            name="redirectUrl"
            id="google-redirectUrl"
--- a/dashboard/src/features/orgs/projects/authentication/settings/gql/getAuthenticationSettings.gql
+++ b/dashboard/src/features/orgs/projects/authentication/settings/gql/getAuthenticationSettings.gql
@@ -15,6 +15,7 @@ query GetAuthenticationSettings($appId: uuid!) {
      }
      signUp {
        enabled
+        disableNewUsers
      }
      session {
        accessToken {
--- a/dashboard/src/features/orgs/projects/authentication/users/components/EditUserPasswordForm/EditUserPasswordForm.tsx
+++ b/dashboard/src/features/orgs/projects/authentication/users/components/EditUserPasswordForm/EditUserPasswordForm.tsx
@@ -3,10 +3,10 @@ import { Form } from '@/components/form/Form';
 import { Alert } from '@/components/ui/v2/Alert';
 import { Button } from '@/components/ui/v2/Button';
 import { Input } from '@/components/ui/v2/Input';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
-import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';
+import { useRemoteApplicationGQLClient } from '@/features/orgs/hooks/useRemoteApplicationGQLClient';
+import { useProject } from '@/features/orgs/projects/hooks/useProject';
+import { execPromiseWithErrorToast } from '@/features/orgs/utils/execPromiseWithErrorToast';
 import type { DialogFormProps } from '@/types/common';
-import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import type { RemoteAppGetUsersQuery } from '@/utils/__generated__/graphql';
 import {
  useGetSignInMethodsQuery,
@@ -38,10 +38,10 @@ export default function EditUserPasswordForm({
    client: remoteProjectGQLClient,
  });
  const { closeDialog } = useDialog();
-  const { currentProject } = useCurrentWorkspaceAndProject();
+  const { project } = useProject();
  const { data } = useGetSignInMethodsQuery({
-    variables: { appId: currentProject?.id },
-    skip: !currentProject?.id,
+    variables: { appId: project?.id },
+    skip: !project?.id,
  });

  const passwordMinLength =
--- a/dashboard/src/features/orgs/projects/common/components/ApplicationPaused/ApplicationPaused.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/ApplicationPaused/ApplicationPaused.tsx
@@ -1,17 +1,11 @@
 import { Container } from '@/components/layout/Container';
 import { Modal } from '@/components/ui/v1/Modal';
-import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
-import { Box } from '@/components/ui/v2/Box';
 import { Button } from '@/components/ui/v2/Button';
-import { Text } from '@/components/ui/v2/Text';
 import { TransferProjectDialog } from '@/features/orgs/components/common/TransferProjectDialog';
 import { ApplicationInfo } from '@/features/orgs/projects/common/components/ApplicationInfo';
-import { ApplicationLockedReason } from '@/features/orgs/projects/common/components/ApplicationLockedReason';
-import { ApplicationPausedReason } from '@/features/orgs/projects/common/components/ApplicationPausedReason';
-import { ApplicationPausedSymbol } from '@/features/orgs/projects/common/components/ApplicationPausedSymbol';
+import { ApplicationPausedBanner } from '@/features/orgs/projects/common/components/ApplicationPausedBanner';
 import { RemoveApplicationModal } from '@/features/orgs/projects/common/components/RemoveApplicationModal';
 import { StagingMetadata } from '@/features/orgs/projects/common/components/StagingMetadata';
-import { useAppPausedReason } from '@/features/orgs/projects/common/hooks/useAppPausedReason';
 import { useIsCurrentUserOwner } from '@/features/orgs/projects/common/hooks/useIsCurrentUserOwner';
 import { useCurrentOrg } from '@/features/orgs/projects/hooks/useCurrentOrg';
 import { useProject } from '@/features/orgs/projects/hooks/useProject';
@@ -19,46 +13,19 @@ import {
  GetAllWorkspacesAndProjectsDocument,
  useUnpauseApplicationMutation,
 } from '@/generated/graphql';
-import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { useState } from 'react';

 export default function ApplicationPaused() {
  const { org } = useCurrentOrg();
-  const { project, refetch: refetchProject } = useProject();
+  const { project } = useProject();
  const isOwner = useIsCurrentUserOwner();
  const [transferProjectDialogOpen, setTransferProjectDialogOpen] =
    useState(false);

  const [showDeletingModal, setShowDeletingModal] = useState(false);
-  const [unpauseApplication, { loading: changingApplicationStateLoading }] =
-    useUnpauseApplicationMutation({
-      refetchQueries: [{ query: GetAllWorkspacesAndProjectsDocument }],
-    });
-
-  const { isLocked, lockedReason, freeAndLiveProjectsNumberExceeded, loading } =
-    useAppPausedReason();
-
-  async function handleTriggerUnpausing() {
-    await execPromiseWithErrorToast(
-      async () => {
-        await unpauseApplication({ variables: { appId: project.id } });
-        await new Promise((resolve) => {
-          setTimeout(resolve, 1000);
-        });
-        await refetchProject();
-      },
-      {
-        loadingMessage: 'Starting the project...',
-        successMessage: 'The project has been started successfully.',
-        errorMessage:
-          'An error occurred while waking up the project. Please try again.',
-      },
-    );
-  }
-
-  if (loading) {
-    return <ActivityIndicator label="Loading user data..." delay={1000} />;
-  }
+  useUnpauseApplicationMutation({
+    refetchQueries: [{ query: GetAllWorkspacesAndProjectsDocument }],
+  });

  return (
    <>
@@ -77,65 +44,38 @@ export default function ApplicationPaused() {
      </Modal>

      <Container className="mx-auto grid max-w-lg grid-flow-row gap-6 text-center">
-        <div className="mx-auto flex w-centImage flex-col text-center">
-          <ApplicationPausedSymbol isLocked={isLocked} />
-        </div>
-
-        <Box className="grid grid-flow-row gap-6">
-          <Text variant="h3" component="h1">
-            {project.name} is {isLocked ? 'locked' : 'paused'}
-          </Text>
-          {isLocked ? (
-            <ApplicationLockedReason reason={lockedReason} />
-          ) : (
+        <div className="mx-auto flex w-full max-w-xs flex-col gap-4">
+          <ApplicationPausedBanner
+            alertClassName="items-center"
+            textContainerClassName="items-center text-center"
+          />
+          {org && (
            <>
-              <ApplicationPausedReason
-                freeAndLiveProjectsNumberExceeded={
-                  freeAndLiveProjectsNumberExceeded
-                }
-              />
-              <div className="grid grid-flow-row gap-4">
-                {org && (
-                  <>
-                    <Button
-                      className="mx-auto w-full max-w-xs"
-                      onClick={() => setTransferProjectDialogOpen(true)}
-                    >
-                      Transfer
-                    </Button>
-                    <TransferProjectDialog
-                      open={transferProjectDialogOpen}
-                      setOpen={setTransferProjectDialogOpen}
-                    />
-                  </>
-                )}
-                <Button
-                  variant="borderless"
-                  className="mx-auto w-full max-w-xs"
-                  loading={changingApplicationStateLoading}
-                  disabled={
-                    changingApplicationStateLoading ||
-                    freeAndLiveProjectsNumberExceeded
-                  }
-                  onClick={handleTriggerUnpausing}
-                >
-                  Wake Up
-                </Button>
+              <Button
+                className="w-full"
+                onClick={() => setTransferProjectDialogOpen(true)}
+              >
+                Transfer
+              </Button>

-                {isOwner && (
-                  <Button
-                    color="error"
-                    variant="outlined"
-                    className="mx-auto w-full max-w-xs"
-                    onClick={() => setShowDeletingModal(true)}
-                  >
-                    Delete Project
-                  </Button>
-                )}
-              </div>
+              <TransferProjectDialog
+                open={transferProjectDialogOpen}
+                setOpen={setTransferProjectDialogOpen}
+              />
            </>
          )}
-        </Box>
+
+          {isOwner && (
+            <Button
+              color="error"
+              variant="outlined"
+              className="mx-auto w-full max-w-xs"
+              onClick={() => setShowDeletingModal(true)}
+            >
+              Delete Project
+            </Button>
+          )}
+        </div>

        <StagingMetadata>
          <ApplicationInfo />
--- a/dashboard/src/features/orgs/projects/common/components/ApplicationPausedBanner/ApplicationPausedBanner.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/ApplicationPausedBanner/ApplicationPausedBanner.tsx
@@ -0,0 +1,111 @@
+import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
+import { Alert } from '@/components/ui/v2/Alert';
+import { Button } from '@/components/ui/v3/button';
+import { useAppPausedReason } from '@/features/orgs/projects/common/hooks/useAppPausedReason';
+import { useAppState } from '@/features/orgs/projects/common/hooks/useAppState';
+import { useCurrentOrg } from '@/features/orgs/projects/hooks/useCurrentOrg';
+import { useProject } from '@/features/orgs/projects/hooks/useProject';
+import { execPromiseWithErrorToast } from '@/features/orgs/utils/execPromiseWithErrorToast';
+import { cn } from '@/lib/utils';
+import { ApplicationStatus } from '@/types/application';
+import { useUnpauseApplicationMutation } from '@/utils/__generated__/graphql';
+import Image from 'next/image';
+import { useCallback } from 'react';
+
+export default function ApplicationPausedBanner({
+  alertClassName,
+  textContainerClassName,
+  wakeUpButtonClassName,
+}: {
+  alertClassName?: string;
+  textContainerClassName?: string;
+  wakeUpButtonClassName?: string;
+}) {
+  const { org } = useCurrentOrg();
+  const { state } = useAppState();
+  const { freeAndLiveProjectsNumberExceeded } = useAppPausedReason();
+  const { project, refetch: refetchProject } = useProject();
+
+  const [unpauseApplication, { loading: changingApplicationStateLoading }] =
+    useUnpauseApplicationMutation({
+      variables: {
+        appId: project?.id,
+      },
+    });
+
+  const handleTriggerUnpausing = useCallback(async () => {
+    await execPromiseWithErrorToast(
+      async () => {
+        await unpauseApplication({ variables: { appId: project.id } });
+        await new Promise((resolve) => {
+          setTimeout(resolve, 1000);
+        });
+        await refetchProject();
+      },
+      {
+        loadingMessage: 'Starting the project...',
+        successMessage: 'The project has been started successfully.',
+        errorMessage:
+          'An error occurred while waking up the project. Please try again.',
+      },
+    );
+  }, [unpauseApplication, project?.id, refetchProject]);
+
+  return (
+    <Alert
+      severity="warning"
+      className={cn(
+        'flex w-full flex-col items-start justify-between gap-4 p-4',
+        alertClassName,
+      )}
+    >
+      <Image
+        src="/assets/PausedApp.svg"
+        className="mt-1"
+        alt="Closed Eye"
+        width={52}
+        height={40}
+      />
+
+      <div
+        className={cn(
+          'flex h-full w-full flex-col gap-2',
+          textContainerClassName,
+        )}
+      >
+        <p className="w-full">
+          Project <b>{project?.name}</b> is paused.
+        </p>
+        <p className="w-full">
+          Wake up your project to make it accessible again. Once reactivated,
+          all features will be fully functional. Go to settings to manage your
+          project.
+        </p>
+        {org?.plan?.isFree && (
+          <p>
+            Projects under your Personal Organization will stop responding to
+            API calls after 7 days of inactivity, so consider transferring the
+            project to a <b>Pro Organization</b> to avoid auto-sleep.
+          </p>
+        )}
+        {freeAndLiveProjectsNumberExceeded && (
+          <p>
+            Additionally, only 1 free project can be active at any given time,
+            so please pause your current active free project before unpausing
+            another.
+          </p>
+        )}
+      </div>
+      {state === ApplicationStatus.Paused && (
+        <Button
+          variant="outline"
+          className={cn('w-full', wakeUpButtonClassName)}
+          disabled={changingApplicationStateLoading}
+          onClick={handleTriggerUnpausing}
+        >
+          {changingApplicationStateLoading ? <ActivityIndicator /> : 'Wake up'}
+        </Button>
+      )}
+    </Alert>
+  );
+}
--- a/dashboard/src/features/orgs/projects/common/components/ApplicationPausedBanner/index.ts
+++ b/dashboard/src/features/orgs/projects/common/components/ApplicationPausedBanner/index.ts
@@ -0,0 +1 @@
+export { default as ApplicationPausedBanner } from './ApplicationPausedBanner';
--- a/dashboard/src/features/orgs/projects/common/components/ApplicationPausedReason/ApplicationPausedReason.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/ApplicationPausedReason/ApplicationPausedReason.tsx
@@ -1,36 +0,0 @@
-import { Alert } from '@/components/ui/v2/Alert';
-import { useCurrentOrg } from '@/features/orgs/projects/hooks/useCurrentOrg';
-
-interface ApplicationPausedReasonProps {
-  freeAndLiveProjectsNumberExceeded?: boolean;
-}
-
-export default function ApplicationPausedReason({
-  freeAndLiveProjectsNumberExceeded,
-}: ApplicationPausedReasonProps) {
-  const { org } = useCurrentOrg();
-
-  return (
-    <Alert
-      severity="warning"
-      className="flex flex-col w-full max-w-xs gap-4 p-6 mx-auto text-left"
-    >
-      {org?.plan?.isFree ? (
-        <p>
-          Projects under your Personal Organization will stop responding to API
-          calls after 7 days of inactivity, so consider transferring the project
-          to a <b>Pro Organization</b> to avoid auto-sleep.
-        </p>
-      ) : (
-        <p className="text-center">Your project is Paused.</p>
-      )}
-      {freeAndLiveProjectsNumberExceeded && (
-        <p className="text-center">
-          Additionally, only 1 free project can be active at any given time, so
-          please pause your current active free project before unpausing
-          another.
-        </p>
-      )}
-    </Alert>
-  );
-}
--- a/dashboard/src/features/orgs/projects/common/components/ApplicationPausedReason/index.ts
+++ b/dashboard/src/features/orgs/projects/common/components/ApplicationPausedReason/index.ts
@@ -1 +0,0 @@
-export { default as ApplicationPausedReason } from './ApplicationPausedReason';
--- a/dashboard/src/features/orgs/projects/common/components/StagingMetadata/StagingMetadata.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/StagingMetadata/StagingMetadata.tsx
@@ -48,7 +48,7 @@ export default function StagingMetadata({
 }: PropsWithChildren<unknown>) {
  return (
    isDevOrStaging() && (
-      <div className="mx-auto mt-10 max-w-sm">
+      <div className="mx-auto max-w-sm">
        <Box className="mx-auto grid grid-flow-row justify-items-center rounded-md border p-5 text-center">
          <Status status={StatusEnum.Deploying}>Internal info</Status>
          {children}
--- a/dashboard/src/features/orgs/projects/common/components/WorkspaceAndProjectList/WorkspaceAndProjectList.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/WorkspaceAndProjectList/WorkspaceAndProjectList.tsx
@@ -1,213 +0,0 @@
-import { useUI } from '@/components/common/UIProvider';
-import { StateBadge } from '@/components/presentational/StateBadge';
-import type { DeploymentStatus } from '@/components/presentational/StatusCircle';
-import { StatusCircle } from '@/components/presentational/StatusCircle';
-import type { BoxProps } from '@/components/ui/v2/Box';
-import { Box } from '@/components/ui/v2/Box';
-import type { ButtonProps } from '@/components/ui/v2/Button';
-import { Button } from '@/components/ui/v2/Button';
-import { Divider } from '@/components/ui/v2/Divider';
-import { PlusCircleIcon } from '@/components/ui/v2/icons/PlusCircleIcon';
-import { SearchIcon } from '@/components/ui/v2/icons/SearchIcon';
-import type { InputProps } from '@/components/ui/v2/Input';
-import { Input } from '@/components/ui/v2/Input';
-import { Link } from '@/components/ui/v2/Link';
-import { List } from '@/components/ui/v2/List';
-import { ListItem } from '@/components/ui/v2/ListItem';
-import { Text } from '@/components/ui/v2/Text';
-import { DeploymentStatusMessage } from '@/features/projects/deployments/components/DeploymentStatusMessage';
-import type { ApplicationState, Workspace } from '@/types/application';
-import { ApplicationStatus } from '@/types/application';
-import { getApplicationStatusString } from '@/utils/helpers';
-import debounce from 'lodash.debounce';
-import Image from 'next/image';
-import NavLink from 'next/link';
-import type { ChangeEvent, PropsWithoutRef } from 'react';
-import { Fragment, useState } from 'react';
-import { twMerge } from 'tailwind-merge';
-
-export interface WorkspaceAndProjectListProps extends BoxProps {
-  /**
-   * List of workspaces to be displayed.
-   */
-  workspaces: Workspace[];
-  /**
-   * Props to be passed to individual slots.
-   */
-  slotProps?: {
-    root?: BoxProps;
-    header?: BoxProps;
-    search?: PropsWithoutRef<InputProps>;
-    button?: PropsWithoutRef<ButtonProps>;
-  };
-}
-
-function checkStatusOfTheApplication(stateHistory: ApplicationState[] | []) {
-  if (stateHistory.length === 0) {
-    return ApplicationStatus.Empty;
-  }
-
-  if (stateHistory[0].stateId === undefined) {
-    return ApplicationStatus.Empty;
-  }
-
-  return stateHistory[0].stateId;
-}
-
-export default function WorkspaceAndProjectList({
-  workspaces,
-  className,
-  slotProps = {},
-  ...props
-}: WorkspaceAndProjectListProps) {
-  const [query, setQuery] = useState('');
-  const { maintenanceActive } = useUI();
-
-  const handleQueryChange = debounce((event: ChangeEvent<HTMLInputElement>) => {
-    slotProps?.search?.onChange?.(event);
-    setQuery(event.target.value);
-  }, 500);
-
-  const filteredWorkspaces = workspaces
-    .map((workspace) => ({
-      ...workspace,
-      projects: workspace.projects.filter((project) =>
-        project.name.toLowerCase().includes(query.toLowerCase()),
-      ),
-    }))
-    .filter((workspace) => workspace.projects.length > 0);
-
-  return (
-    <Box
-      {...props}
-      {...slotProps.root}
-      className={twMerge(
-        'grid grid-flow-row content-start gap-4',
-        className,
-        slotProps.root?.className,
-      )}
-    >
-      <Box
-        {...slotProps.header}
-        className={twMerge(
-          'grid grid-flow-col place-content-between items-center',
-          slotProps.header?.className,
-        )}
-      >
-        <Text variant="h2" component="h1" className="hidden md:block">
-          My Projects
-        </Text>
-
-        <Input
-          placeholder="Find Project"
-          startAdornment={
-            <SearchIcon
-              className="w-4 h-4 ml-2 -mr-1 shrink-0"
-              sx={{ color: 'text.disabled' }}
-            />
-          }
-          {...slotProps.search}
-          onChange={handleQueryChange}
-        />
-
-        <NavLink href="/new" passHref legacyBehavior>
-          <Button
-            variant="outlined"
-            color="secondary"
-            startIcon={<PlusCircleIcon />}
-            disabled={maintenanceActive}
-            {...slotProps.button}
-          >
-            New Project
-          </Button>
-        </NavLink>
-      </Box>
-
-      <Box className="grid grid-flow-row gap-8 my-8">
-        {filteredWorkspaces.map((workspace) => (
-          <div key={workspace.slug}>
-            <NavLink href={`/${workspace.slug}`} passHref legacyBehavior>
-              <Link
-                href={`${workspace.slug}`}
-                className="mb-1.5 block font-medium"
-                underline="none"
-                sx={{ color: 'text.primary' }}
-              >
-                {workspace.name}
-              </Link>
-            </NavLink>
-
-            <List className="grid grid-flow-row border-y">
-              {workspace.projects.map((project, index) => {
-                const [latestDeployment] = project.deployments;
-
-                return (
-                  <Fragment key={project.slug}>
-                    <ListItem.Root
-                      secondaryAction={
-                        <div className="grid grid-flow-col gap-px">
-                          {latestDeployment && (
-                            <div className="flex self-center mr-2 align-middle">
-                              <StatusCircle
-                                status={
-                                  latestDeployment.deploymentStatus as DeploymentStatus
-                                }
-                              />
-                            </div>
-                          )}
-
-                          <StateBadge
-                            state={checkStatusOfTheApplication(
-                              project.appStates,
-                            )}
-                            desiredState={project.desiredState}
-                            title={getApplicationStatusString(
-                              checkStatusOfTheApplication(project.appStates),
-                            )}
-                          />
-                        </div>
-                      }
-                    >
-                      <NavLink
-                        href={`${workspace?.slug}/${project.slug}`}
-                        passHref
-                        className='w-full'
-                        legacyBehavior>
-                        <ListItem.Button className="rounded-none">
-                          <ListItem.Avatar>
-                            <div className="w-10 h-10 overflow-hidden rounded-lg">
-                              <Image
-                                src="/logos/new.svg"
-                                alt="Nhost Logo"
-                                width={40}
-                                height={40}
-                              />
-                            </div>
-                          </ListItem.Avatar>
-
-                          <ListItem.Text
-                            primary={project.name}
-                            secondary={
-                              <DeploymentStatusMessage
-                                appCreatedAt={project.createdAt}
-                                deployment={latestDeployment}
-                              />
-                            }
-                          />
-                        </ListItem.Button>
-                      </NavLink>
-                    </ListItem.Root>
-
-                    {index < workspace.projects.length - 1 && (
-                      <Divider component="li" role="listitem" />
-                    )}
-                  </Fragment>
-                );
-              })}
-            </List>
-          </div>
-        ))}
-      </Box>
-    </Box>
-  );
-}
--- a/dashboard/src/features/orgs/projects/common/components/WorkspaceAndProjectList/index.ts
+++ b/dashboard/src/features/orgs/projects/common/components/WorkspaceAndProjectList/index.ts
@@ -1,2 +0,0 @@
-export * from './WorkspaceAndProjectList';
-export { default as WorkspaceAndProjectList } from './WorkspaceAndProjectList';
--- a/dashboard/src/features/orgs/projects/common/components/WorkspaceSidebar/Resource.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/WorkspaceSidebar/Resource.tsx
@@ -1,43 +0,0 @@
-import { ArrowSquareOutIcon } from '@/components/ui/v2/icons/ArrowSquareOutIcon';
-import { Text } from '@/components/ui/v2/Text';
-import { useTheme } from '@mui/material';
-import Image from 'next/image';
-
-export interface ResourceProps {
-  text: string;
-  logo: string;
-  link: string;
-}
-
-export default function Resource({ text, logo, link }: ResourceProps) {
-  const theme = useTheme();
-
-  return (
-    <a
-      href={link}
-      target="_blank"
-      rel="noreferrer"
-      className="flex justify-between py-1 align-middle"
-    >
-      <div className="flex items-center align-middle">
-        <Image
-          src={
-            theme.palette.mode === 'dark'
-              ? `/logos/light/${logo}.svg`
-              : `/logos/${logo}.svg`
-          }
-          alt={text}
-          width={20}
-          height={20}
-        />
-
-        <Text className="ml-2 inline-flex self-center align-middle font-medium">
-          {text}
-        </Text>
-      </div>
-      <div className="flex self-center">
-        <ArrowSquareOutIcon className="h-4 w-4" />
-      </div>
-    </a>
-  );
-}
--- a/dashboard/src/features/orgs/projects/common/components/WorkspaceSidebar/WorkspaceSidebar.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/WorkspaceSidebar/WorkspaceSidebar.tsx
@@ -1,168 +0,0 @@
-import { useDialog } from '@/components/common/DialogProvider';
-import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
-import type { BoxProps } from '@/components/ui/v2/Box';
-import { Box } from '@/components/ui/v2/Box';
-import { Button } from '@/components/ui/v2/Button';
-import { GitHubIcon } from '@/components/ui/v2/icons/GitHubIcon';
-import { PlusCircleIcon } from '@/components/ui/v2/icons/PlusCircleIcon';
-import { List } from '@/components/ui/v2/List';
-import { ListItem } from '@/components/ui/v2/ListItem';
-import { Text } from '@/components/ui/v2/Text';
-import { Announcements } from '@/features/projects/common/components/Announcements';
-import { EditWorkspaceNameForm } from '@/features/projects/workspaces/components/EditWorkspaceNameForm';
-import type { Workspace } from '@/types/application';
-import Image from 'next/image';
-import NavLink from 'next/link';
-import { twMerge } from 'tailwind-merge';
-import Resource from './Resource';
-
-export interface WorkspaceSidebarProps extends BoxProps {
-  /**
-   * List of workspaces to be displayed.
-   */
-  workspaces: Workspace[];
-}
-
-export default function WorkspaceSidebar({
-  className,
-  workspaces,
-  ...props
-}: WorkspaceSidebarProps) {
-  const { openDialog } = useDialog();
-
-  return (
-    <Box
-      component="aside"
-      className={twMerge(
-        'grid w-full grid-flow-row content-start gap-8 md:grid',
-        className,
-      )}
-      {...props}
-    >
-      <Announcements />
-
-      <section className="grid grid-flow-row gap-2">
-        <Text color="secondary">My Workspaces</Text>
-
-        {workspaces.length > 0 ? (
-          <List className="grid grid-flow-row gap-2">
-            {workspaces.map(({ id, name, slug }) => (
-              <ListItem.Root key={id}>
-                <NavLink href={`/${slug}`} passHref className='w-full' legacyBehavior>
-                  <ListItem.Button
-                    dense
-                    aria-label={`View ${name}`}
-                    className="!p-1"
-                  >
-                    <ListItem.Avatar className="w-8 h-8">
-                      <div className="inline-block w-8 h-8 overflow-hidden rounded-lg">
-                        <Image
-                          src="/logos/new.svg"
-                          alt="Nhost Logo"
-                          width={32}
-                          height={32}
-                        />
-                      </div>
-                    </ListItem.Avatar>
-                    <ListItem.Text primary={name} />
-                  </ListItem.Button>
-                </NavLink>
-              </ListItem.Root>
-            ))}
-          </List>
-        ) : (
-          <ActivityIndicator
-            label="Creating your first workspace..."
-            className="py-1"
-          />
-        )}
-
-        <Button
-          variant="borderless"
-          color="secondary"
-          startIcon={<PlusCircleIcon />}
-          className="justify-self-start"
-          onClick={() => {
-            openDialog({
-              title: (
-                <span className="grid grid-flow-row">
-                  <span>New Workspace</span>
-
-                  <Text variant="subtitle1" component="span">
-                    Invite team members to workspaces to work collaboratively.
-                  </Text>
-                </span>
-              ),
-              component: <EditWorkspaceNameForm />,
-            });
-          }}
-        >
-          New Workspace
-        </Button>
-      </section>
-
-      <section className="grid grid-flow-row gap-2">
-        <Text color="secondary">Resources</Text>
-
-        <div className="grid grid-flow-row gap-2">
-          <Resource
-            text="Documentation"
-            logo="Note"
-            link="https://docs.nhost.io"
-          />
-          <Resource
-            text="JavaScript Client"
-            logo="js"
-            link="https://docs.nhost.io/reference/javascript/"
-          />
-          <Resource
-            text="Nhost CLI"
-            logo="CLI"
-            link="https://docs.nhost.io/platform/cli"
-          />
-        </div>
-      </section>
-
-      <section className="grid grid-flow-row gap-2">
-        <NavLink
-          href="https://github.com/nhost/nhost"
-          passHref
-          target="_blank"
-          rel="noreferrer noopener"
-          legacyBehavior>
-          <Button
-            className="grid w-full grid-flow-col gap-1"
-            variant="outlined"
-            color="secondary"
-            startIcon={<GitHubIcon />}
-          >
-            Star us on GitHub
-          </Button>
-        </NavLink>
-
-        <NavLink
-          href="https://discord.com/invite/9V7Qb2U"
-          passHref
-          target="_blank"
-          rel="noreferrer noopener"
-          legacyBehavior>
-          <Button
-            className="grid w-full grid-flow-col gap-1"
-            variant="outlined"
-            color="secondary"
-            aria-labelledby="discord-button-label"
-          >
-            <Image
-              src="/assets/brands/discord.svg"
-              alt="Discord Logo"
-              width={24}
-              height={24}
-            />
-
-            <span id="discord-button-label">Join Discord</span>
-          </Button>
-        </NavLink>
-      </section>
-    </Box>
-  );
-}
--- a/dashboard/src/features/orgs/projects/common/components/WorkspaceSidebar/index.ts
+++ b/dashboard/src/features/orgs/projects/common/components/WorkspaceSidebar/index.ts
@@ -1 +0,0 @@
-export { default as WorkspaceSidebar } from './WorkspaceSidebar';
--- a/dashboard/src/features/orgs/projects/common/components/settings/TOMLEditor/TOMLEditor.tsx
+++ b/dashboard/src/features/orgs/projects/common/components/settings/TOMLEditor/TOMLEditor.tsx
@@ -159,9 +159,6 @@ export default function TOMLEditor() {
            height="100%"
            width="100%"
            theme={theme.palette.mode === 'light' ? bbedit : githubDark}
-            basicSetup={{
-              searchKeymap: false,
-            }}
            extensions={[StreamLanguage.define(toml)]}
            onChange={onChange}
          />
--- a/dashboard/src/features/orgs/projects/common/hooks/useAppPausedReason/useAppPausedReason.ts
+++ b/dashboard/src/features/orgs/projects/common/hooks/useAppPausedReason/useAppPausedReason.ts
@@ -25,7 +25,7 @@ export default function useAppPausedReason(): {
  });

  const { data: isLockedData } = useGetProjectIsLockedQuery({
-    variables: { appId: project.id },
+    variables: { appId: project?.id },
    skip: !project,
  });

--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseColumnForm/BaseColumnForm.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseColumnForm/BaseColumnForm.tsx
@@ -11,12 +11,12 @@ import { Text } from '@/components/ui/v2/Text';
 import type {
  ColumnType,
  DatabaseColumn,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import {
  identityTypes,
  postgresFunctions,
  postgresTypeGroups,
-} from '@/features/database/dataGrid/utils/postgresqlConstants';
+} from '@/features/orgs/projects/database/dataGrid/utils/postgresqlConstants';
 import type { DialogFormProps } from '@/types/common';
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
@@ -102,7 +102,7 @@ export default function BaseColumnForm({
  return (
    <Form
      onSubmit={handleExternalSubmit}
-      className="flex flex-col content-between flex-auto overflow-hidden border-t-1"
+      className="flex flex-auto flex-col content-between overflow-hidden border-t-1"
    >
      <div className="flex-auto overflow-y-auto">
        <section className="grid grid-cols-8 px-6 py-3">
@@ -184,7 +184,7 @@ export default function BaseColumnForm({
                  </Text>
                </span>
              }
-              className="w-full col-span-8 py-3 m-0 sm:col-span-6 sm:col-start-3 sm:ml-1"
+              className="col-span-8 m-0 w-full py-3 sm:col-span-6 sm:col-start-3 sm:ml-1"
              onChange={(_event, checked) => {
                if (checked) {
                  setDefaultValueInputText('');
@@ -197,7 +197,7 @@ export default function BaseColumnForm({

        <Box
          component="section"
-          className="grid grid-cols-8 px-6 py-3 border-t-1"
+          className="grid grid-cols-8 border-t-1 px-6 py-3"
        >
          <ControlledAutocomplete
            id="defaultValue"
@@ -249,7 +249,7 @@ export default function BaseColumnForm({
          />

          <ControlledCheckbox
-            className="w-full col-span-8 py-3 m-0 sm:col-span-6 sm:col-start-3 sm:ml-1"
+            className="col-span-8 m-0 w-full py-3 sm:col-span-6 sm:col-start-3 sm:ml-1"
            name="isNullable"
            label={
              <span className="inline-grid grid-flow-row">
@@ -269,7 +269,7 @@ export default function BaseColumnForm({
          />

          <ControlledCheckbox
-            className="w-full col-span-8 py-3 m-0 sm:col-span-6 sm:col-start-3 sm:ml-1"
+            className="col-span-8 m-0 w-full py-3 sm:col-span-6 sm:col-start-3 sm:ml-1"
            name="isUnique"
            label={
              <span className="inline-grid grid-flow-row">
@@ -306,7 +306,7 @@ export default function BaseColumnForm({
        </Box>
      </div>

-      <Box className="grid justify-between flex-shrink-0 grid-flow-col gap-3 p-2 border-t-1">
+      <Box className="grid flex-shrink-0 grid-flow-col justify-between gap-3 border-t-1 p-2">
        <Button
          variant="borderless"
          color="secondary"
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseColumnForm/ForeignKeyEditor.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseColumnForm/ForeignKeyEditor.tsx
@@ -5,9 +5,9 @@ import { ArrowRightIcon } from '@/components/ui/v2/icons/ArrowRightIcon';
 import { LinkIcon } from '@/components/ui/v2/icons/LinkIcon';
 import { InputLabel } from '@/components/ui/v2/InputLabel';
 import { Text } from '@/components/ui/v2/Text';
-import { CreateForeignKeyForm } from '@/features/database/dataGrid/components/CreateForeignKeyForm';
-import { EditForeignKeyForm } from '@/features/database/dataGrid/components/EditForeignKeyForm';
-import type { DatabaseColumn } from '@/features/database/dataGrid/types/dataBrowser';
+import { CreateForeignKeyForm } from '@/features/orgs/projects/database/dataGrid/components/CreateForeignKeyForm';
+import { EditForeignKeyForm } from '@/features/orgs/projects/database/dataGrid/components/EditForeignKeyForm';
+import type { DatabaseColumn } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { ForwardedRef } from 'react';
 import { forwardRef, useRef } from 'react';
 import { useFormContext, useWatch } from 'react-hook-form';
@@ -106,7 +106,7 @@ const ForeignKeyEditorInput = forwardRef(
              });
            }}
            variant="borderless"
-            className="min-w-[initial] py-1 px-2"
+            className="min-w-[initial] px-2 py-1"
          >
            Edit
          </Button>
@@ -114,7 +114,7 @@ const ForeignKeyEditorInput = forwardRef(
          <Button
            onClick={() => setValue('foreignKeyRelation', null)}
            variant="borderless"
-            className="min-w-[initial] py-1 px-2"
+            className="min-w-[initial] px-2 py-1"
          >
            Delete
          </Button>
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/BaseForeignKeyForm.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/BaseForeignKeyForm.tsx
@@ -6,11 +6,11 @@ import { Button } from '@/components/ui/v2/Button';
 import { Divider } from '@/components/ui/v2/Divider';
 import { Option } from '@/components/ui/v2/Option';
 import { Text } from '@/components/ui/v2/Text';
-import { useDatabaseQuery } from '@/features/database/dataGrid/hooks/useDatabaseQuery';
+import { useDatabaseQuery } from '@/features/orgs/projects/database/dataGrid/hooks/useDatabaseQuery';
 import type {
  DatabaseColumn,
  ForeignKeyRelation,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { DialogFormProps } from '@/types/common';
 import { useRouter } from 'next/router';
 import { useEffect } from 'react';
@@ -107,9 +107,9 @@ export default function BaseForeignKeyForm({
            selectedColumn?.isPrimary || selectedColumn?.isUnique || false,
        });
      }}
-      className="flex flex-col content-between flex-auto pb-4 overflow-hidden"
+      className="flex flex-auto flex-col content-between overflow-hidden pb-4"
    >
-      <Box className="grid flex-auto grid-flow-row gap-4 py-4 overflow-y-auto border-t-1">
+      <Box className="grid flex-auto grid-flow-row gap-4 overflow-y-auto border-t-1 py-4">
        <Box component="section" className="grid grid-flow-row gap-4 px-6">
          <Text variant="h3">From</Text>

@@ -185,7 +185,7 @@ export default function BaseForeignKeyForm({
        </Box>
      </Box>

-      <Box className="grid flex-shrink-0 grid-flow-row gap-2 px-6 pt-4 border-t-1">
+      <Box className="grid flex-shrink-0 grid-flow-row gap-2 border-t-1 px-6 pt-4">
        <Button loading={isSubmitting} disabled={isSubmitting} type="submit">
          {submitButtonText}
        </Button>
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/ReferencedColumnSelect.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/ReferencedColumnSelect.tsx
@@ -1,6 +1,6 @@
 import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Option } from '@/components/ui/v2/Option';
-import { useTableQuery } from '@/features/database/dataGrid/hooks/useTableQuery';
+import { useTableQuery } from '@/features/orgs/projects/database/dataGrid/hooks/useTableQuery';
 import { useFormState, useWatch } from 'react-hook-form';

 export default function ReferencedColumnSelect() {
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/ReferencedSchemaSelect.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/ReferencedSchemaSelect.tsx
@@ -1,7 +1,7 @@
 import type { ControlledSelectProps } from '@/components/form/ControlledSelect';
 import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Option } from '@/components/ui/v2/Option';
-import type { NormalizedQueryDataRow } from '@/features/database/dataGrid/types/dataBrowser';
+import type { NormalizedQueryDataRow } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { ForwardedRef, PropsWithoutRef } from 'react';
 import { forwardRef } from 'react';
 import { useFormContext, useFormState } from 'react-hook-form';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/ReferencedTableSelect.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm/ReferencedTableSelect.tsx
@@ -1,6 +1,6 @@
 import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Option } from '@/components/ui/v2/Option';
-import type { NormalizedQueryDataRow } from '@/features/database/dataGrid/types/dataBrowser';
+import type { NormalizedQueryDataRow } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useFormContext, useFormState, useWatch } from 'react-hook-form';
 import type { BaseForeignKeyFormValues } from './BaseForeignKeyForm';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseRecordForm/BaseRecordForm.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseRecordForm/BaseRecordForm.tsx
@@ -2,11 +2,11 @@ import { useDialog } from '@/components/common/DialogProvider';
 import { Form } from '@/components/form/Form';
 import { Box } from '@/components/ui/v2/Box';
 import { Button } from '@/components/ui/v2/Button';
-import { DatabaseRecordInputGroup } from '@/features/database/dataGrid/components/DatabaseRecordInputGroup';
+import { DatabaseRecordInputGroup } from '@/features/orgs/projects/database/dataGrid/components/DatabaseRecordInputGroup';
 import type {
  ColumnInsertOptions,
  DataBrowserGridColumn,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { DialogFormProps } from '@/types/common';
 import { useEffect } from 'react';
 import { useFormContext } from 'react-hook-form';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/BaseTableForm.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/BaseTableForm.tsx
@@ -4,11 +4,11 @@ import { Box } from '@/components/ui/v2/Box';
 import { Button } from '@/components/ui/v2/Button';
 import { Input } from '@/components/ui/v2/Input';
 import { Text } from '@/components/ui/v2/Text';
-import { baseColumnValidationSchema } from '@/features/database/dataGrid/components/BaseColumnForm';
+import { baseColumnValidationSchema } from '@/features/orgs/projects/database/dataGrid/components/BaseColumnForm';
 import type {
  DatabaseTable,
  ForeignKeyRelation,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { DialogFormProps } from '@/types/common';
 import { useEffect } from 'react';
 import { useFormContext, useFormState } from 'react-hook-form';
@@ -152,17 +152,17 @@ export default function BaseTableForm({
      className="flex flex-auto flex-col content-between overflow-hidden border-t-1"
    >
      <div className="flex-auto overflow-y-auto pb-4">
-        <Box component="section" className="grid grid-cols-8 py-3 px-6">
+        <Box component="section" className="grid grid-cols-8 px-6 py-3">
          <NameInput />
        </Box>

        <Box
          component="section"
-          className="grid grid-cols-8 border-t-1 py-3 px-6"
+          className="grid grid-cols-8 border-t-1 px-6 py-3"
        >
          <Text
            variant="h2"
-            className="col-span-8 mt-3 mb-1.5 text-sm+ font-bold"
+            className="col-span-8 mb-1.5 mt-3 text-sm+ font-bold"
          >
            Columns
          </Text>
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/ColumnEditorRow.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/ColumnEditorRow.tsx
@@ -10,12 +10,12 @@ import { OptionBase } from '@/components/ui/v2/Option';
 import type {
  ColumnType,
  ForeignKeyRelation,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import {
  identityTypes,
  postgresFunctions,
  postgresTypeGroups,
-} from '@/features/database/dataGrid/utils/postgresqlConstants';
+} from '@/features/orgs/projects/database/dataGrid/utils/postgresqlConstants';
 import clsx from 'clsx';
 import type { PropsWithoutRef } from 'react';
 import { memo, useEffect, useState } from 'react';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/ForeignKeyEditorRow.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/ForeignKeyEditorRow.tsx
@@ -3,7 +3,7 @@ import { Button } from '@/components/ui/v2/Button';
 import { ArrowRightIcon } from '@/components/ui/v2/icons/ArrowRightIcon';
 import { LinkIcon } from '@/components/ui/v2/icons/LinkIcon';
 import { Text } from '@/components/ui/v2/Text';
-import type { ForeignKeyRelation } from '@/features/database/dataGrid/types/dataBrowser';
+import type { ForeignKeyRelation } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useWatch } from 'react-hook-form';

 export interface ForeignKeyEditorRowProps {
@@ -50,7 +50,7 @@ export default function ForeignKeyEditorRow({
        <Button
          onClick={onEdit}
          variant="borderless"
-          className="min-w-[initial] py-1 px-2"
+          className="min-w-[initial] px-2 py-1"
        >
          Edit
        </Button>
@@ -58,7 +58,7 @@ export default function ForeignKeyEditorRow({
        <Button
          onClick={onDelete}
          variant="borderless"
-          className="min-w-[initial] py-1 px-2"
+          className="min-w-[initial] px-2 py-1"
        >
          Delete
        </Button>
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/ForeignKeyEditorSection.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/ForeignKeyEditorSection.tsx
@@ -3,13 +3,13 @@ import { Button } from '@/components/ui/v2/Button';
 import { PlusIcon } from '@/components/ui/v2/icons/PlusIcon';
 import { InputLabel } from '@/components/ui/v2/InputLabel';
 import { Text } from '@/components/ui/v2/Text';
-import type { BaseForeignKeyFormValues } from '@/features/database/dataGrid/components/BaseForeignKeyForm';
-import { CreateForeignKeyForm } from '@/features/database/dataGrid/components/CreateForeignKeyForm';
-import { EditForeignKeyForm } from '@/features/database/dataGrid/components/EditForeignKeyForm';
+import type { BaseForeignKeyFormValues } from '@/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm';
+import { CreateForeignKeyForm } from '@/features/orgs/projects/database/dataGrid/components/CreateForeignKeyForm';
+import { EditForeignKeyForm } from '@/features/orgs/projects/database/dataGrid/components/EditForeignKeyForm';
 import type {
  DatabaseColumn,
  ForeignKeyRelation,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useFieldArray, useFormContext, useWatch } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import ForeignKeyEditorRow from './ForeignKeyEditorRow';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/IdentityColumnSelect.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/IdentityColumnSelect.tsx
@@ -3,8 +3,8 @@ import { Option } from '@/components/ui/v2/Option';
 import type {
  ColumnType,
  DatabaseColumn,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { identityTypes } from '@/features/database/dataGrid/utils/postgresqlConstants';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { identityTypes } from '@/features/orgs/projects/database/dataGrid/utils/postgresqlConstants';
 import { useMemo } from 'react';
 import { useFormContext, useFormState, useWatch } from 'react-hook-form';
 import type { BaseTableFormValues } from './BaseTableForm';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/PrimaryKeySelect.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/BaseTableForm/PrimaryKeySelect.tsx
@@ -1,6 +1,6 @@
 import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Option } from '@/components/ui/v2/Option';
-import type { DatabaseColumn } from '@/features/database/dataGrid/types/dataBrowser';
+import type { DatabaseColumn } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useMemo } from 'react';
 import { useFormState, useWatch } from 'react-hook-form';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete/ColumnAutocomplete.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete/ColumnAutocomplete.tsx
@@ -11,8 +11,8 @@ import { List } from '@/components/ui/v2/List';
 import { OptionBase } from '@/components/ui/v2/Option';
 import { OptionGroupBase } from '@/components/ui/v2/OptionGroup';
 import { Text } from '@/components/ui/v2/Text';
-import { useMetadataQuery } from '@/features/database/dataGrid/hooks/useMetadataQuery';
-import { useTableQuery } from '@/features/database/dataGrid/hooks/useTableQuery';
+import { useMetadataQuery } from '@/features/orgs/projects/database/dataGrid/hooks/useMetadataQuery';
+import { useTableQuery } from '@/features/orgs/projects/database/dataGrid/hooks/useTableQuery';
 import { getTruncatedText } from '@/utils/getTruncatedText';
 import type { AutocompleteGroupedOption } from '@mui/base/useAutocomplete';
 import { useAutocomplete } from '@mui/base/useAutocomplete';
@@ -210,7 +210,6 @@ function ColumnAutocomplete(
    ]);
  }

-
  const options = useColumnGroups({
    selectedSchema,
    selectedTable,
@@ -243,20 +242,20 @@ function ColumnAutocomplete(
    onChange: handleChange,
  });

-  
-  function handleInputValueChange(event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) {
-    const {value} = event.target
-    setInputValue(value)
+  function handleInputValueChange(
+    event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
+  ) {
+    const { value } = event.target;
+    setInputValue(value);

-    setSelectedColumn(
-      {
-        value,
-        label: value,
-        metadata: selectedColumn?.metadata || {
-          table_schema: selectedSchema,
-          table_name: selectedTable,
-        }
-      });
+    setSelectedColumn({
+      value,
+      label: value,
+      metadata: selectedColumn?.metadata || {
+        table_schema: selectedSchema,
+        table_name: selectedTable,
+      },
+    });

    onChange?.(event, {
      value:
@@ -395,11 +394,11 @@ function ColumnAutocomplete(
                  );
                }}
              >
-                <ArrowLeftIcon className="w-4 h-4" />
+                <ArrowLeftIcon className="h-4 w-4" />
              </IconButton>
            )}

-            <Text className="text-left truncate direction-rtl">
+            <Text className="direction-rtl truncate text-left">
              <Text component="span" color="disabled">
                {defaultTable}
              </Text>
@@ -433,7 +432,7 @@ function ColumnAutocomplete(
            >
              {(
                groupedOptions as AutocompleteGroupedOption<
-                  typeof options[number]
+                  (typeof options)[number]
                >[]
              ).map((optionGroup) =>
                renderGroup({
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete/useAsyncValue.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete/useAsyncValue.ts
@@ -1,7 +1,7 @@
 import type { AutocompleteOption } from '@/components/ui/v2/Autocomplete';
-import type { FetchMetadataReturnType } from '@/features/database/dataGrid/hooks/useMetadataQuery';
-import type { FetchTableReturnType } from '@/features/database/dataGrid/hooks/useTableQuery';
-import type { HasuraMetadataTable } from '@/features/database/dataGrid/types/dataBrowser';
+import type { FetchMetadataReturnType } from '@/features/orgs/projects/database/dataGrid/hooks/useMetadataQuery';
+import type { FetchTableReturnType } from '@/features/orgs/projects/database/dataGrid/hooks/useTableQuery';
+import type { HasuraMetadataTable } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useEffect, useState } from 'react';

 export interface UseAsyncValueOptions {
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete/useColumnGroups.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete/useColumnGroups.ts
@@ -1,6 +1,6 @@
 import type { AutocompleteOption } from '@/components/ui/v2/Autocomplete';
-import type { FetchMetadataReturnType } from '@/features/database/dataGrid/hooks/useMetadataQuery';
-import type { FetchTableReturnType } from '@/features/database/dataGrid/hooks/useTableQuery';
+import type { FetchMetadataReturnType } from '@/features/orgs/projects/database/dataGrid/hooks/useMetadataQuery';
+import type { FetchTableReturnType } from '@/features/orgs/projects/database/dataGrid/hooks/useTableQuery';

 export interface UseColumnGroupsOptions {
  /**
@@ -65,44 +65,47 @@ export default function useColumnGroups({
  const objectAndArrayRelationships = [
    ...(object_relationships || []),
    ...(array_relationships || []),
-  ].reduce((relationships, currentRelationship) => {
-    const { foreign_key_constraint_on, manual_configuration } =
-      currentRelationship?.using || {};
+  ].reduce(
+    (relationships, currentRelationship) => {
+      const { foreign_key_constraint_on, manual_configuration } =
+        currentRelationship?.using || {};

-    if (manual_configuration) {
-      return [
-        ...relationships,
-        ...Object.keys(manual_configuration.column_mapping).map((column) => ({
-          schema: manual_configuration.remote_table?.schema || 'public',
-          table: manual_configuration.remote_table?.name,
-          column,
-          name: currentRelationship.name,
-        })),
-      ];
-    }
+      if (manual_configuration) {
+        return [
+          ...relationships,
+          ...Object.keys(manual_configuration.column_mapping).map((column) => ({
+            schema: manual_configuration.remote_table?.schema || 'public',
+            table: manual_configuration.remote_table?.name,
+            column,
+            name: currentRelationship.name,
+          })),
+        ];
+      }
+
+      if (typeof foreign_key_constraint_on === 'string') {
+        return [
+          ...relationships,
+          {
+            schema: selectedSchema,
+            table: selectedTable,
+            column: foreign_key_constraint_on,
+            name: currentRelationship.name,
+          },
+        ];
+      }

-    if (typeof foreign_key_constraint_on === 'string') {
      return [
        ...relationships,
        {
-          schema: selectedSchema,
-          table: selectedTable,
-          column: foreign_key_constraint_on,
+          schema: foreign_key_constraint_on.table.schema,
+          table: foreign_key_constraint_on.table.name,
+          column: foreign_key_constraint_on.column,
          name: currentRelationship.name,
        },
      ];
-    }
-
-    return [
-      ...relationships,
-      {
-        schema: foreign_key_constraint_on.table.schema,
-        table: foreign_key_constraint_on.table.name,
-        column: foreign_key_constraint_on.column,
-        name: currentRelationship.name,
-      },
-    ];
-  }, [] as { schema: string; table: string; column: string; name: string }[]);
+    },
+    [] as { schema: string; table: string; column: string; name: string }[],
+  );

  return [
    ...columnOptions,
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/CreateForeignKeyForm/CreateForeignKeyForm.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/CreateForeignKeyForm/CreateForeignKeyForm.tsx
@@ -3,11 +3,11 @@ import { Button } from '@/components/ui/v2/Button';
 import type {
  BaseForeignKeyFormProps,
  BaseForeignKeyFormValues,
-} from '@/features/database/dataGrid/components/BaseForeignKeyForm';
+} from '@/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm';
 import {
  BaseForeignKeyForm,
  baseForeignKeyValidationSchema,
-} from '@/features/database/dataGrid/components/BaseForeignKeyForm';
+} from '@/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/DatabaseRecordInputGroup/DatabaseRecordInputGroup.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/DatabaseRecordInputGroup/DatabaseRecordInputGroup.tsx
@@ -7,9 +7,9 @@ import { Input } from '@/components/ui/v2/Input';
 import { Option } from '@/components/ui/v2/Option';
 import { Select } from '@/components/ui/v2/Select';
 import { Text } from '@/components/ui/v2/Text';
-import type { DataBrowserGridColumn } from '@/features/database/dataGrid/types/dataBrowser';
-import { getInputType } from '@/features/database/dataGrid/utils/inputHelpers';
-import { normalizeDefaultValue } from '@/features/database/dataGrid/utils/normalizeDefaultValue';
+import type { DataBrowserGridColumn } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getInputType } from '@/features/orgs/projects/database/dataGrid/utils/inputHelpers';
+import { normalizeDefaultValue } from '@/features/orgs/projects/database/dataGrid/utils/normalizeDefaultValue';
 import { Controller, useFormContext } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

@@ -82,7 +82,7 @@ export default function DatabaseRecordInputGroup({
  return (
    <Box component="section" className={twMerge('py-3', className)} {...props}>
      {title && (
-        <Text variant="h2" className="mt-3 mb-1.5 text-sm+ font-bold">
+        <Text variant="h2" className="mb-1.5 mt-3 text-sm+ font-bold">
          {title}
        </Text>
      )}
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/EditForeignKeyForm/EditForeignKeyForm.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/EditForeignKeyForm/EditForeignKeyForm.tsx
@@ -3,12 +3,12 @@ import { Button } from '@/components/ui/v2/Button';
 import type {
  BaseForeignKeyFormProps,
  BaseForeignKeyFormValues,
-} from '@/features/database/dataGrid/components/BaseForeignKeyForm';
+} from '@/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm';
 import {
  BaseForeignKeyForm,
  baseForeignKeyValidationSchema,
-} from '@/features/database/dataGrid/components/BaseForeignKeyForm';
-import type { ForeignKeyRelation } from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/components/BaseForeignKeyForm';
+import type { ForeignKeyRelation } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/sections/ColumnPermissionsSection.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/sections/ColumnPermissionsSection.tsx
@@ -3,9 +3,9 @@ import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Button } from '@/components/ui/v2/Button';
 import { Checkbox } from '@/components/ui/v2/Checkbox';
 import { Text } from '@/components/ui/v2/Text';
-import type { RolePermissionEditorFormValues } from '@/features/database/dataGrid/components/EditPermissionsForm/RolePermissionEditorForm';
-import { useTableQuery } from '@/features/database/dataGrid/hooks/useTableQuery';
-import type { DatabaseAction } from '@/features/database/dataGrid/types/dataBrowser';
+import type { RolePermissionEditorFormValues } from '@/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/RolePermissionEditorForm';
+import { useTableQuery } from '@/features/orgs/projects/database/dataGrid/hooks/useTableQuery';
+import type { DatabaseAction } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useFormContext, useWatch } from 'react-hook-form';
 import PermissionSettingsSection from './PermissionSettingsSection';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/sections/RootFieldPermissionsSection.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/sections/RootFieldPermissionsSection.tsx
@@ -2,7 +2,7 @@ import { ControlledSwitch } from '@/components/form/ControlledSwitch';
 import { Button } from '@/components/ui/v2/Button';
 import { Checkbox } from '@/components/ui/v2/Checkbox';
 import { Text } from '@/components/ui/v2/Text';
-import type { RolePermissionEditorFormValues } from '@/features/database/dataGrid/components/EditPermissionsForm/RolePermissionEditorForm';
+import type { RolePermissionEditorFormValues } from '@/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/RolePermissionEditorForm';
 import { useFormContext, useWatch } from 'react-hook-form';
 import PermissionSettingsSection from './PermissionSettingsSection';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/sections/RowPermissionsSection.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/sections/RowPermissionsSection.tsx
@@ -3,12 +3,12 @@ import { Input } from '@/components/ui/v2/Input';
 import { Radio } from '@/components/ui/v2/Radio';
 import { RadioGroup } from '@/components/ui/v2/RadioGroup';
 import { Text } from '@/components/ui/v2/Text';
-import type { RolePermissionEditorFormValues } from '@/features/database/dataGrid/components/EditPermissionsForm/RolePermissionEditorForm';
-import { RuleGroupEditor } from '@/features/database/dataGrid/components/RuleGroupEditor';
+import type { RolePermissionEditorFormValues } from '@/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/RolePermissionEditorForm';
+import { RuleGroupEditor } from '@/features/orgs/projects/database/dataGrid/components/RuleGroupEditor';
 import type {
  DatabaseAction,
  RuleGroup,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { FocusEvent } from 'react';
 import { useState } from 'react';
 import { useFormContext } from 'react-hook-form';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/validationSchemas.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/EditPermissionsForm/validationSchemas.ts
@@ -1,4 +1,4 @@
-import type { DatabaseAction } from '@/features/database/dataGrid/types/dataBrowser';
+import type { DatabaseAction } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import * as Yup from 'yup';

 const ruleSchema = Yup.object().shape({
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleEditorRow.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleEditorRow.tsx
@@ -1,8 +1,8 @@
 import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Option } from '@/components/ui/v2/Option';
 import { Text } from '@/components/ui/v2/Text';
-import { ColumnAutocomplete } from '@/features/database/dataGrid/components/ColumnAutocomplete';
-import type { HasuraOperator } from '@/features/database/dataGrid/types/dataBrowser';
+import { ColumnAutocomplete } from '@/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete';
+import type { HasuraOperator } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { DetailedHTMLProps, HTMLProps } from 'react';
 import { useState } from 'react';
 import { useController, useFormContext } from 'react-hook-form';
@@ -74,7 +74,7 @@ function renderOption({
  value,
  label,
  helperText,
-}: typeof commonOperators[number]) {
+}: (typeof commonOperators)[number]) {
  return (
    <Option key={value} value={value} className="grid grid-flow-col gap-2">
      <Text component="span" className="inline-block w-16">
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleGroupControls.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleGroupControls.tsx
@@ -1,7 +1,7 @@
 import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Option } from '@/components/ui/v2/Option';
 import { Text } from '@/components/ui/v2/Text';
-import type { RuleGroup } from '@/features/database/dataGrid/types/dataBrowser';
+import type { RuleGroup } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import type { DetailedHTMLProps, HTMLProps } from 'react';
 import { useWatch } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleGroupEditor.stories.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleGroupEditor.stories.tsx
@@ -1,7 +1,7 @@
 import { Form } from '@/components/form/Form';
 import { Button } from '@/components/ui/v2/Button';
 import { Text } from '@/components/ui/v2/Text';
-import type { RuleGroup } from '@/features/database/dataGrid/types/dataBrowser';
+import type { RuleGroup } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import permissionVariablesQuery from '@/tests/msw/mocks/graphql/permissionVariablesQuery';
 import hasuraMetadataQuery from '@/tests/msw/mocks/rest/hasuraMetadataQuery';
 import tableQuery from '@/tests/msw/mocks/rest/tableQuery';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleGroupEditor.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleGroupEditor.tsx
@@ -8,7 +8,7 @@ import { Text } from '@/components/ui/v2/Text';
 import type {
  Rule,
  RuleGroup,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import { useMemo } from 'react';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleRemoveButton.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleRemoveButton.tsx
@@ -4,7 +4,7 @@ import { XIcon } from '@/components/ui/v2/icons/XIcon';
 import type {
  Rule,
  RuleGroup,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useWatch } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleValueInput.tsx
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/components/RuleGroupEditor/RuleValueInput.tsx
@@ -6,9 +6,9 @@ import type { AutocompleteOption } from '@/components/ui/v2/Autocomplete';
 import type { InputProps } from '@/components/ui/v2/Input';
 import { inputClasses } from '@/components/ui/v2/Input';
 import { Option } from '@/components/ui/v2/Option';
-import type { ColumnAutocompleteProps } from '@/features/database/dataGrid/components/ColumnAutocomplete';
-import { ColumnAutocomplete } from '@/features/database/dataGrid/components/ColumnAutocomplete';
-import type { HasuraOperator } from '@/features/database/dataGrid/types/dataBrowser';
+import type { ColumnAutocompleteProps } from '@/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete';
+import { ColumnAutocomplete } from '@/features/orgs/projects/database/dataGrid/components/ColumnAutocomplete';
+import type { HasuraOperator } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { getAllPermissionVariables } from '@/features/projects/permissions/settings/utils/getAllPermissionVariables';
 import { useGetRolesPermissionsQuery } from '@/utils/__generated__/graphql';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/createColumn.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/createColumn.ts
@@ -4,8 +4,8 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import prepareCreateColumnQuery from './prepareCreateColumnQuery';

 export interface CreateColumnVariables {
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/createColumnMigration.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/createColumnMigration.ts
@@ -4,9 +4,9 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import { getHasuraMigrationsApiUrl } from '@/utils/env';
 import prepareCreateColumnQuery from './prepareCreateColumnQuery';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/prepareCreateColumnQuery.test.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/prepareCreateColumnQuery.test.ts
@@ -1,4 +1,4 @@
-import type { DatabaseColumn } from '@/features/database/dataGrid/types/dataBrowser';
+import type { DatabaseColumn } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { expect, test } from 'vitest';
 import prepareCreateColumnQuery from './prepareCreateColumnQuery';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/prepareCreateColumnQuery.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation/prepareCreateColumnQuery.ts
@@ -1,10 +1,10 @@
 import type {
  DatabaseColumn,
  MutationOrQueryBaseOptions,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { identityTypes } from '@/features/database/dataGrid/utils/postgresqlConstants';
-import { prepareCreateForeignKeyRelationQuery } from '@/features/database/dataGrid/utils/prepareCreateForeignKeyRelationQuery';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { identityTypes } from '@/features/orgs/projects/database/dataGrid/utils/postgresqlConstants';
+import { prepareCreateForeignKeyRelationQuery } from '@/features/orgs/projects/database/dataGrid/utils/prepareCreateForeignKeyRelationQuery';
 import { format } from 'node-pg-format';

 export interface PrepareCreateColumnQueryVariables
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateRecordMutation/createRecord.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateRecordMutation/createRecord.ts
@@ -4,9 +4,9 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import { format } from 'node-pg-format';

 export interface CreateRecordVariables<TData extends object = {}> {
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/createTable.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/createTable.ts
@@ -4,8 +4,8 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import prepareCreateTableQuery from './prepareCreateTableQuery';

 export interface CreateTableVariables {
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/createTableMigration.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/createTableMigration.ts
@@ -4,9 +4,9 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import { getHasuraMigrationsApiUrl } from '@/utils/env';
 import prepareCreateTableQuery from './prepareCreateTableQuery';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/prepareCreateTableQuery.test.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/prepareCreateTableQuery.test.ts
@@ -1,4 +1,4 @@
-import type { DatabaseTable } from '@/features/database/dataGrid/types/dataBrowser';
+import type { DatabaseTable } from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import { expect, test } from 'vitest';
 import prepareCreateTableQuery from './prepareCreateTableQuery';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/prepareCreateTableQuery.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useCreateTableMutation/prepareCreateTableQuery.ts
@@ -1,8 +1,8 @@
 import type {
  DatabaseTable,
  MutationOrQueryBaseOptions,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
 import { format } from 'node-pg-format';

 export interface PrepareCreateTableQueryVariables
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDatabaseQuery/fetchDatabase.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDatabaseQuery/fetchDatabase.ts
@@ -3,8 +3,8 @@ import type {
  NormalizedQueryDataRow,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedReadOnlyHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedReadOnlyHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';

 export interface FetchDatabaseOptions
  extends Omit<MutationOrQueryBaseOptions, 'schema' | 'table'> {}
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteColumnMutation/deleteColumn.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteColumnMutation/deleteColumn.ts
@@ -4,9 +4,9 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';

 export interface DeleteColumnVariables {
  /**
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteColumnMutation/deleteColumnMigration.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteColumnMutation/deleteColumnMigration.ts
@@ -1,13 +1,13 @@
-import { prepareCreateColumnQuery } from '@/features/database/dataGrid/hooks/useCreateColumnMutation';
+import { prepareCreateColumnQuery } from '@/features/orgs/projects/database/dataGrid/hooks/useCreateColumnMutation';
 import type {
  AffectedRowsResult,
  DataBrowserGridColumn,
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import { getHasuraMigrationsApiUrl } from '@/utils/env';

 export interface DeleteColumnMigrationVariables {
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteColumnMutation/useDeleteColumnWithToastMutation.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteColumnMutation/useDeleteColumnWithToastMutation.ts
@@ -1,4 +1,4 @@
-import type { UseDeleteColumnMutationOptions } from '@/features/database/dataGrid/hooks/useDeleteColumnMutation';
+import type { UseDeleteColumnMutationOptions } from '@/features/orgs/projects/database/dataGrid/hooks/useDeleteColumnMutation';
 import { showLoadingToast, triggerToast } from '@/utils/toast';
 import { useEffect, useState } from 'react';
 import toast from 'react-hot-toast';
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteRecordMutation/deleteRecord.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteRecordMutation/deleteRecord.ts
@@ -2,9 +2,9 @@ import type {
  AffectedRowsResult,
  MutationOrQueryBaseOptions,
  QueryError,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import { format } from 'node-pg-format';
 import type { Row } from 'react-table';

--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteTableMutation/deleteTable.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteTableMutation/deleteTable.ts
@@ -3,9 +3,9 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { getPreparedHasuraQuery } from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { getPreparedHasuraQuery } from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';

 export interface DeleteTableVariables {
  /**
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteTableMutation/deleteTableMigration.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useDeleteTableMutation/deleteTableMigration.ts
@@ -3,12 +3,12 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
 import {
  getEmptyDownMigrationMessage,
  getPreparedHasuraQuery,
-} from '@/features/database/dataGrid/utils/hasuraQueryHelpers';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/utils/hasuraQueryHelpers';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import { getHasuraMigrationsApiUrl } from '@/utils/env';

 export interface DeleteTableMigrationVariables {
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useManagePermissionMutation/managePermission.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useManagePermissionMutation/managePermission.ts
@@ -5,8 +5,8 @@ import type {
  MetadataError,
  MutationOrQueryBaseOptions,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { normalizeMetadataError } from '@/features/database/dataGrid/utils/normalizeMetadataError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { normalizeMetadataError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeMetadataError';

 export interface ManagePermissionVariables {
  /**
--- a/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useManagePermissionMutation/managePermissionMigration.ts
+++ b/dashboard/src/features/orgs/projects/database/dataGrid/hooks/useManagePermissionMutation/managePermissionMigration.ts
@@ -5,8 +5,8 @@ import type {
  MutationOrQueryBaseOptions,
  QueryError,
  QueryResult,
-} from '@/features/database/dataGrid/types/dataBrowser';
-import { normalizeQueryError } from '@/features/database/dataGrid/utils/normalizeQueryError';
+} from '@/features/orgs/projects/database/dataGrid/types/dataBrowser';
+import { normalizeQueryError } from '@/features/orgs/projects/database/dataGrid/utils/normalizeQueryError';
 import { getHasuraMigrationsApiUrl } from '@/utils/env';

 export interface ManagePermissionMigrationVariables {
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`export { default as OTPEmailSettings } from './OTPEmailSettings';`
				`@@ -0,0 +1 @@`
				`export { default as DisableSignUpsSettings } from './DisableSignUpsSettings';`
				`@@ -0,0 +1 @@`
				`export { default as ApplicationPausedBanner } from './ApplicationPausedBanner';`
				`@@ -1 +0,0 @@`
				`export { default as ApplicationPausedReason } from './ApplicationPausedReason';`
				`@@ -1 +0,0 @@`
				`export { default as WorkspaceSidebar } from './WorkspaceSidebar';`