From 7b943457c85bba0f0c732d8b8c353648bf7a9f26 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Thu, 25 Jul 2024 20:43:12 +0200 Subject: [PATCH] Update sync-metadata to use feature-flag core module --- .../engine/core-modules/feature-flag/feature-flag.module.ts | 5 +++-- .../workspace-sync-metadata/factories/index.ts | 2 -- .../workspace-sync-metadata.module.ts | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts index a79d3a729..76beb418b 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts @@ -5,6 +5,7 @@ import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm'; import { TypeORMModule } from 'src/database/typeorm/typeorm.module'; import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity'; +import { FeatureFlagFactory } from 'src/engine/core-modules/feature-flag/services/feature-flags.factory'; import { IsFeatureEnabledService } from 'src/engine/core-modules/feature-flag/services/is-feature-enabled.service'; @Module({ @@ -18,7 +19,7 @@ import { IsFeatureEnabledService } from 'src/engine/core-modules/feature-flag/se resolvers: [], }), ], - exports: [IsFeatureEnabledService], - providers: [IsFeatureEnabledService], + exports: [IsFeatureEnabledService, FeatureFlagFactory], + providers: [IsFeatureEnabledService, FeatureFlagFactory], }) export class FeatureFlagModule {} diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/index.ts index db218ca73..8b11b063e 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/index.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/index.ts @@ -1,12 +1,10 @@ import { StandardIndexFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-index.factory'; -import { FeatureFlagFactory } from '../../../core-modules/feature-flag/services/feature-flags.factory'; import { StandardFieldFactory } from './standard-field.factory'; import { StandardObjectFactory } from './standard-object.factory'; import { StandardRelationFactory } from './standard-relation.factory'; export const workspaceSyncMetadataFactories = [ - FeatureFlagFactory, StandardFieldFactory, StandardObjectFactory, StandardRelationFactory, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts index 2e189fdeb..447f60e0c 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts @@ -2,6 +2,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity'; +import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module'; import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity'; @@ -21,6 +22,7 @@ import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/works @Module({ imports: [ + FeatureFlagModule, WorkspaceMigrationBuilderModule, WorkspaceMigrationRunnerModule, TypeOrmModule.forFeature(