From ca90c24aaa918d1f4018fa08dd300a3d4fa343cb Mon Sep 17 00:00:00 2001 From: Sync Fork Date: Thu, 4 Jan 2024 00:04:17 +0000 Subject: [PATCH] Merge upstream changes --- .changeset/lucky-humans-kneel.md | 5 ++ .changeset/ninety-deers-whisper.md | 5 ++ dashboard/.env.example | 3 + dashboard/CHANGELOG.md | 6 ++ dashboard/graphql.config.yaml | 4 +- dashboard/package.json | 4 +- .../layout/SettingsLayout/SettingsLayout.tsx | 2 - .../useCurrentWorkspaceAndProject.ts | 1 - dashboard/src/gql/fragments/project.gql | 1 - .../[workspaceSlug]/[appSlug]/backups.tsx | 8 +-- .../browser/[dataSourceSlug]/index.tsx | 2 - .../[appSlug]/deployments/[deploymentId].tsx | 8 +-- .../[appSlug]/deployments/index.tsx | 8 +-- .../[workspaceSlug]/[appSlug]/graphql.tsx | 2 - .../[appSlug]/hasura/index.tsx | 8 +-- .../pages/[workspaceSlug]/[appSlug]/index.tsx | 8 +-- .../[workspaceSlug]/[appSlug]/logs/index.tsx | 8 +-- .../[appSlug]/metrics/index.tsx | 8 +-- .../[appSlug]/services/index.tsx | 8 +-- .../settings/sign-in-methods/index.tsx | 2 - .../[appSlug]/storage/index.tsx | 2 - .../[workspaceSlug]/[appSlug]/users/index.tsx | 2 - dashboard/src/tests/mocks.ts | 1 - dashboard/src/utils/__generated__/graphql.ts | 63 ++----------------- examples/quickstarts/sveltekit/CHANGELOG.md | 5 ++ examples/quickstarts/sveltekit/package.json | 2 +- packages/vue/src/client.ts | 2 + pnpm-lock.yaml | 2 +- 28 files changed, 44 insertions(+), 136 deletions(-) create mode 100644 .changeset/lucky-humans-kneel.md create mode 100644 .changeset/ninety-deers-whisper.md diff --git a/.changeset/lucky-humans-kneel.md b/.changeset/lucky-humans-kneel.md new file mode 100644 index 0000000000..eae3bf1a7a --- /dev/null +++ b/.changeset/lucky-humans-kneel.md @@ -0,0 +1,5 @@ +--- +'@nhost/dashboard': patch +--- + +chore: use env variables when running graphql codegen diff --git a/.changeset/ninety-deers-whisper.md b/.changeset/ninety-deers-whisper.md new file mode 100644 index 0000000000..e0caa4b791 --- /dev/null +++ b/.changeset/ninety-deers-whisper.md @@ -0,0 +1,5 @@ +--- +'@nhost/vue': patch +--- + +fix: include `ServiceUrls` in `NhostVueClientConstructorParams` interface diff --git a/dashboard/.env.example b/dashboard/.env.example index 82f71ff639..5a668e3bb5 100644 --- a/dashboard/.env.example +++ b/dashboard/.env.example @@ -16,3 +16,6 @@ NEXT_PUBLIC_STRIPE_PK= NEXT_PUBLIC_GITHUB_APP_INSTALL_URL= NEXT_PUBLIC_ANALYTICS_WRITE_KEY= NEXT_PUBLIC_NHOST_BRAGI_WEBSOCKET= + +CODEGEN_GRAPHQL_URL=https://local.graphql.nhost.run/v1 +CODEGEN_HASURA_ADMIN_SECRET=nhost-admin-secret diff --git a/dashboard/CHANGELOG.md b/dashboard/CHANGELOG.md index 7a89fa9cd9..bf37eb2b91 100644 --- a/dashboard/CHANGELOG.md +++ b/dashboard/CHANGELOG.md @@ -1,5 +1,11 @@ # @nhost/dashboard +## 1.3.1 + +### Patch Changes + +- af33c21d1: chore: remove backendUrl deprecation notice and remove all references to `providersUpdated` + ## 1.3.0 ### Minor Changes diff --git a/dashboard/graphql.config.yaml b/dashboard/graphql.config.yaml index 5e30d37e79..0220b533f7 100644 --- a/dashboard/graphql.config.yaml +++ b/dashboard/graphql.config.yaml @@ -1,7 +1,7 @@ schema: - - https://local.graphql.nhost.run/v1: + - ${CODEGEN_GRAPHQL_URL}: headers: - x-hasura-admin-secret: nhost-admin-secret + x-hasura-admin-secret: ${CODEGEN_HASURA_ADMIN_SECRET} generates: src/utils/__generated__/graphql.ts: documents: diff --git a/dashboard/package.json b/dashboard/package.json index 57e64d3d37..b0f12fbe6b 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@nhost/dashboard", - "version": "1.3.0", + "version": "1.3.1", "private": true, "scripts": { "preinstall": "npx only-allow pnpm", @@ -10,7 +10,7 @@ "start": "next start", "lint": "next lint --max-warnings 0", "test": "vitest", - "codegen": "graphql-codegen --config graphql.config.yaml --errors-only", + "codegen": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config graphql.config.yaml --errors-only", "codegen-graphite": "graphql-codegen --config graphite.graphql.config.yaml --errors-only", "format": "prettier --write \"src/**/*.{js,ts,tsx,jsx,json,md}\" --plugin-search-dir=.", "storybook": "start-storybook -p 6006 -s public", diff --git a/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx b/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx index 858374e818..ba4eb5fe4a 100644 --- a/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx +++ b/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import type { ProjectLayoutProps } from '@/components/layout/ProjectLayout'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import type { SettingsSidebarProps } from '@/components/layout/SettingsSidebar'; @@ -50,7 +49,6 @@ export default function SettingsLayout({ >
- {hasGitRepo && ( - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/database/browser/[dataSourceSlug]/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/database/browser/[dataSourceSlug]/index.tsx index cfdd45f5c6..8b7b9adc55 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/database/browser/[dataSourceSlug]/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/database/browser/[dataSourceSlug]/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { InlineCode } from '@/components/presentational/InlineCode'; import { DataBrowserEmptyState } from '@/features/database/dataGrid/components/DataBrowserEmptyState'; import { DataBrowserLayout } from '@/features/database/dataGrid/components/DataBrowserLayout'; @@ -38,7 +37,6 @@ DataBrowserDatabaseDetailsPage.getLayout = function getLayout( ) { return ( - {page} ); diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/[deploymentId].tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/[deploymentId].tsx index 8c68f0e123..9513101b11 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/[deploymentId].tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/[deploymentId].tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { Container } from '@/components/layout/Container'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import type { DeploymentStatus } from '@/components/presentational/StatusCircle'; @@ -153,10 +152,5 @@ export default function DeploymentDetailsPage() { } DeploymentDetailsPage.getLayout = function getLayout(page: ReactElement) { - return ( - - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/index.tsx index d648724699..c4c29b2557 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/deployments/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { useUI } from '@/components/common/UIProvider'; import { Container } from '@/components/layout/Container'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; @@ -68,10 +67,5 @@ export default function DeploymentsPage() { } DeploymentsPage.getLayout = function getLayout(page: ReactElement) { - return ( - - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/graphql.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/graphql.tsx index dbf9b9e3db..0618039153 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/graphql.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/graphql.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import { LoadingScreen } from '@/components/presentational/LoadingScreen'; import { RetryableErrorBoundary } from '@/components/presentational/RetryableErrorBoundary'; @@ -352,7 +351,6 @@ GraphQLPage.getLayout = function getLayout(page: ReactElement) { }, }} > - {page} ); diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/hasura/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/hasura/index.tsx index 5d0f73606f..b3d06a077d 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/hasura/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/hasura/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { Container } from '@/components/layout/Container'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import { LoadingScreen } from '@/components/presentational/LoadingScreen'; @@ -113,10 +112,5 @@ export default function HasuraPage() { } HasuraPage.getLayout = function getLayout(page: ReactElement) { - return ( - - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/index.tsx index 64b0950f4d..7d904c0a63 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import { ApplicationErrored } from '@/features/projects/common/components/ApplicationErrored'; import { ApplicationLive } from '@/features/projects/common/components/ApplicationLive'; @@ -50,10 +49,5 @@ export default function AppIndexPage() { } AppIndexPage.getLayout = function getLayout(page: ReactElement) { - return ( - - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/logs/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/logs/index.tsx index 9633c14c81..7bc074fb7b 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/logs/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/logs/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import { RetryableErrorBoundary } from '@/components/presentational/RetryableErrorBoundary'; import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject'; @@ -135,10 +134,5 @@ export default function LogsPage() { } LogsPage.getLayout = function getLayout(page: ReactElement) { - return ( - - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/metrics/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/metrics/index.tsx index f1a4b4b94a..127e5aa7cc 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/metrics/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/metrics/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { Container } from '@/components/layout/Container'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator'; @@ -127,10 +126,5 @@ export default function MetricsPage() { } MetricsPage.getLayout = function getLayout(page: ReactElement) { - return ( - - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/services/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/services/index.tsx index 3fe0fa2059..861512208c 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/services/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/services/index.tsx @@ -12,7 +12,6 @@ import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/ import type { GetRunServicesQuery } from '@/utils/__generated__/graphql'; import { useGetRunServicesQuery } from '@/utils/__generated__/graphql'; -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { UpgradeNotification } from '@/features/projects/common/components/UpgradeNotification'; import { ServiceForm, @@ -259,10 +258,5 @@ export default function ServicesPage() { } ServicesPage.getLayout = function getLayout(page: ReactElement) { - return ( - - - {page} - - ); + return {page}; }; diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/settings/sign-in-methods/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/settings/sign-in-methods/index.tsx index f9ff8785d3..7fe3930519 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/settings/sign-in-methods/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/settings/sign-in-methods/index.tsx @@ -1,6 +1,5 @@ import { Container } from '@/components/layout/Container'; import { SettingsLayout } from '@/components/layout/SettingsLayout'; -import { ProvidersUpdatedAlert } from '@/components/settings'; import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator'; import { AnonymousSignInSettings } from '@/features/authentication/settings/components/AnonymousSignInSettings'; import { AppleProviderSettings } from '@/features/authentication/settings/components/AppleProviderSettings'; @@ -55,7 +54,6 @@ export default function SettingsSignInMethodsPage() { - {!currentProject.providersUpdated && } diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/storage/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/storage/index.tsx index e4b5c50c30..171027cfc1 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/storage/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/storage/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { ProjectLayout } from '@/components/layout/ProjectLayout'; import { LoadingScreen } from '@/components/presentational/LoadingScreen'; import { RetryableErrorBoundary } from '@/components/presentational/RetryableErrorBoundary'; @@ -45,7 +44,6 @@ StoragePage.getLayout = function getLayout(page: ReactElement) { - {page} ); diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/users/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/users/index.tsx index 39e61ffc44..f1f25d80cf 100644 --- a/dashboard/src/pages/[workspaceSlug]/[appSlug]/users/index.tsx +++ b/dashboard/src/pages/[workspaceSlug]/[appSlug]/users/index.tsx @@ -1,4 +1,3 @@ -import DepricationNotice from '@/components/common/DepricationNotice/DepricationNotice'; import { useDialog } from '@/components/common/DialogProvider'; import { Pagination } from '@/components/common/Pagination'; import { Container } from '@/components/layout/Container'; @@ -391,7 +390,6 @@ export default function UsersPage() { UsersPage.getLayout = function getLayout(page: ReactElement) { return ( - {page} ); diff --git a/dashboard/src/tests/mocks.ts b/dashboard/src/tests/mocks.ts index 5508225efa..e2809b969b 100644 --- a/dashboard/src/tests/mocks.ts +++ b/dashboard/src/tests/mocks.ts @@ -59,7 +59,6 @@ export const mockApplication: Project = { deployments: [], desiredState: ApplicationStatus.Live, featureFlags: [], - providersUpdated: true, githubRepository: { fullName: 'test/git-project' }, repositoryProductionBranch: null, nhostBaseFolder: null, diff --git a/dashboard/src/utils/__generated__/graphql.ts b/dashboard/src/utils/__generated__/graphql.ts index bd13fa16bd..dac7805023 100644 --- a/dashboard/src/utils/__generated__/graphql.ts +++ b/dashboard/src/utils/__generated__/graphql.ts @@ -3362,7 +3362,6 @@ export type Apps = { /** An object relationship */ plan: Plans; planId: Scalars['uuid']; - providersUpdated?: Maybe; /** An object relationship */ region: Regions; regionId: Scalars['uuid']; @@ -3626,7 +3625,6 @@ export type Apps_Bool_Exp = { nhostBaseFolder?: InputMaybe; plan?: InputMaybe; planId?: InputMaybe; - providersUpdated?: InputMaybe; region?: InputMaybe; regionId?: InputMaybe; repositoryProductionBranch?: InputMaybe; @@ -3700,7 +3698,6 @@ export type Apps_Insert_Input = { nhostBaseFolder?: InputMaybe; plan?: InputMaybe; planId?: InputMaybe; - providersUpdated?: InputMaybe; region?: InputMaybe; regionId?: InputMaybe; repositoryProductionBranch?: InputMaybe; @@ -3862,7 +3859,6 @@ export type Apps_Order_By = { nhostBaseFolder?: InputMaybe; plan?: InputMaybe; planId?: InputMaybe; - providersUpdated?: InputMaybe; region?: InputMaybe; regionId?: InputMaybe; repositoryProductionBranch?: InputMaybe; @@ -3919,8 +3915,6 @@ export enum Apps_Select_Column { /** column name */ PlanId = 'planId', /** column name */ - ProvidersUpdated = 'providersUpdated', - /** column name */ RegionId = 'regionId', /** column name */ RepositoryProductionBranch = 'repositoryProductionBranch', @@ -3943,8 +3937,6 @@ export enum Apps_Select_Column_Apps_Aggregate_Bool_Exp_Bool_And_Arguments_Column /** column name */ IsLocked = 'isLocked', /** column name */ - ProvidersUpdated = 'providersUpdated', - /** column name */ StateMatch = 'stateMatch' } @@ -3953,8 +3945,6 @@ export enum Apps_Select_Column_Apps_Aggregate_Bool_Exp_Bool_Or_Arguments_Columns /** column name */ IsLocked = 'isLocked', /** column name */ - ProvidersUpdated = 'providersUpdated', - /** column name */ StateMatch = 'stateMatch' } @@ -3975,7 +3965,6 @@ export type Apps_Set_Input = { name?: InputMaybe; nhostBaseFolder?: InputMaybe; planId?: InputMaybe; - providersUpdated?: InputMaybe; regionId?: InputMaybe; repositoryProductionBranch?: InputMaybe; slug?: InputMaybe; @@ -4049,7 +4038,6 @@ export type Apps_Stream_Cursor_Value_Input = { name?: InputMaybe; nhostBaseFolder?: InputMaybe; planId?: InputMaybe; - providersUpdated?: InputMaybe; regionId?: InputMaybe; repositoryProductionBranch?: InputMaybe; slug?: InputMaybe; @@ -4106,8 +4094,6 @@ export enum Apps_Update_Column { /** column name */ PlanId = 'planId', /** column name */ - ProvidersUpdated = 'providersUpdated', - /** column name */ RegionId = 'regionId', /** column name */ RepositoryProductionBranch = 'repositoryProductionBranch', @@ -22490,7 +22476,7 @@ export type DeleteApplicationMutation = { __typename?: 'mutation_root', deleteAp export type GetAllWorkspacesAndProjectsQueryVariables = Exact<{ [key: string]: never; }>; -export type GetAllWorkspacesAndProjectsQuery = { __typename?: 'query_root', workspaces: Array<{ __typename?: 'workspaces', id: any, name: string, slug: string, creatorUserId?: any | null, workspaceMembers: Array<{ __typename?: 'workspaceMembers', id: any, type: string, user: { __typename?: 'users', id: any, email?: any | null, displayName: string } }>, projects: Array<{ __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, providersUpdated?: boolean | null, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }> }> }; +export type GetAllWorkspacesAndProjectsQuery = { __typename?: 'query_root', workspaces: Array<{ __typename?: 'workspaces', id: any, name: string, slug: string, creatorUserId?: any | null, workspaceMembers: Array<{ __typename?: 'workspaceMembers', id: any, type: string, user: { __typename?: 'users', id: any, email?: any | null, displayName: string } }>, projects: Array<{ __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }> }> }; export type GetAppPlanAndGlobalPlansAppFragment = { __typename?: 'apps', id: any, subdomain: string, workspace: { __typename?: 'workspaces', id: any, paymentMethods: Array<{ __typename?: 'paymentMethods', id: any }> }, plan: { __typename?: 'plans', id: any, name: string } }; @@ -22547,7 +22533,7 @@ export type GetWorkspaceAndProjectQueryVariables = Exact<{ }>; -export type GetWorkspaceAndProjectQuery = { __typename?: 'query_root', workspaces: Array<{ __typename?: 'workspaces', id: any, name: string, slug: string, creatorUserId?: any | null, workspaceMembers: Array<{ __typename?: 'workspaceMembers', id: any, type: string, user: { __typename?: 'users', id: any, email?: any | null, displayName: string } }>, projects: Array<{ __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, providersUpdated?: boolean | null, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }> }> }; +export type GetWorkspaceAndProjectQuery = { __typename?: 'query_root', workspaces: Array<{ __typename?: 'workspaces', id: any, name: string, slug: string, creatorUserId?: any | null, workspaceMembers: Array<{ __typename?: 'workspaceMembers', id: any, type: string, user: { __typename?: 'users', id: any, email?: any | null, displayName: string } }>, projects: Array<{ __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }> }> }; export type InsertApplicationMutationVariables = Exact<{ app: Apps_Insert_Input; @@ -22739,9 +22725,9 @@ export type GetFilesAggregateQuery = { __typename?: 'query_root', filesAggregate export type AppStateHistoryFragment = { __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }; -export type ProjectFragment = { __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, providersUpdated?: boolean | null, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }; +export type ProjectFragment = { __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }; -export type WorkspaceFragment = { __typename?: 'workspaces', id: any, name: string, slug: string, creatorUserId?: any | null, workspaceMembers: Array<{ __typename?: 'workspaceMembers', id: any, type: string, user: { __typename?: 'users', id: any, email?: any | null, displayName: string } }>, projects: Array<{ __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, providersUpdated?: boolean | null, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }> }; +export type WorkspaceFragment = { __typename?: 'workspaces', id: any, name: string, slug: string, creatorUserId?: any | null, workspaceMembers: Array<{ __typename?: 'workspaceMembers', id: any, type: string, user: { __typename?: 'users', id: any, email?: any | null, displayName: string } }>, projects: Array<{ __typename?: 'apps', id: any, slug: string, name: string, repositoryProductionBranch: string, subdomain: string, createdAt: any, desiredState: number, nhostBaseFolder: string, config?: { __typename?: 'ConfigConfig', observability: { __typename?: 'ConfigObservability', grafana: { __typename?: 'ConfigGrafana', adminPassword: string } }, hasura: { __typename?: 'ConfigHasura', adminSecret: string, settings?: { __typename?: 'ConfigHasuraSettings', enableConsole?: boolean | null } | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null } | null, featureFlags: Array<{ __typename?: 'featureFlags', description: string, id: any, name: string, value: string }>, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }>, region: { __typename?: 'regions', id: any, countryCode: string, awsName: string, domain: string, city: string }, plan: { __typename?: 'plans', id: any, name: string, price: number, isFree: boolean, featureMaxDbSize: number }, githubRepository?: { __typename?: 'githubRepositories', fullName: string } | null, deployments: Array<{ __typename?: 'deployments', id: any, commitSHA: string, commitMessage?: string | null, commitUserName?: string | null, deploymentStartedAt?: any | null, deploymentEndedAt?: any | null, commitUserAvatarUrl?: string | null, deploymentStatus?: string | null }>, creator?: { __typename?: 'users', id: any, email?: any | null, displayName: string } | null }> }; export type GithubRepositoryFragment = { __typename?: 'githubRepositories', id: any, name: string, fullName: string, private: boolean, githubAppInstallation: { __typename?: 'githubAppInstallations', id: any, accountLogin?: string | null, accountType?: string | null, accountAvatarUrl?: string | null } }; @@ -22979,13 +22965,6 @@ export type UpdateRunServiceConfigMutationVariables = Exact<{ export type UpdateRunServiceConfigMutation = { __typename?: 'mutation_root', updateRunServiceConfig: { __typename?: 'ConfigRunServiceConfig', name: any } }; -export type ConfirmProvidersUpdatedMutationVariables = Exact<{ - id: Scalars['uuid']; -}>; - - -export type ConfirmProvidersUpdatedMutation = { __typename?: 'mutation_root', updateApp?: { __typename?: 'apps', id: any } | null }; - export type GetFreeAndActiveProjectsQueryVariables = Exact<{ userId: Scalars['uuid']; }>; @@ -23240,7 +23219,6 @@ export const ProjectFragmentDoc = gql` createdAt desiredState nhostBaseFolder - providersUpdated config(resolve: true) { observability { grafana { @@ -26751,39 +26729,6 @@ export function useUpdateRunServiceConfigMutation(baseOptions?: Apollo.MutationH export type UpdateRunServiceConfigMutationHookResult = ReturnType; export type UpdateRunServiceConfigMutationResult = Apollo.MutationResult; export type UpdateRunServiceConfigMutationOptions = Apollo.BaseMutationOptions; -export const ConfirmProvidersUpdatedDocument = gql` - mutation confirmProvidersUpdated($id: uuid!) { - updateApp(pk_columns: {id: $id}, _set: {providersUpdated: true}) { - id - } -} - `; -export type ConfirmProvidersUpdatedMutationFn = Apollo.MutationFunction; - -/** - * __useConfirmProvidersUpdatedMutation__ - * - * To run a mutation, you first call `useConfirmProvidersUpdatedMutation` within a React component and pass it any options that fit your needs. - * When your component renders, `useConfirmProvidersUpdatedMutation` returns a tuple that includes: - * - A mutate function that you can call at any time to execute the mutation - * - An object with fields that represent the current status of the mutation's execution - * - * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2; - * - * @example - * const [confirmProvidersUpdatedMutation, { data, loading, error }] = useConfirmProvidersUpdatedMutation({ - * variables: { - * id: // value for 'id' - * }, - * }); - */ -export function useConfirmProvidersUpdatedMutation(baseOptions?: Apollo.MutationHookOptions) { - const options = {...defaultOptions, ...baseOptions} - return Apollo.useMutation(ConfirmProvidersUpdatedDocument, options); - } -export type ConfirmProvidersUpdatedMutationHookResult = ReturnType; -export type ConfirmProvidersUpdatedMutationResult = Apollo.MutationResult; -export type ConfirmProvidersUpdatedMutationOptions = Apollo.BaseMutationOptions; export const GetFreeAndActiveProjectsDocument = gql` query GetFreeAndActiveProjects($userId: uuid!) { freeAndActiveProjects: apps( diff --git a/examples/quickstarts/sveltekit/CHANGELOG.md b/examples/quickstarts/sveltekit/CHANGELOG.md index 69c7733e68..4e306e918f 100644 --- a/examples/quickstarts/sveltekit/CHANGELOG.md +++ b/examples/quickstarts/sveltekit/CHANGELOG.md @@ -1,5 +1,10 @@ --- +## 0.2.1 +### Patch Changes + +- b4dccd449: fix: resolve auth issue and too many redirects error + ## 0.2.0 ### Minor Changes diff --git a/examples/quickstarts/sveltekit/package.json b/examples/quickstarts/sveltekit/package.json index 0fc2050f9b..c1dffbe5d6 100644 --- a/examples/quickstarts/sveltekit/package.json +++ b/examples/quickstarts/sveltekit/package.json @@ -1,6 +1,6 @@ { "name": "@nhost-examples/sveltekit", - "version": "0.2.0", + "version": "0.2.1", "private": true, "scripts": { "dev": "vite dev", diff --git a/packages/vue/src/client.ts b/packages/vue/src/client.ts index 4b150a3b41..851154b546 100644 --- a/packages/vue/src/client.ts +++ b/packages/vue/src/client.ts @@ -2,6 +2,7 @@ import { NhostAuthConstructorParams, NhostClient as VanillaClient, removeParameterFromWindow, + ServiceUrls, Subdomain } from '@nhost/nhost-js' import { App, warn } from 'vue' @@ -11,6 +12,7 @@ export type { ErrorPayload, NhostSession, Subdomain, User } from '@nhost/nhost-j export interface NhostVueClientConstructorParams extends Partial, + Partial, Omit {} export class NhostClient extends VanillaClient { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e72f53fc66..f9e5b51488 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36442,4 +36442,4 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - dev: false + dev: false \ No newline at end of file