diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-update-view-aggregate-operations.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command.ts similarity index 99% rename from packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-update-view-aggregate-operations.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command.ts index e7b5a1576..44ff082a7 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-update-view-aggregate-operations.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command.ts @@ -102,7 +102,7 @@ const AGGREGATE_OPERATION_OPTIONS = [ ]; @Command({ - name: 'upgrade:0-50:update-view-aggregate-operations', + name: 'upgrade:0-44:update-view-aggregate-operations', description: 'Update View and ViewField entities with new aggregate operations (countTrue, countFalse)', }) diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-upgrade-version-command.module.ts index 94d9f8b94..0787dafd9 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-upgrade-version-command.module.ts @@ -2,13 +2,17 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { InitializePermissionsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-initialize-permissions.command'; +import { UpdateViewAggregateOperationsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command'; import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; 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 { RoleModule } from 'src/engine/metadata-modules/role/role.module'; import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module'; +import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module'; +import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module'; import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module'; +import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module'; @Module({ imports: [ @@ -20,8 +24,14 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works WorkspaceDataSourceModule, RoleModule, UserRoleModule, + WorkspaceMigrationModule, + WorkspaceMigrationRunnerModule, + WorkspaceMetadataVersionModule, ], - providers: [InitializePermissionsCommand], - exports: [InitializePermissionsCommand], + providers: [ + InitializePermissionsCommand, + UpdateViewAggregateOperationsCommand, + ], + exports: [InitializePermissionsCommand, UpdateViewAggregateOperationsCommand], }) export class V0_44_UpgradeVersionCommandModule {} diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts index 5b0e9c1fe..c498b310b 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts @@ -2,7 +2,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version-command/0-50/0-50-migrate-relations-to-field-metadata.command'; -import { UpdateViewAggregateOperationsCommand } from 'src/database/commands/upgrade-version-command/0-50/0-50-update-view-aggregate-operations.command'; import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; @@ -28,13 +27,7 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor WorkspaceMigrationRunnerModule, WorkspaceMetadataVersionModule, ], - providers: [ - MigrateRelationsToFieldMetadataCommand, - UpdateViewAggregateOperationsCommand, - ], - exports: [ - MigrateRelationsToFieldMetadataCommand, - UpdateViewAggregateOperationsCommand, - ], + providers: [MigrateRelationsToFieldMetadataCommand], + exports: [MigrateRelationsToFieldMetadataCommand], }) export class V0_50_UpgradeVersionCommandModule {} diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts index a0965ac13..d6d1edaba 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts @@ -15,8 +15,8 @@ import { MigrateRichTextContentPatchCommand } from 'src/database/commands/upgrad import { MigrateSearchVectorOnNoteAndTaskEntitiesCommand } from 'src/database/commands/upgrade-version-command/0-43/0-43-migrate-search-vector-on-note-and-task-entities.command'; import { UpdateDefaultViewRecordOpeningOnWorkflowObjectsCommand } from 'src/database/commands/upgrade-version-command/0-43/0-43-update-default-view-record-opening-on-workflow-objects.command'; import { InitializePermissionsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-initialize-permissions.command'; +import { UpdateViewAggregateOperationsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command'; import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version-command/0-50/0-50-migrate-relations-to-field-metadata.command'; -import { UpdateViewAggregateOperationsCommand } from 'src/database/commands/upgrade-version-command/0-50/0-50-update-view-aggregate-operations.command'; import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager'; @@ -50,10 +50,10 @@ export class UpgradeCommand extends UpgradeCommandRunner { // 0.44 Commands protected readonly initializePermissionsCommand: InitializePermissionsCommand, + protected readonly updateViewAggregateOperationsCommand: UpdateViewAggregateOperationsCommand, // 0.50 Commands protected readonly migrateRelationsToFieldMetadataCommand: MigrateRelationsToFieldMetadataCommand, - protected readonly updateViewAggregateOperationsCommand: UpdateViewAggregateOperationsCommand, ) { super( workspaceRepository, @@ -75,14 +75,14 @@ export class UpgradeCommand extends UpgradeCommandRunner { ], }; const commands_044: VersionCommands = { - beforeSyncMetadata: [this.initializePermissionsCommand], + beforeSyncMetadata: [ + this.initializePermissionsCommand, + this.updateViewAggregateOperationsCommand, + ], afterSyncMetadata: [], }; const _commands_050: VersionCommands = { - beforeSyncMetadata: [ - this.migrateRelationsToFieldMetadataCommand, - this.updateViewAggregateOperationsCommand, - ], + beforeSyncMetadata: [this.migrateRelationsToFieldMetadataCommand], afterSyncMetadata: [], }; diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts index 463188e43..91076917a 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts @@ -9,7 +9,9 @@ type FeatureFlagMetadata = { export type PublicFeatureFlag = { key: Extract< FeatureFlagKey, - FeatureFlagKey.IsWorkflowEnabled | FeatureFlagKey.IsPermissionsEnabled + | FeatureFlagKey.IsWorkflowEnabled + | FeatureFlagKey.IsPermissionsEnabled + | FeatureFlagKey.IsCustomDomainEnabled >; metadata: FeatureFlagMetadata; }; @@ -32,4 +34,16 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [ imagePath: 'https://twenty.com/images/lab/is-permissions-enabled.png', }, }, + ...(process.env.CLOUDFLARE_API_KEY + ? [ + { + key: FeatureFlagKey.IsCustomDomainEnabled as PublicFeatureFlag['key'], + metadata: { + label: 'Custom Domain', + description: 'Customize your workspace URL with your own domain.', + imagePath: '', + }, + }, + ] + : []), ];