From 3aedce9af7ce421cbdb18ef655060af4aaa8c36c Mon Sep 17 00:00:00 2001
From: Paul Rastoin <45004772+prastoin@users.noreply.github.com>
Date: Thu, 26 Feb 2026 11:24:01 +0100
Subject: [PATCH] Fix remaining non v4 uuid universal identifier (#18263)

---
 ...-standard-universal-identifiers.command.ts | 69 ++++++++++++++++++-
 .../constants/standard-skill.constant.ts      | 20 +++---
 .../constants/standard-object.constant.ts     |  2 +-
 3 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-fix-invalid-standard-universal-identifiers.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-fix-invalid-standard-universal-identifiers.command.ts
index 572ab6969d..e884530756 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-fix-invalid-standard-universal-identifiers.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-fix-invalid-standard-universal-identifiers.command.ts
@@ -9,6 +9,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { STANDARD_AGENT } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-agent.constant';
 import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant';
+import { STANDARD_SKILL } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 
 const OLD_ROLE_ADMIN_UNIVERSAL_IDENTIFIER =
@@ -431,6 +432,72 @@ const STANDARD_OBJECT_MISMATCHES = [
     oldValue: '4749c4d8-5770-4b2e-4c1d-78a9b70a1a7a',
     newValue: '8678dde9-a804-4a9e-80e3-9af35e471ec5',
   },
+  {
+    table: 'core."fieldMetadata"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-92d0-1d7f-a126-25ededa6b142',
+    newValue: '20202020-1ecc-4562-84c9-ff3a2f6cce85',
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-6155-838a-b64e-44a791fbdc13',
+    newValue: STANDARD_SKILL['workflow-building'].universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-e225-f5c7-3d56-45feaa36f2e6',
+    newValue: STANDARD_SKILL['data-manipulation'].universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-398f-0d7a-82db-4f43bc7e7044',
+    newValue: STANDARD_SKILL['dashboard-building'].universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-c66a-5fed-4a74-46e0b42a6332',
+    newValue: STANDARD_SKILL['metadata-building'].universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-db75-4fca-6813-4c7db0f964a0',
+    newValue: STANDARD_SKILL.research.universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-5eb9-e775-cf4e-4f22be7be362',
+    newValue: STANDARD_SKILL['code-interpreter'].universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-2c7f-5b77-dfa4-494b84752ab7',
+    newValue: STANDARD_SKILL.xlsx.universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-c3d1-e0c9-2f93-45648b8bbd26',
+    newValue: STANDARD_SKILL.pdf.universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-6f15-2432-0537-4e23a2efd1cb',
+    newValue: STANDARD_SKILL.docx.universalIdentifier,
+  },
+  {
+    table: 'core."skill"',
+    column: '"universalIdentifier"',
+    oldValue: '20202020-c81b-baf8-5255-4c34bd0eac9b',
+    newValue: STANDARD_SKILL.pptx.universalIdentifier,
+  },
 ];
 
 @Command({
@@ -462,7 +529,7 @@ export class FixInvalidStandardUniversalIdentifiersCommand extends ActiveOrSuspe
 
     if (isDryRun) {
       this.logger.log(
-        `[DRY RUN] Would fix role, agent, and ${STANDARD_OBJECT_MISMATCHES.length} standard object universal identifier mismatches in workspace ${workspaceId}. Skipping.`,
+        `[DRY RUN] Would fix role, agent, skill, and ${STANDARD_OBJECT_MISMATCHES.length} standard object universal identifier mismatches in workspace ${workspaceId}. Skipping.`,
       );
 
       return;
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts
index aa16b50c9f..f2bcf156ba 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts
@@ -1,33 +1,33 @@
 export const STANDARD_SKILL = {
   'workflow-building': {
-    universalIdentifier: '20202020-6155-838a-b64e-44a791fbdc13',
+    universalIdentifier: '20202020-297a-4721-a1f3-c79a30b5420e',
   },
   'data-manipulation': {
-    universalIdentifier: '20202020-e225-f5c7-3d56-45feaa36f2e6',
+    universalIdentifier: '20202020-0c39-4523-9543-e6c2a807937e',
   },
   'dashboard-building': {
-    universalIdentifier: '20202020-398f-0d7a-82db-4f43bc7e7044',
+    universalIdentifier: '20202020-ffdb-4623-abfb-036b9abeb121',
   },
   'metadata-building': {
-    universalIdentifier: '20202020-c66a-5fed-4a74-46e0b42a6332',
+    universalIdentifier: '20202020-7b80-4a14-8fb9-d1512b89c078',
   },
   research: {
-    universalIdentifier: '20202020-db75-4fca-6813-4c7db0f964a0',
+    universalIdentifier: '20202020-6b44-417e-a31f-5560b59d300a',
   },
   'code-interpreter': {
-    universalIdentifier: '20202020-5eb9-e775-cf4e-4f22be7be362',
+    universalIdentifier: '20202020-a97a-4069-8e44-fc18faea7b97',
   },
   xlsx: {
-    universalIdentifier: '20202020-2c7f-5b77-dfa4-494b84752ab7',
+    universalIdentifier: '20202020-b1ac-484f-bf27-82c2114f5707',
   },
   pdf: {
-    universalIdentifier: '20202020-c3d1-e0c9-2f93-45648b8bbd26',
+    universalIdentifier: '20202020-8c9e-454c-86a8-a0495f3c4f61',
   },
   docx: {
-    universalIdentifier: '20202020-6f15-2432-0537-4e23a2efd1cb',
+    universalIdentifier: '20202020-2d1f-43b6-b84e-ce8b1e7b2c3e',
   },
   pptx: {
-    universalIdentifier: '20202020-c81b-baf8-5255-4c34bd0eac9b',
+    universalIdentifier: '20202020-13b5-4e60-9359-b8519ef1c07d',
   },
 } as const satisfies Record<
   string,
diff --git a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
index a875434a89..854d4836fe 100644
--- a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
+++ b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
@@ -2624,7 +2624,7 @@ export const STANDARD_OBJECTS = {
         universalIdentifier: '20202020-46d0-4e7f-bc26-74c0edaeb619',
       },
       calendarStartDay: {
-        universalIdentifier: '20202020-92d0-1d7f-a126-25ededa6b142',
+        universalIdentifier: '20202020-1ecc-4562-84c9-ff3a2f6cce85',
       },
       numberFormat: {
         universalIdentifier: '20202020-7f40-4e7f-b126-11c0eda6b141',