The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Refactor application module architecture for clarity and explicitness (#18432)
Félix Malfait514d0017ea50
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 61ed7e1b8a6..0c7898e916a 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -316,12 +316,6 @@ export type ApiKeyToken = {token: Scalars['String'];};-export enum AppRegistrationSourceType {- LOCAL = 'LOCAL',- NPM = 'NPM',- TARBALL = 'TARBALL'-}-export type AppToken = {__typename?: 'AppToken';createdAt: Scalars['DateTime'];@@ -362,20 +356,28 @@ export type ApplicationRegistration = {description?: Maybe<Scalars['String']>;id: Scalars['UUID'];isFeatured: Scalars['Boolean'];+ isListed: Scalars['Boolean'];latestAvailableVersion?: Maybe<Scalars['String']>;logoUrl?: Maybe<Scalars['String']>;name: Scalars['String'];oAuthClientId: Scalars['String'];oAuthRedirectUris: Array<Scalars['String']>;oAuthScopes: Array<Scalars['String']>;+ ownerWorkspaceId?: Maybe<Scalars['UUID']>;sourcePackage?: Maybe<Scalars['String']>;- sourceType: AppRegistrationSourceType;+ sourceType: ApplicationRegistrationSourceType;termsUrl?: Maybe<Scalars['String']>;universalIdentifier: Scalars['String'];updatedAt: Scalars['DateTime'];websiteUrl?: Maybe<Scalars['String']>;};+export enum ApplicationRegistrationSourceType {+ LOCAL = 'LOCAL',+ NPM = 'NPM',+ TARBALL = 'TARBALL'+}+export type ApplicationRegistrationStats = {__typename?: 'ApplicationRegistrationStats';activeInstalls: Scalars['Int'];@@ -387,7 +389,7 @@ export type ApplicationRegistrationSummary = {__typename?: 'ApplicationRegistrationSummary';id: Scalars['UUID'];latestAvailableVersion?: Maybe<Scalars['String']>;- sourceType: AppRegistrationSourceType;+ sourceType: ApplicationRegistrationSourceType;};export type ApplicationRegistrationVariable = {@@ -1086,15 +1088,6 @@ export type CreateAppTokenInput = {expiresAt: Scalars['DateTime'];};-export type CreateApplicationInput = {- applicationRegistrationId?: InputMaybe<Scalars['String']>;- description?: InputMaybe<Scalars['String']>;- name: Scalars['String'];- sourcePath: Scalars['String'];- universalIdentifier: Scalars['String'];- version: Scalars['String'];-};-export type CreateApplicationRegistration = {__typename?: 'CreateApplicationRegistration';applicationRegistration: ApplicationRegistration;@@ -2235,6 +2228,7 @@ export type MarketplaceApp = {frontComponents: Array<MarketplaceAppFrontComponent>;icon: Scalars['String'];id: Scalars['String'];+ isFeatured: Scalars['Boolean'];logicFunctions: Array<MarketplaceAppLogicFunction>;logo?: Maybe<Scalars['String']>;name: Scalars['String'];@@ -2383,7 +2377,6 @@ export type Mutation = {createObjectEvent: Analytics;createOneAgent: Agent;createOneAppToken: AppToken;- createOneApplication: Application;createOneField: Field;createOneLogicFunction: LogicFunction;createOneObject: Object;@@ -2456,7 +2449,7 @@ export type Mutation = {initiateOTPProvisioningForAuthenticatedUser: InitiateTwoFactorAuthenticationProvisioning;installApplication: Scalars['Boolean'];installMarketplaceApp: Scalars['Boolean'];- installNpmApp: Scalars['Boolean'];+ registerNpmPackage: ApplicationRegistration;removeQueryFromEventStream: Scalars['Boolean'];removeRoleFromAgent: Scalars['Boolean'];renewApplicationToken: ApplicationTokenPair;@@ -2467,6 +2460,7 @@ export type Mutation = {revokeApiKey?: Maybe<ApiKey>;rotateApplicationRegistrationClientSecret: RotateClientSecret;runEvaluationInput: AgentTurn;+ runWorkspaceMigration: Scalars['Boolean'];saveImapSmtpCaldavAccount: ImapSmtpCaldavConnectionSuccess;sendInvitations: SendInvitations;setAdminAiModelEnabled: Scalars['Boolean'];@@ -2482,6 +2476,7 @@ export type Mutation = {switchSubscriptionInterval: BillingUpdate;syncApplication: WorkspaceMigration;trackAnalytics: Analytics;+ transferApplicationRegistrationOwnership: ApplicationRegistration;uninstallApplication: Scalars['Boolean'];updateApiKey?: Maybe<ApiKey>;updateApplicationRegistration: ApplicationRegistration;@@ -2707,11 +2702,6 @@ export type MutationCreateOneAppTokenArgs = {};-export type MutationCreateOneApplicationArgs = {- input: CreateApplicationInput;-};--export type MutationCreateOneFieldArgs = {input: CreateOneFieldMetadataInput;};@@ -3042,7 +3032,8 @@ export type MutationInitiateOtpProvisioningArgs = {export type MutationInstallApplicationArgs = {- workspaceMigration: WorkspaceMigrationInput;+ appRegistrationId: Scalars['String'];+ version?: InputMaybe<Scalars['String']>;};@@ -3052,9 +3043,8 @@ export type MutationInstallMarketplaceAppArgs = {};-export type MutationInstallNpmAppArgs = {+export type MutationRegisterNpmPackageArgs = {packageName: Scalars['String'];- version?: InputMaybe<Scalars['String']>;};@@ -3111,6 +3101,11 @@ export type MutationRunEvaluationInputArgs = {};+export type MutationRunWorkspaceMigrationArgs = {+ workspaceMigration: WorkspaceMigrationInput;+};++export type MutationSaveImapSmtpCaldavAccountArgs = {accountOwnerId: Scalars['UUID'];connectionParameters: EmailAccountConnectionParameters;@@ -3184,6 +3179,12 @@ export type MutationTrackAnalyticsArgs = {};+export type MutationTransferApplicationRegistrationOwnershipArgs = {+ applicationRegistrationId: Scalars['String'];+ targetWorkspaceSubdomain: Scalars['String'];+};++export type MutationUninstallApplicationArgs = {universalIdentifier: Scalars['String'];};@@ -3932,6 +3933,7 @@ export type Query = {agentTurns: Array<AgentTurn>;apiKey?: Maybe<ApiKey>;apiKeys: Array<ApiKey>;+ applicationRegistrationTarballUrl?: Maybe<Scalars['String']>;barChartData: BarChartData;billingPortalSession: BillingSession;chatMessages: Array<AgentMessage>;@@ -3946,6 +3948,7 @@ export type Query = {eventLogs: EventLogQueryResult;field: Field;fields: FieldConnection;+ findAllApplicationRegistrations: Array<ApplicationRegistration>;findApplicationRegistrationByClientId?: Maybe<PublicApplicationRegistration>;findApplicationRegistrationByUniversalIdentifier?: Maybe<ApplicationRegistration>;findApplicationRegistrationStats: ApplicationRegistrationStats;@@ -3960,6 +3963,7 @@ export type Query = {findOneApplication: Application;findOneApplicationRegistration: ApplicationRegistration;findOneLogicFunction: LogicFunction;+ findOneMarketplaceApp: MarketplaceApp;findWorkspaceFromInviteHash: Workspace;findWorkspaceInvitations: Array<WorkspaceInvitation>;frontComponent?: Maybe<FrontComponent>;@@ -4035,6 +4039,11 @@ export type QueryApiKeyArgs = {};+export type QueryApplicationRegistrationTarballUrlArgs = {+ id: Scalars['String'];+};++export type QueryBarChartDataArgs = {input: BarChartDataInput;};@@ -4135,6 +4144,11 @@ export type QueryFindOneLogicFunctionArgs = {};+export type QueryFindOneMarketplaceAppArgs = {+ universalIdentifier: Scalars['String'];+};++export type QueryFindWorkspaceFromInviteHashArgs = {inviteHash: Scalars['String'];};@@ -4827,6 +4841,7 @@ export type UpdateApplicationRegistrationInput = {export type UpdateApplicationRegistrationPayload = {author?: InputMaybe<Scalars['String']>;description?: InputMaybe<Scalars['String']>;+ isListed?: InputMaybe<Scalars['Boolean']>;logoUrl?: InputMaybe<Scalars['String']>;name?: InputMaybe<Scalars['String']>;oAuthRedirectUris?: InputMaybe<Array<Scalars['String']>>;@@ -5818,19 +5833,26 @@ export type UpdateOneApplicationVariableMutationVariables = Exact<{export type UpdateOneApplicationVariableMutation = { __typename?: 'Mutation', updateOneApplicationVariable: boolean };-export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> };+export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: ApplicationRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> };export type FindManyApplicationsQueryVariables = Exact<{ [key: string]: never; }>;-export type FindManyApplicationsQuery = { __typename?: 'Query', findManyApplications: Array<{ __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, applicationRegistrationId?: string | null, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null }> };+export type FindManyApplicationsQuery = { __typename?: 'Query', findManyApplications: Array<{ __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: ApplicationRegistrationSourceType } | null }> };export type FindOneApplicationQueryVariables = Exact<{id: Scalars['UUID'];}>;-export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> } };+export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: ApplicationRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> } };++export type FindOneApplicationByUniversalIdentifierQueryVariables = Exact<{+ universalIdentifier: Scalars['UUID'];+}>;+++export type FindOneApplicationByUniversalIdentifierQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string } };export type AuthTokenFragmentFragment = { __typename?: 'AuthToken', token: string, expiresAt: string };@@ -6225,7 +6247,15 @@ export type GetLogicFunctionSourceCodeQueryVariables = Exact<{export type GetLogicFunctionSourceCodeQuery = { __typename?: 'Query', getLogicFunctionSourceCode?: string | null };-export type MarketplaceAppFieldsFragment = { __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, sourcePackage?: string | null, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null };+export type MarketplaceAppFieldsFragment = { __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, sourcePackage?: string | null, isFeatured: boolean, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null };++export type InstallApplicationMutationVariables = Exact<{+ appRegistrationId: Scalars['String'];+ version?: InputMaybe<Scalars['String']>;+}>;+++export type InstallApplicationMutation = { __typename?: 'Mutation', installApplication: boolean };export type InstallMarketplaceAppMutationVariables = Exact<{universalIdentifier: Scalars['String'];@@ -6235,13 +6265,12 @@ export type InstallMarketplaceAppMutationVariables = Exact<{export type InstallMarketplaceAppMutation = { __typename?: 'Mutation', installMarketplaceApp: boolean };-export type InstallNpmAppMutationVariables = Exact<{+export type RegisterNpmPackageMutationVariables = Exact<{packageName: Scalars['String'];- version?: InputMaybe<Scalars['String']>;}>;-export type InstallNpmAppMutation = { __typename?: 'Mutation', installNpmApp: boolean };+export type RegisterNpmPackageMutation = { __typename?: 'Mutation', registerNpmPackage: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string } };export type UpgradeApplicationMutationVariables = Exact<{appRegistrationId: Scalars['String'];@@ -6262,7 +6291,14 @@ export type UploadAppTarballMutation = { __typename?: 'Mutation', uploadAppTarbaexport type FindManyMarketplaceAppsQueryVariables = Exact<{ [key: string]: never; }>;-export type FindManyMarketplaceAppsQuery = { __typename?: 'Query', findManyMarketplaceApps: Array<{ __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, sourcePackage?: string | null, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null }> };+export type FindManyMarketplaceAppsQuery = { __typename?: 'Query', findManyMarketplaceApps: Array<{ __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, sourcePackage?: string | null, isFeatured: boolean, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null }> };++export type FindOneMarketplaceAppQueryVariables = Exact<{+ universalIdentifier: Scalars['String'];+}>;+++export type FindOneMarketplaceAppQuery = { __typename?: 'Query', findOneMarketplaceApp: { __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, sourcePackage?: string | null, isFeatured: boolean, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null } };export type NavigationMenuItemFieldsFragment = { __typename?: 'NavigationMenuItem', id: string, userWorkspaceId?: string | null, targetRecordId?: string | null, targetObjectMetadataId?: string | null, viewId?: string | null, folderId?: string | null, name?: string | null, link?: string | null, icon?: string | null, color?: string | null, position: number, applicationId?: string | null, createdAt: string, updatedAt: string };@@ -6452,6 +6488,11 @@ export type GetAdminAiModelsQueryVariables = Exact<{ [key: string]: never; }>;export type GetAdminAiModelsQuery = { __typename?: 'Query', getAdminAiModels: { __typename?: 'AdminAIModels', autoEnableNewModels: boolean, models: Array<{ __typename?: 'AdminAIModelConfig', modelId: string, label: string, modelFamily?: ModelFamily | null, inferenceProvider: InferenceProvider, isAvailable: boolean, isAdminEnabled: boolean, deprecated?: boolean | null, isRecommended?: boolean | null }> } };+export type FindAllApplicationRegistrationsQueryVariables = Exact<{ [key: string]: never; }>;+++export type FindAllApplicationRegistrationsQuery = { __typename?: 'Query', findAllApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, isListed: boolean, isFeatured: boolean, ownerWorkspaceId?: string | null, createdAt: string, updatedAt: string }> };+export type CreateDatabaseConfigVariableMutationVariables = Exact<{key: Scalars['String'];value: Scalars['JSON'];@@ -6554,7 +6595,7 @@ export type GetSystemHealthStatusQueryVariables = Exact<{ [key: string]: never;export type GetSystemHealthStatusQuery = { __typename?: 'Query', getSystemHealthStatus: { __typename?: 'SystemHealth', services: Array<{ __typename?: 'SystemHealthService', id: HealthIndicatorId, label: string, status: AdminPanelHealthServiceStatus }> } };-export type ApplicationRegistrationFragmentFragment = { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string };+export type ApplicationRegistrationFragmentFragment = { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, isListed: boolean, isFeatured: boolean, ownerWorkspaceId?: string | null, createdAt: string, updatedAt: string };export type DeleteApplicationRegistrationMutationVariables = Exact<{id: Scalars['String'];@@ -6570,12 +6611,20 @@ export type RotateApplicationRegistrationClientSecretMutationVariables = Exact<{export type RotateApplicationRegistrationClientSecretMutation = { __typename?: 'Mutation', rotateApplicationRegistrationClientSecret: { __typename?: 'RotateClientSecret', clientSecret: string } };+export type TransferApplicationRegistrationOwnershipMutationVariables = Exact<{+ applicationRegistrationId: Scalars['String'];+ targetWorkspaceSubdomain: Scalars['String'];+}>;+++export type TransferApplicationRegistrationOwnershipMutation = { __typename?: 'Mutation', transferApplicationRegistrationOwnership: { __typename?: 'ApplicationRegistration', id: string, name: string } };+export type UpdateApplicationRegistrationMutationVariables = Exact<{input: UpdateApplicationRegistrationInput;}>;-export type UpdateApplicationRegistrationMutation = { __typename?: 'Mutation', updateApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };+export type UpdateApplicationRegistrationMutation = { __typename?: 'Mutation', updateApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, isListed: boolean, isFeatured: boolean, ownerWorkspaceId?: string | null, createdAt: string, updatedAt: string } };export type UpdateApplicationRegistrationVariableMutationVariables = Exact<{input: UpdateApplicationRegistrationVariableInput;@@ -6584,6 +6633,13 @@ export type UpdateApplicationRegistrationVariableMutationVariables = Exact<{export type UpdateApplicationRegistrationVariableMutation = { __typename?: 'Mutation', updateApplicationRegistrationVariable: { __typename?: 'ApplicationRegistrationVariable', id: string, key: string, description: string, isSecret: boolean, isRequired: boolean, isFilled: boolean, createdAt: string, updatedAt: string } };+export type ApplicationRegistrationTarballUrlQueryVariables = Exact<{+ id: Scalars['String'];+}>;+++export type ApplicationRegistrationTarballUrlQuery = { __typename?: 'Query', applicationRegistrationTarballUrl?: string | null };+export type FindApplicationRegistrationByClientIdQueryVariables = Exact<{clientId: Scalars['String'];}>;@@ -6608,14 +6664,14 @@ export type FindApplicationRegistrationVariablesQuery = { __typename?: 'Query',export type FindManyApplicationRegistrationsQueryVariables = Exact<{ [key: string]: never; }>;-export type FindManyApplicationRegistrationsQuery = { __typename?: 'Query', findManyApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string }> };+export type FindManyApplicationRegistrationsQuery = { __typename?: 'Query', findManyApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, isListed: boolean, isFeatured: boolean, ownerWorkspaceId?: string | null, createdAt: string, updatedAt: string }> };export type FindOneApplicationRegistrationQueryVariables = Exact<{id: Scalars['String'];}>;-export type FindOneApplicationRegistrationQuery = { __typename?: 'Query', findOneApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };+export type FindOneApplicationRegistrationQuery = { __typename?: 'Query', findOneApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, isListed: boolean, isFeatured: boolean, ownerWorkspaceId?: string | null, createdAt: string, updatedAt: string } };export type UninstallApplicationMutationVariables = Exact<{universalIdentifier: Scalars['String'];@@ -7889,6 +7945,7 @@ export const MarketplaceAppFieldsFragmentDoc = gql`description}sourcePackage+ isFeatureddefaultRole {idlabel@@ -7960,6 +8017,9 @@ export const ApplicationRegistrationFragmentFragmentDoc = gql`latestAvailableVersionwebsiteUrltermsUrl+ isListed+ isFeatured+ ownerWorkspaceIdcreatedAtupdatedAt}@@ -9385,6 +9445,7 @@ export const FindManyApplicationsDocument = gql`namedescriptionversion+ universalIdentifierapplicationRegistrationIdapplicationRegistration {id@@ -9456,6 +9517,41 @@ export function useFindOneApplicationLazyQuery(baseOptions?: Apollo.LazyQueryHooexport type FindOneApplicationQueryHookResult = ReturnType<typeof useFindOneApplicationQuery>;export type FindOneApplicationLazyQueryHookResult = ReturnType<typeof useFindOneApplicationLazyQuery>;export type FindOneApplicationQueryResult = Apollo.QueryResult<FindOneApplicationQuery, FindOneApplicationQueryVariables>;+export const FindOneApplicationByUniversalIdentifierDocument = gql`+ query FindOneApplicationByUniversalIdentifier($universalIdentifier: UUID!) {+ findOneApplication(universalIdentifier: $universalIdentifier) {+ id+ }+}+ `;++/**+ * __useFindOneApplicationByUniversalIdentifierQuery__+ *+ * To run a query within a React component, call `useFindOneApplicationByUniversalIdentifierQuery` and pass it any options that fit your needs.+ * When your component renders, `useFindOneApplicationByUniversalIdentifierQuery` returns an object from Apollo Client that contains loading, error, and data properties+ * you can use to render your UI.+ *+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;+ *+ * @example+ * const { data, loading, error } = useFindOneApplicationByUniversalIdentifierQuery({+ * variables: {+ * universalIdentifier: // value for 'universalIdentifier'+ * },+ * });+ */+export function useFindOneApplicationByUniversalIdentifierQuery(baseOptions: Apollo.QueryHookOptions<FindOneApplicationByUniversalIdentifierQuery, FindOneApplicationByUniversalIdentifierQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useQuery<FindOneApplicationByUniversalIdentifierQuery, FindOneApplicationByUniversalIdentifierQueryVariables>(FindOneApplicationByUniversalIdentifierDocument, options);+ }+export function useFindOneApplicationByUniversalIdentifierLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FindOneApplicationByUniversalIdentifierQuery, FindOneApplicationByUniversalIdentifierQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useLazyQuery<FindOneApplicationByUniversalIdentifierQuery, FindOneApplicationByUniversalIdentifierQueryVariables>(FindOneApplicationByUniversalIdentifierDocument, options);+ }+export type FindOneApplicationByUniversalIdentifierQueryHookResult = ReturnType<typeof useFindOneApplicationByUniversalIdentifierQuery>;+export type FindOneApplicationByUniversalIdentifierLazyQueryHookResult = ReturnType<typeof useFindOneApplicationByUniversalIdentifierLazyQuery>;+export type FindOneApplicationByUniversalIdentifierQueryResult = Apollo.QueryResult<FindOneApplicationByUniversalIdentifierQuery, FindOneApplicationByUniversalIdentifierQueryVariables>;export const AuthorizeAppDocument = gql`mutation authorizeApp($clientId: String!, $codeChallenge: String, $redirectUrl: String!) {authorizeApp(@@ -11437,6 +11533,38 @@ export function useGetLogicFunctionSourceCodeLazyQuery(baseOptions?: Apollo.Lazyexport type GetLogicFunctionSourceCodeQueryHookResult = ReturnType<typeof useGetLogicFunctionSourceCodeQuery>;export type GetLogicFunctionSourceCodeLazyQueryHookResult = ReturnType<typeof useGetLogicFunctionSourceCodeLazyQuery>;export type GetLogicFunctionSourceCodeQueryResult = Apollo.QueryResult<GetLogicFunctionSourceCodeQuery, GetLogicFunctionSourceCodeQueryVariables>;+export const InstallApplicationDocument = gql`+ mutation InstallApplication($appRegistrationId: String!, $version: String) {+ installApplication(appRegistrationId: $appRegistrationId, version: $version)+}+ `;+export type InstallApplicationMutationFn = Apollo.MutationFunction<InstallApplicationMutation, InstallApplicationMutationVariables>;++/**+ * __useInstallApplicationMutation__+ *+ * To run a mutation, you first call `useInstallApplicationMutation` within a React component and pass it any options that fit your needs.+ * When your component renders, `useInstallApplicationMutation` 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 [installApplicationMutation, { data, loading, error }] = useInstallApplicationMutation({+ * variables: {+ * appRegistrationId: // value for 'appRegistrationId'+ * version: // value for 'version'+ * },+ * });+ */+export function useInstallApplicationMutation(baseOptions?: Apollo.MutationHookOptions<InstallApplicationMutation, InstallApplicationMutationVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useMutation<InstallApplicationMutation, InstallApplicationMutationVariables>(InstallApplicationDocument, options);+ }+export type InstallApplicationMutationHookResult = ReturnType<typeof useInstallApplicationMutation>;+export type InstallApplicationMutationResult = Apollo.MutationResult<InstallApplicationMutation>;+export type InstallApplicationMutationOptions = Apollo.BaseMutationOptions<InstallApplicationMutation, InstallApplicationMutationVariables>;export const InstallMarketplaceAppDocument = gql`mutation InstallMarketplaceApp($universalIdentifier: String!, $version: String) {installMarketplaceApp(@@ -11472,38 +11600,41 @@ export function useInstallMarketplaceAppMutation(baseOptions?: Apollo.MutationHoexport type InstallMarketplaceAppMutationHookResult = ReturnType<typeof useInstallMarketplaceAppMutation>;export type InstallMarketplaceAppMutationResult = Apollo.MutationResult<InstallMarketplaceAppMutation>;export type InstallMarketplaceAppMutationOptions = Apollo.BaseMutationOptions<InstallMarketplaceAppMutation, InstallMarketplaceAppMutationVariables>;-export const InstallNpmAppDocument = gql`- mutation InstallNpmApp($packageName: String!, $version: String) {- installNpmApp(packageName: $packageName, version: $version)+export const RegisterNpmPackageDocument = gql`+ mutation RegisterNpmPackage($packageName: String!) {+ registerNpmPackage(packageName: $packageName) {+ id+ universalIdentifier+ name+ }}`;-export type InstallNpmAppMutationFn = Apollo.MutationFunction<InstallNpmAppMutation, InstallNpmAppMutationVariables>;+export type RegisterNpmPackageMutationFn = Apollo.MutationFunction<RegisterNpmPackageMutation, RegisterNpmPackageMutationVariables>;/**- * __useInstallNpmAppMutation__+ * __useRegisterNpmPackageMutation__*- * To run a mutation, you first call `useInstallNpmAppMutation` within a React component and pass it any options that fit your needs.- * When your component renders, `useInstallNpmAppMutation` returns a tuple that includes:+ * To run a mutation, you first call `useRegisterNpmPackageMutation` within a React component and pass it any options that fit your needs.+ * When your component renders, `useRegisterNpmPackageMutation` 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 [installNpmAppMutation, { data, loading, error }] = useInstallNpmAppMutation({+ * const [registerNpmPackageMutation, { data, loading, error }] = useRegisterNpmPackageMutation({* variables: {* packageName: // value for 'packageName'- * version: // value for 'version'* },* });*/-export function useInstallNpmAppMutation(baseOptions?: Apollo.MutationHookOptions<InstallNpmAppMutation, InstallNpmAppMutationVariables>) {+export function useRegisterNpmPackageMutation(baseOptions?: Apollo.MutationHookOptions<RegisterNpmPackageMutation, RegisterNpmPackageMutationVariables>) {const options = {...defaultOptions, ...baseOptions}- return Apollo.useMutation<InstallNpmAppMutation, InstallNpmAppMutationVariables>(InstallNpmAppDocument, options);+ return Apollo.useMutation<RegisterNpmPackageMutation, RegisterNpmPackageMutationVariables>(RegisterNpmPackageDocument, options);}-export type InstallNpmAppMutationHookResult = ReturnType<typeof useInstallNpmAppMutation>;-export type InstallNpmAppMutationResult = Apollo.MutationResult<InstallNpmAppMutation>;-export type InstallNpmAppMutationOptions = Apollo.BaseMutationOptions<InstallNpmAppMutation, InstallNpmAppMutationVariables>;+export type RegisterNpmPackageMutationHookResult = ReturnType<typeof useRegisterNpmPackageMutation>;+export type RegisterNpmPackageMutationResult = Apollo.MutationResult<RegisterNpmPackageMutation>;+export type RegisterNpmPackageMutationOptions = Apollo.BaseMutationOptions<RegisterNpmPackageMutation, RegisterNpmPackageMutationVariables>;export const UpgradeApplicationDocument = gql`mutation UpgradeApplication($appRegistrationId: String!, $targetVersion: String!) {upgradeApplication(@@ -11609,6 +11740,41 @@ export function useFindManyMarketplaceAppsLazyQuery(baseOptions?: Apollo.LazyQueexport type FindManyMarketplaceAppsQueryHookResult = ReturnType<typeof useFindManyMarketplaceAppsQuery>;export type FindManyMarketplaceAppsLazyQueryHookResult = ReturnType<typeof useFindManyMarketplaceAppsLazyQuery>;export type FindManyMarketplaceAppsQueryResult = Apollo.QueryResult<FindManyMarketplaceAppsQuery, FindManyMarketplaceAppsQueryVariables>;+export const FindOneMarketplaceAppDocument = gql`+ query FindOneMarketplaceApp($universalIdentifier: String!) {+ findOneMarketplaceApp(universalIdentifier: $universalIdentifier) {+ ...MarketplaceAppFields+ }+}+ ${MarketplaceAppFieldsFragmentDoc}`;++/**+ * __useFindOneMarketplaceAppQuery__+ *+ * To run a query within a React component, call `useFindOneMarketplaceAppQuery` and pass it any options that fit your needs.+ * When your component renders, `useFindOneMarketplaceAppQuery` returns an object from Apollo Client that contains loading, error, and data properties+ * you can use to render your UI.+ *+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;+ *+ * @example+ * const { data, loading, error } = useFindOneMarketplaceAppQuery({+ * variables: {+ * universalIdentifier: // value for 'universalIdentifier'+ * },+ * });+ */+export function useFindOneMarketplaceAppQuery(baseOptions: Apollo.QueryHookOptions<FindOneMarketplaceAppQuery, FindOneMarketplaceAppQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useQuery<FindOneMarketplaceAppQuery, FindOneMarketplaceAppQueryVariables>(FindOneMarketplaceAppDocument, options);+ }+export function useFindOneMarketplaceAppLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FindOneMarketplaceAppQuery, FindOneMarketplaceAppQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useLazyQuery<FindOneMarketplaceAppQuery, FindOneMarketplaceAppQueryVariables>(FindOneMarketplaceAppDocument, options);+ }+export type FindOneMarketplaceAppQueryHookResult = ReturnType<typeof useFindOneMarketplaceAppQuery>;+export type FindOneMarketplaceAppLazyQueryHookResult = ReturnType<typeof useFindOneMarketplaceAppLazyQuery>;+export type FindOneMarketplaceAppQueryResult = Apollo.QueryResult<FindOneMarketplaceAppQuery, FindOneMarketplaceAppQueryVariables>;export const CreateNavigationMenuItemDocument = gql`mutation CreateNavigationMenuItem($input: CreateNavigationMenuItemInput!) {createNavigationMenuItem(input: $input) {@@ -12709,6 +12875,40 @@ export function useGetAdminAiModelsLazyQuery(baseOptions?: Apollo.LazyQueryHookOexport type GetAdminAiModelsQueryHookResult = ReturnType<typeof useGetAdminAiModelsQuery>;export type GetAdminAiModelsLazyQueryHookResult = ReturnType<typeof useGetAdminAiModelsLazyQuery>;export type GetAdminAiModelsQueryResult = Apollo.QueryResult<GetAdminAiModelsQuery, GetAdminAiModelsQueryVariables>;+export const FindAllApplicationRegistrationsDocument = gql`+ query FindAllApplicationRegistrations {+ findAllApplicationRegistrations {+ ...ApplicationRegistrationFragment+ }+}+ ${ApplicationRegistrationFragmentFragmentDoc}`;++/**+ * __useFindAllApplicationRegistrationsQuery__+ *+ * To run a query within a React component, call `useFindAllApplicationRegistrationsQuery` and pass it any options that fit your needs.+ * When your component renders, `useFindAllApplicationRegistrationsQuery` returns an object from Apollo Client that contains loading, error, and data properties+ * you can use to render your UI.+ *+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;+ *+ * @example+ * const { data, loading, error } = useFindAllApplicationRegistrationsQuery({+ * variables: {+ * },+ * });+ */+export function useFindAllApplicationRegistrationsQuery(baseOptions?: Apollo.QueryHookOptions<FindAllApplicationRegistrationsQuery, FindAllApplicationRegistrationsQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useQuery<FindAllApplicationRegistrationsQuery, FindAllApplicationRegistrationsQueryVariables>(FindAllApplicationRegistrationsDocument, options);+ }+export function useFindAllApplicationRegistrationsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FindAllApplicationRegistrationsQuery, FindAllApplicationRegistrationsQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useLazyQuery<FindAllApplicationRegistrationsQuery, FindAllApplicationRegistrationsQueryVariables>(FindAllApplicationRegistrationsDocument, options);+ }+export type FindAllApplicationRegistrationsQueryHookResult = ReturnType<typeof useFindAllApplicationRegistrationsQuery>;+export type FindAllApplicationRegistrationsLazyQueryHookResult = ReturnType<typeof useFindAllApplicationRegistrationsLazyQuery>;+export type FindAllApplicationRegistrationsQueryResult = Apollo.QueryResult<FindAllApplicationRegistrationsQuery, FindAllApplicationRegistrationsQueryVariables>;export const CreateDatabaseConfigVariableDocument = gql`mutation CreateDatabaseConfigVariable($key: String!, $value: JSON!) {createDatabaseConfigVariable(key: $key, value: $value)@@ -13368,6 +13568,44 @@ export function useRotateApplicationRegistrationClientSecretMutation(baseOptionsexport type RotateApplicationRegistrationClientSecretMutationHookResult = ReturnType<typeof useRotateApplicationRegistrationClientSecretMutation>;export type RotateApplicationRegistrationClientSecretMutationResult = Apollo.MutationResult<RotateApplicationRegistrationClientSecretMutation>;export type RotateApplicationRegistrationClientSecretMutationOptions = Apollo.BaseMutationOptions<RotateApplicationRegistrationClientSecretMutation, RotateApplicationRegistrationClientSecretMutationVariables>;+export const TransferApplicationRegistrationOwnershipDocument = gql`+ mutation TransferApplicationRegistrationOwnership($applicationRegistrationId: String!, $targetWorkspaceSubdomain: String!) {+ transferApplicationRegistrationOwnership(+ applicationRegistrationId: $applicationRegistrationId+ targetWorkspaceSubdomain: $targetWorkspaceSubdomain+ ) {+ id+ name+ }+}+ `;+export type TransferApplicationRegistrationOwnershipMutationFn = Apollo.MutationFunction<TransferApplicationRegistrationOwnershipMutation, TransferApplicationRegistrationOwnershipMutationVariables>;++/**+ * __useTransferApplicationRegistrationOwnershipMutation__+ *+ * To run a mutation, you first call `useTransferApplicationRegistrationOwnershipMutation` within a React component and pass it any options that fit your needs.+ * When your component renders, `useTransferApplicationRegistrationOwnershipMutation` 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 [transferApplicationRegistrationOwnershipMutation, { data, loading, error }] = useTransferApplicationRegistrationOwnershipMutation({+ * variables: {+ * applicationRegistrationId: // value for 'applicationRegistrationId'+ * targetWorkspaceSubdomain: // value for 'targetWorkspaceSubdomain'+ * },+ * });+ */+export function useTransferApplicationRegistrationOwnershipMutation(baseOptions?: Apollo.MutationHookOptions<TransferApplicationRegistrationOwnershipMutation, TransferApplicationRegistrationOwnershipMutationVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useMutation<TransferApplicationRegistrationOwnershipMutation, TransferApplicationRegistrationOwnershipMutationVariables>(TransferApplicationRegistrationOwnershipDocument, options);+ }+export type TransferApplicationRegistrationOwnershipMutationHookResult = ReturnType<typeof useTransferApplicationRegistrationOwnershipMutation>;+export type TransferApplicationRegistrationOwnershipMutationResult = Apollo.MutationResult<TransferApplicationRegistrationOwnershipMutation>;+export type TransferApplicationRegistrationOwnershipMutationOptions = Apollo.BaseMutationOptions<TransferApplicationRegistrationOwnershipMutation, TransferApplicationRegistrationOwnershipMutationVariables>;export const UpdateApplicationRegistrationDocument = gql`mutation UpdateApplicationRegistration($input: UpdateApplicationRegistrationInput!) {updateApplicationRegistration(input: $input) {@@ -13441,6 +13679,39 @@ export function useUpdateApplicationRegistrationVariableMutation(baseOptions?: Aexport type UpdateApplicationRegistrationVariableMutationHookResult = ReturnType<typeof useUpdateApplicationRegistrationVariableMutation>;export type UpdateApplicationRegistrationVariableMutationResult = Apollo.MutationResult<UpdateApplicationRegistrationVariableMutation>;export type UpdateApplicationRegistrationVariableMutationOptions = Apollo.BaseMutationOptions<UpdateApplicationRegistrationVariableMutation, UpdateApplicationRegistrationVariableMutationVariables>;+export const ApplicationRegistrationTarballUrlDocument = gql`+ query ApplicationRegistrationTarballUrl($id: String!) {+ applicationRegistrationTarballUrl(id: $id)+}+ `;++/**+ * __useApplicationRegistrationTarballUrlQuery__+ *+ * To run a query within a React component, call `useApplicationRegistrationTarballUrlQuery` and pass it any options that fit your needs.+ * When your component renders, `useApplicationRegistrationTarballUrlQuery` returns an object from Apollo Client that contains loading, error, and data properties+ * you can use to render your UI.+ *+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;+ *+ * @example+ * const { data, loading, error } = useApplicationRegistrationTarballUrlQuery({+ * variables: {+ * id: // value for 'id'+ * },+ * });+ */+export function useApplicationRegistrationTarballUrlQuery(baseOptions: Apollo.QueryHookOptions<ApplicationRegistrationTarballUrlQuery, ApplicationRegistrationTarballUrlQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useQuery<ApplicationRegistrationTarballUrlQuery, ApplicationRegistrationTarballUrlQueryVariables>(ApplicationRegistrationTarballUrlDocument, options);+ }+export function useApplicationRegistrationTarballUrlLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ApplicationRegistrationTarballUrlQuery, ApplicationRegistrationTarballUrlQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useLazyQuery<ApplicationRegistrationTarballUrlQuery, ApplicationRegistrationTarballUrlQueryVariables>(ApplicationRegistrationTarballUrlDocument, options);+ }+export type ApplicationRegistrationTarballUrlQueryHookResult = ReturnType<typeof useApplicationRegistrationTarballUrlQuery>;+export type ApplicationRegistrationTarballUrlLazyQueryHookResult = ReturnType<typeof useApplicationRegistrationTarballUrlLazyQuery>;+export type ApplicationRegistrationTarballUrlQueryResult = Apollo.QueryResult<ApplicationRegistrationTarballUrlQuery, ApplicationRegistrationTarballUrlQueryVariables>;export const FindApplicationRegistrationByClientIdDocument = gql`query FindApplicationRegistrationByClientId($clientId: String!) {findApplicationRegistrationByClientId(clientId: $clientId) {diff --git a/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.ts b/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.tsindex 5144c9c928b..d663753866d 100644--- a/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.ts+++ b/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.ts@@ -7,6 +7,7 @@ export const FIND_MANY_APPLICATIONS = gql`namedescriptionversion+ universalIdentifierapplicationRegistrationIdapplicationRegistration {iddiff --git a/packages/twenty-front/src/modules/applications/graphql/queries/findOneApplicationByUniversalIdentifier.ts b/packages/twenty-front/src/modules/applications/graphql/queries/findOneApplicationByUniversalIdentifier.tsnew file mode 100644index 00000000000..d914982a872--- /dev/null+++ b/packages/twenty-front/src/modules/applications/graphql/queries/findOneApplicationByUniversalIdentifier.ts@@ -0,0 +1,9 @@+import { gql } from '@apollo/client';++export const FIND_ONE_APPLICATION_BY_UNIVERSAL_IDENTIFIER = gql`+ query FindOneApplicationByUniversalIdentifier($universalIdentifier: UUID!) {+ findOneApplication(universalIdentifier: $universalIdentifier) {+ id+ }+ }+`;diff --git a/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.ts b/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.tsindex 6ebbe4afdb1..d3fa666561f 100644--- a/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.ts+++ b/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.ts@@ -50,6 +50,7 @@ export const MARKETPLACE_APP_FRAGMENT = gql`description}sourcePackage+ isFeatureddefaultRole {idlabeldiff --git a/packages/twenty-front/src/modules/marketplace/graphql/mutations/installApplication.ts b/packages/twenty-front/src/modules/marketplace/graphql/mutations/installApplication.tsnew file mode 100644index 00000000000..e7731d94a75--- /dev/null+++ b/packages/twenty-front/src/modules/marketplace/graphql/mutations/installApplication.ts@@ -0,0 +1,7 @@+import gql from 'graphql-tag';++export const INSTALL_APPLICATION = gql`+ mutation InstallApplication($appRegistrationId: String!, $version: String) {+ installApplication(appRegistrationId: $appRegistrationId, version: $version)+ }+`;diff --git a/packages/twenty-front/src/modules/marketplace/graphql/mutations/installNpmApp.ts b/packages/twenty-front/src/modules/marketplace/graphql/mutations/installNpmApp.tsdeleted file mode 100644index 575a7dea763..00000000000--- a/packages/twenty-front/src/modules/marketplace/graphql/mutations/installNpmApp.ts+++ /dev/null@@ -1,7 +0,0 @@-import gql from 'graphql-tag';--export const INSTALL_NPM_APP = gql`- mutation InstallNpmApp($packageName: String!, $version: String) {- installNpmApp(packageName: $packageName, version: $version)- }-`;diff --git a/packages/twenty-front/src/modules/marketplace/graphql/mutations/registerNpmPackage.ts b/packages/twenty-front/src/modules/marketplace/graphql/mutations/registerNpmPackage.tsnew file mode 100644index 00000000000..9b4009d1591--- /dev/null+++ b/packages/twenty-front/src/modules/marketplace/graphql/mutations/registerNpmPackage.ts@@ -0,0 +1,11 @@+import { gql } from '@apollo/client';++export const REGISTER_NPM_PACKAGE = gql`+ mutation RegisterNpmPackage($packageName: String!) {+ registerNpmPackage(packageName: $packageName) {+ id+ universalIdentifier+ name+ }+ }+`;diff --git a/packages/twenty-front/src/modules/marketplace/graphql/queries/findOneMarketplaceApp.ts b/packages/twenty-front/src/modules/marketplace/graphql/queries/findOneMarketplaceApp.tsnew file mode 100644index 00000000000..913fb4927b8--- /dev/null+++ b/packages/twenty-front/src/modules/marketplace/graphql/queries/findOneMarketplaceApp.ts@@ -0,0 +1,12 @@+import gql from 'graphql-tag';++import { MARKETPLACE_APP_FRAGMENT } from '@/marketplace/graphql/fragments/marketplaceAppFragment';++export const FIND_ONE_MARKETPLACE_APP = gql`+ ${MARKETPLACE_APP_FRAGMENT}+ query FindOneMarketplaceApp($universalIdentifier: String!) {+ findOneMarketplaceApp(universalIdentifier: $universalIdentifier) {+ ...MarketplaceAppFields+ }+ }+`;diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useInstallApp.ts b/packages/twenty-front/src/modules/marketplace/hooks/useInstallApp.tsindex 31570c632fd..211c90e034d 100644--- a/packages/twenty-front/src/modules/marketplace/hooks/useInstallApp.ts+++ b/packages/twenty-front/src/modules/marketplace/hooks/useInstallApp.ts@@ -26,9 +26,11 @@ export const useInstallApp = <TVariables extends Record<string, unknown>>(}return false;- } catch {+ } catch (error) {+ const graphqlMessage = error instanceof Error ? error.message : undefined;+enqueueErrorSnackBar({- message: t`Failed to install the application.`,+ message: graphqlMessage ?? t`Failed to install the application.`,});return false;diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useInstallNpmApp.ts b/packages/twenty-front/src/modules/marketplace/hooks/useInstallNpmApp.tsdeleted file mode 100644index 9168b8a596f..00000000000--- a/packages/twenty-front/src/modules/marketplace/hooks/useInstallNpmApp.ts+++ /dev/null@@ -1,13 +0,0 @@-import { useMutation } from '@apollo/client';--import { useInstallApp } from '~/modules/marketplace/hooks/useInstallApp';-import { INSTALL_NPM_APP } from '~/modules/marketplace/graphql/mutations/installNpmApp';--export const useInstallNpmApp = () => {- const [installNpmAppMutation] = useMutation(INSTALL_NPM_APP);-- return useInstallApp<{- packageName: string;- version?: string;- }>(installNpmAppMutation);-};diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useRegisterNpmPackage.ts b/packages/twenty-front/src/modules/marketplace/hooks/useRegisterNpmPackage.tsnew file mode 100644index 00000000000..11b3aaa0f4e--- /dev/null+++ b/packages/twenty-front/src/modules/marketplace/hooks/useRegisterNpmPackage.ts@@ -0,0 +1,50 @@+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';+import { useMutation } from '@apollo/client';+import { t } from '@lingui/core/macro';+import { useState } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { REGISTER_NPM_PACKAGE } from '~/modules/marketplace/graphql/mutations/registerNpmPackage';++export const useRegisterNpmPackage = () => {+ const [registerNpmPackageMutation] = useMutation(REGISTER_NPM_PACKAGE);+ const { enqueueErrorSnackBar, enqueueSuccessSnackBar } = useSnackBar();+ const [isRegistering, setIsRegistering] = useState(false);++ const register = async (params: {+ packageName: string;+ }): Promise<boolean> => {+ setIsRegistering(true);++ try {+ const result = await registerNpmPackageMutation({+ variables: { packageName: params.packageName },+ });++ const registration = result.data?.registerNpmPackage;++ if (!isDefined(registration)) {+ enqueueErrorSnackBar({ message: t`Registration failed.` });++ return false;+ }++ enqueueSuccessSnackBar({+ message: t`Package registered successfully.`,+ });++ return true;+ } catch (error) {+ const graphqlMessage = error instanceof Error ? error.message : undefined;++ enqueueErrorSnackBar({+ message: graphqlMessage ?? t`Failed to register npm package.`,+ });++ return false;+ } finally {+ setIsRegistering(false);+ }+ };++ return { register, isRegistering };+};diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts b/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.tsindex af1ff1e9027..7f270421501 100644--- a/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts+++ b/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts@@ -29,9 +29,11 @@ export const useUpgradeApplication = () => {}return false;- } catch {+ } catch (error) {+ const graphqlMessage = error instanceof Error ? error.message : undefined;+enqueueErrorSnackBar({- message: t`Failed to upgrade the application.`,+ message: graphqlMessage ?? t`Failed to upgrade the application.`,});return false;diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useUploadAppTarball.ts b/packages/twenty-front/src/modules/marketplace/hooks/useUploadAppTarball.tsindex dc96f5713d5..87ed302d9c2 100644--- a/packages/twenty-front/src/modules/marketplace/hooks/useUploadAppTarball.ts+++ b/packages/twenty-front/src/modules/marketplace/hooks/useUploadAppTarball.ts@@ -8,6 +8,7 @@ import { UPLOAD_APP_TARBALL } from '~/modules/marketplace/graphql/mutations/uplotype UploadResult =| {success: true;+ registrationId: string;universalIdentifier: string;}| {@@ -29,7 +30,10 @@ export const useUploadAppTarball = () => {const registration = result.data?.uploadAppTarball;- if (!isDefined(registration?.universalIdentifier)) {+ if (+ !isDefined(registration?.id) ||+ !isDefined(registration?.universalIdentifier)+ ) {enqueueErrorSnackBar({ message: t`Upload failed.` });return { success: false };@@ -37,11 +41,14 @@ export const useUploadAppTarball = () => {return {success: true,+ registrationId: registration.id,universalIdentifier: registration.universalIdentifier,};- } catch {+ } catch (error) {+ const graphqlMessage = error instanceof Error ? error.message : undefined;+enqueueErrorSnackBar({- message: t`Failed to upload tarball.`,+ message: graphqlMessage ?? t`Failed to upload tarball.`,});return { success: false };diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsxindex f17364b4808..3a7a1cbfdac 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx@@ -1,27 +1,17 @@import { useState } from 'react';-import { styled } from '@linaria/react';import { useClientConfig } from '@/client-config/hooks/useClientConfig';import { GET_ADMIN_AI_MODELS } from '@/settings/admin-panel/ai/graphql/queries/getAdminAiModels';import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { t } from '@lingui/core/macro';-import {- H2Title,- IconArchive,- IconFilter,- IconPlug,- IconRobot,- IconSearch,-} from 'twenty-ui/display';-import { Button } from 'twenty-ui/input';+import { H2Title, IconArchive, IconPlug, IconRobot } from 'twenty-ui/display';+import { SearchInput } from 'twenty-ui/input';import { Card, Section } from 'twenty-ui/layout';import { MenuItemToggle } from 'twenty-ui/navigation';-import { themeCssVariables } from 'twenty-ui/theme-constants';import {useCreateDatabaseConfigVariableMutation,useGetAdminAiModelsQuery,@@ -30,17 +20,6 @@ import {import { getModelIcon } from '~/pages/settings/ai/utils/getModelIcon';import { getModelProviderLabel } from '~/pages/settings/ai/utils/getModelProviderLabel';-const StyledSearchAndFilterContainer = styled.div`- display: flex;- gap: ${themeCssVariables.spacing[2]};- margin-bottom: ${themeCssVariables.spacing[2]};- width: 100%;-`;--const StyledSearchInputContainer = styled.div`- flex: 1;-`;-export const SettingsAdminAI = () => {const { enqueueErrorSnackBar } = useSnackBar();const [searchQuery, setSearchQuery] = useState('');@@ -162,53 +141,41 @@ export const SettingsAdminAI = () => {description={t`Toggle model availability across all workspaces`}/>- <StyledSearchAndFilterContainer>- <StyledSearchInputContainer>- <SettingsTextInput- instanceId="admin-model-search"- LeftIcon={IconSearch}- placeholder={t`Search a model...`}- value={searchQuery}- onChange={setSearchQuery}+ <SearchInput+ placeholder={t`Search a model...`}+ value={searchQuery}+ onChange={setSearchQuery}+ filterDropdown={(filterButton) => (+ <Dropdown+ dropdownId="admin-ai-models-filter-dropdown"+ dropdownPlacement="bottom-end"+ dropdownOffset={{ x: 0, y: 8 }}+ clickableComponent={filterButton}+ dropdownComponents={+ <DropdownContent>+ <DropdownMenuItemsContainer>+ <MenuItemToggle+ LeftIcon={IconPlug}+ onToggleChange={() =>+ setShowUnconfigured(!showUnconfigured)+ }+ toggled={showUnconfigured}+ text={t`Unconfigured models`}+ toggleSize="small"+ />+ <MenuItemToggle+ LeftIcon={IconArchive}+ onToggleChange={() => setShowDeprecated(!showDeprecated)}+ toggled={showDeprecated}+ text={t`Deprecated models`}+ toggleSize="small"+ />+ </DropdownMenuItemsContainer>+ </DropdownContent>+ }/>- </StyledSearchInputContainer>- <Dropdown- dropdownId="admin-ai-models-filter-dropdown"- dropdownPlacement="bottom-end"- dropdownOffset={{ x: 0, y: 8 }}- clickableComponent={- <Button- Icon={IconFilter}- size="medium"- variant="secondary"- accent="default"- ariaLabel={t`Filter`}- />- }- dropdownComponents={- <DropdownContent>- <DropdownMenuItemsContainer>- <MenuItemToggle- LeftIcon={IconPlug}- onToggleChange={() =>- setShowUnconfigured(!showUnconfigured)- }- toggled={showUnconfigured}- text={t`Unconfigured models`}- toggleSize="small"- />- <MenuItemToggle- LeftIcon={IconArchive}- onToggleChange={() => setShowDeprecated(!showDeprecated)}- toggled={showDeprecated}- text={t`Deprecated models`}- toggleSize="small"- />- </DropdownMenuItemsContainer>- </DropdownContent>- }- />- </StyledSearchAndFilterContainer>+ )}+ /><Card rounded>{filteredModels.map((model, index) => (diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsxnew file mode 100644index 00000000000..dbdc935e39d--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx@@ -0,0 +1,107 @@+import { FIND_ALL_APPLICATION_REGISTRATIONS } from '@/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations';+import { Table } from '@/ui/layout/table/components/Table';+import { TableBody } from '@/ui/layout/table/components/TableBody';+import { TableCell } from '@/ui/layout/table/components/TableCell';+import { TableHeader } from '@/ui/layout/table/components/TableHeader';+import { TableRow } from '@/ui/layout/table/components/TableRow';+import { useQuery } from '@apollo/client';+import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';+import { useState } from 'react';+import { getSettingsPath } from 'twenty-shared/utils';+import { SettingsPath } from 'twenty-shared/types';+import { H2Title, Status } from 'twenty-ui/display';+import { SearchInput } from 'twenty-ui/input';+import { Section } from 'twenty-ui/layout';+import { UndecoratedLink } from 'twenty-ui/navigation';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { type ApplicationRegistrationFragmentFragment } from '~/generated-metadata/graphql';++const StyledTableContainer = styled.div`+ margin-top: ${themeCssVariables.spacing[3]};+`;++const StyledTableHeaderRowContainer = styled.div`+ margin-bottom: ${themeCssVariables.spacing[2]};+`;++const TABLE_GRID = '1fr 1fr 100px 80px';++export const SettingsAdminApps = () => {+ const [searchQuery, setSearchQuery] = useState('');++ const { data } = useQuery(FIND_ALL_APPLICATION_REGISTRATIONS);++ const registrations: ApplicationRegistrationFragmentFragment[] =+ data?.findAllApplicationRegistrations ?? [];++ const filtered =+ searchQuery.trim().length === 0+ ? registrations+ : registrations.filter((registration) => {+ const query = searchQuery.toLowerCase();++ return (+ registration.name.toLowerCase().includes(query) ||+ (registration.sourcePackage ?? '').toLowerCase().includes(query) ||+ registration.universalIdentifier.toLowerCase().includes(query)+ );+ });++ return (+ <Section>+ <H2Title+ title={t`All App Registrations`}+ description={t`All application registrations across the platform, including orphaned marketplace apps`}+ />+ <SearchInput+ placeholder={t`Search registrations...`}+ value={searchQuery}+ onChange={setSearchQuery}+ />+ <StyledTableContainer>+ <Table>+ <StyledTableHeaderRowContainer>+ <TableRow gridTemplateColumns={TABLE_GRID}>+ <TableHeader>{t`Name`}</TableHeader>+ <TableHeader>{t`Source`}</TableHeader>+ <TableHeader>{t`Listed`}</TableHeader>+ <TableHeader>{t`Featured`}</TableHeader>+ </TableRow>+ </StyledTableHeaderRowContainer>+ <TableBody>+ {filtered.map((registration) => (+ <UndecoratedLink+ key={registration.id}+ to={getSettingsPath(+ SettingsPath.ApplicationRegistrationDetail,+ { applicationRegistrationId: registration.id },+ )}+ fullWidth+ >+ <TableRow gridTemplateColumns={TABLE_GRID} isClickable>+ <TableCell>{registration.name}</TableCell>+ <TableCell>+ {registration.sourcePackage ?? registration.sourceType}+ </TableCell>+ <TableCell>+ <Status+ color={registration.isListed ? 'green' : 'gray'}+ text={registration.isListed ? t`Yes` : t`No`}+ />+ </TableCell>+ <TableCell>+ <Status+ color={registration.isFeatured ? 'yellow' : 'gray'}+ text={registration.isFeatured ? t`Yes` : t`No`}+ />+ </TableCell>+ </TableRow>+ </UndecoratedLink>+ ))}+ </TableBody>+ </Table>+ </StyledTableContainer>+ </Section>+ );+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations.ts b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations.tsnew file mode 100644index 00000000000..82e35e01ebf--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations.ts@@ -0,0 +1,12 @@+import { gql } from '@apollo/client';++import { APPLICATION_REGISTRATION_FRAGMENT } from '@/settings/application-registrations/graphql/fragments/applicationRegistrationFragment';++export const FIND_ALL_APPLICATION_REGISTRATIONS = gql`+ query FindAllApplicationRegistrations {+ findAllApplicationRegistrations {+ ...ApplicationRegistrationFragment+ }+ }+ ${APPLICATION_REGISTRATION_FRAGMENT}+`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsxindex bc522ff7696..7ca51933284 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx@@ -5,6 +5,7 @@ import { SETTINGS_ADMIN_TABS_ID } from '@/settings/admin-panel/constants/Settingimport { TabList } from '@/ui/layout/tab-list/components/TabList';import { t } from '@lingui/core/macro';import {+ IconApps,IconHeart,IconSettings2,IconSparkles,@@ -24,6 +25,12 @@ export const SettingsAdminContent = () => {Icon: IconSettings2,disabled: !canAccessFullAdminPanel && !canImpersonate,},+ {+ id: SETTINGS_ADMIN_TABS.APPS,+ title: t`Apps`,+ Icon: IconApps,+ disabled: !canAccessFullAdminPanel,+ },{id: SETTINGS_ADMIN_TABS.AI,title: t`AI`,diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsxindex 6387007601f..2063680883d 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx@@ -1,4 +1,5 @@import { SettingsAdminAI } from '@/settings/admin-panel/ai/components/SettingsAdminAI';+import { SettingsAdminApps } from '@/settings/admin-panel/apps/components/SettingsAdminApps';import { SettingsAdminGeneral } from '@/settings/admin-panel/components/SettingsAdminGeneral';import { SettingsAdminConfigVariables } from '@/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables';import { SETTINGS_ADMIN_TABS } from '@/settings/admin-panel/constants/SettingsAdminTabs';@@ -16,6 +17,8 @@ export const SettingsAdminTabContent = () => {switch (activeTabId) {case SETTINGS_ADMIN_TABS.GENERAL:return <SettingsAdminGeneral />;+ case SETTINGS_ADMIN_TABS.APPS:+ return <SettingsAdminApps />;case SETTINGS_ADMIN_TABS.AI:return <SettingsAdminAI />;case SETTINGS_ADMIN_TABS.CONFIG_VARIABLES:diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTableCard.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTableCard.tsxindex 9d3b7fe11dc..22479fc44a0 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTableCard.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTableCard.tsx@@ -45,13 +45,13 @@ export const SettingsAdminTableCard = ({<TableRowkey={index + item.label}gridAutoColumns={gridAutoColumns}- height={themeCssVariables.spacing[6]}><TableCellalign={labelAlign}color={themeCssVariables.font.color.tertiary}- height={themeCssVariables.spacing[6]}+ height="auto"gap={themeCssVariables.spacing[2]}+ padding={`${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[2]}`}>{item.Icon && <item.Icon size={theme.icon.size.md} />}<span>{item.label}</span>@@ -59,9 +59,10 @@ export const SettingsAdminTableCard = ({<TableCellalign={valueAlign}color={themeCssVariables.font.color.primary}- height={themeCssVariables.spacing[6]}+ height="auto"onClick={item.onClick}clickable={isDefined(item.onClick)}+ padding={`${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[2]}`}>{item.value}</TableCell>diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsxindex 89abbea65e0..d73e7bbc233 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsx@@ -1,11 +1,5 @@-import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';-import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { IconSearch } from 'twenty-ui/display';--const StyledSearchInputContainer = styled.div`- width: 100%;-`;+import { SearchInput } from 'twenty-ui/input';type ConfigVariableSearchInputProps = {value: string;@@ -17,15 +11,10 @@ export const ConfigVariableSearchInput = ({onChange,}: ConfigVariableSearchInputProps) => {return (- <StyledSearchInputContainer>- <SettingsTextInput- instanceId="config-variable-search"- placeholder={t`Search config variables`}- value={value}- onChange={onChange}- autoFocus={false}- LeftIcon={IconSearch}- />- </StyledSearchInputContainer>+ <SearchInput+ placeholder={t`Search config variables`}+ value={value}+ onChange={onChange}+ />);};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.tsindex 4aa7bd6e46c..3cf4c9d64a4 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts@@ -1,5 +1,6 @@export const SETTINGS_ADMIN_TABS = {GENERAL: 'general',+ APPS: 'apps',AI: 'ai',CONFIG_VARIABLES: 'config-variables',HEALTH_STATUS: 'health-status',diff --git a/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.ts b/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.tsindex f129e72cecb..87ff0263cf7 100644--- a/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.ts+++ b/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.ts@@ -16,6 +16,9 @@ export const APPLICATION_REGISTRATION_FRAGMENT = gql`latestAvailableVersionwebsiteUrltermsUrl+ isListed+ isFeatured+ ownerWorkspaceIdcreatedAtupdatedAt}diff --git a/packages/twenty-front/src/modules/settings/application-registrations/graphql/mutations/transferApplicationRegistrationOwnership.ts b/packages/twenty-front/src/modules/settings/application-registrations/graphql/mutations/transferApplicationRegistrationOwnership.tsnew file mode 100644index 00000000000..d0f74374cfe--- /dev/null+++ b/packages/twenty-front/src/modules/settings/application-registrations/graphql/mutations/transferApplicationRegistrationOwnership.ts@@ -0,0 +1,16 @@+import { gql } from '@apollo/client';++export const TRANSFER_APPLICATION_REGISTRATION_OWNERSHIP = gql`+ mutation TransferApplicationRegistrationOwnership(+ $applicationRegistrationId: String!+ $targetWorkspaceSubdomain: String!+ ) {+ transferApplicationRegistrationOwnership(+ applicationRegistrationId: $applicationRegistrationId+ targetWorkspaceSubdomain: $targetWorkspaceSubdomain+ ) {+ id+ name+ }+ }+`;diff --git a/packages/twenty-front/src/modules/settings/application-registrations/graphql/queries/applicationRegistrationTarballUrl.ts b/packages/twenty-front/src/modules/settings/application-registrations/graphql/queries/applicationRegistrationTarballUrl.tsnew file mode 100644index 00000000000..a20ee989a74--- /dev/null+++ b/packages/twenty-front/src/modules/settings/application-registrations/graphql/queries/applicationRegistrationTarballUrl.ts@@ -0,0 +1,7 @@+import { gql } from '@apollo/client';++export const APPLICATION_REGISTRATION_TARBALL_URL = gql`+ query ApplicationRegistrationTarballUrl($id: String!) {+ applicationRegistrationTarballUrl(id: $id)+ }+`;diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsxindex 90f8f529560..bcf711a6cbb 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx@@ -1,8 +1,10 @@import { SettingsAdminTableCard } from '@/settings/admin-panel/components/SettingsAdminTableCard';import { DELETE_APPLICATION_REGISTRATION } from '@/settings/application-registrations/graphql/mutations/deleteApplicationRegistration';import { ROTATE_APPLICATION_REGISTRATION_CLIENT_SECRET } from '@/settings/application-registrations/graphql/mutations/rotateApplicationRegistrationClientSecret';+import { TRANSFER_APPLICATION_REGISTRATION_OWNERSHIP } from '@/settings/application-registrations/graphql/mutations/transferApplicationRegistrationOwnership';import { UPDATE_APPLICATION_REGISTRATION } from '@/settings/application-registrations/graphql/mutations/updateApplicationRegistration';import { UPDATE_APPLICATION_REGISTRATION_VARIABLE } from '@/settings/application-registrations/graphql/mutations/updateApplicationRegistrationVariable';+import { APPLICATION_REGISTRATION_TARBALL_URL } from '@/settings/application-registrations/graphql/queries/applicationRegistrationTarballUrl';import { FIND_APPLICATION_REGISTRATION_STATS } from '@/settings/application-registrations/graphql/queries/findApplicationRegistrationStats';import { FIND_APPLICATION_REGISTRATION_VARIABLES } from '@/settings/application-registrations/graphql/queries/findApplicationRegistrationVariables';import { FIND_MANY_APPLICATION_REGISTRATIONS } from '@/settings/application-registrations/graphql/queries/findManyApplicationRegistrations';@@ -16,6 +18,7 @@ import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModaimport { useModal } from '@/ui/layout/modal/hooks/useModal';import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';+import { useInstallMarketplaceApp } from '~/modules/marketplace/hooks/useInstallMarketplaceApp';import { useMutation, useQuery } from '@apollo/client';import { styled } from '@linaria/react';import { Trans, useLingui } from '@lingui/react/macro';@@ -25,10 +28,15 @@ import { useParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined, isValidUrl } from 'twenty-shared/utils';import {+ H1Title,+ H1TitleFontColor,H2Title,+ IconArrowRight,IconChartBar,IconCheck,+ IconBox,IconDownload,+ IconExternalLink,IconKey,IconRefresh,IconShield,@@ -38,15 +46,33 @@ import {IconWorld,Status,} from 'twenty-ui/display';+import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';import { Button } from 'twenty-ui/input';-import { Section } from 'twenty-ui/layout';+import {+ Card,+ Section,+ SectionAlignment,+ SectionFontColor,+} from 'twenty-ui/layout';import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';+import {+ ApplicationRegistrationSourceType,+ useFindManyApplicationsQuery,+} from '~/generated-metadata/graphql';import { useNavigateSettings } from '~/hooks/useNavigateSettings';import { themeCssVariables } from 'twenty-ui/theme-constants';+import {+ StyledAppModal,+ StyledAppModalButton,+ StyledAppModalSection,+ StyledAppModalTitle,+} from '~/pages/settings/applications/components/SettingsAppModalLayout';import { applicationRegistrationClientSecretFamilyState } from '~/pages/settings/applications/states/applicationRegistrationClientSecretFamilyState';const DELETE_REGISTRATION_MODAL_ID = 'delete-application-registration-modal';const ROTATE_SECRET_MODAL_ID = 'rotate-application-registration-secret-modal';+const TRANSFER_OWNERSHIP_MODAL_ID =+ 'transfer-application-registration-ownership-modal';const StyledInputContainer = styled.div`align-items: center;@@ -99,6 +125,32 @@ const StyledRotateContainer = styled.div`padding-top: ${themeCssVariables.spacing[2]};`;+const StyledDangerButtonGroup = styled.div`+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+`;++const StyledSourceRow = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+`;++const StyledDownloadLink = styled.a`+ color: ${themeCssVariables.font.color.secondary};+ cursor: pointer;+ text-decoration: underline;+ &:hover {+ color: ${themeCssVariables.font.color.primary};+ }+`;++const StyledMarketplaceActions = styled.div`+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+ padding-top: ${themeCssVariables.spacing[2]};+`;+type ServerVariable = {id: string;key: string;@@ -113,7 +165,7 @@ export const SettingsApplicationRegistrationDetails = () => {const navigate = useNavigateSettings();const { copyToClipboard } = useCopyToClipboard();const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();- const { openModal } = useModal();+ const { openModal, closeModal } = useModal();const { applicationRegistrationId = '' } = useParams<{applicationRegistrationId: string;}>();@@ -123,11 +175,14 @@ export const SettingsApplicationRegistrationDetails = () => {applicationRegistrationId,);+ const [isInstalling, setIsInstalling] = useState(false);const [isLoading, setIsLoading] = useState(false);const [formRedirectUris, setFormRedirectUris] = useState<string[]>([]);const [newRedirectUri, setNewRedirectUri] = useState('');const [hasChanges, setHasChanges] = useState(false);const [rotatedSecret, setRotatedSecret] = useState<string | null>(null);+ const [transferSubdomain, setTransferSubdomain] = useState('');+ const [isTransferring, setIsTransferring] = useState(false);const [variableValues, setVariableValues] = useState<Record<string, string>>({},@@ -158,6 +213,14 @@ export const SettingsApplicationRegistrationDetails = () => {skip: !applicationRegistrationId,});+ const { data: tarballUrlData } = useQuery(+ APPLICATION_REGISTRATION_TARBALL_URL,+ {+ variables: { id: applicationRegistrationId },+ skip: !applicationRegistrationId,+ },+ );+const [updateRegistration] = useMutation(UPDATE_APPLICATION_REGISTRATION, {refetchQueries: [FIND_ONE_APPLICATION_REGISTRATION,@@ -176,15 +239,120 @@ export const SettingsApplicationRegistrationDetails = () => {refetchQueries: [FIND_APPLICATION_REGISTRATION_VARIABLES],},);+ const [transferOwnership] = useMutation(+ TRANSFER_APPLICATION_REGISTRATION_OWNERSHIP,+ {+ refetchQueries: [+ FIND_ONE_APPLICATION_REGISTRATION,+ FIND_MANY_APPLICATION_REGISTRATIONS,+ ],+ },+ );++ const { install } = useInstallMarketplaceApp();+ const { data: applicationsData, refetch: refetchApplications } =+ useFindManyApplicationsQuery();const registration = data?.findOneApplicationRegistration;const variables: ServerVariable[] =variablesData?.findApplicationRegistrationVariables ?? [];+ const isNpmSource =+ registration?.sourceType === ApplicationRegistrationSourceType.NPM;+if (loading || !registration) {return null;}+ const isInstalledOnWorkspace = (+ applicationsData?.findManyApplications ?? []+ ).some(+ (application) =>+ application.universalIdentifier === registration.universalIdentifier,+ );++ const handleToggleListed = async () => {+ try {+ await updateRegistration({+ variables: {+ input: {+ id: applicationRegistrationId,+ update: {+ isListed: !registration.isListed,+ },+ },+ },+ });+ enqueueSuccessSnackBar({+ message: registration.isListed+ ? t`App removed from marketplace`+ : t`App listed on marketplace`,+ });+ } catch {+ enqueueErrorSnackBar({+ message: t`Error updating marketplace listing`,+ });+ }+ };++ const marketplacePageUrl = getSettingsPath(+ SettingsPath.AvailableApplicationDetail,+ {+ availableApplicationId: registration.universalIdentifier,+ },+ );++ const handleInstallOnWorkspace = async () => {+ setIsInstalling(true);+ try {+ const success = await install({+ universalIdentifier: registration.universalIdentifier,+ });++ if (success) {+ await refetchApplications();+ enqueueSuccessSnackBar({+ message: t`App installed on this workspace`,+ });+ }+ } catch {+ enqueueErrorSnackBar({+ message: t`Error installing app`,+ });+ } finally {+ setIsInstalling(false);+ }+ };++ const handleTransferOwnership = async () => {+ const trimmed = transferSubdomain.trim();++ if (!isNonEmptyString(trimmed)) {+ return;+ }++ setIsTransferring(true);+ try {+ await transferOwnership({+ variables: {+ applicationRegistrationId,+ targetWorkspaceSubdomain: trimmed,+ },+ });+ enqueueSuccessSnackBar({+ message: t`Ownership transferred successfully`,+ });+ setTransferSubdomain('');+ navigate(SettingsPath.Applications);+ } catch {+ enqueueErrorSnackBar({+ message: t`Failed to transfer ownership. Check that the subdomain is correct.`,+ });+ } finally {+ setIsTransferring(false);+ }+ };+const markDirty = () => setHasChanges(true);const handleSave = async () => {@@ -364,6 +532,47 @@ export const SettingsApplicationRegistrationDetails = () => {t`Universal identifier copied`,),},+ ...(isNpmSource && isNonEmptyString(registration.sourcePackage)+ ? [+ {+ Icon: IconBox,+ label: t`Package`,+ value: registration.sourcePackage,+ },+ ]+ : registration.sourceType === ApplicationRegistrationSourceType.TARBALL+ ? [+ {+ Icon: IconBox,+ label: t`Source`,+ value: isNonEmptyString(+ tarballUrlData?.applicationRegistrationTarballUrl,+ ) ? (+ <StyledSourceRow>+ <span>+ <Trans>Tarball upload</Trans>+ </span>+ <StyledDownloadLink+ href={tarballUrlData.applicationRegistrationTarballUrl}+ download+ >+ <Trans>Download</Trans>+ </StyledDownloadLink>+ </StyledSourceRow>+ ) : (+ t`Tarball upload`+ ),+ },+ ]+ : registration.sourceType === ApplicationRegistrationSourceType.LOCAL+ ? [+ {+ Icon: IconBox,+ label: t`Source`,+ value: t`Local development`,+ },+ ]+ : []),];const stats = statsData?.findApplicationRegistrationStats;@@ -447,6 +656,61 @@ export const SettingsApplicationRegistrationDetails = () => {/></Section>+ <Section>+ <H2Title+ title={t`Marketplace Listing`}+ description={t`Control visibility on the marketplace. Unlisted apps are still accessible via direct link.`}+ />+ <Card rounded>+ <SettingsOptionCardContentToggle+ title={t`Listed on marketplace`}+ description={+ isNpmSource+ ? t`Managed by the marketplace catalog sync for npm packages`+ : t`When enabled, this app appears in the marketplace browse page`+ }+ checked={registration.isListed}+ onChange={handleToggleListed}+ disabled={isNpmSource}+ divider+ />+ <SettingsOptionCardContentToggle+ title={t`Featured`}+ description={t`Featured apps are curated. Open a PR to request featured status.`}+ checked={registration.isFeatured}+ onChange={() => {}}+ disabled+ />+ </Card>+ <StyledMarketplaceActions>+ <Button+ Icon={IconExternalLink}+ title={t`View marketplace page`}+ variant="secondary"+ to={marketplacePageUrl}+ />+ </StyledMarketplaceActions>+ </Section>++ <Section>+ <H2Title+ title={t`Installation`}+ description={t`Install this app on the current workspace`}+ />+ <Button+ Icon={isInstalledOnWorkspace ? IconCheck : IconDownload}+ title={+ isInstalledOnWorkspace+ ? t`Installed`+ : t`Install on this workspace`+ }+ variant="secondary"+ accent="blue"+ disabled={isInstalledOnWorkspace || isInstalling}+ onClick={handleInstallOnWorkspace}+ />+ </Section>+<Section><H2Titletitle={t`OAuth Credentials`}@@ -574,17 +838,26 @@ export const SettingsApplicationRegistrationDetails = () => {description={hasActiveInstalls? t`Uninstall this app from all workspaces before deleting it`- : t`Delete this app`+ : t`Delete or transfer this app registration`}/>- <Button- accent="danger"- variant="secondary"- title={t`Delete`}- Icon={IconTrash}- disabled={hasActiveInstalls}- onClick={() => openModal(DELETE_REGISTRATION_MODAL_ID)}- />+ <StyledDangerButtonGroup>+ <Button+ accent="danger"+ variant="secondary"+ title={t`Delete`}+ Icon={IconTrash}+ disabled={hasActiveInstalls}+ onClick={() => openModal(DELETE_REGISTRATION_MODAL_ID)}+ />+ <Button+ accent="default"+ variant="secondary"+ title={t`Transfer ownership`}+ Icon={IconArrowRight}+ onClick={() => openModal(TRANSFER_OWNERSHIP_MODAL_ID)}+ />+ </StyledDangerButtonGroup></Section></SettingsPageContainer></SubMenuTopBarContainer>@@ -622,6 +895,58 @@ export const SettingsApplicationRegistrationDetails = () => {confirmButtonText={t`Delete`}loading={isLoading}/>++ <StyledAppModal+ modalId={TRANSFER_OWNERSHIP_MODAL_ID}+ isClosable+ onClose={() => setTransferSubdomain('')}+ padding="large"+ dataGloballyPreventClickOutside+ >+ <StyledAppModalTitle>+ <H1Title+ title={t`Transfer ownership`}+ fontColor={H1TitleFontColor.Primary}+ />+ </StyledAppModalTitle>+ <StyledAppModalSection+ alignment={SectionAlignment.Center}+ fontColor={SectionFontColor.Primary}+ >+ {t`Enter the workspace subdomain to transfer this app to. You will lose access to manage it.`}+ </StyledAppModalSection>+ <Section>+ <SettingsTextInput+ instanceId="transfer-ownership-subdomain"+ value={transferSubdomain}+ onChange={setTransferSubdomain}+ placeholder={t`e.g. my-workspace`}+ fullWidth+ disableHotkeys+ label={t`Target workspace subdomain`}+ autoFocusOnMount+ />+ </Section>+ <StyledAppModalButton+ onClick={() => {+ closeModal(TRANSFER_OWNERSHIP_MODAL_ID);+ setTransferSubdomain('');+ }}+ variant="secondary"+ title={t`Cancel`}+ fullWidth+ />+ <StyledAppModalButton+ onClick={handleTransferOwnership}+ variant="secondary"+ accent="danger"+ title={t`Transfer`}+ disabled={+ !isNonEmptyString(transferSubdomain.trim()) || isTransferring+ }+ fullWidth+ />+ </StyledAppModal></>);};diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsxindex 96fb23b0d16..c8639e6fd9d 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx@@ -7,16 +7,18 @@ import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { useMemo, useState } from 'react';+import { useState } from 'react';import { useParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';import {IconApps,IconBox,+ IconCheck,IconColumns,IconCommand,IconDownload,+ IconEyeOff,IconFileText,IconInfoCircle,IconLayoutGrid,@@ -27,7 +29,11 @@ import {import { Button } from 'twenty-ui/input';import { Section } from 'twenty-ui/layout';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { PermissionFlagType } from '~/generated-metadata/graphql';+import {+ PermissionFlagType,+ useFindOneApplicationByUniversalIdentifierQuery,+ useFindOneMarketplaceAppQuery,+} from '~/generated-metadata/graphql';import { useMarketplaceApps } from '~/modules/marketplace/hooks/useMarketplaceApps';import { SettingsApplicationPermissionsTab } from '~/pages/settings/applications/tabs/SettingsApplicationPermissionsTab';import { SettingsAvailableApplicationDetailContentTab } from '~/pages/settings/applications/tabs/SettingsAvailableApplicationDetailContentTab';@@ -240,6 +246,19 @@ const StyledProviderItem = styled.li`margin-bottom: ${themeCssVariables.spacing[1]};`;+const StyledUnlistedBanner = styled.div`+ align-items: center;+ background-color: ${themeCssVariables.background.transparent.lighter};+ border: 1px solid ${themeCssVariables.border.color.medium};+ border-radius: ${themeCssVariables.border.radius.sm};+ color: ${themeCssVariables.font.color.secondary};+ display: flex;+ font-size: ${themeCssVariables.font.size.md};+ gap: ${themeCssVariables.spacing[2]};+ margin-bottom: ${themeCssVariables.spacing[4]};+ padding: ${themeCssVariables.spacing[3]} ${themeCssVariables.spacing[4]};+`;+export const SettingsAvailableApplicationDetails = () => {const { availableApplicationId = '' } = useParams<{availableApplicationId: string;@@ -252,10 +271,44 @@ export const SettingsAvailableApplicationDetails = () => {const canInstallMarketplaceApps = useHasPermissionFlag(PermissionFlagType.MARKETPLACE_APPS,);+ const { data: installedAppData } =+ useFindOneApplicationByUniversalIdentifierQuery({+ variables: { universalIdentifier: availableApplicationId },+ skip: !availableApplicationId,+ });++ const listedApp = marketplaceApps?.find(+ (app) => app.id === availableApplicationId,+ );- const application = useMemo(() => {- return marketplaceApps?.find((app) => app.id === availableApplicationId);- }, [availableApplicationId, marketplaceApps]);+ const { data: singleAppData } = useFindOneMarketplaceAppQuery({+ variables: { universalIdentifier: availableApplicationId },+ skip: isDefined(listedApp) || !availableApplicationId,+ });++ const singleApp = singleAppData?.findOneMarketplaceApp;++ const application = isDefined(listedApp)+ ? listedApp+ : isDefined(singleApp)+ ? {+ ...singleApp,+ content: {+ objects: (singleApp.objects ?? []).length,+ fields:+ (singleApp.objects ?? []).reduce(+ (count, appObject) => count + appObject.fields.length,+ 0,+ ) + (singleApp.fields ?? []).length,+ functions: (singleApp.logicFunctions ?? []).length,+ frontComponents: (singleApp.frontComponents ?? []).length,+ },+ }+ : undefined;++ const isUnlisted = !isDefined(listedApp) && isDefined(application);++ const isAlreadyInstalled = isDefined(installedAppData?.findOneApplication);const handleInstall = async () => {if (isDefined(application)) {@@ -438,6 +491,12 @@ export const SettingsAvailableApplicationDetails = () => {]}><SettingsPageContainer>+ {isUnlisted && (+ <StyledUnlistedBanner>+ <IconEyeOff size={16} />+ {t`This application is not listed on the marketplace. It was shared via a direct link.`}+ </StyledUnlistedBanner>+ )}<StyledHeader><StyledHeaderLeft><StyledLogo>@@ -461,12 +520,18 @@ export const SettingsAvailableApplicationDetails = () => {</StyledHeaderLeft>{canInstallMarketplaceApps && (<Button- Icon={IconDownload}- title={isInstalling ? t`Installing...` : t`Install`}- variant="primary"- accent="blue"+ Icon={isAlreadyInstalled ? IconCheck : IconDownload}+ title={+ isAlreadyInstalled+ ? t`Installed`+ : isInstalling+ ? t`Installing...`+ : t`Install`+ }+ variant={isAlreadyInstalled ? 'secondary' : 'primary'}+ accent={isAlreadyInstalled ? 'default' : 'blue'}onClick={handleInstall}- disabled={isInstalling}+ disabled={isAlreadyInstalled || isInstalling}/>)}</StyledHeader>diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsxindex f811bf36ad6..f7841cfc732 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx@@ -6,7 +6,7 @@ import { isDefined } from 'twenty-shared/utils';import { IconCircleDot, IconStatusChange, IconUpload } from 'twenty-ui/display';import { Button } from 'twenty-ui/input';import {- AppRegistrationSourceType,+ ApplicationRegistrationSourceType,type Application,} from '~/generated-metadata/graphql';import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';@@ -26,7 +26,7 @@ export const SettingsApplicationVersionContainer = ({const currentVersion = application?.version;const sourceType = application?.applicationRegistration?.sourceType;- const isNpmApp = sourceType === AppRegistrationSourceType.NPM;+ const isNpmApp = sourceType === ApplicationRegistrationSourceType.NPM;const latestVersion = isNpmApp? (latestAvailableVersion ?? currentVersion)diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsxindex a1356838ca7..893318b475b 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx@@ -1,4 +1,4 @@-import { H2Title, IconChevronRight, IconSearch } from 'twenty-ui/display';+import { H2Title, IconChevronRight } from 'twenty-ui/display';import { TableHeader } from '@/ui/layout/table/components/TableHeader';import { TableRow } from '@/ui/layout/table/components/TableRow';import { getSettingsPath, isDefined } from 'twenty-shared/utils';@@ -10,13 +10,13 @@ import {APPLICATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS,SettingsApplicationTableRow,} from '~/pages/settings/applications/components/SettingsApplicationTableRow';-import { useContext, useMemo, useState } from 'react';+import { useContext, useState } from 'react';import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/applicationWithoutRelation';import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';import { Section } from 'twenty-ui/layout';-import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';+import { SearchInput } from 'twenty-ui/input';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { AppRegistrationSourceType } from '~/generated-metadata/graphql';+import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';const StyledTableContainer = styled.div`margin-top: ${themeCssVariables.spacing[3]};@@ -41,15 +41,13 @@ export const SettingsApplicationsTable = ({const [searchTerm, setSearchTerm] = useState('');- const filteredApplications = useMemo(() => {- return applications.filter(- (application) =>- application.name.toLowerCase().includes(searchTerm.toLowerCase()) ||- (application.description ?? '')- .toLowerCase()- .includes(searchTerm.toLowerCase()),- );- }, [applications, searchTerm]);+ const filteredApplications = applications.filter(+ (application) =>+ application.name.toLowerCase().includes(searchTerm.toLowerCase()) ||+ (application.description ?? '')+ .toLowerCase()+ .includes(searchTerm.toLowerCase()),+ );return (<Section>@@ -58,9 +56,7 @@ export const SettingsApplicationsTable = ({description={t`List installed applications. Use filter to search for a specific application`}/><StyledSearchInputContainer>- <SettingsTextInput- instanceId="env-var-search"- LeftIcon={IconSearch}+ <SearchInputplaceholder={t`Search an application`}value={searchTerm}onChange={setSearchTerm}@@ -81,7 +77,7 @@ export const SettingsApplicationsTable = ({{filteredApplications.map((application) => {const isNpmApp =application.applicationRegistration?.sourceType ===- AppRegistrationSourceType.NPM;+ ApplicationRegistrationSourceType.NPM;const latestVersion =application.applicationRegistration?.latestAvailableVersion;diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsInstallNpmAppModal.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsRegisterNpmAppModal.tsxsimilarity index 64%rename from packages/twenty-front/src/pages/settings/applications/components/SettingsInstallNpmAppModal.tsxrename to packages/twenty-front/src/pages/settings/applications/components/SettingsRegisterNpmAppModal.tsxindex db1cbc31996..5c101e8ab2e 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsInstallNpmAppModal.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsRegisterNpmAppModal.tsx@@ -1,14 +1,15 @@import { styled } from '@linaria/react';import { useState } from 'react';+import { FIND_MANY_APPLICATION_REGISTRATIONS } from '@/settings/application-registrations/graphql/queries/findManyApplicationRegistrations';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';import { useModal } from '@/ui/layout/modal/hooks/useModal';+import { useApolloClient } from '@apollo/client';import { useLingui } from '@lingui/react/macro';import { H1Title, H1TitleFontColor } from 'twenty-ui/display';import { Section, SectionAlignment, SectionFontColor } from 'twenty-ui/layout';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { useInstallNpmApp } from '~/modules/marketplace/hooks/useInstallNpmApp';-import { useFindManyApplicationsQuery } from '~/generated-metadata/graphql';+import { useRegisterNpmPackage } from '~/modules/marketplace/hooks/useRegisterNpmPackage';import {StyledAppModal,StyledAppModalButton,@@ -16,7 +17,7 @@ import {StyledAppModalTitle,} from '~/pages/settings/applications/components/SettingsAppModalLayout';-export const INSTALL_NPM_APP_MODAL_ID = 'install-npm-app-modal';+export const REGISTER_NPM_APP_MODAL_ID = 'register-npm-app-modal';const StyledInputGroup = styled.div`display: flex;@@ -24,51 +25,49 @@ const StyledInputGroup = styled.div`gap: ${themeCssVariables.spacing[3]};`;-export const SettingsInstallNpmAppModal = () => {+export const SettingsRegisterNpmAppModal = () => {const { t } = useLingui();const { closeModal } = useModal();- const { install, isInstalling } = useInstallNpmApp();- const { refetch } = useFindManyApplicationsQuery();+ const { register, isRegistering } = useRegisterNpmPackage();+ const apolloClient = useApolloClient();const [packageName, setPackageName] = useState('');- const [version, setVersion] = useState('');const isValid = packageName.trim().length > 0;- const handleInstall = async () => {+ const handleRegister = async () => {if (!isValid) {return;}- const success = await install({+ const success = await register({packageName: packageName.trim(),- version: version.trim() || undefined,});if (success) {- await refetch();- closeModal(INSTALL_NPM_APP_MODAL_ID);+ await apolloClient.refetchQueries({+ include: [FIND_MANY_APPLICATION_REGISTRATIONS],+ });+ closeModal(REGISTER_NPM_APP_MODAL_ID);setPackageName('');- setVersion('');}};const handleCancel = () => {- closeModal(INSTALL_NPM_APP_MODAL_ID);+ closeModal(REGISTER_NPM_APP_MODAL_ID);setPackageName('');- setVersion('');};return (<StyledAppModal- modalId={INSTALL_NPM_APP_MODAL_ID}+ modalId={REGISTER_NPM_APP_MODAL_ID}isClosable={true}padding="large"dataGloballyPreventClickOutside><StyledAppModalTitle><H1Title- title={t`Install from npm`}+ title={t`Register from npm`}fontColor={H1TitleFontColor.Primary}/></StyledAppModalTitle>@@ -76,7 +75,7 @@ export const SettingsInstallNpmAppModal = () => {alignment={SectionAlignment.Center}fontColor={SectionFontColor.Primary}>- {t`Enter the npm package name of the application you want to install.`}+ {t`Enter the npm package name to register as an application.`}</StyledAppModalSection><Section>@@ -91,15 +90,6 @@ export const SettingsInstallNpmAppModal = () => {label={t`Package name`}autoFocusOnMount/>- <SettingsTextInput- instanceId="npm-version-input"- value={version}- onChange={setVersion}- placeholder={t`latest`}- fullWidth- disableHotkeys- label={t`Version (optional)`}- /></StyledInputGroup></Section>@@ -110,11 +100,11 @@ export const SettingsInstallNpmAppModal = () => {fullWidth/><StyledAppModalButton- onClick={handleInstall}+ onClick={handleRegister}variant="secondary"accent="blue"- title={t`Install`}- disabled={!isValid || isInstalling}+ title={t`Register`}+ disabled={!isValid || isRegistering}fullWidth/></StyledAppModal>diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsUploadTarballModal.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsUploadTarballModal.tsxindex 03461c003d5..4d00c028b9e 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsUploadTarballModal.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsUploadTarballModal.tsx@@ -1,14 +1,17 @@import { styled } from '@linaria/react';import { useRef } from 'react';+import { FIND_MANY_APPLICATION_REGISTRATIONS } from '@/settings/application-registrations/graphql/queries/findManyApplicationRegistrations';+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { useModal } from '@/ui/layout/modal/hooks/useModal';+import { useApolloClient, useMutation } from '@apollo/client';import { useLingui } from '@lingui/react/macro';+import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';import { H1Title, H1TitleFontColor } from 'twenty-ui/display';import { SectionAlignment, SectionFontColor } from 'twenty-ui/layout';+import { INSTALL_APPLICATION } from '~/modules/marketplace/graphql/mutations/installApplication';import { useUploadAppTarball } from '~/modules/marketplace/hooks/useUploadAppTarball';-import { useInstallMarketplaceApp } from '~/modules/marketplace/hooks/useInstallMarketplaceApp';-import { useFindManyApplicationsQuery } from '~/generated-metadata/graphql';import {StyledAppModal,StyledAppModalButton,@@ -23,11 +26,12 @@ const StyledFileInput = styled.input``;export const SettingsUploadTarballModal = () => {- const { t } = useLingui();+ const { t: tFn } = useLingui();const { closeModal } = useModal();const { upload, isUploading } = useUploadAppTarball();- const { install } = useInstallMarketplaceApp();- const { refetch } = useFindManyApplicationsQuery();+ const [installApplication] = useMutation(INSTALL_APPLICATION);+ const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();+ const apolloClient = useApolloClient();const fileInputRef = useRef<HTMLInputElement>(null);const handleSelectFile = () => {@@ -46,16 +50,31 @@ export const SettingsUploadTarballModal = () => {try {const uploadResult = await upload(file);- if (uploadResult.success) {- const installResult = await install({- universalIdentifier: uploadResult.universalIdentifier,- });+ if (!uploadResult.success) {+ return;+ }++ const registrationId = uploadResult.registrationId;- if (installResult) {- await refetch();- closeModal(UPLOAD_TARBALL_MODAL_ID);+ if (isDefined(registrationId)) {+ try {+ await installApplication({+ variables: { appRegistrationId: registrationId },+ });+ enqueueSuccessSnackBar({+ message: t`Application installed successfully.`,+ });+ } catch {+ enqueueErrorSnackBar({+ message: t`Tarball uploaded but installation failed.`,+ });}}++ await apolloClient.refetchQueries({+ include: [FIND_MANY_APPLICATION_REGISTRATIONS],+ });+ closeModal(UPLOAD_TARBALL_MODAL_ID);} finally {if (isDefined(fileInputRef.current)) {fileInputRef.current.value = '';@@ -76,7 +95,7 @@ export const SettingsUploadTarballModal = () => {><StyledAppModalTitle><H1Title- title={t`Upload tarball`}+ title={tFn`Upload tarball`}fontColor={H1TitleFontColor.Primary}/></StyledAppModalTitle>@@ -84,7 +103,7 @@ export const SettingsUploadTarballModal = () => {alignment={SectionAlignment.Center}fontColor={SectionFontColor.Primary}>- {t`Select a .tar.gz application package to upload and install.`}+ {tFn`Select a .tar.gz application package to upload and install.`}</StyledAppModalSection><StyledFileInput@@ -97,14 +116,14 @@ export const SettingsUploadTarballModal = () => {<StyledAppModalButtononClick={handleCancel}variant="secondary"- title={t`Cancel`}+ title={tFn`Cancel`}fullWidth/><StyledAppModalButtononClick={handleSelectFile}variant="secondary"accent="blue"- title={t`Choose file`}+ title={tFn`Choose file`}disabled={isUploading}fullWidth/>diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsxindex fa0d5feff5e..ede140c6102 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx@@ -1,11 +1,16 @@+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import { useMemo, useState } from 'react';+import { type ReactNode, useState } from 'react';+import { IconSparkles } from 'twenty-ui/display';import { SearchInput } from 'twenty-ui/input';import { Section } from 'twenty-ui/layout';+import { MenuItemToggle } from 'twenty-ui/navigation';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { SettingsAvailableApplicationCard } from '~/pages/settings/applications/components/SettingsAvailableApplicationCard';import { useMarketplaceApps } from '~/modules/marketplace/hooks/useMarketplaceApps';+import { SettingsAvailableApplicationCard } from '~/pages/settings/applications/components/SettingsAvailableApplicationCard';const StyledSearchInputContainer = styled.div`padding-bottom: ${themeCssVariables.spacing[2]};@@ -27,24 +32,43 @@ const StyledEmptyState = styled.div`text-align: center;`;+const StyledHintLink = styled.button`+ background: none;+ border: none;+ color: ${themeCssVariables.color.blue};+ cursor: pointer;+ font-size: inherit;+ padding: 0;+ text-decoration: underline;+`;+export const SettingsApplicationsAvailableTab = () => {const { t } = useLingui();const [searchTerm, setSearchTerm] = useState('');+ const [showFeaturedOnly, setShowFeaturedOnly] = useState(true);const { data: marketplaceApps, isLoading } = useMarketplaceApps();- const applications = marketplaceApps;+ const textFilteredApplications = searchTerm+ ? marketplaceApps.filter((application) => {+ const lowerSearch = searchTerm.toLowerCase();- const filteredApplications = useMemo(() => {- return applications.filter(- (application) =>- application.name.toLowerCase().includes(searchTerm.toLowerCase()) ||- application.description- .toLowerCase()- .includes(searchTerm.toLowerCase()) ||- application.author.toLowerCase().includes(searchTerm.toLowerCase()),- );- }, [applications, searchTerm]);+ return (+ application.name.toLowerCase().includes(lowerSearch) ||+ application.description.toLowerCase().includes(lowerSearch) ||+ application.author.toLowerCase().includes(lowerSearch)+ );+ })+ : marketplaceApps;++ const filteredApplications = showFeaturedOnly+ ? textFilteredApplications.filter((application) => application.isFeatured)+ : textFilteredApplications;++ const nonFeaturedCount = showFeaturedOnly+ ? textFilteredApplications.filter((application) => !application.isFeatured)+ .length+ : 0;if (isLoading) {return (@@ -54,6 +78,9 @@ export const SettingsApplicationsAvailableTab = () => {);}+ const showNonFeaturedHint =+ filteredApplications.length === 0 && nonFeaturedCount > 0;+return (<Section><StyledSearchInputContainer>@@ -61,11 +88,43 @@ export const SettingsApplicationsAvailableTab = () => {placeholder={t`Search an application`}value={searchTerm}onChange={setSearchTerm}+ filterDropdown={(filterButton: ReactNode) => (+ <Dropdown+ dropdownId="marketplace-filter-dropdown"+ dropdownPlacement="bottom-end"+ dropdownOffset={{ x: 0, y: 8 }}+ clickableComponent={filterButton}+ dropdownComponents={+ <DropdownContent>+ <DropdownMenuItemsContainer>+ <MenuItemToggle+ LeftIcon={IconSparkles}+ onToggleChange={() =>+ setShowFeaturedOnly(!showFeaturedOnly)+ }+ toggled={showFeaturedOnly}+ text={t`Featured only`}+ toggleSize="small"+ />+ </DropdownMenuItemsContainer>+ </DropdownContent>+ }+ />+ )}/></StyledSearchInputContainer>{filteredApplications.length === 0 ? (- <StyledEmptyState>{t`No applications available`}</StyledEmptyState>+ <StyledEmptyState>+ {showNonFeaturedHint+ ? t`No featured applications found. ${nonFeaturedCount} non-featured result(s) available — `+ : t`No applications available`}+ {showNonFeaturedHint && (+ <StyledHintLink onClick={() => setShowFeaturedOnly(false)}>+ {t`show all`}+ </StyledHintLink>+ )}+ </StyledEmptyState>) : (<StyledCardsGrid>{filteredApplications.map((application) => (diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsxindex 96d33b3a640..fd7915dbd0a 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx@@ -2,6 +2,11 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembeimport { FIND_MANY_APPLICATION_REGISTRATIONS } from '@/settings/application-registrations/graphql/queries/findManyApplicationRegistrations';import { SettingsListCard } from '@/settings/components/SettingsListCard';import { getDocumentationUrl } from '@/support/utils/getDocumentationUrl';+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { useModal } from '@/ui/layout/modal/hooks/useModal';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';@@ -13,20 +18,40 @@ import {CommandBlock,H2Title,IconApps,+ IconChevronDown,IconChevronRight,IconCopy,+ IconDownload,IconFileInfo,+ IconUpload,} from 'twenty-ui/display';-import { Button } from 'twenty-ui/input';+import { Button, ButtonGroup, IconButton } from 'twenty-ui/input';import { Section } from 'twenty-ui/layout';import { useContext } from 'react';+import { MenuItem } from 'twenty-ui/navigation';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';+import {+ REGISTER_NPM_APP_MODAL_ID,+ SettingsRegisterNpmAppModal,+} from '~/pages/settings/applications/components/SettingsRegisterNpmAppModal';+import {+ SettingsUploadTarballModal,+ UPLOAD_TARBALL_MODAL_ID,+} from '~/pages/settings/applications/components/SettingsUploadTarballModal';++const REGISTER_APP_DROPDOWN_ID = 'register-app-dropdown';const StyledButtonContainer = styled.div`margin: ${themeCssVariables.spacing[2]} 0;`;+const StyledButtonGroupContainer = styled.div`+ display: flex;+ justify-content: flex-end;+ margin-bottom: ${themeCssVariables.spacing[4]};+`;+type ApplicationRegistration = {id: string;name: string;@@ -38,6 +63,8 @@ export const SettingsApplicationsDeveloperTab = () => {const { t } = useLingui();const navigate = useNavigate();const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);+ const { openModal } = useModal();+ const { closeDropdown } = useCloseDropdown();const { copyToClipboard } = useCopyToClipboard();@@ -63,6 +90,16 @@ export const SettingsApplicationsDeveloperTab = () => {/>);+ const handleRegisterFromNpm = () => {+ closeDropdown(REGISTER_APP_DROPDOWN_ID);+ openModal(REGISTER_NPM_APP_MODAL_ID);+ };++ const handleUploadTarball = () => {+ closeDropdown(REGISTER_APP_DROPDOWN_ID);+ openModal(UPLOAD_TARBALL_MODAL_ID);+ };+return (<><Section>@@ -87,12 +124,12 @@ export const SettingsApplicationsDeveloperTab = () => {/></StyledButtonContainer></Section>- {registrations.length > 0 && (- <Section>- <H2Title- title={t`My Apps`}- description={t`Apps you've created and published`}- />+ <Section>+ <H2Title+ title={t`My Apps`}+ description={t`Apps you've created, registered, or published`}+ />+ {registrations.length > 0 && (<SettingsListCarditems={registrations}getItemLabel={(registration) => registration.name}@@ -112,8 +149,47 @@ export const SettingsApplicationsDeveloperTab = () => {/>)}/>- </Section>- )}+ )}+ </Section>+ <StyledButtonGroupContainer>+ <ButtonGroup size="small" variant="secondary">+ <Button+ Icon={IconDownload}+ title={t`Register from npm`}+ onClick={handleRegisterFromNpm}+ />+ <Dropdown+ dropdownId={REGISTER_APP_DROPDOWN_ID}+ clickableComponent={+ <IconButton+ size="small"+ variant="secondary"+ Icon={IconChevronDown}+ position="right"+ />+ }+ dropdownComponents={+ <DropdownContent>+ <DropdownMenuItemsContainer>+ <MenuItem+ LeftIcon={IconDownload}+ text={t`Register from npm`}+ onClick={handleRegisterFromNpm}+ />+ <MenuItem+ LeftIcon={IconUpload}+ text={t`Upload tarball`}+ onClick={handleUploadTarball}+ />+ </DropdownMenuItemsContainer>+ </DropdownContent>+ }+ />+ </ButtonGroup>+ </StyledButtonGroupContainer>++ <SettingsRegisterNpmAppModal />+ <SettingsUploadTarballModal /></>);};diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsxindex 74240a67ecb..69ff9ce9b88 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsx@@ -1,99 +1,14 @@-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { useModal } from '@/ui/layout/modal/hooks/useModal';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { IconChevronDown, IconDownload, IconUpload } from 'twenty-ui/display';-import { Button, ButtonGroup, IconButton } from 'twenty-ui/input';-import { Section } from 'twenty-ui/layout';-import { MenuItem } from 'twenty-ui/navigation';-import { themeCssVariables } from 'twenty-ui/theme-constants';import { useFindManyApplicationsQuery } from '~/generated-metadata/graphql';import { SettingsApplicationsTable } from '~/pages/settings/applications/components/SettingsApplicationsTable';-import {- INSTALL_NPM_APP_MODAL_ID,- SettingsInstallNpmAppModal,-} from '~/pages/settings/applications/components/SettingsInstallNpmAppModal';-import {- SettingsUploadTarballModal,- UPLOAD_TARBALL_MODAL_ID,-} from '~/pages/settings/applications/components/SettingsUploadTarballModal';--const INSTALL_APP_DROPDOWN_ID = 'install-app-dropdown';--const StyledButtonGroupContainer = styled.div`- display: flex;- justify-content: flex-end;- margin-bottom: ${themeCssVariables.spacing[4]};-`;export const SettingsApplicationsInstalledTab = () => {- const { t } = useLingui();const { data } = useFindManyApplicationsQuery();- const { openModal } = useModal();- const { closeDropdown } = useCloseDropdown();const applications = data?.findManyApplications ?? [];- const handleInstallFromNpm = () => {- closeDropdown(INSTALL_APP_DROPDOWN_ID);- openModal(INSTALL_NPM_APP_MODAL_ID);- };-- const handleUploadTarball = () => {- closeDropdown(INSTALL_APP_DROPDOWN_ID);- openModal(UPLOAD_TARBALL_MODAL_ID);- };-- return (- <>- {applications.length > 0 && (- <SettingsApplicationsTable applications={applications} />- )}-- <Section>- <StyledButtonGroupContainer>- <ButtonGroup size="small" variant="secondary">- <Button- Icon={IconDownload}- title={t`Install app`}- onClick={handleInstallFromNpm}- />- <Dropdown- dropdownId={INSTALL_APP_DROPDOWN_ID}- clickableComponent={- <IconButton- size="small"- variant="secondary"- Icon={IconChevronDown}- position="right"- />- }- dropdownComponents={- <DropdownContent>- <DropdownMenuItemsContainer>- <MenuItem- LeftIcon={IconDownload}- text={t`Install from npm`}- onClick={handleInstallFromNpm}- />- <MenuItem- LeftIcon={IconUpload}- text={t`Upload tarball`}- onClick={handleUploadTarball}- />- </DropdownMenuItemsContainer>- </DropdownContent>- }- />- </ButtonGroup>- </StyledButtonGroupContainer>- </Section>+ if (applications.length === 0) {+ return null;+ }- <SettingsInstallNpmAppModal />- <SettingsUploadTarballModal />- </>- );+ return <SettingsApplicationsTable applications={applications} />;};diff --git a/packages/twenty-server/nest-cli.json b/packages/twenty-server/nest-cli.jsonindex 2017554dcb6..08b16289ddf 100644--- a/packages/twenty-server/nest-cli.json+++ b/packages/twenty-server/nest-cli.json@@ -21,11 +21,11 @@"outDir": "dist/assets"},{- "include": "engine/core-modules/application/constants/seed-dependencies/**",+ "include": "engine/core-modules/application/application-package/constants/seed-dependencies/**","outDir": "dist/assets"},{- "include": "engine/core-modules/application/constants/yarn-engine/**",+ "include": "engine/core-modules/application/application-package/constants/yarn-engine/**","outDir": "dist/assets"},{diff --git a/packages/twenty-server/src/database/commands/cron-register-all.command.ts b/packages/twenty-server/src/database/commands/cron-register-all.command.tsindex 8fdac4a99d0..6c2b5492a78 100644--- a/packages/twenty-server/src/database/commands/cron-register-all.command.ts+++ b/packages/twenty-server/src/database/commands/cron-register-all.command.ts@@ -2,7 +2,7 @@ import { Logger } from '@nestjs/common';import { Command, CommandRunner } from 'nest-commander';-import { AppVersionCheckCronCommand } from 'src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command';+import { ApplicationVersionCheckCronCommand } from 'src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command';import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';import { EventLogCleanupCronCommand } from 'src/engine/core-modules/event-logs/cleanup/commands/event-log-cleanup.cron.command';import { CheckPublicDomainsValidRecordsCronCommand } from 'src/engine/core-modules/public-domain/crons/commands/check-public-domains-valid-records.cron.command';@@ -55,7 +55,7 @@ export class CronRegisterAllCommand extends CommandRunner {private readonly trashCleanupCronCommand: TrashCleanupCronCommand,private readonly eventLogCleanupCronCommand: EventLogCleanupCronCommand,private readonly marketplaceCatalogSyncCronCommand: MarketplaceCatalogSyncCronCommand,- private readonly appVersionCheckCronCommand: AppVersionCheckCronCommand,+ private readonly applicationVersionCheckCronCommand: ApplicationVersionCheckCronCommand,) {super();}@@ -145,8 +145,8 @@ export class CronRegisterAllCommand extends CommandRunner {command: this.marketplaceCatalogSyncCronCommand,},{- name: 'AppVersionCheck',- command: this.appVersionCheckCronCommand,+ name: 'ApplicationVersionCheck',+ command: this.applicationVersionCheckCronCommand,},];diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.tsindex 3bb4591c02b..42e1a61d616 100644--- a/packages/twenty-server/src/database/commands/database-command.module.ts+++ b/packages/twenty-server/src/database/commands/database-command.module.ts@@ -9,7 +9,7 @@ import { UpgradeVersionCommandModule } from 'src/database/commands/upgrade-versiimport { TypeORMModule } from 'src/database/typeorm/typeorm.module';import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';import { GenerateApiKeyCommand } from 'src/engine/core-modules/api-key/commands/generate-api-key.command';-import { AppVersionCheckModule } from 'src/engine/core-modules/application/application-version-check/application-version-check.module';+import { ApplicationUpgradeModule } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.module';import { MarketplaceModule } from 'src/engine/core-modules/application/application-marketplace/marketplace.module';import { EventLogCleanupModule } from 'src/engine/core-modules/event-logs/cleanup/event-log-cleanup.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';@@ -58,7 +58,7 @@ import { AutomatedTriggerModule } from 'src/modules/workflow/workflow-trigger/auPublicDomainModule,EventLogCleanupModule,MarketplaceModule,- AppVersionCheckModule,+ ApplicationUpgradeModule,],providers: [DataSeedWorkspaceCommand,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.tsindex beab570c1a2..129a38adf5e 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.ts@@ -10,7 +10,7 @@ import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';import { ApplicationService } from 'src/engine/core-modules/application/application.service';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';-import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util';+import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util';import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.types';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1772732588833-add-is-listed-to-app-registration.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1772732588833-add-is-listed-to-app-registration.tsnew file mode 100644index 00000000000..c7991a8a4ab--- /dev/null+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1772732588833-add-is-listed-to-app-registration.ts@@ -0,0 +1,61 @@+import { type MigrationInterface, type QueryRunner } from 'typeorm';++export class AddIsListedToAppRegistration1772732588833+ implements MigrationInterface+{+ name = 'AddIsListedToAppRegistration1772732588833';++ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ADD "isListed" boolean NOT NULL DEFAULT false`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ALTER COLUMN "workspaceId" DROP NOT NULL`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT IF EXISTS "FK_applicationRegistration_workspaceId"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ADD CONSTRAINT "FK_applicationRegistration_workspaceId" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE SET NULL`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT "FK_applicationRegistration_workspaceId"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT "FK_94ab20372e448d45088357f884e"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ALTER COLUMN "workspaceId" DROP NOT NULL`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ADD CONSTRAINT "FK_94ab20372e448d45088357f884e" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ADD CONSTRAINT "FK_applicationRegistration_workspaceId" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT "FK_94ab20372e448d45088357f884e"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ALTER COLUMN "workspaceId" SET NOT NULL`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ADD CONSTRAINT "FK_94ab20372e448d45088357f884e" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT IF EXISTS "FK_applicationRegistration_workspaceId"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ADD CONSTRAINT "FK_applicationRegistration_workspaceId" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" ALTER COLUMN "workspaceId" SET NOT NULL`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."applicationRegistration" DROP COLUMN "isListed"`,+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.tsindex 185596edcff..46003adbe6b 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts@@ -6,6 +6,7 @@ import { AdminPanelHealthService } from 'src/engine/core-modules/admin-panel/admimport { AdminPanelQueueService } from 'src/engine/core-modules/admin-panel/admin-panel-queue.service';import { AdminPanelResolver } from 'src/engine/core-modules/admin-panel/admin-panel.resolver';import { AdminPanelService } from 'src/engine/core-modules/admin-panel/admin-panel.service';+import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { AuthModule } from 'src/engine/core-modules/auth/auth.module';import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';@@ -40,6 +41,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permiImpersonationModule,PermissionsModule,SecureHttpClientModule,+ ApplicationRegistrationModule,],providers: [AdminPanelResolver,diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.tsindex 32050760654..0ceae81f81b 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts@@ -7,6 +7,8 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { AdminPanelHealthService } from 'src/engine/core-modules/admin-panel/admin-panel-health.service';import { AdminPanelQueueService } from 'src/engine/core-modules/admin-panel/admin-panel-queue.service';import { AdminPanelService } from 'src/engine/core-modules/admin-panel/admin-panel.service';+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { AdminAIModelsDTO } from 'src/engine/core-modules/client-config/client-config.entity';import { ConfigVariableDTO } from 'src/engine/core-modules/admin-panel/dtos/config-variable.dto';import { ConfigVariablesDTO } from 'src/engine/core-modules/admin-panel/dtos/config-variables.dto';@@ -56,8 +58,9 @@ import { QueueMetricsDataDTO } from './dtos/queue-metrics-data.dto';)export class AdminPanelResolver {constructor(- private adminService: AdminPanelService,- private adminPanelHealthService: AdminPanelHealthService,+ private readonly adminService: AdminPanelService,+ private readonly adminPanelHealthService: AdminPanelHealthService,+ private readonly applicationRegistrationService: ApplicationRegistrationService,private adminPanelQueueService: AdminPanelQueueService,private featureFlagService: FeatureFlagService,private readonly twentyConfigService: TwentyConfigService,@@ -267,4 +270,12 @@ export class AdminPanelResolver {jobIds,);}++ @UseGuards(AdminPanelGuard)+ @Query(() => [ApplicationRegistrationEntity])+ async findAllApplicationRegistrations(): Promise<+ ApplicationRegistrationEntity[]+ > {+ return this.applicationRegistrationService.findAll();+ }}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.tsindex eea6d62a307..af98b288fe8 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts@@ -1,7 +1,7 @@import { Module } from '@nestjs/common';import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';-import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';+import { ApplicationManifestModule } from 'src/engine/core-modules/application/application-manifest/application-manifest.module';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { ApplicationDevelopmentResolver } from 'src/engine/core-modules/application/application-development/application-development.resolver';import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';@@ -12,9 +12,9 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor@Module({imports: [- ApplicationInstallModule,- ApplicationRegistrationModule,ApplicationModule,+ ApplicationManifestModule,+ ApplicationRegistrationModule,FeatureFlagModule,TokenModule,FileStorageModule,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.tsindex adf28602b77..32e70123fa9 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts@@ -1,5 +1,4 @@import {- Logger,UseFilters,UseGuards,UseInterceptors,@@ -13,24 +12,22 @@ import { FileFolder, FeatureFlagKey } from 'twenty-shared/types';import type { FileUpload } from 'graphql-upload/processRequest.mjs';-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';import {ApplicationException,ApplicationExceptionCode,} from 'src/engine/core-modules/application/application.exception';-import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';-import { ApplicationInput } from 'src/engine/core-modules/application/dtos/application.input';-import { CreateApplicationInput } from 'src/engine/core-modules/application/dtos/create-application.input';-import { GenerateApplicationTokenInput } from 'src/engine/core-modules/application/dtos/generate-application-token.input';-import { UploadApplicationFileInput } from 'src/engine/core-modules/application/dtos/uploadApplicationFileInput';-import { WorkspaceMigrationDTO } from 'src/engine/core-modules/application/dtos/workspace-migration.dto';-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/application-sync.service';import { ApplicationService } from 'src/engine/core-modules/application/application.service';-import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';+import { ApplicationInput } from 'src/engine/core-modules/application/application-development/dtos/application.input';+import { GenerateApplicationTokenInput } from 'src/engine/core-modules/application/application-development/dtos/generate-application-token.input';+import { UploadApplicationFileInput } from 'src/engine/core-modules/application/application-development/dtos/upload-application-file.input';+import { WorkspaceMigrationDTO } from 'src/engine/core-modules/application/application-development/dtos/workspace-migration.dto';+import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/application-oauth/dtos/application-token-pair.dto';import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';import { FileDTO } from 'src/engine/core-modules/file/dtos/file.dto';@@ -58,12 +55,10 @@ import { streamToBuffer } from 'src/utils/stream-to-buffer';SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),)export class ApplicationDevelopmentResolver {- private readonly logger = new Logger(ApplicationDevelopmentResolver.name);-constructor(private readonly applicationTokenService: ApplicationTokenService,- private readonly applicationSyncService: ApplicationSyncService,private readonly applicationService: ApplicationService,+ private readonly applicationSyncService: ApplicationSyncService,private readonly applicationRegistrationService: ApplicationRegistrationService,private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,private readonly fileStorageService: FileStorageService,@@ -87,19 +82,17 @@ export class ApplicationDevelopmentResolver {@Args() { manifest }: ApplicationInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<WorkspaceMigrationDTO> {- const applicationRegistrationId =- await this.resolveApplicationRegistrationId(- manifest.application.universalIdentifier,- {- name: manifest.application.displayName,- description: manifest.application.description,- logoUrl: manifest.application.logoUrl,- author: manifest.application.author,- websiteUrl: manifest.application.websiteUrl,- termsUrl: manifest.application.termsUrl,- },- workspaceId,- );+ const applicationRegistrationId = await this.findApplicationRegistrationId(+ manifest.application.universalIdentifier,+ workspaceId,+ );++ await this.ensureApplicationExists({+ universalIdentifier: manifest.application.universalIdentifier,+ name: manifest.application.displayName,+ workspaceId,+ applicationRegistrationId,+ });const workspaceMigration =await this.applicationSyncService.synchronizeFromManifest({@@ -121,19 +114,6 @@ export class ApplicationDevelopmentResolver {};}- @Mutation(() => ApplicationDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)- async createOneApplication(- @Args('input') input: CreateApplicationInput,- @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ) {- return await this.applicationService.create({- ...input,- sourceType: AppRegistrationSourceType.LOCAL,- workspaceId,- });- }-@Mutation(() => FileDTO)@UseGuards(SettingsPermissionGuard(PermissionFlagType.UPLOAD_FILE))@RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)@@ -176,16 +156,8 @@ export class ApplicationDevelopmentResolver {});}- private async resolveApplicationRegistrationId(+ private async findApplicationRegistrationId(universalIdentifier: string,- metadata: {- name: string;- description?: string;- logoUrl?: string;- author?: string;- websiteUrl?: string;- termsUrl?: string;- },workspaceId: string,): Promise<string> {const existingRegistration =@@ -193,35 +165,27 @@ export class ApplicationDevelopmentResolver {universalIdentifier,);- if (existingRegistration) {- const isOwner =- await this.applicationRegistrationService.isOwnedByWorkspace(- existingRegistration.id,- workspaceId,- );-- if (!isOwner) {- throw new ApplicationException(- 'Cannot sync application: registration is owned by another workspace',- ApplicationExceptionCode.FORBIDDEN,- );- }-- return existingRegistration.id;+ if (!existingRegistration) {+ throw new ApplicationException(+ `No registration found for "${universalIdentifier}". Create one first with createApplicationRegistration.`,+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,+ );}- const { applicationRegistration: newRegistration } =- await this.applicationRegistrationService.create(- { ...metadata, universalIdentifier },+ const isOwner =+ await this.applicationRegistrationService.isOwnedByWorkspace(+ existingRegistration.id,workspaceId,- null,);- this.logger.log(- `Created app registration for ${metadata.name} (${universalIdentifier})`,- );+ if (!isOwner) {+ throw new ApplicationException(+ 'Cannot sync application: registration is owned by another workspace',+ ApplicationExceptionCode.FORBIDDEN,+ );+ }- return newRegistration.id;+ return existingRegistration.id;}private async syncRegistrationMetadata(@@ -259,4 +223,29 @@ export class ApplicationDevelopmentResolver {}}}++ private async ensureApplicationExists(params: {+ universalIdentifier: string;+ name: string;+ workspaceId: string;+ applicationRegistrationId: string;+ }): Promise<void> {+ const existing = await this.applicationService.findByUniversalIdentifier({+ universalIdentifier: params.universalIdentifier,+ workspaceId: params.workspaceId,+ });++ if (existing) {+ return;+ }++ await this.applicationService.create({+ universalIdentifier: params.universalIdentifier,+ name: params.name,+ sourcePath: params.universalIdentifier,+ sourceType: ApplicationRegistrationSourceType.LOCAL,+ applicationRegistrationId: params.applicationRegistrationId,+ workspaceId: params.workspaceId,+ });+ }}diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/application.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/dtos/application.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/dtos/application.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-development/dtos/application.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/create-application.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/dtos/create-application.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/dtos/create-application.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-development/dtos/create-application.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/generate-application-token.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/dtos/generate-application-token.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/dtos/generate-application-token.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-development/dtos/generate-application-token.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/uploadApplicationFileInput.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/dtos/upload-application-file.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/dtos/uploadApplicationFileInput.tsrename to packages/twenty-server/src/engine/core-modules/application/application-development/dtos/upload-application-file.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/workspace-migration.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/dtos/workspace-migration.dto.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/dtos/workspace-migration.dto.tsrename to packages/twenty-server/src/engine/core-modules/application/application-development/dtos/workspace-migration.dto.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.ts b/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.tsindex a70b239ff5a..841d70e8545 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.ts@@ -21,6 +21,7 @@ export class ApplicationExceptionFilter implements ExceptionFilter {case ApplicationExceptionCode.FIELD_NOT_FOUND:case ApplicationExceptionCode.ENTITY_NOT_FOUND:case ApplicationExceptionCode.APPLICATION_NOT_FOUND:+ case ApplicationExceptionCode.APP_NOT_INSTALLED:case ApplicationExceptionCode.LOGIC_FUNCTION_NOT_FOUND:case ApplicationExceptionCode.FRONT_COMPONENT_NOT_FOUND:throw new NotFoundError(exception);diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.tsindex 8f5dfa38321..f0a797e538f 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts@@ -4,66 +4,26 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';-import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';+import { ApplicationManifestModule } from 'src/engine/core-modules/application/application-manifest/application-manifest.module';+import { ApplicationPackageModule } from 'src/engine/core-modules/application/application-package/application-package.module';import { ApplicationInstallResolver } from 'src/engine/core-modules/application/application-install/application-install.resolver';-import { AppPackageFetcherService } from 'src/engine/core-modules/application/application-install/app-package-fetcher.service';import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';-import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-install/application-manifest-migration.service';-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';-import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';-import { ApplicationVariableEntityModule } from 'src/engine/core-modules/application/application-variable/application-variable.module';-import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';-import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';-import { ObjectPermissionModule } from 'src/engine/metadata-modules/object-permission/object-permission.module';-import { PermissionFlagModule } from 'src/engine/metadata-modules/permission-flag/permission-flag.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';-import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';-import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';-import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';-import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/code-step/code-step-build.module';@Module({imports: [- TypeOrmModule.forFeature([- FileEntity,- ApplicationRegistrationEntity,- ApplicationEntity,- ]),+ TypeOrmModule.forFeature([ApplicationRegistrationEntity]),ApplicationModule,+ ApplicationManifestModule,+ ApplicationPackageModule,CacheLockModule,FeatureFlagModule,- ApplicationVariableEntityModule,- TokenModule,- WorkspaceMigrationModule,PermissionsModule,- ObjectPermissionModule,- PermissionFlagModule,- WorkflowCommonModule,- CodeStepBuildModule,FileStorageModule,- WorkspaceCacheModule,- WorkspaceMigrationRunnerModule,- TwentyConfigModule,- ],- providers: [- ApplicationInstallResolver,- ApplicationManifestMigrationService,- ApplicationSyncService,- AppPackageFetcherService,- ApplicationInstallService,- AppUpgradeService,- WorkspaceMigrationGraphqlApiExceptionInterceptor,- ],- exports: [- ApplicationSyncService,- AppPackageFetcherService,- ApplicationInstallService,- AppUpgradeService,],+ providers: [ApplicationInstallResolver, ApplicationInstallService],+ exports: [ApplicationInstallService],})export class ApplicationInstallModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.tsindex a41d36fd340..f92a9ea5468 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts@@ -1,9 +1,4 @@-import {- UseFilters,- UseGuards,- UseInterceptors,- UsePipes,-} from '@nestjs/common';+import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';import { Args, Mutation, Query } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';@@ -12,18 +7,10 @@ import { FeatureFlagKey } from 'twenty-shared/types';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';-import {- ApplicationException,- ApplicationExceptionCode,-} from 'src/engine/core-modules/application/application.exception';import { ApplicationService } from 'src/engine/core-modules/application/application.service';-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';-import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';+import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';-import { InstallApplicationInput } from 'src/engine/core-modules/application/dtos/install-application.input';-import { UninstallApplicationInput } from 'src/engine/core-modules/application/dtos/uninstallApplicationInput';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';-import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';@@ -31,25 +18,17 @@ import {FeatureFlagGuard,RequireFeatureFlag,} from 'src/engine/guards/feature-flag.guard';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';-import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';@UsePipes(ResolverValidationPipe)@MetadataResolver()-@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)export class ApplicationInstallResolver {constructor(private readonly applicationService: ApplicationService,- private readonly applicationTokenService: ApplicationTokenService,- private readonly applicationSyncService: ApplicationSyncService,- private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,- private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly applicationInstallService: ApplicationInstallService,) {}@Query(() => [ApplicationDTO])@@ -78,84 +57,19 @@ export class ApplicationInstallResolver {});}- @Mutation(() => ApplicationTokenPairDTO)- @UseGuards(NoPermissionGuard)- @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)- async renewApplicationToken(- @Args('applicationRefreshToken') applicationRefreshToken: string,- @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<ApplicationTokenPairDTO> {- const applicationRefreshTokenPayload =- this.applicationTokenService.validateApplicationRefreshToken(- applicationRefreshToken,- );-- if (applicationRefreshTokenPayload.workspaceId !== workspaceId) {- throw new ApplicationException(- 'Refresh token workspace does not match authenticated workspace',- ApplicationExceptionCode.FORBIDDEN,- );- }-- return this.applicationTokenService.renewApplicationTokens(- applicationRefreshTokenPayload,- );- }-@Mutation(() => Boolean)@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))@RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)async installApplication(- @Args() { workspaceMigration: { actions } }: InstallApplicationInput,- @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ) {- const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(- workspaceId,- ['featureFlagsMap'],- );-- if (- featureFlagsMap[- FeatureFlagKey.IS_APPLICATION_INSTALLATION_FROM_TARBALL_ENABLED- ] !== true- ) {- throw new ApplicationException(- 'Application installation from tarball is not enabled',- ApplicationExceptionCode.FORBIDDEN,- );- }-- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- await this.workspaceMigrationRunnerService.run({- workspaceMigration: {- actions,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- workspaceId,- });-- return true;- }-- @Mutation(() => Boolean)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))- @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)- async uninstallApplication(- @Args() { universalIdentifier }: UninstallApplicationInput,+ @Args('appRegistrationId') appRegistrationId: string,+ @Args('version', { type: () => String, nullable: true })+ version: string | undefined,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ) {- await this.applicationSyncService.uninstallApplication({- applicationUniversalIdentifier: universalIdentifier,+ ): Promise<boolean> {+ return this.applicationInstallService.installApplication({+ appRegistrationId,+ version,workspaceId,});-- return true;}}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.tsindex c757f94a16a..da9c4a7f5b7 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts@@ -8,14 +8,19 @@ import { FileFolder } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { Repository } from 'typeorm';+import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';import {- AppPackageFetcherService,+ ApplicationPackageFetcherService,type ResolvedPackage,-} from 'src/engine/core-modules/application/application-install/app-package-fetcher.service';-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';+} from 'src/engine/core-modules/application/application-package/application-package-fetcher.service';+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/application-sync.service';import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';@@ -43,9 +48,8 @@ export class ApplicationInstallService {constructor(@InjectRepository(ApplicationRegistrationEntity)private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,- @InjectRepository(ApplicationEntity)- private readonly applicationRepository: Repository<ApplicationEntity>,- private readonly appPackageFetcherService: AppPackageFetcherService,+ private readonly applicationService: ApplicationService,+ private readonly applicationPackageFetcherService: ApplicationPackageFetcherService,private readonly applicationSyncService: ApplicationSyncService,private readonly fileStorageService: FileStorageService,private readonly cacheLockService: CacheLockService,@@ -56,11 +60,20 @@ export class ApplicationInstallService {version?: string;workspaceId: string;}): Promise<boolean> {- const appRegistration = await this.appRegistrationRepository.findOneOrFail({+ const appRegistration = await this.appRegistrationRepository.findOne({where: { id: params.appRegistrationId },});- if (appRegistration.sourceType === AppRegistrationSourceType.LOCAL) {+ if (!appRegistration) {+ throw new ApplicationException(+ `Application registration with id ${params.appRegistrationId} not found`,+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,+ );+ }++ if (+ appRegistration.sourceType === ApplicationRegistrationSourceType.LOCAL+ ) {this.logger.log(`Skipping install for LOCAL app ${appRegistration.universalIdentifier} (files synced by CLI watcher in dev mode)`,);@@ -88,18 +101,29 @@ export class ApplicationInstallService {let resolvedPackage: ResolvedPackage | null = null;try {- resolvedPackage = await this.appPackageFetcherService.resolvePackage(- appRegistration,- { targetVersion: params.version },- );+ resolvedPackage =+ await this.applicationPackageFetcherService.resolvePackage(+ appRegistration,+ { targetVersion: params.version },+ );if (!resolvedPackage) {return true;}+ const universalIdentifier = appRegistration.universalIdentifier;++ await this.ensureApplicationExists({+ universalIdentifier,+ name: resolvedPackage.manifest.application.displayName,+ workspaceId: params.workspaceId,+ applicationRegistrationId: appRegistration.id,+ sourceType: appRegistration.sourceType,+ });+await this.writeFilesToStorage(resolvedPackage.extractedDir,- appRegistration.universalIdentifier,+ universalIdentifier,params.workspaceId,);@@ -109,14 +133,8 @@ export class ApplicationInstallService {applicationRegistrationId: appRegistration.id,});- await this.updateApplicationSourceType(- appRegistration.universalIdentifier,- params.workspaceId,- appRegistration.sourceType,- );-this.logger.log(- `Successfully installed app ${appRegistration.universalIdentifier} v${resolvedPackage.packageJson.version ?? 'unknown'}`,+ `Successfully installed app ${universalIdentifier} v${resolvedPackage.packageJson.version ?? 'unknown'}`,);return true;@@ -128,7 +146,7 @@ export class ApplicationInstallService {throw error;} finally {if (resolvedPackage) {- await this.appPackageFetcherService.cleanupExtractedDir(+ await this.applicationPackageFetcherService.cleanupExtractedDir(resolvedPackage.cleanupDir,);}@@ -202,14 +220,29 @@ export class ApplicationInstallService {return result;}- private async updateApplicationSourceType(- universalIdentifier: string,- workspaceId: string,- sourceType: AppRegistrationSourceType,- ): Promise<void> {- await this.applicationRepository.update(- { universalIdentifier, workspaceId },- { sourceType },- );+ private async ensureApplicationExists(params: {+ universalIdentifier: string;+ name: string;+ workspaceId: string;+ applicationRegistrationId: string;+ sourceType: ApplicationRegistrationSourceType;+ }): Promise<ApplicationEntity> {+ const existing = await this.applicationService.findByUniversalIdentifier({+ universalIdentifier: params.universalIdentifier,+ workspaceId: params.workspaceId,+ });++ if (isDefined(existing)) {+ return existing;+ }++ return this.applicationService.create({+ universalIdentifier: params.universalIdentifier,+ name: params.name,+ sourcePath: params.universalIdentifier,+ sourceType: params.sourceType,+ applicationRegistrationId: params.applicationRegistrationId,+ workspaceId: params.workspaceId,+ });}}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/app-upgrade.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-upgrade.service.tssimilarity index 86%rename from packages/twenty-server/src/engine/core-modules/application/application-install/app-upgrade.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-install/application-upgrade.service.tsindex 53f7e0aacf6..325e285e0fe 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/app-upgrade.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-upgrade.service.ts@@ -5,14 +5,14 @@ import axios from 'axios';import { Repository } from 'typeorm';import { z } from 'zod';+import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import {ApplicationException,ApplicationExceptionCode,} from 'src/engine/core-modules/application/application.exception';-import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';const npmPackageMetadataSchema = z.object({@@ -20,8 +20,8 @@ const npmPackageMetadataSchema = z.object({});@Injectable()-export class AppUpgradeService {- private readonly logger = new Logger(AppUpgradeService.name);+export class ApplicationUpgradeService {+ private readonly logger = new Logger(ApplicationUpgradeService.name);constructor(@InjectRepository(ApplicationRegistrationEntity)@@ -35,7 +35,7 @@ export class AppUpgradeService {async checkForUpdates(appRegistration: ApplicationRegistrationEntity,): Promise<string | null> {- if (appRegistration.sourceType !== AppRegistrationSourceType.NPM) {+ if (appRegistration.sourceType !== ApplicationRegistrationSourceType.NPM) {return null;}@@ -82,7 +82,7 @@ export class AppUpgradeService {async checkAllForUpdates(): Promise<void> {const npmRegistrations = await this.appRegistrationRepository.find({- where: { sourceType: AppRegistrationSourceType.NPM },+ where: { sourceType: ApplicationRegistrationSourceType.NPM },});for (const registration of npmRegistrations) {@@ -100,8 +100,8 @@ export class AppUpgradeService {});if (- appRegistration.sourceType === AppRegistrationSourceType.LOCAL ||- appRegistration.sourceType === AppRegistrationSourceType.TARBALL+ appRegistration.sourceType === ApplicationRegistrationSourceType.LOCAL ||+ appRegistration.sourceType === ApplicationRegistrationSourceType.TARBALL) {throw new ApplicationException('Cannot upgrade an app installed from a tarball or local source',diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/crons/application-version-check.cron.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/crons/application-version-check.cron.job.tsnew file mode 100644index 00000000000..b84e12296b3--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/crons/application-version-check.cron.job.ts@@ -0,0 +1,37 @@+import { Injectable, Logger } from '@nestjs/common';++import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';+import { APPLICATION_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant';+import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';++@Injectable()+@Processor(MessageQueue.cronQueue)+export class ApplicationVersionCheckCronJob {+ private readonly logger = new Logger(ApplicationVersionCheckCronJob.name);++ constructor(+ private readonly applicationUpgradeService: ApplicationUpgradeService,+ ) {}++ @Process(ApplicationVersionCheckCronJob.name)+ @SentryCronMonitor(+ ApplicationVersionCheckCronJob.name,+ APPLICATION_VERSION_CHECK_CRON_PATTERN,+ )+ async handle(): Promise<void> {+ this.logger.log('Starting application version check...');++ try {+ await this.applicationUpgradeService.checkAllForUpdates();+ this.logger.log('Application version check completed successfully');+ } catch (error) {+ this.logger.error(+ `Application version check failed: ${error instanceof Error ? error.message : String(error)}`,+ );+ throw error;+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/crons/commands/application-version-check.cron.command.tssimilarity index 62%rename from packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command.tsrename to packages/twenty-server/src/engine/core-modules/application/application-install/crons/commands/application-version-check.cron.command.tsindex 1ceb4b21e8e..e64b9dd5b58 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/crons/commands/application-version-check.cron.command.ts@@ -1,7 +1,7 @@import { Command, CommandRunner } from 'nest-commander';-import { APP_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant';-import { AppVersionCheckCronJob } from 'src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job';+import { APPLICATION_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant';+import { ApplicationVersionCheckCronJob } from 'src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job';import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';@@ -11,7 +11,7 @@ import { MessageQueueService } from 'src/engine/core-modules/message-queue/servidescription:'Starts a cron job to check for app version updates on npm registries',})-export class AppVersionCheckCronCommand extends CommandRunner {+export class ApplicationVersionCheckCronCommand extends CommandRunner {constructor(@InjectMessageQueue(MessageQueue.cronQueue)private readonly messageQueueService: MessageQueueService,@@ -21,11 +21,11 @@ export class AppVersionCheckCronCommand extends CommandRunner {async run(): Promise<void> {await this.messageQueueService.addCron<undefined>({- jobName: AppVersionCheckCronJob.name,+ jobName: ApplicationVersionCheckCronJob.name,data: undefined,options: {repeat: {- pattern: APP_VERSION_CHECK_CRON_PATTERN,+ pattern: APPLICATION_VERSION_CHECK_CRON_PATTERN,},},});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/crons/constants/application-version-check-cron-pattern.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/crons/constants/application-version-check-cron-pattern.constant.tsnew file mode 100644index 00000000000..bf8fbebcaeb--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/crons/constants/application-version-check-cron-pattern.constant.ts@@ -0,0 +1,2 @@+// Every 6 hours+export const APPLICATION_VERSION_CHECK_CRON_PATTERN = '0 */6 * * *';diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-manifest-migration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.tssimilarity index 97%rename from packages/twenty-server/src/engine/core-modules/application/application-install/application-manifest-migration.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.tsindex da6d70702af..ccf689855e1 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-manifest-migration.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts@@ -10,9 +10,9 @@ import {} from 'src/engine/core-modules/application/application.exception';import { ApplicationService } from 'src/engine/core-modules/application/application.service';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';-import { buildFromToAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/utils/build-from-to-all-universal-flat-entity-maps.util';-import { computeApplicationManifestAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/utils/compute-application-manifest-all-universal-flat-entity-maps.util';-import { getApplicationSubAllFlatEntityMaps } from 'src/engine/core-modules/application/utils/get-application-sub-all-flat-entity-maps.util';+import { buildFromToAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/application-manifest/utils/build-from-to-all-universal-flat-entity-maps.util';+import { computeApplicationManifestAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/application-manifest/utils/compute-application-manifest-all-universal-flat-entity-maps.util';+import { getApplicationSubAllFlatEntityMaps } from 'src/engine/core-modules/application/application-manifest/utils/get-application-sub-all-flat-entity-maps.util';import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';import { FieldPermissionService } from 'src/engine/metadata-modules/object-permission/field-permission/field-permission.service';diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.module.tsnew file mode 100644index 00000000000..c70b229012d--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.module.ts@@ -0,0 +1,39 @@+import { Module } from '@nestjs/common';++import { ApplicationModule } from 'src/engine/core-modules/application/application.module';+import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-manifest/application-manifest-migration.service';+import { ApplicationManifestResolver } from 'src/engine/core-modules/application/application-manifest/application-manifest.resolver';+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/application-sync.service';+import { ApplicationVariableEntityModule } from 'src/engine/core-modules/application/application-variable/application-variable.module';+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';+import { ObjectPermissionModule } from 'src/engine/metadata-modules/object-permission/object-permission.module';+import { PermissionFlagModule } from 'src/engine/metadata-modules/permission-flag/permission-flag.module';+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';+import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';+import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';++@Module({+ imports: [+ ApplicationModule,+ ApplicationVariableEntityModule,+ FeatureFlagModule,+ FileStorageModule,+ ObjectPermissionModule,+ PermissionFlagModule,+ PermissionsModule,+ WorkspaceCacheModule,+ WorkspaceMigrationModule,+ WorkspaceMigrationRunnerModule,+ ],+ providers: [+ ApplicationManifestMigrationService,+ ApplicationManifestResolver,+ ApplicationSyncService,+ WorkspaceMigrationGraphqlApiExceptionInterceptor,+ ],+ exports: [ApplicationManifestMigrationService, ApplicationSyncService],+})+export class ApplicationManifestModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.resolver.tsnew file mode 100644index 00000000000..5667c4569c7--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.resolver.ts@@ -0,0 +1,105 @@+import {+ UseFilters,+ UseGuards,+ UseInterceptors,+ UsePipes,+} from '@nestjs/common';+import { Args, Mutation } from '@nestjs/graphql';++import { PermissionFlagType } from 'twenty-shared/constants';+import { FeatureFlagKey } from 'twenty-shared/types';++import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';+import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/application-sync.service';+import { RunWorkspaceMigrationInput } from 'src/engine/core-modules/application/application-manifest/dtos/run-workspace-migration.input';+import { UninstallApplicationInput } from 'src/engine/core-modules/application/application-manifest/dtos/uninstall-application.input';+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';+import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';+import {+ FeatureFlagGuard,+ RequireFeatureFlag,+} from 'src/engine/guards/feature-flag.guard';+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';++@UsePipes(ResolverValidationPipe)+@MetadataResolver()+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)+@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)+export class ApplicationManifestResolver {+ constructor(+ private readonly applicationService: ApplicationService,+ private readonly applicationSyncService: ApplicationSyncService,+ private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {}++ @Mutation(() => Boolean)+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ async runWorkspaceMigration(+ @Args() { workspaceMigration: { actions } }: RunWorkspaceMigrationInput,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ) {+ const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(+ workspaceId,+ ['featureFlagsMap'],+ );++ if (+ featureFlagsMap[+ FeatureFlagKey.IS_APPLICATION_INSTALLATION_FROM_TARBALL_ENABLED+ ] !== true+ ) {+ throw new ApplicationException(+ 'Application installation from tarball is not enabled',+ ApplicationExceptionCode.FORBIDDEN,+ );+ }++ const { workspaceCustomFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ {+ workspaceId,+ },+ );++ await this.workspaceMigrationRunnerService.run({+ workspaceMigration: {+ actions,+ applicationUniversalIdentifier:+ workspaceCustomFlatApplication.universalIdentifier,+ },+ workspaceId,+ });++ return true;+ }++ @Mutation(() => Boolean)+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ async uninstallApplication(+ @Args() { universalIdentifier }: UninstallApplicationInput,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ) {+ await this.applicationSyncService.uninstallApplication({+ applicationUniversalIdentifier: universalIdentifier,+ workspaceId,+ });++ return true;+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.tssimilarity index 86%rename from packages/twenty-server/src/engine/core-modules/application/application-install/application-sync.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.tsindex e64cd7aba01..c8c64c529fe 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-sync.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.ts@@ -11,12 +11,11 @@ import {ApplicationException,ApplicationExceptionCode,} from 'src/engine/core-modules/application/application.exception';-import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-install/application-manifest-migration.service';+import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-manifest/application-manifest-migration.service';import { ApplicationService } from 'src/engine/core-modules/application/application.service';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';-import { buildFromToAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/utils/build-from-to-all-universal-flat-entity-maps.util';-import { getApplicationSubAllFlatEntityMaps } from 'src/engine/core-modules/application/utils/get-application-sub-all-flat-entity-maps.util';-import { getDefaultApplicationPackageFields } from 'src/engine/core-modules/application/utils/get-default-application-package-fields.util';+import { buildFromToAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/application-manifest/utils/build-from-to-all-universal-flat-entity-maps.util';+import { getApplicationSubAllFlatEntityMaps } from 'src/engine/core-modules/application/application-manifest/utils/get-application-sub-all-flat-entity-maps.util';import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';import { createEmptyAllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-all-flat-entity-maps.constant';@@ -93,28 +92,18 @@ export class ApplicationSyncService {).toString('utf-8'),) as PackageJson;- const defaultPackageFields = await getDefaultApplicationPackageFields();-- let application = await this.applicationService.findByUniversalIdentifier({- universalIdentifier: manifest.application.universalIdentifier,- workspaceId,- });-- if (!application) {- application = await this.applicationService.create({+ const application = await this.applicationService.findByUniversalIdentifier(+ {universalIdentifier: manifest.application.universalIdentifier,- name,- description: manifest.application.description,- version: packageJson.version,- sourcePath: 'cli-sync',- defaultRoleId: null,workspaceId,- packageJsonChecksum: defaultPackageFields.packageJsonChecksum,- packageJsonFileId: null,- yarnLockChecksum: defaultPackageFields.yarnLockChecksum,- yarnLockFileId: null,- availablePackages: defaultPackageFields.availablePackages,- });+ },+ );++ if (!application) {+ throw new ApplicationException(+ `Application "${manifest.application.universalIdentifier}" is not installed in workspace "${workspaceId}". Install it first.`,+ ApplicationExceptionCode.APP_NOT_INSTALLED,+ );}await this.applicationVariableService.upsertManyApplicationVariableEntities(diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.spec.tssimilarity index 92%rename from packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.spec.tsindex 970078bc33c..27e0a19f959 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.spec.ts@@ -1,4 +1,4 @@-import { fromNavigationMenuItemManifestToUniversalFlatNavigationMenuItem } from 'src/engine/core-modules/application/utils/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util';+import { fromNavigationMenuItemManifestToUniversalFlatNavigationMenuItem } from 'src/engine/core-modules/application/application-manifest/converters/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util';describe('fromNavigationMenuItemManifestToUniversalFlatNavigationMenuItem', () => {const now = '2026-01-01T00:00:00.000Z';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-manifest-to-universal-flat-page-layout.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-manifest-to-universal-flat-page-layout.util.spec.tssimilarity index 93%rename from packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-manifest-to-universal-flat-page-layout.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-manifest-to-universal-flat-page-layout.util.spec.tsindex 858c97dcd3a..dfac4a02a43 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-manifest-to-universal-flat-page-layout.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-manifest-to-universal-flat-page-layout.util.spec.ts@@ -1,5 +1,5 @@import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum';-import { fromPageLayoutManifestToUniversalFlatPageLayout } from 'src/engine/core-modules/application/utils/from-page-layout-manifest-to-universal-flat-page-layout.util';+import { fromPageLayoutManifestToUniversalFlatPageLayout } from 'src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util';describe('fromPageLayoutManifestToUniversalFlatPageLayout', () => {const now = '2026-01-01T00:00:00.000Z';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.spec.tssimilarity index 92%rename from packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.spec.tsindex 1d7c84297ff..942c92532a5 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.spec.ts@@ -1,6 +1,6 @@import { PageLayoutTabLayoutMode } from 'twenty-shared/types';-import { fromPageLayoutTabManifestToUniversalFlatPageLayoutTab } from 'src/engine/core-modules/application/utils/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util';+import { fromPageLayoutTabManifestToUniversalFlatPageLayoutTab } from 'src/engine/core-modules/application/application-manifest/converters/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util';describe('fromPageLayoutTabManifestToUniversalFlatPageLayoutTab', () => {const now = '2026-01-01T00:00:00.000Z';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.spec.tssimilarity index 95%rename from packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.spec.tsindex 0b746ff67d0..548b5ab44d5 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.spec.ts@@ -1,5 +1,5 @@import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum';-import { fromPageLayoutWidgetManifestToUniversalFlatPageLayoutWidget } from 'src/engine/core-modules/application/utils/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util';+import { fromPageLayoutWidgetManifestToUniversalFlatPageLayoutWidget } from 'src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util';describe('fromPageLayoutWidgetManifestToUniversalFlatPageLayoutWidget', () => {const now = '2026-01-01T00:00:00.000Z';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-field-manifest-to-universal-flat-view-field.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-field-manifest-to-universal-flat-view-field.util.spec.tssimilarity index 93%rename from packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-field-manifest-to-universal-flat-view-field.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-field-manifest-to-universal-flat-view-field.util.spec.tsindex bdc33155153..9fb8739adb0 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-field-manifest-to-universal-flat-view-field.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-field-manifest-to-universal-flat-view-field.util.spec.ts@@ -1,6 +1,6 @@import { AggregateOperations } from 'twenty-shared/types';-import { fromViewFieldManifestToUniversalFlatViewField } from 'src/engine/core-modules/application/utils/from-view-field-manifest-to-universal-flat-view-field.util';+import { fromViewFieldManifestToUniversalFlatViewField } from 'src/engine/core-modules/application/application-manifest/converters/from-view-field-manifest-to-universal-flat-view-field.util';describe('fromViewFieldManifestToUniversalFlatViewField', () => {const now = '2026-01-01T00:00:00.000Z';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-filter-manifest-to-universal-flat-view-filter.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-filter-manifest-to-universal-flat-view-filter.util.spec.tssimilarity index 93%rename from packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-filter-manifest-to-universal-flat-view-filter.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-filter-manifest-to-universal-flat-view-filter.util.spec.tsindex 91a42ef8d5e..38003109771 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-filter-manifest-to-universal-flat-view-filter.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-filter-manifest-to-universal-flat-view-filter.util.spec.ts@@ -1,6 +1,6 @@import { ViewFilterOperand } from 'twenty-shared/types';-import { fromViewFilterManifestToUniversalFlatViewFilter } from 'src/engine/core-modules/application/utils/from-view-filter-manifest-to-universal-flat-view-filter.util';+import { fromViewFilterManifestToUniversalFlatViewFilter } from 'src/engine/core-modules/application/application-manifest/converters/from-view-filter-manifest-to-universal-flat-view-filter.util';describe('fromViewFilterManifestToUniversalFlatViewFilter', () => {const now = '2026-01-01T00:00:00.000Z';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-manifest-to-universal-flat-view.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-manifest-to-universal-flat-view.util.spec.tssimilarity index 95%rename from packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-manifest-to-universal-flat-view.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-manifest-to-universal-flat-view.util.spec.tsindex 193cbbe2c2c..2c5fec26549 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/from-view-manifest-to-universal-flat-view.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-manifest-to-universal-flat-view.util.spec.ts@@ -4,7 +4,7 @@ import {ViewVisibility,} from 'twenty-shared/types';-import { fromViewManifestToUniversalFlatView } from 'src/engine/core-modules/application/utils/from-view-manifest-to-universal-flat-view.util';+import { fromViewManifestToUniversalFlatView } from 'src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util';describe('fromViewManifestToUniversalFlatView', () => {const now = '2026-01-01T00:00:00.000Z';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-field-manifest-to-universal-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-field-manifest-to-universal-flat-field-metadata.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-field-manifest-to-universal-flat-field-metadata.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-field-manifest-to-universal-flat-field-metadata.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-front-component-manifest-to-universal-flat-front-component.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-front-component-manifest-to-universal-flat-front-component.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-front-component-manifest-to-universal-flat-front-component.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-front-component-manifest-to-universal-flat-front-component.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-logic-function-manifest-to-universal-flat-logic-function.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-logic-function-manifest-to-universal-flat-logic-function.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-logic-function-manifest-to-universal-flat-logic-function.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-logic-function-manifest-to-universal-flat-logic-function.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-object-manifest-to-universal-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-object-manifest-to-universal-flat-object-metadata.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-page-layout-manifest-to-universal-flat-page-layout.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-page-layout-manifest-to-universal-flat-page-layout.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-role-manifest-to-universal-flat-role.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-role-manifest-to-universal-flat-role.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-role-manifest-to-universal-flat-role.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-role-manifest-to-universal-flat-role.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-skill-manifest-to-universal-flat-skill.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-skill-manifest-to-universal-flat-skill.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-skill-manifest-to-universal-flat-skill.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-skill-manifest-to-universal-flat-skill.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-view-field-group-manifest-to-universal-flat-view-field-group.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-field-group-manifest-to-universal-flat-view-field-group.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-view-field-group-manifest-to-universal-flat-view-field-group.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-field-group-manifest-to-universal-flat-view-field-group.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-view-field-manifest-to-universal-flat-view-field.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-field-manifest-to-universal-flat-view-field.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-view-field-manifest-to-universal-flat-view-field.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-field-manifest-to-universal-flat-view-field.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-view-filter-group-manifest-to-universal-flat-view-filter-group.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-filter-group-manifest-to-universal-flat-view-filter-group.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-view-filter-group-manifest-to-universal-flat-view-filter-group.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-filter-group-manifest-to-universal-flat-view-filter-group.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-view-filter-manifest-to-universal-flat-view-filter.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-filter-manifest-to-universal-flat-view-filter.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-view-filter-manifest-to-universal-flat-view-filter.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-filter-manifest-to-universal-flat-view-filter.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-view-group-manifest-to-universal-flat-view-group.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-group-manifest-to-universal-flat-view-group.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-view-group-manifest-to-universal-flat-view-group.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-group-manifest-to-universal-flat-view-group.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/from-view-manifest-to-universal-flat-view.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/from-view-manifest-to-universal-flat-view.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/install-application.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/dtos/run-workspace-migration.input.tssimilarity index 97%rename from packages/twenty-server/src/engine/core-modules/application/dtos/install-application.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/dtos/run-workspace-migration.input.tsindex 7b51882416a..5d8bd305f05 100644--- a/packages/twenty-server/src/engine/core-modules/application/dtos/install-application.input.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/dtos/run-workspace-migration.input.ts@@ -46,7 +46,7 @@ export class WorkspaceMigrationInput {}@ArgsType()-export class InstallApplicationInput {+export class RunWorkspaceMigrationInput {@Field(() => WorkspaceMigrationInput)@ValidateNested()@Type(() => WorkspaceMigrationInput)diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/uninstallApplicationInput.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/dtos/uninstall-application.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/dtos/uninstallApplicationInput.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/dtos/uninstall-application.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/build-from-to-all-universal-flat-entity-maps.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-from-to-all-universal-flat-entity-maps.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/build-from-to-all-universal-flat-entity-maps.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-from-to-all-universal-flat-entity-maps.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/compute-application-manifest-all-universal-flat-entity-maps.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/compute-application-manifest-all-universal-flat-entity-maps.util.tssimilarity index 82%rename from packages/twenty-server/src/engine/core-modules/application/utils/compute-application-manifest-all-universal-flat-entity-maps.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/compute-application-manifest-all-universal-flat-entity-maps.util.tsindex 156ca659fe4..e3ecc4ec3bc 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/compute-application-manifest-all-universal-flat-entity-maps.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/compute-application-manifest-all-universal-flat-entity-maps.util.ts@@ -1,23 +1,23 @@import { type Manifest } from 'twenty-shared/application';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';-import { fromCommandMenuItemManifestToUniversalFlatCommandMenuItem } from 'src/engine/core-modules/application/utils/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util';-import { fromFieldManifestToUniversalFlatFieldMetadata } from 'src/engine/core-modules/application/utils/from-field-manifest-to-universal-flat-field-metadata.util';-import { fromFrontComponentManifestToUniversalFlatFrontComponent } from 'src/engine/core-modules/application/utils/from-front-component-manifest-to-universal-flat-front-component.util';-import { fromLogicFunctionManifestToUniversalFlatLogicFunction } from 'src/engine/core-modules/application/utils/from-logic-function-manifest-to-universal-flat-logic-function.util';-import { fromNavigationMenuItemManifestToUniversalFlatNavigationMenuItem } from 'src/engine/core-modules/application/utils/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util';-import { fromObjectManifestToUniversalFlatObjectMetadata } from 'src/engine/core-modules/application/utils/from-object-manifest-to-universal-flat-object-metadata.util';-import { fromPageLayoutManifestToUniversalFlatPageLayout } from 'src/engine/core-modules/application/utils/from-page-layout-manifest-to-universal-flat-page-layout.util';-import { fromPageLayoutTabManifestToUniversalFlatPageLayoutTab } from 'src/engine/core-modules/application/utils/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util';-import { fromPageLayoutWidgetManifestToUniversalFlatPageLayoutWidget } from 'src/engine/core-modules/application/utils/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util';-import { fromRoleManifestToUniversalFlatRole } from 'src/engine/core-modules/application/utils/from-role-manifest-to-universal-flat-role.util';-import { fromSkillManifestToUniversalFlatSkill } from 'src/engine/core-modules/application/utils/from-skill-manifest-to-universal-flat-skill.util';-import { fromViewFieldGroupManifestToUniversalFlatViewFieldGroup } from 'src/engine/core-modules/application/utils/from-view-field-group-manifest-to-universal-flat-view-field-group.util';-import { fromViewFieldManifestToUniversalFlatViewField } from 'src/engine/core-modules/application/utils/from-view-field-manifest-to-universal-flat-view-field.util';-import { fromViewFilterGroupManifestToUniversalFlatViewFilterGroup } from 'src/engine/core-modules/application/utils/from-view-filter-group-manifest-to-universal-flat-view-filter-group.util';-import { fromViewFilterManifestToUniversalFlatViewFilter } from 'src/engine/core-modules/application/utils/from-view-filter-manifest-to-universal-flat-view-filter.util';-import { fromViewGroupManifestToUniversalFlatViewGroup } from 'src/engine/core-modules/application/utils/from-view-group-manifest-to-universal-flat-view-group.util';-import { fromViewManifestToUniversalFlatView } from 'src/engine/core-modules/application/utils/from-view-manifest-to-universal-flat-view.util';+import { fromCommandMenuItemManifestToUniversalFlatCommandMenuItem } from 'src/engine/core-modules/application/application-manifest/converters/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util';+import { fromFieldManifestToUniversalFlatFieldMetadata } from 'src/engine/core-modules/application/application-manifest/converters/from-field-manifest-to-universal-flat-field-metadata.util';+import { fromFrontComponentManifestToUniversalFlatFrontComponent } from 'src/engine/core-modules/application/application-manifest/converters/from-front-component-manifest-to-universal-flat-front-component.util';+import { fromLogicFunctionManifestToUniversalFlatLogicFunction } from 'src/engine/core-modules/application/application-manifest/converters/from-logic-function-manifest-to-universal-flat-logic-function.util';+import { fromNavigationMenuItemManifestToUniversalFlatNavigationMenuItem } from 'src/engine/core-modules/application/application-manifest/converters/from-navigation-menu-item-manifest-to-universal-flat-navigation-menu-item.util';+import { fromObjectManifestToUniversalFlatObjectMetadata } from 'src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util';+import { fromPageLayoutManifestToUniversalFlatPageLayout } from 'src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util';+import { fromPageLayoutTabManifestToUniversalFlatPageLayoutTab } from 'src/engine/core-modules/application/application-manifest/converters/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util';+import { fromPageLayoutWidgetManifestToUniversalFlatPageLayoutWidget } from 'src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util';+import { fromRoleManifestToUniversalFlatRole } from 'src/engine/core-modules/application/application-manifest/converters/from-role-manifest-to-universal-flat-role.util';+import { fromSkillManifestToUniversalFlatSkill } from 'src/engine/core-modules/application/application-manifest/converters/from-skill-manifest-to-universal-flat-skill.util';+import { fromViewFieldGroupManifestToUniversalFlatViewFieldGroup } from 'src/engine/core-modules/application/application-manifest/converters/from-view-field-group-manifest-to-universal-flat-view-field-group.util';+import { fromViewFieldManifestToUniversalFlatViewField } from 'src/engine/core-modules/application/application-manifest/converters/from-view-field-manifest-to-universal-flat-view-field.util';+import { fromViewFilterGroupManifestToUniversalFlatViewFilterGroup } from 'src/engine/core-modules/application/application-manifest/converters/from-view-filter-group-manifest-to-universal-flat-view-filter-group.util';+import { fromViewFilterManifestToUniversalFlatViewFilter } from 'src/engine/core-modules/application/application-manifest/converters/from-view-filter-manifest-to-universal-flat-view-filter.util';+import { fromViewGroupManifestToUniversalFlatViewGroup } from 'src/engine/core-modules/application/application-manifest/converters/from-view-group-manifest-to-universal-flat-view-group.util';+import { fromViewManifestToUniversalFlatView } from 'src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util';import { createEmptyAllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-all-flat-entity-maps.constant';import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';import { addUniversalFlatEntityToUniversalFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/add-universal-flat-entity-to-universal-flat-entity-maps-through-mutation-or-throw.util';diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/get-application-sub-all-flat-entity-maps.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/get-application-sub-all-flat-entity-maps.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/get-application-sub-all-flat-entity-maps.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/get-application-sub-all-flat-entity-maps.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job.tsindex e990c53dc99..ba6ea83e3ba 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job.ts@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';import { MARKETPLACE_CATALOG_SYNC_CRON_PATTERN } from 'src/engine/core-modules/application/application-marketplace/crons/constants/marketplace-catalog-sync-cron-pattern.constant';-import { MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service';+import { MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service';import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto.tsindex 478aeb88ac2..4ae1794af5c 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto.ts@@ -2,6 +2,7 @@ import { Field, Int, ObjectType } from '@nestjs/graphql';import {IsArray,+ IsBoolean,IsNotEmpty,IsNumber,IsOptional,@@ -285,4 +286,8 @@ export class MarketplaceAppDTO {@IsString()@Field({ nullable: true })sourcePackage?: string;++ @IsBoolean()+ @Field(() => Boolean)+ isFeatured: boolean;}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.tsnew file mode 100644index 00000000000..2203e995188--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts@@ -0,0 +1,88 @@+import { Injectable, Logger } from '@nestjs/common';++import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { MARKETPLACE_CATALOG_INDEX } from 'src/engine/core-modules/application/application-marketplace/constants/marketplace-catalog-index.constant';+import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/marketplace.service';++@Injectable()+export class MarketplaceCatalogSyncService {+ private readonly logger = new Logger(MarketplaceCatalogSyncService.name);++ constructor(+ private readonly applicationRegistrationService: ApplicationRegistrationService,+ private readonly marketplaceService: MarketplaceService,+ ) {}++ async syncCatalog(): Promise<void> {+ await this.syncCuratedApps();+ await this.syncNpmApps();++ this.logger.log('Marketplace catalog sync completed');+ }++ private async syncCuratedApps(): Promise<void> {+ for (const entry of MARKETPLACE_CATALOG_INDEX) {+ try {+ await this.applicationRegistrationService.upsertFromCatalog({+ universalIdentifier: entry.universalIdentifier,+ name: entry.name,+ description:+ entry.richDisplayData.aboutDescription ?? entry.description,+ author: entry.author,+ sourceType: ApplicationRegistrationSourceType.NPM,+ sourcePackage: entry.sourcePackage,+ logoUrl: entry.logoUrl ?? null,+ websiteUrl: entry.websiteUrl ?? null,+ termsUrl: entry.termsUrl ?? null,+ latestAvailableVersion: entry.richDisplayData.version ?? null,+ isListed: true,+ isFeatured: entry.isFeatured,+ marketplaceDisplayData: entry.richDisplayData,+ ownerWorkspaceId: null,+ });+ } catch (error) {+ this.logger.error(+ `Failed to sync curated app "${entry.name}": ${error instanceof Error ? error.message : String(error)}`,+ );+ }+ }+ }++ private async syncNpmApps(): Promise<void> {+ const npmApps = await this.marketplaceService.fetchAppsFromNpmRegistry();++ const curatedIdentifiers = new Set(+ MARKETPLACE_CATALOG_INDEX.map((entry) => entry.universalIdentifier),+ );++ for (const app of npmApps) {+ if (curatedIdentifiers.has(app.id)) {+ continue;+ }++ try {+ await this.applicationRegistrationService.upsertFromCatalog({+ universalIdentifier: app.id,+ name: app.name,+ description: app.description,+ author: app.author,+ sourceType: ApplicationRegistrationSourceType.NPM,+ sourcePackage: app.sourcePackage ?? app.name,+ logoUrl: null,+ websiteUrl: app.websiteUrl ?? null,+ termsUrl: null,+ latestAvailableVersion: app.version ?? null,+ isListed: true,+ isFeatured: false,+ marketplaceDisplayData: null,+ ownerWorkspaceId: null,+ });+ } catch (error) {+ this.logger.error(+ `Failed to sync npm app "${app.name}": ${error instanceof Error ? error.message : String(error)}`,+ );+ }+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-query.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.tssimilarity index 61%rename from packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-query.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.tsindex 9a7dba2e9d4..329653409ad 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-query.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts@@ -1,17 +1,13 @@import { Injectable, Logger } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { isDefined } from 'twenty-shared/utils';-import { Repository } from 'typeorm';-import { v4 } from 'uuid';-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import {ApplicationRegistrationException,ApplicationRegistrationExceptionCode,} from 'src/engine/core-modules/application/application-registration/application-registration.exception';-import { assertValidNpmPackageName } from 'src/engine/core-modules/application/utils/assert-valid-npm-package-name.util';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';import { MarketplaceAppDTO } from 'src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto';import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';@@ -28,8 +24,7 @@ export class MarketplaceQueryService {private hasSyncBeenEnqueued = false;constructor(- @InjectRepository(ApplicationRegistrationEntity)- private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,+ private readonly applicationRegistrationService: ApplicationRegistrationService,@InjectMessageQueue(MessageQueue.cronQueue)private readonly messageQueueService: MessageQueueService,) {}@@ -39,9 +34,8 @@ export class MarketplaceQueryService {return this.cachedApps;}- const registrations = await this.appRegistrationRepository.find({- where: { sourceType: AppRegistrationSourceType.NPM },- });+ const registrations =+ await this.applicationRegistrationService.findManyListed();if (registrations.length === 0) {if (!this.hasSyncBeenEnqueued) {@@ -66,12 +60,22 @@ export class MarketplaceQueryService {return this.cachedApps;}+ async findOneMarketplaceApp(+ universalIdentifier: string,+ ): Promise<MarketplaceAppDTO> {+ const registration =+ await this.findRegistrationByUniversalIdentifier(universalIdentifier);++ return this.toMarketplaceAppDTO(registration);+ }+async findRegistrationByUniversalIdentifier(universalIdentifier: string,): Promise<ApplicationRegistrationEntity> {- const registration = await this.appRegistrationRepository.findOne({- where: { universalIdentifier },- });+ const registration =+ await this.applicationRegistrationService.findOneByUniversalIdentifier(+ universalIdentifier,+ );if (!isDefined(registration)) {throw new ApplicationRegistrationException(@@ -83,53 +87,6 @@ export class MarketplaceQueryService {return registration;}- async findOrCreateNpmRegistration(params: {- packageName: string;- ownerWorkspaceId: string;- }): Promise<ApplicationRegistrationEntity> {- assertValidNpmPackageName(params.packageName);-- const existing = await this.appRegistrationRepository.findOne({- where: { sourcePackage: params.packageName },- });-- if (isDefined(existing)) {- return existing;- }-- this.logger.log(- `Creating new registration for npm package "${params.packageName}"`,- );-- try {- const registration = this.appRegistrationRepository.create({- universalIdentifier: v4(),- name: params.packageName,- sourceType: AppRegistrationSourceType.NPM,- sourcePackage: params.packageName,- oAuthClientId: v4(),- oAuthRedirectUris: [],- oAuthScopes: [],- ownerWorkspaceId: params.ownerWorkspaceId,- });-- return await this.appRegistrationRepository.save(registration);- } catch {- const concurrentlyCreated = await this.appRegistrationRepository.findOne({- where: { sourcePackage: params.packageName },- });-- if (isDefined(concurrentlyCreated)) {- return concurrentlyCreated;- }-- throw new ApplicationRegistrationException(- `Failed to create registration for package "${params.packageName}"`,- ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND,- );- }- }-toMarketplaceAppDTO(registration: ApplicationRegistrationEntity,): MarketplaceAppDTO {@@ -157,6 +114,7 @@ export class MarketplaceQueryService {frontComponents: displayData?.frontComponents ?? [],sourcePackage: registration.sourcePackage ?? undefined,defaultRole: displayData?.defaultRole,+ isFeatured: registration.isFeatured,};}}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.tsindex a4aa1263711..3a8f409504d 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts@@ -1,21 +1,20 @@import { Module } from '@nestjs/common';-import { TypeOrmModule } from '@nestjs/typeorm';-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';-import { MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service';-import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-query.service';-import { MarketplaceResolver } from 'src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver';-import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace.service';+import { MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service';+import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/marketplace-query.service';+import { MarketplaceResolver } from 'src/engine/core-modules/application/application-marketplace/marketplace.resolver';+import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/marketplace.service';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@Module({imports: [- TypeOrmModule.forFeature([ApplicationRegistrationEntity]),+ ApplicationRegistrationModule,ApplicationInstallModule,FeatureFlagModule,PermissionsModule,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.resolver.tssimilarity index 57%rename from packages/twenty-server/src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver.tsrename to packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.resolver.tsindex 9d3d17f5b99..8433590c78a 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.resolver.ts@@ -6,15 +6,9 @@ import { FeatureFlagKey } from 'twenty-shared/types';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { ApplicationRegistrationExceptionFilter } from 'src/engine/core-modules/application/application-registration/application-registration-exception-filter';-import {- ApplicationRegistrationException,- ApplicationRegistrationExceptionCode,-} from 'src/engine/core-modules/application/application-registration/application-registration.exception';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';-import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';import { MarketplaceAppDTO } from 'src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto';-import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-query.service';+import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/marketplace-query.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import {@@ -38,7 +32,6 @@ export class MarketplaceResolver {constructor(private readonly marketplaceQueryService: MarketplaceQueryService,private readonly applicationInstallService: ApplicationInstallService,- private readonly appUpgradeService: AppUpgradeService,) {}@Query(() => [MarketplaceAppDTO])@@ -47,6 +40,16 @@ export class MarketplaceResolver {return this.marketplaceQueryService.findManyMarketplaceApps();}+ @Query(() => MarketplaceAppDTO)+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ async findOneMarketplaceApp(+ @Args('universalIdentifier') universalIdentifier: string,+ ): Promise<MarketplaceAppDTO> {+ return this.marketplaceQueryService.findOneMarketplaceApp(+ universalIdentifier,+ );+ }+@Mutation(() => Boolean)@UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))@RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)@@ -61,54 +64,10 @@ export class MarketplaceResolver {universalIdentifier,);- if (registration.sourceType !== AppRegistrationSourceType.NPM) {- throw new ApplicationRegistrationException(- `Only NPM apps can be installed via the marketplace`,- ApplicationRegistrationExceptionCode.SOURCE_CHANNEL_MISMATCH,- );- }-- return this.applicationInstallService.installApplication({- appRegistrationId: registration.id,- version,- workspaceId: workspace.id,- });- }-- @Mutation(() => Boolean)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))- @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)- async installNpmApp(- @Args('packageName') packageName: string,- @Args('version', { type: () => String, nullable: true })- version: string | undefined,- @AuthWorkspace() workspace: WorkspaceEntity,- ): Promise<boolean> {- const registration =- await this.marketplaceQueryService.findOrCreateNpmRegistration({- packageName,- ownerWorkspaceId: workspace.id,- });-return this.applicationInstallService.installApplication({appRegistrationId: registration.id,version,workspaceId: workspace.id,});}-- @Mutation(() => Boolean)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))- @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)- async upgradeApplication(- @Args('appRegistrationId') appRegistrationId: string,- @Args('targetVersion') targetVersion: string,- @AuthWorkspace() workspace: WorkspaceEntity,- ): Promise<boolean> {- return this.appUpgradeService.upgradeApplication({- appRegistrationId,- targetVersion,- workspaceId: workspace.id,- });- }}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.service.tssimilarity index 98%rename from packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.service.tsindex c61c87449b8..1e0544ce0fd 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.service.ts@@ -80,6 +80,7 @@ export class MarketplaceService {logicFunctions: [],frontComponents: [],sourcePackage: name,+ isFeatured: false,};}).filter(isDefined);diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service.tsdeleted file mode 100644index 0f840814134..00000000000--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service.ts+++ /dev/null@@ -1,171 +0,0 @@-import { Injectable, Logger } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';--import { isDefined } from 'twenty-shared/utils';-import { Repository } from 'typeorm';-import { v4 } from 'uuid';--import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';-import { MARKETPLACE_CATALOG_INDEX } from 'src/engine/core-modules/application/application-marketplace/constants/marketplace-catalog-index.constant';-import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace.service';-import { getAdminWorkspaceId } from 'src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util';--@Injectable()-export class MarketplaceCatalogSyncService {- private readonly logger = new Logger(MarketplaceCatalogSyncService.name);-- constructor(- @InjectRepository(ApplicationRegistrationEntity)- private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,- private readonly marketplaceService: MarketplaceService,- ) {}-- async syncCatalog(): Promise<void> {- const dataSource = this.appRegistrationRepository.manager.connection;- const adminWorkspaceId = await getAdminWorkspaceId(dataSource);-- if (!isDefined(adminWorkspaceId)) {- this.logger.warn(- 'No admin workspace found. Skipping marketplace catalog sync.',- );-- return;- }-- await this.syncCuratedApps(adminWorkspaceId);- await this.syncNpmApps(adminWorkspaceId);-- this.logger.log('Marketplace catalog sync completed');- }-- private async syncCuratedApps(ownerWorkspaceId: string): Promise<void> {- for (const entry of MARKETPLACE_CATALOG_INDEX) {- try {- await this.upsertRegistration({- universalIdentifier: entry.universalIdentifier,- name: entry.name,- description:- entry.richDisplayData.aboutDescription ?? entry.description,- author: entry.author,- sourceType: AppRegistrationSourceType.NPM,- sourcePackage: entry.sourcePackage,- logoUrl: entry.logoUrl ?? null,- websiteUrl: entry.websiteUrl ?? null,- termsUrl: entry.termsUrl ?? null,- latestAvailableVersion: entry.richDisplayData.version ?? null,- isFeatured: entry.isFeatured,- marketplaceDisplayData: entry.richDisplayData,- ownerWorkspaceId,- });- } catch (error) {- this.logger.error(- `Failed to sync curated app "${entry.name}": ${error instanceof Error ? error.message : String(error)}`,- );- }- }- }-- private async syncNpmApps(ownerWorkspaceId: string): Promise<void> {- const npmApps = await this.marketplaceService.fetchAppsFromNpmRegistry();-- const curatedIdentifiers = new Set(- MARKETPLACE_CATALOG_INDEX.map((entry) => entry.universalIdentifier),- );-- for (const app of npmApps) {- if (curatedIdentifiers.has(app.id)) {- continue;- }-- try {- await this.upsertRegistration({- universalIdentifier: app.id,- name: app.name,- description: app.description,- author: app.author,- sourceType: AppRegistrationSourceType.NPM,- sourcePackage: app.sourcePackage ?? app.name,- logoUrl: null,- websiteUrl: app.websiteUrl ?? null,- termsUrl: null,- latestAvailableVersion: app.version ?? null,- isFeatured: false,- marketplaceDisplayData: null,- ownerWorkspaceId,- });- } catch (error) {- this.logger.error(- `Failed to sync npm app "${app.name}": ${error instanceof Error ? error.message : String(error)}`,- );- }- }- }-- // Lookup by universalIdentifier only (matches the unique constraint).- // ownerWorkspaceId is only set on insert.- private async upsertRegistration(- params: Pick<- ApplicationRegistrationEntity,- | 'universalIdentifier'- | 'name'- | 'description'- | 'author'- | 'sourceType'- | 'sourcePackage'- | 'logoUrl'- | 'websiteUrl'- | 'termsUrl'- | 'latestAvailableVersion'- | 'isFeatured'- | 'marketplaceDisplayData'- | 'ownerWorkspaceId'- >,- ): Promise<void> {- const existing = await this.appRegistrationRepository.findOne({- where: {- universalIdentifier: params.universalIdentifier,- },- });-- if (isDefined(existing)) {- await this.appRegistrationRepository.save({- ...existing,- name: params.name,- description: params.description,- author: params.author,- sourceType: params.sourceType,- sourcePackage: params.sourcePackage,- logoUrl: params.logoUrl,- websiteUrl: params.websiteUrl,- termsUrl: params.termsUrl,- latestAvailableVersion: params.latestAvailableVersion,- isFeatured: params.isFeatured,- marketplaceDisplayData: params.marketplaceDisplayData,- });-- return;- }-- const registration = this.appRegistrationRepository.create({- universalIdentifier: params.universalIdentifier,- name: params.name,- description: params.description,- author: params.author,- sourceType: params.sourceType,- sourcePackage: params.sourcePackage,- logoUrl: params.logoUrl,- websiteUrl: params.websiteUrl,- termsUrl: params.termsUrl,- latestAvailableVersion: params.latestAvailableVersion,- isFeatured: params.isFeatured,- marketplaceDisplayData: params.marketplaceDisplayData,- oAuthClientId: v4(),- oAuthRedirectUris: [],- oAuthScopes: [],- ownerWorkspaceId: params.ownerWorkspaceId,- });-- await this.appRegistrationRepository.save(registration);- }-}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util.tsdeleted file mode 100644index ae6eabe7882..00000000000--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util.ts+++ /dev/null@@ -1,36 +0,0 @@-import { WorkspaceActivationStatus } from 'twenty-shared/workspace';-import { type DataSource } from 'typeorm';--// Every ApplicationRegistration must be owned by a workspace (ownerWorkspaceId-// represents ownership / write-access, not visibility scoping — marketplace-// registrations are readable by all workspaces). When the catalog sync creates-// registrations for marketplace apps that no developer has explicitly claimed,-// we assign them to the "admin" workspace: the oldest active workspace whose-// owner has admin privileges.-//-// TODO: This heuristic is fragile — on fresh instances with no admin users the-// catalog sync is silently skipped, and if the admin workspace is later deleted-// all marketplace registrations become orphaned. Consider introducing a-// dedicated "platform" workspace or making ownerWorkspaceId nullable instead.-export const getAdminWorkspaceId = async (- dataSource: DataSource,-): Promise<string | null> => {- const result = await dataSource.query<Array<{ workspaceId: string }>>(- `SELECT uw."workspaceId"- FROM core."userWorkspace" uw- JOIN core."user" u ON u.id = uw."userId" AND u."deletedAt" IS NULL- JOIN core."workspace" w ON w.id = uw."workspaceId" AND w."deletedAt" IS NULL- WHERE (u."canAccessFullAdminPanel" = true OR u."canImpersonate" = true)- AND w."activationStatus" = $1- AND uw."deletedAt" IS NULL- ORDER BY w."createdAt" ASC- LIMIT 1`,- [WorkspaceActivationStatus.ACTIVE],- );-- if (result.length === 0) {- return null;- }-- return result[0].workspaceId;-};diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/oauth-scopes.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/__tests__/oauth-scopes.spec.tssimilarity index 88%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/oauth-scopes.spec.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/__tests__/oauth-scopes.spec.tsindex 8a7d8de3913..64147701aef 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/oauth-scopes.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-oauth/__tests__/oauth-scopes.spec.ts@@ -2,7 +2,7 @@ import {ALL_OAUTH_SCOPES,OAUTH_SCOPE_DESCRIPTIONS,OAUTH_SCOPES,-} from 'src/engine/core-modules/application/application-registration/constants/oauth-scopes';+} from 'src/engine/core-modules/application/application-oauth/constants/oauth-scopes';describe('OAuth Scopes', () => {it('should have all scopes defined', () => {diff --git a/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.module.tsnew file mode 100644index 00000000000..2281fffef97--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.module.ts@@ -0,0 +1,42 @@+import { Module } from '@nestjs/common';+import { TypeOrmModule } from '@nestjs/typeorm';++import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { ApplicationModule as ApplicationCoreModule } from 'src/engine/core-modules/application/application.module';+import { ApplicationOAuthResolver } from 'src/engine/core-modules/application/application-oauth/application-oauth.resolver';+import { OAuthDiscoveryController } from 'src/engine/core-modules/application/application-oauth/controllers/oauth-discovery.controller';+import { OAuthTokenController } from 'src/engine/core-modules/application/application-oauth/controllers/oauth-token.controller';+import { OAuthService } from 'src/engine/core-modules/application/application-oauth/oauth.service';+import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';+import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';+import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';++@Module({+ imports: [+ TypeOrmModule.forFeature([+ AppTokenEntity,+ ApplicationEntity,+ UserWorkspaceEntity,+ ]),+ ApplicationRegistrationModule,+ ApplicationCoreModule,+ ApplicationInstallModule,+ TokenModule,+ FeatureFlagModule,+ PermissionsModule,+ ThrottlerModule,+ TwentyConfigModule,+ WorkspaceCacheStorageModule,+ ],+ controllers: [OAuthTokenController, OAuthDiscoveryController],+ providers: [OAuthService, ApplicationOAuthResolver],+ exports: [OAuthService],+})+export class ApplicationOAuthModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.resolver.tsnew file mode 100644index 00000000000..64af1b2d3f7--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.resolver.ts@@ -0,0 +1,56 @@+import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';+import { Args, Mutation } from '@nestjs/graphql';++import { FeatureFlagKey } from 'twenty-shared/types';++import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';+import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/application-oauth/dtos/application-token-pair.dto';+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';+import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';+import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';+import {+ FeatureFlagGuard,+ RequireFeatureFlag,+} from 'src/engine/guards/feature-flag.guard';+import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';++@UsePipes(ResolverValidationPipe)+@MetadataResolver()+@UseFilters(AuthGraphqlApiExceptionFilter)+@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)+export class ApplicationOAuthResolver {+ constructor(+ private readonly applicationTokenService: ApplicationTokenService,+ ) {}++ @Mutation(() => ApplicationTokenPairDTO)+ @UseGuards(NoPermissionGuard)+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ async renewApplicationToken(+ @Args('applicationRefreshToken') applicationRefreshToken: string,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ): Promise<ApplicationTokenPairDTO> {+ const applicationRefreshTokenPayload =+ this.applicationTokenService.validateApplicationRefreshToken(+ applicationRefreshToken,+ );++ if (applicationRefreshTokenPayload.workspaceId !== workspaceId) {+ throw new ApplicationException(+ 'Refresh token workspace does not match authenticated workspace',+ ApplicationExceptionCode.FORBIDDEN,+ );+ }++ return this.applicationTokenService.renewApplicationTokens(+ applicationRefreshTokenPayload,+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/constants/oauth-scopes.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/constants/oauth-scopes.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/constants/oauth-scopes.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/constants/oauth-scopes.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/controllers/oauth-discovery.controller.tssimilarity index 96%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/controllers/oauth-discovery.controller.tsindex e5855d1471b..d1a60d9e630 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-oauth/controllers/oauth-discovery.controller.ts@@ -1,6 +1,6 @@import { Controller, Get, UseGuards } from '@nestjs/common';-import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-registration/constants/oauth-scopes';+import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-oauth/constants/oauth-scopes';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-token.controller.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/controllers/oauth-token.controller.tssimilarity index 93%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-token.controller.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/controllers/oauth-token.controller.tsindex b175c9a2232..007669f0aa9 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-token.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-oauth/controllers/oauth-token.controller.ts@@ -13,12 +13,12 @@ import {import { type Request, type Response } from 'express';-import { OAuthIntrospectInput } from 'src/engine/core-modules/application/application-registration/dtos/oauth-introspect.input';-import { OAuthRevokeInput } from 'src/engine/core-modules/application/application-registration/dtos/oauth-revoke.input';-import { OAuthTokenInput } from 'src/engine/core-modules/application/application-registration/dtos/oauth-token.input';-import { OAuthService } from 'src/engine/core-modules/application/application-registration/oauth.service';-import { OAuthErrorResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-error-response.type';-import { OAuthTokenResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-token-response.type';+import { OAuthIntrospectInput } from 'src/engine/core-modules/application/application-oauth/dtos/oauth-introspect.input';+import { OAuthRevokeInput } from 'src/engine/core-modules/application/application-oauth/dtos/oauth-revoke.input';+import { OAuthTokenInput } from 'src/engine/core-modules/application/application-oauth/dtos/oauth-token.input';+import { OAuthService } from 'src/engine/core-modules/application/application-oauth/oauth.service';+import { OAuthErrorResponse } from 'src/engine/core-modules/application/application-oauth/types/oauth-error-response.type';+import { OAuthTokenResponse } from 'src/engine/core-modules/application/application-oauth/types/oauth-token-response.type';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';import { ThrottlerException } from 'src/engine/core-modules/throttler/throttler.exception';import { ThrottlerService } from 'src/engine/core-modules/throttler/throttler.service';diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/application-token-pair.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/application-token-pair.dto.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/dtos/application-token-pair.dto.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/application-token-pair.dto.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-introspect.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/oauth-introspect.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-introspect.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/oauth-introspect.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-revoke.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/oauth-revoke.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-revoke.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/oauth-revoke.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-token.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/oauth-token.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-token.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/dtos/oauth-token.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/oauth.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/oauth.service.tssimilarity index 96%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/oauth.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/oauth.service.tsindex f08f307baf1..56cbeda98f6 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/oauth.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-oauth/oauth.service.ts@@ -11,14 +11,13 @@ import {AppTokenEntity,AppTokenType,} from 'src/engine/core-modules/app-token/app-token.entity';+import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';-import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';import { ApplicationService } from 'src/engine/core-modules/application/application.service';-import { OAuthErrorResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-error-response.type';-import { OAuthTokenResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-token-response.type';+import { OAuthErrorResponse } from 'src/engine/core-modules/application/application-oauth/types/oauth-error-response.type';+import { OAuthTokenResponse } from 'src/engine/core-modules/application/application-oauth/types/oauth-token-response.type';import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';@@ -557,14 +556,7 @@ export class OAuthService {return existingApplication;}- this.logger.log(- `Auto-installing application "${applicationRegistration.name}" in workspace ${workspaceId}`,- );-- if (- applicationRegistration.sourceType === AppRegistrationSourceType.NPM ||- applicationRegistration.sourceType === AppRegistrationSourceType.TARBALL- ) {+ try {await this.applicationInstallService.installApplication({appRegistrationId: applicationRegistration.id,workspaceId,@@ -584,6 +576,11 @@ export class OAuthService {this.logger.warn(`Install succeeded but application not found in workspace, falling back to bare creation`,);+ } catch (error) {+ this.logger.warn(+ `Auto-install failed for ${applicationRegistration.name}, falling back to bare creation`,+ error,+ );}return this.applicationService.create({diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-error-response.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/types/oauth-error-response.type.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-error-response.type.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/types/oauth-error-response.type.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-token-response.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/types/oauth-token-response.type.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-token-response.type.tsrename to packages/twenty-server/src/engine/core-modules/application/application-oauth/types/oauth-token-response.type.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/app-package-fetcher.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.tssimilarity index 66%rename from packages/twenty-server/src/engine/core-modules/application/application-install/app-package-fetcher.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.tsindex 6fe9ab331ed..21e9bfb5033 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/app-package-fetcher.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.ts@@ -1,4 +1,5 @@import { Injectable, Logger, type OnModuleInit } from '@nestjs/common';+import { InjectRepository } from '@nestjs/typeorm';import { execFile } from 'child_process';import { promises as fs } from 'fs';@@ -7,21 +8,27 @@ import { join } from 'path';import { promisify } from 'util';import { type Manifest } from 'twenty-shared/application';+import { FileFolder } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';import { type PackageJson } from 'type-fest';+import { Repository } from 'typeorm';import { v4 } from 'uuid';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import {ApplicationException,ApplicationExceptionCode,} from 'src/engine/core-modules/application/application.exception';-import { YARN_ENGINE_DIRNAME } from 'src/engine/core-modules/application/constants/yarn-engine-dirname';-import { assertValidNpmPackageName } from 'src/engine/core-modules/application/utils/assert-valid-npm-package-name.util';-import { extractTarballSecurely } from 'src/engine/core-modules/application/utils/extract-tarball-securely.util';-import { readJsonFileOrThrow } from 'src/engine/core-modules/application/utils/read-json-file.util';-import { resolvePackageContentDir } from 'src/engine/core-modules/application/utils/tarball-utils';-import { FileStorageDriverFactory } from 'src/engine/core-modules/file-storage/file-storage-driver.factory';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { YARN_ENGINE_DIRNAME } from 'src/engine/core-modules/application/application-package/constants/yarn-engine-dirname';+import { assertValidNpmPackageName } from 'src/engine/core-modules/application/application-package/utils/assert-valid-npm-package-name.util';+import { extractTarballSecurely } from 'src/engine/core-modules/application/application-package/utils/extract-tarball-securely.util';+import { readJsonFileOrThrow } from 'src/engine/core-modules/application/application-package/utils/read-json-file.util';+import { resolvePackageContentDir } from 'src/engine/core-modules/application/application-package/utils/tarball-utils';+import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';+import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';+import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { streamToBuffer } from 'src/utils/stream-to-buffer';@@ -38,12 +45,16 @@ export type ResolvedPackage = {};@Injectable()-export class AppPackageFetcherService implements OnModuleInit {- private readonly logger = new Logger(AppPackageFetcherService.name);+export class ApplicationPackageFetcherService implements OnModuleInit {+ private readonly logger = new Logger(ApplicationPackageFetcherService.name);constructor(private readonly twentyConfigService: TwentyConfigService,- private readonly fileStorageDriverFactory: FileStorageDriverFactory,+ private readonly fileStorageService: FileStorageService,+ @InjectRepository(FileEntity)+ private readonly fileRepository: Repository<FileEntity>,+ @InjectRepository(ApplicationEntity)+ private readonly applicationRepository: Repository<ApplicationEntity>,) {}async onModuleInit(): Promise<void> {@@ -54,16 +65,33 @@ export class AppPackageFetcherService implements OnModuleInit {}}+ async resolveNpmPackage(+ packageName: string,+ targetVersion?: string,+ ): Promise<ResolvedPackage> {+ return this.resolveFromNpm(packageName, targetVersion);+ }+async resolvePackage(appRegistration: ApplicationRegistrationEntity,options?: { targetVersion?: string },): Promise<ResolvedPackage | null> {switch (appRegistration.sourceType) {- case AppRegistrationSourceType.NPM:- return this.resolveFromNpm(appRegistration, options?.targetVersion);- case AppRegistrationSourceType.TARBALL:+ case ApplicationRegistrationSourceType.NPM:+ if (!appRegistration.sourcePackage) {+ throw new ApplicationException(+ `App registration ${appRegistration.id} has sourceType=npm but no sourcePackage`,+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,+ );+ }++ return this.resolveFromNpm(+ appRegistration.sourcePackage,+ options?.targetVersion,+ );+ case ApplicationRegistrationSourceType.TARBALL:return this.resolveFromTarball(appRegistration);- case AppRegistrationSourceType.LOCAL:+ case ApplicationRegistrationSourceType.LOCAL:return null;}}@@ -77,7 +105,7 @@ export class AppPackageFetcherService implements OnModuleInit {}private async resolveFromNpm(- appRegistration: ApplicationRegistrationEntity,+ packageName: string,targetVersion?: string,): Promise<ResolvedPackage> {const workDir = join(APP_FETCHER_TMPDIR, v4());@@ -89,30 +117,21 @@ export class AppPackageFetcherService implements OnModuleInit {const authToken = this.twentyConfigService.get('APP_REGISTRY_TOKEN');- if (!appRegistration.sourcePackage) {- throw new ApplicationException(- `App registration ${appRegistration.id} has sourceType=npm but no sourcePackage`,- ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,- );- }-- const sourcePackage = appRegistration.sourcePackage;-- assertValidNpmPackageName(sourcePackage);+ assertValidNpmPackageName(packageName);const versionSpec = targetVersion ?? 'latest';await this.writeNpmrc({workDir,- packageName: sourcePackage,+ packageName,registryUrl,authToken,});await this.setupYarnEngine(workDir);- await this.writeMinimalPackageJson(workDir, sourcePackage, versionSpec);+ await this.writeMinimalPackageJson(workDir, packageName, versionSpec);await this.runYarnInstall(workDir);- const packageDir = join(workDir, 'node_modules', sourcePackage);+ const packageDir = join(workDir, 'node_modules', packageName);const manifest = await readJsonFileOrThrow<Manifest>(packageDir,'manifest.json',@@ -131,7 +150,7 @@ export class AppPackageFetcherService implements OnModuleInit {} catch (error) {await this.cleanupExtractedDir(workDir);throw new ApplicationException(- `Failed to resolve npm package ${appRegistration.sourcePackage}: ${error}`,+ `Failed to resolve npm package ${packageName}: ${error}`,ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,);}@@ -140,16 +159,33 @@ export class AppPackageFetcherService implements OnModuleInit {private async resolveFromTarball(appRegistration: ApplicationRegistrationEntity,): Promise<ResolvedPackage> {+ if (!isDefined(appRegistration.tarballFileId)) {+ throw new ApplicationException(+ `App registration ${appRegistration.id} has sourceType=tarball but no tarball file`,+ ApplicationExceptionCode.TARBALL_EXTRACTION_FAILED,+ );+ }+const workDir = join(APP_FETCHER_TMPDIR, v4());await fs.mkdir(workDir, { recursive: true });try {- const storagePath = join('app-tarball', appRegistration.id, 'app.tar.gz');- const driver = this.fileStorageDriverFactory.getCurrentDriver();- const tarballStream = await driver.readFile({- filePath: storagePath,+ const file = await this.fileRepository.findOneOrFail({+ where: { id: appRegistration.tarballFileId },});++ const application = await this.applicationRepository.findOneOrFail({+ where: { id: file.applicationId },+ });++ const tarballStream = await this.fileStorageService.readFile({+ workspaceId: file.workspaceId,+ applicationUniversalIdentifier: application.universalIdentifier,+ fileFolder: FileFolder.AppTarball,+ resourcePath: removeFileFolderFromFileEntityPath(file.path),+ });+const tarballBuffer = await streamToBuffer(tarballStream);const tarballPath = join(workDir, 'app.tar.gz');@@ -273,11 +309,19 @@ export class AppPackageFetcherService implements OnModuleInit {},);} catch (error: unknown) {- const errorMessage =- error instanceof Error ? error.message : String(error);+ const stderr =+ isDefined(error) &&+ typeof error === 'object' &&+ 'stderr' in error &&+ typeof (error as { stderr: unknown }).stderr === 'string'+ ? (error as { stderr: string }).stderr+ : undefined;++ const message =+ stderr ?? (error instanceof Error ? error.message : String(error));throw new ApplicationException(- `yarn install failed: ${errorMessage}`,+ `yarn install failed: ${message}`,ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,);}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/application-package.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package.module.tsnew file mode 100644index 00000000000..2f7c6239fb8--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package.module.ts@@ -0,0 +1,19 @@+import { Module } from '@nestjs/common';+import { TypeOrmModule } from '@nestjs/typeorm';++import { ApplicationPackageFetcherService } from 'src/engine/core-modules/application/application-package/application-package-fetcher.service';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';+import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';++@Module({+ imports: [+ FileStorageModule,+ TwentyConfigModule,+ TypeOrmModule.forFeature([FileEntity, ApplicationEntity]),+ ],+ providers: [ApplicationPackageFetcherService],+ exports: [ApplicationPackageFetcherService],+})+export class ApplicationPackageModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/constants/seed-dependencies-dirname.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname.tssimilarity index 68%rename from packages/twenty-server/src/engine/core-modules/application/constants/seed-dependencies-dirname.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname.tsindex 8311c7a796f..d0ff9f29830 100644--- a/packages/twenty-server/src/engine/core-modules/application/constants/seed-dependencies-dirname.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname.ts@@ -6,6 +6,6 @@ export const SEED_DEPENDENCIES_DIRNAME = path.resolve(__dirname,path.join(ASSET_PATH,- 'engine/core-modules/application/constants/seed-dependencies',+ 'engine/core-modules/application/application-package/constants/seed-dependencies',),);diff --git a/packages/twenty-server/src/engine/core-modules/application/constants/seed-dependencies/package.json b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/package.jsonsimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/constants/seed-dependencies/package.jsonrename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/package.jsondiff --git a/packages/twenty-server/src/engine/core-modules/application/constants/seed-dependencies/yarn.lock b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/yarn.locksimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/constants/seed-dependencies/yarn.lockrename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/yarn.lockdiff --git a/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine-dirname.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/yarn-engine-dirname.tssimilarity index 69%rename from packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine-dirname.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/yarn-engine-dirname.tsindex 61da3c1b916..adb769755e4 100644--- a/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine-dirname.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/yarn-engine-dirname.ts@@ -6,6 +6,6 @@ export const YARN_ENGINE_DIRNAME = path.resolve(__dirname,path.join(ASSET_PATH,- 'engine/core-modules/application/constants/yarn-engine',+ 'engine/core-modules/application/application-package/constants/yarn-engine',),);diff --git a/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarn/releases/yarn-4.9.2.cjs b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/yarn-engine/.yarn/releases/yarn-4.9.2.cjssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarn/releases/yarn-4.9.2.cjsrename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/yarn-engine/.yarn/releases/yarn-4.9.2.cjsdiff --git a/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarnrc.yml b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/yarn-engine/.yarnrc.ymlsimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarnrc.ymlrename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/yarn-engine/.yarnrc.ymldiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/assert-valid-npm-package-name.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/assert-valid-npm-package-name.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/assert-valid-npm-package-name.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/utils/assert-valid-npm-package-name.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/copy-yarn-engine-and-build-dependencies.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/copy-yarn-engine-and-build-dependencies.tssimilarity index 96%rename from packages/twenty-server/src/engine/core-modules/application/utils/copy-yarn-engine-and-build-dependencies.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/utils/copy-yarn-engine-and-build-dependencies.tsindex 0a45dc882f5..115f4109f44 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/copy-yarn-engine-and-build-dependencies.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/copy-yarn-engine-and-build-dependencies.ts@@ -3,7 +3,7 @@ import { promises as fs, statSync } from 'fs';import { join } from 'path';import { promisify } from 'util';-import { YARN_ENGINE_DIRNAME } from 'src/engine/core-modules/application/constants/yarn-engine-dirname';+import { YARN_ENGINE_DIRNAME } from 'src/engine/core-modules/application/application-package/constants/yarn-engine-dirname';const execFilePromise = promisify(execFile);diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/extract-tarball-securely.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/extract-tarball-securely.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/extract-tarball-securely.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/utils/extract-tarball-securely.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/get-default-application-package-fields.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util.tssimilarity index 87%rename from packages/twenty-server/src/engine/core-modules/application/utils/get-default-application-package-fields.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util.tsindex 04f215fa3d9..96e67762ef6 100644--- a/packages/twenty-server/src/engine/core-modules/application/utils/get-default-application-package-fields.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util.ts@@ -1,8 +1,8 @@import { readFile } from 'fs/promises';import path from 'path';-import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util';-import { SEED_DEPENDENCIES_DIRNAME } from 'src/engine/core-modules/application/constants/seed-dependencies-dirname';+import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util';+import { SEED_DEPENDENCIES_DIRNAME } from 'src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname';// To regenerate: use logicFunctionCreateHash from logic-function-create-hash.utils.// package.json: hash(JSON.stringify(JSON.parse(content))). yarn.lock: hash(content).diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/read-json-file.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/read-json-file.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/read-json-file.util.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/utils/read-json-file.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/utils/tarball-utils.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/tarball-utils.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/utils/tarball-utils.tsrename to packages/twenty-server/src/engine/core-modules/application/application-package/utils/tarball-utils.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.entity.tsrename to packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.module.tsnew file mode 100644index 00000000000..04e15401590--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.module.ts@@ -0,0 +1,20 @@+import { Module } from '@nestjs/common';+import { TypeOrmModule } from '@nestjs/typeorm';++import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';++@Module({+ imports: [+ TypeOrmModule.forFeature([+ ApplicationRegistrationVariableEntity,+ ApplicationRegistrationEntity,+ ]),+ SecretEncryptionModule,+ ],+ providers: [ApplicationRegistrationVariableService],+ exports: [ApplicationRegistrationVariableService],+})+export class ApplicationRegistrationVariableModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.tssimilarity index 94%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.tsindex 5eaaa4526ef..d79e2e844d5 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts@@ -5,14 +5,14 @@ import { type ServerVariables } from 'twenty-shared/application';import { isDefined } from 'twenty-shared/utils';import { In, Not, type Repository } from 'typeorm';-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import {ApplicationRegistrationException,ApplicationRegistrationExceptionCode,} from 'src/engine/core-modules/application/application-registration/application-registration.exception';-import { type CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input';-import { type UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input';+import { type CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input';+import { type UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/update-application-registration-variable.input';import { SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';@Injectable()diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/update-application-registration-variable.input.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input.tsrename to packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/update-application-registration-variable.input.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.tsindex f438b980138..a16388ffcd9 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts@@ -18,10 +18,10 @@ import {} from 'typeorm';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';-import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { type MarketplaceDisplayData } from 'src/engine/core-modules/application/application-marketplace/types/marketplace-display-data.type';+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { UserEntity } from 'src/engine/core-modules/user/user.entity';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -96,22 +96,22 @@ export class ApplicationRegistrationEntity {@JoinColumn({ name: 'createdByUserId' })createdByUser: Relation<UserEntity> | null;- // Represents ownership (who can edit), not visibility scoping.- // Marketplace registrations are readable by all workspaces but owned by the- // admin workspace when no developer has explicitly claimed them.- @Column({ name: 'workspaceId', nullable: false, type: 'uuid' })- ownerWorkspaceId: string;+ // Ownership (who can edit). Null for catalog-synced marketplace apps that+ // have no explicit owner — these are managed via the Admin Panel.+ @Field(() => UUIDScalarType, { nullable: true })+ @Column({ name: 'workspaceId', nullable: true, type: 'uuid' })+ ownerWorkspaceId: string | null;- @ManyToOne(() => WorkspaceEntity, { onDelete: 'CASCADE' })+ @ManyToOne(() => WorkspaceEntity, { onDelete: 'SET NULL', nullable: true })@JoinColumn({ name: 'workspaceId' })- workspace: Relation<WorkspaceEntity>;+ workspace: Relation<WorkspaceEntity> | null;- @Field(() => AppRegistrationSourceType)+ @Field(() => ApplicationRegistrationSourceType)@Column({type: 'text',- default: AppRegistrationSourceType.LOCAL,+ default: ApplicationRegistrationSourceType.LOCAL,})- sourceType: AppRegistrationSourceType;+ sourceType: ApplicationRegistrationSourceType;@Field(() => String, { nullable: true })@Column({ nullable: true, type: 'text' })@@ -136,6 +136,10 @@ export class ApplicationRegistrationEntity {@Column({ nullable: true, type: 'text' })termsUrl: string | null;+ @Field(() => Boolean)+ @Column({ type: 'boolean', default: false })+ isListed: boolean;+@Field(() => Boolean)@Column({ name: 'isFeatured', type: 'boolean', default: false })isFeatured: boolean;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.tsindex 9fd867815bb..224c64672ca 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts@@ -1,25 +1,18 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { ApplicationRegistrationResolver } from 'src/engine/core-modules/application/application-registration/application-registration.resolver';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';-import { OAuthDiscoveryController } from 'src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller';-import { OAuthTokenController } from 'src/engine/core-modules/application/application-registration/controllers/oauth-token.controller';-import { OAuthService } from 'src/engine/core-modules/application/application-registration/oauth.service';-import { AppTarballUploadService } from 'src/engine/core-modules/application/application-registration/services/app-tarball-upload.service';-import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';+import { ApplicationRegistrationVariableModule } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.module';+import { ApplicationTarballService } from 'src/engine/core-modules/application/application-registration/application-tarball.service';+import { ApplicationPackageModule } from 'src/engine/core-modules/application/application-package/application-package.module';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';-import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';-import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';-import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';-import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { FileUrlModule } from 'src/engine/core-modules/file/file-url/file-url.module';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';@@ -27,32 +20,26 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/imports: [TypeOrmModule.forFeature([ApplicationRegistrationEntity,- ApplicationRegistrationVariableEntity,ApplicationEntity,- AppTokenEntity,- UserWorkspaceEntity,+ WorkspaceEntity,]),- SecretEncryptionModule,+ ApplicationRegistrationVariableModule,+ ApplicationPackageModule,+ ApplicationModule,FeatureFlagModule,PermissionsModule,- ThrottlerModule,- TokenModule,- ApplicationModule,- ApplicationInstallModule,FileStorageModule,+ FileUrlModule,WorkspaceCacheStorageModule,],- controllers: [OAuthTokenController, OAuthDiscoveryController],providers: [ApplicationRegistrationService,- ApplicationRegistrationVariableService,ApplicationRegistrationResolver,- AppTarballUploadService,- OAuthService,+ ApplicationTarballService,],exports: [ApplicationRegistrationService,- ApplicationRegistrationVariableService,+ ApplicationRegistrationVariableModule,],})export class ApplicationRegistrationModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.tsindex 590a249225f..f034f0cd4af 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts@@ -3,37 +3,42 @@ import { Args, Mutation, Query } from '@nestjs/graphql';import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';import { PermissionFlagType } from 'twenty-shared/constants';-import { FeatureFlagKey } from 'twenty-shared/types';+import { FeatureFlagKey, FileFolder } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';import type { FileUpload } from 'graphql-upload/processRequest.mjs';+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';+import { CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input';+import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/update-application-registration-variable.input';+import { ApplicationPackageFetcherService } from 'src/engine/core-modules/application/application-package/application-package-fetcher.service';import { ApplicationRegistrationExceptionFilter } from 'src/engine/core-modules/application/application-registration/application-registration-exception-filter';-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import {+ ApplicationRegistrationException,+ ApplicationRegistrationExceptionCode,+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import {- AppTarballUploadService,+ ApplicationTarballService,MAX_TARBALL_UPLOAD_SIZE_BYTES,-} from 'src/engine/core-modules/application/application-registration/services/app-tarball-upload.service';+} from 'src/engine/core-modules/application/application-registration/application-tarball.service';import { ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';-import { CreateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.input';import { CreateApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.dto';+import { CreateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.input';import { PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto';-import { CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input';import { RotateClientSecretDTO } from 'src/engine/core-modules/application/application-registration/dtos/rotate-client-secret.dto';+import { TransferApplicationRegistrationOwnershipInput } from 'src/engine/core-modules/application/application-registration/dtos/transfer-application-registration-ownership.input';import { UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';-import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input';-import {- ApplicationRegistrationException,- ApplicationRegistrationExceptionCode,-} from 'src/engine/core-modules/application/application-registration/application-registration.exception';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { UserEntity } from 'src/engine/core-modules/user/user.entity';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import {@@ -57,7 +62,9 @@ export class ApplicationRegistrationResolver {constructor(private readonly applicationRegistrationService: ApplicationRegistrationService,private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,- private readonly appTarballUploadService: AppTarballUploadService,+ private readonly applicationTarballService: ApplicationTarballService,+ private readonly applicationPackageFetcherService: ApplicationPackageFetcherService,+ private readonly fileUrlService: FileUrlService,) {}@UseGuards(PublicEndpointGuard, NoPermissionGuard)@@ -255,6 +262,44 @@ export class ApplicationRegistrationResolver {);}+ @UseGuards(+ WorkspaceAuthGuard,+ FeatureFlagGuard,+ SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS),+ )+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ @Mutation(() => ApplicationRegistrationEntity)+ async registerNpmPackage(+ @Args('packageName') packageName: string,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ): Promise<ApplicationRegistrationEntity> {+ const resolvedPackage =+ await this.applicationPackageFetcherService.resolveNpmPackage(+ packageName,+ );++ try {+ const manifest = resolvedPackage.manifest.application;++ return await this.applicationRegistrationService.createFromNpmPackage({+ packageName,+ universalIdentifier: manifest.universalIdentifier,+ name: manifest.displayName,+ description: manifest.description,+ author: manifest.author,+ logoUrl: manifest.logoUrl,+ websiteUrl: manifest.websiteUrl,+ termsUrl: manifest.termsUrl,+ version: resolvedPackage.packageJson.version as string | undefined,+ ownerWorkspaceId: workspaceId,+ });+ } finally {+ await this.applicationPackageFetcherService.cleanupExtractedDir(+ resolvedPackage.cleanupDir,+ );+ }+ }+@UseGuards(WorkspaceAuthGuard,FeatureFlagGuard,@@ -279,10 +324,62 @@ export class ApplicationRegistrationResolver {);}- return this.appTarballUploadService.uploadTarball({+ return this.applicationTarballService.uploadTarball({tarballBuffer,universalIdentifier,ownerWorkspaceId: workspaceId,});}++ @UseGuards(+ WorkspaceAuthGuard,+ FeatureFlagGuard,+ SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),+ )+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ @Query(() => String, { nullable: true })+ async applicationRegistrationTarballUrl(+ @Args('id') id: string,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ): Promise<string | null> {+ const registration = await this.applicationRegistrationService.findOneById(+ id,+ workspaceId,+ );++ if (+ registration.sourceType !== ApplicationRegistrationSourceType.TARBALL ||+ !isDefined(registration.tarballFileId)+ ) {+ return null;+ }++ return this.fileUrlService.signFileByIdUrl({+ fileId: registration.tarballFileId,+ workspaceId,+ fileFolder: FileFolder.AppTarball,+ });+ }++ @UseGuards(+ WorkspaceAuthGuard,+ FeatureFlagGuard,+ SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),+ )+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ @Mutation(() => ApplicationRegistrationEntity)+ async transferApplicationRegistrationOwnership(+ @Args()+ {+ applicationRegistrationId,+ targetWorkspaceSubdomain,+ }: TransferApplicationRegistrationOwnershipInput,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ): Promise<ApplicationRegistrationEntity> {+ return this.applicationRegistrationService.transferOwnership({+ applicationRegistrationId,+ targetWorkspaceSubdomain,+ currentOwnerWorkspaceId: workspaceId,+ });+ }}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.tsindex 10102b489a3..47a57706084 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts@@ -5,22 +5,23 @@ import crypto from 'crypto';import * as bcrypt from 'bcrypt';import { isDefined } from 'twenty-shared/utils';-import { type Repository } from 'typeorm';+import { IsNull, type Repository } from 'typeorm';import { v4 } from 'uuid';+import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-oauth/constants/oauth-scopes';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import {ApplicationRegistrationException,ApplicationRegistrationExceptionCode,} from 'src/engine/core-modules/application/application-registration/application-registration.exception';-import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-registration/constants/oauth-scopes';import { type ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';import { type CreateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.input';import { type PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto';import { type UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { validateRedirectUri } from 'src/engine/core-modules/auth/utils/validate-redirect-uri.util';-+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';const BCRYPT_SALT_ROUNDS = 10;@Injectable()@@ -30,6 +31,8 @@ export class ApplicationRegistrationService {private readonly applicationRegistrationRepository: Repository<ApplicationRegistrationEntity>,@InjectRepository(ApplicationEntity)private readonly applicationRepository: Repository<ApplicationEntity>,+ @InjectRepository(WorkspaceEntity)+ private readonly workspaceRepository: Repository<WorkspaceEntity>,) {}async findMany(@@ -41,12 +44,36 @@ export class ApplicationRegistrationService {});}+ async findAll(): Promise<ApplicationRegistrationEntity[]> {+ return this.applicationRegistrationRepository.find({+ order: { createdAt: 'DESC' },+ });+ }+async findOneById(id: string,ownerWorkspaceId: string,): Promise<ApplicationRegistrationEntity> {const registration = await this.applicationRegistrationRepository.findOne({- where: { id, ownerWorkspaceId },+ where: [+ { id, ownerWorkspaceId },+ { id, ownerWorkspaceId: IsNull() },+ ],+ });++ if (!registration) {+ throw new ApplicationRegistrationException(+ `Application registration with id ${id} not found`,+ ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND,+ );+ }++ return registration;+ }++ async findOneByIdGlobal(id: string): Promise<ApplicationRegistrationEntity> {+ const registration = await this.applicationRegistrationRepository.findOne({+ where: { id },});if (!registration) {@@ -193,6 +220,7 @@ export class ApplicationRegistrationService {updateData.oAuthScopes = update.oAuthScopes;if (isDefined(update.websiteUrl)) updateData.websiteUrl = update.websiteUrl;if (isDefined(update.termsUrl)) updateData.termsUrl = update.termsUrl;+ if (isDefined(update.isListed)) updateData.isListed = update.isListed;if (Object.keys(updateData).length > 0) {await this.applicationRegistrationRepository.update(id, updateData);@@ -235,6 +263,140 @@ export class ApplicationRegistrationService {return bcrypt.compare(clientSecret, registration.oAuthClientSecretHash);}+ async upsertFromCatalog(+ params: Pick<+ ApplicationRegistrationEntity,+ | 'universalIdentifier'+ | 'name'+ | 'description'+ | 'author'+ | 'sourceType'+ | 'sourcePackage'+ | 'logoUrl'+ | 'websiteUrl'+ | 'termsUrl'+ | 'latestAvailableVersion'+ | 'isListed'+ | 'isFeatured'+ | 'marketplaceDisplayData'+ | 'ownerWorkspaceId'+ >,+ ): Promise<void> {+ const existing = await this.findOneByUniversalIdentifier(+ params.universalIdentifier,+ );++ if (isDefined(existing)) {+ await this.applicationRegistrationRepository.save({+ ...existing,+ name: params.name,+ description: params.description,+ author: params.author,+ sourceType: params.sourceType,+ sourcePackage: params.sourcePackage,+ logoUrl: params.logoUrl,+ websiteUrl: params.websiteUrl,+ termsUrl: params.termsUrl,+ latestAvailableVersion: params.latestAvailableVersion,+ marketplaceDisplayData: params.marketplaceDisplayData,+ });++ return;+ }++ const registration = this.applicationRegistrationRepository.create({+ universalIdentifier: params.universalIdentifier,+ name: params.name,+ description: params.description,+ author: params.author,+ sourceType: params.sourceType,+ sourcePackage: params.sourcePackage,+ logoUrl: params.logoUrl,+ websiteUrl: params.websiteUrl,+ termsUrl: params.termsUrl,+ latestAvailableVersion: params.latestAvailableVersion,+ isListed: params.isListed,+ isFeatured: params.isFeatured,+ marketplaceDisplayData: params.marketplaceDisplayData,+ oAuthClientId: v4(),+ oAuthRedirectUris: [],+ oAuthScopes: [],+ ownerWorkspaceId: params.ownerWorkspaceId,+ });++ await this.applicationRegistrationRepository.save(registration);+ }++ async createFromNpmPackage(params: {+ packageName: string;+ universalIdentifier: string;+ name: string;+ description?: string;+ author?: string;+ logoUrl?: string;+ websiteUrl?: string;+ termsUrl?: string;+ version?: string;+ ownerWorkspaceId: string;+ }): Promise<ApplicationRegistrationEntity> {+ const existingByUid = await this.findOneByUniversalIdentifier(+ params.universalIdentifier,+ );++ if (isDefined(existingByUid)) {+ throw new ApplicationRegistrationException(+ `An app with universalIdentifier "${params.universalIdentifier}" is already registered`,+ ApplicationRegistrationExceptionCode.UNIVERSAL_IDENTIFIER_ALREADY_CLAIMED,+ );+ }++ const existingByPackage =+ await this.applicationRegistrationRepository.findOne({+ where: { sourcePackage: params.packageName },+ });++ if (isDefined(existingByPackage)) {+ throw new ApplicationRegistrationException(+ `Package "${params.packageName}" is already registered`,+ ApplicationRegistrationExceptionCode.INVALID_INPUT,+ );+ }++ const registration = this.applicationRegistrationRepository.create({+ universalIdentifier: params.universalIdentifier,+ name: params.name,+ description: params.description ?? null,+ author: params.author ?? null,+ logoUrl: params.logoUrl ?? null,+ websiteUrl: params.websiteUrl ?? null,+ termsUrl: params.termsUrl ?? null,+ latestAvailableVersion: params.version ?? null,+ sourceType: ApplicationRegistrationSourceType.NPM,+ sourcePackage: params.packageName,+ isListed: true,+ oAuthClientId: v4(),+ oAuthRedirectUris: [],+ oAuthScopes: [],+ ownerWorkspaceId: params.ownerWorkspaceId,+ });++ return this.applicationRegistrationRepository.save(registration);+ }++ async findManyBySourceType(+ sourceType: ApplicationRegistrationSourceType,+ ): Promise<ApplicationRegistrationEntity[]> {+ return this.applicationRegistrationRepository.find({+ where: { sourceType },+ });+ }++ async findManyListed(): Promise<ApplicationRegistrationEntity[]> {+ return this.applicationRegistrationRepository.find({+ where: { isListed: true },+ });+ }+async getStats(applicationRegistrationId: string,ownerWorkspaceId: string,@@ -269,6 +431,43 @@ export class ApplicationRegistrationService {};}+ async transferOwnership(params: {+ applicationRegistrationId: string;+ targetWorkspaceSubdomain: string;+ currentOwnerWorkspaceId: string;+ }): Promise<ApplicationRegistrationEntity> {+ const registration = await this.findOneById(+ params.applicationRegistrationId,+ params.currentOwnerWorkspaceId,+ );++ const targetWorkspace = await this.workspaceRepository.findOne({+ where: { subdomain: params.targetWorkspaceSubdomain },+ });++ if (!isDefined(targetWorkspace)) {+ throw new ApplicationRegistrationException(+ `No workspace found with subdomain "${params.targetWorkspaceSubdomain}"`,+ ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND,+ );+ }++ if (targetWorkspace.id === params.currentOwnerWorkspaceId) {+ throw new ApplicationRegistrationException(+ 'Cannot transfer ownership to the same workspace',+ ApplicationRegistrationExceptionCode.INVALID_INPUT,+ );+ }++ await this.applicationRegistrationRepository.update(registration.id, {+ ownerWorkspaceId: targetWorkspace.id,+ });++ return this.applicationRegistrationRepository.findOneOrFail({+ where: { id: registration.id },+ });+ }+private async generateClientSecret(): Promise<{clientSecret: string;clientSecretHash: string;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/services/app-tarball-upload.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.tssimilarity index 68%rename from packages/twenty-server/src/engine/core-modules/application/application-registration/services/app-tarball-upload.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.tsindex d2bb46e869d..9ce07460b9d 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/services/app-tarball-upload.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts@@ -5,31 +5,34 @@ import { promises as fs } from 'fs';import { tmpdir } from 'os';import { join } from 'path';+import { FileFolder } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { Repository } from 'typeorm';import { v4 } from 'uuid';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';import {ApplicationRegistrationException,ApplicationRegistrationExceptionCode,} from 'src/engine/core-modules/application/application-registration/application-registration.exception';-import { extractTarballSecurely } from 'src/engine/core-modules/application/utils/extract-tarball-securely.util';-import { resolvePackageContentDir } from 'src/engine/core-modules/application/utils/tarball-utils';-import { readJsonFile } from 'src/engine/core-modules/application/utils/read-json-file.util';-import { FileStorageDriverFactory } from 'src/engine/core-modules/file-storage/file-storage-driver.factory';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { extractTarballSecurely } from 'src/engine/core-modules/application/application-package/utils/extract-tarball-securely.util';+import { readJsonFile } from 'src/engine/core-modules/application/application-package/utils/read-json-file.util';+import { resolvePackageContentDir } from 'src/engine/core-modules/application/application-package/utils/tarball-utils';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';export const MAX_TARBALL_UPLOAD_SIZE_BYTES = 50 * 1024 * 1024;@Injectable()-export class AppTarballUploadService {- private readonly logger = new Logger(AppTarballUploadService.name);+export class ApplicationTarballService {+ private readonly logger = new Logger(ApplicationTarballService.name);constructor(@InjectRepository(ApplicationRegistrationEntity)private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,- private readonly fileStorageDriverFactory: FileStorageDriverFactory,+ private readonly fileStorageService: FileStorageService,+ private readonly applicationService: ApplicationService,) {}async uploadTarball(params: {@@ -86,8 +89,10 @@ export class AppTarballUploadService {if (isDefined(appRegistration)) {if (- appRegistration.sourceType !== AppRegistrationSourceType.LOCAL &&- appRegistration.sourceType !== AppRegistrationSourceType.TARBALL+ appRegistration.sourceType !==+ ApplicationRegistrationSourceType.LOCAL &&+ appRegistration.sourceType !==+ ApplicationRegistrationSourceType.TARBALL) {throw new ApplicationRegistrationException(`This app is registered as ${appRegistration.sourceType}. Cannot upload tarball.`,@@ -98,7 +103,7 @@ export class AppTarballUploadService {appRegistration = this.appRegistrationRepository.create({universalIdentifier,name: manifest.application?.displayName ?? 'Unknown App',- sourceType: AppRegistrationSourceType.TARBALL,+ sourceType: ApplicationRegistrationSourceType.TARBALL,oAuthClientId: v4(),oAuthRedirectUris: [],oAuthScopes: [],@@ -109,18 +114,29 @@ export class AppTarballUploadService {await this.appRegistrationRepository.save(appRegistration);}- const storagePath = join('app-tarball', appRegistration.id);-- const driver = this.fileStorageDriverFactory.getCurrentDriver();+ const { workspaceCustomFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId: params.ownerWorkspaceId },+ );- await driver.writeFile({- filePath: join(storagePath, 'app.tar.gz'),+ const savedFile = await this.fileStorageService.writeFile({sourceFile: params.tarballBuffer,+ resourcePath: `${appRegistration.id}/app.tar.gz`,mimeType: 'application/gzip',+ fileFolder: FileFolder.AppTarball,+ applicationUniversalIdentifier:+ workspaceCustomFlatApplication.universalIdentifier,+ workspaceId: params.ownerWorkspaceId,+ fileId: appRegistration.tarballFileId ?? v4(),+ settings: {+ isTemporaryFile: false,+ toDelete: false,+ },});await this.appRegistrationRepository.update(appRegistration.id, {- sourceType: AppRegistrationSourceType.TARBALL,+ sourceType: ApplicationRegistrationSourceType.TARBALL,+ tarballFileId: savedFile.id,});this.logger.log(diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/application-registration-summary.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-summary.dto.tssimilarity index 63%rename from packages/twenty-server/src/engine/core-modules/application/dtos/application-registration-summary.dto.tsrename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-summary.dto.tsindex 33e01912262..143146e5504 100644--- a/packages/twenty-server/src/engine/core-modules/application/dtos/application-registration-summary.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-summary.dto.ts@@ -3,7 +3,7 @@ import { Field, ObjectType } from '@nestjs/graphql';import { IsOptional, IsString } from 'class-validator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';@ObjectType('ApplicationRegistrationSummary')export class ApplicationRegistrationSummaryDTO {@@ -15,6 +15,6 @@ export class ApplicationRegistrationSummaryDTO {@Field({ nullable: true })latestAvailableVersion?: string;- @Field(() => AppRegistrationSourceType)- sourceType: AppRegistrationSourceType;+ @Field(() => ApplicationRegistrationSourceType)+ sourceType: ApplicationRegistrationSourceType;}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/transfer-application-registration-ownership.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/transfer-application-registration-ownership.input.tsnew file mode 100644index 00000000000..57b643fa9a9--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/transfer-application-registration-ownership.input.ts@@ -0,0 +1,15 @@+import { ArgsType, Field } from '@nestjs/graphql';++import { IsNotEmpty, IsString, IsUUID } from 'class-validator';++@ArgsType()+export class TransferApplicationRegistrationOwnershipInput {+ @Field(() => String)+ @IsUUID()+ applicationRegistrationId: string;++ @Field(() => String)+ @IsString()+ @IsNotEmpty()+ targetWorkspaceSubdomain: string;+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.tsindex a8987afc6cb..ea4784094f3 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.ts@@ -4,6 +4,7 @@ import { Type } from 'class-transformer';import {ArrayMaxSize,IsArray,+ IsBoolean,IsNotEmpty,IsOptional,IsString,@@ -65,6 +66,11 @@ export class UpdateApplicationRegistrationPayload {@MaxLength(2048)@IsOptional()termsUrl?: string;++ @Field(() => Boolean, { nullable: true })+ @IsBoolean()+ @IsOptional()+ isListed?: boolean;}@InputType()diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum.tsdeleted file mode 100644index ab88a4b37ac..00000000000--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum.ts+++ /dev/null@@ -1,11 +0,0 @@-import { registerEnumType } from '@nestjs/graphql';--export enum AppRegistrationSourceType {- NPM = 'npm',- TARBALL = 'tarball',- LOCAL = 'local',-}--registerEnumType(AppRegistrationSourceType, {- name: 'AppRegistrationSourceType',-});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum.tsnew file mode 100644index 00000000000..2a4b755faa8--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum.ts@@ -0,0 +1,11 @@+import { registerEnumType } from '@nestjs/graphql';++export enum ApplicationRegistrationSourceType {+ NPM = 'npm',+ TARBALL = 'tarball',+ LOCAL = 'local',+}++registerEnumType(ApplicationRegistrationSourceType, {+ name: 'ApplicationRegistrationSourceType',+});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.tsnew file mode 100644index 00000000000..0627170e7a8--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts@@ -0,0 +1,34 @@+import { Module } from '@nestjs/common';+import { TypeOrmModule } from '@nestjs/typeorm';++import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';+import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';+import { ApplicationVersionCheckCronJob } from 'src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job';+import { ApplicationVersionCheckCronCommand } from 'src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command';+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { ApplicationUpgradeResolver } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.resolver';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';++@Module({+ imports: [+ TypeOrmModule.forFeature([+ ApplicationRegistrationEntity,+ ApplicationEntity,+ ]),+ ApplicationInstallModule,+ FeatureFlagModule,+ PermissionsModule,+ TwentyConfigModule,+ ],+ providers: [+ ApplicationUpgradeService,+ ApplicationUpgradeResolver,+ ApplicationVersionCheckCronJob,+ ApplicationVersionCheckCronCommand,+ ],+ exports: [ApplicationUpgradeService, ApplicationVersionCheckCronCommand],+})+export class ApplicationUpgradeModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.tsnew file mode 100644index 00000000000..15ca639bb51--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts@@ -0,0 +1,48 @@+import { UseFilters, UseGuards } from '@nestjs/common';+import { Args, Mutation } from '@nestjs/graphql';++import { PermissionFlagType } from 'twenty-shared/constants';+import { FeatureFlagKey } from 'twenty-shared/types';++import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';+import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';+import {+ FeatureFlagGuard,+ RequireFeatureFlag,+} from 'src/engine/guards/feature-flag.guard';+import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';+import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';++@MetadataResolver()+@UseFilters(ApplicationExceptionFilter)+@UseGuards(+ UserAuthGuard,+ WorkspaceAuthGuard,+ FeatureFlagGuard,+ NoPermissionGuard,+)+export class ApplicationUpgradeResolver {+ constructor(+ private readonly applicationUpgradeService: ApplicationUpgradeService,+ ) {}++ @Mutation(() => Boolean)+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)+ async upgradeApplication(+ @Args('appRegistrationId') appRegistrationId: string,+ @Args('targetVersion') targetVersion: string,+ @AuthWorkspace() workspace: WorkspaceEntity,+ ): Promise<boolean> {+ return this.applicationUpgradeService.upgradeApplication({+ appRegistrationId,+ targetVersion,+ workspaceId: workspace.id,+ });+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.tsnew file mode 100644index 00000000000..325e285e0fe--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts@@ -0,0 +1,134 @@+import { Injectable, Logger } from '@nestjs/common';+import { InjectRepository } from '@nestjs/typeorm';++import axios from 'axios';+import { Repository } from 'typeorm';+import { z } from 'zod';++import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';++const npmPackageMetadataSchema = z.object({+ version: z.string(),+});++@Injectable()+export class ApplicationUpgradeService {+ private readonly logger = new Logger(ApplicationUpgradeService.name);++ constructor(+ @InjectRepository(ApplicationRegistrationEntity)+ private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,+ @InjectRepository(ApplicationEntity)+ private readonly applicationRepository: Repository<ApplicationEntity>,+ private readonly applicationInstallService: ApplicationInstallService,+ private readonly twentyConfigService: TwentyConfigService,+ ) {}++ async checkForUpdates(+ appRegistration: ApplicationRegistrationEntity,+ ): Promise<string | null> {+ if (appRegistration.sourceType !== ApplicationRegistrationSourceType.NPM) {+ return null;+ }++ const registryUrl = this.twentyConfigService.get('APP_REGISTRY_URL');++ if (!appRegistration.sourcePackage) {+ return null;+ }++ try {+ const encodedPackage = encodeURIComponent(appRegistration.sourcePackage);++ const { data } = await axios.get(+ `${registryUrl}/${encodedPackage}/latest`,+ {+ headers: { 'User-Agent': 'Twenty-AppUpgrade' },+ timeout: 10_000,+ },+ );++ const parsed = npmPackageMetadataSchema.safeParse(data);++ if (!parsed.success) {+ this.logger.warn(+ `Unexpected response shape from registry for ${appRegistration.sourcePackage}`,+ );++ return null;+ }++ await this.appRegistrationRepository.update(appRegistration.id, {+ latestAvailableVersion: parsed.data.version,+ });++ return parsed.data.version;+ } catch (error) {+ this.logger.warn(+ `Failed to check updates for ${appRegistration.sourcePackage}: ${error}`,+ );++ return null;+ }+ }++ async checkAllForUpdates(): Promise<void> {+ const npmRegistrations = await this.appRegistrationRepository.find({+ where: { sourceType: ApplicationRegistrationSourceType.NPM },+ });++ for (const registration of npmRegistrations) {+ await this.checkForUpdates(registration);+ }+ }++ async upgradeApplication(params: {+ appRegistrationId: string;+ targetVersion: string;+ workspaceId: string;+ }): Promise<boolean> {+ const appRegistration = await this.appRegistrationRepository.findOneOrFail({+ where: { id: params.appRegistrationId },+ });++ if (+ appRegistration.sourceType === ApplicationRegistrationSourceType.LOCAL ||+ appRegistration.sourceType === ApplicationRegistrationSourceType.TARBALL+ ) {+ throw new ApplicationException(+ 'Cannot upgrade an app installed from a tarball or local source',+ ApplicationExceptionCode.UPGRADE_FAILED,+ );+ }++ try {+ return await this.applicationInstallService.installApplication({+ appRegistrationId: params.appRegistrationId,+ version: params.targetVersion,+ workspaceId: params.workspaceId,+ });+ } catch (error) {+ const appName =+ appRegistration.sourcePackage ?? appRegistration.universalIdentifier;++ this.logger.error(`Upgrade failed for ${appName}`, error);++ if (error instanceof ApplicationException) {+ throw error;+ }++ throw new ApplicationException(+ `Upgrade failed for ${appName}`,+ ApplicationExceptionCode.UPGRADE_FAILED,+ );+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job.tsnew file mode 100644index 00000000000..3d2f2882adb--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job.ts@@ -0,0 +1,37 @@+import { Injectable, Logger } from '@nestjs/common';++import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';+import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';+import { APPLICATION_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant';+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';++@Injectable()+@Processor(MessageQueue.cronQueue)+export class ApplicationVersionCheckCronJob {+ private readonly logger = new Logger(ApplicationVersionCheckCronJob.name);++ constructor(+ private readonly applicationUpgradeService: ApplicationUpgradeService,+ ) {}++ @Process(ApplicationVersionCheckCronJob.name)+ @SentryCronMonitor(+ ApplicationVersionCheckCronJob.name,+ APPLICATION_VERSION_CHECK_CRON_PATTERN,+ )+ async handle(): Promise<void> {+ this.logger.log('Starting application version check...');++ try {+ await this.applicationUpgradeService.checkAllForUpdates();+ this.logger.log('Application version check completed successfully');+ } catch (error) {+ this.logger.error(+ `Application version check failed: ${error instanceof Error ? error.message : String(error)}`,+ );+ throw error;+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command.tsnew file mode 100644index 00000000000..f8d45ba9854--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command.ts@@ -0,0 +1,33 @@+import { Command, CommandRunner } from 'nest-commander';++import { ApplicationVersionCheckCronJob } from 'src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job';+import { APPLICATION_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant';+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';++@Command({+ name: 'cron:app-version-check',+ description:+ 'Starts a cron job to check for app version updates on npm registries',+})+export class ApplicationVersionCheckCronCommand extends CommandRunner {+ constructor(+ @InjectMessageQueue(MessageQueue.cronQueue)+ private readonly messageQueueService: MessageQueueService,+ ) {+ super();+ }++ async run(): Promise<void> {+ await this.messageQueueService.addCron<undefined>({+ jobName: ApplicationVersionCheckCronJob.name,+ data: undefined,+ options: {+ repeat: {+ pattern: APPLICATION_VERSION_CHECK_CRON_PATTERN,+ },+ },+ });+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant.tsnew file mode 100644index 00000000000..bf8fbebcaeb--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant.ts@@ -0,0 +1,2 @@+// Every 6 hours+export const APPLICATION_VERSION_CHECK_CRON_PATTERN = '0 */6 * * *';diff --git a/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.tsindex 1057e6de543..d82381b68fe 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts@@ -6,7 +6,7 @@ import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';import { ApplicationVariableEntityResolver } from 'src/engine/core-modules/application/application-variable/application-variable.resolver';import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';-import { WorkspaceApplicationVariableMapCacheService } from 'src/engine/core-modules/application/application-variable/services/workspace-application-variable-map-cache.service';+import { WorkspaceApplicationVariableMapCacheService } from 'src/engine/core-modules/application/application-variable/workspace-application-variable-map-cache.service';import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';diff --git a/packages/twenty-server/src/engine/core-modules/application/application-variable/services/workspace-application-variable-map-cache.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/workspace-application-variable-map-cache.service.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application/application-variable/services/workspace-application-variable-map-cache.service.tsrename to packages/twenty-server/src/engine/core-modules/application/application-variable/workspace-application-variable-map-cache.service.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/application-version-check.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-version-check/application-version-check.module.tsdeleted file mode 100644index 78f72ed5249..00000000000--- a/packages/twenty-server/src/engine/core-modules/application/application-version-check/application-version-check.module.ts+++ /dev/null@@ -1,12 +0,0 @@-import { Module } from '@nestjs/common';--import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';-import { AppVersionCheckCronCommand } from 'src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command';-import { AppVersionCheckCronJob } from 'src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job';--@Module({- imports: [ApplicationInstallModule],- providers: [AppVersionCheckCronJob, AppVersionCheckCronCommand],- exports: [AppVersionCheckCronCommand],-})-export class AppVersionCheckModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job.tsdeleted file mode 100644index abcef3ab5e7..00000000000--- a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job.ts+++ /dev/null@@ -1,35 +0,0 @@-import { Injectable, Logger } from '@nestjs/common';--import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';-import { APP_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant';-import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';-import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';-import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';-import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';--@Injectable()-@Processor(MessageQueue.cronQueue)-export class AppVersionCheckCronJob {- private readonly logger = new Logger(AppVersionCheckCronJob.name);-- constructor(private readonly appUpgradeService: AppUpgradeService) {}-- @Process(AppVersionCheckCronJob.name)- @SentryCronMonitor(- AppVersionCheckCronJob.name,- APP_VERSION_CHECK_CRON_PATTERN,- )- async handle(): Promise<void> {- this.logger.log('Starting app version check...');-- try {- await this.appUpgradeService.checkAllForUpdates();- this.logger.log('App version check completed successfully');- } catch (error) {- this.logger.error(- `App version check failed: ${error instanceof Error ? error.message : String(error)}`,- );- throw error;- }- }-}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant.tsdeleted file mode 100644index 7d3be1e2aed..00000000000--- a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant.ts+++ /dev/null@@ -1,2 +0,0 @@-// Every 6 hours-export const APP_VERSION_CHECK_CRON_PATTERN = '0 */6 * * *';diff --git a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application.entity.tsindex 2cd01581e8d..a9cf4036723 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.entity.ts@@ -16,7 +16,7 @@ import {} from 'typeorm';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';@@ -53,8 +53,8 @@ export class ApplicationEntity extends WorkspaceRelatedEntity {@Column({ nullable: true, type: 'text' })version: string | null;- @Column({ type: 'text', default: AppRegistrationSourceType.LOCAL })- sourceType: AppRegistrationSourceType;+ @Column({ type: 'text', default: ApplicationRegistrationSourceType.LOCAL })+ sourceType: ApplicationRegistrationSourceType;@Column({ nullable: false, type: 'text' })sourcePath: string;diff --git a/packages/twenty-server/src/engine/core-modules/application/application.exception.ts b/packages/twenty-server/src/engine/core-modules/application/application.exception.tsindex ed88cbd77d9..862463b3f53 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.exception.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.exception.ts@@ -11,6 +11,7 @@ export enum ApplicationExceptionCode {FRONT_COMPONENT_NOT_FOUND = 'FRONT_COMPONENT_NOT_FOUND',ENTITY_NOT_FOUND = 'ENTITY_NOT_FOUND',APPLICATION_NOT_FOUND = 'APPLICATION_NOT_FOUND',+ APP_NOT_INSTALLED = 'APP_NOT_INSTALLED',FORBIDDEN = 'FORBIDDEN',INVALID_INPUT = 'INVALID_INPUT',SOURCE_CHANNEL_MISMATCH = 'SOURCE_CHANNEL_MISMATCH',@@ -35,6 +36,8 @@ const getApplicationExceptionUserFriendlyMessage = (return msg`Entity not found.`;case ApplicationExceptionCode.APPLICATION_NOT_FOUND:return msg`Application not found.`;+ case ApplicationExceptionCode.APP_NOT_INSTALLED:+ return msg`Application is not installed in this workspace. Install it first.`;case ApplicationExceptionCode.FORBIDDEN:return msg`You do not have permission to perform this action.`;case ApplicationExceptionCode.INVALID_INPUT:diff --git a/packages/twenty-server/src/engine/core-modules/application/application.module.ts b/packages/twenty-server/src/engine/core-modules/application/application.module.tsindex d938caefd86..a6bfe4413b3 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.module.ts@@ -4,18 +4,19 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { ApplicationService } from 'src/engine/core-modules/application/application.service';import { WorkspaceFlatApplicationMapCacheService } from 'src/engine/core-modules/application/workspace-flat-application-map-cache.service';+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@Module({imports: [- TypeOrmModule.forFeature([ApplicationEntity, AgentEntity, WorkspaceEntity]),+ TypeOrmModule.forFeature([ApplicationEntity, WorkspaceEntity]),WorkspaceManyOrAllFlatEntityMapsCacheModule,WorkspaceCacheModule,TwentyConfigModule,+ FeatureFlagModule,],exports: [ApplicationService, WorkspaceFlatApplicationMapCacheService],providers: [ApplicationService, WorkspaceFlatApplicationMapCacheService],diff --git a/packages/twenty-server/src/engine/core-modules/application/application.service.ts b/packages/twenty-server/src/engine/core-modules/application/application.service.tsindex 8c265e945c8..b255b35106e 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.service.ts@@ -10,8 +10,8 @@ import {ApplicationException,ApplicationExceptionCode,} from 'src/engine/core-modules/application/application.exception';-import { getDefaultApplicationPackageFields } from 'src/engine/core-modules/application/utils/get-default-application-package-fields.util';-import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util';+import { getDefaultApplicationPackageFields } from 'src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util';+import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util';import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { ALL_FLAT_ENTITY_MAPS_PROPERTIES } from 'src/engine/metadata-modules/flat-entity/constant/all-flat-entity-maps-properties.constant';diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts b/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.tsindex 274a455628a..7be90826a8a 100644--- a/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts@@ -10,7 +10,7 @@ import {import GraphQLJSON from 'graphql-type-json';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { ApplicationRegistrationSummaryDTO } from 'src/engine/core-modules/application/dtos/application-registration-summary.dto';+import { ApplicationRegistrationSummaryDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-summary.dto';import { ApplicationVariableEntityDTO } from 'src/engine/core-modules/application/application-variable/dtos/application-variable.dto';import { AgentDTO } from 'src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto';import { LogicFunctionDTO } from 'src/engine/metadata-modules/logic-function/dtos/logic-function.dto';diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.tsindex 80d9f64cc8e..b5114e4a5b6 100644--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts@@ -7,9 +7,11 @@ import { ActorModule } from 'src/engine/core-modules/actor/actor.module';import { AdminPanelModule } from 'src/engine/core-modules/admin-panel/admin-panel.module';import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';import { AppTokenModule } from 'src/engine/core-modules/app-token/app-token.module';+import { ApplicationOAuthModule } from 'src/engine/core-modules/application/application-oauth/application-oauth.module';import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';import { ApplicationDevelopmentModule } from 'src/engine/core-modules/application/application-development/application-development.module';import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';+import { ApplicationUpgradeModule } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.module';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { MarketplaceModule } from 'src/engine/core-modules/application/application-marketplace/marketplace.module';import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';@@ -92,8 +94,10 @@ import { FileModule } from './file/file.module';RowLevelPermissionModule,OpenApiModule,ApplicationRegistrationModule,+ ApplicationOAuthModule,ApplicationModule,ApplicationInstallModule,+ ApplicationUpgradeModule,ApplicationDevelopmentModule,MarketplaceModule,AppTokenModule,diff --git a/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.ts b/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.tsindex 2e41991f51b..ef518dc97af 100644--- a/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.ts+++ b/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.ts@@ -12,6 +12,7 @@ export const SUPPORTED_FILE_FOLDERS = [FileFolder.FilesField,FileFolder.Workflow,FileFolder.AgentChat,+ FileFolder.AppTarball,] as const;export type SupportedFileFolder = (typeof SUPPORTED_FILE_FOLDERS)[number];diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.tsindex 33930a777b9..47dd3c97eb7 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.ts@@ -38,7 +38,7 @@ import {LogicFunctionExceptionCode,} from 'src/engine/metadata-modules/logic-function/logic-function.exception';import { type FlatLogicFunction } from 'src/engine/metadata-modules/logic-function/types/flat-logic-function.type';-import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/utils/copy-yarn-engine-and-build-dependencies';+import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/application-package/utils/copy-yarn-engine-and-build-dependencies';import { type LogicFunctionResourceService } from 'src/engine/core-modules/logic-function/logic-function-resource/logic-function-resource.service';import { callWithTimeout } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/call-with-timeout';diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/local.driver.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/local.driver.tsindex 704d64c0f59..1a526d74d8d 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/local.driver.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/local.driver.ts@@ -14,7 +14,7 @@ import { ConsoleListener } from 'src/engine/core-modules/logic-function/logic-fuimport { TemporaryDirManager } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/temporary-dir-manager';import { HANDLER_NAME_REGEX } from 'src/engine/metadata-modules/logic-function/constants/handler.contant';import { LogicFunctionExecutionStatus } from 'src/engine/metadata-modules/logic-function/dtos/logic-function-execution-result.dto';-import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/utils/copy-yarn-engine-and-build-dependencies';+import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/application-package/utils/copy-yarn-engine-and-build-dependencies';import type { LogicFunctionResourceService } from 'src/engine/core-modules/logic-function/logic-function-resource/logic-function-resource.service';export interface LocalDriverOptions {diff --git a/packages/twenty-server/src/engine/guards/feature-flag.guard.ts b/packages/twenty-server/src/engine/guards/feature-flag.guard.tsindex b3ed355b1ac..2905df2e638 100644--- a/packages/twenty-server/src/engine/guards/feature-flag.guard.ts+++ b/packages/twenty-server/src/engine/guards/feature-flag.guard.ts@@ -1,6 +1,7 @@import {type CanActivate,type ExecutionContext,+ ForbiddenException,Injectable,} from '@nestjs/common';import { Reflector } from '@nestjs/core';@@ -60,7 +61,7 @@ export class FeatureFlagGuard implements CanActivate {);if (!isEnabled) {- throw new Error(+ throw new ForbiddenException(`Feature flag "${featureFlag}" is not enabled for this workspace`,);}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.tsindex b55a4e00bb2..7fc854fc8db 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts@@ -42,14 +42,12 @@ export class AgentTurnResolver {@Query(() => [AgentTurnDTO])async agentTurns(@Args('agentId', { type: () => UUIDScalarType }) agentId: string,- ): Promise<AgentTurnDTO[]> {- const turns = await this.turnRepository.find({+ ): Promise<AgentTurnEntity[]> {+ return this.turnRepository.find({where: { agentId },relations: ['evaluations', 'messages', 'messages.parts'],order: { createdAt: 'DESC' },});-- return turns;}@Mutation(() => AgentTurnEvaluationDTO)@@ -67,7 +65,7 @@ export class AgentTurnResolver {@Args('input') input: string,@AuthWorkspace() workspace: WorkspaceEntity,@AuthUserWorkspaceId() userWorkspaceId: string,- ): Promise<AgentTurnDTO> {+ ): Promise<AgentTurnEntity> {const thread = this.threadRepository.create({userWorkspaceId,title: `Eval: ${input.substring(0, 50)}...`,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.tsindex 6d92ceb7cb8..aeabdc4c42c 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.ts@@ -5,7 +5,7 @@ import { FieldMetadataType } from 'twenty-shared/types';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';@@ -27,7 +27,7 @@ const MOCK_FLAT_APPLICATION: FlatApplication = {description: null,workspaceId: 'workspace-id',version: null,- sourceType: AppRegistrationSourceType.LOCAL,+ sourceType: ApplicationRegistrationSourceType.LOCAL,sourcePath: '',packageJsonChecksum: null,packageJsonFileId: null,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.tsindex 0676908f28e..47089756a3d 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.ts@@ -6,7 +6,7 @@ import {RelationType,} from 'twenty-shared/types';-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import {generateMorphOrRelationFlatFieldMetadataPair,@@ -22,7 +22,7 @@ const MOCK_FLAT_APPLICATION: FlatApplication = {description: null,version: null,workspaceId: 'workspace-id',- sourceType: AppRegistrationSourceType.LOCAL,+ sourceType: ApplicationRegistrationSourceType.LOCAL,sourcePath: '',packageJsonChecksum: null,packageJsonFileId: null,diff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/dtos/front-component.dto.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/dtos/front-component.dto.tsindex 8a26cbc81ec..a9a28e9da20 100644--- a/packages/twenty-server/src/engine/metadata-modules/front-component/dtos/front-component.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/dtos/front-component.dto.ts@@ -10,7 +10,7 @@ import {} from 'class-validator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';+import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/application-oauth/dtos/application-token-pair.dto';@ObjectType('FrontComponent')export class FrontComponentDTO {diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.tsindex 34ed3189d15..23e058bf753 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.ts@@ -4,7 +4,7 @@ import { getRepositoryToken } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';-import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';@@ -34,7 +34,7 @@ describe('PermissionsService', () => {useValue: {},},{- provide: ApplicationService,+ provide: getRepositoryToken(ApplicationEntity),useValue: {},},],diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.tsindex a2f64f024ce..cc28745b229 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.ts@@ -4,7 +4,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';-import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';@@ -27,7 +26,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheUserRoleModule,WorkspaceCacheModule,RoleTargetModule,- ApplicationModule,],providers: [ApiKeyRoleService, PermissionsService],exports: [PermissionsService, ApiKeyRoleService],diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.tsindex a3f8cc4f4c3..9fb0566c866 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts@@ -7,7 +7,11 @@ import { isDefined } from 'twenty-shared/utils';import { In, Repository } from 'typeorm';import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';-import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';import { TOOL_PERMISSION_FLAGS } from 'src/engine/metadata-modules/permissions/constants/tool-permission-flags';import {PermissionsException,@@ -28,7 +32,8 @@ export class PermissionsService {private readonly apiKeyRoleService: ApiKeyRoleService,@InjectRepository(RoleEntity)private readonly roleRepository: Repository<RoleEntity>,- private readonly applicationService: ApplicationService,+ @InjectRepository(ApplicationEntity)+ private readonly applicationRepository: Repository<ApplicationEntity>,) {}private isToolPermission(feature: string) {@@ -183,11 +188,18 @@ export class PermissionsService {}if (applicationId) {- const applicationRoleId =- await this.applicationService.findApplicationRoleId(- applicationId,- workspaceId,+ const application = await this.applicationRepository.findOne({+ where: { id: applicationId, workspaceId },+ });++ if (!isDefined(application) || !isDefined(application.defaultRoleId)) {+ throw new ApplicationException(+ `Could not find application ${applicationId}`,+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,);+ }++ const applicationRoleId = application.defaultRoleId;const role = await this.roleRepository.findOne({where: { id: applicationRoleId, workspaceId },diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.tsindex 45ca9974227..8da0debb3ed 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.ts@@ -1,4 +1,4 @@-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { type ApplicationEntity } from 'src/engine/core-modules/application/application.entity';export const TWENTY_STANDARD_APPLICATION = {@@ -8,7 +8,7 @@ export const TWENTY_STANDARD_APPLICATION = {'Twenty is an open-source CRM that allows you to manage your sales and customer relationships',version: '1.0.0',sourcePath: 'cli-sync',- sourceType: AppRegistrationSourceType.LOCAL,+ sourceType: ApplicationRegistrationSourceType.LOCAL,} as const satisfies Pick<ApplicationEntity,| 'universalIdentifier'diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.tsindex 7773492965e..313c84521cf 100644--- a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts@@ -9,7 +9,7 @@ import { type CommonResponseBody } from 'test/integration/metadata/types/common-import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';-import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';+import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';type VariableFields = Pick<ApplicationRegistrationVariableEntity,diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snapindex 4b1d21d552e..4bb2897930b 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snap@@ -4,10 +4,8 @@ exports[`Install application should fail when feature flag is disabled should fa{"extensions": {"code": "FORBIDDEN",- "subCode": "FORBIDDEN",- "userFriendlyMessage": "You do not have permission to perform this action.",+ "userFriendlyMessage": "An error occurred.",},- "message": "Application installation from tarball is not enabled",- "name": "ForbiddenError",+ "message": "Feature flag "IS_APPLICATION_ENABLED" is not enabled for this workspace",}`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application.integration-spec.ts.snapindex bc5966fd394..3f0787dc1c6 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application.integration-spec.ts.snap@@ -1,5 +1,17 @@// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing+exports[`Install application should fail when entity does not exist should fail with execution error when installing non-existent app registration 1`] = `+{+ "extensions": {+ "code": "NOT_FOUND",+ "subCode": "APPLICATION_NOT_FOUND",+ "userFriendlyMessage": "Application not found.",+ },+ "message": "Application registration with id 20202020-0000-0000-0000-000000000000 not found",+ "name": "NotFoundError",+}+`;+exports[`Install application should fail when entity does not exist should fail when a role has an invalid universalIdentifier 1`] = `{"extensions": {@@ -34,27 +46,3 @@ exports[`Install application should fail when entity does not exist should fail"name": "GraphQLError",}`;--exports[`Install application should fail when entity does not exist should fail with execution error when deleting non-existent field metadata 1`] = `-{- "eventId": Any<String>,- "extensions": {- "action": {- "metadataName": "fieldMetadata",- "type": "delete",- "universalIdentifier": Any<String>,- },- "code": "APPLICATION_INSTALLATION_FAILED",- "errors": {- "actionTranspilation": {- "code": "ENTITY_NOT_FOUND",- "message": "Could not find flat entity with universal identifier 20202020-6110-4547-9fd0-2525257a2c3f",- },- },- "exceptionEventId": Any<String>,- "userFriendlyMessage": "Migration execution failed.",- },- "message": "Migration action 'delete' for 'fieldMetadata' failed",- "name": "GraphQLError",-}-`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application-feature-flag-disabled.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application-feature-flag-disabled.integration-spec.tsindex f3c3065da99..c6f2381129d 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application-feature-flag-disabled.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application-feature-flag-disabled.integration-spec.ts@@ -1,20 +1,30 @@+import { FeatureFlagKey } from 'twenty-shared/types';import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';import { installApplication } from 'test/integration/metadata/suites/application/utils/install-application.util';+import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';describe('Install application should fail when feature flag is disabled', () => {+ beforeAll(async () => {+ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_APPLICATION_ENABLED,+ value: false,+ expectToFail: false,+ });+ });++ afterAll(async () => {+ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_APPLICATION_ENABLED,+ value: true,+ expectToFail: false,+ });+ });+it('should fail with forbidden error when feature flag is disabled', async () => {const { errors } = await installApplication({expectToFail: true,input: {- workspaceMigration: {- actions: [- {- type: 'delete',- metadataName: 'fieldMetadata',- universalIdentifier: '20202020-784f-4042-b58f-ae8dbf718f6e',- },- ],- },+ appRegistrationId: '20202020-0000-0000-0000-000000000000',},});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application.integration-spec.tsindex 929cf887407..0556e403cd1 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-install-application.integration-spec.ts@@ -12,8 +12,6 @@ const INVALID_UUID_APP_ID = uuidv4();const INVALID_UUID_ROLE_ID = uuidv4();describe('Install application should fail when entity does not exist', () => {- let appCreated = false;-beforeAll(async () => {await updateFeatureFlag({featureFlag:@@ -21,15 +19,15 @@ describe('Install application should fail when entity does not exist', () => {value: true,expectToFail: false,});+ });+ beforeEach(async () => {await setupApplicationForSync({applicationUniversalIdentifier: INVALID_UUID_APP_ID,name: 'Test Invalid UUID App',description: 'App for testing UUID v4 validation',sourcePath: 'test-invalid-uuid',});-- appCreated = true;}, 60000);afterAll(async () => {@@ -42,29 +40,40 @@ describe('Install application should fail when entity does not exist', () => {});afterEach(async () => {- if (!appCreated) {- return;+ try {+ await uninstallApplication({+ universalIdentifier: INVALID_UUID_APP_ID,+ expectToFail: false,+ });+ } catch {+ // May fail if the test didn't install/sync}- await uninstallApplication({- universalIdentifier: INVALID_UUID_APP_ID,- expectToFail: false,- });+ await globalThis.testDataSource.query(+ `DELETE FROM core."file" WHERE "applicationId" IN (+ SELECT id FROM core."application" WHERE "universalIdentifier" = $1+ )`,+ [INVALID_UUID_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."application"+ WHERE "universalIdentifier" = $1`,+ [INVALID_UUID_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [INVALID_UUID_APP_ID],+ );});- it('should fail with execution error when deleting non-existent field metadata', async () => {+ it('should fail with execution error when installing non-existent app registration', async () => {const { errors } = await installApplication({expectToFail: true,input: {- workspaceMigration: {- actions: [- {- type: 'delete',- metadataName: 'fieldMetadata',- universalIdentifier: '20202020-6110-4547-9fd0-2525257a2c3f',- },- ],- },+ appRegistrationId: '20202020-0000-0000-0000-000000000000',},});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-sync-application-object-system-fields.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-sync-application-object-system-fields.integration-spec.tsindex 2ddf0722b15..65c7db04cb7 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/failing-sync-application-object-system-fields.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-sync-application-object-system-fields.integration-spec.ts@@ -3,7 +3,6 @@ import { buildBaseManifest } from 'test/integration/metadata/suites/application/import { buildDefaultObjectManifest } from 'test/integration/metadata/suites/application/utils/build-default-object-manifest.util';import { setupApplicationForSync } from 'test/integration/metadata/suites/application/utils/setup-application-for-sync.util';import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';-import { uninstallApplication } from 'test/integration/metadata/suites/application/utils/uninstall-application.util';import { type Manifest, type ObjectManifest } from 'twenty-shared/application';import {type EachTestingContext,@@ -157,8 +156,6 @@ const failingSyncApplicationSystemFieldsTestCases: SyncApplicationTestingContext];describe('Sync application should fail due to object system fields integrity', () => {- let appCreated = false;-beforeAll(async () => {await setupApplicationForSync({applicationUniversalIdentifier: TEST_APP_ID,@@ -166,19 +163,32 @@ describe('Sync application should fail due to object system fields integrity', (description: 'App for testing system field validation',sourcePath: 'test-system-fields',});-- appCreated = true;}, 60000);- afterEach(async () => {- if (!appCreated) {- return;- }+ afterAll(async () => {+ await globalThis.testDataSource.query(+ `DELETE FROM core."role" WHERE "universalIdentifier" = $1`,+ [TEST_ROLE_ID],+ );- await uninstallApplication({- universalIdentifier: TEST_APP_ID,- expectToFail: false,- });+ await globalThis.testDataSource.query(+ `DELETE FROM core."file" WHERE "applicationId" IN (+ SELECT id FROM core."application" WHERE "universalIdentifier" = $1+ )`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."application"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );});it.each(diff --git a/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.tsindex d2e36c72190..a0c6594e825 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts@@ -68,8 +68,8 @@ describe('Marketplace Catalog Sync (integration)', () => {(id, "universalIdentifier", name, "oAuthClientId","oAuthRedirectUris", "oAuthScopes", "workspaceId","sourceType", "sourcePackage", "latestAvailableVersion",- "marketplaceDisplayData")- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)`,+ "marketplaceDisplayData", "isListed")+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,[id,params.universalIdentifier,@@ -84,6 +84,7 @@ describe('Marketplace Catalog Sync (integration)', () => {params.marketplaceDisplayData? JSON.stringify(params.marketplaceDisplayData): null,+ true,],);diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-field.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-field.integration-spec.tsindex 8300dd44998..c7c4e9e6a1c 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-field.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-field.integration-spec.ts@@ -52,10 +52,38 @@ describe('Manifest update - fields', () => {}, 60000);afterEach(async () => {- await uninstallApplication({- universalIdentifier: TEST_APP_ID,- expectToFail: false,- });+ try {+ await uninstallApplication({+ universalIdentifier: TEST_APP_ID,+ expectToFail: false,+ });+ } catch {+ // May fail if the test didn't fully install/sync+ }++ await globalThis.testDataSource.query(+ `DELETE FROM core."role" WHERE "universalIdentifier" = $1`,+ [TEST_ROLE_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."file" WHERE "applicationId" IN (+ SELECT id FROM core."application" WHERE "universalIdentifier" = $1+ )`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."application"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );});it('should create a new field when added to manifest on second sync', async () => {diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-object.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-object.integration-spec.tsindex 11381ef4d7f..443d651eab2 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-object.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-object.integration-spec.ts@@ -41,10 +41,38 @@ describe('Manifest update - objects', () => {}, 60000);afterEach(async () => {- await uninstallApplication({- universalIdentifier: TEST_APP_ID,- expectToFail: false,- });+ try {+ await uninstallApplication({+ universalIdentifier: TEST_APP_ID,+ expectToFail: false,+ });+ } catch {+ // May fail if the test didn't fully install/sync+ }++ await globalThis.testDataSource.query(+ `DELETE FROM core."role" WHERE "universalIdentifier" = $1`,+ [TEST_ROLE_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."file" WHERE "applicationId" IN (+ SELECT id FROM core."application" WHERE "universalIdentifier" = $1+ )`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."application"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );});it('should create a new object when added to manifest on second sync', async () => {diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-role.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-role.integration-spec.tsindex 48a9352520c..02891cefa02 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-role.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-role.integration-spec.ts@@ -7,6 +7,7 @@ import { type Manifest } from 'twenty-shared/application';import { v4 as uuidv4 } from 'uuid';const TEST_APP_ID = uuidv4();+const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';const TEST_ROLE_ID = uuidv4();const TEST_SECOND_ROLE_ID = uuidv4();@@ -50,10 +51,38 @@ describe('Manifest update - roles', () => {}, 60000);afterEach(async () => {- await uninstallApplication({- universalIdentifier: TEST_APP_ID,- expectToFail: false,- });+ try {+ await uninstallApplication({+ universalIdentifier: TEST_APP_ID,+ expectToFail: false,+ });+ } catch {+ // Application may not have been installed if the test failed early+ }++ await globalThis.testDataSource.query(+ `DELETE FROM core."role" WHERE "universalIdentifier" IN ($1, $2)`,+ [TEST_ROLE_ID, TEST_SECOND_ROLE_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."file" WHERE "applicationId" IN (+ SELECT id FROM core."application" WHERE "universalIdentifier" = $1+ )`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."application"+ WHERE "universalIdentifier" = $1 AND "workspaceId" = $2`,+ [TEST_APP_ID, TEST_WORKSPACE_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1 AND "workspaceId" = $2`,+ [TEST_APP_ID, TEST_WORKSPACE_ID],+ );});it('should create a new role when added to manifest on second sync', async () => {diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-skill.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-skill.integration-spec.tsindex 498c0d0faa2..59940485584 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-skill.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-update-skill.integration-spec.ts@@ -39,10 +39,38 @@ describe('Manifest update - skills', () => {}, 60000);afterEach(async () => {- await uninstallApplication({- universalIdentifier: TEST_APP_ID,- expectToFail: false,- });+ try {+ await uninstallApplication({+ universalIdentifier: TEST_APP_ID,+ expectToFail: false,+ });+ } catch {+ // May fail if the test didn't fully install/sync+ }++ await globalThis.testDataSource.query(+ `DELETE FROM core."role" WHERE "universalIdentifier" = $1`,+ [TEST_ROLE_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."file" WHERE "applicationId" IN (+ SELECT id FROM core."application" WHERE "universalIdentifier" = $1+ )`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."application"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );});it('should create a new skill when added to manifest on second sync', async () => {diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-sync-application-workspace-migration.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-sync-application-workspace-migration.integration-spec.tsindex 3259187b364..dfe9b0829aa 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-sync-application-workspace-migration.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-sync-application-workspace-migration.integration-spec.ts@@ -61,28 +61,48 @@ const buildManifest = (});describe('syncApplication', () => {- let appCreated = false;-- beforeAll(async () => {+ beforeEach(async () => {await setupApplicationForSync({applicationUniversalIdentifier: TEST_APP_ID,name: 'Test Application',description: 'A test application',sourcePath: 'test-sync',});-- appCreated = true;}, 60000);afterEach(async () => {- if (!appCreated) {- return;+ try {+ await uninstallApplication({+ universalIdentifier: TEST_APP_ID,+ expectToFail: false,+ });+ } catch {+ // May fail if the test didn't fully install/sync}- await uninstallApplication({- universalIdentifier: TEST_APP_ID,- expectToFail: false,- });+ await globalThis.testDataSource.query(+ `DELETE FROM core."role" WHERE "universalIdentifier" = $1`,+ [TEST_ROLE_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."file" WHERE "applicationId" IN (+ SELECT id FROM core."application" WHERE "universalIdentifier" = $1+ )`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."application"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );++ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [TEST_APP_ID],+ );});it('should return workspace migration actions on initial sync then on second sync with field rename and new role', async () => {diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/generate-application-token.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/generate-application-token.util.tsindex abc1dbd1db2..6a0668d3a15 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/generate-application-token.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/generate-application-token.util.ts@@ -4,7 +4,7 @@ import { type CommonResponseBody } from 'test/integration/metadata/types/common-import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';-import { type ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';+import { type ApplicationTokenPairDTO } from 'src/engine/core-modules/application/application-oauth/dtos/application-token-pair.dto';export const generateApplicationToken = async ({applicationId,diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/install-application-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/install-application-query-factory.util.tsindex 6bfcc719dd7..b9996c12720 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/install-application-query-factory.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/install-application-query-factory.util.ts@@ -1,13 +1,8 @@import gql from 'graphql-tag';export type InstallApplicationFactoryInput = {- workspaceMigration: {- actions: {- type: 'delete';- metadataName: string;- universalIdentifier: string;- }[];- };+ appRegistrationId: string;+ version?: string;};export const installApplicationQueryFactory = ({@@ -16,11 +11,15 @@ export const installApplicationQueryFactory = ({input: InstallApplicationFactoryInput;}) => ({query: gql`- mutation InstallApplication($workspaceMigration: WorkspaceMigrationInput!) {- installApplication(workspaceMigration: $workspaceMigration)+ mutation InstallApplication($appRegistrationId: String!, $version: String) {+ installApplication(+ appRegistrationId: $appRegistrationId+ version: $version+ )}`,variables: {- workspaceMigration: input.workspaceMigration,+ appRegistrationId: input.appRegistrationId,+ version: input.version,},});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.tsindex 67e0744f7c1..c205aaad59a 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.ts@@ -1,6 +1,9 @@-import { createOneApplication } from 'test/integration/metadata/suites/application/utils/create-one-application.util';+import crypto from 'crypto';+import { uploadApplicationFile } from 'test/integration/metadata/suites/application/utils/upload-application-file.util';+const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';+export const setupApplicationForSync = async ({applicationUniversalIdentifier,name,@@ -12,16 +15,46 @@ export const setupApplicationForSync = async ({description: string;sourcePath: string;}) => {- await createOneApplication({- universalIdentifier: applicationUniversalIdentifier,- name,- description,- version: '1.0.0',- sourcePath,- expectToFail: false,- });+ const registrationId = crypto.randomUUID();+ const applicationId = crypto.randomUUID();+ const oAuthClientId = crypto.randomUUID();++ await globalThis.testDataSource.query(+ `INSERT INTO core."applicationRegistration"+ (id, "universalIdentifier", name, description, "oAuthClientId",+ "oAuthRedirectUris", "oAuthScopes", "workspaceId", "sourceType")+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,+ [+ registrationId,+ applicationUniversalIdentifier,+ name,+ description,+ oAuthClientId,+ [],+ [],+ TEST_WORKSPACE_ID,+ 'local',+ ],+ );++ await globalThis.testDataSource.query(+ `INSERT INTO core."application"+ (id, "universalIdentifier", name, description, version, "sourcePath",+ "sourceType", "workspaceId", "applicationRegistrationId")+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,+ [+ applicationId,+ applicationUniversalIdentifier,+ name,+ description,+ '1.0.0',+ sourcePath,+ 'local',+ TEST_WORKSPACE_ID,+ registrationId,+ ],+ );- // File upload uses multipart which requires real timersjest.useRealTimers();const packageJson = JSON.stringify({