diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.entity.ts b/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.entity.ts index e471517e4cc..eae0960aae4 100644 --- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.entity.ts +++ b/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.entity.ts @@ -1,4 +1,4 @@ -import { Field, ObjectType, registerEnumType } from '@nestjs/graphql'; +import { Field, ObjectType } from '@nestjs/graphql'; import { IDField } from '@ptc-org/nestjs-query-graphql'; import { @@ -18,20 +18,13 @@ import { import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application-registration/application-registration-variable.entity'; -import { type MarketplaceDisplayData } from 'src/engine/core-modules/marketplace/types/marketplace-display-data.type'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/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/marketplace/types/marketplace-display-data.type'; import { UserEntity } from 'src/engine/core-modules/user/user.entity'; import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; -export enum AppRegistrationSourceType { - NPM = 'npm', - TARBALL = 'tarball', - LOCAL = 'local', -} - -registerEnumType(AppRegistrationSourceType, { - name: 'AppRegistrationSourceType', -}); +export { AppRegistrationSourceType }; @Entity({ name: 'applicationRegistration', schema: 'core' }) @ObjectType('ApplicationRegistration') diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/enums/app-registration-source-type.enum.ts b/packages/twenty-server/src/engine/core-modules/application-registration/enums/app-registration-source-type.enum.ts new file mode 100644 index 00000000000..ab88a4b37ac --- /dev/null +++ b/packages/twenty-server/src/engine/core-modules/application-registration/enums/app-registration-source-type.enum.ts @@ -0,0 +1,11 @@ +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-registration/services/app-tarball-upload.service.ts b/packages/twenty-server/src/engine/core-modules/application-registration/services/app-tarball-upload.service.ts index 138cc39f5ab..3c8b63f8c50 100644 --- a/packages/twenty-server/src/engine/core-modules/application-registration/services/app-tarball-upload.service.ts +++ b/packages/twenty-server/src/engine/core-modules/application-registration/services/app-tarball-upload.service.ts @@ -9,10 +9,8 @@ import { isDefined } from 'twenty-shared/utils'; import { Repository } from 'typeorm'; import { v4 } from 'uuid'; -import { - ApplicationRegistrationEntity, - AppRegistrationSourceType, -} from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/enums/app-registration-source-type.enum'; import { ApplicationRegistrationException, ApplicationRegistrationExceptionCode, 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.ts index 8e435b156f9..b78c602ea28 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 @@ -15,10 +15,8 @@ import { UpdateDateColumn, } from 'typeorm'; -import { - ApplicationRegistrationEntity, - AppRegistrationSourceType, -} from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/enums/app-registration-source-type.enum'; import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity'; import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity'; import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity'; diff --git a/packages/twenty-server/src/engine/core-modules/application/resolvers/application-development.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/resolvers/application-development.resolver.ts index 0e2e35f238b..8795dad19d2 100644 --- a/packages/twenty-server/src/engine/core-modules/application/resolvers/application-development.resolver.ts +++ b/packages/twenty-server/src/engine/core-modules/application/resolvers/application-development.resolver.ts @@ -12,7 +12,7 @@ import { FileFolder } from 'twenty-shared/types'; import type { FileUpload } from 'graphql-upload/processRequest.mjs'; -import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/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 { diff --git a/packages/twenty-server/src/engine/core-modules/application/services/application.service.ts b/packages/twenty-server/src/engine/core-modules/application/services/application.service.ts index a4635b89a64..f63dc429342 100644 --- a/packages/twenty-server/src/engine/core-modules/application/services/application.service.ts +++ b/packages/twenty-server/src/engine/core-modules/application/services/application.service.ts @@ -5,7 +5,7 @@ import { FileFolder } from 'twenty-shared/types'; import { isDefined } from 'twenty-shared/utils'; import { type QueryRunner, type Repository } from 'typeorm'; -import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/enums/app-registration-source-type.enum'; import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity'; import { ApplicationException, diff --git a/packages/twenty-server/src/engine/core-modules/marketplace/services/marketplace-catalog-sync.service.ts b/packages/twenty-server/src/engine/core-modules/marketplace/services/marketplace-catalog-sync.service.ts index 375e2f6fe52..0f752f28cc9 100644 --- a/packages/twenty-server/src/engine/core-modules/marketplace/services/marketplace-catalog-sync.service.ts +++ b/packages/twenty-server/src/engine/core-modules/marketplace/services/marketplace-catalog-sync.service.ts @@ -5,10 +5,8 @@ import { isDefined } from 'twenty-shared/utils'; import { Repository } from 'typeorm'; import { v4 } from 'uuid'; -import { - ApplicationRegistrationEntity, - AppRegistrationSourceType, -} from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/enums/app-registration-source-type.enum'; import { MARKETPLACE_CATALOG_INDEX } from 'src/engine/core-modules/marketplace/constants/marketplace-catalog-index.constant'; import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/marketplace/crons/marketplace-catalog-sync.cron.job'; import { MarketplaceAppDTO } from 'src/engine/core-modules/marketplace/dtos/marketplace-app.dto'; 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.ts index 0e2109901e7..4509ae74364 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-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/enums/app-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'; 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.ts index 7f3358cadb0..868ba859b9e 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-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/enums/app-registration-source-type.enum'; import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type'; import { generateMorphOrRelationFlatFieldMetadataPair, 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.ts index f0e08a9f2b9..f6fb0423364 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-registration/application-registration.entity'; +import { AppRegistrationSourceType } from 'src/engine/core-modules/application-registration/enums/app-registration-source-type.enum'; import { type ApplicationEntity } from 'src/engine/core-modules/application/application.entity'; export const TWENTY_STANDARD_APPLICATION = {