From 779c5033818dca1810f562370279b50477910aab Mon Sep 17 00:00:00 2001 From: Weiko Date: Fri, 20 Dec 2024 11:42:42 +0100 Subject: [PATCH] Fix sync metadata default value not being synced (#9163) ## Context We used to not sync defaultValue and recently introduced a change in https://github.com/twentyhq/twenty/blob/3340f01c312de9d9ca6a4f19f45437d9d850fff0/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts with shouldNotOverrideDefaultValue to sync it for specific field metadata type that can't be overwritten by the user. This means we should have removed 'defaultValue' from commonFieldPropertiesToIgnore list since it was handled differently. This PR fixes that Before Screenshot 2024-12-20 at 11 04 09 After Screenshot 2024-12-20 at 11 04 55 --- .../0-40/0-40-record-position-backfill.command.ts | 2 +- .../0-40/0-40-upgrade-version.command.ts | 12 ++++++------ .../comparators/workspace-field.comparator.ts | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts index b889c904c..53c26618d 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts @@ -9,7 +9,7 @@ import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace- import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; @Command({ - name: 'migrate-0.40:backfill-record-position', + name: 'upgrade-0.40:record-position-backfill', description: 'Backfill record position', }) export class RecordPositionBackfillCommand extends ActiveWorkspacesCommandRunner { diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts index f0063834a..e60b537bb 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts @@ -38,6 +38,12 @@ export class UpgradeTo0_40Command extends ActiveWorkspacesCommandRunner { 'Running command to upgrade to 0.40: must start with phone calling code otherwise SyncMetadata will fail', ); + await this.recordPositionBackfillCommand.executeActiveWorkspacesCommand( + passedParam, + options, + workspaceIds, + ); + await this.phoneCallingCodeCreateColumnCommand.executeActiveWorkspacesCommand( passedParam, options, @@ -50,12 +56,6 @@ export class UpgradeTo0_40Command extends ActiveWorkspacesCommandRunner { workspaceIds, ); - await this.recordPositionBackfillCommand.executeActiveWorkspacesCommand( - passedParam, - options, - workspaceIds, - ); - await this.viewGroupNoValueBackfillCommand.executeActiveWorkspacesCommand( passedParam, options, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts index edc92cd39..863a12496 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts @@ -26,7 +26,6 @@ const commonFieldPropertiesToIgnore = [ 'gate', 'asExpression', 'generatedType', - 'defaultValue', 'isLabelSyncedWithName', ];