Rename fieldId and objectId into fieldMetadataId and objectMetadataId (#2421)

* Rename fieldId and objectId into fieldMetadataId and objectMetadataId * Fix tests
2023-11-10 14:35:18 +01:00
parent 57cfd4db45
commit 618513afcd
136 changed files with 544 additions and 402 deletions
--- a/server/src/database/typeorm-seeds/metadata/field-metadata.ts
+++ b/server/src/database/typeorm-seeds/metadata/field-metadata.ts
@ -107,10 +107,10 @@ export const seedFieldMetadata = async (
        workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
        isActive: true,
        type: 'TEXT',
-        name: 'objectId',
+        name: 'objectMetadataId',
        label: 'Object Id',
        targetColumnMap: {
-          value: 'objectId',
+          value: 'objectMetadataId',
        },
        description: 'View target object',
        icon: null,
@ -138,10 +138,10 @@ export const seedFieldMetadata = async (
        workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
        isActive: true,
        type: 'TEXT',
-        name: 'fieldId',
+        name: 'fieldMetadataId',
        label: 'Field Id',
        targetColumnMap: {
-          value: 'fieldId',
+          value: 'fieldMetadataId',
        },
        description: 'View Field target field',
        icon: null,
@ -214,10 +214,10 @@ export const seedFieldMetadata = async (
        workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
        isActive: true,
        type: 'TEXT',
-        name: 'fieldId',
+        name: 'fieldMetadataId',
        label: 'Field Id',
        targetColumnMap: {
-          value: 'fieldId',
+          value: 'fieldMetadataId',
        },
        description: 'View Filter target field',
        icon: null,
@ -290,10 +290,10 @@ export const seedFieldMetadata = async (
        workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
        isActive: true,
        type: 'TEXT',
-        name: 'fieldId',
+        name: 'fieldMetadataId',
        label: 'Field Id',
        targetColumnMap: {
-          value: 'fieldId',
+          value: 'fieldMetadataId',
        },
        description: 'View Sort target field',
        icon: null,
--- a/server/src/database/typeorm-seeds/tenant/view-fields.ts
+++ b/server/src/database/typeorm-seeds/tenant/view-fields.ts
@ -11,7 +11,7 @@ export const seedViewFields = async (
    .insert()
    .into(`${schemaName}.${tableName}`, [
      'id',
-      'fieldId',
+      'fieldMetadataId',
      'viewId',
      'position',
      'isVisible',
@ -21,7 +21,7 @@ export const seedViewFields = async (
    .values([
      {
        id: '46a72a5b-276e-4241-a05f-c054410aebcb',
-        fieldId: 'name',
+        fieldMetadataId: 'name',
        viewId: '10bec73c-0aea-4cc4-a3b2-8c2186f29b43',
        position: 0,
        isVisible: true,
@ -29,7 +29,7 @@ export const seedViewFields = async (
      },
      {
        id: 'f15b26ff-8f79-49dd-8f53-4286dd1af846',
-        fieldId: 'name',
+        fieldMetadataId: 'name',
        viewId: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        position: 0,
        isVisible: true,
@ -37,7 +37,7 @@ export const seedViewFields = async (
      },
      {
        id: '8d1dbb50-c97f-42c4-8575-3d2c9bdeb6e5',
-        fieldId: 'domainName',
+        fieldMetadataId: 'domainName',
        viewId: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        position: 1,
        isVisible: true,
@ -45,7 +45,7 @@ export const seedViewFields = async (
      },
      {
        id: '33833b3b-4e02-4f10-91fc-c594422952af',
-        fieldId: 'accountOwner',
+        fieldMetadataId: 'accountOwner',
        viewId: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        position: 2,
        isVisible: true,
@ -53,7 +53,7 @@ export const seedViewFields = async (
      },
      {
        id: 'c750a968-832e-4812-a1a2-74f515af55c1',
-        fieldId: 'createdAt',
+        fieldMetadataId: 'createdAt',
        viewId: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        position: 3,
        isVisible: true,
@ -61,7 +61,7 @@ export const seedViewFields = async (
      },
      {
        id: '2fde3187-a0bc-47ca-80bd-457bd826fb4a',
-        fieldId: 'employees',
+        fieldMetadataId: 'employees',
        viewId: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        position: 4,
        isVisible: true,
@ -69,7 +69,7 @@ export const seedViewFields = async (
      },
      {
        id: '2fead26f-3f4f-4a4d-a4c6-3abe7b2f74c9',
-        fieldId: 'linkedin',
+        fieldMetadataId: 'linkedin',
        viewId: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        position: 5,
        isVisible: true,
@ -77,7 +77,7 @@ export const seedViewFields = async (
      },
      {
        id: '0cffa82a-c851-4e17-b46c-2c4642d78329',
-        fieldId: 'address',
+        fieldMetadataId: 'address',
        viewId: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        position: 6,
        isVisible: true,
@ -85,7 +85,7 @@ export const seedViewFields = async (
      },
      {
        id: '93a68c4a-8107-409a-9adb-06305ffbd692',
-        fieldId: 'displayName',
+        fieldMetadataId: 'displayName',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 0,
        isVisible: true,
@ -93,7 +93,7 @@ export const seedViewFields = async (
      },
      {
        id: 'd955ee31-6316-4cb2-af71-9609dede4d7e',
-        fieldId: 'email',
+        fieldMetadataId: 'email',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 1,
        isVisible: true,
@ -101,7 +101,7 @@ export const seedViewFields = async (
      },
      {
        id: 'bceb4d84-8ad1-4a0e-9333-efb870b42eb8',
-        fieldId: 'company',
+        fieldMetadataId: 'company',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 2,
        isVisible: true,
@ -109,7 +109,7 @@ export const seedViewFields = async (
      },
      {
        id: 'bef874d4-f349-4cdb-ae28-6e9fc497449b',
-        fieldId: 'phone',
+        fieldMetadataId: 'phone',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 3,
        isVisible: true,
@ -117,7 +117,7 @@ export const seedViewFields = async (
      },
      {
        id: 'e06f920d-1af9-404d-8b9a-4f97c4009a4a',
-        fieldId: 'createdAt',
+        fieldMetadataId: 'createdAt',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 4,
        isVisible: true,
@ -125,7 +125,7 @@ export const seedViewFields = async (
      },
      {
        id: '92d94ee8-31fc-4025-a427-29291abb2b19',
-        fieldId: 'city',
+        fieldMetadataId: 'city',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 5,
        isVisible: true,
@ -133,7 +133,7 @@ export const seedViewFields = async (
      },
      {
        id: 'b38e4022-1559-40da-bd5e-29d89b6c8330',
-        fieldId: 'jobTitle',
+        fieldMetadataId: 'jobTitle',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 6,
        isVisible: true,
@ -141,7 +141,7 @@ export const seedViewFields = async (
      },
      {
        id: '30147fab-9666-4db5-a11b-20af4544c712',
-        fieldId: 'linkedin',
+        fieldMetadataId: 'linkedin',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 7,
        isVisible: true,
@ -149,7 +149,7 @@ export const seedViewFields = async (
      },
      {
        id: 'f0870949-21ac-46a2-b3ec-d1b0107c434c',
-        fieldId: 'x',
+        fieldMetadataId: 'x',
        viewId: '6095799e-b48f-4e00-b071-10818083593a',
        position: 8,
        isVisible: true,
--- a/server/src/database/typeorm-seeds/tenant/views.ts
+++ b/server/src/database/typeorm-seeds/tenant/views.ts
@ -9,31 +9,36 @@ export const seedViews = async (
  await workspaceDataSource
    .createQueryBuilder()
    .insert()
-    .into(`${schemaName}.${tableName}`, ['id', 'name', 'objectId', 'type'])
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'name',
+      'objectMetadataId',
+      'type',
+    ])
    .orIgnore()
    .values([
      {
        id: '37a8a866-eb17-4e76-9382-03143a2f6a80',
        name: 'All companies',
-        objectId: 'company',
+        objectMetadataId: 'company',
        type: 'table',
      },
      {
        id: '6095799e-b48f-4e00-b071-10818083593a',
        name: 'All people',
-        objectId: 'person',
+        objectMetadataId: 'person',
        type: 'table',
      },
      {
        id: 'e26f66b7-f890-4a5c-b4d2-ec09987b5308',
        name: 'All opportunities',
-        objectId: 'company',
+        objectMetadataId: 'company',
        type: 'kanban',
      },
      {
        id: '10bec73c-0aea-4cc4-a3b2-8c2186f29b43',
        name: 'All Companies (V2)',
-        objectId: '1a8487a0-480c-434e-b4c7-e22408b97047',
+        objectMetadataId: '1a8487a0-480c-434e-b4c7-e22408b97047',
        type: 'table',
      },
    ])
--- a/server/src/metadata/standard-objects/view-fields/view-fields.metadata.ts
+++ b/server/src/metadata/standard-objects/view-fields/view-fields.metadata.ts
@ -9,10 +9,10 @@ const viewFieldsMetadata = {
  fields: [
    {
      type: 'TEXT',
-      name: 'fieldId',
+      name: 'fieldMetadataId',
      label: 'Field Id',
      targetColumnMap: {
-        value: 'fieldId',
+        value: 'fieldMetadataId',
      },
      description: 'View Field target field',
      icon: null,
--- a/server/src/metadata/standard-objects/view-filters/view-filters.metadata.ts
+++ b/server/src/metadata/standard-objects/view-filters/view-filters.metadata.ts
@ -9,10 +9,10 @@ const viewFiltersMetadata = {
  fields: [
    {
      type: 'TEXT',
-      name: 'fieldId',
+      name: 'fieldMetadataId',
      label: 'Field Id',
      targetColumnMap: {
-        value: 'fieldId',
+        value: 'fieldMetadataId',
      },
      description: 'View Filter target field',
      icon: null,
--- a/server/src/metadata/standard-objects/view-sorts/view-sorts.metadata.ts
+++ b/server/src/metadata/standard-objects/view-sorts/view-sorts.metadata.ts
@ -9,10 +9,10 @@ const viewSortsMetadata = {
  fields: [
    {
      type: 'TEXT',
-      name: 'fieldId',
+      name: 'fieldMetadataId',
      label: 'Field Id',
      targetColumnMap: {
-        value: 'fieldId',
+        value: 'fieldMetadataId',
      },
      description: 'View Sort target field',
      icon: null,
--- a/server/src/metadata/standard-objects/views/views.metadata.ts
+++ b/server/src/metadata/standard-objects/views/views.metadata.ts
@ -20,10 +20,10 @@ const viewsMetadata = {
    },
    {
      type: 'TEXT',
-      name: 'objectId',
+      name: 'objectMetadataId',
      label: 'Object Id',
      targetColumnMap: {
-        value: 'objectId',
+        value: 'objectMetadataId',
      },
      description: 'View target object',
      icon: null,
--- a/server/src/metadata/tenant-initialisation/standard-objects-prefill-data/standard-objects-prefill-data.ts
+++ b/server/src/metadata/tenant-initialisation/standard-objects-prefill-data/standard-objects-prefill-data.ts
@ -58,27 +58,27 @@ export const standardObjectsPrefillData = async (
    const createdViews = await entityManager
      .createQueryBuilder()
      .insert()
-      .into(`${schemaName}.view`, ['name', 'objectId', 'type'])
+      .into(`${schemaName}.view`, ['name', 'objectMetadataId', 'type'])
      .orIgnore()
      .values([
        {
          name: 'All companies',
-          objectId: 'company',
+          objectMetadataId: 'company',
          type: 'table',
        },
        {
          name: 'All people',
-          objectId: 'person',
+          objectMetadataId: 'person',
          type: 'table',
        },
        {
          name: 'All opportunities',
-          objectId: 'company',
+          objectMetadataId: 'company',
          type: 'kanban',
        },
        {
          name: 'All Companies (V2)',
-          objectId: companyIdMap['Airbnb'],
+          objectMetadataId: companyIdMap['Airbnb'],
          type: 'table',
        },
      ])
@ -94,7 +94,7 @@ export const standardObjectsPrefillData = async (
      .createQueryBuilder()
      .insert()
      .into(`${schemaName}.viewField`, [
-        'fieldId',
+        'fieldMetadataId',
        'viewId',
        'position',
        'isVisible',
@ -103,161 +103,161 @@ export const standardObjectsPrefillData = async (
      .orIgnore()
      .values([
        {
-          fieldId: 'name',
+          fieldMetadataId: 'name',
          viewId: viewIdMap['All Companies (V2)'],
          position: 0,
          isVisible: true,
          size: 180,
        },
        {
-          fieldId: 'name',
+          fieldMetadataId: 'name',
          viewId: viewIdMap['All companies'],
          position: 0,
          isVisible: true,
          size: 180,
        },
        {
-          fieldId: 'domainName',
+          fieldMetadataId: 'domainName',
          viewId: viewIdMap['All companies'],
          position: 1,
          isVisible: true,
          size: 100,
        },
        {
-          fieldId: 'accountOwner',
+          fieldMetadataId: 'accountOwner',
          viewId: viewIdMap['All companies'],
          position: 2,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'createdAt',
+          fieldMetadataId: 'createdAt',
          viewId: viewIdMap['All companies'],
          position: 3,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'employees',
+          fieldMetadataId: 'employees',
          viewId: viewIdMap['All companies'],
          position: 4,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'linkedin',
+          fieldMetadataId: 'linkedin',
          viewId: viewIdMap['All companies'],
          position: 5,
          isVisible: true,
          size: 170,
        },
        {
-          fieldId: 'address',
+          fieldMetadataId: 'address',
          viewId: viewIdMap['All companies'],
          position: 6,
          isVisible: true,
          size: 170,
        },
        {
-          fieldId: 'displayName',
+          fieldMetadataId: 'displayName',
          viewId: viewIdMap['All people'],
          position: 0,
          isVisible: true,
          size: 210,
        },
        {
-          fieldId: 'email',
+          fieldMetadataId: 'email',
          viewId: viewIdMap['All people'],
          position: 1,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'company',
+          fieldMetadataId: 'company',
          viewId: viewIdMap['All people'],
          position: 2,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'phone',
+          fieldMetadataId: 'phone',
          viewId: viewIdMap['All people'],
          position: 3,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'createdAt',
+          fieldMetadataId: 'createdAt',
          viewId: viewIdMap['All people'],
          position: 4,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'city',
+          fieldMetadataId: 'city',
          viewId: viewIdMap['All people'],
          position: 5,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'jobTitle',
+          fieldMetadataId: 'jobTitle',
          viewId: viewIdMap['All people'],
          position: 6,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'linkedin',
+          fieldMetadataId: 'linkedin',
          viewId: viewIdMap['All people'],
          position: 7,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'x',
+          fieldMetadataId: 'x',
          viewId: viewIdMap['All people'],
          position: 8,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'amount',
+          fieldMetadataId: 'amount',
          viewId: viewIdMap['All opportunities'],
          position: 0,
          isVisible: true,
          size: 180,
        },
        {
-          fieldId: 'probability',
+          fieldMetadataId: 'probability',
          viewId: viewIdMap['All opportunities'],
          position: 1,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'closeDate',
+          fieldMetadataId: 'closeDate',
          viewId: viewIdMap['All opportunities'],
          position: 2,
          isVisible: true,
          size: 100,
        },
        {
-          fieldId: 'company',
+          fieldMetadataId: 'company',
          viewId: viewIdMap['All opportunities'],
          position: 3,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'createdAt',
+          fieldMetadataId: 'createdAt',
          viewId: viewIdMap['All opportunities'],
          position: 4,
          isVisible: true,
          size: 150,
        },
        {
-          fieldId: 'pointOfContact',
+          fieldMetadataId: 'pointOfContact',
          viewId: viewIdMap['All opportunities'],
          position: 5,
          isVisible: true,
--- a/server/src/metadata/tenant-migration/migrations/1697618011-addViewTable.ts
+++ b/server/src/metadata/tenant-migration/migrations/1697618011-addViewTable.ts
@ -18,7 +18,7 @@ export const addViewTable: TenantMigrationTableAction[] = [
        action: TenantMigrationColumnActionType.CREATE,
      },
      {
-        columnName: 'objectId',
+        columnName: 'objectMetadataId',
        columnType: 'varchar',
        action: TenantMigrationColumnActionType.CREATE,
      },
--- a/server/src/metadata/tenant-migration/migrations/1697618012-addViewFieldTable.ts
+++ b/server/src/metadata/tenant-migration/migrations/1697618012-addViewFieldTable.ts
@ -13,7 +13,7 @@ export const addViewFieldTable: TenantMigrationTableAction[] = [
    action: 'alter',
    columns: [
      {
-        columnName: 'fieldId',
+        columnName: 'fieldMetadataId',
        columnType: 'varchar',
        action: TenantMigrationColumnActionType.CREATE,
      },
--- a/server/src/metadata/tenant-migration/migrations/1697618013-addViewFilterTable.ts
+++ b/server/src/metadata/tenant-migration/migrations/1697618013-addViewFilterTable.ts
@ -13,7 +13,7 @@ export const addViewFilterTable: TenantMigrationTableAction[] = [
    action: 'alter',
    columns: [
      {
-        columnName: 'fieldId',
+        columnName: 'fieldMetadataId',
        columnType: 'varchar',
        action: TenantMigrationColumnActionType.CREATE,
      },
--- a/server/src/metadata/tenant-migration/migrations/1697618014-addViewSortTable.ts
+++ b/server/src/metadata/tenant-migration/migrations/1697618014-addViewSortTable.ts
@ -13,7 +13,7 @@ export const addViewSortTable: TenantMigrationTableAction[] = [
    action: 'alter',
    columns: [
      {
-        columnName: 'fieldId',
+        columnName: 'fieldMetadataId',
        columnType: 'varchar',
        action: TenantMigrationColumnActionType.CREATE,
      },