Skip to content

Commit 4ebedf7

Browse files
committed
Merge remote-tracking branch 'origin/main' into r--logic-function-record-inputs
2 parents d864a2e + 6a1b28b commit 4ebedf7

63 files changed

Lines changed: 1219 additions & 629 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://json.schemastore.org/claude-code-settings.json",
3+
"attribution": {
4+
"commit": "",
5+
"pr": ""
6+
}
7+
}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
**/**/.env
22
.DS_Store
33
/.idea
4-
.claude/
4+
.claude/*
5+
!.claude/settings.json
56
.cursor/debug-*.log
67
**/**/node_modules/
78
.cache

packages/twenty-client-sdk/src/metadata/generated/schema.graphql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3395,6 +3395,7 @@ type Mutation {
33953395
signUp(email: String!, password: String!, captchaToken: String, locale: String, verifyEmailRedirectPath: String): AvailableWorkspacesAndAccessTokens!
33963396
signUpInWorkspace(email: String!, password: String!, workspaceId: UUID, workspaceInviteHash: String, workspacePersonalInviteToken: String, captchaToken: String, locale: String, verifyEmailRedirectPath: String): SignUp!
33973397
signUpInNewWorkspace(input: SignUpInNewWorkspaceInput): SignUp!
3398+
uploadNewWorkspaceLogo(workspaceId: String!, file: Upload!): FileWithSignedUrl!
33983399
generateTransientToken: TransientToken!
33993400
getAuthTokensFromLoginToken(loginToken: String!, origin: String!): AuthTokens!
34003401
authorizeApp(clientId: String!, codeChallenge: String, redirectUrl: String!, state: String, scope: String): AuthorizeApp!
@@ -4475,6 +4476,9 @@ input UpdateWorkspaceMemberSettingsInput {
44754476
}
44764477

44774478
input ActivateWorkspaceInput {
4479+
"""
4480+
Deprecated: the workspace name is set at creation (signUpInNewWorkspace) and this field is ignored during activation. Kept for backward compatibility.
4481+
"""
44784482
displayName: String
44794483
}
44804484

packages/twenty-client-sdk/src/metadata/generated/schema.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2916,6 +2916,7 @@ export interface Mutation {
29162916
signUp: AvailableWorkspacesAndAccessTokens
29172917
signUpInWorkspace: SignUp
29182918
signUpInNewWorkspace: SignUp
2919+
uploadNewWorkspaceLogo: FileWithSignedUrl
29192920
generateTransientToken: TransientToken
29202921
getAuthTokensFromLoginToken: AuthTokens
29212922
authorizeApp: AuthorizeApp
@@ -6094,6 +6095,7 @@ export interface MutationGenqlSelection{
60946095
signUp?: (AvailableWorkspacesAndAccessTokensGenqlSelection & { __args: {email: Scalars['String'], password: Scalars['String'], captchaToken?: (Scalars['String'] | null), locale?: (Scalars['String'] | null), verifyEmailRedirectPath?: (Scalars['String'] | null)} })
60956096
signUpInWorkspace?: (SignUpGenqlSelection & { __args: {email: Scalars['String'], password: Scalars['String'], workspaceId?: (Scalars['UUID'] | null), workspaceInviteHash?: (Scalars['String'] | null), workspacePersonalInviteToken?: (Scalars['String'] | null), captchaToken?: (Scalars['String'] | null), locale?: (Scalars['String'] | null), verifyEmailRedirectPath?: (Scalars['String'] | null)} })
60966097
signUpInNewWorkspace?: (SignUpGenqlSelection & { __args?: {input?: (SignUpInNewWorkspaceInput | null)} })
6098+
uploadNewWorkspaceLogo?: (FileWithSignedUrlGenqlSelection & { __args: {workspaceId: Scalars['String'], file: Scalars['Upload']} })
60976099
generateTransientToken?: TransientTokenGenqlSelection
60986100
getAuthTokensFromLoginToken?: (AuthTokensGenqlSelection & { __args: {loginToken: Scalars['String'], origin: Scalars['String']} })
60996101
authorizeApp?: (AuthorizeAppGenqlSelection & { __args: {clientId: Scalars['String'], codeChallenge?: (Scalars['String'] | null), redirectUrl: Scalars['String'], state?: (Scalars['String'] | null), scope?: (Scalars['String'] | null)} })
@@ -6507,7 +6509,9 @@ export interface UpdateApplicationRegistrationVariablePayload {value?: (Scalars[
65076509

65086510
export interface UpdateWorkspaceMemberSettingsInput {workspaceMemberId: Scalars['UUID'],update: Scalars['JSON']}
65096511

6510-
export interface ActivateWorkspaceInput {displayName?: (Scalars['String'] | null)}
6512+
export interface ActivateWorkspaceInput {
6513+
/** Deprecated: the workspace name is set at creation (signUpInNewWorkspace) and this field is ignored during activation. Kept for backward compatibility. */
6514+
displayName?: (Scalars['String'] | null)}
65116515

65126516
export interface UpdateWorkspaceInput {subdomain?: (Scalars['String'] | null),customDomain?: (Scalars['String'] | null),displayName?: (Scalars['String'] | null),logo?: (Scalars['String'] | null),inviteHash?: (Scalars['String'] | null),isPublicInviteLinkEnabled?: (Scalars['Boolean'] | null),allowImpersonation?: (Scalars['Boolean'] | null),isGoogleAuthEnabled?: (Scalars['Boolean'] | null),isMicrosoftAuthEnabled?: (Scalars['Boolean'] | null),isPasswordAuthEnabled?: (Scalars['Boolean'] | null),isGoogleAuthBypassEnabled?: (Scalars['Boolean'] | null),isMicrosoftAuthBypassEnabled?: (Scalars['Boolean'] | null),isPasswordAuthBypassEnabled?: (Scalars['Boolean'] | null),defaultRoleId?: (Scalars['UUID'] | null),isTwoFactorAuthenticationEnforced?: (Scalars['Boolean'] | null),trashRetentionDays?: (Scalars['Float'] | null),eventLogRetentionDays?: (Scalars['Float'] | null),fastModel?: (Scalars['String'] | null),smartModel?: (Scalars['String'] | null),aiAdditionalInstructions?: (Scalars['String'] | null),editableProfileFields?: (Scalars['String'][] | null),enabledAiModelIds?: (Scalars['String'][] | null),useRecommendedModels?: (Scalars['Boolean'] | null),isInternalMessagesImportEnabled?: (Scalars['Boolean'] | null)}
65136517

packages/twenty-client-sdk/src/metadata/generated/types.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8454,6 +8454,19 @@ export default {
84548454
]
84558455
}
84568456
],
8457+
"uploadNewWorkspaceLogo": [
8458+
131,
8459+
{
8460+
"workspaceId": [
8461+
1,
8462+
"String!"
8463+
],
8464+
"file": [
8465+
357,
8466+
"Upload!"
8467+
]
8468+
}
8469+
],
84578470
"generateTransientToken": [
84588471
250
84598472
],

packages/twenty-front/src/generated-metadata/graphql.ts

Lines changed: 17 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)