Skip to content

Commit eedb163

Browse files
authored
Field metadata and object metadata v1 relicas (#16230)
# Introduction Related twentyhq/core-team-issues#1911 Nearly done with all functional v1 implemen removal Will remain dead code methods that I will detect using knip
1 parent 59f0f6f commit eedb163

File tree

45 files changed

+61
-2504
lines changed

Some content is hidden

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

45 files changed

+61
-2504
lines changed

packages/twenty-server/src/engine/core-modules/application/application-sync.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import { FlatRouteTrigger } from 'src/engine/metadata-modules/route-trigger/type
3737
import { ServerlessFunctionLayerService } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.service';
3838
import { ServerlessFunctionV2Service } from 'src/engine/metadata-modules/serverless-function/services/serverless-function-v2.service';
3939
import { FlatServerlessFunction } from 'src/engine/metadata-modules/serverless-function/types/flat-serverless-function.type';
40-
import { computeMetadataNameFromLabel } from 'src/engine/metadata-modules/utils/validate-name-and-label-are-sync-or-throw.util';
40+
import { computeMetadataNameFromLabelOrThrow } from 'src/engine/metadata-modules/utils/compute-metadata-name-from-label-or-throw.util';
4141
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-validate-build-and-run-service';
4242

4343
@Injectable()
@@ -264,7 +264,7 @@ export class ApplicationSyncService {
264264

265265
for (const fieldToCreate of fieldsToCreate) {
266266
const createFieldInput: CreateFieldInput = {
267-
name: computeMetadataNameFromLabel(fieldToCreate.label),
267+
name: computeMetadataNameFromLabelOrThrow(fieldToCreate.label),
268268
type: fieldToCreate.type,
269269
label: fieldToCreate.label,
270270
description: fieldToCreate.description ?? undefined,

packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
1515
import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
1616
import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
1717
import { FieldMetadataResolver } from 'src/engine/metadata-modules/field-metadata/field-metadata.resolver';
18-
import { FieldMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/field-metadata/interceptors/field-metadata-graphql-api-exception.interceptor';
19-
import { FieldMetadataEnumValidationService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-enum-validation.service';
20-
import { FieldMetadataMorphRelationService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-morph-relation.service';
21-
import { FieldMetadataRelationService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-relation.service';
22-
import { FieldMetadataValidationService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-validation.service';
2318
import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata.service';
24-
import { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
25-
import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
2619
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
2720
import { FlatFieldMetadataModule } from 'src/engine/metadata-modules/flat-field-metadata/flat-field-metadata.module';
2821
import { IndexMetadataModule } from 'src/engine/metadata-modules/index-metadata/index-metadata.module';
@@ -38,6 +31,7 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-
3831
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
3932
import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
4033
import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
34+
import { FieldMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/field-metadata/interceptors/field-metadata-graphql-api-exception.interceptor';
4135

4236
import { FieldMetadataEntity } from './field-metadata.entity';
4337

@@ -72,14 +66,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
7266
IndexMetadataModule,
7367
WorkspaceManyOrAllFlatEntityMapsCacheModule,
7468
],
75-
services: [
76-
IsFieldMetadataDefaultValue,
77-
FieldMetadataService,
78-
FieldMetadataMorphRelationService,
79-
FieldMetadataRelationService,
80-
FieldMetadataValidationService,
81-
FieldMetadataEnumValidationService,
82-
],
69+
services: [FieldMetadataService],
8370
resolvers: [
8471
{
8572
EntityClass: FieldMetadataEntity,
@@ -104,22 +91,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
10491
],
10592
}),
10693
],
107-
providers: [
108-
IsFieldMetadataDefaultValue,
109-
IsFieldMetadataOptions,
110-
FieldMetadataService,
111-
FieldMetadataRelationService,
112-
FieldMetadataMorphRelationService,
113-
FieldMetadataValidationService,
114-
FieldMetadataEnumValidationService,
115-
FieldMetadataResolver,
116-
],
117-
exports: [
118-
FieldMetadataService,
119-
FieldMetadataRelationService,
120-
FieldMetadataMorphRelationService,
121-
FieldMetadataEnumValidationService,
122-
FieldMetadataValidationService,
123-
],
94+
providers: [FieldMetadataService, FieldMetadataResolver],
95+
exports: [FieldMetadataService],
12496
})
12597
export class FieldMetadataModule {}

packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)