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

chore: update versions

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

@@ -23,9 +23,7 @@ runs:
     - uses: actions/cache@v3
       id: pnpm-cache
       with:
-        path: |
-          ${{ steps.pnpm-cache-dir.outputs.dir }}
-          ~/.cache/Cypress
+        path: ${{ steps.pnpm-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
         restore-keys: ${{ runner.os }}-node-
     - name: Use Node.js 16

.github/workflows/ci.yaml

@@ -19,6 +19,11 @@ env:
   NEXT_PUBLIC_ENV: dev
   NEXT_TELEMETRY_DISABLED: 1
   NEXT_PUBLIC_NHOST_BACKEND_URL: http://localhost:1337
+  NHOST_TEST_DASHBOARD_URL: ${{ vars.NHOST_TEST_DASHBOARD_URL }}
+  NHOST_TEST_WORKSPACE_NAME: ${{ vars.NHOST_TEST_WORKSPACE_NAME }}
+  NHOST_TEST_PROJECT_NAME: ${{ vars.NHOST_TEST_PROJECT_NAME }}
+  NHOST_TEST_USER_EMAIL: ${{ secrets.NHOST_TEST_USER_EMAIL }}
+  NHOST_TEST_USER_PASSWORD: ${{ secrets.NHOST_TEST_USER_PASSWORD }}
 
 jobs:
   build:
@@ -60,47 +65,6 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
 
-  e2e:
-    name: 'e2e (${{ matrix.package.path }})'
-    needs: build
-    if: ${{ needs.build.outputs.matrix != '[]' && needs.build.outputs.matrix != '' }}
-    strategy:
-      # * Don't cancel other matrices when one fails
-      fail-fast: false
-      matrix:
-        package: ${{ fromJson(needs.build.outputs.matrix) }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      # * Install Node and dependencies. Package dependencies won't be downloaded again as they have been cached by the `build` job.
-      - name: Install Node and dependencies
-        uses: ./.github/actions/install-dependencies
-        with:
-          TURBO_TOKEN: ${{ env.TURBO_TOKEN }}
-          TURBO_TEAM: ${{ env.TURBO_TEAM }}
-      # * Install Nhost CLI if a `nhost/config.yaml` file is found
-      - name: Install Nhost CLI
-        if: hashFiles(format('{0}/nhost/config.yaml', matrix.package.path)) != ''
-        uses: ./.github/actions/nhost-cli
-      # * Run the `ci` script of the current package of the matrix. Dependencies build is cached by Turborepo
-      - name: Run e2e test
-        run: pnpm --filter="${{ matrix.package.name }}" run e2e
-      - id: file-name
-        if: ${{ failure() }}
-        name: Tranform package name into a valid file name
-        run: |
-          PACKAGE_FILE_NAME=$(echo "${{ matrix.package.name }}" | sed 's/@//g; s/\//-/g')
-          echo "fileName=$PACKAGE_FILE_NAME"  >> $GITHUB_OUTPUT
-      # * Run this step only if the previous step failed, and some Cypress screenshots/videos exist
-      - name: Upload Cypress videos and screenshots
-        if: ${{ failure() && hashFiles(format('{0}/cypress/screenshots/**', matrix.package.path), format('{0}/cypress/videos/**', matrix.package.path)) != ''}}
-        uses: actions/upload-artifact@v3
-        with:
-          name: cypress-${{ steps.file-name.outputs.fileName }}
-          path: |
-            ${{format('{0}/cypress/screenshots/**', matrix.package.path)}}
-            ${{format('{0}/cypress/videos/**', matrix.package.path)}}
-
   unit:
     name: Unit tests
     needs: build
@@ -141,3 +105,42 @@ jobs:
       # * Run every `lint` script in the workspace . Dependencies build is cached by Turborepo
       - name: Lint
         run: pnpm run lint:all
+
+  e2e:
+    name: 'E2E (Package: ${{ matrix.package.path }})'
+    needs: build
+    if: ${{ needs.build.outputs.matrix != '[]' && needs.build.outputs.matrix != '' }}
+    strategy:
+      # * Don't cancel other matrices when one fails
+      fail-fast: false
+      matrix:
+        package: ${{ fromJson(needs.build.outputs.matrix) }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      # * Install Node and dependencies. Package dependencies won't be downloaded again as they have been cached by the `build` job.
+      - name: Install Node and dependencies
+        uses: ./.github/actions/install-dependencies
+        with:
+          TURBO_TOKEN: ${{ env.TURBO_TOKEN }}
+          TURBO_TEAM: ${{ env.TURBO_TEAM }}
+      # * Install Nhost CLI if a `nhost/config.yaml` file is found
+      - name: Install Nhost CLI
+        if: hashFiles(format('{0}/nhost/config.yaml', matrix.package.path)) != ''
+        uses: ./.github/actions/nhost-cli
+      # * Run the `ci` script of the current package of the matrix. Dependencies build is cached by Turborepo
+      - name: Run e2e test
+        run: pnpm --filter="${{ matrix.package.name }}" run e2e
+      - id: file-name
+        if: ${{ failure() }}
+        name: Tranform package name into a valid file name
+        run: |
+          PACKAGE_FILE_NAME=$(echo "${{ matrix.package.name }}" | sed 's/@//g; s/\//-/g')
+          echo "fileName=$PACKAGE_FILE_NAME"  >> $GITHUB_OUTPUT
+      # * Run this step only if the previous step failed, and Playwright generated a report
+      - name: Upload Playwright Report
+        if: ${{ failure() && hashFiles(format('{0}/playwright-report/**', matrix.package.path)) != ''}}
+        uses: actions/upload-artifact@v3
+        with:
+          name: playwright-${{ steps.file-name.outputs.fileName }}
+          path: ${{format('{0}/playwright-report/**', matrix.package.path)}}

.github/workflows/dashboard.yaml

@@ -9,6 +9,7 @@ env:
   NEXT_PUBLIC_ENV: dev
   NEXT_TELEMETRY_DISABLED: 1
   NEXT_PUBLIC_NHOST_BACKEND_URL: http://localhost:1337
+
 jobs:
   build:
     name: Build

config/.eslint.base.js

@@ -23,8 +23,8 @@ module.exports = {
     'e2e/**/*.ts',
     'e2e/**/*.d.ts'
   ],
-  plugins: ['@typescript-eslint', 'cypress'],
-  extends: ['plugin:cypress/recommended'],
+  plugins: ['@typescript-eslint'],
+  extends: [],
   parserOptions: {
     ecmaVersion: 2020,
     sourceType: 'module'

dashboard/.gitignore

@@ -49,4 +49,8 @@ tailwind.json
 .idea
 
 # Do not ignore Logs page
-!src/**/logs*
+!src/**/logs*
+/test-results/
+/playwright-report/
+/playwright/.cache/
+storageState.json

dashboard/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @nhost/dashboard
 
+## 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

dashboard/README.md

@@ -111,3 +111,21 @@ pnpm storybook
 | `@typescript-eslint/consistent-type-imports` | Enforces `import type { Type } from 'module'` syntax. It prevents false positive circular dependency errors.                                                 |
 | `@typescript-eslint/naming-convention`       | Enforces a consistent naming convention.                                                                                                                     |
 | `no-restricted-imports`                      | Enforces absolute imports and consistent import paths for components from `src/components/ui` folder.                                                        |
+
+### End-to-End Tests
+
+End-to-end tests are written using [Playwright](https://playwright.dev/). To run the tests, run the following command:
+
+```bash
+pnpm e2e
+```
+
+Most of the tests require access to the Nhost test user. To run these tests, you need to set the following environment variables in `.env.test`:
+
+```
+NHOST_TEST_DASHBOARD_URL=<test_dashboard_url>
+NHOST_TEST_USER_EMAIL=<test_user_email>
+NHOST_TEST_USER_PASSWORD=<test_user_password>
+NHOST_TEST_WORKSPACE_NAME=<test_workspace_name>
+NHOST_TEST_PROJECT_NAME=<test_project_name>
+```

dashboard/e2e/auth.test.ts

@@ -0,0 +1,92 @@
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+import {
+  TEST_DASHBOARD_URL,
+  TEST_PROJECT_NAME,
+  TEST_PROJECT_SLUG,
+  TEST_WORKSPACE_SLUG,
+} from './env';
+
+let page: Page;
+
+test.describe.configure({ mode: 'serial' });
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+
+  await page.goto(TEST_DASHBOARD_URL);
+  await page.getByRole('link', { name: TEST_PROJECT_NAME }).click();
+  await page.waitForURL(
+    `${TEST_DASHBOARD_URL}/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}`,
+  );
+
+  await page
+    .getByRole('navigation', { name: /main navigation/i })
+    .getByRole('link', { name: /auth/i })
+    .click();
+
+  await page.waitForURL(
+    `${TEST_DASHBOARD_URL}/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/users`,
+  );
+});
+
+test.afterAll(async () => {
+  await page.close();
+});
+
+test('should create a user', async () => {
+  await expect(
+    page.getByRole('heading', { name: /there are no users yet/i }),
+  ).toBeVisible();
+
+  await page
+    .getByRole('button', { name: /create user/i })
+    .first()
+    .click();
+
+  await expect(page.getByRole('dialog')).toBeVisible();
+  await expect(
+    page.getByRole('heading', { name: /create user/i }),
+  ).toBeVisible();
+
+  await page
+    .getByRole('textbox', { name: /email/i })
+    .fill('testuser@example.com');
+  await page.getByRole('textbox', { name: /password/i }).fill('test.password');
+  await page.getByRole('button', { name: /create/i, exact: true }).click();
+
+  await expect(page.getByRole('dialog')).not.toBeVisible();
+
+  await expect(
+    page.getByRole('button', { name: /view testuser@example.com/i }),
+  ).toBeVisible();
+});
+
+test('should delete a user', async () => {
+  await expect(
+    page.getByRole('button', { name: /view testuser@example.com/i }),
+  ).toBeVisible();
+
+  await page
+    .getByRole('button', { name: /more options for testuser@example.com/i })
+    .click();
+  await page.getByRole('menuitem', { name: /delete user/i }).click();
+
+  await expect(page.getByRole('dialog')).toBeVisible();
+  await expect(
+    page.getByRole('heading', { name: /delete user/i }),
+  ).toBeVisible();
+  await expect(
+    page.getByText(
+      /are you sure you want to delete the "testuser@example.com" user?/i,
+    ),
+  ).toBeVisible();
+
+  await page.getByRole('button', { name: /delete/i, exact: true }).click();
+
+  await expect(page.getByRole('dialog')).not.toBeVisible();
+
+  await expect(
+    page.getByRole('heading', { name: /there are no users yet/i }),
+  ).toBeVisible();
+});

dashboard/e2e/env.ts

@@ -0,0 +1,42 @@
+import slugify from 'slugify';
+
+/**
+ * URL of the dashboard to test against.
+ */
+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;
+
+/**
+ * Slugified name of the workspace to test against.
+ */
+export const TEST_WORKSPACE_SLUG = slugify(TEST_WORKSPACE_NAME, {
+  lower: true,
+  strict: true,
+});
+
+/**
+ * Name of the project to test against.
+ */
+export const TEST_PROJECT_NAME = process.env.NHOST_TEST_PROJECT_NAME;
+
+/**
+ * Slugified name of the project to test against.
+ */
+export const TEST_PROJECT_SLUG = slugify(TEST_PROJECT_NAME, {
+  lower: true,
+  strict: true,
+});
+
+/**
+ * Email of the test account to use.
+ */
+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;

dashboard/e2e/overview.test.ts

@@ -0,0 +1,107 @@
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+import {
+  TEST_DASHBOARD_URL,
+  TEST_PROJECT_NAME,
+  TEST_PROJECT_SLUG,
+  TEST_WORKSPACE_NAME,
+  TEST_WORKSPACE_SLUG,
+} from './env';
+
+let page: Page;
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+
+  await page.goto(TEST_DASHBOARD_URL);
+  await page.getByRole('link', { name: TEST_PROJECT_NAME }).click();
+  await page.waitForURL(
+    `${TEST_DASHBOARD_URL}/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}`,
+  );
+});
+
+test.afterAll(async () => {
+  await page.close();
+});
+
+test('should show a sidebar with menu items', async () => {
+  const navLocator = page.getByRole('navigation', { name: /main navigation/i });
+  await expect(navLocator).toBeVisible();
+  await expect(navLocator.getByRole('list').getByRole('listitem')).toHaveCount(
+    10,
+  );
+  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: /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();
+
+  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(/free plan/i)).toBeVisible();
+  await expect(page.getByRole('button', { name: /upgrade/i })).toBeVisible();
+  await expect(
+    page.getByRole('main').getByRole('link', { name: /settings/i }),
+  ).toBeVisible();
+});
+
+test("should show the project's region and subdomain", async () => {
+  await expect(page.locator('p:has-text("Region") + div p').nth(0)).toHaveText(
+    /frankfurt \(eu-central-1\)/i,
+  );
+  await expect(
+    page.locator('p:has-text("Subdomain") + div p').nth(0),
+  ).toHaveText(/[a-z]{20}/i);
+});
+
+test('should not have a GitHub repository connected', async () => {
+  await expect(
+    page.getByRole('button', { name: /connect to github/i }),
+  ).toBeVisible();
+});
+
+test('should show proper limits for the free project', async () => {
+  // Limit for Database
+  await expect(page.getByText(/of 500 MB/i)).toBeVisible();
+
+  // Limit for Storage
+  await expect(page.getByText(/of 1 GB/i)).toBeVisible();
+
+  // Limit for Users
+  await expect(page.getByText(/of 10000/i)).toBeVisible();
+
+  // Limit for Functions
+  await expect(page.getByText(/of 10$/i, { exact: true })).toBeVisible();
+});

dashboard/global-setup.ts

@@ -0,0 +1,27 @@
+import { chromium } from '@playwright/test';
+import {
+  TEST_DASHBOARD_URL,
+  TEST_USER_EMAIL,
+  TEST_USER_PASSWORD,
+} from './e2e/env';
+
+async function globalSetup() {
+  const browser = await chromium.launch();
+  const page = await browser.newPage();
+
+  await page.goto(TEST_DASHBOARD_URL);
+  await page.waitForURL(`${TEST_DASHBOARD_URL}/signin`);
+  await page.getByRole('link', { name: /continue with email/i }).click();
+
+  await page.waitForURL(`${TEST_DASHBOARD_URL}/signin/email`);
+  await page.getByLabel('Email').fill(TEST_USER_EMAIL);
+  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.context().storageState({ path: 'storageState.json' });
+
+  await browser.close();
+}
+
+export default globalSetup;

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.13.3",
+  "version": "0.13.8",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -14,7 +14,8 @@
     "nhost:dev": "nhost dev -d",
     "format": "prettier --write \"src/**/*.{js,ts,tsx,jsx,json,md}\" --plugin-search-dir=.",
     "storybook": "start-storybook -p 6006 -s public",
-    "build-storybook": "build-storybook"
+    "build-storybook": "build-storybook",
+    "e2e": "npx playwright@1.31.2 install --with-deps && playwright test"
   },
   "dependencies": {
     "@apollo/client": "^3.7.3",
@@ -29,7 +30,7 @@
     "@graphiql/toolkit": "^0.8.2",
     "@headlessui/react": "^1.6.5",
     "@heroicons/react": "^1.0.6",
-    "@hookform/resolvers": "^2.9.10",
+    "@hookform/resolvers": "^3.0.0",
     "@mui/base": "^5.0.0-alpha.106",
     "@mui/material": "^5.10.14",
     "@mui/system": "^5.10.14",
@@ -62,7 +63,7 @@
     "prettysize": "^2.0.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-error-boundary": "^3.1.4",
+    "react-error-boundary": "^4.0.0",
     "react-hook-form": "^7.42.1",
     "react-hot-toast": "^2.4.0",
     "react-is": "18.2.0",
@@ -76,7 +77,7 @@
     "tailwind-merge": "^1.8.0",
     "utility-types": "^3.10.0",
     "validator": "^13.7.0",
-    "yup": "^0.32.11",
+    "yup": "^1.0.2",
     "yup-password": "^0.2.2"
   },
   "devDependencies": {
@@ -87,6 +88,7 @@
     "@graphql-codegen/typescript-operations": "^3.0.0",
     "@graphql-codegen/typescript-react-apollo": "^3.3.1",
     "@next/bundle-analyzer": "^12.3.1",
+    "@playwright/test": "^1.31.2",
     "@storybook/addon-actions": "^6.5.14",
     "@storybook/addon-essentials": "^6.5.14",
     "@storybook/addon-interactions": "^6.5.14",
@@ -116,6 +118,7 @@
     "babel-loader": "^8.3.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "csstype": "^3.0.10",
+    "dotenv": "^16.0.3",
     "encoding": "^0.1.13",
     "eslint": "^8.28.0",
     "eslint-config-airbnb": "19.0.4",
@@ -161,4 +164,4 @@
   "msw": {
     "workerDirectory": "public"
   }
-}
+}

dashboard/playwright.config.ts

@@ -0,0 +1,64 @@
+import { defineConfig, devices } from '@playwright/test';
+
+import dotenv from 'dotenv';
+import path from 'path';
+
+dotenv.config({ path: path.resolve(__dirname, '.env.test') });
+
+export default defineConfig({
+  testDir: './e2e',
+  timeout: 30 * 1000,
+  expect: {
+    timeout: 5000,
+  },
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  globalSetup: require.resolve('./global-setup'),
+  use: {
+    actionTimeout: 0,
+    trace: 'on-first-retry',
+    storageState: 'storageState.json',
+  },
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    // {
+    //   name: 'firefox',
+    //   use: { ...devices['Desktop Firefox'] },
+    // },
+
+    // {
+    //   name: 'webkit',
+    //   use: { ...devices['Desktop Safari'] },
+    // },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { channel: 'chrome' },
+    // },
+  ],
+});

dashboard/src/components/applications/ApplicationInfo.tsx

@@ -9,28 +9,39 @@ import Link from '@/ui/v2/Link';
 import Text from '@/ui/v2/Text';
 import { copy } from '@/utils/copy';
 import { getApplicationStatusString } from '@/utils/helpers';
-import { triggerToast } from '@/utils/toast';
+import getServerError from '@/utils/settings/getServerError';
 import { formatDistance } from 'date-fns';
 import { useRouter } from 'next/router';
+import { toast } from 'react-hot-toast';
 
 export default function ApplicationInfo() {
   const { currentApplication } = useCurrentWorkspaceAndApplication();
-  const [deleteApplication, { client }] = useDeleteApplicationMutation({
+  const [deleteApplication] = useDeleteApplicationMutation({
     refetchQueries: [GetOneUserDocument],
   });
   const router = useRouter();
 
   async function handleClickRemove() {
-    await deleteApplication({
-      variables: {
-        appId: currentApplication.id,
-      },
-    });
-    await router.push('/');
-    await client.refetchQueries({
-      include: ['getOneUser'],
-    });
-    triggerToast(`${currentApplication.name} deleted`);
+    try {
+      await toast.promise(
+        deleteApplication({
+          variables: {
+            appId: currentApplication.id,
+          },
+        }),
+        {
+          loading: 'Deleting project...',
+          success: 'The project has been deleted successfully.',
+          error: getServerError(
+            'An error occurred while deleting the project. Please try again.',
+          ),
+        },
+      );
+
+      await router.push('/');
+    } catch {
+      // Note: The toast will handle the error.
+    }
   }
 
   return (

dashboard/src/components/applications/ApplicationPaused.tsx

@@ -3,54 +3,81 @@ import { ChangePlanModal } from '@/components/applications/ChangePlanModal';
 import { StagingMetadata } from '@/components/applications/StagingMetadata';
 import { useDialog } from '@/components/common/DialogProvider';
 import Container from '@/components/layout/Container';
-import { useUpdateApplicationMutation } from '@/generated/graphql';
+import {
+  GetOneUserDocument,
+  useGetFreeAndActiveProjectsQuery,
+  useUnpauseApplicationMutation,
+} from '@/generated/graphql';
 import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
-import { ApplicationStatus } from '@/types/application';
 import { Modal } from '@/ui';
+import { Alert } from '@/ui/Alert';
+import ActivityIndicator from '@/ui/v2/ActivityIndicator';
+import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';
-import { discordAnnounce } from '@/utils/discordAnnounce';
-import { triggerToast } from '@/utils/toast';
-import { updateOwnCache } from '@/utils/updateOwnCache';
+import { MAX_FREE_PROJECTS } from '@/utils/CONSTANTS';
+import { getToastStyleProps } from '@/utils/settings/settingsConstants';
+import type { ApolloError } from '@apollo/client';
 import { useUserData } from '@nhost/nextjs';
 import Image from 'next/image';
 import { useState } from 'react';
+import { toast } from 'react-hot-toast';
 import { RemoveApplicationModal } from './RemoveApplicationModal';
 
 export default function ApplicationPaused() {
   const { openAlertDialog } = useDialog();
   const { currentWorkspace, currentApplication } =
     useCurrentWorkspaceAndApplication();
-  const [changingApplicationStateLoading, setChangingApplicationStateLoading] =
-    useState(false);
-  const [updateApplication, { client }] = useUpdateApplicationMutation();
-  const { id, email } = useUserData();
+  const { id } = useUserData();
   const isOwner = currentWorkspace.members.some(
     ({ userId, type }) => userId === id && type === 'owner',
   );
-  const isPro = currentApplication.plan.name === 'Pro';
   const [showDeletingModal, setShowDeletingModal] = useState(false);
+  const [unpauseApplication, { loading: changingApplicationStateLoading }] =
+    useUnpauseApplicationMutation({
+      refetchQueries: [GetOneUserDocument],
+    });
+
+  const { data, loading } = useGetFreeAndActiveProjectsQuery({
+    variables: { userId: id },
+    fetchPolicy: 'cache-and-network',
+  });
+
+  const numberOfFreeAndLiveProjects = data?.freeAndActiveProjects.length || 0;
+  const wakeUpDisabled = numberOfFreeAndLiveProjects >= MAX_FREE_PROJECTS;
 
   async function handleTriggerUnpausing() {
-    setChangingApplicationStateLoading(true);
     try {
-      await updateApplication({
-        variables: {
-          appId: currentApplication.id,
-          app: {
-            desiredState: ApplicationStatus.Live,
+      await toast.promise(
+        unpauseApplication({ variables: { appId: currentApplication.id } }),
+        {
+          loading: 'Starting the project...',
+          success: `The project has been started successfully.`,
+          error: (arg: ApolloError) => {
+            // we need to get the internal error message from the GraphQL error
+            const { internal } = arg.graphQLErrors[0]?.extensions || {};
+            const { message } = (internal as Record<string, any>)?.error || {};
+
+            // we use the default Apollo error message if we can't find the
+            // internal error message
+            return (
+              message ||
+              arg.message ||
+              'An error occurred while waking up the project. Please try again.'
+            );
           },
         },
-      });
-      await updateOwnCache(client);
-      discordAnnounce(
-        `App ${currentApplication.name} (${email}) set to awake.`,
+        getToastStyleProps(),
       );
-      triggerToast(`${currentApplication.name} set to awake.`);
-    } catch (e) {
-      triggerToast(`Error trying to awake ${currentApplication.name}`);
+    } catch {
+      // Note: The toast will handle the error.
     }
   }
+
+  if (loading) {
+    return <ActivityIndicator label="Loading user data..." delay={1000} />;
+  }
+
   return (
     <>
       <Modal
@@ -65,7 +92,7 @@ export default function ApplicationPaused() {
         />
       </Modal>
 
-      <Container className="mx-auto mt-20 grid max-w-sm grid-flow-row gap-2 text-center">
+      <Container className="mx-auto mt-20 grid max-w-lg grid-flow-row gap-4 text-center">
         <div className="mx-auto flex w-centImage flex-col text-center">
           <Image
             src="/assets/PausedApp.svg"
@@ -75,16 +102,18 @@ export default function ApplicationPaused() {
           />
         </div>
 
-        <Text variant="h3" component="h1" className="mt-4">
-          {currentApplication.name} is sleeping
-        </Text>
+        <Box className="grid grid-flow-row gap-1">
+          <Text variant="h3" component="h1">
+            {currentApplication.name} is sleeping
+          </Text>
 
-        <Text className="mt-1">
-          Projects on the free plan stop responding to API calls after 7 days of
-          no traffic.
-        </Text>
+          <Text>
+            Starter projects stop responding to API calls after 7 days of
+            inactivity. Upgrade to Pro to avoid autosleep.
+          </Text>
+        </Box>
 
-        {!isPro && (
+        <Box className="grid grid-flow-row gap-2">
           <Button
             className="mx-auto w-full max-w-[280px]"
             onClick={() => {
@@ -101,32 +130,41 @@ export default function ApplicationPaused() {
               });
             }}
           >
-            Upgrade to Pro to avoid autosleep
-          </Button>
-        )}
-
-        <div className="grid grid-flow-row gap-2">
-          <Button
-            variant="borderless"
-            className="mx-auto w-full max-w-[280px]"
-            loading={changingApplicationStateLoading}
-            disabled={changingApplicationStateLoading}
-            onClick={handleTriggerUnpausing}
-          >
-            Wake Up
+            Upgrade to Pro
           </Button>
 
-          {isOwner && (
+          <div className="grid grid-flow-row gap-2">
             <Button
-              color="error"
               variant="borderless"
               className="mx-auto w-full max-w-[280px]"
-              onClick={() => setShowDeletingModal(true)}
+              loading={changingApplicationStateLoading}
+              disabled={changingApplicationStateLoading || wakeUpDisabled}
+              onClick={handleTriggerUnpausing}
             >
-              Delete Project
+              Wake Up
             </Button>
-          )}
-        </div>
+
+            {wakeUpDisabled && (
+              <Alert severity="warning" className="mx-auto max-w-xs text-left">
+                Note: Only one free project can be active at any given time.
+                Please pause your active free project before unpausing{' '}
+                {currentApplication.name}.
+              </Alert>
+            )}
+
+            {isOwner && (
+              <Button
+                color="error"
+                variant="borderless"
+                className="mx-auto w-full max-w-[280px]"
+                onClick={() => setShowDeletingModal(true)}
+              >
+                Delete Project
+              </Button>
+            )}
+          </div>
+        </Box>
+
         <StagingMetadata>
           <ApplicationInfo />
         </StagingMetadata>

dashboard/src/components/applications/RemoveApplicationModal.tsx

@@ -6,7 +6,10 @@ import Divider from '@/ui/v2/Divider';
 import Text from '@/ui/v2/Text';
 import { discordAnnounce } from '@/utils/discordAnnounce';
 import { triggerToast } from '@/utils/toast';
-import { useDeleteApplicationMutation } from '@/utils/__generated__/graphql';
+import {
+  GetOneUserDocument,
+  useDeleteApplicationMutation,
+} from '@/utils/__generated__/graphql';
 import router from 'next/router';
 import { useState } from 'react';
 import { twMerge } from 'tailwind-merge';
@@ -42,7 +45,9 @@ export function RemoveApplicationModal({
   description,
   className,
 }: RemoveApplicationModalProps) {
-  const [deleteApplication, { client }] = useDeleteApplicationMutation();
+  const [deleteApplication] = useDeleteApplicationMutation({
+    refetchQueries: [GetOneUserDocument],
+  });
   const [loadingRemove, setLoadingRemove] = useState(false);
   const { currentApplication } = useCurrentWorkspaceAndApplication();
 
@@ -73,9 +78,6 @@ export function RemoveApplicationModal({
     }
     close();
     await router.push('/');
-    await client.refetchQueries({
-      include: ['getOneUser'],
-    });
     triggerToast(`${currentApplication.name} deleted`);
   }
 

dashboard/src/components/applications/RenderWorkspacesWithApps.tsx

@@ -111,9 +111,8 @@ export function RenderWorkspacesWithApps({
                             )}
 
                             <StateBadge
-                              status={checkStatusOfTheApplication(
-                                app.appStates,
-                              )}
+                              state={checkStatusOfTheApplication(app.appStates)}
+                              desiredState={app.desiredState}
                               title={getApplicationStatusString(
                                 checkStatusOfTheApplication(app.appStates),
                               )}

dashboard/src/components/applications/StagingMetadata.tsx

@@ -6,7 +6,7 @@ import type { PropsWithChildren } from 'react';
 export function StagingMetadata({ children }: PropsWithChildren<unknown>) {
   return (
     isDevOrStaging() && (
-      <div className="mt-10">
+      <div className="mx-auto mt-10 max-w-sm">
         <Box className="mx-auto flex flex-col rounded-md border p-5 text-center">
           <Status status={StatusEnum.Deploying}>Internal info</Status>
           {children}

dashboard/src/components/billing-payment-method/BillingPaymentMethodForm.tsx

@@ -76,7 +76,8 @@ function AddPaymentMethodForm({
 
       if (createPaymentMethodError) {
         throw new Error(
-          createPaymentMethodError.message || 'Unknown error occurred.',
+          createPaymentMethodError.message ||
+            'An unknown error occurred. Please try again.',
         );
       }
 
@@ -90,7 +91,10 @@ function AddPaymentMethodForm({
       );
 
       if (attachPaymentMethodError) {
-        throw Error((attachPaymentMethodError as any).response.data);
+        throw new Error(
+          (attachPaymentMethodError as any)?.response?.data ||
+            'An unknown error occurred. Please try again.',
+        );
       }
 
       // update workspace with new country code in database
@@ -151,7 +155,7 @@ function AddPaymentMethodForm({
   };
 
   return (
-    <Box className="w-modal2 px-6 pt-6 pb-6 text-left rounded-lg">
+    <Box className="w-modal2 rounded-lg px-6 pt-6 pb-6 text-left">
       <div className="flex flex-col">
         <form onSubmit={handleSubmit}>
           <Text className="text-center text-lg font-medium">
@@ -203,7 +207,7 @@ function AddPaymentMethodForm({
 
 type BillingPaymentMethodFormProps = {
   close: () => void;
-  onPaymentMethodAdded?: () => Promise<void>;
+  onPaymentMethodAdded?: (e?: any) => Promise<void>;
   workspaceId: string;
 };
 

dashboard/src/components/common/DataGridDateCell/DataGridDateCell.tsx

@@ -46,7 +46,7 @@ export default function DataGridDateCell<TData extends object>({
       : undefined;
 
   const { year, month, day, hour, minute, second } = getDateComponents(date, {
-    adjustTimezone: specificType === 'timetz' || specificType === 'timestamptz',
+    adjustTimezone: ['date', 'timetz', 'timestamptz'].includes(specificType),
   });
 
   const { inputRef, focusCell, isEditing, cancelEditCell } =

dashboard/src/components/dataBrowser/EditPermissionsForm/validationSchemas.ts

@@ -39,17 +39,17 @@ const ruleGroupSchema = Yup.object().shape({
 
 const baseValidationSchema = Yup.object().shape({
   filter: ruleGroupSchema.nullable().required('Please select a filter type.'),
-  columns: Yup.array().of(Yup.string()).nullable(true),
+  columns: Yup.array().of(Yup.string()).nullable(),
 });
 
 const selectValidationSchema = baseValidationSchema.shape({
   limit: Yup.number()
     .label('Limit')
     .min(0, 'Limit must not be negative.')
-    .nullable(true),
-  allowAggregations: Yup.boolean().nullable(true),
-  queryRootFields: Yup.array().of(Yup.string()).nullable(true),
-  subscriptionRootFields: Yup.array().of(Yup.string()).nullable(true),
+    .nullable(),
+  allowAggregations: Yup.boolean().nullable(),
+  queryRootFields: Yup.array().of(Yup.string()).nullable(),
+  subscriptionRootFields: Yup.array().of(Yup.string()).nullable(),
 });
 
 const columnPresetSchema = Yup.object().shape({
@@ -88,17 +88,17 @@ const columnPresetSchema = Yup.object().shape({
 });
 
 const insertValidationSchema = baseValidationSchema.shape({
-  backendOnly: Yup.boolean().nullable(true),
-  columnPresets: Yup.array().of(columnPresetSchema).nullable(true),
+  backendOnly: Yup.boolean().nullable(),
+  columnPresets: Yup.array().of(columnPresetSchema).nullable(),
 });
 
 const updateValidationSchema = baseValidationSchema.shape({
-  backendOnly: Yup.boolean().nullable(true),
-  columnPresets: Yup.array().of(columnPresetSchema).nullable(true),
+  backendOnly: Yup.boolean().nullable(),
+  columnPresets: Yup.array().of(columnPresetSchema).nullable(),
 });
 
 const deleteValidationSchema = baseValidationSchema.shape({
-  columnPresets: Yup.array().of(columnPresetSchema).nullable(true),
+  columnPresets: Yup.array().of(columnPresetSchema).nullable(),
 });
 
 const validationSchemas: Record<DatabaseAction, Yup.ObjectSchema<any>> = {

dashboard/src/components/settings/authentication/DisableNewUsersSettings/DisableNewUsersSettings.tsx

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

dashboard/src/components/settings/signInMethods/AppleProviderSettings/AppleProviderSettings.tsx

@@ -24,22 +24,30 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  teamId: Yup.string().label('Team ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  keyId: Yup.string().label('Key ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  clientId: Yup.string().label('Client ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  privateKey: Yup.string().label('Private Key').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  teamId: Yup.string()
+    .label('Team ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  keyId: Yup.string()
+    .label('Key ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  clientId: Yup.string()
+    .label('Client ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  privateKey: Yup.string()
+    .label('Private Key')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   enabled: Yup.boolean(),
 });
 

dashboard/src/components/settings/signInMethods/BaseProviderSettings/BaseProviderSettings.tsx

@@ -3,14 +3,18 @@ import { useFormContext } from 'react-hook-form';
 import * as Yup from 'yup';
 
 export const baseProviderValidationSchema = Yup.object({
-  clientId: Yup.string().label('Client ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  clientSecret: Yup.string().label('Client Secret').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  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(),
+    }),
   enabled: Yup.bool(),
 });
 

dashboard/src/components/settings/signInMethods/SMSSettings/SMSSettings.tsx

@@ -22,19 +22,23 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  accountSid: Yup.string().label('Account SID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  authToken: Yup.string().label('Auth Token').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  accountSid: Yup.string()
+    .label('Account SID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  authToken: Yup.string()
+    .label('Auth Token')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   messagingServiceId: Yup.string()
     .label('Messaging Service ID')
     .when('enabled', {
       is: true,
-      then: Yup.string().required(),
+      then: (schema) => schema.required(),
     }),
   enabled: Yup.boolean().label('Enabled'),
 });

dashboard/src/components/settings/signInMethods/TwitterProviderSettings/TwitterProviderSettings.tsx

@@ -23,14 +23,18 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  consumerSecret: Yup.string().label('Consumer Secret').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  consumerKey: Yup.string().label('Consumer Key').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  consumerSecret: Yup.string()
+    .label('Consumer Secret')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  consumerKey: Yup.string()
+    .label('Consumer Key')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   enabled: Yup.boolean(),
 });
 

dashboard/src/components/settings/signInMethods/WorkOsProviderSettings/WorkOsProviderSettings.tsx

@@ -24,22 +24,30 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  clientId: Yup.string().label('Client ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  clientSecret: Yup.string().label('Client Secret').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  organization: Yup.string().label('Organization').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  connection: Yup.string().label('Connection').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  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(),
+    }),
+  organization: Yup.string()
+    .label('Organization')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  connection: Yup.string()
+    .label('Connection')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   enabled: Yup.boolean(),
 });
 

dashboard/src/components/ui/StateBadge.tsx

@@ -5,7 +5,11 @@ export interface StateBadgeProps {
   /**
    * This is the current state of the application.
    */
-  status: ApplicationStatus;
+  state: ApplicationStatus;
+  /**
+   * This is the desired state of the application.
+   */
+  desiredState: ApplicationStatus;
   /**
    * The title to show on the application state badge.
    */
@@ -24,20 +28,28 @@ function getNormalizedTitle(title: string) {
   return title;
 }
 
-export default function StateBadge({ title, status }: StateBadgeProps) {
+export default function StateBadge({
+  title,
+  state,
+  desiredState,
+}: StateBadgeProps) {
+  if (
+    desiredState === ApplicationStatus.Paused &&
+    state === ApplicationStatus.Live
+  ) {
+    return <Chip size="small" color="default" label="Pausing" />;
+  }
+
   const normalizedTitle = getNormalizedTitle(title);
 
   if (
-    status === ApplicationStatus.Empty ||
-    status === ApplicationStatus.Unpausing
+    state === ApplicationStatus.Empty ||
+    state === ApplicationStatus.Unpausing
   ) {
     return <Chip size="small" label={normalizedTitle} color="warning" />;
   }
 
-  if (
-    status === ApplicationStatus.Errored ||
-    status === ApplicationStatus.Live
-  ) {
+  if (state === ApplicationStatus.Errored || state === ApplicationStatus.Live) {
     return <Chip size="small" label={normalizedTitle} color="success" />;
   }
 

dashboard/src/components/ui/v2/Radio/Radio.tsx

@@ -6,7 +6,7 @@ import SvgIcon from '@/ui/v2/icons/SvgIcon';
 import { styled } from '@mui/material';
 import type { RadioProps as MaterialRadioProps } from '@mui/material/Radio';
 import MaterialRadio from '@mui/material/Radio';
-import type { ForwardedRef, PropsWithoutRef } from 'react';
+import type { ForwardedRef, PropsWithoutRef, ReactNode } from 'react';
 import { forwardRef } from 'react';
 
 export interface RadioProps extends MaterialRadioProps {
@@ -17,7 +17,7 @@ export interface RadioProps extends MaterialRadioProps {
   /**
    * Label to be displayed next to the radio button.
    */
-  label?: string;
+  label?: ReactNode;
   /**
    * Props to be passed to individual component slots.
    */

dashboard/src/components/ui/v2/Tooltip/Tooltip.tsx

@@ -1,7 +1,9 @@
 import { styled } from '@mui/material';
 import Box from '@mui/material/Box';
 import type { TooltipProps as MaterialTooltipProps } from '@mui/material/Tooltip';
-import MaterialTooltip, { tooltipClasses } from '@mui/material/Tooltip';
+import MaterialTooltip, {
+  tooltipClasses as materialTooltipClasses,
+} from '@mui/material/Tooltip';
 import type { ForwardedRef } from 'react';
 import { forwardRef } from 'react';
 
@@ -21,7 +23,7 @@ export interface TooltipProps extends MaterialTooltipProps {
 }
 
 const StyledTooltip = styled(Box)(({ theme }) => ({
-  [`&.${tooltipClasses.tooltip}`]: {
+  [`&.${materialTooltipClasses.tooltip}`]: {
     fontSize: '0.9375rem',
     lineHeight: '1.375rem',
     backgroundColor:
@@ -36,9 +38,23 @@ const StyledTooltip = styled(Box)(({ theme }) => ({
       '0px 1px 4px rgba(14, 24, 39, 0.1), 0px 8px 24px rgba(14, 24, 39, 0.1)',
     maxWidth: '17.5rem',
   },
-  [`&.${tooltipClasses.tooltipPlacementBottom}`]: {
+  [`& .${materialTooltipClasses.arrow}`]: {
+    color:
+      theme.palette.mode === 'dark'
+        ? theme.palette.grey[300]
+        : theme.palette.grey[700],
+  },
+  [`&.${materialTooltipClasses.tooltipPlacementBottom}`]: {
     marginTop: `${theme.spacing(0.75)} !important`,
   },
+  [`&.${materialTooltipClasses.tooltipPlacementBottom} .${materialTooltipClasses.arrow}`]:
+    {
+      marginTop: `${theme.spacing(-0.5)} !important`,
+      color:
+        theme.palette.mode === 'dark'
+          ? theme.palette.grey[300]
+          : theme.palette.grey[700],
+    },
 }));
 
 function Tooltip(
@@ -69,6 +85,8 @@ function Tooltip(
   );
 }
 
+export { materialTooltipClasses as tooltipClasses };
+
 Tooltip.displayName = 'NhostTooltip';
 
 export default forwardRef(Tooltip);

dashboard/src/components/users/CreateUserForm/CreateUserForm.tsx

@@ -165,7 +165,7 @@ export default function CreateUserForm({
           </Alert>
         )}
         <div className="grid grid-flow-row gap-2">
-          <Button type="submit" loading={isSubmitting} disabled={isSubmitting}>
+          <Button type="submit" disabled={isSubmitting}>
             Create
           </Button>
 

dashboard/src/components/users/UsersBody/UsersBody.tsx

@@ -242,7 +242,11 @@ export default function UsersBody({ users, onSubmit }: UsersBodyProps) {
             secondaryAction={
               <Dropdown.Root>
                 <Dropdown.Trigger asChild hideChevron>
-                  <IconButton variant="borderless" color="secondary">
+                  <IconButton
+                    variant="borderless"
+                    color="secondary"
+                    aria-label={`More options for ${user.displayName}`}
+                  >
                     <DotsHorizontalIcon />
                   </IconButton>
                 </Dropdown.Trigger>
@@ -282,6 +286,7 @@ export default function UsersBody({ users, onSubmit }: UsersBodyProps) {
             <ListItem.Button
               className="grid h-full w-full grid-cols-1 py-2.5 lg:grid-cols-6"
               onClick={() => handleViewUser(user)}
+              aria-label={`View ${user.displayName}`}
             >
               <div className="col-span-2 grid grid-flow-col place-content-start gap-4">
                 <Avatar

dashboard/src/gql/app/pauseApplication.graphql

@@ -0,0 +1,5 @@
+mutation PauseApplication($appId: uuid!) {
+  updateApp(pk_columns: { id: $appId }, _set: { desiredState: 6 }) {
+    id
+  }
+}

dashboard/src/gql/app/unpauseApplication.graphql

@@ -0,0 +1,5 @@
+mutation UnpauseApplication($appId: uuid!) {
+  updateApp(pk_columns: { id: $appId }, _set: { desiredState: 5 }) {
+    id
+  }
+}

dashboard/src/gql/user/getFreeAndActiveProjects.graphql

@@ -0,0 +1,11 @@
+query GetFreeAndActiveProjects($userId: uuid!) {
+  freeAndActiveProjects: apps(
+    where: {
+      creatorUserId: { _eq: $userId }
+      plan: { isFree: { _eq: true } }
+      desiredState: { _eq: 5 }
+    }
+  ) {
+    id
+  }
+}

dashboard/src/hooks/useNotFoundRedirect.tsx

@@ -11,7 +11,7 @@ export default function useNotFoundRedirect() {
   const router = useRouter();
   const {
     query: { workspaceSlug, appSlug, updating },
-  } = useRouter();
+  } = router;
 
   const notIn404Already = router.pathname !== '/404';
   const noResolvedWorkspace = workspaceSlug && currentWorkspace === undefined;

dashboard/src/pages/[workspaceSlug]/[appSlug]/settings/general/index.tsx

@@ -8,7 +8,8 @@ import { useUI } from '@/context/UIContext';
 import {
   GetOneUserDocument,
   useDeleteApplicationMutation,
-  useUpdateAppMutation,
+  usePauseApplicationMutation,
+  useUpdateApplicationMutation,
 } from '@/generated/graphql';
 import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
 import Input from '@/ui/v2/Input';
@@ -37,9 +38,13 @@ export type ProjectNameValidationSchema = Yup.InferType<
 
 export default function SettingsGeneralPage() {
   const { currentApplication } = useCurrentWorkspaceAndApplication();
-  const { openDialog, closeDialog } = useDialog();
-  const [updateApp] = useUpdateAppMutation();
+  const { openDialog, openAlertDialog, closeDialog } = useDialog();
+  const [updateApp] = useUpdateApplicationMutation();
   const client = useApolloClient();
+  const [pauseApplication] = usePauseApplicationMutation({
+    variables: { appId: currentApplication?.id },
+    refetchQueries: [GetOneUserDocument],
+  });
   const [deleteApplication] = useDeleteApplicationMutation({
     variables: { appId: currentApplication?.id },
     refetchQueries: [GetOneUserDocument],
@@ -61,7 +66,7 @@ export default function SettingsGeneralPage() {
 
   const { register, formState } = form;
 
-  const handleProjectNameChange = async (data: ProjectNameValidationSchema) => {
+  async function handleProjectNameChange(data: ProjectNameValidationSchema) {
     // In this bit of code we spread the props of the current path (e.g. /workspace/...) and add one key-value pair: `updating: true`.
     // We want to indicate that the currently we're in the process of running a mutation state that will affect the routing behaviour of the website
     // i.e. redirecting to 404 if there's no workspace/project with that slug.
@@ -83,7 +88,7 @@ export default function SettingsGeneralPage() {
 
     const updateAppMutation = updateApp({
       variables: {
-        id: currentApplication.id,
+        appId: currentApplication.id,
         app: {
           name: data.name,
           slug: newProjectSlug,
@@ -108,34 +113,50 @@ export default function SettingsGeneralPage() {
     }
 
     try {
-      await client.refetchQueries({
-        include: ['getOneUser'],
-      });
       form.reset(undefined, { keepValues: true, keepDirty: false });
       await router.push(
         `/${currentWorkspace.slug}/${newProjectSlug}/settings/general`,
       );
+      await client.refetchQueries({ include: [GetOneUserDocument] });
     } catch (error) {
       await discordAnnounce(
-        error.message || 'Error while trying to update application cache',
+        error.message ||
+          'An error occurred while trying to update application cache.',
       );
     }
-  };
+  }
 
-  const handleDeleteApplication = async () => {
+  async function handleDeleteApplication() {
     await toast.promise(
       deleteApplication(),
       {
         loading: `Deleting ${currentApplication.name}...`,
-        success: `${currentApplication.name} deleted`,
+        success: `${currentApplication.name} has been deleted successfully.`,
         error: getServerError(
-          `Error while trying to ${currentApplication.name} project name`,
+          `An error occurred while trying to delete the project "${currentApplication.name}". Please try again.`,
         ),
       },
       getToastStyleProps(),
     );
+
     await router.push('/');
-  };
+  }
+
+  async function handlePauseApplication() {
+    await toast.promise(
+      pauseApplication(),
+      {
+        loading: `Pausing ${currentApplication.name}...`,
+        success: `${currentApplication.name} will be paused, but please note that it may take some time to complete the process.`,
+        error: getServerError(
+          `An error occurred while trying to pause the project "${currentApplication.name}". Please try again.`,
+        ),
+      },
+      getToastStyleProps(),
+    );
+
+    await router.push('/');
+  }
 
   return (
     <Container
@@ -171,6 +192,32 @@ export default function SettingsGeneralPage() {
         </Form>
       </FormProvider>
 
+      {currentApplication.plan.isFree && (
+        <SettingsContainer
+          title="Pause Project"
+          description="While your project is paused, it will not be accessible. You can wake it up anytime after."
+          submitButtonText="Pause"
+          slotProps={{
+            submitButton: {
+              type: 'button',
+              color: 'primary',
+              variant: 'contained',
+              disabled: maintenanceActive,
+              onClick: () => {
+                openAlertDialog({
+                  title: 'Pause Project?',
+                  payload:
+                    'Are you sure you want to pause this project? It will not be accessible until you unpause it.',
+                  props: {
+                    onPrimaryAction: handlePauseApplication,
+                  },
+                });
+              },
+            },
+          }}
+        />
+      )}
+
       <SettingsContainer
         title="Delete Project"
         description="The project will be permanently deleted, including its database, metadata, files, etc. This action is irreversible and can not be undone."

dashboard/src/pages/new.tsx

@@ -11,23 +11,25 @@ import { Modal } from '@/ui/Modal';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
-import Checkbox from '@/ui/v2/Checkbox';
 import IconButton from '@/ui/v2/IconButton';
 import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
 import Option from '@/ui/v2/Option';
+import Radio from '@/ui/v2/Radio';
+import RadioGroup from '@/ui/v2/RadioGroup';
 import Select from '@/ui/v2/Select';
 import type { TextProps } from '@/ui/v2/Text';
 import Text from '@/ui/v2/Text';
+import Tooltip from '@/ui/v2/Tooltip';
+import { MAX_FREE_PROJECTS } from '@/utils/CONSTANTS';
 import { copy } from '@/utils/copy';
-import { discordAnnounce } from '@/utils/discordAnnounce';
 import { getErrorMessage } from '@/utils/getErrorMessage';
-import { getCurrentEnvironment, slugifyString } from '@/utils/helpers';
-import { nhost } from '@/utils/nhost';
+import { getCurrentEnvironment } from '@/utils/helpers';
 import { planDescriptions } from '@/utils/planDescriptions';
 import generateRandomDatabasePassword from '@/utils/settings/generateRandomDatabasePassword';
 import { resetDatabasePasswordValidationSchema } from '@/utils/settings/resetDatabasePasswordValidationSchema';
+import { getToastStyleProps } from '@/utils/settings/settingsConstants';
 import { triggerToast } from '@/utils/toast';
 import type {
   PrefetchNewAppPlansFragment,
@@ -35,19 +37,25 @@ import type {
   PrefetchNewAppWorkspaceFragment,
 } from '@/utils/__generated__/graphql';
 import {
+  useGetFreeAndActiveProjectsQuery,
   useInsertApplicationMutation,
   usePrefetchNewAppQuery,
 } from '@/utils/__generated__/graphql';
+import type { ApolloError } from '@apollo/client';
+import { useUserData } from '@nhost/nextjs';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
 import type { ReactElement } from 'react';
 import { cloneElement, isValidElement, useState } from 'react';
+import { toast } from 'react-hot-toast';
+import slugify from 'slugify';
 import { twMerge } from 'tailwind-merge';
 
 type NewAppPageProps = {
   regions: PrefetchNewAppRegionsFragment[];
   plans: PrefetchNewAppPlansFragment[];
   workspaces: PrefetchNewAppWorkspaceFragment[];
+  numberOfFreeAndLiveProjects: number;
   preSelectedWorkspace: PrefetchNewAppWorkspaceFragment;
   preSelectedRegion: PrefetchNewAppRegionsFragment;
 };
@@ -56,6 +64,7 @@ export function NewProjectPageContent({
   regions,
   plans,
   workspaces,
+  numberOfFreeAndLiveProjects,
   preSelectedWorkspace,
   preSelectedRegion,
 }: NewAppPageProps) {
@@ -86,15 +95,23 @@ export function NewProjectPageContent({
     generateRandomDatabasePassword(),
   );
 
-  const [plan, setPlan] = useState(plans[0]);
+  // find the first acceptable plan as default plan
+  const defaultSelectedPlan = plans.find((plan) => {
+    if (!plan.isFree) {
+      return true;
+    }
+    return numberOfFreeAndLiveProjects < MAX_FREE_PROJECTS;
+  });
+
+  const [plan, setPlan] = useState(defaultSelectedPlan);
 
   // state
   const { submitState, setSubmitState } = useSubmitState();
-  const [applicationError, setApplicationError] = useState<any>('');
   const [showPaymentModal, setShowPaymentModal] = useState(false);
 
   // graphql mutations
-  const [insertApp] = useInsertApplicationMutation();
+
+  const [insertApp] = useInsertApplicationMutation({});
   const { refetchUserData } = useLazyRefetchUserData();
 
   // options
@@ -119,8 +136,6 @@ export function NewProjectPageContent({
     (availableWorkspace) => availableWorkspace.id === selectedWorkspace.id,
   );
 
-  const user = nhost.auth.getUser();
-
   const isK8SPostgresEnabledInCurrentEnvironment = features[
     'k8s-postgres'
   ].enabled.find((e) => e === getCurrentEnvironment());
@@ -133,30 +148,24 @@ export function NewProjectPageContent({
     setDatabasePassword(newRandomDatabasePassword);
   };
 
-  const handleSubmit = async () => {
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+
+    if (!plan.isFree && workspace.paymentMethods.length === 0) {
+      setShowPaymentModal(true);
+      return;
+    }
+
     setSubmitState({
       error: null,
       loading: true,
     });
 
     if (name.length < 1 || name.length > 32) {
-      setApplicationError(
-        `The project name must be between 1 and 32 characters`,
-      );
       setSubmitState({
-        error: null,
+        error: Error('The project name must be between 1 and 32 characters'),
         loading: false,
       });
-    }
-
-    const slug = slugifyString(name);
-
-    if (slug.length < 1 || slug.length > 32) {
-      setSubmitState({
-        error: Error('The project slug must be between 1 and 32 characters.'),
-        loading: false,
-      });
-
       return;
     }
 
@@ -173,14 +182,11 @@ export function NewProjectPageContent({
       }
     }
 
-    // NOTE: Maybe we'll reintroduce this way of creating the subdomain in the future
-    // https://www.rfc-editor.org/rfc/rfc1034#section-3.1
-    // subdomain max length is 63 characters
-    // const subdomain = `${slug}-${workspaceSlug}`.substring(0, 63);
+    const slug = slugify(name, { lower: true, strict: true });
 
     try {
-      if (isK8SPostgresEnabledInCurrentEnvironment) {
-        await insertApp({
+      await toast.promise(
+        insertApp({
           variables: {
             app: {
               name,
@@ -188,37 +194,40 @@ export function NewProjectPageContent({
               planId: plan.id,
               workspaceId: selectedWorkspace.id,
               regionId: selectedRegion.id,
-              postgresPassword: databasePassword,
+              postgresPassword: isK8SPostgresEnabledInCurrentEnvironment
+                ? databasePassword
+                : undefined,
             },
           },
-        });
-      } else {
-        await insertApp({
-          variables: {
-            app: {
-              name,
-              slug,
-              planId: plan.id,
-              workspaceId: selectedWorkspace.id,
-              regionId: selectedRegion.id,
-            },
-          },
-        });
-      }
+        }),
+        {
+          loading: 'Creating the project...',
+          success: 'The project has been created successfully.',
+          error: (arg: ApolloError) => {
+            // we need to get the internal error message from the GraphQL error
+            const { internal } = arg.graphQLErrors[0]?.extensions || {};
+            const { message } = (internal as Record<string, any>)?.error || {};
 
-      triggerToast(`New project ${name} created`);
-    } catch (error) {
-      discordAnnounce(
-        `Error creating project: ${error.message}. (${user.email})`,
+            // we use the default Apollo error message if we can't find the
+            // internal error message
+            return (
+              message ||
+              arg.message ||
+              'An error occurred while creating the project. Please try again.'
+            );
+          },
+        },
+        getToastStyleProps(),
       );
+
+      await refetchUserData();
+      await router.push(`/${selectedWorkspace.slug}/${slug}`);
+    } catch (error) {
       setSubmitState({
-        error: Error(getErrorMessage(error, 'application')),
+        error: null,
         loading: false,
       });
     }
-
-    await refetchUserData();
-    router.push(`/${selectedWorkspace.slug}/${slug}`);
   };
 
   if (!selectedWorkspace) {
@@ -243,383 +252,376 @@ export function NewProjectPageContent({
 
   return (
     <Container>
-      <div className="mx-auto grid max-w-[760px] grid-flow-row gap-4 py-6 sm:py-14">
-        <Text variant="h2" component="h1">
-          New Project
-        </Text>
+      <form onSubmit={handleSubmit}>
+        <div className="mx-auto grid max-w-[760px] grid-flow-row gap-4 py-6 sm:py-14">
+          <Text variant="h2" component="h1">
+            New Project
+          </Text>
 
-        <div className="grid grid-flow-row gap-4">
-          <Input
-            id="name"
-            autoComplete="off"
-            label="Project Name"
-            variant="inline"
-            fullWidth
-            hideEmptyHelperText
-            placeholder="Project Name"
-            onChange={(event) => {
-              setSubmitState({
-                error: null,
-                loading: false,
-              });
-              setApplicationError('');
-              setName(event.target.value);
-            }}
-            value={name}
-            autoFocus
-          />
-
-          <Select
-            id="workspace"
-            label="Workspace"
-            variant="inline"
-            hideEmptyHelperText
-            placeholder="Select Workspace"
-            slotProps={{
-              root: { className: 'grid grid-flow-col gap-1' },
-            }}
-            onChange={(_event, value) => {
-              const workspaceInList = workspaces.find(({ id }) => id === value);
-              setPlan(plans[0]);
-              setSelectedWorkspace({
-                id: workspaceInList.id,
-                name: workspaceInList.name,
-                disabled: false,
-                slug: workspaceInList.slug,
-              });
-            }}
-            value={selectedWorkspace.id}
-            renderValue={(option) => (
-              <span className="inline-grid grid-flow-col items-center gap-2">
-                {option?.label}
-              </span>
-            )}
-          >
-            {workspaceOptions.map((option) => (
-              <Option
-                value={option.id}
-                key={option.id}
-                className="grid grid-flow-col items-center gap-2"
-              >
-                <span className="inline-block h-6 w-6 overflow-hidden rounded-md">
-                  <Image
-                    src="/logos/new.svg"
-                    alt="Nhost Logo"
-                    width={24}
-                    height={24}
-                  />
-                </span>
-
-                {option.name}
-              </Option>
-            ))}
-          </Select>
-
-          {isK8SPostgresEnabledInCurrentEnvironment && (
+          <div className="grid grid-flow-row gap-4">
             <Input
-              name="databasePassword"
-              id="databasePassword"
-              autoComplete="new-password"
-              label="Database Password"
-              value={databasePassword}
+              id="name"
+              autoComplete="off"
+              label="Project Name"
               variant="inline"
-              type="password"
-              error={!!passwordError}
+              fullWidth
               hideEmptyHelperText
-              endAdornment={
-                <InputAdornment position="end" className="mr-2">
-                  <IconButton
-                    color="secondary"
-                    onClick={() => {
-                      copy(databasePassword, 'Postgres password');
-                    }}
-                    variant="borderless"
-                    aria-label="Copy password"
-                  >
-                    <CopyIcon className="h-4 w-4" />
-                  </IconButton>
-                </InputAdornment>
-              }
-              slotProps={{
-                // Note: this is supposed to fix a `validateDOMNesting` error
-                helperText: { component: 'div' },
-              }}
-              helperText={
-                <div className="grid max-w-xs grid-flow-row gap-2">
-                  {passwordError && (
-                    <Text
-                      variant="subtitle2"
-                      sx={{
-                        color: (theme) =>
-                          `${theme.palette.error.main} !important`,
-                      }}
-                    >
-                      {passwordError}
-                    </Text>
-                  )}
-
-                  <Box className="font-medium">
-                    The root Postgres password for your database - it must be
-                    strong and hard to guess.{' '}
-                    <Button
-                      type="button"
-                      variant="borderless"
-                      color="secondary"
-                      onClick={handleGenerateRandomPassword}
-                      className="px-1 py-0.5 text-xs underline underline-offset-2 hover:underline"
-                      tabIndex={-1}
-                    >
-                      Generate a password
-                    </Button>
-                  </Box>
-                </div>
-              }
-              onChange={async (e) => {
-                e.preventDefault();
+              placeholder="Project Name"
+              onChange={(event) => {
                 setSubmitState({
                   error: null,
                   loading: false,
                 });
-                if (e.target.value.length === 0) {
-                  setDatabasePassword(e.target.value);
-                  setPasswordError('Please enter a password');
-
-                  return;
-                }
-                setDatabasePassword(e.target.value);
-                setPasswordError('');
-                try {
-                  await resetDatabasePasswordValidationSchema.validate({
-                    databasePassword: e.target.value,
-                  });
-                  setPasswordError('');
-                } catch (validationError) {
-                  setPasswordError(validationError.message);
-                }
+                setName(event.target.value);
               }}
-              fullWidth
+              value={name}
+              autoFocus
             />
-          )}
 
-          <Select
-            id="region"
-            label="Region"
-            variant="inline"
-            hideEmptyHelperText
-            placeholder="Select Region"
-            slotProps={{
-              root: { className: 'grid grid-flow-col gap-1' },
-            }}
-            onChange={(_event, value) => {
-              const regionInList = regions.find(({ id }) => id === value);
-              setPlan(plans[0]);
-              setSelectedRegion({
-                id: regionInList.id,
-                name: regionInList.country.name,
-                disabled: false,
-                code: regionInList.country.code,
-              });
-            }}
-            value={selectedRegion.id}
-            renderValue={(option) => {
-              const [flag, , country] = (option?.label as any[]) || [];
-
-              return (
-                <span className="inline-grid grid-flow-col grid-rows-none items-center gap-x-2">
-                  {flag}
-
-                  {isValidElement<TextProps>(country)
-                    ? cloneElement(country, {
-                        ...country.props,
-                        variant: 'body1',
-                      })
-                    : null}
-                </span>
-              );
-            }}
-          >
-            {regionOptions.map((option) => (
-              <Option
-                value={option.id}
-                key={option.id}
-                className={twMerge(
-                  'relative grid grid-flow-col grid-rows-2 items-center justify-start gap-x-3',
-                  option.disabled && 'pointer-events-none opacity-50',
-                )}
-                disabled={option.disabled}
-              >
-                <span className="row-span-2 flex">
-                  <Image
-                    src={`/assets/flags/${option.code}.svg`}
-                    alt={`${option.country} country flag`}
-                    width={16}
-                    height={12}
-                  />
+            <Select
+              id="workspace"
+              label="Workspace"
+              variant="inline"
+              hideEmptyHelperText
+              placeholder="Select Workspace"
+              slotProps={{
+                root: { className: 'grid grid-flow-col gap-1' },
+              }}
+              onChange={(_event, value) => {
+                const workspaceInList = workspaces.find(
+                  ({ id }) => id === value,
+                );
+                setPlan(plans[0]);
+                setSelectedWorkspace({
+                  id: workspaceInList.id,
+                  name: workspaceInList.name,
+                  disabled: false,
+                  slug: workspaceInList.slug,
+                });
+              }}
+              value={selectedWorkspace.id}
+              renderValue={(option) => (
+                <span className="inline-grid grid-flow-col items-center gap-2">
+                  {option?.label}
                 </span>
+              )}
+            >
+              {workspaceOptions.map((option) => (
+                <Option
+                  value={option.id}
+                  key={option.id}
+                  className="grid grid-flow-col items-center gap-2"
+                >
+                  <span className="inline-block h-6 w-6 overflow-hidden rounded-md">
+                    <Image
+                      src="/logos/new.svg"
+                      alt="Nhost Logo"
+                      width={24}
+                      height={24}
+                    />
+                  </span>
 
-                <Text className="row-span-1 font-medium">{option.name}</Text>
+                  {option.name}
+                </Option>
+              ))}
+            </Select>
 
-                <Text variant="subtitle2" className="row-span-1">
-                  {option.country}
-                </Text>
+            {isK8SPostgresEnabledInCurrentEnvironment && (
+              <Input
+                name="databasePassword"
+                id="databasePassword"
+                autoComplete="new-password"
+                label="Database Password"
+                value={databasePassword}
+                variant="inline"
+                type="password"
+                error={!!passwordError}
+                hideEmptyHelperText
+                endAdornment={
+                  <InputAdornment position="end" className="mr-2">
+                    <IconButton
+                      color="secondary"
+                      onClick={() => {
+                        copy(databasePassword, 'Postgres password');
+                      }}
+                      variant="borderless"
+                      aria-label="Copy password"
+                    >
+                      <CopyIcon className="h-4 w-4" />
+                    </IconButton>
+                  </InputAdornment>
+                }
+                slotProps={{
+                  // Note: this is supposed to fix a `validateDOMNesting` error
+                  helperText: { component: 'div' },
+                }}
+                helperText={
+                  <div className="grid max-w-xs grid-flow-row gap-2">
+                    {passwordError && (
+                      <Text
+                        variant="subtitle2"
+                        sx={{
+                          color: (theme) =>
+                            `${theme.palette.error.main} !important`,
+                        }}
+                      >
+                        {passwordError}
+                      </Text>
+                    )}
 
-                {option.disabled && (
-                  <Text
-                    variant="subtitle2"
-                    className="absolute top-1/2 right-4 -translate-y-1/2"
-                  >
-                    Disabled
-                  </Text>
-                )}
-              </Option>
-            ))}
-          </Select>
+                    <Box className="font-medium">
+                      The root Postgres password for your database - it must be
+                      strong and hard to guess.{' '}
+                      <Button
+                        type="button"
+                        variant="borderless"
+                        color="secondary"
+                        onClick={handleGenerateRandomPassword}
+                        className="px-1 py-0.5 text-xs underline underline-offset-2 hover:underline"
+                        tabIndex={-1}
+                      >
+                        Generate a password
+                      </Button>
+                    </Box>
+                  </div>
+                }
+                onChange={async (e) => {
+                  e.preventDefault();
+                  setSubmitState({
+                    error: null,
+                    loading: false,
+                  });
+                  setDatabasePassword(e.target.value);
 
-          <div className="grid w-full grid-cols-8 gap-x-4 gap-y-2">
-            <div className="col-span-8 sm:col-span-2">
-              <Text className="text-xs font-medium">Plan</Text>
-              <Text variant="subtitle2">You can change this later.</Text>
-            </div>
+                  try {
+                    await resetDatabasePasswordValidationSchema.validate({
+                      databasePassword: e.target.value,
+                    });
+                    setPasswordError('');
+                  } catch (validationError) {
+                    setPasswordError(validationError.message);
+                  }
+                }}
+                fullWidth
+              />
+            )}
 
-            <div className="col-span-8 sm:col-span-6">
-              {plans.map((currentPlan) => {
-                const checked = plan.id === currentPlan.id;
+            <Select
+              id="region"
+              label="Region"
+              variant="inline"
+              hideEmptyHelperText
+              placeholder="Select Region"
+              slotProps={{
+                root: { className: 'grid grid-flow-col gap-1' },
+              }}
+              onChange={(_event, value) => {
+                const regionInList = regions.find(({ id }) => id === value);
+                setSelectedRegion({
+                  id: regionInList.id,
+                  name: regionInList.country.name,
+                  disabled: false,
+                  code: regionInList.country.code,
+                });
+              }}
+              value={selectedRegion.id}
+              renderValue={(option) => {
+                const [flag, , country] = (option?.label as any[]) || [];
 
                 return (
-                  <Box
-                    className="border-t py-4 last-of-type:border-b"
-                    key={currentPlan.id}
-                  >
-                    <Checkbox
-                      label={
-                        <>
-                          <span className="inline-block max-w-xs">
-                            <span className="font-medium">
-                              {currentPlan.name}:
-                            </span>{' '}
-                            {planDescriptions[currentPlan.name]}
-                          </span>
+                  <span className="inline-grid grid-flow-col grid-rows-none items-center gap-x-2">
+                    {flag}
 
-                          {currentPlan.isFree ? (
-                            <Text variant="h3" component="span">
-                              Free
-                            </Text>
-                          ) : (
-                            <Text
-                              variant="h3"
-                              component="span"
-                              className="inline-grid grid-flow-col items-center gap-1"
-                            >
-                              $ {currentPlan.price}{' '}
-                              <Text variant="subtitle2" component="span">
-                                / mo
-                              </Text>
-                            </Text>
-                          )}
-                        </>
-                      }
-                      componentsProps={{
-                        formControlLabel: {
-                          className: 'flex',
-                          componentsProps: {
-                            typography: {
-                              className:
-                                'font-regular text-xs grid grid-flow-col justify-between items-center w-full',
-                            },
-                          },
-                        },
-                      }}
-                      checked={checked}
-                      key={currentPlan.id}
-                      onChange={(event, inputChecked) => {
-                        if (!inputChecked) {
-                          event.preventDefault();
-
-                          return;
-                        }
-
-                        setPlan(currentPlan);
-                      }}
-                    />
-                  </Box>
+                    {isValidElement<TextProps>(country)
+                      ? cloneElement(country, {
+                          ...country.props,
+                          variant: 'body1',
+                        })
+                      : null}
+                  </span>
                 );
-              })}
-            </div>
-          </div>
-        </div>
-
-        {submitState.error && (
-          <Alert severity="error" className="text-left">
-            <Text className="font-medium">Warning</Text>{' '}
-            <Text className="font-medium">
-              {submitState.error &&
-                getErrorMessage(submitState.error, 'application')}
-            </Text>
-          </Alert>
-        )}
-
-        <div className="flex justify-end">
-          {showPaymentModal && (
-            <Modal
-              showModal={showPaymentModal}
-              close={() => {
-                setShowPaymentModal(false);
               }}
             >
-              <BillingPaymentMethodForm
+              {regionOptions.map((option) => (
+                <Option
+                  value={option.id}
+                  key={option.id}
+                  className={twMerge(
+                    'relative grid grid-flow-col grid-rows-2 items-center justify-start gap-x-3',
+                    option.disabled && 'pointer-events-none opacity-50',
+                  )}
+                  disabled={option.disabled}
+                >
+                  <span className="row-span-2 flex">
+                    <Image
+                      src={`/assets/flags/${option.code}.svg`}
+                      alt={`${option.country} country flag`}
+                      width={16}
+                      height={12}
+                    />
+                  </span>
+
+                  <Text className="row-span-1 font-medium">{option.name}</Text>
+
+                  <Text variant="subtitle2" className="row-span-1">
+                    {option.country}
+                  </Text>
+
+                  {option.disabled && (
+                    <Text
+                      variant="subtitle2"
+                      className="absolute top-1/2 right-4 -translate-y-1/2"
+                    >
+                      Disabled
+                    </Text>
+                  )}
+                </Option>
+              ))}
+            </Select>
+
+            <div className="grid w-full grid-cols-8 gap-x-4 gap-y-2">
+              <div className="col-span-8 sm:col-span-2">
+                <Text className="text-xs font-medium">Plan</Text>
+                <Text variant="subtitle2">You can change this later.</Text>
+              </div>
+
+              <RadioGroup
+                value={plan.id}
+                onChange={(_event, value) => {
+                  setPlan(plans.find((p) => p.id === value));
+                }}
+                className="col-span-8 space-y-2 sm:col-span-6"
+              >
+                {plans.map((currentPlan) => {
+                  const disabledPlan =
+                    currentPlan.isFree &&
+                    numberOfFreeAndLiveProjects >= MAX_FREE_PROJECTS;
+
+                  return (
+                    <Tooltip
+                      visible={disabledPlan}
+                      title="Only one free project can be active at any given time. Please pause your active free project before creating a new one."
+                      key={currentPlan.id}
+                      slotProps={{
+                        tooltip: { className: '!max-w-xs w-full text-center' },
+                      }}
+                    >
+                      <Box className="w-full rounded-md border">
+                        <Radio
+                          slotProps={{
+                            formControl: {
+                              className: 'p-3 w-full',
+                              slotProps: {
+                                typography: { className: 'w-full' },
+                              },
+                            },
+                          }}
+                          value={currentPlan.id}
+                          disabled={disabledPlan}
+                          label={
+                            <div className="flex w-full items-center justify-between ">
+                              <div className="inline-block max-w-xs">
+                                <Text className="font-medium text-[inherit]">
+                                  {currentPlan.name}
+                                </Text>
+                                <Text className="text-xs text-[inherit]">
+                                  {planDescriptions[currentPlan.name]}
+                                </Text>
+                              </div>
+
+                              {currentPlan.isFree ? (
+                                <Text
+                                  variant="h3"
+                                  component="span"
+                                  className="text-[inherit]"
+                                >
+                                  Free
+                                </Text>
+                              ) : (
+                                <Text variant="h3" component="span">
+                                  ${currentPlan.price}/mo
+                                </Text>
+                              )}
+                            </div>
+                          }
+                        />
+                      </Box>
+                    </Tooltip>
+                  );
+                })}
+              </RadioGroup>
+            </div>
+          </div>
+
+          {submitState.error && (
+            <Alert severity="error" className="text-left">
+              <Text className="font-medium">Error</Text>{' '}
+              <Text className="font-medium">
+                {submitState.error &&
+                  getErrorMessage(submitState.error, 'application')}{' '}
+              </Text>
+            </Alert>
+          )}
+
+          <div className="flex justify-end">
+            {showPaymentModal && (
+              <Modal
+                showModal={showPaymentModal}
                 close={() => {
                   setShowPaymentModal(false);
                 }}
-                onPaymentMethodAdded={handleSubmit}
-                workspaceId={workspace.id}
-              />
-            </Modal>
-          )}
+              >
+                <BillingPaymentMethodForm
+                  close={() => {
+                    setShowPaymentModal(false);
+                  }}
+                  onPaymentMethodAdded={handleSubmit}
+                  workspaceId={workspace.id}
+                />
+              </Modal>
+            )}
 
-          <Button
-            onClick={() => {
-              if (!plan.isFree && workspace.paymentMethods.length === 0) {
-                setShowPaymentModal(true);
-
-                return;
-              }
-
-              handleSubmit();
-            }}
-            type="submit"
-            loading={submitState.loading}
-            disabled={
-              !!applicationError ||
-              !!submitState.error ||
-              !!passwordError ||
-              maintenanceActive
-            }
-            id="create-app"
-          >
-            Create Project
-          </Button>
+            <Button
+              type="submit"
+              loading={submitState.loading}
+              disabled={!!passwordError || maintenanceActive}
+              id="create-app"
+            >
+              Create Project
+            </Button>
+          </div>
         </div>
-      </div>
+      </form>
     </Container>
   );
 }
 
 export default function NewProjectPage() {
-  const { data, loading, error } = usePrefetchNewAppQuery();
   const router = useRouter();
+  const user = useUserData();
 
-  if (error) {
-    throw error;
+  const { data, loading, error } = usePrefetchNewAppQuery();
+
+  const {
+    data: freeAndActiveProjectsData,
+    loading: freeAndActiveProjectsLoading,
+    error: freeAndActiveProjectsError,
+  } = useGetFreeAndActiveProjectsQuery({
+    variables: { userId: user?.id },
+    fetchPolicy: 'cache-and-network',
+  });
+
+  if (error || freeAndActiveProjectsError) {
+    throw error || freeAndActiveProjectsError;
   }
 
-  if (loading) {
+  if (loading || freeAndActiveProjectsLoading) {
     return (
       <ActivityIndicator delay={500} label="Loading plans and regions..." />
     );
   }
 
   const { workspace } = router.query;
-
   const { regions, plans, workspaces } = data;
 
   // get pre-selected workspace
@@ -628,13 +630,16 @@ export default function NewProjectPage() {
     ? workspaces.find((w) => w.slug === workspace)
     : workspaces[0];
 
-  const preSelectedRegion = regions.filter((region) => region.active)[0];
+  const preSelectedRegion = regions.find((region) => region.active);
 
   return (
     <NewProjectPageContent
       regions={regions}
       plans={plans}
       workspaces={workspaces}
+      numberOfFreeAndLiveProjects={
+        freeAndActiveProjectsData?.freeAndActiveProjects.length
+      }
       preSelectedWorkspace={preSelectedWorkspace}
       preSelectedRegion={preSelectedRegion}
     />

dashboard/src/utils/CONSTANTS.ts

@@ -22,3 +22,8 @@ export const READ_ONLY_SCHEMAS = ['auth', 'storage'];
  * Key used to store the color preference in local storage.
  */
 export const COLOR_PREFERENCE_STORAGE_KEY = 'nhost-color-preference';
+
+/**
+ * Maximum number of free projects a user is allowed to have.
+ */
+export const MAX_FREE_PROJECTS = 1;

dashboard/src/utils/__generated__/graphql.ts

@@ -865,6 +865,38 @@ export type ConfigBooleanComparisonExp = {
   _nin?: InputMaybe<Array<Scalars['Boolean']>>;
 };
 
+export type ConfigClaimMap = {
+  __typename?: 'ConfigClaimMap';
+  claim: Scalars['String'];
+  default?: Maybe<Scalars['String']>;
+  path?: Maybe<Scalars['String']>;
+  value?: Maybe<Scalars['String']>;
+};
+
+export type ConfigClaimMapComparisonExp = {
+  _and?: InputMaybe<Array<ConfigClaimMapComparisonExp>>;
+  _not?: InputMaybe<ConfigClaimMapComparisonExp>;
+  _or?: InputMaybe<Array<ConfigClaimMapComparisonExp>>;
+  claim?: InputMaybe<ConfigStringComparisonExp>;
+  default?: InputMaybe<ConfigStringComparisonExp>;
+  path?: InputMaybe<ConfigStringComparisonExp>;
+  value?: InputMaybe<ConfigStringComparisonExp>;
+};
+
+export type ConfigClaimMapInsertInput = {
+  claim: Scalars['String'];
+  default?: InputMaybe<Scalars['String']>;
+  path?: InputMaybe<Scalars['String']>;
+  value?: InputMaybe<Scalars['String']>;
+};
+
+export type ConfigClaimMapUpdateInput = {
+  claim?: InputMaybe<Scalars['String']>;
+  default?: InputMaybe<Scalars['String']>;
+  path?: InputMaybe<Scalars['String']>;
+  value?: InputMaybe<Scalars['String']>;
+};
+
 export type ConfigConfig = {
   __typename?: 'ConfigConfig';
   auth?: Maybe<ConfigAuth>;
@@ -1079,6 +1111,7 @@ export type ConfigJwtSecret = {
   allowed_skew?: Maybe<Scalars['ConfigUint32']>;
   audience?: Maybe<Scalars['String']>;
   claims_format?: Maybe<Scalars['String']>;
+  claims_map?: Maybe<Array<ConfigClaimMap>>;
   claims_namespace?: Maybe<Scalars['String']>;
   claims_namespace_path?: Maybe<Scalars['String']>;
   header?: Maybe<Scalars['String']>;
@@ -1095,6 +1128,7 @@ export type ConfigJwtSecretComparisonExp = {
   allowed_skew?: InputMaybe<ConfigUint32ComparisonExp>;
   audience?: InputMaybe<ConfigStringComparisonExp>;
   claims_format?: InputMaybe<ConfigStringComparisonExp>;
+  claims_map?: InputMaybe<ConfigClaimMapComparisonExp>;
   claims_namespace?: InputMaybe<ConfigStringComparisonExp>;
   claims_namespace_path?: InputMaybe<ConfigStringComparisonExp>;
   header?: InputMaybe<ConfigStringComparisonExp>;
@@ -1108,6 +1142,7 @@ export type ConfigJwtSecretInsertInput = {
   allowed_skew?: InputMaybe<Scalars['ConfigUint32']>;
   audience?: InputMaybe<Scalars['String']>;
   claims_format?: InputMaybe<Scalars['String']>;
+  claims_map?: InputMaybe<Array<ConfigClaimMapInsertInput>>;
   claims_namespace?: InputMaybe<Scalars['String']>;
   claims_namespace_path?: InputMaybe<Scalars['String']>;
   header?: InputMaybe<Scalars['String']>;
@@ -1121,6 +1156,7 @@ export type ConfigJwtSecretUpdateInput = {
   allowed_skew?: InputMaybe<Scalars['ConfigUint32']>;
   audience?: InputMaybe<Scalars['String']>;
   claims_format?: InputMaybe<Scalars['String']>;
+  claims_map?: InputMaybe<Array<ConfigClaimMapUpdateInput>>;
   claims_namespace?: InputMaybe<Scalars['String']>;
   claims_namespace_path?: InputMaybe<Scalars['String']>;
   header?: InputMaybe<Scalars['String']>;
@@ -16361,6 +16397,13 @@ export type InsertApplicationMutationVariables = Exact<{
 
 export type InsertApplicationMutation = { __typename?: 'mutation_root', insertApp?: { __typename?: 'apps', id: any, name: string, slug: string, workspace: { __typename?: 'workspaces', id: any, name: string, slug: string } } | null };
 
+export type PauseApplicationMutationVariables = Exact<{
+  appId: Scalars['uuid'];
+}>;
+
+
+export type PauseApplicationMutation = { __typename?: 'mutation_root', updateApp?: { __typename?: 'apps', id: any } | null };
+
 export type PrefetchNewAppRegionsFragment = { __typename?: 'regions', id: any, city: string, active: boolean, country: { __typename?: 'countries', code: any, name: string } };
 
 export type PrefetchNewAppPlansFragment = { __typename?: 'plans', id: any, name: string, isDefault: boolean, isFree: boolean, price: number, featureBackupEnabled: boolean, featureCustomDomainsEnabled: boolean, featureMaxDbSize: number };
@@ -16454,6 +16497,13 @@ export type UpdateConfigMutationVariables = Exact<{
 
 export type UpdateConfigMutation = { __typename?: 'mutation_root', updateConfig: { __typename?: 'ConfigConfig', id: 'ConfigConfig' } };
 
+export type UnpauseApplicationMutationVariables = Exact<{
+  appId: Scalars['uuid'];
+}>;
+
+
+export type UnpauseApplicationMutation = { __typename?: 'mutation_root', updateApp?: { __typename?: 'apps', id: any } | null };
+
 export type UpdateAppMutationVariables = Exact<{
   id: Scalars['uuid'];
   app: Apps_Set_Input;
@@ -16784,6 +16834,13 @@ export type GetAvatarQueryVariables = Exact<{
 
 export type GetAvatarQuery = { __typename?: 'query_root', user?: { __typename?: 'users', id: any, avatarUrl: string } | null };
 
+export type GetFreeAndActiveProjectsQueryVariables = Exact<{
+  userId: Scalars['uuid'];
+}>;
+
+
+export type GetFreeAndActiveProjectsQuery = { __typename?: 'query_root', freeAndActiveProjects: Array<{ __typename?: 'apps', id: any }> };
+
 export type ProjectFragment = { __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, isProvisioned: boolean, createdAt: any, desiredState: number, nhostBaseFolder: string, providersUpdated?: boolean | null, config?: { __typename?: 'ConfigConfig', hasura: { __typename?: 'ConfigHasura', adminSecret: string } } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, isFree: boolean }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }> };
 
 export type GetOneUserQueryVariables = Exact<{
@@ -17729,6 +17786,39 @@ export function useInsertApplicationMutation(baseOptions?: Apollo.MutationHookOp
 export type InsertApplicationMutationHookResult = ReturnType<typeof useInsertApplicationMutation>;
 export type InsertApplicationMutationResult = Apollo.MutationResult<InsertApplicationMutation>;
 export type InsertApplicationMutationOptions = Apollo.BaseMutationOptions<InsertApplicationMutation, InsertApplicationMutationVariables>;
+export const PauseApplicationDocument = gql`
+    mutation PauseApplication($appId: uuid!) {
+  updateApp(pk_columns: {id: $appId}, _set: {desiredState: 6}) {
+    id
+  }
+}
+    `;
+export type PauseApplicationMutationFn = Apollo.MutationFunction<PauseApplicationMutation, PauseApplicationMutationVariables>;
+
+/**
+ * __usePauseApplicationMutation__
+ *
+ * To run a mutation, you first call `usePauseApplicationMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `usePauseApplicationMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [pauseApplicationMutation, { data, loading, error }] = usePauseApplicationMutation({
+ *   variables: {
+ *      appId: // value for 'appId'
+ *   },
+ * });
+ */
+export function usePauseApplicationMutation(baseOptions?: Apollo.MutationHookOptions<PauseApplicationMutation, PauseApplicationMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<PauseApplicationMutation, PauseApplicationMutationVariables>(PauseApplicationDocument, options);
+      }
+export type PauseApplicationMutationHookResult = ReturnType<typeof usePauseApplicationMutation>;
+export type PauseApplicationMutationResult = Apollo.MutationResult<PauseApplicationMutation>;
+export type PauseApplicationMutationOptions = Apollo.BaseMutationOptions<PauseApplicationMutation, PauseApplicationMutationVariables>;
 export const PrefetchNewAppDocument = gql`
     query PrefetchNewApp {
   regions(order_by: {city: asc}) {
@@ -18314,6 +18404,39 @@ export function useUpdateConfigMutation(baseOptions?: Apollo.MutationHookOptions
 export type UpdateConfigMutationHookResult = ReturnType<typeof useUpdateConfigMutation>;
 export type UpdateConfigMutationResult = Apollo.MutationResult<UpdateConfigMutation>;
 export type UpdateConfigMutationOptions = Apollo.BaseMutationOptions<UpdateConfigMutation, UpdateConfigMutationVariables>;
+export const UnpauseApplicationDocument = gql`
+    mutation UnpauseApplication($appId: uuid!) {
+  updateApp(pk_columns: {id: $appId}, _set: {desiredState: 5}) {
+    id
+  }
+}
+    `;
+export type UnpauseApplicationMutationFn = Apollo.MutationFunction<UnpauseApplicationMutation, UnpauseApplicationMutationVariables>;
+
+/**
+ * __useUnpauseApplicationMutation__
+ *
+ * To run a mutation, you first call `useUnpauseApplicationMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUnpauseApplicationMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [unpauseApplicationMutation, { data, loading, error }] = useUnpauseApplicationMutation({
+ *   variables: {
+ *      appId: // value for 'appId'
+ *   },
+ * });
+ */
+export function useUnpauseApplicationMutation(baseOptions?: Apollo.MutationHookOptions<UnpauseApplicationMutation, UnpauseApplicationMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<UnpauseApplicationMutation, UnpauseApplicationMutationVariables>(UnpauseApplicationDocument, options);
+      }
+export type UnpauseApplicationMutationHookResult = ReturnType<typeof useUnpauseApplicationMutation>;
+export type UnpauseApplicationMutationResult = Apollo.MutationResult<UnpauseApplicationMutation>;
+export type UnpauseApplicationMutationOptions = Apollo.BaseMutationOptions<UnpauseApplicationMutation, UnpauseApplicationMutationVariables>;
 export const UpdateAppDocument = gql`
     mutation updateApp($id: uuid!, $app: apps_set_input!) {
   updateApp(pk_columns: {id: $id}, _set: $app) {
@@ -20072,6 +20195,46 @@ export type GetAvatarQueryResult = Apollo.QueryResult<GetAvatarQuery, GetAvatarQ
 export function refetchGetAvatarQuery(variables: GetAvatarQueryVariables) {
       return { query: GetAvatarDocument, variables: variables }
     }
+export const GetFreeAndActiveProjectsDocument = gql`
+    query GetFreeAndActiveProjects($userId: uuid!) {
+  freeAndActiveProjects: apps(
+    where: {creatorUserId: {_eq: $userId}, plan: {isFree: {_eq: true}}, desiredState: {_eq: 5}}
+  ) {
+    id
+  }
+}
+    `;
+
+/**
+ * __useGetFreeAndActiveProjectsQuery__
+ *
+ * To run a query within a React component, call `useGetFreeAndActiveProjectsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetFreeAndActiveProjectsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetFreeAndActiveProjectsQuery({
+ *   variables: {
+ *      userId: // value for 'userId'
+ *   },
+ * });
+ */
+export function useGetFreeAndActiveProjectsQuery(baseOptions: Apollo.QueryHookOptions<GetFreeAndActiveProjectsQuery, GetFreeAndActiveProjectsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GetFreeAndActiveProjectsQuery, GetFreeAndActiveProjectsQueryVariables>(GetFreeAndActiveProjectsDocument, options);
+      }
+export function useGetFreeAndActiveProjectsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetFreeAndActiveProjectsQuery, GetFreeAndActiveProjectsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GetFreeAndActiveProjectsQuery, GetFreeAndActiveProjectsQueryVariables>(GetFreeAndActiveProjectsDocument, options);
+        }
+export type GetFreeAndActiveProjectsQueryHookResult = ReturnType<typeof useGetFreeAndActiveProjectsQuery>;
+export type GetFreeAndActiveProjectsLazyQueryHookResult = ReturnType<typeof useGetFreeAndActiveProjectsLazyQuery>;
+export type GetFreeAndActiveProjectsQueryResult = Apollo.QueryResult<GetFreeAndActiveProjectsQuery, GetFreeAndActiveProjectsQueryVariables>;
+export function refetchGetFreeAndActiveProjectsQuery(variables: GetFreeAndActiveProjectsQueryVariables) {
+      return { query: GetFreeAndActiveProjectsDocument, variables: variables }
+    }
 export const GetOneUserDocument = gql`
     query getOneUser($userId: uuid!) {
   user(id: $userId) {

dashboard/src/utils/dataBrowser/validationSchemaHelpers/validationSchemaHelpers.ts

@@ -7,7 +7,7 @@ export interface ColumnDetails {
   hasDefaultValue: boolean;
 }
 
-function createGenericValidationSchema<T extends yup.BaseSchema>(
+function createGenericValidationSchema<T extends yup.Schema>(
   genericSchema: T,
   { isNullable, hasDefaultValue, isIdentity }: ColumnDetails,
 ): T {
@@ -136,7 +136,10 @@ export function createDynamicValidationSchema(
       };
     }
 
-    if (column.type === 'text' && column.specificType === 'jsonb') {
+    if (
+      column.type === 'text' &&
+      (column.specificType === 'jsonb' || column.specificType === 'json')
+    ) {
       return {
         ...schema,
         [column.id]: createJSONValidationSchema(details),

dashboard/src/utils/discordAnnounce.ts

@@ -4,6 +4,10 @@ import { isDevOrStaging } from './helpers';
  * @param content {string} This string to log on the particular channel.
  */
 export const discordAnnounce = async (content: string) => {
+  if (!process.env.NEXT_PUBLIC_DISCORD_LOGGING) {
+    return;
+  }
+
   const username = isDevOrStaging() ? 'console-next(dev)' : 'console-next';
 
   const params = {

dashboard/vitest.config.ts

@@ -10,5 +10,6 @@ export default defineConfig({
     environment: 'jsdom',
     globals: true,
     setupFiles: 'src/setupTests.ts',
+    include: ['src/**/*.(spec|test).{js,jsx,ts,tsx}'],
   },
 });

docs/docs/authentication/sign-in-methods/4-google.mdx

@@ -56,6 +56,7 @@ Follow this guide to sign in users with Google.
 - Click on **Credentials** under **APIs & Services** in the left menu.
 - Click **+ CREATE CREDENTIALS** and then **OAuth client ID** in the top menu.
 - On the **Create OAuth client ID** page for **Application Type** select **Web application**.
+- Under **Authorized JavaScript origins**, add your project's redirect URL for the Google sign-in method in the following format: `https://<subdomain>.auth.<region>.nhost.run`
 - Under **Authorized redirect URIs** add your **OAuth Callback URL** from Nhost.
 - Click **CREATE**.
 

docs/docs/serverless-functions.mdx

@@ -31,11 +31,11 @@ export default (req: Request, res: Response) => {
 To get the `Request`, and `Response` types you can install the `@types/express` package.
 
 ```bash
-npm install -d @types/express
+npm install -D @types/express
 # or yarn
-yarn add -d @types/express
+yarn add -D @types/express
 # or pnpm
-pnpm add -d @types/express
+pnpm add -D @types/express
 ```
 
 :::

examples/nextjs/.eslintrc.js

@@ -1,9 +1,5 @@
 module.exports = {
-  extends: [
-    '../../config/.eslintrc.js',
-    'plugin:react/jsx-runtime',
-    'plugin:@next/next/recommended'
-  ],
+  extends: ['../../config/.eslintrc.js', 'plugin:@next/next/recommended'],
   rules: {
     'react/react-in-jsx-scope': 'off'
   }

examples/react-apollo/.gitignore

@@ -25,5 +25,7 @@ yarn-error.log*
 .nhost
 functions/node_modules
 
-cypress/videos
-cypress/screenshots
+/test-results/
+/playwright-report/
+/playwright/.cache/
+storageState.json

examples/react-apollo/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost-examples/react-apollo
 
+## 0.1.10
+
+### Patch Changes
+
+- caba147b: chore(examples): improve tests of the React Apollo example
+
 ## 0.1.9
 
 ### Patch Changes

examples/react-apollo/cypress.config.ts

@@ -1,16 +0,0 @@
-import { defineConfig } from 'cypress'
-
-export default defineConfig({
-  e2e: {
-    baseUrl: 'http://localhost:3000',
-    chromeWebSecurity: false,
-    // * for some reason, the mailhog API is not systematically available
-    // * when using `localhost` instead of `127.0.0.1`
-    mailHogUrl: 'http://127.0.0.1:8025',
-    env: {
-      backendUrl: 'http://localhost:1337'
-    },
-    defaultCommandTimeout: 20000,
-    requestTimeout: 20000
-  }
-} as Cypress.ConfigOptions)

examples/react-apollo/cypress/e2e/1-unauthenticated/authentication-guards.cy.ts

@@ -1,8 +0,0 @@
-context('Authentication guards', () => {
-  it('should redirect to /sign-in when not authenticated', () => {
-    cy.visit('/')
-    cy.location('pathname').should('equal', '/sign-in')
-    cy.visit('/apollo')
-    cy.location('pathname').should('equal', '/sign-in')
-  })
-})

examples/react-apollo/cypress/e2e/1-unauthenticated/forgot-password.cy.ts

@@ -1,21 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Forgot password', () => {
-  it('should reset password', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password(8)
-
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-
-    cy.visit('/sign-in')
-    cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-    cy.findByRole('button', { name: /Forgot Password?/i }).click()
-
-    cy.findByPlaceholderText('Email Address').type(email)
-    cy.findByRole('button', { name: /Reset your password/i }).click()
-
-    cy.confirmEmail(email)
-    cy.contains('Profile page')
-  })
-})

examples/react-apollo/cypress/e2e/2-sign-up/anonymous.cy.ts

@@ -1,51 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Anonymous users', () => {
-  beforeEach(() => {
-    cy.signInAnonymous()
-  })
-
-  it('should sign-up anonymously', () => {
-    cy.contains('You signed in anonymously')
-  })
-
-  it('should deanonymise with email+password', () => {
-    cy.fetchUserData()
-      .its('id')
-      .then((id) => {
-        const email = faker.internet.email()
-        const password = faker.internet.password()
-        cy.signUpEmailPassword(email, password)
-        cy.contains('Verification email sent').should('be.visible')
-        cy.confirmEmail(email)
-        cy.contains('You signed in anonymously').should('not.exist')
-
-        cy.fetchUserData().then((user) => {
-          cy.wrap(user).its('id').should('equal', id)
-          cy.wrap(user).its('email').should('equal', email)
-        })
-      })
-  })
-
-  it('should deanonymise with a magic link', () => {
-    cy.fetchUserData()
-      .its('id')
-      .then((id) => {
-        const email = faker.internet.email()
-        cy.signUpEmailPasswordless(email)
-        cy.contains('Verification email sent').should('be.visible')
-        cy.confirmEmail(email)
-        cy.goToHomePage()
-        cy.contains('You signed in anonymously').should('not.exist')
-
-        cy.fetchUserData().then((user) => {
-          cy.wrap(user).its('id').should('equal', id)
-          cy.wrap(user).its('email').should('equal', email)
-        })
-      })
-  })
-
-  // TODO implement deanonymisation with Oauth?
-  // TODO forbid email/password change, MFA activation, and password reset when the following PR is released
-  // * https://github.com/nhost/hasura-auth/pull/190
-})

examples/react-apollo/cypress/e2e/2-sign-up/email-password.cy.ts

@@ -1,28 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Sign up with email+password', () => {
-  it('should sign-up with email and password', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password()
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-    cy.contains('You are authenticated')
-  })
-
-  it('shoud raise an error when trying to sign up with an existing email', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password(10)
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Email already in use').should('be.visible')
-  })
-
-  // TODO implement in the UI
-  it.skip('should fail when network is not available', () => {
-    cy.disconnectBackend()
-    cy.signUpEmailPassword(faker.internet.email(), faker.internet.password())
-    cy.contains('Error').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/2-sign-up/email-passwordless.cy.ts

@@ -1,17 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Sign up with a magic link', () => {
-  it('should sign-up with a magic link', () => {
-    const email = faker.internet.email()
-    cy.signUpEmailPasswordless(email)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-    cy.contains('Profile page')
-  })
-
-  it('should fail when network is not available', () => {
-    cy.disconnectBackend()
-    cy.signUpEmailPasswordless(faker.internet.email())
-    cy.contains('Error').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/3-sign-in/email-password.cy.ts

@@ -1,74 +0,0 @@
-import totp from 'totp-generator'
-
-import { faker } from '@faker-js/faker'
-import { Decoder } from '@nuintun/qrcode'
-
-context('Sign in with email+password', () => {
-  it('should sign-in with email and password', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password()
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-    cy.signOut()
-    cy.contains('Sign in to the Application').should('be.visible')
-    cy.signInEmailPassword(email, password)
-
-    cy.contains('You are authenticated')
-  })
-
-  // TODO implement in the UI
-  it.skip('should fail when network is not available', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password()
-    cy.disconnectBackend()
-    cy.signInEmailPassword(email, password)
-    cy.contains('Error').should('be.visible')
-  })
-
-  it('should activate and sign-in with MFA', () => {
-    // * Sign-up with email+password
-    const email = faker.internet.email()
-    const password = faker.internet.email()
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-
-    cy.getNavBar()
-      .findByRole('button', { name: /Profile/i })
-      .click()
-
-    cy.findByText(/Activate 2-step verification/i)
-      .parent()
-      .findByRole('button')
-      .click()
-
-    cy.findAllByAltText(/qrcode/i).then(async (img) => {
-      // * Activate MFA
-      const result = await new Decoder().scan(img.prop('src'))
-      const [, params] = result.data.split('?')
-      const { secret, algorithm, digits, period } = Object.fromEntries(new URLSearchParams(params))
-      const code = totp(secret, {
-        algorithm: algorithm.replace('SHA1', 'SHA-1'),
-        digits: parseInt(digits),
-        period: parseInt(period)
-      })
-      cy.findByPlaceholderText('Enter activation code').type(code)
-      cy.findByRole('button', { name: /Activate/i }).click()
-      cy.contains('MFA has been activated!!!')
-      cy.signOut()
-
-      // * Sign-in with MFA
-      cy.visit('/sign-in')
-      cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-      cy.findByPlaceholderText('Email Address').type(email)
-      cy.findByPlaceholderText('Password').type(password)
-      cy.findByRole('button', { name: /Sign in/i }).click()
-      cy.contains('Send 2-step verification code')
-      const newCode = totp(secret, { timestamp: Date.now() })
-      cy.findByPlaceholderText('One-time password').type(newCode)
-      cy.findByRole('button', { name: /Send 2-step verification code/i }).click()
-      cy.contains('You are authenticated')
-    })
-  })
-})

examples/react-apollo/cypress/e2e/3-sign-in/token.cy.ts

@@ -1,22 +0,0 @@
-context('Automatic sign-in with a refresh token', () => {
-  it('should sign in automatically with a refresh token', () => {
-    cy.signUpAndConfirmEmail()
-    cy.contains('Profile page')
-    cy.clearLocalStorage()
-    cy.reload()
-    cy.contains('Sign in to the Application')
-    cy.visitPathWithRefreshToken('/profile')
-    cy.contains('Profile page')
-  })
-
-  it('should fail automatic sign-in when network is not available', () => {
-    cy.signUpAndConfirmEmail()
-    cy.contains('Profile page')
-    cy.disconnectBackend()
-    cy.clearLocalStorage()
-    cy.reload()
-    cy.contains('Sign in to the Application')
-    cy.visitPathWithRefreshToken('/profile')
-    cy.contains('Could not sign in automatically. Retrying to get user information..')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/apollo.cy.ts

@@ -1,45 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Apollo', () => {
-  const addItemTest = (sentence: string) => {
-    cy.getNavBar()
-      .findByRole('button', { name: /Apollo/i })
-      .click()
-    cy.contains('Todo list')
-    cy.focused().type(sentence)
-    cy.findByRole('button', { name: /Add/i }).click()
-  }
-
-  it('should add an item to the todo list when normally authenticated', () => {
-    cy.signUpAndConfirmEmail()
-    const sentence = faker.lorem.sentence()
-    addItemTest(sentence)
-    cy.get('li').contains(sentence)
-  })
-
-  it('should add an item to the todo list when anonymous', () => {
-    cy.signInAnonymous()
-    const sentence = faker.lorem.sentence()
-    addItemTest(sentence)
-    cy.get('li').contains(sentence)
-  })
-
-  it('should add an item to the todo list after a token refresh', () => {
-    // * This test has a limitation: Hasura's clock is not changing, so the previous JWT will still be valid.
-    cy.signUpAndConfirmEmail()
-    const now = Date.now()
-    cy.clock(now)
-    cy.tick(4 * 7 * 24 * 60 * 60 * 1000)
-    const sentence = faker.lorem.sentence()
-    addItemTest(sentence)
-    cy.get('li').contains(sentence)
-  })
-
-  it('should not add an item when backend is disconnected', () => {
-    cy.signUpAndConfirmEmail()
-    cy.disconnectBackend()
-    addItemTest(faker.lorem.sentence())
-    cy.contains('Network error')
-    cy.get('ul').should('be.empty')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/change-email.cy.ts

@@ -1,30 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Change email', () => {
-  it('should change email', () => {
-    const newEmail = faker.internet.email()
-    cy.signUpAndConfirmEmail()
-    cy.findByPlaceholderText('New email').type(newEmail)
-    cy.findByText(/Change Email/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Please check your inbox and follow the link to confirm the email change').should(
-      'be.visible'
-    )
-    cy.signOut()
-    cy.confirmEmail(newEmail)
-    cy.contains('Profile page')
-  })
-
-  it('should not accept an invalid email', () => {
-    const newEmail = faker.random.alphaNumeric()
-    cy.signUpAndConfirmEmail()
-    cy.findByPlaceholderText('New email').type(newEmail)
-    cy.findByText(/Change Email/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Email is incorrectly formatted').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/change-password.cy.ts

@@ -1,29 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Change password', () => {
-  it('should change password', () => {
-    const email = faker.internet.email()
-    const newPassword = faker.internet.password()
-    cy.signUpAndConfirmEmail(email)
-    cy.findByPlaceholderText('New password').type(newPassword)
-    cy.findByText(/Change Password/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Password changed successfully').should('be.visible')
-    cy.signOut()
-    cy.signInEmailPassword(email, newPassword)
-    cy.contains('You are authenticated')
-  })
-
-  it('should not accept an invalid password', () => {
-    const newPassword = faker.random.alphaNumeric(2)
-    cy.signUpAndConfirmEmail()
-    cy.findByPlaceholderText('New password').type(newPassword)
-    cy.findByText(/Change Password/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Password is incorrectly formatted').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/file-uploads.cy.ts

@@ -1,75 +0,0 @@
-context('File uploads', () => {
-  it('should upload a single file', () => {
-    cy.signUpAndConfirmEmail()
-    cy.findByRole('button', { name: /Storage/i }).click()
-    cy.findByRole('button', { name: /Drag a file here or click to select/i })
-      .children('input[type=file]')
-      .selectFile(
-        {
-          contents: Cypress.Buffer.from('file contents'),
-          fileName: 'file.txt',
-          mimeType: 'text/plain',
-          lastModified: Date.now()
-        },
-        { force: true }
-      )
-      .parent()
-      .contains('Successfully uploaded')
-  })
-
-  it('should upload two files using the same single file uploader', () => {
-    cy.signUpAndConfirmEmail()
-    cy.findByRole('button', { name: /Storage/i }).click()
-    cy.findByRole('button', { name: /Drag a file here or click to select/i })
-      .children('input[type=file]')
-      .selectFile(
-        {
-          contents: Cypress.Buffer.from('file contents'),
-          fileName: 'file.txt',
-          mimeType: 'text/plain',
-          lastModified: Date.now()
-        },
-        { force: true }
-      )
-      .selectFile(
-        {
-          contents: Cypress.Buffer.from('file contents'),
-          fileName: 'file.txt',
-          mimeType: 'text/plain',
-          lastModified: Date.now()
-        },
-        { force: true }
-      )
-      .parent()
-      .contains('Successfully uploaded')
-  })
-
-  it('should upload multiple files', () => {
-    const files: Required<Cypress.FileReferenceObject>[] = [
-      {
-        contents: Cypress.Buffer.from('file contents'),
-        fileName: 'file1.txt',
-        mimeType: 'text/plain',
-        lastModified: Date.now()
-      },
-      {
-        contents: Cypress.Buffer.from('file contents'),
-        fileName: 'file2.txt',
-        mimeType: 'text/plain',
-        lastModified: Date.now()
-      }
-    ]
-    cy.signUpAndConfirmEmail()
-    cy.findByRole('button', { name: /Storage/i }).click()
-    cy.findByRole('button', { name: /Drag files here or click to select/i })
-      .children('input[type=file]')
-      .selectFile(files, { force: true })
-    cy.findByRole('button', { name: /Upload/i }).click()
-    cy.findByRole('button', { name: /Successfully uploaded/i }).should('be.visible')
-    cy.findByRole('table').within(() => {
-      files.forEach((file) => {
-        cy.contains(file.fileName).parent().findByTitle('success').should('exist')
-      })
-    })
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/sign-out.cy.ts

@@ -1,13 +0,0 @@
-context('Sign out', () => {
-  beforeEach(() => {
-    cy.signUpAndConfirmEmail()
-  })
-
-  it('should sign out', () => {
-    cy.visitPathWithRefreshToken()
-    cy.goToProfilePage()
-    cy.contains('Profile page')
-    cy.signOut()
-    cy.contains('Sign in to the Application')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/token-refresh.cy.ts

@@ -1,30 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Token refresh', () => {
-  it('should refresh token one minute before it expires', () => {
-    const email = faker.internet.email()
-    cy.signUpEmailPasswordless(email)
-    cy.contains('Verification email sent').should('be.visible')
-    const now = Date.now()
-    cy.clock(now)
-    cy.confirmEmail(email)
-
-    cy.intercept(Cypress.env('backendUrl') + '/v1/auth/token').as('tokenRequest')
-    cy.tick(14 * 60 * 1000)
-    cy.wait('@tokenRequest').its('response.statusCode').should('eq', 200)
-  })
-
-  it('should refresh session from localStorage after 4 weeks of inactivity', () => {
-    const email = faker.internet.email()
-    cy.signUpEmailPasswordless(email)
-    cy.contains('Verification email sent').should('be.visible')
-    const now = Date.now()
-    cy.clock(now)
-    cy.confirmEmail(email)
-    cy.contains('Profile page')
-
-    cy.tick(4 * 7 * 24 * 60 * 60 * 1000)
-    cy.reload()
-    cy.contains('Profile page')
-  })
-})

examples/react-apollo/cypress/support/e2e.ts

@@ -1,139 +0,0 @@
-import { faker } from '@faker-js/faker'
-import { User } from '@nhost/react'
-
-import '@testing-library/cypress/add-commands'
-import 'cypress-mailhog'
-declare module 'mocha' {
-  export interface Context {
-    refreshToken?: string
-  }
-}
-declare global {
-  namespace Cypress {
-    interface Chainable {
-      signUpEmailPassword(email: string, password: string): Chainable<Element>
-      signUpEmailPasswordless(email: string): Chainable<Element>
-      signInEmailPassword(email: string, password: string): Chainable<Element>
-      signInAnonymous(): Chainable<Element>
-      /** Sign in from the refresh token stored in the global state */
-      visitPathWithRefreshToken(path?: string): Chainable<Element>
-      /** Click on the 'Sign Out' item of the left side menu to sign out the current user */
-      signOut(): Chainable<Element>
-      /** Run a sign-up + authentication sequence with passwordless to use an authenticated user in other tests */
-      signUpAndConfirmEmail(email?: string): Chainable<Element>
-      /** Gets a confirmation email and click on the link */
-      confirmEmail(email: string): Chainable<Element>
-      /** Save the refresh token in the global state so it can be reused with `this.refreshToken` */
-      saveRefreshToken(): Chainable<Element>
-      /** Make the Nhost backend unavailable */
-      disconnectBackend(): Chainable<Element>
-      /** Get the left side navigation bar */
-      getNavBar(): Chainable<Element>
-      /** Go to the profile page */
-      goToProfilePage(): Chainable<Element>
-      /** Go to the home page */
-      goToHomePage(): Chainable<Element>
-      /** Go getch the user ID in the profile page*/
-      fetchUserData(): Chainable<User>
-    }
-  }
-}
-
-Cypress.Commands.add('signUpEmailPassword', (email, password) => {
-  cy.visit('/sign-up')
-  cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-  cy.findByPlaceholderText('First name').type(faker.name.firstName())
-  cy.findByPlaceholderText('Last name').type(faker.name.lastName())
-  cy.findByPlaceholderText('Email Address').type(email)
-  cy.findByPlaceholderText('Password').type(password)
-  cy.findByPlaceholderText('Confirm Password').type(password)
-  cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-})
-
-Cypress.Commands.add('signUpEmailPasswordless', (email) => {
-  cy.visit('/sign-up')
-  cy.findByRole('button', { name: /Continue with a magic link/i }).click()
-  cy.findByPlaceholderText('Email Address').type(email)
-  cy.findByRole('button', { name: /Continue with email/i }).click()
-})
-
-Cypress.Commands.add('signInEmailPassword', (email, password) => {
-  cy.visit('/sign-in')
-  cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-  cy.findByPlaceholderText('Email Address').type(email)
-  cy.findByPlaceholderText('Password').type(password)
-  cy.findByRole('button', { name: /Sign in/i }).click()
-  cy.saveRefreshToken()
-})
-
-Cypress.Commands.add('signInAnonymous', () => {
-  cy.visit('/sign-in')
-  cy.findByRole('link', { name: /sign in anonymously/i }).click()
-  cy.saveRefreshToken()
-})
-
-Cypress.Commands.add('visitPathWithRefreshToken', function (path = '/') {
-  cy.visit(path + '#refreshToken=' + this.refreshToken)
-})
-
-Cypress.Commands.add('signOut', () => {
-  cy.getNavBar()
-    .findByRole('button', { name: /Sign Out/i })
-    .click()
-})
-
-Cypress.Commands.add('confirmEmail', (email) => {
-  cy.mhGetMailsByRecipient(email, 1)
-    .should('have.length', 1)
-    .then(([message]) => {
-      cy.visit(message.Content.Headers['X-Link'][0])
-      cy.saveRefreshToken()
-    })
-})
-
-Cypress.Commands.add('signUpAndConfirmEmail', (givenEmail) => {
-  const email = givenEmail || faker.internet.email()
-  cy.signUpEmailPasswordless(email)
-  cy.contains('Verification email sent').should('be.visible')
-  cy.confirmEmail(email)
-})
-
-Cypress.Commands.add('saveRefreshToken', () => {
-  cy.getNavBar()
-    .findByRole('button', { name: /Sign Out/i })
-    .then(() => localStorage.getItem('nhostRefreshToken'))
-    .as('refreshToken')
-})
-
-Cypress.Commands.add('disconnectBackend', () => {
-  cy.intercept(Cypress.env('backendUrl') + '/**', {
-    forceNetworkError: true
-  })
-})
-
-Cypress.Commands.add('getNavBar', () => {
-  cy.findByRole(`navigation`, { name: /main navigation/i })
-})
-
-Cypress.Commands.add('goToProfilePage', () => {
-  cy.getNavBar()
-    .findByRole('button', { name: /Profile/i })
-    .click()
-})
-
-Cypress.Commands.add('goToHomePage', () => {
-  cy.getNavBar().findByRole('button', { name: /Home/i }).click()
-})
-
-Cypress.Commands.add('fetchUserData', () => {
-  cy.goToProfilePage()
-  cy.findByText('User information')
-    .parent()
-    .within(() => {
-      cy.get('pre')
-        .invoke('text')
-        .then((text) => JSON.parse(text))
-        .as('user')
-    })
-  return cy.get<User>('@user')
-})

examples/react-apollo/e2e/authenticated/apollo.test.ts

@@ -0,0 +1,52 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signInAnonymously, signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should add an item to the todo list when authenticated with email and password', async ({
+  page
+}) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+  const sentence = faker.lorem.sentence()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /apollo/i }).click()
+  await expect(newPage.getByText(/todo list/i)).toBeVisible()
+  await newPage.getByRole('textbox').fill(sentence)
+  await newPage.getByRole('button', { name: /add/i }).click()
+  await expect(newPage.getByRole('listitem').first()).toHaveText(sentence)
+})
+
+test('should add an item to the todo list when authenticated anonymously', async ({ page }) => {
+  const sentence = faker.lorem.sentence()
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /apollo/i }).click()
+  await expect(page.getByText(/todo list/i)).toBeVisible()
+  await page.getByRole('textbox').fill(sentence)
+  await page.getByRole('button', { name: /add/i }).click()
+  await expect(page.getByRole('listitem').first()).toHaveText(sentence)
+})
+
+test('should fail when network is not available', async ({ page }) => {
+  const sentence = faker.lorem.sentence()
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /apollo/i }).click()
+  await expect(page.getByText(/todo list/i)).toBeVisible()
+
+  await page.route('**', (route) => route.abort('internetdisconnected'))
+  await page.getByRole('textbox').fill(sentence)
+  await page.getByRole('button', { name: /add/i }).click()
+
+  await expect(page.getByText(/network error/i)).toBeVisible()
+})

examples/react-apollo/e2e/authenticated/change-email.test.ts

@@ -0,0 +1,56 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should be able to change email', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newEmail = faker.internet.email()
+
+  await newPage.getByPlaceholder(/new email/i).fill(newEmail)
+  await newPage.locator('h1:has-text("Change email") + div button:has-text("Change")').click()
+
+  await expect(
+    newPage.getByText(/please check your inbox and follow the link to confirm the email change/i)
+  ).toBeVisible()
+
+  await newPage.getByRole('button', { name: /sign out/i }).click()
+
+  const updatedEmailPage = await verifyEmail({
+    page: newPage,
+    email: newEmail,
+    context: page.context(),
+    linkText: /change email/i
+  })
+
+  await expect(updatedEmailPage.getByText(/profile page/i)).toBeVisible()
+})
+
+test('should not accept an invalid email', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newEmail = faker.random.alphaNumeric()
+
+  await newPage.getByPlaceholder(/new email/i).fill(newEmail)
+  await newPage.locator('h1:has-text("Change email") + div button:has-text("Change")').click()
+
+  await expect(newPage.getByText(/email is incorrectly formatted/i)).toBeVisible()
+})

examples/react-apollo/e2e/authenticated/change-password.test.ts

@@ -0,0 +1,47 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signInWithEmailAndPassword, signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should be able to change password', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newPassword = faker.internet.password()
+
+  await newPage.getByPlaceholder(/new password/i).fill(newPassword)
+  await newPage.locator('h1:has-text("Change password") + div button:has-text("Change")').click()
+  await expect(newPage.getByText(/password changed successfully/i)).toBeVisible()
+
+  await newPage.getByRole('button', { name: /sign out/i }).click()
+
+  await signInWithEmailAndPassword({ page: newPage, email, password: newPassword })
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+test('should not accept an invalid email', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newPassword = faker.internet.password(2)
+
+  await newPage.getByPlaceholder(/new password/i).fill(newPassword)
+  await newPage.locator('h1:has-text("Change password") + div button:has-text("Change")').click()
+
+  await expect(newPage.getByText(/password is incorrectly formatted/i)).toBeVisible()
+})

examples/react-apollo/e2e/authenticated/file-upload.test.ts

@@ -0,0 +1,97 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should upload a single file', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /storage/i }).click()
+
+  await newPage
+    .getByRole('button', { name: /drag a file here or click to select/i })
+    .locator('input[type=file]')
+    .setInputFiles({
+      buffer: Buffer.from('file contents', 'utf-8'),
+      name: 'file.txt',
+      mimeType: 'text/plain'
+    })
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+})
+
+test('should upload two files using the same single file uploader', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /storage/i }).click()
+
+  await newPage
+    .getByRole('button', { name: /drag a file here or click to select/i })
+    .locator('input[type=file]')
+    .setInputFiles({
+      buffer: Buffer.from('file contents 1', 'utf-8'),
+      name: 'file1.txt',
+      mimeType: 'text/plain'
+    })
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+
+  await newPage
+    .getByRole('button', { name: /successfully uploaded/i })
+    .locator('input[type=file]')
+    .setInputFiles({
+      buffer: Buffer.from('file contents 2', 'utf-8'),
+      name: 'file2.txt',
+      mimeType: 'text/plain'
+    })
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+})
+
+test('should upload multiple files at once', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /storage/i }).click()
+
+  await newPage
+    .getByRole('button', { name: /drag files here or click to select/i })
+    .locator('input[type=file]')
+    .setInputFiles([
+      {
+        buffer: Buffer.from('file contents 1', 'utf-8'),
+        name: 'file1.txt',
+        mimeType: 'text/plain'
+      },
+      {
+        buffer: Buffer.from('file contents 2', 'utf-8'),
+        name: 'file2.txt',
+        mimeType: 'text/plain'
+      }
+    ])
+
+  await expect(newPage.getByRole('row').nth(0)).toHaveText('file1.txt')
+  await expect(newPage.getByRole('row').nth(1)).toHaveText('file2.txt')
+  await newPage.getByRole('button', { name: /upload/i }).click()
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+})

examples/react-apollo/e2e/config.ts

@@ -0,0 +1,3 @@
+export const baseURL = 'http://localhost:3000'
+export const mailhogURL = 'http://localhost:8025'
+export const authBackendURL = 'https://local.auth.nhost.run'

examples/react-apollo/e2e/sign-in/auto-sign-in.test.ts

@@ -0,0 +1,72 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { authBackendURL, baseURL } from '../config'
+import {
+  clearStorage,
+  getValueFromLocalStorage,
+  signUpWithEmailAndPassword,
+  verifyEmail
+} from '../utils'
+
+test('should sign in automatically with a refresh token', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+
+  const refreshToken = await getValueFromLocalStorage({
+    page: newPage,
+    origin: baseURL,
+    key: 'nhostRefreshToken'
+  })
+
+  // Clear storage and reload the page
+  await clearStorage({ page: newPage })
+  await newPage.reload()
+
+  await expect(newPage.getByText(/sign in to the application/i)).toBeVisible()
+
+  // User should be signed in automatically
+  await newPage.goto(`${baseURL}/profile#refreshToken=${refreshToken}`)
+  await expect(newPage.getByText(/profile page/i)).toBeVisible()
+})
+
+test('should fail automatic sign-in when network is not available', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+
+  const refreshToken = await getValueFromLocalStorage({
+    page: newPage,
+    origin: baseURL,
+    key: 'nhostRefreshToken'
+  })
+
+  // Clear storage and reload the page
+  await clearStorage({ page: newPage })
+  await newPage.reload()
+
+  await expect(newPage.getByText(/sign in to the application/i)).toBeVisible()
+  await newPage.route(`${authBackendURL}/**`, (route) => route.abort('internetdisconnected'))
+
+  // User should be signed in automatically
+  await newPage.goto(`${baseURL}/profile#refreshToken=${refreshToken}`)
+  await expect(
+    newPage.getByText(/could not sign in automatically. retrying to get user information/i)
+  ).toBeVisible()
+})

examples/react-apollo/e2e/sign-in/email-password.test.ts

@@ -0,0 +1,84 @@
+import { faker } from '@faker-js/faker'
+import type { Page } from '@playwright/test'
+import { expect, test } from '@playwright/test'
+import totp from 'totp-generator'
+import { baseURL } from '../config'
+import {
+  decodeQRCode,
+  signInWithEmailAndPassword,
+  signUpWithEmailAndPassword,
+  verifyEmail
+} from '../utils'
+
+const email = faker.internet.email()
+const password = faker.internet.password()
+
+let page: Page
+
+test.describe.configure({ mode: 'serial' })
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage()
+
+  await page.goto('/')
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+  await newPage.getByRole('button', { name: /sign out/i }).click()
+
+  page = newPage
+})
+
+test.afterEach(async () => {
+  await page.getByRole('button', { name: /sign out/i }).click()
+})
+
+test.afterAll(() => {
+  page.close()
+})
+
+test('should sign in with email and password', async () => {
+  await page.goto('/')
+
+  await signInWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+// TODO: Create email verification test
+
+test('should activate and sign in with MFA', async () => {
+  await page.goto('/')
+
+  await signInWithEmailAndPassword({ page, email, password })
+  await page.waitForURL(baseURL)
+  await page.getByRole('button', { name: /profile/i }).click()
+  await page.getByRole('button', { name: /generate/i }).click()
+
+  const image = page.getByAltText(/qrcode/i)
+  const src = await image.getAttribute('src')
+
+  const { secret, algorithm, digits, period } = decodeQRCode(src)
+
+  const code = totp(secret, {
+    algorithm: algorithm.replace('SHA1', 'SHA-1'),
+    digits: parseInt(digits),
+    period: parseInt(period)
+  })
+
+  await page.getByPlaceholder(/enter activation code/i).fill(code)
+  await page.getByRole('button', { name: /activate/i }).click()
+  await expect(page.getByText(/mfa has been activated/i)).toBeVisible()
+  await page.getByRole('button', { name: /sign out/i }).click()
+
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await signInWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/send 2-step verification code/i)).toBeVisible()
+
+  const newCode = totp(secret, { timestamp: Date.now() })
+
+  await page.getByPlaceholder(/one-time password/i).fill(newCode)
+  await page.getByRole('button', { name: /send 2-step verification code/i }).click()
+  await expect(page.getByText(/you are authenticated/i)).toBeVisible()
+})

examples/react-apollo/e2e/sign-up/anonymous.test.ts

@@ -0,0 +1,53 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import {
+  getUserData,
+  signInAnonymously,
+  signUpWithEmailAndPassword,
+  signUpWithEmailPasswordless,
+  verifyEmail,
+  verifyMagicLink
+} from '../utils'
+
+test('should deanonymize with email and password', async ({ page, context }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password(8)
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /profile/i }).click()
+
+  const userData = await getUserData(page)
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyEmail({ page, context, email })
+  await authenticatedPage.getByRole('button', { name: /profile/i }).click()
+
+  const updatedUserData = await getUserData(authenticatedPage)
+  expect(updatedUserData.id).toBe(userData.id)
+  expect(updatedUserData.email).toBe(email)
+})
+
+test('should deanonymize with a magic link', async ({ page, context }) => {
+  const email = faker.internet.email()
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /profile/i }).click()
+
+  const userData = await getUserData(page)
+
+  await signUpWithEmailPasswordless({ page, email })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyMagicLink({ page, context, email })
+  await authenticatedPage.getByRole('button', { name: /profile/i }).click()
+
+  const updatedUserData = await getUserData(authenticatedPage)
+  expect(updatedUserData.id).toBe(userData.id)
+  expect(updatedUserData.email).toBe(email)
+})

examples/react-apollo/e2e/sign-up/email-password.test.ts

@@ -0,0 +1,44 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should sign up with email and password', async ({ page, context }) => {
+  page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyEmail({ page, context, email })
+  await expect(authenticatedPage.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+test('should raise an error when trying to sign up with an existing email', async ({ page }) => {
+  page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  // close modal
+  await page.getByRole('dialog').getByRole('button').click()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/email already in use/i)).toBeVisible()
+})
+
+test('should fail when network is not available', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.route('**', (route) => route.abort('internetdisconnected'))
+  await signUpWithEmailAndPassword({ page, email, password })
+
+  await expect(page.getByText(/network error/i)).toBeVisible()
+})

examples/react-apollo/e2e/sign-up/email-passwordless.test.ts

@@ -0,0 +1,27 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailPasswordless, verifyMagicLink } from '../utils'
+
+test('should sign up with a magic link', async ({ page, context }) => {
+  page.goto('/')
+
+  const email = faker.internet.email()
+
+  await signUpWithEmailPasswordless({ page, email })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyMagicLink({ page, context, email })
+  await authenticatedPage.getByRole('button', { name: /home/i }).click()
+  await expect(authenticatedPage.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+test('should fail when network is not available', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+
+  await page.route('**', (route) => route.abort('internetdisconnected'))
+  await signUpWithEmailPasswordless({ page, email })
+
+  await expect(page.getByText(/network error/i)).toBeVisible()
+})

examples/react-apollo/e2e/unauthenticated/authentication-guards.test.ts

@@ -0,0 +1,14 @@
+import { expect, test } from '@playwright/test'
+import { baseURL } from '../config'
+
+test('should redirect to /sign-in when not authenticated', async ({ page }) => {
+  await page.goto(`${baseURL}`)
+  await page.waitForURL(`${baseURL}/sign-in`)
+
+  await expect(page.getByText(/sign in to the application/i)).toBeVisible()
+
+  await page.goto(`${baseURL}/apollo`)
+  await page.waitForURL(`${baseURL}/sign-in`)
+
+  await expect(page.getByText(/sign in to the application/i)).toBeVisible()
+})

examples/react-apollo/e2e/unauthenticated/forgot-password.test.ts

@@ -0,0 +1,28 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { baseURL } from '../config'
+import { resetPassword, signUpWithEmailAndPassword } from '../utils'
+
+test('should reset password', async ({ page, context }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password(8)
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  await page.goto(`${baseURL}/sign-in`)
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await page.getByRole('button', { name: /forgot password?/i }).click()
+
+  await page.getByPlaceholder('Email Address').type(email)
+  await page.getByRole('button', { name: /reset your password/i }).click()
+
+  const authenticatedPage = await resetPassword({ page, context, email })
+
+  await authenticatedPage.waitForLoadState()
+  await authenticatedPage.getByRole('button', { name: /profile/i }).click()
+
+  await expect(authenticatedPage.getByText(/profile page/i)).toBeVisible()
+})

examples/react-apollo/e2e/utils.ts

@@ -0,0 +1,265 @@
+import { faker } from '@faker-js/faker'
+import type { User } from '@nhost/react'
+import type { BrowserContext, Page } from '@playwright/test'
+import jsQR from 'jsqr'
+import { PNG } from 'pngjs'
+import { baseURL, mailhogURL } from './config'
+
+/**
+ * Returns the user data from the profile page.
+ *
+ * @param page - The page to get the user data from.
+ * @returns The user data.
+ */
+export async function getUserData(page: Page) {
+  const textContent = await page.locator('h1:has-text("User information") + div pre').textContent()
+  const userData = textContent ? JSON.parse(textContent) : {}
+
+  return userData as User
+}
+
+/**
+ * Returns a promise that resolves when the sign up flow is completed.
+ *
+ * @param page - The page to sign up with.
+ * @param email - The email address to sign up with.
+ * @param password - The password to sign up with.
+ */
+export async function signUpWithEmailAndPassword({
+  page,
+  email,
+  password
+}: {
+  page: Page
+  email: string
+  password: string
+}) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('link', { name: /sign up/i }).click()
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await page.getByPlaceholder(/first name/i).type(faker.name.firstName())
+  await page.getByPlaceholder(/last name/i).type(faker.name.lastName())
+  await page.getByPlaceholder(/email address/i).type(email)
+  await page.getByPlaceholder(/^password$/i).type(password)
+  await page.getByPlaceholder(/confirm password/i).type(password)
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+}
+
+/**
+ * Returns a promise that resolves when the sign in flow is completed.
+ *
+ * @param page - The page to sign in with.
+ * @param email - The email address to sign in with.
+ * @param password - The password to sign in with.
+ */
+export async function signInWithEmailAndPassword({
+  page,
+  email,
+  password
+}: {
+  page: Page
+  email: string
+  password: string
+}) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await page.getByPlaceholder(/email address/i).type(email)
+  await page.getByPlaceholder(/password/i).type(password)
+  await page.getByRole('button', { name: /sign in/i }).click()
+}
+
+/**
+ * Returns a promise that resolves when the sign in flow is completed.
+ *
+ * @param page - The page to sign in with.
+ */
+export async function signInAnonymously({ page }: { page: Page }) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('link', { name: /sign in anonymously/i }).click()
+  await page.waitForURL(baseURL)
+}
+
+/**
+ * Returns a promise that resolves when the sign up flow is completed.
+ *
+ * @param page - The page to sign up with.
+ * @param email - The email address to sign up with.
+ */
+export async function signUpWithEmailPasswordless({ page, email }: { page: Page; email: string }) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('link', { name: /sign up/i }).click()
+  await page.getByRole('button', { name: /continue with a magic link/i }).click()
+  await page.getByPlaceholder(/email address/i).fill(email)
+  await page.getByRole('button', { name: /continue with email/i }).click()
+}
+
+/**
+ * Returns a promise that resolves to a new page that is opened after clicking
+ * the magic link in the email.
+ *
+ * @param email - The email address to reset the password for.
+ * @param page - The page to click the magic link in.
+ * @param context - The browser context.
+ * @returns A promise that resolves to a new page.
+ */
+export async function verifyMagicLink({
+  email,
+  page,
+  context
+}: {
+  email: string
+  page: Page
+  context: BrowserContext
+}) {
+  await page.goto(mailhogURL)
+  await page.locator('.messages > .msglist-message', { hasText: email }).nth(0).click()
+
+  // Based on: https://playwright.dev/docs/pages#handling-new-pages
+  const authenticatedPagePromise = context.waitForEvent('page')
+
+  await page
+    .frameLocator('#preview-html')
+    .getByRole('link', { name: /sign in/i })
+    .click()
+
+  const authenticatedPage = await authenticatedPagePromise
+  await authenticatedPage.waitForLoadState()
+
+  return authenticatedPage
+}
+
+/**
+ * Returns a promise that resolves to a new page that is opened after clicking
+ * the reset password link in the email.
+ *
+ * @param email - The email address to reset the password for.
+ * @param page - The page to click the reset password link in.
+ * @param context - The browser context.
+ * @returns A promise that resolves to a new page.
+ */
+export async function resetPassword({
+  email,
+  page,
+  context
+}: {
+  email: string
+  page: Page
+  context: BrowserContext
+}) {
+  await page.goto(mailhogURL)
+  await page.locator('.messages > .msglist-message', { hasText: email }).nth(0).click()
+
+  // Based on: https://playwright.dev/docs/pages#handling-new-pages
+  const authenticatedPagePromise = context.waitForEvent('page')
+
+  await page
+    .frameLocator('#preview-html')
+    .getByRole('link', { name: /reset password/i })
+    .click()
+
+  const authenticatedPage = await authenticatedPagePromise
+  await authenticatedPage.waitForLoadState()
+
+  return authenticatedPage
+}
+
+/**
+ * Returns a promise that resolves to a new page that is opened after clicking
+ * the verify email link in the email.
+ *
+ * @param email - The email address to verify.
+ * @param page - The page to click the verify email link in.
+ * @param context - The browser context.
+ * @param linkText - The text of the link to click.
+ * @returns A promise that resolves to a new page.
+ */
+export async function verifyEmail({
+  email,
+  page,
+  context,
+  linkText = /verify email/i
+}: {
+  email: string
+  page: Page
+  context: BrowserContext
+  linkText?: string | RegExp
+}) {
+  await page.goto(mailhogURL)
+  await page.locator('.messages > .msglist-message', { hasText: email }).nth(0).click()
+
+  // Based on: https://playwright.dev/docs/pages#handling-new-pages
+  const authenticatedPagePromise = context.waitForEvent('page')
+
+  await page.frameLocator('#preview-html').getByRole('link', { name: linkText }).click()
+
+  const authenticatedPage = await authenticatedPagePromise
+  await authenticatedPage.waitForLoadState()
+
+  return authenticatedPage
+}
+
+/**
+ * Returns decoded data from a QR code.
+ *
+ * @param base64String - The base64 encoded string of the QR code.
+ * @returns The decoded data.
+ */
+export function decodeQRCode(base64String?: string | null) {
+  if (!base64String) {
+    return {
+      secret: '',
+      algorithm: '',
+      digits: '',
+      period: ''
+    }
+  }
+
+  const buffer = Buffer.from(base64String.replace('data:image/png;base64,', ''), 'base64')
+  const pngData = PNG.sync.read(buffer)
+
+  const decoded = jsQR(Uint8ClampedArray.from(pngData.data), pngData.width, pngData.height)
+  const params = decoded?.data?.split('?').at(-1)
+
+  // note: we are decoding MFA here
+  const { secret, algorithm, digits, period } = Object.fromEntries(new URLSearchParams(params))
+
+  return { secret, algorithm, digits, period }
+}
+
+/**
+ * Clears the local and session storage for a page.
+ *
+ * @param page - The page to clear the storage for.
+ */
+export async function clearStorage({ page }: { page: Page }) {
+  await page.evaluate(() => {
+    localStorage.clear()
+    sessionStorage.clear()
+  })
+}
+
+/**
+ * Returns a promise that resolves to the value of a key in local storage.
+ *
+ * @param page - The page to get the value from.
+ * @param origin - The origin of the local storage.
+ * @param key - The key to get the value for.
+ * @returns The value of the key in local storage.
+ */
+export async function getValueFromLocalStorage({
+  page,
+  origin: externalOrigin,
+  key
+}: {
+  page: Page
+  origin: string
+  key: string
+}) {
+  const storageState = await page.context().storageState()
+  const localStorage = storageState.origins.find(
+    ({ origin }) => origin === externalOrigin
+  )?.localStorage
+  const value = localStorage?.find(({ name }) => name === key)?.value
+
+  return value || null
+}

examples/react-apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost-examples/react-apollo",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.6.9",
@@ -22,11 +22,10 @@
   "scripts": {
     "dev": "vite --host localhost --port 3000",
     "generate": "graphql-codegen --config graphql.config.yaml",
-    "cypress": "cypress open",
-    "e2e": "start-test e2e:backend http-get://localhost:9695 e2e:frontend 3000 e2e:test",
-    "e2e:test": "cypress run",
-    "e2e:backend": "nhost dev --no-browser",
-    "e2e:frontend": "run-s build preview",
+    "e2e": "start-test e2e:start-backend http-get://localhost:9695 e2e:test",
+    "e2e:test": "npx playwright@1.31.2 install --with-deps && playwright test",
+    "e2e:start-backend": "nhost dev --no-browser",
+    "e2e:start-ui": "run-s build preview",
     "build": "vite build",
     "preview": "vite preview --host localhost --port 3000",
     "prettier": "prettier --check .",
@@ -52,14 +51,16 @@
     "@faker-js/faker": "^7.6.0",
     "@graphql-codegen/cli": "^2.12.0",
     "@nuintun/qrcode": "^3.3.0",
-    "@testing-library/cypress": "^8.0.3",
+    "@playwright/test": "^1.31.2",
+    "@types/pngjs": "^6.0.1",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.9",
     "@types/totp-generator": "^0.0.4",
     "@vitejs/plugin-react": "^3.0.0",
     "@xstate/inspect": "^0.6.2",
-    "cypress": "^10.7.0",
-    "cypress-mailhog": "^1.6.0",
+    "dotenv": "^16.0.3",
+    "jsqr": "^1.4.0",
+    "pngjs": "^7.0.0",
     "start-server-and-test": "^1.15.2",
     "totp-generator": "^0.0.13",
     "typescript": "^4.8.2",

examples/react-apollo/playwright.config.ts

@@ -0,0 +1,32 @@
+import { defineConfig, devices } from '@playwright/test'
+
+import dotenv from 'dotenv'
+import path from 'path'
+
+dotenv.config({ path: path.resolve(__dirname, '.env.test') })
+
+export default defineConfig({
+  testDir: './e2e',
+  timeout: 30 * 1000,
+  expect: {
+    timeout: 5000
+  },
+  webServer: {
+    command: 'pnpm e2e:start-ui',
+    port: 3000
+  },
+  use: {
+    baseURL: 'http://localhost:3000'
+  },
+  fullyParallel: true,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] }
+    }
+  ]
+})

examples/react-apollo/src/main.tsx

@@ -14,7 +14,7 @@ if (devTools) {
 }
 
 const nhost = new NhostClient({
-  subdomain: import.meta.env.VITE_NHOST_SUBDOMAIN || 'localhost',
+  subdomain: import.meta.env.VITE_NHOST_SUBDOMAIN || 'local',
   region: import.meta.env.VITE_NHOST_REGION,
   devTools
 })

examples/react-apollo/tsconfig.json

@@ -15,8 +15,8 @@
     "resolveJsonModule": true,
     "isolatedModules": false,
     "noEmit": true,
-    "types": ["node", "cypress", "@testing-library/cypress"],
+    "types": ["node"],
     "jsx": "react-jsx"
   },
-  "include": ["src", "cypress", "cypress.config.ts"]
+  "include": ["src"]
 }

integrations/apollo/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/apollo
 
+## 5.1.1
+
+### Patch Changes
+
+- @nhost/nhost-js@2.1.1
+
 ## 5.1.0
 
 ### Patch Changes

integrations/apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/apollo",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "Nhost Apollo Client library",
   "license": "MIT",
   "keywords": [

integrations/react-apollo/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/react-apollo
 
+## 5.0.12
+
+### Patch Changes
+
+- @nhost/apollo@5.1.1
+- @nhost/react@2.0.11
+
 ## 5.0.11
 
 ### Patch Changes

integrations/react-apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react-apollo",
-  "version": "5.0.11",
+  "version": "5.0.12",
   "description": "Nhost React Apollo client",
   "license": "MIT",
   "keywords": [

integrations/react-urql/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/react-urql
 
+## 2.0.11
+
+### Patch Changes
+
+- @nhost/react@2.0.11
+
 ## 2.0.10
 
 ### Patch Changes

integrations/react-urql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react-urql",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "Nhost React URQL client",
   "license": "MIT",
   "keywords": [

package.json

@@ -37,6 +37,7 @@
     "test": "turbo run test --filter=!@nhost/dashboard --filter=!@nhost/docs --filter=!@nhost-examples/* --no-deps --include-dependencies",
     "test:all": "turbo run test",
     "test:dashboard": "turbo run test --filter=@nhost/dashboard",
+    "e2e:dashboard": "turbo run e2e --filter=@nhost/dashboard",
     "e2e": "turbo run e2e --concurrency=1",
     "changeset": "changeset",
     "docgen": "turbo run build --filter=@nhost/docgen --no-deps && pnpm i && turbo run docgen --filter=!@nhost/docgen --filter=@nhost/* && :",
@@ -64,7 +65,6 @@
     "@vitest/coverage-c8": "^0.29.0",
     "eslint": "^8.26.0",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",
@@ -76,7 +76,7 @@
     "husky": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "turbo": "1.8.3",
+    "turbo": "1.8.5",
     "typedoc": "^0.22.18",
     "typescript": "4.9.5",
     "vite": "^4.0.2",

packages/hasura-storage-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/hasura-storage-js
 
+## 2.0.4
+
+### Patch Changes
+
+- 614f213e: fix(hasura-storage-js): allow image transformation parameters in `getPresignedUrl`
+
 ## 2.0.3
 
 ### Patch Changes

packages/hasura-storage-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/hasura-storage-js",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Hasura-storage client",
   "license": "MIT",
   "keywords": [
@@ -47,6 +47,7 @@
     "e2e": "start-test e2e:backend http-get://localhost:9695 ci:test",
     "ci:test": "vitest run",
     "e2e:backend": "nhost dev --no-browser",
+    "test": "vitest --config ./vite.unit.config.js",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
     "prettier": "prettier --check src/",

packages/hasura-storage-js/src/hasura-storage-client.ts

@@ -129,6 +129,7 @@ export class HasuraStorageClient {
   async getPresignedUrl(
     params: StorageGetPresignedUrlParams
   ): Promise<StorageGetPresignedUrlResponse> {
+    const { fileId, ...imageTransformationParams } = params
     const { presignedUrl, error } = await this.api.getPresignedUrl(params)
     if (error) {
       return { presignedUrl: null, error }
@@ -138,7 +139,18 @@ export class HasuraStorageClient {
       return { presignedUrl: null, error: new Error('Invalid file id') }
     }
 
-    return { presignedUrl, error: null }
+    const urlWithTransformationParams = appendImageTransformationParameters(
+      presignedUrl.url,
+      imageTransformationParams
+    )
+
+    return {
+      presignedUrl: {
+        ...presignedUrl,
+        url: urlWithTransformationParams
+      },
+      error: null
+    }
   }
 
   /**

packages/hasura-storage-js/src/utils/appendImageTransformationParameters/appendImageTransformationParameters.test.ts

@@ -0,0 +1,41 @@
+import { expect, test } from 'vitest'
+import appendImageTransformationParameters from './appendImageTransformationParameters'
+
+test('should append image transformation parameters to a simple URL', () => {
+  expect(
+    appendImageTransformationParameters('https://example.com/', {
+      width: 100,
+      height: 100,
+      blur: 50,
+      quality: 80
+    })
+  ).toBe('https://example.com/?w=100&h=100&b=50&q=80')
+})
+
+test('should append image transformation parameters to a URL with existing query parameters', () => {
+  expect(
+    appendImageTransformationParameters('https://example.com/?foo=bar', {
+      width: 100,
+      height: 100,
+      blur: 50,
+      quality: 80
+    })
+  ).toBe('https://example.com/?foo=bar&w=100&h=100&b=50&q=80')
+})
+
+test('should not append falsy values', () => {
+  expect(
+    appendImageTransformationParameters('https://example.com/', {
+      width: undefined,
+      height: 100,
+      blur: undefined,
+      quality: 80
+    })
+  ).toBe('https://example.com/?h=100&q=80')
+})
+
+test('should keep the original URL if no transformation parameters are provided', () => {
+  expect(appendImageTransformationParameters('https://example.com/', {})).toBe(
+    'https://example.com/'
+  )
+})

packages/hasura-storage-js/src/utils/appendImageTransformationParameters/appendImageTransformationParameters.ts

@@ -0,0 +1,36 @@
+import { StorageImageTransformationParams } from '../types'
+
+/**
+ * Appends image transformation parameters to the URL. If the URL already
+ * contains query parameters, the transformation parameters are appended to
+ * the existing query parameters.
+ *
+ * @internal
+ * @param url - The URL to append the transformation parameters to.
+ * @param params - The image transformation parameters.
+ * @returns The URL with the transformation parameters appended.
+ */
+export default function appendImageTransformationParameters(
+  url: string,
+  params: StorageImageTransformationParams
+): string {
+  const urlObject = new URL(url)
+
+  // create an object with the transformation parameters by using the first
+  // character of the parameter name as the key
+  const imageTransformationParams = Object.entries(params).reduce(
+    (accumulator, [key, value]) => ({ ...accumulator, [key.charAt(0)]: value }),
+    {} as Record<string, any>
+  )
+
+  // set the query parameters in the URL object
+  Object.entries(imageTransformationParams).forEach(([key, value]) => {
+    if (!value) {
+      return
+    }
+
+    urlObject.searchParams.set(key, value)
+  })
+
+  return urlObject.toString()
+}

packages/hasura-storage-js/src/utils/appendImageTransformationParameters/index.ts

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

packages/hasura-storage-js/src/utils/index.ts

@@ -1,13 +1,2 @@
-import { StorageImageTransformationParams } from './types'
-
+export * from './appendImageTransformationParameters'
 export * from './types'
-
-export const appendImageTransformationParameters = (
-  url: string,
-  params: StorageImageTransformationParams
-): string => {
-  const queryParameters = Object.entries(params)
-    .map(([key, value]) => `${key.charAt(0)}=${value}`)
-    .join('&')
-  return queryParameters ? `${url}?${queryParameters}` : url
-}

packages/hasura-storage-js/src/utils/types.ts

@@ -65,9 +65,7 @@ export interface StorageGetUrlParams extends StorageImageTransformationParams {
   fileId: string
 }
 
-// TODO not implemented yet in hasura-storage
-// export interface StorageGetPresignedUrlParams extends StorageImageTransformationParams {
-export interface StorageGetPresignedUrlParams {
+export interface StorageGetPresignedUrlParams extends StorageImageTransformationParams {
   fileId: string
 }
 

packages/hasura-storage-js/vite.unit.config.js

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vite'
+
+import baseConfig from '../../config/vite.lib.config'
+
+const PWD = process.env.PWD
+
+export default defineConfig({
+  ...baseConfig,
+  test: {
+    ...(baseConfig.test || {}),
+    testTimeout: 30000,
+    environment: 'node',
+    include: [`${PWD}/src/**/*.{spec,test}.{ts,tsx}`]
+  }
+})

packages/nextjs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/nextjs
 
+## 1.13.17
+
+### Patch Changes
+
+- @nhost/react@2.0.11
+
 ## 1.13.16
 
 ### Patch Changes

packages/nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/nextjs",
-  "version": "1.13.16",
+  "version": "1.13.17",
   "description": "Nhost NextJS library",
   "license": "MIT",
   "keywords": [

packages/nhost-js/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/nhost-js
 
+## 2.1.1
+
+### Patch Changes
+
+- Updated dependencies [614f213e]
+  - @nhost/hasura-storage-js@2.0.4
+
 ## 2.1.0
 
 ### Minor Changes

packages/nhost-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/nhost-js",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Nhost JavaScript SDK",
   "license": "MIT",
   "keywords": [