Add KanbanFieldMetadataId on View standard object (#4604)

* Add KanbanFieldMetadataId on View standard object * Deprecate Pipeline step * Fix * Use Constants instead of raw ids * Fix * Fix query runner * Fix according to review * Fix tests * Fix tests * Fix tests
2024-03-21 18:08:27 +01:00
parent cc0e3c8a9a
commit 3fa8c4bace
36 changed files with 424 additions and 1486 deletions
--- a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/company.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/company.ts
@ -2,7 +2,7 @@ import { EntityManager } from 'typeorm';

 import companiesDemo from './companies-demo.json';

-export const companyPrefillData = async (
+export const companyPrefillDemoData = async (
  entityManager: EntityManager,
  schemaName: string,
 ) => {
--- a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts
@ -1,12 +1,11 @@
 import { DataSource, EntityManager } from 'typeorm';

 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { viewPrefillData } from 'src/engine/workspace-manager/demo-objects-prefill-data/view';
-import { companyPrefillData } from 'src/engine/workspace-manager/demo-objects-prefill-data/company';
-import { personPrefillData } from 'src/engine/workspace-manager/demo-objects-prefill-data/person';
-import { pipelineStepPrefillData } from 'src/engine/workspace-manager/demo-objects-prefill-data/pipeline-step';
 import { workspaceMemberPrefillData } from 'src/engine/workspace-manager/demo-objects-prefill-data/workspace-member';
-import { seedDemoOpportunity } from 'src/engine/workspace-manager/demo-objects-prefill-data/opportunity';
+import { viewPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/view';
+import { companyPrefillDemoData } from 'src/engine/workspace-manager/demo-objects-prefill-data/company';
+import { personPrefillDemoData } from 'src/engine/workspace-manager/demo-objects-prefill-data/person';
+import { opportunityPrefillDemoData } from 'src/engine/workspace-manager/demo-objects-prefill-data/opportunity';

 export const demoObjectsPrefillData = async (
  workspaceDataSource: DataSource,
@ -14,10 +13,10 @@ export const demoObjectsPrefillData = async (
  objectMetadata: ObjectMetadataEntity[],
 ) => {
  const objectMetadataMap = objectMetadata.reduce((acc, object) => {
-    acc[object.nameSingular] = {
+    acc[object.standardId ?? ''] = {
      id: object.id,
      fields: object.fields.reduce((acc, field) => {
-        acc[field.name] = field.id;
+        acc[field.standardId ?? ''] = field.id;

        return acc;
      }, {}),
@ -26,18 +25,15 @@ export const demoObjectsPrefillData = async (
    return acc;
  }, {});

-  // TODO: udnerstand why only with this createQueryRunner transaction below works
-  const queryRunner = workspaceDataSource.createQueryRunner();
+  await workspaceDataSource.transaction(
+    async (entityManager: EntityManager) => {
+      await companyPrefillDemoData(entityManager, schemaName);
+      await personPrefillDemoData(entityManager, schemaName);
+      await opportunityPrefillDemoData(entityManager, schemaName);

-  await queryRunner.connect();
+      await viewPrefillData(entityManager, schemaName, objectMetadataMap);

-  workspaceDataSource.transaction(async (entityManager: EntityManager) => {
-    await companyPrefillData(entityManager, schemaName);
-    await personPrefillData(entityManager, schemaName);
-    await viewPrefillData(entityManager, schemaName, objectMetadataMap);
-    await pipelineStepPrefillData(entityManager, schemaName);
-    await seedDemoOpportunity(entityManager, schemaName);
-
-    await workspaceMemberPrefillData(entityManager, schemaName);
-  });
+      await workspaceMemberPrefillData(entityManager, schemaName);
+    },
+  );
 };
--- a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/opportunity.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/opportunity.ts
@ -9,9 +9,6 @@ const getRandomProbability = () => {
  return firstDigit / 10;
 };

-const getRandomPipelineStepId = (pipelineStepIds: { id: string }[]) =>
-  pipelineStepIds[Math.floor(Math.random() * pipelineStepIds.length)].id;
-
 const getRandomStage = () => {
  const stages = ['NEW', 'SCREENING', 'MEETING', 'PROPOSAL', 'CUSTOMER'];

@ -24,14 +21,7 @@ const generateRandomAmountMicros = () => {
  return firstDigit * 10000000000;
 };

-// Function to generate the array of opportunities
-// companiesWithPeople - selecting from the db companies and 1 person related to the company.id to use companyId, pointOfContactId and personId
-// pipelineStepIds - selecting from the db pipeline, getting random id from selected to use as pipelineStepId
-
-const generateOpportunities = (
-  companies,
-  pipelineStepIds: { id: string }[],
-) => {
+const generateOpportunities = (companies) => {
  return companies.map((company) => ({
    id: v4(),
    amountAmountMicros: generateRandomAmountMicros(),
@ -39,13 +29,12 @@ const generateOpportunities = (
    closeDate: new Date(),
    stage: getRandomStage(),
    probability: getRandomProbability(),
-    pipelineStepId: getRandomPipelineStepId(pipelineStepIds),
    pointOfContactId: company.personId,
    companyId: company.id,
  }));
 };

-export const seedDemoOpportunity = async (
+export const opportunityPrefillDemoData = async (
  entityManager: EntityManager,
  schemaName: string,
 ) => {
@ -55,14 +44,8 @@ export const seedDemoOpportunity = async (
     LEFT JOIN ${schemaName}.person ON company.id = "person"."companyId"
     LIMIT 50`,
  );
-  const pipelineStepIds = await entityManager?.query(
-    `SELECT id FROM ${schemaName}."pipelineStep"`,
-  );

-  const opportunities = generateOpportunities(
-    companiesWithPeople,
-    pipelineStepIds,
-  );
+  const opportunities = generateOpportunities(companiesWithPeople);

  await entityManager
    .createQueryBuilder()
@ -74,7 +57,6 @@ export const seedDemoOpportunity = async (
      'closeDate',
      'stage',
      'probability',
-      'pipelineStepId',
      'pointOfContactId',
      'companyId',
      'position',
--- a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/person.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/person.ts
@ -2,7 +2,7 @@ import { EntityManager } from 'typeorm';

 import peopleDemo from './people-demo.json';

-export const personPrefillData = async (
+export const personPrefillDemoData = async (
  entityManager: EntityManager,
  schemaName: string,
 ) => {
--- a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/pipeline-step.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/pipeline-step.ts
@ -1,41 +0,0 @@
-import { EntityManager } from 'typeorm';
-
-export const pipelineStepPrefillData = async (
-  entityManager: EntityManager,
-  schemaName: string,
-) => {
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.pipelineStep`, ['name', 'color', 'position'])
-    .orIgnore()
-    .values([
-      {
-        name: 'NEW',
-        color: 'red',
-        position: 0,
-      },
-      {
-        name: 'SCREENING',
-        color: 'purple',
-        position: 1,
-      },
-      {
-        name: 'MEETING',
-        color: 'sky',
-        position: 2,
-      },
-      {
-        name: 'PROPOSAL',
-        color: 'turquoise',
-        position: 3,
-      },
-      {
-        name: 'CUSTOMER',
-        color: 'yellow',
-        position: 4,
-      },
-    ])
-    .returning('*')
-    .execute();
-};
--- a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/view.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/view.ts
@ -1,269 +0,0 @@
-import { EntityManager } from 'typeorm';
-
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-
-export const viewPrefillData = async (
-  entityManager: EntityManager,
-  schemaName: string,
-  objectMetadataMap: Record<string, ObjectMetadataEntity>,
-) => {
-  // Creating views
-  const createdViews = await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.view`, [
-      'name',
-      'objectMetadataId',
-      'type',
-      'key',
-      'position',
-      'icon',
-    ])
-    .orIgnore()
-    .values([
-      {
-        name: 'All Companies',
-        objectMetadataId: objectMetadataMap['company'].id,
-        type: 'table',
-        key: 'INDEX',
-        position: 0,
-        icon: 'IconBuildingSkyscraper',
-      },
-      {
-        name: 'All People',
-        objectMetadataId: objectMetadataMap['person'].id,
-        type: 'table',
-        key: 'INDEX',
-        position: 0,
-        icon: 'IconUser',
-      },
-      {
-        name: 'By Stage',
-        objectMetadataId: objectMetadataMap['opportunity'].id,
-        type: 'kanban',
-        key: null,
-        position: 0,
-        icon: 'IconLayoutKanban',
-      },
-      {
-        name: 'All Opportunities',
-        objectMetadataId: objectMetadataMap['opportunity'].id,
-        type: 'table',
-        key: 'INDEX',
-        position: 1,
-        icon: 'IconTargetArrow',
-      },
-    ])
-    .returning('*')
-    .execute();
-
-  const viewIdMap = createdViews.raw.reduce((acc, view) => {
-    acc[view.name] = view.id;
-
-    return acc;
-  }, {});
-
-  // Creating viewFields
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.viewField`, [
-      'fieldMetadataId',
-      'viewId',
-      'position',
-      'isVisible',
-      'size',
-    ])
-    .orIgnore()
-    .values([
-      // Company
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['name'],
-        viewId: viewIdMap['All Companies'],
-        position: 0,
-        isVisible: true,
-        size: 180,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['domainName'],
-        viewId: viewIdMap['All Companies'],
-        position: 1,
-        isVisible: true,
-        size: 100,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['accountOwner'],
-        viewId: viewIdMap['All Companies'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['createdAt'],
-        viewId: viewIdMap['All Companies'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['employees'],
-        viewId: viewIdMap['All Companies'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['linkedinLink'],
-        viewId: viewIdMap['All Companies'],
-        position: 5,
-        isVisible: true,
-        size: 170,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['address'],
-        viewId: viewIdMap['All Companies'],
-        position: 6,
-        isVisible: true,
-        size: 170,
-      },
-      // Person
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['name'],
-        viewId: viewIdMap['All People'],
-        position: 0,
-        isVisible: true,
-        size: 210,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['email'],
-        viewId: viewIdMap['All People'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['company'],
-        viewId: viewIdMap['All People'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['phone'],
-        viewId: viewIdMap['All People'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['createdAt'],
-        viewId: viewIdMap['All People'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['city'],
-        viewId: viewIdMap['All People'],
-        position: 5,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['jobTitle'],
-        viewId: viewIdMap['All People'],
-        position: 6,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['linkedinLink'],
-        viewId: viewIdMap['All People'],
-        position: 7,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['xLink'],
-        viewId: viewIdMap['All People'],
-        position: 8,
-        isVisible: true,
-        size: 150,
-      },
-      // Opportunity
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['name'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 0,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['amount'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['closeDate'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['probability'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId:
-          objectMetadataMap['opportunity'].fields['pointOfContact'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['name'],
-        viewId: viewIdMap['By Stage'],
-        position: 0,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['amount'],
-        viewId: viewIdMap['By Stage'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['closeDate'],
-        viewId: viewIdMap['By Stage'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['probability'],
-        viewId: viewIdMap['By Stage'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId:
-          objectMetadataMap['opportunity'].fields['pointOfContact'],
-        viewId: viewIdMap['By Stage'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-    ])
-    .execute();
-};