Add custom domain to Lab and move countBoolean command to 0.44 from 0.50 (#10884)

- Add customs domain to Lab
- Moving back countBoolean command to 0.44 from 0.50 (I inadvertently
moved it yesterday night...)

<img width="592" alt="Screenshot 2025-03-14 at 12 07 44"
src="https://github.com/user-attachments/assets/1d8d7b36-f392-4df0-974d-426a55760af2"
/>
This commit is contained in:
Félix Malfait
2025-03-14 15:13:44 +01:00
committed by GitHub
parent 9883472d55
commit c371dd5d27
5 changed files with 37 additions and 20 deletions

View File

@ -102,7 +102,7 @@ const AGGREGATE_OPERATION_OPTIONS = [
]; ];
@Command({ @Command({
name: 'upgrade:0-50:update-view-aggregate-operations', name: 'upgrade:0-44:update-view-aggregate-operations',
description: description:
'Update View and ViewField entities with new aggregate operations (countTrue, countFalse)', 'Update View and ViewField entities with new aggregate operations (countTrue, countFalse)',
}) })

View File

@ -2,13 +2,17 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm'; import { TypeOrmModule } from '@nestjs/typeorm';
import { InitializePermissionsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-initialize-permissions.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 { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity'; import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { Workspace } from 'src/engine/core-modules/workspace/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 { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-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 { RoleModule } from 'src/engine/metadata-modules/role/role.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-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 { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
@Module({ @Module({
imports: [ imports: [
@ -20,8 +24,14 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
WorkspaceDataSourceModule, WorkspaceDataSourceModule,
RoleModule, RoleModule,
UserRoleModule, UserRoleModule,
WorkspaceMigrationModule,
WorkspaceMigrationRunnerModule,
WorkspaceMetadataVersionModule,
], ],
providers: [InitializePermissionsCommand], providers: [
exports: [InitializePermissionsCommand], InitializePermissionsCommand,
UpdateViewAggregateOperationsCommand,
],
exports: [InitializePermissionsCommand, UpdateViewAggregateOperationsCommand],
}) })
export class V0_44_UpgradeVersionCommandModule {} export class V0_44_UpgradeVersionCommandModule {}

View File

@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm'; 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 { 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 { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { Workspace } from 'src/engine/core-modules/workspace/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 { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
@ -28,13 +27,7 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor
WorkspaceMigrationRunnerModule, WorkspaceMigrationRunnerModule,
WorkspaceMetadataVersionModule, WorkspaceMetadataVersionModule,
], ],
providers: [ providers: [MigrateRelationsToFieldMetadataCommand],
MigrateRelationsToFieldMetadataCommand, exports: [MigrateRelationsToFieldMetadataCommand],
UpdateViewAggregateOperationsCommand,
],
exports: [
MigrateRelationsToFieldMetadataCommand,
UpdateViewAggregateOperationsCommand,
],
}) })
export class V0_50_UpgradeVersionCommandModule {} export class V0_50_UpgradeVersionCommandModule {}

View File

@ -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 { 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 { 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 { 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 { 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 { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager'; import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
@ -50,10 +50,10 @@ export class UpgradeCommand extends UpgradeCommandRunner {
// 0.44 Commands // 0.44 Commands
protected readonly initializePermissionsCommand: InitializePermissionsCommand, protected readonly initializePermissionsCommand: InitializePermissionsCommand,
protected readonly updateViewAggregateOperationsCommand: UpdateViewAggregateOperationsCommand,
// 0.50 Commands // 0.50 Commands
protected readonly migrateRelationsToFieldMetadataCommand: MigrateRelationsToFieldMetadataCommand, protected readonly migrateRelationsToFieldMetadataCommand: MigrateRelationsToFieldMetadataCommand,
protected readonly updateViewAggregateOperationsCommand: UpdateViewAggregateOperationsCommand,
) { ) {
super( super(
workspaceRepository, workspaceRepository,
@ -75,14 +75,14 @@ export class UpgradeCommand extends UpgradeCommandRunner {
], ],
}; };
const commands_044: VersionCommands = { const commands_044: VersionCommands = {
beforeSyncMetadata: [this.initializePermissionsCommand], beforeSyncMetadata: [
this.initializePermissionsCommand,
this.updateViewAggregateOperationsCommand,
],
afterSyncMetadata: [], afterSyncMetadata: [],
}; };
const _commands_050: VersionCommands = { const _commands_050: VersionCommands = {
beforeSyncMetadata: [ beforeSyncMetadata: [this.migrateRelationsToFieldMetadataCommand],
this.migrateRelationsToFieldMetadataCommand,
this.updateViewAggregateOperationsCommand,
],
afterSyncMetadata: [], afterSyncMetadata: [],
}; };

View File

@ -9,7 +9,9 @@ type FeatureFlagMetadata = {
export type PublicFeatureFlag = { export type PublicFeatureFlag = {
key: Extract< key: Extract<
FeatureFlagKey, FeatureFlagKey,
FeatureFlagKey.IsWorkflowEnabled | FeatureFlagKey.IsPermissionsEnabled | FeatureFlagKey.IsWorkflowEnabled
| FeatureFlagKey.IsPermissionsEnabled
| FeatureFlagKey.IsCustomDomainEnabled
>; >;
metadata: FeatureFlagMetadata; metadata: FeatureFlagMetadata;
}; };
@ -32,4 +34,16 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [
imagePath: 'https://twenty.com/images/lab/is-permissions-enabled.png', 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: '',
},
},
]
: []),
]; ];