diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-upgrade-version-command.module.ts index 2f3af3c198..9ce14fb641 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-upgrade-version-command.module.ts @@ -7,7 +7,6 @@ import { FixMorphRelationFieldNamesCommand } from 'src/database/commands/upgrade import { IdentifyWebhookMetadataCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-identify-webhook-metadata.command'; import { MakeWebhookUniversalIdentifierAndApplicationIdNotNullableMigrationCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-make-webhook-universal-identifier-and-application-id-not-nullable-migration.command'; import { MigrateAttachmentToMorphRelationsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-attachment-to-morph-relations.command'; -import { MigrateFavoritesToNavigationMenuItemsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-favorites-to-navigation-menu-items.command'; import { MigrateNoteTargetToMorphRelationsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-note-target-to-morph-relations.command'; import { MigrateSendEmailRecipientsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-send-email-recipients.command'; import { MigrateTaskTargetToMorphRelationsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-task-target-to-morph-relations.command'; @@ -70,7 +69,6 @@ import { TaskTargetWorkspaceEntity } from 'src/modules/task/standard-objects/tas providers: [ FixMorphRelationFieldNamesCommand, MigrateAttachmentToMorphRelationsCommand, - MigrateFavoritesToNavigationMenuItemsCommand, MigrateNoteTargetToMorphRelationsCommand, MigrateTaskTargetToMorphRelationsCommand, IdentifyWebhookMetadataCommand, @@ -84,7 +82,6 @@ import { TaskTargetWorkspaceEntity } from 'src/modules/task/standard-objects/tas exports: [ FixMorphRelationFieldNamesCommand, MigrateAttachmentToMorphRelationsCommand, - MigrateFavoritesToNavigationMenuItemsCommand, MigrateNoteTargetToMorphRelationsCommand, MigrateTaskTargetToMorphRelationsCommand, IdentifyWebhookMetadataCommand, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-migrate-favorites-to-navigation-menu-items.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command.ts similarity index 99% rename from packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-migrate-favorites-to-navigation-menu-items.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command.ts index 1eb3530678..3a55d2e246 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-migrate-favorites-to-navigation-menu-items.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command.ts @@ -40,7 +40,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta const WORKSPACE_LEVEL = 'workspace-level'; @Command({ - name: 'upgrade:1-17:migrate-favorites-to-navigation-menu-items', + name: 'upgrade:1-18:migrate-favorites-to-navigation-menu-items', description: 'Migrate favorites and favoriteFolders to navigationMenuItems', }) export class MigrateFavoritesToNavigationMenuItemsCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-upgrade-version-command.module.ts index 613b03333c..1ffb08bb75 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-upgrade-version-command.module.ts @@ -6,6 +6,7 @@ import { BackfillMessageChannelThrottleRetryAfterCommand } from 'src/database/co import { BackfillStandardViewsAndFieldMetadataCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-backfill-standard-views-and-field-metadata.command'; import { MigrateActivityRichTextAttachmentFileIdsCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-activity-rich-text-attachment-file-ids.command'; import { MigrateAttachmentFilesCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-attachment-files.command'; +import { MigrateFavoritesToNavigationMenuItemsCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command'; import { MigratePersonAvatarFilesCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-person-avatar-files.command'; import { ApplicationModule } from 'src/engine/core-modules/application/application.module'; import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity'; @@ -13,10 +14,14 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature- import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module'; import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity'; import { FilesFieldModule } from 'src/engine/core-modules/file/files-field/files-field.module'; +import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module'; import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module'; +import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module'; +import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module'; +import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module'; import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module'; import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module'; import { AttachmentWorkspaceEntity } from 'src/modules/attachment/standard-objects/attachment.workspace-entity'; @@ -30,6 +35,8 @@ import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/perso PersonWorkspaceEntity, FileEntity, AttachmentWorkspaceEntity, + ObjectMetadataEntity, + FieldMetadataEntity, ]), DataSourceModule, FeatureFlagModule, @@ -40,9 +47,12 @@ import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/perso FieldMetadataModule, ApplicationModule, FilesFieldModule, + UserWorkspaceModule, + WorkspaceMigrationModule, ], providers: [ MigratePersonAvatarFilesCommand, + MigrateFavoritesToNavigationMenuItemsCommand, MigrateAttachmentFilesCommand, BackfillFileSizeAndMimeTypeCommand, MigrateActivityRichTextAttachmentFileIdsCommand, @@ -51,6 +61,7 @@ import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/perso ], exports: [ MigratePersonAvatarFilesCommand, + MigrateFavoritesToNavigationMenuItemsCommand, MigrateAttachmentFilesCommand, BackfillFileSizeAndMimeTypeCommand, MigrateActivityRichTextAttachmentFileIdsCommand, 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 8d2b22eda0..d340c6aaf8 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,7 +15,6 @@ import { FixMorphRelationFieldNamesCommand } from 'src/database/commands/upgrade import { IdentifyWebhookMetadataCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-identify-webhook-metadata.command'; import { MakeWebhookUniversalIdentifierAndApplicationIdNotNullableMigrationCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-make-webhook-universal-identifier-and-application-id-not-nullable-migration.command'; import { MigrateAttachmentToMorphRelationsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-attachment-to-morph-relations.command'; -import { MigrateFavoritesToNavigationMenuItemsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-favorites-to-navigation-menu-items.command'; import { MigrateNoteTargetToMorphRelationsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-note-target-to-morph-relations.command'; import { MigrateTaskTargetToMorphRelationsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-task-target-to-morph-relations.command'; import { MigrateWorkflowCodeStepsCommand } from 'src/database/commands/upgrade-version-command/1-17/1-17-migrate-workflow-code-steps.command'; @@ -24,6 +23,7 @@ import { BackfillMessageChannelThrottleRetryAfterCommand } from 'src/database/co import { BackfillStandardViewsAndFieldMetadataCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-backfill-standard-views-and-field-metadata.command'; import { MigrateActivityRichTextAttachmentFileIdsCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-activity-rich-text-attachment-file-ids.command'; import { MigrateAttachmentFilesCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-attachment-files.command'; +import { MigrateFavoritesToNavigationMenuItemsCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command'; import { MigratePersonAvatarFilesCommand } from 'src/database/commands/upgrade-version-command/1-18/1-18-migrate-person-avatar-files.command'; import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service'; import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; @@ -48,7 +48,6 @@ export class UpgradeCommand extends UpgradeCommandRunner { protected readonly backfillApplicationPackageFilesCommand: BackfillApplicationPackageFilesCommand, protected readonly deleteFileRecordsAndUpdateTableCommand: DeleteFileRecordsAndUpdateTableCommand, protected readonly migrateAttachmentToMorphRelationsCommand: MigrateAttachmentToMorphRelationsCommand, - protected readonly migrateFavoritesToNavigationMenuItemsCommand: MigrateFavoritesToNavigationMenuItemsCommand, protected readonly migrateNoteTargetToMorphRelationsCommand: MigrateNoteTargetToMorphRelationsCommand, protected readonly migrateTaskTargetToMorphRelationsCommand: MigrateTaskTargetToMorphRelationsCommand, protected readonly identifyWebhookMetadataCommand: IdentifyWebhookMetadataCommand, @@ -57,6 +56,7 @@ export class UpgradeCommand extends UpgradeCommandRunner { protected readonly fixMorphRelationFieldNamesCommand: FixMorphRelationFieldNamesCommand, // 1.18 Commands + protected readonly migrateFavoritesToNavigationMenuItemsCommand: MigrateFavoritesToNavigationMenuItemsCommand, protected readonly migratePersonAvatarFilesCommand: MigratePersonAvatarFilesCommand, protected readonly backfillFileSizeAndMimeTypeCommand: BackfillFileSizeAndMimeTypeCommand, protected readonly migrateAttachmentFilesCommand: MigrateAttachmentFilesCommand, @@ -76,7 +76,6 @@ export class UpgradeCommand extends UpgradeCommandRunner { const commands_1170: VersionCommands = [ this.migrateAttachmentToMorphRelationsCommand, - this.migrateFavoritesToNavigationMenuItemsCommand, this.migrateNoteTargetToMorphRelationsCommand, this.migrateTaskTargetToMorphRelationsCommand, this.identifyWebhookMetadataCommand, @@ -89,6 +88,7 @@ export class UpgradeCommand extends UpgradeCommandRunner { ]; const commands_1180: VersionCommands = [ + this.migrateFavoritesToNavigationMenuItemsCommand, this.migratePersonAvatarFilesCommand, this.migrateAttachmentFilesCommand, this.migrateActivityRichTextAttachmentFileIdsCommand, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts index 35e5be517f..95f7ac272c 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts @@ -4,4 +4,5 @@ export const DEFAULT_FEATURE_FLAGS = [ FeatureFlagKey.IS_ATTACHMENT_MIGRATED, FeatureFlagKey.IS_NOTE_TARGET_MIGRATED, FeatureFlagKey.IS_TASK_TARGET_MIGRATED, + FeatureFlagKey.IS_NAVIGATION_MENU_ITEM_ENABLED, ] as const satisfies FeatureFlagKey[];