From 2569f190cbde99c0b71d2aa607d19de365f51759 Mon Sep 17 00:00:00 2001 From: Kristaps Fabians Geikins Date: Fri, 13 Sep 2024 14:02:56 +0300 Subject: [PATCH] Revert "fix(server): workspace status check query" This reverts commit 5413269273d24638c8e3e29d627904eb3dc78383. --- packages/server/codegen.yml | 1 - packages/server/modules/core/graph/generated/graphql.ts | 8 ++++---- .../modules/workspaces/graph/resolvers/workspaces.ts | 6 ------ .../workspacesCore/graph/resolvers/workspacesCore.ts | 6 ------ 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/packages/server/codegen.yml b/packages/server/codegen.yml index 45848709e..f7ae9eeda 100644 --- a/packages/server/codegen.yml +++ b/packages/server/codegen.yml @@ -66,7 +66,6 @@ generates: Webhook: '@/modules/webhooks/helpers/graphTypes#WebhookGraphQLReturn' SmartTextEditorValue: '@/modules/core/services/richTextEditorService#SmartTextEditorValueSchema' BlobMetadata: '@/modules/blobstorage/domain/types#BlobStorageItem' - ServerWorkspacesInfo: '@/modules/core/helpers/graphTypes#GraphQLEmptyReturn' modules/cross-server-sync/graph/generated/graphql.ts: plugins: - 'typescript' diff --git a/packages/server/modules/core/graph/generated/graphql.ts b/packages/server/modules/core/graph/generated/graphql.ts index 1667a4754..bd6a72416 100644 --- a/packages/server/modules/core/graph/generated/graphql.ts +++ b/packages/server/modules/core/graph/generated/graphql.ts @@ -4418,7 +4418,7 @@ export type ResolversTypes = { ServerAppListItem: ResolverTypeWrapper; ServerAutomateInfo: ResolverTypeWrapper; ServerConfiguration: ResolverTypeWrapper; - ServerInfo: ResolverTypeWrapper & { workspaces: ResolversTypes['ServerWorkspacesInfo'] }>; + ServerInfo: ResolverTypeWrapper; ServerInfoUpdateInput: ServerInfoUpdateInput; ServerInvite: ResolverTypeWrapper; ServerInviteCreateInput: ServerInviteCreateInput; @@ -4427,7 +4427,7 @@ export type ResolversTypes = { ServerRoleItem: ResolverTypeWrapper; ServerStatistics: ResolverTypeWrapper; ServerStats: ResolverTypeWrapper; - ServerWorkspacesInfo: ResolverTypeWrapper; + ServerWorkspacesInfo: ResolverTypeWrapper; SetPrimaryUserEmailInput: SetPrimaryUserEmailInput; SmartTextEditorValue: ResolverTypeWrapper; SortDirection: SortDirection; @@ -4663,7 +4663,7 @@ export type ResolversParentTypes = { ServerAppListItem: ServerAppListItem; ServerAutomateInfo: ServerAutomateInfo; ServerConfiguration: ServerConfiguration; - ServerInfo: Omit & { workspaces: ResolversParentTypes['ServerWorkspacesInfo'] }; + ServerInfo: ServerInfo; ServerInfoUpdateInput: ServerInfoUpdateInput; ServerInvite: ServerInviteGraphQLReturnType; ServerInviteCreateInput: ServerInviteCreateInput; @@ -4671,7 +4671,7 @@ export type ResolversParentTypes = { ServerRoleItem: ServerRoleItem; ServerStatistics: GraphQLEmptyReturn; ServerStats: GraphQLEmptyReturn; - ServerWorkspacesInfo: GraphQLEmptyReturn; + ServerWorkspacesInfo: ServerWorkspacesInfo; SetPrimaryUserEmailInput: SetPrimaryUserEmailInput; SmartTextEditorValue: SmartTextEditorValueSchema; Stream: StreamGraphQLReturn; diff --git a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts index 28ac181a1..03a515f00 100644 --- a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts +++ b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts @@ -878,12 +878,6 @@ export = FF_WORKSPACES_MODULE_ENABLED getWorkspaceWithDomains: getWorkspaceWithDomainsFactory({ db }) })({ workspaceId, userId }) } - }, - ServerInfo: { - workspaces: () => ({}) - }, - ServerWorkspacesInfo: { - workspacesEnabled: () => true } } as Resolvers) : {} diff --git a/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts b/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts index e842bca8c..d362d94da 100644 --- a/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts +++ b/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts @@ -102,12 +102,6 @@ export = !FF_WORKSPACES_MODULE_ENABLED }, LimitedUser: { workspaceDomainPolicyCompliant: async () => null - }, - ServerInfo: { - workspaces: () => ({}) - }, - ServerWorkspacesInfo: { - workspacesEnabled: () => false } } as Resolvers) : {}