mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve view migration command (#13403)

Browse Source 
Remove unused imports.
Improve typing.
This commit is contained in:
Raphaël Bosi
2025-07-24 11:50:25 +02:00
committed by GitHub
parent e18005f937
commit 7653be8fde
2 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/twenty-server/src/database/commands/database-command.module.ts
View File

@ -13,12 +13,6 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
import { ViewField } from 'src/engine/metadata-modules/view/view-field.entity';
import { ViewFilterGroup } from 'src/engine/metadata-modules/view/view-filter-group.entity';
import { ViewFilter } from 'src/engine/metadata-modules/view/view-filter.entity';
import { ViewGroup } from 'src/engine/metadata-modules/view/view-group.entity';
import { ViewSort } from 'src/engine/metadata-modules/view/view-sort.entity';
import { View } from 'src/engine/metadata-modules/view/view.entity';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
import { DevSeederModule } from 'src/engine/workspace-manager/dev-seeder/dev-seeder.module';
import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
@ -32,18 +26,7 @@ import { DataSeedWorkspaceCommand } from './data-seed-dev-workspace.command';
imports: [
UpgradeVersionCommandModule,
TypeOrmModule.forFeature(
[
Workspace,
View,
ViewField,
ViewFilter,
ViewSort,
ViewGroup,
ViewFilterGroup,
],
'core',
),
TypeOrmModule.forFeature([Workspace], 'core'),
// Cron command dependencies
MessagingImportManagerModule,

25
packages/twenty-server/src/database/commands/views-migration/migrate-views-to-core.command.ts
View File

@ -36,18 +36,6 @@ export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrat
constructor(
@InjectRepository(Workspace, 'core')
protected readonly workspaceRepository: Repository<Workspace>,
@InjectRepository(View, 'core')
private readonly coreViewRepository: Repository<View>,
@InjectRepository(ViewField, 'core')
private readonly coreViewFieldRepository: Repository<ViewField>,
@InjectRepository(ViewFilter, 'core')
private readonly coreViewFilterRepository: Repository<ViewFilter>,
@InjectRepository(ViewSort, 'core')
private readonly coreViewSortRepository: Repository<ViewSort>,
@InjectRepository(ViewGroup, 'core')
private readonly coreViewGroupRepository: Repository<ViewGroup>,
@InjectRepository(ViewFilterGroup, 'core')
private readonly coreViewFilterGroupRepository: Repository<ViewFilterGroup>,
private readonly featureFlagService: FeatureFlagService,
protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
@InjectDataSource('core')
@ -242,7 +230,7 @@ export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrat
workspaceId: string,
queryRunner: QueryRunner,
): Promise<void> {
const coreView = {
const coreView: Partial<View> = {
id: workspaceView.id,
name: workspaceView.name,
objectMetadataId: workspaceView.objectMetadataId,
@ -277,7 +265,7 @@ export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrat
queryRunner: QueryRunner,
): Promise<void> {
for (const field of workspaceViewFields) {
const coreViewField = {
const coreViewField: Partial<ViewField> = {
id: field.id,
fieldMetadataId: field.fieldMetadataId,
viewId: field.viewId,
@ -319,13 +307,12 @@ export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrat
);
}
const coreViewFilter = {
const coreViewFilter: Partial<ViewFilter> = {
id: filter.id,
fieldMetadataId: filter.fieldMetadataId,
viewId: filter.viewId,
operand: filter.operand,
value: parsedValue,
displayValue: filter.displayValue,
viewFilterGroupId: filter.viewFilterGroupId,
workspaceId,
createdAt: new Date(filter.createdAt),
@ -354,7 +341,7 @@ export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrat
const direction = sort.direction.toUpperCase() as ViewSortDirection;
const coreViewSort = {
const coreViewSort: Partial<ViewSort> = {
id: sort.id,
fieldMetadataId: sort.fieldMetadataId,
viewId: sort.viewId,
@ -384,7 +371,7 @@ export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrat
continue;
}
const coreViewGroup = {
const coreViewGroup: Partial<ViewGroup> = {
id: group.id,
fieldMetadataId: group.fieldMetadataId,
viewId: group.viewId,
@ -409,7 +396,7 @@ export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrat
queryRunner: QueryRunner,
): Promise<void> {
for (const filterGroup of workspaceViewFilterGroups) {
const coreViewFilterGroup = {
const coreViewFilterGroup: Partial<ViewFilterGroup> = {
id: filterGroup.id,
viewId: filterGroup.viewId,
logicalOperator: