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

chore: update versions

.github/workflows/ci.yaml

@@ -24,6 +24,7 @@ env:
   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 }}
+  NHOST_TEST_PROJECT_ADMIN_SECRET: ${{ secrets.NHOST_TEST_PROJECT_ADMIN_SECRET }}
 
 jobs:
   build:

dashboard/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @nhost/dashboard
 
+## 0.14.1
+
+### Patch Changes
+
+- @nhost/react-apollo@5.0.15
+- @nhost/nextjs@1.13.19
+
+## 0.14.0
+
+### Minor Changes
+
+- 6e1f03ea: feat(dashboard): add support for the Azure AD provider
+
+### Patch Changes
+
+- 1bd2c373: chore(deps): bump `turbo` to 1.8.6
+- d329b621: chore(deps): bump `@types/react` to 18.0.30
+- cb248f0d: fix(tests): avoid name collision in database tests
+- 867c8076: chore(deps): bump `@types/react` to 18.0.29
+
 ## 0.13.10
 
 ### Patch Changes

dashboard/Dockerfile

@@ -3,7 +3,7 @@ RUN apk add --no-cache libc6-compat
 RUN apk update
 WORKDIR /app
 
-RUN yarn global add turbo@1.8.3
+RUN yarn global add turbo@1.8.6
 COPY . .
 RUN turbo prune --scope="@nhost/dashboard" --docker
 

dashboard/README.md

@@ -128,4 +128,5 @@ 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>
+NHOST_TEST_PROJECT_ADMIN_SECRET=<test_project_admin_secret>
 ```

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

@@ -7,11 +7,15 @@ import { openProject, prepareTable } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
+import { snakeCase } from 'snake-case';
 
 let page: Page;
 
 test.beforeAll(async ({ browser }) => {
   page = await browser.newPage();
+});
+
+test.beforeEach(async () => {
   await page.goto('/');
 
   await openProject({
@@ -35,7 +39,7 @@ test('should create a simple table', async () => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const tableName = faker.random.word().toLowerCase();
+  const tableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -63,7 +67,7 @@ test('should create a table with unique constraints', async () => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const tableName = faker.random.word().toLowerCase();
+  const tableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -92,7 +96,7 @@ test('should create a table with nullable columns', async () => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const tableName = faker.random.word().toLowerCase();
+  const tableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -121,7 +125,7 @@ test('should create a table with an identity column', async () => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const tableName = faker.random.word().toLowerCase();
+  const tableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -153,7 +157,7 @@ test('should create table with foreign key constraint', async () => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const firstTableName = faker.random.word().toLowerCase();
+  const firstTableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -175,7 +179,7 @@ test('should create table with foreign key constraint', async () => {
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const secondTableName = faker.random.word().toLowerCase();
+  const secondTableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -234,7 +238,7 @@ test('should not be able to create a table with a name that already exists', asy
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const tableName = faker.random.word().toLowerCase();
+  const tableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,

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

@@ -3,15 +3,19 @@ import {
   TEST_PROJECT_SLUG,
   TEST_WORKSPACE_SLUG,
 } from '@/e2e/env';
-import { openProject, prepareTable } from '@/e2e/utils';
+import { deleteTable, openProject, prepareTable } from '@/e2e/utils';
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
+import { snakeCase } from 'snake-case';
 
 let page: Page;
 
 test.beforeAll(async ({ browser }) => {
   page = await browser.newPage();
+});
+
+test.beforeEach(async () => {
   await page.goto('/');
 
   await openProject({
@@ -32,7 +36,7 @@ test.afterAll(async () => {
 });
 
 test('should delete a table', async () => {
-  const tableName = faker.random.word().toLowerCase();
+  const tableName = snakeCase(faker.lorem.words(3));
 
   await page.getByRole('button', { name: /new table/i }).click();
 
@@ -52,26 +56,11 @@ test('should delete a table', async () => {
     `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
   );
 
-  const tableLink = page.getByRole('link', {
+  await deleteTable({
+    page,
     name: tableName,
-    exact: true,
   });
 
-  await tableLink.hover();
-  await page
-    .getByRole('listitem')
-    .filter({ hasText: tableName })
-    .getByRole('button')
-    .click();
-
-  await page.getByRole('menuitem', { name: /delete table/i }).click();
-
-  await expect(
-    page.getByRole('heading', { name: /delete table/i }),
-  ).toBeVisible();
-
-  await page.getByRole('button', { name: /delete/i }).click();
-
   // navigate to next URL
   await page.waitForURL(
     `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/**`,
@@ -86,7 +75,7 @@ test('should not be able to delete a table if other tables have foreign keys ref
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const firstTableName = faker.random.word().toLowerCase();
+  const firstTableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -108,7 +97,7 @@ test('should not be able to delete a table if other tables have foreign keys ref
   await page.getByRole('button', { name: /new table/i }).click();
   await expect(page.getByText(/create a new table/i)).toBeVisible();
 
-  const secondTableName = faker.random.word().toLowerCase();
+  const secondTableName = snakeCase(faker.lorem.words(3));
 
   await prepareTable({
     page,
@@ -163,26 +152,11 @@ test('should not be able to delete a table if other tables have foreign keys ref
   ).toBeVisible();
 
   // try to delete the first table that is referenced by the second table
-  const tableLink = page.getByRole('link', {
+  await deleteTable({
+    page,
     name: firstTableName,
-    exact: true,
   });
 
-  await tableLink.hover();
-  await page
-    .getByRole('listitem')
-    .filter({ hasText: firstTableName })
-    .getByRole('button')
-    .click();
-
-  await page.getByRole('menuitem', { name: /delete table/i }).click();
-
-  await expect(
-    page.getByRole('heading', { name: /delete table/i }),
-  ).toBeVisible();
-
-  await page.getByRole('button', { name: /delete/i }).click();
-
   await expect(
     page.getByText(
       /constraint [a-zA-Z_]+ on table [a-zA-Z_]+ depends on table [a-zA-Z_]+/i,

dashboard/e2e/env.ts

@@ -31,6 +31,12 @@ export const TEST_PROJECT_SLUG = slugify(TEST_PROJECT_NAME, {
   strict: true,
 });
 
+/**
+ * Hasura admin secret of the test project to use.
+ */
+export const TEST_PROJECT_ADMIN_SECRET =
+  process.env.NHOST_TEST_PROJECT_ADMIN_SECRET;
+
 /**
  * Email of the test account to use.
  */

dashboard/e2e/utils.ts

@@ -66,18 +66,25 @@ export async function prepareTable({
 
         // set type
         await page
+          .getByRole('table')
           .getByRole('combobox', { name: /type/i })
           .nth(index)
-          .fill(type);
+          .type(type);
-        await page.getByRole('option', { name: type }).first().click();
+        await page
+          .getByRole('table')
+          .getByRole('option', { name: type })
+          .first()
+          .click();
 
         // optionally set default value
         if (defaultValue) {
           await page
+            .getByRole('table')
             .getByRole('combobox', { name: /default value/i })
-            .first()
+            .nth(index)
-            .fill(defaultValue);
+            .type(defaultValue);
           await page
+            .getByRole('table')
             .getByRole('option', { name: defaultValue })
             .first()
             .click();
@@ -111,3 +118,33 @@ export async function prepareTable({
   await page.getByRole('button', { name: /primary key/i }).click();
   await page.getByRole('option', { name: primaryKey, exact: true }).click();
 }
+
+/**
+ * Deletes a table with the given name.
+ *
+ * @param page - The Playwright page object.
+ * @param name - The name of the table to delete.
+ * @returns A promise that resolves when the table is deleted.
+ */
+export async function deleteTable({
+  page,
+  name,
+}: {
+  page: Page;
+  name: string;
+}) {
+  const tableLink = page.getByRole('link', {
+    name,
+    exact: true,
+  });
+
+  await tableLink.hover();
+  await page
+    .getByRole('listitem')
+    .filter({ hasText: name })
+    .getByRole('button')
+    .click();
+
+  await page.getByRole('menuitem', { name: /delete table/i }).click();
+  await page.getByRole('button', { name: /delete/i }).click();
+}

dashboard/global-setup.ts

@@ -1,19 +1,19 @@
-import { chromium } from '@playwright/test';
 import {
   TEST_DASHBOARD_URL,
   TEST_USER_EMAIL,
   TEST_USER_PASSWORD,
-} from './e2e/env';
+} from '@/e2e/env';
+import { chromium } from '@playwright/test';
 
 async function globalSetup() {
   const browser = await chromium.launch();
-  const page = await browser.newPage();
+  const page = await browser.newPage({ baseURL: TEST_DASHBOARD_URL });
 
-  await page.goto(TEST_DASHBOARD_URL);
+  await page.goto('/');
-  await page.waitForURL(`${TEST_DASHBOARD_URL}/signin`);
+  await page.waitForURL('/signin');
   await page.getByRole('link', { name: /continue with email/i }).click();
 
-  await page.waitForURL(`${TEST_DASHBOARD_URL}/signin/email`);
+  await page.waitForURL('/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();

dashboard/global-teardown.ts

@@ -0,0 +1,66 @@
+import {
+  TEST_DASHBOARD_URL,
+  TEST_PROJECT_ADMIN_SECRET,
+  TEST_PROJECT_NAME,
+  TEST_PROJECT_SLUG,
+  TEST_WORKSPACE_SLUG,
+} from '@/e2e/env';
+import { openProject } from '@/e2e/utils';
+import { chromium } from '@playwright/test';
+
+async function globalTeardown() {
+  const browser = await chromium.launch();
+
+  const context = await browser.newContext({
+    baseURL: TEST_DASHBOARD_URL,
+    storageState: 'storageState.json',
+  });
+
+  const page = await context.newPage();
+
+  await page.goto('/');
+
+  await openProject({
+    page,
+    projectName: TEST_PROJECT_NAME,
+    workspaceSlug: TEST_WORKSPACE_SLUG,
+    projectSlug: TEST_PROJECT_SLUG,
+  });
+
+  const pagePromise = context.waitForEvent('page');
+
+  await page.getByRole('link', { name: /hasura/i }).click();
+  await page.getByRole('link', { name: /open hasura/i }).click();
+
+  const hasuraPage = await pagePromise;
+  await hasuraPage.waitForLoadState();
+
+  const adminSecretInput = hasuraPage.getByPlaceholder(/enter admin-secret/i);
+
+  // note: a more ideal way would be to paste from clipboard, but Playwright
+  // doesn't support that yet
+  await adminSecretInput.fill(TEST_PROJECT_ADMIN_SECRET);
+  await adminSecretInput.press('Enter');
+
+  // note: getByRole doesn't work here
+  await hasuraPage.locator('a', { hasText: /data/i }).click();
+  await hasuraPage.getByRole('link', { name: /sql/i }).click();
+
+  await hasuraPage.getByRole('textbox').fill(`
+DO $$ DECLARE
+  tablename text;
+BEGIN
+  FOR tablename IN
+    SELECT table_name FROM information_schema.tables
+    WHERE table_schema = 'public'
+  LOOP
+    EXECUTE 'DROP TABLE IF EXISTS public.' || quote_ident(tablename) || ' CASCADE';
+  END LOOP;
+END $$;
+`);
+
+  await hasuraPage.getByRole('button', { name: /run!/i }).click();
+  await hasuraPage.getByText(/sql executed!/i).waitFor();
+}
+
+export default globalTeardown;

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.13.10",
+  "version": "0.14.1",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -106,7 +106,7 @@
     "@types/lodash.debounce": "^4.0.7",
     "@types/node": "^16.11.7",
     "@types/pluralize": "^0.0.29",
-    "@types/react": "18.0.28",
+    "@types/react": "18.0.30",
     "@types/react-dom": "18.0.11",
     "@types/react-table": "^7.7.12",
     "@types/testing-library__jest-dom": "^5.14.5",
@@ -141,6 +141,7 @@
     "prettier-plugin-tailwindcss": "^0.2.0",
     "react-date-fns-hooks": "^0.9.4",
     "require-from-string": "^2.0.2",
+    "snake-case": "^3.0.4",
     "storybook-addon-next-router": "^4.0.1",
     "tailwindcss": "^3.1.2",
     "ts-node": "^10.9.1",

dashboard/playwright.config.ts

@@ -17,6 +17,7 @@ export default defineConfig({
   workers: process.env.CI ? 1 : undefined,
   reporter: 'html',
   globalSetup: require.resolve('./global-setup'),
+  globalTeardown: require.resolve('./global-teardown'),
   use: {
     actionTimeout: 0,
     trace: 'on-first-retry',

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

@@ -0,0 +1,201 @@
+import Form from '@/components/common/Form';
+import SettingsContainer from '@/components/settings/SettingsContainer';
+import BaseProviderSettings from '@/components/settings/signInMethods/BaseProviderSettings';
+import { useUI } from '@/context/UIContext';
+import {
+  GetSignInMethodsDocument,
+  useGetSignInMethodsQuery,
+  useUpdateConfigMutation,
+} from '@/generated/graphql';
+import { useCurrentWorkspaceAndApplication } from '@/hooks/useCurrentWorkspaceAndApplication';
+import ActivityIndicator from '@/ui/v2/ActivityIndicator';
+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 generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
+import { copy } from '@/utils/copy';
+import getServerError from '@/utils/settings/getServerError';
+import { getToastStyleProps } from '@/utils/settings/settingsConstants';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { FormProvider, useForm } from 'react-hook-form';
+import { toast } from 'react-hot-toast';
+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: (schema) => schema.required(),
+    }),
+  clientSecret: Yup.string()
+    .label('Client Secret')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  tenant: Yup.string()
+    .label('Tenant')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  enabled: Yup.boolean(),
+});
+
+export type AzureADProviderFormValues = Yup.InferType<typeof validationSchema>;
+
+export default function AzureADProviderSettings() {
+  const { maintenanceActive } = useUI();
+  const { currentApplication } = useCurrentWorkspaceAndApplication();
+  const [updateConfig] = useUpdateConfigMutation({
+    refetchQueries: [GetSignInMethodsDocument],
+  });
+
+  const { data, loading, error } = useGetSignInMethodsQuery({
+    variables: { appId: currentApplication?.id },
+    fetchPolicy: 'cache-only',
+  });
+
+  const { clientId, clientSecret, tenant, enabled } =
+    data?.config?.auth?.method?.oauth?.azuread || {};
+
+  const form = useForm<AzureADProviderFormValues>({
+    reValidateMode: 'onSubmit',
+    defaultValues: {
+      clientId: clientId || '',
+      clientSecret: clientSecret || '',
+      tenant: tenant || '',
+      enabled: enabled || false,
+    },
+    resolver: yupResolver(validationSchema),
+  });
+
+  if (loading) {
+    return (
+      <ActivityIndicator
+        delay={1000}
+        label="Loading settings for Azure AD..."
+        className="justify-center"
+      />
+    );
+  }
+
+  if (error) {
+    throw error;
+  }
+
+  const { register, formState, watch } = form;
+  const authEnabled = watch('enabled');
+
+  const handleProviderUpdate = async (values: AzureADProviderFormValues) => {
+    const updateConfigPromise = updateConfig({
+      variables: {
+        appId: currentApplication.id,
+        config: {
+          auth: {
+            method: {
+              oauth: {
+                azuread: values,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    try {
+      await toast.promise(
+        updateConfigPromise,
+        {
+          loading: `Azure AD settings are being updated...`,
+          success: `Azure AD settings have been updated successfully.`,
+          error: getServerError(
+            `An error occurred while trying to update the project's Azure AD settings.`,
+          ),
+        },
+        getToastStyleProps(),
+      );
+
+      form.reset(values);
+    } catch {
+      // Note: The toast will handle the error.
+    }
+  };
+
+  return (
+    <FormProvider {...form}>
+      <Form onSubmit={handleProviderUpdate}>
+        <SettingsContainer
+          title="Azure AD"
+          description="Allow users to sign in with Azure AD."
+          slotProps={{
+            submitButton: {
+              disabled: !formState.isDirty || maintenanceActive,
+              loading: formState.isSubmitting,
+            },
+          }}
+          icon="/assets/brands/azuread.svg"
+          switchId="enabled"
+          showSwitch
+          className={twMerge(
+            'grid grid-flow-row grid-cols-2 gap-y-4 gap-x-3 px-4 py-2',
+            !authEnabled && 'hidden',
+          )}
+        >
+          <BaseProviderSettings providerName="azuread" />
+          <Input
+            {...register('tenant')}
+            name="tenant"
+            id="tenant"
+            label="Tenant ID"
+            placeholder="Tenant ID"
+            className="col-span-2"
+            fullWidth
+            hideEmptyHelperText
+            error={!!formState.errors?.tenant}
+            helperText={formState.errors?.tenant?.message}
+          />
+          <Input
+            name="redirectUrl"
+            id="redirectUrl"
+            defaultValue={`${generateAppServiceUrl(
+              currentApplication.subdomain,
+              currentApplication.region.awsName,
+              'auth',
+            )}/signin/provider/azuread/callback`}
+            className="col-span-2"
+            fullWidth
+            hideEmptyHelperText
+            label="Redirect URL"
+            disabled
+            endAdornment={
+              <InputAdornment position="end" className="absolute right-2">
+                <IconButton
+                  sx={{ minWidth: 0, padding: 0 }}
+                  color="secondary"
+                  variant="borderless"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    copy(
+                      `${generateAppServiceUrl(
+                        currentApplication.subdomain,
+                        currentApplication.region.awsName,
+                        'auth',
+                      )}/signin/provider/azuread/callback`,
+                      'Redirect URL',
+                    );
+                  }}
+                >
+                  <CopyIcon className="h-4 w-4" />
+                </IconButton>
+              </InputAdornment>
+            }
+          />
+        </SettingsContainer>
+      </Form>
+    </FormProvider>
+  );
+}

dashboard/src/components/settings/signInMethods/AzureADProviderSettings/index.ts

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

dashboard/src/gql/app/settings/signInMethods/getSignInMethods.graphql

@@ -100,6 +100,12 @@ query GetSignInMethods($appId: uuid!) {
             connection
             organization
           }
+          azuread {
+            enabled
+            clientId
+            clientSecret
+            tenant
+          }
         }
       }
     }

dashboard/src/pages/[workspaceSlug]/[appSlug]/settings/sign-in-methods/index.tsx

@@ -2,6 +2,7 @@ import Container from '@/components/layout/Container';
 import SettingsLayout from '@/components/settings/SettingsLayout';
 import AnonymousSignInSettings from '@/components/settings/signInMethods/AnonymousSignInSettings';
 import AppleProviderSettings from '@/components/settings/signInMethods/AppleProviderSettings';
+import AzureADProviderSettings from '@/components/settings/signInMethods/AzureADProviderSettings';
 import DiscordProviderSettings from '@/components/settings/signInMethods/DiscordProviderSettings';
 import EmailAndPasswordSettings from '@/components/settings/signInMethods/EmailAndPasswordSettings';
 import FacebookProviderSettings from '@/components/settings/signInMethods/FacebookProviderSettings';
@@ -56,6 +57,7 @@ export default function SettingsSignInMethodsPage() {
       <SMSSettings />
       {!currentApplication.providersUpdated && <ProvidersUpdatedAlert />}
       <AppleProviderSettings />
+      <AzureADProviderSettings />
       <DiscordProviderSettings />
       <FacebookProviderSettings />
       <GitHubProviderSettings />

dashboard/src/utils/__generated__/graphql.ts

@@ -25,7 +25,9 @@ export type Scalars = {
   bpchar: any;
   bytea: any;
   citext: any;
+  float64: any;
   jsonb: any;
+  labels: any;
   smallint: any;
   timestamp: any;
   timestamptz: any;
@@ -1035,7 +1037,9 @@ export type ConfigGlobalUpdateInput = {
 export type ConfigHasura = {
   __typename?: 'ConfigHasura';
   adminSecret: Scalars['String'];
+  events?: Maybe<ConfigHasuraEvents>;
   jwtSecrets?: Maybe<Array<ConfigJwtSecret>>;
+  logs?: Maybe<ConfigHasuraLogs>;
   resources?: Maybe<ConfigResources>;
   settings?: Maybe<ConfigHasuraSettings>;
   version?: Maybe<Scalars['String']>;
@@ -1047,22 +1051,66 @@ export type ConfigHasuraComparisonExp = {
   _not?: InputMaybe<ConfigHasuraComparisonExp>;
   _or?: InputMaybe<Array<ConfigHasuraComparisonExp>>;
   adminSecret?: InputMaybe<ConfigStringComparisonExp>;
+  events?: InputMaybe<ConfigHasuraEventsComparisonExp>;
   jwtSecrets?: InputMaybe<ConfigJwtSecretComparisonExp>;
+  logs?: InputMaybe<ConfigHasuraLogsComparisonExp>;
   resources?: InputMaybe<ConfigResourcesComparisonExp>;
   settings?: InputMaybe<ConfigHasuraSettingsComparisonExp>;
   version?: InputMaybe<ConfigStringComparisonExp>;
   webhookSecret?: InputMaybe<ConfigStringComparisonExp>;
 };
 
+export type ConfigHasuraEvents = {
+  __typename?: 'ConfigHasuraEvents';
+  httpPoolSize?: Maybe<Scalars['ConfigUint32']>;
+};
+
+export type ConfigHasuraEventsComparisonExp = {
+  _and?: InputMaybe<Array<ConfigHasuraEventsComparisonExp>>;
+  _not?: InputMaybe<ConfigHasuraEventsComparisonExp>;
+  _or?: InputMaybe<Array<ConfigHasuraEventsComparisonExp>>;
+  httpPoolSize?: InputMaybe<ConfigUint32ComparisonExp>;
+};
+
+export type ConfigHasuraEventsInsertInput = {
+  httpPoolSize?: InputMaybe<Scalars['ConfigUint32']>;
+};
+
+export type ConfigHasuraEventsUpdateInput = {
+  httpPoolSize?: InputMaybe<Scalars['ConfigUint32']>;
+};
+
 export type ConfigHasuraInsertInput = {
   adminSecret: Scalars['String'];
+  events?: InputMaybe<ConfigHasuraEventsInsertInput>;
   jwtSecrets?: InputMaybe<Array<ConfigJwtSecretInsertInput>>;
+  logs?: InputMaybe<ConfigHasuraLogsInsertInput>;
   resources?: InputMaybe<ConfigResourcesInsertInput>;
   settings?: InputMaybe<ConfigHasuraSettingsInsertInput>;
   version?: InputMaybe<Scalars['String']>;
   webhookSecret: Scalars['String'];
 };
 
+export type ConfigHasuraLogs = {
+  __typename?: 'ConfigHasuraLogs';
+  level?: Maybe<Scalars['String']>;
+};
+
+export type ConfigHasuraLogsComparisonExp = {
+  _and?: InputMaybe<Array<ConfigHasuraLogsComparisonExp>>;
+  _not?: InputMaybe<ConfigHasuraLogsComparisonExp>;
+  _or?: InputMaybe<Array<ConfigHasuraLogsComparisonExp>>;
+  level?: InputMaybe<ConfigStringComparisonExp>;
+};
+
+export type ConfigHasuraLogsInsertInput = {
+  level?: InputMaybe<Scalars['String']>;
+};
+
+export type ConfigHasuraLogsUpdateInput = {
+  level?: InputMaybe<Scalars['String']>;
+};
+
 export type ConfigHasuraSettings = {
   __typename?: 'ConfigHasuraSettings';
   enableRemoteSchemaPermissions?: Maybe<Scalars['Boolean']>;
@@ -1085,7 +1133,9 @@ export type ConfigHasuraSettingsUpdateInput = {
 
 export type ConfigHasuraUpdateInput = {
   adminSecret?: InputMaybe<Scalars['String']>;
+  events?: InputMaybe<ConfigHasuraEventsUpdateInput>;
   jwtSecrets?: InputMaybe<Array<ConfigJwtSecretUpdateInput>>;
+  logs?: InputMaybe<ConfigHasuraLogsUpdateInput>;
   resources?: InputMaybe<ConfigResourcesUpdateInput>;
   settings?: InputMaybe<ConfigHasuraSettingsUpdateInput>;
   version?: InputMaybe<Scalars['String']>;
@@ -1639,6 +1689,24 @@ export type Log = {
   timestamp: Scalars['Timestamp'];
 };
 
+export type Metrics = {
+  __typename?: 'Metrics';
+  rows: Array<RowMetric>;
+};
+
+export type RowMetric = {
+  __typename?: 'RowMetric';
+  labels?: Maybe<Scalars['labels']>;
+  time: Scalars['Timestamp'];
+  value?: Maybe<Scalars['float64']>;
+};
+
+export type StatsLiveApps = {
+  __typename?: 'StatsLiveApps';
+  appID: Array<Scalars['uuid']>;
+  count: Scalars['Int'];
+};
+
 /** Boolean expression to compare columns of type "String". All fields are combined with logical 'AND'. */
 export type String_Comparison_Exp = {
   _eq?: InputMaybe<Scalars['String']>;
@@ -4878,6 +4946,7 @@ export type Backups = {
   appId: Scalars['uuid'];
   completedAt?: Maybe<Scalars['timestamptz']>;
   createdAt: Scalars['timestamptz'];
+  expiresAt?: Maybe<Scalars['timestamptz']>;
   id: Scalars['uuid'];
   size: Scalars['bigint'];
 };
@@ -4965,6 +5034,7 @@ export type Backups_Bool_Exp = {
   appId?: InputMaybe<Uuid_Comparison_Exp>;
   completedAt?: InputMaybe<Timestamptz_Comparison_Exp>;
   createdAt?: InputMaybe<Timestamptz_Comparison_Exp>;
+  expiresAt?: InputMaybe<Timestamptz_Comparison_Exp>;
   id?: InputMaybe<Uuid_Comparison_Exp>;
   size?: InputMaybe<Bigint_Comparison_Exp>;
 };
@@ -4986,6 +5056,7 @@ export type Backups_Insert_Input = {
   appId?: InputMaybe<Scalars['uuid']>;
   completedAt?: InputMaybe<Scalars['timestamptz']>;
   createdAt?: InputMaybe<Scalars['timestamptz']>;
+  expiresAt?: InputMaybe<Scalars['timestamptz']>;
   id?: InputMaybe<Scalars['uuid']>;
   size?: InputMaybe<Scalars['bigint']>;
 };
@@ -4996,6 +5067,7 @@ export type Backups_Max_Fields = {
   appId?: Maybe<Scalars['uuid']>;
   completedAt?: Maybe<Scalars['timestamptz']>;
   createdAt?: Maybe<Scalars['timestamptz']>;
+  expiresAt?: Maybe<Scalars['timestamptz']>;
   id?: Maybe<Scalars['uuid']>;
   size?: Maybe<Scalars['bigint']>;
 };
@@ -5005,6 +5077,7 @@ export type Backups_Max_Order_By = {
   appId?: InputMaybe<Order_By>;
   completedAt?: InputMaybe<Order_By>;
   createdAt?: InputMaybe<Order_By>;
+  expiresAt?: InputMaybe<Order_By>;
   id?: InputMaybe<Order_By>;
   size?: InputMaybe<Order_By>;
 };
@@ -5015,6 +5088,7 @@ export type Backups_Min_Fields = {
   appId?: Maybe<Scalars['uuid']>;
   completedAt?: Maybe<Scalars['timestamptz']>;
   createdAt?: Maybe<Scalars['timestamptz']>;
+  expiresAt?: Maybe<Scalars['timestamptz']>;
   id?: Maybe<Scalars['uuid']>;
   size?: Maybe<Scalars['bigint']>;
 };
@@ -5024,6 +5098,7 @@ export type Backups_Min_Order_By = {
   appId?: InputMaybe<Order_By>;
   completedAt?: InputMaybe<Order_By>;
   createdAt?: InputMaybe<Order_By>;
+  expiresAt?: InputMaybe<Order_By>;
   id?: InputMaybe<Order_By>;
   size?: InputMaybe<Order_By>;
 };
@@ -5050,6 +5125,7 @@ export type Backups_Order_By = {
   appId?: InputMaybe<Order_By>;
   completedAt?: InputMaybe<Order_By>;
   createdAt?: InputMaybe<Order_By>;
+  expiresAt?: InputMaybe<Order_By>;
   id?: InputMaybe<Order_By>;
   size?: InputMaybe<Order_By>;
 };
@@ -5068,6 +5144,8 @@ export enum Backups_Select_Column {
   /** column name */
   CreatedAt = 'createdAt',
   /** column name */
+  ExpiresAt = 'expiresAt',
+  /** column name */
   Id = 'id',
   /** column name */
   Size = 'size'
@@ -5078,6 +5156,7 @@ export type Backups_Set_Input = {
   appId?: InputMaybe<Scalars['uuid']>;
   completedAt?: InputMaybe<Scalars['timestamptz']>;
   createdAt?: InputMaybe<Scalars['timestamptz']>;
+  expiresAt?: InputMaybe<Scalars['timestamptz']>;
   id?: InputMaybe<Scalars['uuid']>;
   size?: InputMaybe<Scalars['bigint']>;
 };
@@ -5128,6 +5207,7 @@ export type Backups_Stream_Cursor_Value_Input = {
   appId?: InputMaybe<Scalars['uuid']>;
   completedAt?: InputMaybe<Scalars['timestamptz']>;
   createdAt?: InputMaybe<Scalars['timestamptz']>;
+  expiresAt?: InputMaybe<Scalars['timestamptz']>;
   id?: InputMaybe<Scalars['uuid']>;
   size?: InputMaybe<Scalars['bigint']>;
 };
@@ -5152,6 +5232,8 @@ export enum Backups_Update_Column {
   /** column name */
   CreatedAt = 'createdAt',
   /** column name */
+  ExpiresAt = 'expiresAt',
+  /** column name */
   Id = 'id',
   /** column name */
   Size = 'size'
@@ -9150,6 +9232,7 @@ export type Mutation_Root = {
   /** insert a single row into the table: "regions" */
   insert_regions_one?: Maybe<Regions>;
   migrateRDSToPostgres: Scalars['Boolean'];
+  pauseInactiveApps: Array<Scalars['String']>;
   resetPostgresPassword: Scalars['Boolean'];
   restoreApplicationDatabase: Scalars['Boolean'];
   /** update single row of the table: "apps" */
@@ -9338,9 +9421,16 @@ export type Mutation_Root = {
 };
 
 
+/** mutation root */
+export type Mutation_RootBackupAllApplicationsDatabaseArgs = {
+  expireInDays?: InputMaybe<Scalars['Int']>;
+};
+
+
 /** mutation root */
 export type Mutation_RootBackupApplicationDatabaseArgs = {
   appID: Scalars['String'];
+  expireInDays?: InputMaybe<Scalars['Int']>;
 };
 
 
@@ -11947,6 +12037,41 @@ export type Query_Root = {
   files: Array<Files>;
   /** fetch aggregated fields from the table: "storage.files" */
   filesAggregate: Files_Aggregate;
+  /**
+   * Returns CPU metrics for a given application.
+   * If `from` and `to` are not provided, they default to an hour ago and now, respectively.
+   *
+   * CPU usage is calculated as the average CPU usage over the period of 1m.
+   *
+   * Unit returned is millicores.
+   */
+  getCPUMetrics: Metrics;
+  /**
+   * Returns memory metrics for a given application.
+   * If `from` and `to` are not provided, they default to an hour ago and now, respectively.
+   *
+   * Memory usage is returned in MiB.
+   */
+  getMemoryMetrics: Metrics;
+  /**
+   * Returns disk capacity for the volume used by postgres to store the database.
+   * If `from` and `to` are not provided, they default to an hour ago and now, respectively.
+   *
+   * Disk usage is returned in MiB.
+   */
+  getPostgresVolumeCapacity: Metrics;
+  /**
+   * Returns disk usage for the volume used by postgres to store the database.
+   * If `from` and `to` are not provided, they default to an hour ago and now, respectively.
+   *
+   * Disk usage is returned in MiB.
+   */
+  getPostgresVolumeUsage: Metrics;
+  /**
+   * Return requests per second for a given application by service.
+   * If `from` and `to` are not provided, they default to an hour ago and now, respectively.
+   */
+  getRequestsPerSecond: Metrics;
   /** fetch data from the table: "github_app_installations" using primary key columns */
   githubAppInstallation?: Maybe<GithubAppInstallations>;
   /** fetch data from the table: "github_app_installations" */
@@ -11982,6 +12107,13 @@ export type Query_Root = {
   regions_aggregate: Regions_Aggregate;
   /** fetch data from the table: "regions" using primary key columns */
   regions_by_pk?: Maybe<Regions>;
+  /**
+   * Returns lists of apps that have some live traffic in the give time range.
+   * From defaults to 24 hours ago and to defaults to now.
+   *
+   * Requests that returned a 4xx or 5xx status code are not counted as live traffic.
+   */
+  statsLiveApps: StatsLiveApps;
   systemConfig?: Maybe<ConfigSystemConfig>;
   systemConfigs: Array<ConfigAppSystemConfig>;
   /** fetch data from the table: "auth.users" using primary key columns */
@@ -12511,6 +12643,41 @@ export type Query_RootFilesAggregateArgs = {
 };
 
 
+export type Query_RootGetCpuMetricsArgs = {
+  appID: Scalars['String'];
+  from?: InputMaybe<Scalars['Timestamp']>;
+  to?: InputMaybe<Scalars['Timestamp']>;
+};
+
+
+export type Query_RootGetMemoryMetricsArgs = {
+  appID: Scalars['String'];
+  from?: InputMaybe<Scalars['Timestamp']>;
+  to?: InputMaybe<Scalars['Timestamp']>;
+};
+
+
+export type Query_RootGetPostgresVolumeCapacityArgs = {
+  appID: Scalars['String'];
+  from?: InputMaybe<Scalars['Timestamp']>;
+  to?: InputMaybe<Scalars['Timestamp']>;
+};
+
+
+export type Query_RootGetPostgresVolumeUsageArgs = {
+  appID: Scalars['String'];
+  from?: InputMaybe<Scalars['Timestamp']>;
+  to?: InputMaybe<Scalars['Timestamp']>;
+};
+
+
+export type Query_RootGetRequestsPerSecondArgs = {
+  appID: Scalars['String'];
+  from?: InputMaybe<Scalars['Timestamp']>;
+  to?: InputMaybe<Scalars['Timestamp']>;
+};
+
+
 export type Query_RootGithubAppInstallationArgs = {
   id: Scalars['uuid'];
 };
@@ -12634,6 +12801,12 @@ export type Query_RootRegions_By_PkArgs = {
 };
 
 
+export type Query_RootStatsLiveAppsArgs = {
+  from?: InputMaybe<Scalars['Timestamp']>;
+  to?: InputMaybe<Scalars['Timestamp']>;
+};
+
+
 export type Query_RootSystemConfigArgs = {
   appID: Scalars['uuid'];
 };
@@ -16480,7 +16653,7 @@ export type GetSignInMethodsQueryVariables = Exact<{
 }>;
 
 
-export type GetSignInMethodsQuery = { __typename?: 'query_root', config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', provider?: { __typename: 'ConfigProvider', id: 'ConfigProvider', sms?: { __typename?: 'ConfigSms', accountSid: string, authToken: string, messagingServiceId: string, provider?: string | null } | null } | null, auth?: { __typename: 'ConfigAuth', id: 'ConfigAuth', method?: { __typename?: 'ConfigAuthMethod', emailPassword?: { __typename?: 'ConfigAuthMethodEmailPassword', emailVerificationRequired?: boolean | null, hibpEnabled?: boolean | null } | null, emailPasswordless?: { __typename?: 'ConfigAuthMethodEmailPasswordless', enabled?: boolean | null } | null, smsPasswordless?: { __typename?: 'ConfigAuthMethodSmsPasswordless', enabled?: boolean | null } | null, anonymous?: { __typename?: 'ConfigAuthMethodAnonymous', enabled?: boolean | null } | null, webauthn?: { __typename?: 'ConfigAuthMethodWebauthn', enabled?: boolean | null } | null, oauth?: { __typename?: 'ConfigAuthMethodOauth', apple?: { __typename?: 'ConfigAuthMethodOauthApple', enabled?: boolean | null, clientId?: string | null, keyId?: string | null, teamId?: string | null, privateKey?: string | null } | null, discord?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, facebook?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, github?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, google?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, linkedin?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, spotify?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, twitch?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, twitter?: { __typename?: 'ConfigAuthMethodOauthTwitter', enabled?: boolean | null, consumerKey?: string | null, consumerSecret?: string | null } | null, windowslive?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, workos?: { __typename?: 'ConfigAuthMethodOauthWorkos', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, connection?: string | null, organization?: string | null } | null } | null } | null } | null } | null };
+export type GetSignInMethodsQuery = { __typename?: 'query_root', config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', provider?: { __typename: 'ConfigProvider', id: 'ConfigProvider', sms?: { __typename?: 'ConfigSms', accountSid: string, authToken: string, messagingServiceId: string, provider?: string | null } | null } | null, auth?: { __typename: 'ConfigAuth', id: 'ConfigAuth', method?: { __typename?: 'ConfigAuthMethod', emailPassword?: { __typename?: 'ConfigAuthMethodEmailPassword', emailVerificationRequired?: boolean | null, hibpEnabled?: boolean | null } | null, emailPasswordless?: { __typename?: 'ConfigAuthMethodEmailPasswordless', enabled?: boolean | null } | null, smsPasswordless?: { __typename?: 'ConfigAuthMethodSmsPasswordless', enabled?: boolean | null } | null, anonymous?: { __typename?: 'ConfigAuthMethodAnonymous', enabled?: boolean | null } | null, webauthn?: { __typename?: 'ConfigAuthMethodWebauthn', enabled?: boolean | null } | null, oauth?: { __typename?: 'ConfigAuthMethodOauth', apple?: { __typename?: 'ConfigAuthMethodOauthApple', enabled?: boolean | null, clientId?: string | null, keyId?: string | null, teamId?: string | null, privateKey?: string | null } | null, discord?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, facebook?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, github?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, google?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, linkedin?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, spotify?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, twitch?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, twitter?: { __typename?: 'ConfigAuthMethodOauthTwitter', enabled?: boolean | null, consumerKey?: string | null, consumerSecret?: string | null } | null, windowslive?: { __typename?: 'ConfigStandardOauthProviderWithScope', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, scope?: Array<string> | null } | null, workos?: { __typename?: 'ConfigAuthMethodOauthWorkos', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, connection?: string | null, organization?: string | null } | null, azuread?: { __typename?: 'ConfigAuthMethodOauthAzuread', enabled?: boolean | null, clientId?: string | null, clientSecret?: string | null, tenant?: string | null } | null } | null } | null } | null } | null };
 
 export type GetSmtpSettingsQueryVariables = Exact<{
   appId: Scalars['uuid'];
@@ -18282,6 +18455,12 @@ export const GetSignInMethodsDocument = gql`
             connection
             organization
           }
+          azuread {
+            enabled
+            clientId
+            clientSecret
+            tenant
+          }
         }
       }
     }

examples/codegen-react-apollo/nhost/config.yaml

@@ -13,7 +13,7 @@ services:
       postgres_password: postgres
       postgres_user: postgres
   auth:
-    image: nhost/hasura-auth:0.16.1
+    image: nhost/hasura-auth:0.16.2
   storage:
     image: nhost/hasura-storage:0.3.0
 auth:

examples/codegen-react-query/nhost/config.yaml

@@ -13,7 +13,7 @@ services:
       postgres_password: postgres
       postgres_user: postgres
   auth:
-    image: nhost/hasura-auth:0.16.1
+    image: nhost/hasura-auth:0.16.2
   storage:
     image: nhost/hasura-storage:0.3.0
 auth:

examples/codegen-react-urql/nhost/config.yaml

@@ -13,7 +13,7 @@ services:
       postgres_password: postgres
       postgres_user: postgres
   auth:
-    image: nhost/hasura-auth:0.16.1
+    image: nhost/hasura-auth:0.16.2
   storage:
     image: nhost/hasura-storage:0.3.0
 auth:

integrations/apollo/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/apollo
 
+## 5.2.0
+
+### Patch Changes
+
+- Updated dependencies [a0e093d7]
+  - @nhost/nhost-js@2.2.0
+
 ## 5.1.3
 
 ### Patch Changes

integrations/apollo/package.json

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

integrations/react-apollo/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/react-apollo
 
+## 5.0.15
+
+### Patch Changes
+
+- @nhost/apollo@5.2.0
+- @nhost/react@2.0.13
+
 ## 5.0.14
 
 ### Patch Changes

integrations/react-apollo/package.json

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

integrations/react-urql/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/react-urql
 
+## 2.0.13
+
+### Patch Changes
+
+- @nhost/react@2.0.13
+
 ## 2.0.12
 
 ### Patch Changes

integrations/react-urql/package.json

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

package.json

@@ -76,7 +76,7 @@
     "husky": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "turbo": "1.8.5",
+    "turbo": "1.8.6",
     "typedoc": "^0.22.18",
     "typescript": "4.9.5",
     "vite": "^4.0.2",

packages/hasura-auth-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/hasura-auth-js
 
+## 2.1.0
+
+### Minor Changes
+
+- a0e093d7: fix(exports): don't use conflicting names in exports
+
 ## 2.0.2
 
 ### Patch Changes

packages/hasura-auth-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/hasura-auth-js",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Hasura-auth client",
   "license": "MIT",
   "keywords": [
@@ -43,7 +43,8 @@
   },
   "scripts": {
     "dev": "vite build --config ./vite.dev.config.js",
-    "build": "run-p build:lib build:umd",
+    "build": "run-p typecheck build:lib build:umd",
+    "typecheck": "tsc --noEmit",
     "build:lib": "vite build",
     "build:umd": "vite build --config ../../config/vite.lib.umd.config.js",
     "test": "vitest run",

packages/hasura-auth-js/src/errors.ts

@@ -1,4 +1,4 @@
-import { ErrorPayload } from './types'
+import { AuthErrorPayload } from './types'
 
 export const NETWORK_ERROR_CODE = 0
 export const OTHER_ERROR_CODE = 1
@@ -12,8 +12,8 @@ export const STATE_ERROR_CODE = 20
  * See https://github.com/statelyai/xstate/issues/3037
  */
 export class CodifiedError extends Error {
-  error: ErrorPayload
+  error: AuthErrorPayload
-  constructor(original: Error | ErrorPayload) {
+  constructor(original: Error | AuthErrorPayload) {
     super(original.message)
     Error.captureStackTrace(this, this.constructor)
     if (original instanceof Error) {
@@ -30,95 +30,95 @@ export class CodifiedError extends Error {
   }
 }
 
-export type ValidationErrorPayload = ErrorPayload & { status: typeof VALIDATION_ERROR_CODE }
+export type ValidationAuthErrorPayload = AuthErrorPayload & { status: typeof VALIDATION_ERROR_CODE }
 
 // TODO share with hasura-auth
-export const INVALID_EMAIL_ERROR: ValidationErrorPayload = {
+export const INVALID_EMAIL_ERROR: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'invalid-email',
   message: 'Email is incorrectly formatted'
 }
 
-export const INVALID_MFA_TYPE_ERROR: ValidationErrorPayload = {
+export const INVALID_MFA_TYPE_ERROR: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'invalid-mfa-type',
   message: 'MFA type is invalid'
 }
 
-export const INVALID_MFA_CODE_ERROR: ValidationErrorPayload = {
+export const INVALID_MFA_CODE_ERROR: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'invalid-mfa-code',
   message: 'MFA code is invalid'
 }
 
-export const INVALID_PASSWORD_ERROR: ValidationErrorPayload = {
+export const INVALID_PASSWORD_ERROR: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'invalid-password',
   message: 'Password is incorrectly formatted'
 }
 
-export const INVALID_PHONE_NUMBER_ERROR: ValidationErrorPayload = {
+export const INVALID_PHONE_NUMBER_ERROR: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'invalid-phone-number',
   message: 'Phone number is incorrectly formatted'
 }
 
-export const INVALID_MFA_TICKET_ERROR: ValidationErrorPayload = {
+export const INVALID_MFA_TICKET_ERROR: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'invalid-mfa-ticket',
   message: 'MFA ticket is invalid'
 }
 
-export const NO_MFA_TICKET_ERROR: ValidationErrorPayload = {
+export const NO_MFA_TICKET_ERROR: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'no-mfa-ticket',
   message: 'No MFA ticket has been provided'
 }
 
-export const NO_REFRESH_TOKEN: ValidationErrorPayload = {
+export const NO_REFRESH_TOKEN: ValidationAuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'no-refresh-token',
   message: 'No refresh token has been provided'
 }
 
-export const TOKEN_REFRESHER_RUNNING_ERROR: ErrorPayload = {
+export const TOKEN_REFRESHER_RUNNING_ERROR: AuthErrorPayload = {
   status: STATE_ERROR_CODE,
   error: 'refresher-already-running',
   message:
     'The token refresher is already running. You must wait until is has finished before submitting a new token.'
 }
 
-export const USER_ALREADY_SIGNED_IN: ErrorPayload = {
+export const USER_ALREADY_SIGNED_IN: AuthErrorPayload = {
   status: STATE_ERROR_CODE,
   error: 'already-signed-in',
   message: 'User is already signed in'
 }
 
-export const USER_UNAUTHENTICATED: ErrorPayload = {
+export const USER_UNAUTHENTICATED: AuthErrorPayload = {
   status: STATE_ERROR_CODE,
   error: 'unauthenticated-user',
   message: 'User is not authenticated'
 }
 
-export const USER_NOT_ANONYMOUS: ErrorPayload = {
+export const USER_NOT_ANONYMOUS: AuthErrorPayload = {
   status: STATE_ERROR_CODE,
   error: 'user-not-anonymous',
   message: 'User is not anonymous'
 }
 
-export const EMAIL_NEEDS_VERIFICATION: ErrorPayload = {
+export const EMAIL_NEEDS_VERIFICATION: AuthErrorPayload = {
   status: STATE_ERROR_CODE,
   error: 'unverified-user',
   message: 'Email needs verification'
 }
 
-export const INVALID_REFRESH_TOKEN = {
+export const INVALID_REFRESH_TOKEN: AuthErrorPayload = {
   status: VALIDATION_ERROR_CODE,
   error: 'invalid-refresh-token',
   message: 'Invalid or expired refresh token'
 }
 
-export const INVALID_SIGN_IN_METHOD = {
+export const INVALID_SIGN_IN_METHOD: AuthErrorPayload = {
   status: OTHER_ERROR_CODE,
   error: 'invalid-sign-in-method',
   message: 'Invalid sign-in method'

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

@@ -34,13 +34,13 @@ import {
 } from './promises'
 import {
   AuthChangedFunction,
+  AuthErrorPayload,
   ChangeEmailParams,
   ChangeEmailResponse,
   ChangePasswordParams,
   ChangePasswordResponse,
   DeanonymizeParams,
   DeanonymizeResponse,
-  ErrorPayload,
   JWTClaims,
   JWTHasuraClaims,
   NhostAuthConstructorParams,
@@ -411,7 +411,7 @@ export class HasuraAuthClient {
    */
   async addSecurityKey(
     nickname?: string
-  ): Promise<{ error: ErrorPayload | null; key?: SecurityKey }> {
+  ): Promise<{ error: AuthErrorPayload | null; key?: SecurityKey }> {
     const { error, key } = await addSecurityKeyPromise(this._client, nickname)
     return { error, key }
   }

packages/hasura-auth-js/src/machines/authentication/context.ts

@@ -1,4 +1,4 @@
-import { ErrorPayload, User } from '../../types'
+import { AuthErrorPayload, User } from '../../types'
 
 export type StateErrorTypes = 'registration' | 'authentication' | 'signout'
 
@@ -21,7 +21,7 @@ export type AuthContext = {
   }
   /** Number of times the user tried to get an access token from a refresh token but got a network error */
   importTokenAttempts: number
-  errors: Partial<Record<StateErrorTypes, ErrorPayload>>
+  errors: Partial<Record<StateErrorTypes, AuthErrorPayload>>
 }
 
 export const INITIAL_MACHINE_CONTEXT: AuthContext = {

packages/hasura-auth-js/src/machines/authentication/machine.ts

@@ -24,9 +24,9 @@ import {
 } from '../../errors'
 import { localStorageGetter, localStorageSetter } from '../../local-storage'
 import {
+  AuthErrorPayload,
   AuthOptions,
   DeanonymizeResponse,
-  ErrorPayload,
   NhostSession,
   NhostSessionResponse,
   PasswordlessEmailResponse,
@@ -856,7 +856,7 @@ export const createAuthMachine = ({
               error: null
             }
           }
-          let error: ErrorPayload | null = null
+          let error: AuthErrorPayload | null = null
           if (autoSignIn) {
             const urlToken = getParameterByName('refreshToken') || null
             if (urlToken) {
@@ -866,7 +866,7 @@ export const createAuthMachine = ({
                 })
                 return { session, error: null }
               } catch (exception) {
-                error = (exception as { error: ErrorPayload }).error
+                error = (exception as { error: AuthErrorPayload }).error
               }
             } else {
               const error = getParameterByName('error')
@@ -890,7 +890,7 @@ export const createAuthMachine = ({
               })
               return { session, error: null }
             } catch (exception) {
-              error = (exception as { error: ErrorPayload }).error
+              error = (exception as { error: AuthErrorPayload }).error
             }
           }
           if (error) {

packages/hasura-auth-js/src/machines/change-email.ts

@@ -1,12 +1,12 @@
 import { assign, createMachine, send } from 'xstate'
 import { INVALID_EMAIL_ERROR } from '../errors'
 import { AuthClient } from '../internal-client'
-import { ChangeEmailOptions, ChangeEmailResponse, ErrorPayload } from '../types'
+import { AuthErrorPayload, ChangeEmailOptions, ChangeEmailResponse } from '../types'
 import { postFetch, rewriteRedirectTo } from '../utils'
 import { isValidEmail } from '../utils/validators'
 
 export type ChangeEmailContext = {
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
 }
 
 export type ChangeEmailEvents =
@@ -16,7 +16,7 @@ export type ChangeEmailEvents =
       options?: ChangeEmailOptions
     }
   | { type: 'SUCCESS' }
-  | { type: 'ERROR'; error: ErrorPayload | null }
+  | { type: 'ERROR'; error: AuthErrorPayload | null }
 
 export type ChangeEmailServices = {
   request: { data: ChangeEmailResponse }

packages/hasura-auth-js/src/machines/change-email.typegen.ts

@@ -16,9 +16,9 @@ export interface Typegen0 {
   }
   missingImplementations: {
     actions: never
-    services: never
-    guards: never
     delays: never
+    guards: never
+    services: never
   }
   eventsCausingActions: {
     reportError: 'error.platform.requestChange'
@@ -26,13 +26,13 @@ export interface Typegen0 {
     saveInvalidEmailError: 'REQUEST'
     saveRequestError: 'error.platform.requestChange'
   }
-  eventsCausingServices: {
+  eventsCausingDelays: {}
-    requestChange: 'REQUEST'
-  }
   eventsCausingGuards: {
     invalidEmail: 'REQUEST'
   }
-  eventsCausingDelays: {}
+  eventsCausingServices: {
+    requestChange: 'REQUEST'
+  }
   matchesStates:
     | 'idle'
     | 'idle.error'

packages/hasura-auth-js/src/machines/change-password.ts

@@ -1,12 +1,12 @@
 import { assign, createMachine, send } from 'xstate'
 import { INVALID_PASSWORD_ERROR } from '../errors'
 import { AuthClient } from '../internal-client'
-import { ChangePasswordResponse, ErrorPayload } from '../types'
+import { AuthErrorPayload, ChangePasswordResponse } from '../types'
 import { postFetch } from '../utils'
 import { isValidPassword } from '../utils/validators'
 
 export type ChangePasswordContext = {
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
 }
 export type ChangePasswordEvents =
   | {
@@ -15,7 +15,7 @@ export type ChangePasswordEvents =
       ticket?: string
     }
   | { type: 'SUCCESS' }
-  | { type: 'ERROR'; error: ErrorPayload | null }
+  | { type: 'ERROR'; error: AuthErrorPayload | null }
 
 export type ChangePasswordServices = {
   requestChange: { data: ChangePasswordResponse }

packages/hasura-auth-js/src/machines/change-password.typegen.ts

@@ -16,9 +16,9 @@ export interface Typegen0 {
   }
   missingImplementations: {
     actions: never
-    services: never
-    guards: never
     delays: never
+    guards: never
+    services: never
   }
   eventsCausingActions: {
     reportError: 'error.platform.requestChange'
@@ -26,13 +26,13 @@ export interface Typegen0 {
     saveInvalidPasswordError: 'REQUEST'
     saveRequestError: 'error.platform.requestChange'
   }
-  eventsCausingServices: {
+  eventsCausingDelays: {}
-    requestChange: 'REQUEST'
-  }
   eventsCausingGuards: {
     invalidPassword: 'REQUEST'
   }
-  eventsCausingDelays: {}
+  eventsCausingServices: {
+    requestChange: 'REQUEST'
+  }
   matchesStates:
     | 'idle'
     | 'idle.error'

packages/hasura-auth-js/src/machines/enable-mfa.ts

@@ -1,11 +1,11 @@
 import { assign, createMachine, send } from 'xstate'
 import { INVALID_MFA_CODE_ERROR, INVALID_MFA_TYPE_ERROR } from '../errors'
 import { AuthClient } from '../internal-client'
-import { ErrorPayload } from '../types'
+import { AuthErrorPayload } from '../types'
 import { getFetch, postFetch } from '../utils'
 
 export type EnableMfaContext = {
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
   imageUrl: string | null
   secret: string | null
 }
@@ -20,9 +20,9 @@ export type EnableMfaEvents =
       activeMfaType: 'totp'
     }
   | { type: 'GENERATED' }
-  | { type: 'GENERATED_ERROR'; error: ErrorPayload | null }
+  | { type: 'GENERATED_ERROR'; error: AuthErrorPayload | null }
   | { type: 'SUCCESS' }
-  | { type: 'ERROR'; error: ErrorPayload | null }
+  | { type: 'ERROR'; error: AuthErrorPayload | null }
 
 export type EnableMfadMachine = ReturnType<typeof createEnableMfaMachine>
 

packages/hasura-auth-js/src/machines/enable-mfa.typegen.ts

@@ -23,9 +23,9 @@ export interface Typegen0 {
   }
   missingImplementations: {
     actions: never
-    services: never
-    guards: never
     delays: never
+    guards: never
+    services: never
   }
   eventsCausingActions: {
     reportError: 'error.platform.activate'
@@ -37,15 +37,15 @@ export interface Typegen0 {
     saveInvalidMfaCodeError: 'ACTIVATE'
     saveInvalidMfaTypeError: 'ACTIVATE'
   }
-  eventsCausingServices: {
+  eventsCausingDelays: {}
-    activate: 'ACTIVATE'
-    generate: 'GENERATE'
-  }
   eventsCausingGuards: {
     invalidMfaCode: 'ACTIVATE'
     invalidMfaType: 'ACTIVATE'
   }
-  eventsCausingDelays: {}
+  eventsCausingServices: {
+    activate: 'ACTIVATE'
+    generate: 'GENERATE'
+  }
   matchesStates:
     | 'generated'
     | 'generated.activated'

packages/hasura-auth-js/src/machines/reset-password.ts

@@ -1,12 +1,12 @@
 import { assign, createMachine, send } from 'xstate'
 import { INVALID_EMAIL_ERROR } from '../errors'
 import { AuthClient } from '../internal-client'
-import { ErrorPayload, ResetPasswordOptions, ResetPasswordResponse } from '../types'
+import { AuthErrorPayload, ResetPasswordOptions, ResetPasswordResponse } from '../types'
 import { postFetch, rewriteRedirectTo } from '../utils'
 import { isValidEmail } from '../utils/validators'
 
 export type ResetPasswordContext = {
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
 }
 export type ResetPasswordEvents =
   | {
@@ -15,7 +15,7 @@ export type ResetPasswordEvents =
       options?: ResetPasswordOptions
     }
   | { type: 'SUCCESS' }
-  | { type: 'ERROR'; error: ErrorPayload | null }
+  | { type: 'ERROR'; error: AuthErrorPayload | null }
 
 export type ResetPasswordServices = {
   requestChange: { data: ResetPasswordResponse }

packages/hasura-auth-js/src/machines/reset-password.typegen.ts

@@ -16,9 +16,9 @@ export interface Typegen0 {
   }
   missingImplementations: {
     actions: never
-    services: never
-    guards: never
     delays: never
+    guards: never
+    services: never
   }
   eventsCausingActions: {
     reportError: 'error.platform.requestChange'
@@ -26,13 +26,13 @@ export interface Typegen0 {
     saveInvalidEmailError: 'REQUEST'
     saveRequestError: 'error.platform.requestChange'
   }
-  eventsCausingServices: {
+  eventsCausingDelays: {}
-    requestChange: 'REQUEST'
-  }
   eventsCausingGuards: {
     invalidEmail: 'REQUEST'
   }
-  eventsCausingDelays: {}
+  eventsCausingServices: {
+    requestChange: 'REQUEST'
+  }
   matchesStates:
     | 'idle'
     | 'idle.error'

packages/hasura-auth-js/src/machines/send-verification-email.ts

@@ -1,12 +1,16 @@
 import { assign, createMachine, send } from 'xstate'
 import { INVALID_EMAIL_ERROR } from '../errors'
 import { AuthClient } from '../internal-client'
-import { ErrorPayload, SendVerificationEmailOptions, SendVerificationEmailResponse } from '../types'
+import {
+  AuthErrorPayload,
+  SendVerificationEmailOptions,
+  SendVerificationEmailResponse
+} from '../types'
 import { postFetch, rewriteRedirectTo } from '../utils'
 import { isValidEmail } from '../utils/validators'
 
 export type SendVerificationEmailContext = {
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
 }
 
 export type SendVerificationEmailEvents =
@@ -16,7 +20,7 @@ export type SendVerificationEmailEvents =
       options?: SendVerificationEmailOptions
     }
   | { type: 'SUCCESS' }
-  | { type: 'ERROR'; error: ErrorPayload | null }
+  | { type: 'ERROR'; error: AuthErrorPayload | null }
 
 export type SendVerificationEmailServices = {
   request: { data: SendVerificationEmailResponse }

packages/hasura-auth-js/src/machines/send-verification-email.typegen.ts

@@ -16,9 +16,9 @@ export interface Typegen0 {
   }
   missingImplementations: {
     actions: never
-    services: never
-    guards: never
     delays: never
+    guards: never
+    services: never
   }
   eventsCausingActions: {
     reportError: 'error.platform.request'
@@ -26,13 +26,13 @@ export interface Typegen0 {
     saveInvalidEmailError: 'REQUEST'
     saveRequestError: 'error.platform.request'
   }
-  eventsCausingServices: {
+  eventsCausingDelays: {}
-    request: 'REQUEST'
-  }
   eventsCausingGuards: {
     invalidEmail: 'REQUEST'
   }
-  eventsCausingDelays: {}
+  eventsCausingServices: {
+    request: 'REQUEST'
+  }
   matchesStates:
     | 'idle'
     | 'idle.error'

packages/hasura-auth-js/src/promises/addSecurityKey.ts

@@ -6,14 +6,14 @@ import {
 import { postFetch } from '..'
 import { CodifiedError } from '../errors'
 import { AuthClient } from '../internal-client'
-import { ErrorPayload, SecurityKey } from '../types'
+import { AuthErrorPayload, SecurityKey } from '../types'
-import { ActionErrorState, ActionLoadingState, ActionSuccessState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState, AuthActionSuccessState } from './types'
 
-export interface AddSecurityKeyHandlerResult extends ActionErrorState, ActionSuccessState {
+export interface AddSecurityKeyHandlerResult extends AuthActionErrorState, AuthActionSuccessState {
   key?: SecurityKey
 }
 
-export interface AddSecurityKeyState extends AddSecurityKeyHandlerResult, ActionLoadingState {}
+export interface AddSecurityKeyState extends AddSecurityKeyHandlerResult, AuthActionLoadingState {}
 
 export const addSecurityKeyPromise = async (
   { backendUrl, interpreter }: AuthClient,
@@ -38,7 +38,7 @@ export const addSecurityKeyPromise = async (
     )
     return { key, isError: false, error: null, isSuccess: true }
   } catch (e) {
-    const { error } = e as { error: ErrorPayload }
+    const { error } = e as { error: AuthErrorPayload }
     return { isError: true, error, isSuccess: false }
   }
 }

packages/hasura-auth-js/src/promises/changeEmail.ts

@@ -3,10 +3,12 @@ import { InterpreterFrom } from 'xstate'
 import { ChangeEmailMachine } from '../machines'
 import { ChangeEmailOptions } from '../types'
 
-import { ActionErrorState, ActionLoadingState, NeedsEmailVerificationState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState, NeedsEmailVerificationState } from './types'
-export interface ChangeEmailHandlerResult extends ActionErrorState, NeedsEmailVerificationState {}
+export interface ChangeEmailHandlerResult
+  extends AuthActionErrorState,
+    NeedsEmailVerificationState {}
 
-export interface ChangeEmailState extends ChangeEmailHandlerResult, ActionLoadingState {}
+export interface ChangeEmailState extends ChangeEmailHandlerResult, AuthActionLoadingState {}
 
 export const changeEmailPromise = async (
   interpreter: InterpreterFrom<ChangeEmailMachine>,

packages/hasura-auth-js/src/promises/changePassword.ts

@@ -2,11 +2,11 @@ import { InterpreterFrom } from 'xstate'
 
 import { ChangePasswordMachine } from '../machines'
 
-import { ActionErrorState, ActionLoadingState, ActionSuccessState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState, AuthActionSuccessState } from './types'
 
-export interface ChangePasswordState extends ChangePasswordHandlerResult, ActionLoadingState {}
+export interface ChangePasswordState extends ChangePasswordHandlerResult, AuthActionLoadingState {}
 
-export interface ChangePasswordHandlerResult extends ActionErrorState, ActionSuccessState {}
+export interface ChangePasswordHandlerResult extends AuthActionErrorState, AuthActionSuccessState {}
 
 export const changePasswordPromise = async (
   interpreter: InterpreterFrom<ChangePasswordMachine>,

packages/hasura-auth-js/src/promises/mfa.ts

@@ -2,9 +2,9 @@ import { InterpreterFrom } from 'xstate'
 
 import { EnableMfadMachine } from '../machines'
 
-import { ActionErrorState } from './types'
+import { AuthActionErrorState } from './types'
 
-export interface GenerateQrCodeHandlerResult extends ActionErrorState {
+export interface GenerateQrCodeHandlerResult extends AuthActionErrorState {
   qrCodeDataUrl: string
   isGenerated: boolean
 }
@@ -12,7 +12,7 @@ export interface GenerateQrCodeHandlerResult extends ActionErrorState {
 export interface GenerateQrCodeState extends GenerateQrCodeHandlerResult {
   isGenerating: boolean
 }
-export interface ActivateMfaHandlerResult extends ActionErrorState {
+export interface ActivateMfaHandlerResult extends AuthActionErrorState {
   isActivated: boolean
 }
 

packages/hasura-auth-js/src/promises/resetPassword.ts

@@ -3,14 +3,14 @@ import { InterpreterFrom } from 'xstate'
 import { ResetPasswordMachine } from '../machines'
 import { ResetPasswordOptions } from '../types'
 
-import { ActionErrorState, ActionLoadingState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState } from './types'
 
-export interface ResetPasswordHandlerResult extends ActionErrorState {
+export interface ResetPasswordHandlerResult extends AuthActionErrorState {
   /** Returns `true` when an email to reset the password has been sent */
   isSent: boolean
 }
 
-export interface ResetPasswordState extends ResetPasswordHandlerResult, ActionLoadingState {}
+export interface ResetPasswordState extends ResetPasswordHandlerResult, AuthActionLoadingState {}
 
 export const resetPasswordPromise = async (
   interpreter: InterpreterFrom<ResetPasswordMachine>,

packages/hasura-auth-js/src/promises/sendVerificationEmail.ts

@@ -3,15 +3,15 @@ import { InterpreterFrom } from 'xstate'
 import { SendVerificationEmailMachine } from '../machines'
 import { SendVerificationEmailOptions } from '../types'
 
-import { ActionErrorState, ActionLoadingState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState } from './types'
 
-export interface SendVerificationEmailHandlerResult extends ActionErrorState {
+export interface SendVerificationEmailHandlerResult extends AuthActionErrorState {
   /** Returns `true` when a new verification email has been sent */
   isSent: boolean
 }
 
 export interface SendVerificationEmailState
-  extends ActionLoadingState,
+  extends AuthActionLoadingState,
     SendVerificationEmailHandlerResult {}
 
 export const sendVerificationEmailPromise = (

packages/hasura-auth-js/src/promises/signInAnonymous.ts

@@ -1,10 +1,12 @@
 import { USER_ALREADY_SIGNED_IN } from '../errors'
 import { AuthInterpreter } from '../machines'
 
-import { ActionLoadingState, SessionActionHandlerResult } from './types'
+import { AuthActionLoadingState, SessionActionHandlerResult } from './types'
 
 export interface SignInAnonymousHandlerResult extends SessionActionHandlerResult {}
-export interface SignInAnonymousState extends SignInAnonymousHandlerResult, ActionLoadingState {}
+export interface SignInAnonymousState
+  extends SignInAnonymousHandlerResult,
+    AuthActionLoadingState {}
 
 export const signInAnonymousPromise = (
   interpreter: AuthInterpreter

packages/hasura-auth-js/src/promises/signInEmailPassword.ts

@@ -2,7 +2,7 @@ import { USER_ALREADY_SIGNED_IN } from '../errors'
 import { AuthInterpreter } from '../machines'
 
 import {
-  ActionLoadingState,
+  AuthActionLoadingState,
   NeedsEmailVerificationState,
   SessionActionHandlerResult
 } from './types'
@@ -18,7 +18,7 @@ export interface SignInEmailPasswordHandlerResult
 
 export interface SignInEmailPasswordState
   extends SignInEmailPasswordHandlerResult,
-    ActionLoadingState {}
+    AuthActionLoadingState {}
 
 export const signInEmailPasswordPromise = (
   interpreter: AuthInterpreter,

packages/hasura-auth-js/src/promises/signInEmailPasswordless.ts

@@ -2,13 +2,13 @@ import { USER_ALREADY_SIGNED_IN } from '../errors'
 import { AuthInterpreter } from '../machines'
 import { PasswordlessOptions } from '../types'
 
-import { ActionErrorState, ActionLoadingState, ActionSuccessState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState, AuthActionSuccessState } from './types'
 export interface SignInEmailPasswordlessHandlerResult
-  extends ActionErrorState,
+  extends AuthActionErrorState,
-    ActionSuccessState {}
+    AuthActionSuccessState {}
 export interface SignInEmailPasswordlessState
   extends SignInEmailPasswordlessHandlerResult,
-    ActionLoadingState {}
+    AuthActionLoadingState {}
 
 export const signInEmailPasswordlessPromise = (
   interpreter: AuthInterpreter,

packages/hasura-auth-js/src/promises/signInEmailSecurityKey.ts

@@ -2,7 +2,7 @@ import { USER_ALREADY_SIGNED_IN } from '../errors'
 import { AuthInterpreter } from '../machines'
 
 import {
-  ActionLoadingState,
+  AuthActionLoadingState,
   NeedsEmailVerificationState,
   SessionActionHandlerResult
 } from './types'
@@ -13,7 +13,7 @@ export interface SignInSecurityKeyPasswordlessHandlerResult
 
 export interface SignInSecurityKeyPasswordlessState
   extends SignInSecurityKeyPasswordlessHandlerResult,
-    ActionLoadingState {}
+    AuthActionLoadingState {}
 
 export const signInEmailSecurityKeyPromise = (interpreter: AuthInterpreter, email: string) =>
   new Promise<SignInSecurityKeyPasswordlessHandlerResult>((resolve) => {

packages/hasura-auth-js/src/promises/signInMfaTotp.ts

@@ -1,11 +1,11 @@
 import { USER_ALREADY_SIGNED_IN } from '../errors'
 import { AuthInterpreter } from '../machines'
 
-import { ActionLoadingState, SessionActionHandlerResult } from './types'
+import { AuthActionLoadingState, SessionActionHandlerResult } from './types'
 
 export interface SignInMfaTotpHandlerResult extends SessionActionHandlerResult {}
 
-export interface SignInMfaTotpState extends SignInMfaTotpHandlerResult, ActionLoadingState {}
+export interface SignInMfaTotpState extends SignInMfaTotpHandlerResult, AuthActionLoadingState {}
 
 export const signInMfaTotpPromise = (interpreter: AuthInterpreter, otp: string, ticket?: string) =>
   new Promise<SignInMfaTotpHandlerResult>((resolve) => {

packages/hasura-auth-js/src/promises/signInSmsPasswordless.ts

@@ -2,13 +2,15 @@ import { USER_ALREADY_SIGNED_IN } from '../errors'
 import { AuthInterpreter } from '../machines'
 import { PasswordlessOptions } from '../types'
 
-import { ActionErrorState, ActionLoadingState, ActionSuccessState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState, AuthActionSuccessState } from './types'
 
 export interface SignInSmsPasswordlessState
   extends SignInSmsPasswordlessHandlerResult,
-    ActionLoadingState {}
+    AuthActionLoadingState {}
 
-export interface SignInSmsPasswordlessHandlerResult extends ActionErrorState, ActionSuccessState {
+export interface SignInSmsPasswordlessHandlerResult
+  extends AuthActionErrorState,
+    AuthActionSuccessState {
   /**
    * Returns true when the one-time password has been sent over by SMS, and the user needs to send it back to complete sign-in.
    */

packages/hasura-auth-js/src/promises/signInSmsPasswordlessOtp.ts

@@ -1,12 +1,12 @@
 import { USER_ALREADY_SIGNED_IN } from '../errors'
 import { AuthInterpreter } from '../machines'
 
-import { ActionLoadingState, SessionActionHandlerResult } from './types'
+import { AuthActionLoadingState, SessionActionHandlerResult } from './types'
 
 export interface SignInSmsPasswordlessOtpHandlerResult extends SessionActionHandlerResult {}
 export interface SignInSmsPasswordlessOtpState
   extends SignInSmsPasswordlessOtpHandlerResult,
-    ActionLoadingState {}
+    AuthActionLoadingState {}
 
 export const signInSmsPasswordlessOtpPromise = (
   interpreter: AuthInterpreter,

packages/hasura-auth-js/src/promises/signOut.ts

@@ -1,10 +1,10 @@
 import { USER_UNAUTHENTICATED } from '../errors'
 import { AuthInterpreter } from '../machines'
 
-import { ActionErrorState, ActionLoadingState, ActionSuccessState } from './types'
+import { AuthActionErrorState, AuthActionLoadingState, AuthActionSuccessState } from './types'
 
-export interface SignOutlessHandlerResult extends ActionErrorState, ActionSuccessState {}
+export interface SignOutlessHandlerResult extends AuthActionErrorState, AuthActionSuccessState {}
-export interface SignOutlessState extends SignOutlessHandlerResult, ActionLoadingState {}
+export interface SignOutlessState extends SignOutlessHandlerResult, AuthActionLoadingState {}
 
 export const signOutPromise = async (
   interpreter: AuthInterpreter,

packages/hasura-auth-js/src/promises/signUpEmailPassword.ts

@@ -3,7 +3,7 @@ import { AuthInterpreter } from '../machines'
 import { SignUpOptions } from '../types'
 
 import {
-  ActionLoadingState,
+  AuthActionLoadingState,
   NeedsEmailVerificationState,
   SessionActionHandlerResult
 } from './types'
@@ -14,7 +14,7 @@ export interface SignUpEmailPasswordHandlerResult
 
 export interface SignUpEmailPasswordState
   extends SignUpEmailPasswordHandlerResult,
-    ActionLoadingState {}
+    AuthActionLoadingState {}
 
 export const signUpEmailPasswordPromise = (
   interpreter: AuthInterpreter,

packages/hasura-auth-js/src/promises/signUpEmailSecurityKey.ts

@@ -3,7 +3,7 @@ import { AuthInterpreter } from '../machines'
 import { SignUpSecurityKeyOptions } from '../types'
 
 import {
-  ActionLoadingState,
+  AuthActionLoadingState,
   NeedsEmailVerificationState,
   SessionActionHandlerResult
 } from './types'
@@ -14,7 +14,7 @@ export interface SignUpSecurityKeyHandlerResult
 
 export interface SignUpSecurityKeyState
   extends SignUpSecurityKeyHandlerResult,
-    ActionLoadingState {}
+    AuthActionLoadingState {}
 
 export const signUpEmailSecurityKeyPromise = (
   interpreter: AuthInterpreter,

packages/hasura-auth-js/src/promises/types.ts

@@ -1,28 +1,28 @@
-import { ErrorPayload, User } from '../types'
+import { AuthErrorPayload, User } from '../types'
 
-export interface ActionErrorState {
+export interface AuthActionErrorState {
   /**
    * @return `true` if an error occurred
    * @depreacted use `!isSuccess` or `!!error` instead
    * */
   isError: boolean
   /** Provides details about the error */
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
 }
 
-export interface ActionLoadingState {
+export interface AuthActionLoadingState {
   /**
    * @return `true` when the action is executing, `false` when it finished its execution.
    */
   isLoading: boolean
 }
 
-export interface ActionSuccessState {
+export interface AuthActionSuccessState {
   /** Returns `true` if the action is successful. */
   isSuccess: boolean
 }
 
-export interface SessionActionHandlerResult extends ActionSuccessState, ActionErrorState {
+export interface SessionActionHandlerResult extends AuthActionSuccessState, AuthActionErrorState {
   /** User information */
   user: User | null
   /** Access token (JWT) */

packages/hasura-auth-js/src/types/hasura-auth/common.ts

@@ -1,5 +1,5 @@
 // TODO shared with other packages
-export type ErrorPayload = {
+export type AuthErrorPayload = {
   error: string
   status: number
   message: string

packages/hasura-auth-js/src/types/hasura-auth/responses.ts

@@ -1,13 +1,13 @@
-import { ErrorPayload, NhostSession } from './common'
+import { AuthErrorPayload, NhostSession } from './common'
 
 // Hasura-auth API response types
 export interface NullableErrorResponse {
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
 }
 
 /** session payload from common hasura-auth responses */
 export type NhostSessionResponse =
-  | { session: null; error: ErrorPayload }
+  | { session: null; error: AuthErrorPayload }
   | { session: NhostSession | null; error: null }
 
 /** payload from hasura-auth endpoint /signin/email-password */
@@ -16,7 +16,7 @@ export interface SignInResponse {
   mfa: {
     ticket: string
   } | null
-  error: ErrorPayload | null
+  error: AuthErrorPayload | null
 }
 
 /** payload from hasura-auth endpoint /signup/email-password */

packages/hasura-storage-js/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @nhost/hasura-storage-js
 
+## 2.1.0
+
+### Minor Changes
+
+- a0e093d7: fix(exports): don't use conflicting names in exports
+
+### Patch Changes
+
+- bb8803a1: fix(presigned-url): don't alter URL when no transformation params were provided
+
 ## 2.0.5
 
 ### Patch Changes

packages/hasura-storage-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/hasura-storage-js",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "description": "Hasura-storage client",
   "license": "MIT",
   "keywords": [
@@ -41,7 +41,8 @@
   },
   "scripts": {
     "dev": "vite build --config ../../config/vite.lib.dev.config.js",
-    "build": "run-p build:lib build:umd",
+    "build": "run-p typecheck build:lib build:umd",
+    "typecheck": "tsc --noEmit",
     "build:lib": "vite build",
     "build:umd": "vite build --config ../../config/vite.lib.umd.config.js",
     "e2e": "start-test e2e:backend http-get://localhost:9695 ci:test",

packages/hasura-storage-js/src/machines/file-upload.ts

@@ -1,12 +1,12 @@
 import FormData from 'form-data'
 import { assign, createMachine } from 'xstate'
-import { ErrorPayload, FileUploadConfig } from '../utils'
+import { FileUploadConfig, StorageErrorPayload } from '../utils'
 import { fetchUpload } from '../utils/upload'
 
 export type FileUploadContext = {
   progress: number | null
   loaded: number
-  error: ErrorPayload | null
+  error: StorageErrorPayload | null
   id?: string
   bucketId?: string
   file?: File
@@ -24,7 +24,7 @@ export type FileUploadEvents =
     } & FileUploadConfig)
   | { type: 'UPLOAD_PROGRESS'; progress: number; loaded: number; additions: number }
   | { type: 'UPLOAD_DONE'; id: string; bucketId: string }
-  | { type: 'UPLOAD_ERROR'; error: ErrorPayload }
+  | { type: 'UPLOAD_ERROR'; error: StorageErrorPayload }
   | { type: 'CANCEL' }
   | { type: 'DESTROY' }
 

packages/hasura-storage-js/src/promises/file-upload.ts

@@ -1,7 +1,7 @@
 import { InterpreterFrom } from 'xstate'
 
 import { FileItemRef, FileUploadMachine } from '../machines'
-import { ActionErrorState, FileUploadConfig, StorageUploadFileParams } from '../utils'
+import { FileUploadConfig, StorageActionErrorState, StorageUploadFileParams } from '../utils'
 
 export interface UploadProgressState {
   /**
@@ -14,7 +14,7 @@ export interface UploadProgressState {
   progress: number | null
 }
 
-export interface UploadFileHandlerResult extends ActionErrorState {
+export interface UploadFileHandlerResult extends StorageActionErrorState {
   /**
    * Returns `true` when the file has been successfully uploaded.
    */

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

@@ -3,7 +3,7 @@ import appendImageTransformationParameters from './appendImageTransformationPara
 
 test('should append image transformation parameters to a simple URL', () => {
   expect(
-    appendImageTransformationParameters('https://example.com/', {
+    appendImageTransformationParameters('https://example.com', {
       width: 100,
       height: 100,
       blur: 50,
@@ -25,7 +25,7 @@ test('should append image transformation parameters to a URL with existing query
 
 test('should not append falsy values', () => {
   expect(
-    appendImageTransformationParameters('https://example.com/', {
+    appendImageTransformationParameters('https://example.com', {
       width: undefined,
       height: 100,
       blur: undefined,
@@ -35,7 +35,9 @@ test('should not append falsy values', () => {
 })
 
 test('should keep the original URL if no transformation parameters are provided', () => {
-  expect(appendImageTransformationParameters('https://example.com/', {})).toBe(
+  expect(appendImageTransformationParameters('https://example.com')).toBe('https://example.com')
-    'https://example.com/'
+  expect(
-  )
+    appendImageTransformationParameters('https://example.com/?param1=test_data&param2=test_data')
+  ).toBe('https://example.com/?param1=test_data&param2=test_data')
+  expect(appendImageTransformationParameters('https://example.com/')).toBe('https://example.com/')
 })

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

@@ -12,8 +12,12 @@ import { StorageImageTransformationParams } from '../types'
  */
 export default function appendImageTransformationParameters(
   url: string,
-  params: StorageImageTransformationParams
+  params?: StorageImageTransformationParams
 ): string {
+  if (!params || Object.keys(params).length === 0) {
+    return url
+  }
+
   const urlObject = new URL(url)
 
   // create an object with the transformation parameters by using the first

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

@@ -1,21 +1,21 @@
 import FormData from 'form-data'
 
 // TODO shared with other packages
-export type ErrorPayload = {
+export type StorageErrorPayload = {
   error: string
   status: number
   message: string
 }
 
 // TODO shared with other packages
-export interface ActionErrorState {
+export interface StorageActionErrorState {
   /**
    * @return `true` if an error occurred
    * @depreacted use `!isSuccess` or `!!error` instead
    * */
   isError: boolean
   /** Provides details about the error */
-  error: ErrorPayload | null
+  error: StorageErrorPayload | null
 }
 
 // * Avoid circular references and broken links in docusaurus generated docs
@@ -46,7 +46,7 @@ export type StorageUploadParams = StorageUploadFileParams | StorageUploadFormDat
 
 export type StorageUploadResponse =
   | { fileMetadata: FileResponse; error: null }
-  | { fileMetadata: null; error: ErrorPayload }
+  | { fileMetadata: null; error: StorageErrorPayload }
 
 export interface StorageImageTransformationParams {
   /** Image width, in pixels */

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

@@ -1,6 +1,6 @@
 import FormData from 'form-data'
 import fetch from 'isomorphic-unfetch'
-import { ErrorPayload, StorageUploadResponse } from './types'
+import { StorageErrorPayload, StorageUploadResponse } from './types'
 
 /** Convert any string into ISO-8859-1 */
 export const toIso88591 = (fileName: string) => {
@@ -59,7 +59,7 @@ export const fetchUpload = async (
       })
 
       if (!response.ok) {
-        const error: ErrorPayload = {
+        const error: StorageErrorPayload = {
           status: response.status,
           message: await response.text(),
           // * errors from hasura-storage are not codified
@@ -70,7 +70,7 @@ export const fetchUpload = async (
       const fileMetadata = await response.json()
       return { fileMetadata, error: null }
     } catch (e) {
-      const error: ErrorPayload = {
+      const error: StorageErrorPayload = {
         status: 0,
         message: (e as Error).message,
         error: (e as Error).message

packages/nextjs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/nextjs
 
+## 1.13.19
+
+### Patch Changes
+
+- @nhost/react@2.0.13
+
 ## 1.13.18
 
 ### Patch Changes

packages/nextjs/package.json

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

packages/nhost-js/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @nhost/nhost-js
 
+## 2.2.0
+
+### Minor Changes
+
+- a0e093d7: fix(exports): don't use conflicting names in exports
+
+### Patch Changes
+
+- Updated dependencies [bb8803a1]
+- Updated dependencies [a0e093d7]
+  - @nhost/hasura-storage-js@2.1.0
+  - @nhost/hasura-auth-js@2.1.0
+
 ## 2.1.2
 
 ### Patch Changes

packages/nhost-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/nhost-js",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Nhost JavaScript SDK",
   "license": "MIT",
   "keywords": [
@@ -44,7 +44,8 @@
   },
   "scripts": {
     "dev": "vite build --config ../../config/vite.lib.dev.config.js",
-    "build": "run-p build:lib build:umd",
+    "build": "run-p typecheck build:lib build:umd",
+    "typecheck": "tsc --noEmit",
     "build:lib": "vite build",
     "build:umd": "vite build --config ../../config/vite.lib.umd.config.js",
     "test": "vitest run",

packages/nhost-js/src/index.ts

@@ -1,10 +1,4 @@
 export * from '@nhost/hasura-auth-js'
-// ErrorPayload and ActionErrorState are two conflicting types, but these are
-// the same in both packages, so this error is ignored for now.
-// @ts-ignore
 export * from '@nhost/hasura-storage-js'
 export * from './clients'
-// ErrorPayload is  conflicting types, but it is the same in both packages,
-// so this error is ignored for now.
-// @ts-ignore
 export * from './utils/types'

packages/nhost-js/src/utils/types.ts

@@ -1,11 +1,37 @@
 import { NhostAuthConstructorParams } from '@nhost/hasura-auth-js'
+
 // TODO shared with other packages
-export type ErrorPayload = {
+export interface ErrorPayload {
   error: string
   status: number
   message: string
 }
 
+// TODO shared with other packages
+export interface ActionErrorState {
+  /**
+   * @return `true` if an error occurred
+   * @depreacted use `!isSuccess` or `!!error` instead
+   * */
+  isError: boolean
+  /** Provides details about the error */
+  error: ErrorPayload | null
+}
+
+// TODO shared with other packages
+export interface ActionLoadingState {
+  /**
+   * @return `true` when the action is executing, `false` when it finished its execution.
+   */
+  isLoading: boolean
+}
+
+// TODO shared with other packages
+export interface ActionSuccessState {
+  /** Returns `true` if the action is successful. */
+  isSuccess: boolean
+}
+
 export type BackendUrl = {
   /**
    * Nhost backend URL

packages/react/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/react
 
+## 2.0.13
+
+### Patch Changes
+
+- Updated dependencies [a0e093d7]
+  - @nhost/nhost-js@2.2.0
+
 ## 2.0.12
 
 ### Patch Changes

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "Nhost React library",
   "license": "MIT",
   "keywords": [

packages/vue/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/vue
 
+## 1.13.19
+
+### Patch Changes
+
+- Updated dependencies [a0e093d7]
+  - @nhost/nhost-js@2.2.0
+
 ## 1.13.18
 
 ### Patch Changes

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/vue",
-  "version": "1.13.18",
+  "version": "1.13.19",
   "description": "Nhost Vue library",
   "license": "MIT",
   "keywords": [

pnpm-lock.yaml

@@ -32,7 +32,7 @@ importers:
       husky: ^8.0.1
       npm-run-all: ^4.1.5
       prettier: ^2.7.1
-      turbo: 1.8.5
+      turbo: 1.8.6
       typedoc: ^0.22.18
       typescript: 4.9.5
       vite: ^4.0.2
@@ -65,7 +65,7 @@ importers:
       husky: 8.0.1
       npm-run-all: 4.1.5
       prettier: 2.7.1
-      turbo: 1.8.5
+      turbo: 1.8.6
       typedoc: 0.22.18_typescript@4.9.5
       typescript: 4.9.5
       vite: 4.0.2_@types+node@16.18.11
@@ -126,7 +126,7 @@ importers:
       '@types/lodash.debounce': ^4.0.7
       '@types/node': ^16.11.7
       '@types/pluralize': ^0.0.29
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       '@types/react-dom': 18.0.11
       '@types/react-table': ^7.7.12
       '@types/testing-library__jest-dom': ^5.14.5
@@ -190,6 +190,7 @@ importers:
       require-from-string: ^2.0.2
       sharp: ^0.32.0
       slugify: ^1.6.5
+      snake-case: ^3.0.4
       storybook-addon-next-router: ^4.0.1
       stripe: ^10.17.0
       tailwind-merge: ^1.8.0
@@ -208,19 +209,19 @@ importers:
       '@apollo/client': 3.7.10_xe4twbeoqswbn2uas4ov5melbq
       '@codemirror/language': 6.3.1
       '@emotion/cache': 11.10.5
-      '@emotion/react': 11.10.5_iznqm25yxu4trtkqop3zznseca
+      '@emotion/react': 11.10.5_lzn74h6sajlbfmrxbix4okzmpi
       '@emotion/server': 11.4.0
-      '@emotion/styled': 11.10.5_4ahanhknrtlidghakifap67h7q
+      '@emotion/styled': 11.10.5_4jddrkedmmycnrpdaatf3tfj3a
       '@fontsource/inter': 4.5.14
       '@fontsource/roboto-mono': 4.5.8
-      '@graphiql/react': 0.17.0_755ntyjuho6qjwic26h62or3by
+      '@graphiql/react': 0.17.0_7bopqva7rdmx76dydi5rwteyri
       '@graphiql/toolkit': 0.8.2_7fbl5omhlrpwpn5f5culy6mafe
       '@headlessui/react': 1.7.4_biqbaboplfbrettd7655fr4n2y
       '@heroicons/react': 1.0.6_react@18.2.0
       '@hookform/resolvers': 3.0.0_react-hook-form@7.42.1
-      '@mui/base': 5.0.0-alpha.106_zula6vjvt3wdocc4mwcxqa6nzi
+      '@mui/base': 5.0.0-alpha.106_4qaawyptjkcgzqorucvhm3koke
-      '@mui/material': 5.10.14_acl7mc3llczqccvmbrsweq6vga
+      '@mui/material': 5.10.14_ogvxv7hqfgg53da5eqs77qdqde
-      '@mui/system': 5.10.14_teoksulxetwanny5ohzazahldq
+      '@mui/system': 5.10.14_yunkbz2mvya45l5iqzwl5ypfyq
       '@mui/x-date-pickers': 5.0.8_p6r6qp7wldbu5ojdsmv4yukx2q
       '@nhost/nextjs': link:../packages/nextjs
       '@nhost/react-apollo': link:../integrations/react-apollo
@@ -236,7 +237,7 @@ importers:
       clsx: 1.2.1
       date-fns: 2.29.3
       generate-password: 1.7.0
-      graphiql: 2.4.0_755ntyjuho6qjwic26h62or3by
+      graphiql: 2.4.0_7bopqva7rdmx76dydi5rwteyri
       graphql: 16.6.0
       graphql-request: 4.3.0_rjjjs2nwgns3bcvnnqb5eu5nry
       graphql-tag: 2.12.6_graphql@16.6.0
@@ -278,7 +279,7 @@ importers:
       '@playwright/test': 1.31.2
       '@storybook/addon-actions': 6.5.14_biqbaboplfbrettd7655fr4n2y
       '@storybook/addon-essentials': 6.5.14_2d2r642xwmvaauuvastzobrbwe
-      '@storybook/addon-interactions': 6.5.14_o2w7dvvbfxaohzk6den2xlbkgq
+      '@storybook/addon-interactions': 6.5.14_hvoc3iuqa2ltaiia3y4i66hvou
       '@storybook/addon-links': 6.5.14_biqbaboplfbrettd7655fr4n2y
       '@storybook/addon-postcss': 2.0.0_webpack@5.75.0
       '@storybook/builder-webpack5': 6.5.14_uddrmzyyotmol3pts5dayjifei
@@ -292,7 +293,7 @@ importers:
       '@types/lodash.debounce': 4.0.7
       '@types/node': 16.18.11
       '@types/pluralize': 0.0.29
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       '@types/react-dom': 18.0.11
       '@types/react-table': 7.7.12
       '@types/testing-library__jest-dom': 5.14.5
@@ -327,6 +328,7 @@ importers:
       prettier-plugin-tailwindcss: 0.2.0_prettier@2.7.1
       react-date-fns-hooks: 0.9.4_3pf3ktbrffvgnzxoo2eotyjcpi
       require-from-string: 2.0.2
+      snake-case: 3.0.4
       storybook-addon-next-router: 4.0.1_tu4orvw3rpr5ktbmb2kplp4vty
       tailwindcss: 3.2.1_v776zzvn44o7tpgzieipaairwm
       ts-node: 10.9.1_@types+node@16.18.11
@@ -4541,7 +4543,7 @@ packages:
       '@date-io/core': 2.16.0
     dev: false
 
-  /@design-systems/utils/2.12.0_zula6vjvt3wdocc4mwcxqa6nzi:
+  /@design-systems/utils/2.12.0_4qaawyptjkcgzqorucvhm3koke:
     resolution: {integrity: sha512-Y/d2Zzr+JJfN6u1gbuBUb1ufBuLMJJRZQk+dRmw8GaTpqKx5uf7cGUYGTwN02dIb3I+Tf+cW8jcGBTRiFxdYFg==}
     peerDependencies:
       '@types/react': '*'
@@ -4549,7 +4551,7 @@ packages:
       react-dom: '>= 16.8.6'
     dependencies:
       '@babel/runtime': 7.20.1
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       clsx: 1.2.1
       focus-lock: 0.8.1
       react: 18.2.0
@@ -4557,15 +4559,15 @@ packages:
       react-merge-refs: 1.1.0
     dev: true
 
-  /@devtools-ds/object-inspector/1.2.0_zula6vjvt3wdocc4mwcxqa6nzi:
+  /@devtools-ds/object-inspector/1.2.0_4qaawyptjkcgzqorucvhm3koke:
     resolution: {integrity: sha512-VztcwqVwScSvYdvJVZBJYsVO/2Pew3JPpFV3T9fuCHQLlHcLYOV3aU/kBS2ScuE2O1JN0ZbobLqFLa3vQF54Fw==}
     peerDependencies:
       react: '>= 16.8.6'
     dependencies:
       '@babel/runtime': 7.7.2
       '@devtools-ds/object-parser': 1.2.0
-      '@devtools-ds/themes': 1.2.0_zula6vjvt3wdocc4mwcxqa6nzi
+      '@devtools-ds/themes': 1.2.0_4qaawyptjkcgzqorucvhm3koke
-      '@devtools-ds/tree': 1.2.0_zula6vjvt3wdocc4mwcxqa6nzi
+      '@devtools-ds/tree': 1.2.0_4qaawyptjkcgzqorucvhm3koke
       clsx: 1.1.0
       react: 18.2.0
     transitivePeerDependencies:
@@ -4579,13 +4581,13 @@ packages:
       '@babel/runtime': 7.5.5
     dev: true
 
-  /@devtools-ds/themes/1.2.0_zula6vjvt3wdocc4mwcxqa6nzi:
+  /@devtools-ds/themes/1.2.0_4qaawyptjkcgzqorucvhm3koke:
     resolution: {integrity: sha512-LimEITorE6yWZWWuMc6OiBfLQgPrQqWbyMEmfRUDPa3PHXoAY4SpDxczfg31fgyRDUNWnZhjaJH5bBbu8VEbIw==}
     peerDependencies:
       react: '>= 16.8.6'
     dependencies:
       '@babel/runtime': 7.5.5
-      '@design-systems/utils': 2.12.0_zula6vjvt3wdocc4mwcxqa6nzi
+      '@design-systems/utils': 2.12.0_4qaawyptjkcgzqorucvhm3koke
       clsx: 1.1.0
       react: 18.2.0
     transitivePeerDependencies:
@@ -4593,13 +4595,13 @@ packages:
       - react-dom
     dev: true
 
-  /@devtools-ds/tree/1.2.0_zula6vjvt3wdocc4mwcxqa6nzi:
+  /@devtools-ds/tree/1.2.0_4qaawyptjkcgzqorucvhm3koke:
     resolution: {integrity: sha512-hC4g4ocuo2eg7jsnzKdauxH0sDQiPW3KSM2+uK3kRgcmr9PzpBD5Kob+Y/WFSVKswFleftOGKL4BQLuRv0sPxA==}
     peerDependencies:
       react: '>= 16.8.6'
     dependencies:
       '@babel/runtime': 7.7.2
-      '@devtools-ds/themes': 1.2.0_zula6vjvt3wdocc4mwcxqa6nzi
+      '@devtools-ds/themes': 1.2.0_4qaawyptjkcgzqorucvhm3koke
       clsx: 1.1.0
       react: 18.2.0
     transitivePeerDependencies:
@@ -4937,7 +4939,7 @@ packages:
       '@docusaurus/react-loadable': 5.5.2_react@18.2.0
       '@docusaurus/types': 2.4.0_biqbaboplfbrettd7655fr4n2y
       '@types/history': 4.7.11
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       '@types/react-router-config': 5.0.6
       '@types/react-router-dom': 5.3.3
       react: 18.2.0
@@ -5283,7 +5285,7 @@ packages:
     peerDependencies:
       react: '*'
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       prop-types: 15.8.1
       react: 18.2.0
 
@@ -5354,7 +5356,7 @@ packages:
       '@docusaurus/utils': 2.4.0_@docusaurus+types@2.4.0
       '@docusaurus/utils-common': 2.4.0_@docusaurus+types@2.4.0
       '@types/history': 4.7.11
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       '@types/react-router-config': 5.0.6
       clsx: 1.2.1
       parse-numeric-range: 1.3.0
@@ -5444,7 +5446,7 @@ packages:
       react-dom: ^16.8.4 || ^17.0.0
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       commander: 5.1.0
       joi: 17.7.0
       react: 18.2.0
@@ -5684,7 +5686,7 @@ packages:
     resolution: {integrity: sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==}
     dev: false
 
-  /@emotion/react/11.10.5_iznqm25yxu4trtkqop3zznseca:
+  /@emotion/react/11.10.5_lzn74h6sajlbfmrxbix4okzmpi:
     resolution: {integrity: sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -5704,7 +5706,7 @@ packages:
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.0_react@18.2.0
       '@emotion/utils': 1.2.0
       '@emotion/weak-memoize': 0.3.0
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       hoist-non-react-statics: 3.3.2
       react: 18.2.0
     dev: false
@@ -5784,7 +5786,7 @@ packages:
     resolution: {integrity: sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==}
     dev: false
 
-  /@emotion/styled/11.10.5_4ahanhknrtlidghakifap67h7q:
+  /@emotion/styled/11.10.5_4jddrkedmmycnrpdaatf3tfj3a:
     resolution: {integrity: sha512-8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -5801,11 +5803,11 @@ packages:
       '@babel/runtime': 7.19.4
       '@emotion/babel-plugin': 11.10.5_@babel+core@7.20.2
       '@emotion/is-prop-valid': 1.2.0
-      '@emotion/react': 11.10.5_iznqm25yxu4trtkqop3zznseca
+      '@emotion/react': 11.10.5_lzn74h6sajlbfmrxbix4okzmpi
       '@emotion/serialize': 1.1.1
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.0_react@18.2.0
       '@emotion/utils': 1.2.0
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       react: 18.2.0
     dev: false
 
@@ -6417,7 +6419,7 @@ packages:
   /@gqty/utils/1.0.0:
     resolution: {integrity: sha512-QJMlzts//d0H5mlekOZgx1a4KsTYXfxmRhhx8g/8mvzdaNVPxhFzCsv3+ljTOzbW3A08qy4jXQPWAMoTefSJDQ==}
 
-  /@graphiql/react/0.17.0_755ntyjuho6qjwic26h62or3by:
+  /@graphiql/react/0.17.0_7bopqva7rdmx76dydi5rwteyri:
     resolution: {integrity: sha512-mn8FfucLJzFLQQ5OoJ9U1Dvnva1smOxBL89D2TSM2B6mmDyQIRhFXmjzUTPdsqwpauFiqkDaQZiqX7T/ZPrg/w==}
     peerDependencies:
       graphql: ^15.5.0 || ^16.0.0
@@ -6426,7 +6428,7 @@ packages:
     dependencies:
       '@graphiql/toolkit': 0.8.2_7fbl5omhlrpwpn5f5culy6mafe
       '@reach/combobox': 0.17.0_biqbaboplfbrettd7655fr4n2y
-      '@reach/dialog': 0.17.0_zula6vjvt3wdocc4mwcxqa6nzi
+      '@reach/dialog': 0.17.0_4qaawyptjkcgzqorucvhm3koke
       '@reach/listbox': 0.17.0_biqbaboplfbrettd7655fr4n2y
       '@reach/menu-button': 0.17.0_7i5myeigehqah43i5u7wbekgba
       '@reach/tooltip': 0.17.0_biqbaboplfbrettd7655fr4n2y
@@ -8687,7 +8689,7 @@ packages:
       - supports-color
     dev: true
 
-  /@mui/base/5.0.0-alpha.106_zula6vjvt3wdocc4mwcxqa6nzi:
+  /@mui/base/5.0.0-alpha.106_4qaawyptjkcgzqorucvhm3koke:
     resolution: {integrity: sha512-xJQQtwPCPwr6hGWTBdvDwHYwExn3Bw7nPQkN8Fuz8kHpZqoMVWQvvaFS557AIkkI2AFLV3DxVIMjbCvrIntBWg==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -8700,10 +8702,10 @@ packages:
     dependencies:
       '@babel/runtime': 7.20.1
       '@emotion/is-prop-valid': 1.2.0
-      '@mui/types': 7.2.1_@types+react@18.0.28
+      '@mui/types': 7.2.1_@types+react@18.0.30
       '@mui/utils': 5.10.14_react@18.2.0
       '@popperjs/core': 2.11.6
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       clsx: 1.2.1
       prop-types: 15.8.1
       react: 18.2.0
@@ -8715,7 +8717,7 @@ packages:
     resolution: {integrity: sha512-qLgIJNOR9Dre8JiZ/neVzOf4jf88J6YtOkQqugtMrleLjbfRVUSS4LWl9CSOjNq76quYdmYWnSDgfQqOooT2cQ==}
     dev: false
 
-  /@mui/material/5.10.14_acl7mc3llczqccvmbrsweq6vga:
+  /@mui/material/5.10.14_ogvxv7hqfgg53da5eqs77qdqde:
     resolution: {integrity: sha512-HWzKVAykePMx54WtxVwZyL1W4k3xlHYIqwMw0CaXAvgB3UE9yjABZuuGr8vG5Z6CSNWamzd+s1x8u7pQPFl9og==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -8733,14 +8735,14 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.20.1
-      '@emotion/react': 11.10.5_iznqm25yxu4trtkqop3zznseca
+      '@emotion/react': 11.10.5_lzn74h6sajlbfmrxbix4okzmpi
-      '@emotion/styled': 11.10.5_4ahanhknrtlidghakifap67h7q
+      '@emotion/styled': 11.10.5_4jddrkedmmycnrpdaatf3tfj3a
-      '@mui/base': 5.0.0-alpha.106_zula6vjvt3wdocc4mwcxqa6nzi
+      '@mui/base': 5.0.0-alpha.106_4qaawyptjkcgzqorucvhm3koke
       '@mui/core-downloads-tracker': 5.10.14
-      '@mui/system': 5.10.14_teoksulxetwanny5ohzazahldq
+      '@mui/system': 5.10.14_yunkbz2mvya45l5iqzwl5ypfyq
-      '@mui/types': 7.2.1_@types+react@18.0.28
+      '@mui/types': 7.2.1_@types+react@18.0.30
       '@mui/utils': 5.10.14_react@18.2.0
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       '@types/react-transition-group': 4.4.5
       clsx: 1.2.1
       csstype: 3.1.1
@@ -8751,7 +8753,7 @@ packages:
       react-transition-group: 4.4.5_biqbaboplfbrettd7655fr4n2y
     dev: false
 
-  /@mui/private-theming/5.10.14_pmekkgnqduwlme35zpnqhenc34:
+  /@mui/private-theming/5.10.14_2thlp7g7odiqm7dwhn3rlhxaa4:
     resolution: {integrity: sha512-3aIBe8WK65CwAPDY8nB11hYnzE1CZMymi76UnaFrA/DdGDwl5Y8F6uB+StKrkVmsqF1po7Mp2odqVkHj320gXw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -8763,7 +8765,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.20.1
       '@mui/utils': 5.10.14_react@18.2.0
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       prop-types: 15.8.1
       react: 18.2.0
     dev: false
@@ -8783,14 +8785,14 @@ packages:
     dependencies:
       '@babel/runtime': 7.20.1
       '@emotion/cache': 11.10.5
-      '@emotion/react': 11.10.5_iznqm25yxu4trtkqop3zznseca
+      '@emotion/react': 11.10.5_lzn74h6sajlbfmrxbix4okzmpi
-      '@emotion/styled': 11.10.5_4ahanhknrtlidghakifap67h7q
+      '@emotion/styled': 11.10.5_4jddrkedmmycnrpdaatf3tfj3a
       csstype: 3.1.1
       prop-types: 15.8.1
       react: 18.2.0
     dev: false
 
-  /@mui/system/5.10.14_teoksulxetwanny5ohzazahldq:
+  /@mui/system/5.10.14_yunkbz2mvya45l5iqzwl5ypfyq:
     resolution: {integrity: sha512-2de7XCjRb1j8Od0Stmo0LwFMLpOMNT4wzfINuExXI1TVSuyxXIXUxiC5FEgJW3GMvf/a7SUR8VOiMoKlKWzukw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -8807,20 +8809,20 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.20.1
-      '@emotion/react': 11.10.5_iznqm25yxu4trtkqop3zznseca
+      '@emotion/react': 11.10.5_lzn74h6sajlbfmrxbix4okzmpi
-      '@emotion/styled': 11.10.5_4ahanhknrtlidghakifap67h7q
+      '@emotion/styled': 11.10.5_4jddrkedmmycnrpdaatf3tfj3a
-      '@mui/private-theming': 5.10.14_pmekkgnqduwlme35zpnqhenc34
+      '@mui/private-theming': 5.10.14_2thlp7g7odiqm7dwhn3rlhxaa4
       '@mui/styled-engine': 5.10.14_dovxhg2tvkkxkdnqyoum6wzcxm
-      '@mui/types': 7.2.1_@types+react@18.0.28
+      '@mui/types': 7.2.1_@types+react@18.0.30
       '@mui/utils': 5.10.14_react@18.2.0
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       clsx: 1.2.1
       csstype: 3.1.1
       prop-types: 15.8.1
       react: 18.2.0
     dev: false
 
-  /@mui/types/7.2.1_@types+react@18.0.28:
+  /@mui/types/7.2.1_@types+react@18.0.30:
     resolution: {integrity: sha512-c5mSM7ivD8EsqK6HUi9hQPr5V7TJ/IRThUQ9nWNYPdhCGriTSQV4vL6DflT99LkM+wLiIS1rVjphpEWxERep7A==}
     peerDependencies:
       '@types/react': '*'
@@ -8828,7 +8830,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
     dev: false
 
   /@mui/utils/5.10.14_react@18.2.0:
@@ -8893,10 +8895,10 @@ packages:
       '@date-io/dayjs': 2.16.0
       '@date-io/luxon': 2.16.1
       '@date-io/moment': 2.16.1
-      '@emotion/react': 11.10.5_iznqm25yxu4trtkqop3zznseca
+      '@emotion/react': 11.10.5_lzn74h6sajlbfmrxbix4okzmpi
-      '@emotion/styled': 11.10.5_4ahanhknrtlidghakifap67h7q
+      '@emotion/styled': 11.10.5_4jddrkedmmycnrpdaatf3tfj3a
-      '@mui/material': 5.10.14_acl7mc3llczqccvmbrsweq6vga
+      '@mui/material': 5.10.14_ogvxv7hqfgg53da5eqs77qdqde
-      '@mui/system': 5.10.14_teoksulxetwanny5ohzazahldq
+      '@mui/system': 5.10.14_yunkbz2mvya45l5iqzwl5ypfyq
       '@mui/utils': 5.10.9_react@18.2.0
       '@types/react-transition-group': 4.4.5
       clsx: 1.2.1
@@ -9662,7 +9664,7 @@ packages:
       tslib: 2.5.0
     dev: false
 
-  /@reach/dialog/0.17.0_zula6vjvt3wdocc4mwcxqa6nzi:
+  /@reach/dialog/0.17.0_4qaawyptjkcgzqorucvhm3koke:
     resolution: {integrity: sha512-AnfKXugqDTGbeG3c8xDcrQDE4h9b/vnc27Sa118oQSquz52fneUeX9MeFb5ZEiBJK8T5NJpv7QUTBIKnFCAH5A==}
     peerDependencies:
       react: ^16.8.0 || 17.x
@@ -9673,8 +9675,8 @@ packages:
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
-      react-focus-lock: 2.9.2_pmekkgnqduwlme35zpnqhenc34
+      react-focus-lock: 2.9.2_2thlp7g7odiqm7dwhn3rlhxaa4
-      react-remove-scroll: 2.5.5_pmekkgnqduwlme35zpnqhenc34
+      react-remove-scroll: 2.5.5_2thlp7g7odiqm7dwhn3rlhxaa4
       tslib: 2.5.0
     transitivePeerDependencies:
       - '@types/react'
@@ -10193,7 +10195,7 @@ packages:
       - webpack-command
     dev: true
 
-  /@storybook/addon-interactions/6.5.14_o2w7dvvbfxaohzk6den2xlbkgq:
+  /@storybook/addon-interactions/6.5.14_hvoc3iuqa2ltaiia3y4i66hvou:
     resolution: {integrity: sha512-Stw/m3+T6ILrQPwyPgRNYtXZTBk9wE0KOSOUVrc6VixCcXm43nIYkUFiq4NL86lCBR4RKewfgl8U3Rn6chE8Tg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -10204,7 +10206,7 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@devtools-ds/object-inspector': 1.2.0_zula6vjvt3wdocc4mwcxqa6nzi
+      '@devtools-ds/object-inspector': 1.2.0_4qaawyptjkcgzqorucvhm3koke
       '@storybook/addons': 6.5.14_biqbaboplfbrettd7655fr4n2y
       '@storybook/api': 6.5.14_biqbaboplfbrettd7655fr4n2y
       '@storybook/client-logger': 6.5.14
@@ -12473,7 +12475,7 @@ packages:
   /@types/react-dom/18.0.11:
     resolution: {integrity: sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==}
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
     dev: true
 
   /@types/react-dom/18.0.9:
@@ -12485,39 +12487,39 @@ packages:
   /@types/react-is/17.0.3:
     resolution: {integrity: sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==}
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
     dev: false
 
   /@types/react-router-config/5.0.6:
     resolution: {integrity: sha512-db1mx37a1EJDf1XeX8jJN7R3PZABmJQXR8r28yUjVMFSjkmnQo6X6pOEEmNl+Tp2gYQOGPdYbFIipBtdElZ3Yg==}
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       '@types/react-router': 5.1.18
 
   /@types/react-router-dom/5.3.3:
     resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       '@types/react-router': 5.1.18
 
   /@types/react-router/5.1.18:
     resolution: {integrity: sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==}
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
 
   /@types/react-table/7.7.12:
     resolution: {integrity: sha512-bRUent+NR/WwtDGwI/BqhZ8XnHghwHw0HUKeohzB5xN3K2qKWYE5w19e7GCuOkL1CXD9Gi1HFy7TIm2AvgWUHg==}
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
     dev: true
 
   /@types/react-transition-group/4.4.5:
     resolution: {integrity: sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==}
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
     dev: false
 
   /@types/react/18.0.25:
@@ -12535,8 +12537,8 @@ packages:
       csstype: 3.1.1
     dev: true
 
-  /@types/react/18.0.28:
+  /@types/react/18.0.30:
-    resolution: {integrity: sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==}
+    resolution: {integrity: sha512-AnME2cHDH11Pxt/yYX6r0w448BfTwQOLEhQEjCdwB7QskEI7EKtxhGUsExTQe/MsY3D9D5rMtu62WRocw9A8FA==}
     dependencies:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.2
@@ -20726,14 +20728,14 @@ packages:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
     dev: true
 
-  /graphiql/2.4.0_755ntyjuho6qjwic26h62or3by:
+  /graphiql/2.4.0_7bopqva7rdmx76dydi5rwteyri:
     resolution: {integrity: sha512-lJ6OYDQkhAMZePrz8g6r9vMVmxa4SY9eEzzyJxsgE+jA+6PFKds2e8/tDAaCYfX0HNv84nc7W/th1vsHIdgYiA==}
     peerDependencies:
       graphql: ^15.5.0 || ^16.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@graphiql/react': 0.17.0_755ntyjuho6qjwic26h62or3by
+      '@graphiql/react': 0.17.0_7bopqva7rdmx76dydi5rwteyri
       '@graphiql/toolkit': 0.8.2_7fbl5omhlrpwpn5f5culy6mafe
       entities: 2.2.0
       graphql: 16.6.0
@@ -26617,7 +26619,7 @@ packages:
   /react-fast-compare/3.2.0:
     resolution: {integrity: sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==}
 
-  /react-focus-lock/2.9.2_pmekkgnqduwlme35zpnqhenc34:
+  /react-focus-lock/2.9.2_2thlp7g7odiqm7dwhn3rlhxaa4:
     resolution: {integrity: sha512-5JfrsOKyA5Zn3h958mk7bAcfphr24jPoMoznJ8vaJF6fUrPQ8zrtEd3ILLOK8P5jvGxdMd96OxWNjDzATfR2qw==}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -26627,13 +26629,13 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.20.1
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       focus-lock: 0.11.3
       prop-types: 15.8.1
       react: 18.2.0
       react-clientside-effect: 1.2.6_react@18.2.0
-      use-callback-ref: 1.3.0_pmekkgnqduwlme35zpnqhenc34
+      use-callback-ref: 1.3.0_2thlp7g7odiqm7dwhn3rlhxaa4
-      use-sidecar: 1.1.2_pmekkgnqduwlme35zpnqhenc34
+      use-sidecar: 1.1.2_2thlp7g7odiqm7dwhn3rlhxaa4
     dev: false
 
   /react-helmet-async/1.3.0_biqbaboplfbrettd7655fr4n2y:
@@ -26775,7 +26777,7 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /react-remove-scroll-bar/2.3.4_pmekkgnqduwlme35zpnqhenc34:
+  /react-remove-scroll-bar/2.3.4_2thlp7g7odiqm7dwhn3rlhxaa4:
     resolution: {integrity: sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -26785,13 +26787,13 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       react: 18.2.0
-      react-style-singleton: 2.2.1_pmekkgnqduwlme35zpnqhenc34
+      react-style-singleton: 2.2.1_2thlp7g7odiqm7dwhn3rlhxaa4
       tslib: 2.5.0
     dev: false
 
-  /react-remove-scroll/2.5.5_pmekkgnqduwlme35zpnqhenc34:
+  /react-remove-scroll/2.5.5_2thlp7g7odiqm7dwhn3rlhxaa4:
     resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -26801,13 +26803,13 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       react: 18.2.0
-      react-remove-scroll-bar: 2.3.4_pmekkgnqduwlme35zpnqhenc34
+      react-remove-scroll-bar: 2.3.4_2thlp7g7odiqm7dwhn3rlhxaa4
-      react-style-singleton: 2.2.1_pmekkgnqduwlme35zpnqhenc34
+      react-style-singleton: 2.2.1_2thlp7g7odiqm7dwhn3rlhxaa4
       tslib: 2.5.0
-      use-callback-ref: 1.3.0_pmekkgnqduwlme35zpnqhenc34
+      use-callback-ref: 1.3.0_2thlp7g7odiqm7dwhn3rlhxaa4
-      use-sidecar: 1.1.2_pmekkgnqduwlme35zpnqhenc34
+      use-sidecar: 1.1.2_2thlp7g7odiqm7dwhn3rlhxaa4
     dev: false
 
   /react-router-config/5.1.1_rlw3ibuvnpt5jvejeevjcf4ije:
@@ -26882,7 +26884,7 @@ packages:
       react: 18.2.0
     dev: false
 
-  /react-style-singleton/2.2.1_pmekkgnqduwlme35zpnqhenc34:
+  /react-style-singleton/2.2.1_2thlp7g7odiqm7dwhn3rlhxaa4:
     resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -26892,7 +26894,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       get-nonce: 1.0.1
       invariant: 2.2.4
       react: 18.2.0
@@ -29749,65 +29751,65 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /turbo-darwin-64/1.8.5:
+  /turbo-darwin-64/1.8.6:
-    resolution: {integrity: sha512-CAYh56bzeHfnh7jTm03r29bh8p5a/EjQo1Id5yLUH7hS7msTau/+YpxJWPodLbN0UQsUYivUqHQkglJ+eMJ7xA==}
+    resolution: {integrity: sha512-VlXkQR0TEBAEyBRsvAXBax+fj1EdPKPliwBaCnRLiDUcA/8wYlKte/Kk6ubmj9E0n7U/B4keCxxHiJZqW/5Rqg==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-darwin-arm64/1.8.5:
+  /turbo-darwin-arm64/1.8.6:
-    resolution: {integrity: sha512-R3jCPOv+lu3dcvMhj8b/Defv6dyUwX6W+tbX7d6YUCA46Plf/bGCQ8+MSbxmr/4E1GyGOVFsn1wRfiYk0us/Dg==}
+    resolution: {integrity: sha512-w4L2QLj90ex68UXxTPoqtZPl8mWzc6a1RtPjQhoxAWtZf9T2WXi813dCzYEbVUVC09/DOW/VxZRN7sb2r0KP9A==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-64/1.8.5:
+  /turbo-linux-64/1.8.6:
-    resolution: {integrity: sha512-YRc/KNRZeUVvth11UO4SDQZR2IqGgl9MSsbzqoHuFz4B4Q5QXH7onHogv9aXWE/BZBBbcrSBTlwBSG0Gg+J8hg==}
+    resolution: {integrity: sha512-eV245jefIhMAZskqQKalFwreC5UEdQcuHcBiWcgUk0py76fbwB7+1HfH5cmeJlb3a1sB6f3H0HHmGPmb34feCA==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-arm64/1.8.5:
+  /turbo-linux-arm64/1.8.6:
-    resolution: {integrity: sha512-8exVZb7XBl/V3gHSweuUyG2D9IzfWqwLvlXoeLWlVYSj61Ajgdv+WU7lvUmx+H2s+sSKqmIFmewA5Lw6YY37sg==}
+    resolution: {integrity: sha512-Kiw3nyEvNU6Bpil4zE5FwhasPAOi59R4YdCmjJp0Sen6V9u+/Jij6SWwaoUdATORJLiYQBbhontWBH55B53VDw==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-64/1.8.5:
+  /turbo-windows-64/1.8.6:
-    resolution: {integrity: sha512-fA8PU5ZNoFnQkapG06WiEqfsVQ5wbIPkIqTwUsd/M2Lp+KgxE79SQbuEI+2vQ9SmwM5qoMi515IPjgvXAJXgCw==}
+    resolution: {integrity: sha512-34BkAG9r4nE00xeMeVahaF82h8R6SO+IIOcD60fNr2p+Ch+YcQa+DbEWA/KUj3coUTIiNP5XnRCLRUYADdlxjQ==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-arm64/1.8.5:
+  /turbo-windows-arm64/1.8.6:
-    resolution: {integrity: sha512-SW/NvIdhckLsAWjU/iqBbCB0S8kXupKscUK3kEW1DZIr3MYcP/yIuaE/IdPuqcoF3VP0I3TLD4VTYCCKAo3tKA==}
+    resolution: {integrity: sha512-4jWUaI7Lmonp2I3x81GruiCYd0aQsG/xDOYhuv9+j2yIgB/UHJFz/P8PWp/nziwPtGpRd/AheDlPzzyd9lWoqw==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo/1.8.5:
+  /turbo/1.8.6:
-    resolution: {integrity: sha512-UBnH2wIFb5g6OQCk8f34Ud15ZXV4xEMmugeDJTU5Ur2LpVRsNEny0isSCYdb3Iu3howoNyyXmtpaxWsAwNYkkg==}
+    resolution: {integrity: sha512-6IOOaa8ytgjnSCTnp3LKAd2uGBZ/Kmx8ZPlI/YMWuKMUqvkXKLbh+w76ApMgMm+faUqti+QujVWovCu2kY6KuQ==}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      turbo-darwin-64: 1.8.5
+      turbo-darwin-64: 1.8.6
-      turbo-darwin-arm64: 1.8.5
+      turbo-darwin-arm64: 1.8.6
-      turbo-linux-64: 1.8.5
+      turbo-linux-64: 1.8.6
-      turbo-linux-arm64: 1.8.5
+      turbo-linux-arm64: 1.8.6
-      turbo-windows-64: 1.8.5
+      turbo-windows-64: 1.8.6
-      turbo-windows-arm64: 1.8.5
+      turbo-windows-arm64: 1.8.6
     dev: true
 
   /type-check/0.3.2:
@@ -30387,7 +30389,7 @@ packages:
       react: 18.2.0
       wonka: 6.1.1
 
-  /use-callback-ref/1.3.0_pmekkgnqduwlme35zpnqhenc34:
+  /use-callback-ref/1.3.0_2thlp7g7odiqm7dwhn3rlhxaa4:
     resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -30397,7 +30399,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       react: 18.2.0
       tslib: 2.5.0
     dev: false
@@ -30462,7 +30464,7 @@ packages:
       use-isomorphic-layout-effect: 1.1.2_react@18.2.0
     dev: false
 
-  /use-sidecar/1.1.2_pmekkgnqduwlme35zpnqhenc34:
+  /use-sidecar/1.1.2_2thlp7g7odiqm7dwhn3rlhxaa4:
     resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -30472,7 +30474,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 18.0.28
+      '@types/react': 18.0.30
       detect-node-es: 1.1.0
       react: 18.2.0
       tslib: 2.5.0