From dc792e830d2a2353e700f783db02ad06e66611c5 Mon Sep 17 00:00:00 2001 From: martmull Date: Tue, 6 Feb 2024 10:12:27 +0100 Subject: [PATCH] Rename createWorkspace to createWorkspaceSchema --- .../twenty-front/src/generated/graphql.tsx | 40 +++++++++---------- .../graphql/mutations/createWorkspace.ts | 9 ----- .../mutations/createWorkspaceSchema.ts | 9 +++++ .../src/pages/auth/CreateWorkspace.tsx | 8 ++-- ...ut.ts => create-workspace-schema-input.ts} | 2 +- .../workspace/services/workspace.service.ts | 4 +- .../src/core/workspace/workspace.resolver.ts | 8 ++-- 7 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspace.ts create mode 100644 packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspaceSchema.ts rename packages/twenty-server/src/core/workspace/dtos/{create-workspace-input.ts => create-workspace-schema-input.ts} (92%) diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx index af61a4f227e..981084ef10e 100644 --- a/packages/twenty-front/src/generated/graphql.tsx +++ b/packages/twenty-front/src/generated/graphql.tsx @@ -86,7 +86,7 @@ export type CreateRefreshTokenInput = { expiresAt: Scalars['DateTime']; }; -export type CreateWorkspaceInput = { +export type CreateWorkspaceSchemaInput = { allowImpersonation?: InputMaybe; displayName?: InputMaybe; domainName?: InputMaybe; @@ -235,7 +235,7 @@ export type Mutation = { createEvent: Analytics; createOneObject: Object; createOneRefreshToken: RefreshToken; - createWorkspace: Workspace; + createWorkspaceSchema: Workspace; deleteCurrentWorkspace: Workspace; deleteOneObject: Object; deleteUser: User; @@ -273,8 +273,8 @@ export type MutationCreateOneRefreshTokenArgs = { }; -export type MutationCreateWorkspaceArgs = { - data: CreateWorkspaceInput; +export type MutationCreateWorkspaceSchemaArgs = { + data: CreateWorkspaceSchemaInput; }; @@ -879,12 +879,12 @@ export type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>; export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: string, key: string, value: boolean, workspaceId: string }> | null } } }; -export type CreateWorkspaceMutationVariables = Exact<{ - input: CreateWorkspaceInput; +export type CreateWorkspaceSchemaMutationVariables = Exact<{ + input: CreateWorkspaceSchemaInput; }>; -export type CreateWorkspaceMutation = { __typename?: 'Mutation', createWorkspace: { __typename?: 'Workspace', id: string } }; +export type CreateWorkspaceSchemaMutation = { __typename?: 'Mutation', createWorkspaceSchema: { __typename?: 'Workspace', id: string } }; export type DeleteCurrentWorkspaceMutationVariables = Exact<{ [key: string]: never; }>; @@ -1766,39 +1766,39 @@ export function useGetCurrentUserLazyQuery(baseOptions?: Apollo.LazyQueryHookOpt export type GetCurrentUserQueryHookResult = ReturnType; export type GetCurrentUserLazyQueryHookResult = ReturnType; export type GetCurrentUserQueryResult = Apollo.QueryResult; -export const CreateWorkspaceDocument = gql` - mutation CreateWorkspace($input: CreateWorkspaceInput!) { - createWorkspace(data: $input) { +export const CreateWorkspaceSchemaDocument = gql` + mutation CreateWorkspaceSchema($input: CreateWorkspaceSchemaInput!) { + createWorkspaceSchema(data: $input) { id } } `; -export type CreateWorkspaceMutationFn = Apollo.MutationFunction; +export type CreateWorkspaceSchemaMutationFn = Apollo.MutationFunction; /** - * __useCreateWorkspaceMutation__ + * __useCreateWorkspaceSchemaMutation__ * - * To run a mutation, you first call `useCreateWorkspaceMutation` within a React component and pass it any options that fit your needs. - * When your component renders, `useCreateWorkspaceMutation` returns a tuple that includes: + * To run a mutation, you first call `useCreateWorkspaceSchemaMutation` within a React component and pass it any options that fit your needs. + * When your component renders, `useCreateWorkspaceSchemaMutation` 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 [createWorkspaceMutation, { data, loading, error }] = useCreateWorkspaceMutation({ + * const [createWorkspaceSchemaMutation, { data, loading, error }] = useCreateWorkspaceSchemaMutation({ * variables: { * input: // value for 'input' * }, * }); */ -export function useCreateWorkspaceMutation(baseOptions?: Apollo.MutationHookOptions) { +export function useCreateWorkspaceSchemaMutation(baseOptions?: Apollo.MutationHookOptions) { const options = {...defaultOptions, ...baseOptions} - return Apollo.useMutation(CreateWorkspaceDocument, options); + return Apollo.useMutation(CreateWorkspaceSchemaDocument, options); } -export type CreateWorkspaceMutationHookResult = ReturnType; -export type CreateWorkspaceMutationResult = Apollo.MutationResult; -export type CreateWorkspaceMutationOptions = Apollo.BaseMutationOptions; +export type CreateWorkspaceSchemaMutationHookResult = ReturnType; +export type CreateWorkspaceSchemaMutationResult = Apollo.MutationResult; +export type CreateWorkspaceSchemaMutationOptions = Apollo.BaseMutationOptions; export const DeleteCurrentWorkspaceDocument = gql` mutation DeleteCurrentWorkspace { deleteCurrentWorkspace { diff --git a/packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspace.ts b/packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspace.ts deleted file mode 100644 index 9121ba4a6ac..00000000000 --- a/packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspace.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { gql } from '@apollo/client'; - -export const CREATE_WORKSPACE = gql` - mutation CreateWorkspace($input: CreateWorkspaceInput!) { - createWorkspace(data: $input) { - id - } - } -`; diff --git a/packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspaceSchema.ts b/packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspaceSchema.ts new file mode 100644 index 00000000000..68b7d0deb47 --- /dev/null +++ b/packages/twenty-front/src/modules/workspace/graphql/mutations/createWorkspaceSchema.ts @@ -0,0 +1,9 @@ +import { gql } from '@apollo/client'; + +export const CREATE_WORKSPACE_SCHEMA = gql` + mutation CreateWorkspaceSchema($input: CreateWorkspaceSchemaInput!) { + createWorkspaceSchema(data: $input) { + id + } + } +`; diff --git a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx index 99120544e5e..570b54380ec 100644 --- a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx +++ b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx @@ -20,7 +20,7 @@ import { MainButton } from '@/ui/input/button/components/MainButton'; import { TextInput } from '@/ui/input/components/TextInput'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser'; -import { useCreateWorkspaceMutation } from '~/generated/graphql'; +import { useCreateWorkspaceSchemaMutation } from '~/generated/graphql'; const StyledContentContainer = styled.div` width: 100%; @@ -49,7 +49,7 @@ export const CreateWorkspace = () => { const { enqueueSnackBar } = useSnackBar(); const onboardingStatus = useOnboardingStatus(); - const [createWorkspace] = useCreateWorkspaceMutation(); + const [createWorkspaceSchema] = useCreateWorkspaceSchemaMutation(); const apolloMetadataClient = useApolloMetadataClient(); // Form @@ -69,7 +69,7 @@ export const CreateWorkspace = () => { const onSubmit: SubmitHandler
= useCallback( async (data) => { try { - const result = await createWorkspace({ + const result = await createWorkspaceSchema({ variables: { input: { displayName: data.name, @@ -95,7 +95,7 @@ export const CreateWorkspace = () => { }); } }, - [enqueueSnackBar, navigate, apolloMetadataClient, createWorkspace], + [enqueueSnackBar, navigate, apolloMetadataClient, createWorkspaceSchema], ); const handleKeyDown = (event: React.KeyboardEvent) => { diff --git a/packages/twenty-server/src/core/workspace/dtos/create-workspace-input.ts b/packages/twenty-server/src/core/workspace/dtos/create-workspace-schema-input.ts similarity index 92% rename from packages/twenty-server/src/core/workspace/dtos/create-workspace-input.ts rename to packages/twenty-server/src/core/workspace/dtos/create-workspace-schema-input.ts index 2b656a8e7a1..9e12039190f 100644 --- a/packages/twenty-server/src/core/workspace/dtos/create-workspace-input.ts +++ b/packages/twenty-server/src/core/workspace/dtos/create-workspace-schema-input.ts @@ -3,7 +3,7 @@ import { Field, InputType } from '@nestjs/graphql'; import { IsBoolean, IsOptional, IsString } from 'class-validator'; @InputType() -export class CreateWorkspaceInput { +export class CreateWorkspaceSchemaInput { @Field({ nullable: true }) @IsString() @IsOptional() diff --git a/packages/twenty-server/src/core/workspace/services/workspace.service.ts b/packages/twenty-server/src/core/workspace/services/workspace.service.ts index eb3c18d30d5..5d3ccfc4d25 100644 --- a/packages/twenty-server/src/core/workspace/services/workspace.service.ts +++ b/packages/twenty-server/src/core/workspace/services/workspace.service.ts @@ -10,7 +10,7 @@ import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspa import { Workspace } from 'src/core/workspace/workspace.entity'; import { User } from 'src/core/user/user.entity'; import { UserService } from 'src/core/user/services/user.service'; -import { CreateWorkspaceInput } from 'src/core/workspace/dtos/create-workspace-input'; +import { CreateWorkspaceSchemaInput } from 'src/core/workspace/dtos/create-workspace-schema-input'; export class WorkspaceService extends TypeOrmQueryService { constructor( @@ -22,7 +22,7 @@ export class WorkspaceService extends TypeOrmQueryService { super(workspaceRepository); } - async createWorkspace(user: User, data: CreateWorkspaceInput) { + async createWorkspaceSchema(user: User, data: CreateWorkspaceSchemaInput) { if (!data.displayName || !data.displayName.length) { throw new BadRequestException("'displayName' not provided"); } diff --git a/packages/twenty-server/src/core/workspace/workspace.resolver.ts b/packages/twenty-server/src/core/workspace/workspace.resolver.ts index dbf4e77b20a..30655587561 100644 --- a/packages/twenty-server/src/core/workspace/workspace.resolver.ts +++ b/packages/twenty-server/src/core/workspace/workspace.resolver.ts @@ -13,8 +13,8 @@ import { JwtAuthGuard } from 'src/guards/jwt.auth.guard'; import { UpdateWorkspaceInput } from 'src/core/workspace/dtos/update-workspace-input'; import { EnvironmentService } from 'src/integrations/environment/environment.service'; import { User } from 'src/core/user/user.entity'; -import { CreateWorkspaceInput } from 'src/core/workspace/dtos/create-workspace-input'; import { AuthUser } from 'src/decorators/auth/auth-user.decorator'; +import { CreateWorkspaceSchemaInput } from 'src/core/workspace/dtos/create-workspace-schema-input'; import { Workspace } from './workspace.entity'; @@ -40,11 +40,11 @@ export class WorkspaceResolver { @Mutation(() => Workspace) @UseGuards(JwtAuthGuard) - async createWorkspace( - @Args('data') data: CreateWorkspaceInput, + async createWorkspaceSchema( + @Args('data') data: CreateWorkspaceSchemaInput, @AuthUser() user: User, ) { - return await this.workspaceService.createWorkspace(user, data); + return await this.workspaceService.createWorkspaceSchema(user, data); } @Mutation(() => Workspace)