Fix front data model edition + non nullable workspaceCustom application migration (#16016)

# Introduction Two things: - Enforcing non nullable workspace custom application Id for any workspace - Fixing front non editable data models following https://github.com/twentyhq/twenty/pull/15911 that associate any custom entities to an applicationId. The front was putting everything as readonly when under an app ( we will have to handle the twenty standard application in the future too ) ## Fallback ### Migration The non nullable migration will fail when released, that's why it's being swallowed and re-run in an upgrade command post workspace custom application creation for those that miss one. Allowing the migration to pass in the end The typeorm migration still need to exists for any new workspaces ### GetCurrentUser In order to dynamically display isReadOnly in data model settings we're fetching the workspaceCustomApplicationId through the `getCurrentUser` If not fallback this endpoint would throw until we're handling existing workspaces that do not have a custom workspace application The fallback should be removed post release
2025-11-24 14:39:04 +01:00
parent 2b80d9e015
commit 8299488f21
33 changed files with 368 additions and 58 deletions
@@ -3,6 +3,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';

 import { CreateWorkspaceCustomApplicationCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-create-workspace-custom-application.command';
 import { SetStandardApplicationNotUninstallableCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-set-standard-application-not-uninstallable.command';
+import { WorkspaceCustomApplicationIdNonNullableCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-workspace-custom-application-id-non-nullable-migration.command';
 import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.module';
@@ -16,10 +17,12 @@ import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-sc
  providers: [
    CreateWorkspaceCustomApplicationCommand,
    SetStandardApplicationNotUninstallableCommand,
+    WorkspaceCustomApplicationIdNonNullableCommand,
  ],
  exports: [
    CreateWorkspaceCustomApplicationCommand,
    SetStandardApplicationNotUninstallableCommand,
+    WorkspaceCustomApplicationIdNonNullableCommand,
  ],
 })
 export class V1_12_UpgradeVersionCommandModule {}
@@ -0,0 +1,72 @@
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { DataSource, Repository } from 'typeorm';
+
+import {
+  ActiveOrSuspendedWorkspacesMigrationCommandRunner,
+  type RunOnWorkspaceArgs,
+} from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+
+@Command({
+  name: '1-12-workspace-custom-application-id-non-nullable-migration',
+  description: 'Create FK_3b1acb13a5dac9956d1a4b32755 foreign key',
+})
+export class WorkspaceCustomApplicationIdNonNullableCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner {
+  private hasRunOnce = false;
+
+  constructor(
+    @InjectRepository(WorkspaceEntity)
+    protected readonly workspaceRepository: Repository<WorkspaceEntity>,
+    protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
+    @InjectDataSource()
+    private readonly coreDataSource: DataSource,
+  ) {
+    super(workspaceRepository, twentyORMGlobalManager);
+  }
+
+  override async runOnWorkspace({
+    options,
+  }: RunOnWorkspaceArgs): Promise<void> {
+    if (this.hasRunOnce) {
+      this.logger.log(
+        'Skipping has already been run once WorkspaceCustomApplicationIdNonNullableCommand',
+      );
+
+      return;
+    }
+
+    const queryRunner = this.coreDataSource.createQueryRunner();
+
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+    if (!options.dryRun) {
+      try {
+        await queryRunner.query(
+          `ALTER TABLE "core"."workspace" DROP CONSTRAINT "FK_3b1acb13a5dac9956d1a4b32755"`,
+        );
+        await queryRunner.query(
+          `ALTER TABLE "core"."workspace" ALTER COLUMN "workspaceCustomApplicationId" SET NOT NULL`,
+        );
+        await queryRunner.query(
+          `ALTER TABLE "core"."workspace" ADD CONSTRAINT "FK_3b1acb13a5dac9956d1a4b32755" FOREIGN KEY ("workspaceCustomApplicationId") REFERENCES "core"."application"("id") ON DELETE RESTRICT ON UPDATE NO ACTION`,
+        );
+
+        await queryRunner.commitTransaction();
+        this.logger.log(
+          'Successfully run WorkspaceCustomApplicationIdNonNullableCommand',
+        );
+        this.hasRunOnce = true;
+      } catch (error) {
+        await queryRunner.rollbackTransaction();
+        this.logger.log(
+          `Rollbacking WorkspaceCustomApplicationIdNonNullableCommand: ${error.message}`,
+        );
+      } finally {
+        await queryRunner.release();
+      }
+    }
+  }
+}
@@ -23,6 +23,7 @@ import { CleanOrphanedUserWorkspacesCommand } from 'src/database/commands/upgrad
 import { CreateTwentyStandardApplicationCommand } from 'src/database/commands/upgrade-version-command/1-11/1-11-create-twenty-standard-application.command';
 import { CreateWorkspaceCustomApplicationCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-create-workspace-custom-application.command';
 import { SetStandardApplicationNotUninstallableCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-set-standard-application-not-uninstallable.command';
+import { WorkspaceCustomApplicationIdNonNullableCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-workspace-custom-application-id-non-nullable-migration.command';
 import { FixLabelIdentifierPositionAndVisibilityCommand } from 'src/database/commands/upgrade-version-command/1-6/1-6-fix-label-identifier-position-and-visibility.command';
 import { BackfillWorkflowManualTriggerAvailabilityCommand } from 'src/database/commands/upgrade-version-command/1-7/1-7-backfill-workflow-manual-trigger-availability.command';
 import { DeduplicateUniqueFieldsCommand } from 'src/database/commands/upgrade-version-command/1-8/1-8-deduplicate-unique-fields.command';
@@ -79,9 +80,10 @@ export class UpgradeCommand extends UpgradeCommandRunner {
    protected readonly seedStandardApplicationsCommand: CreateTwentyStandardApplicationCommand,

    // 1.12 Commands
-    protected readonlysetStandardApplicationNotUninstallableCommand: SetStandardApplicationNotUninstallableCommand,
+    protected readonly setStandardApplicationNotUninstallableCommand: SetStandardApplicationNotUninstallableCommand,
    protected readonly createTwentyStandardApplicationCommand: CreateTwentyStandardApplicationCommand,
    protected readonly createWorkspaceCustomApplicationCommand: CreateWorkspaceCustomApplicationCommand,
+    protected readonly workspaceCustomApplicationIdNonNullableCommand: WorkspaceCustomApplicationIdNonNullableCommand,
  ) {
    super(
      workspaceRepository,
@@ -138,10 +140,11 @@ export class UpgradeCommand extends UpgradeCommandRunner {
    };

    const commands_1120: VersionCommands = {
-      beforeSyncMetadata: [this.createWorkspaceCustomApplicationCommand],
-      afterSyncMetadata: [
-        this.readonlysetStandardApplicationNotUninstallableCommand,
+      beforeSyncMetadata: [
+        this.createWorkspaceCustomApplicationCommand,
+        this.workspaceCustomApplicationIdNonNullableCommand,
      ],
+      afterSyncMetadata: [this.setStandardApplicationNotUninstallableCommand],
    };

    this.allCommands = {