Fix variable dropdown (#8521)

- fixed dropdown width - add icons - handle composite fields ## After ![image](https://github.com/user-attachments/assets/b9ac585e-2a39-4ab2-8620-739f83272b9b) ![image](https://github.com/user-attachments/assets/d9f7eabb-5693-4c1c-b81c-45a901479042) ![image](https://github.com/user-attachments/assets/9edced28-8a04-4951-913d-3e5561d4fcbe)
2024-11-15 19:08:03 +01:00
parent 54b28ff7ed
commit 9b2853bb01
15 changed files with 189 additions and 79 deletions
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/types/output-schema.type.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/types/output-schema.type.ts
@ -0,0 +1,16 @@
+import { InputSchemaPropertyType } from 'src/modules/code-introspection/types/input-schema.type';
+
+type Leaf = {
+  isLeaf: true;
+  icon?: string;
+  type?: InputSchemaPropertyType;
+  value: any;
+};
+
+type Node = {
+  isLeaf: false;
+  icon?: string;
+  value: OutputSchema;
+};
+
+export type OutputSchema = Record<string, Leaf | Node>;
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts
@ -1,76 +1,88 @@
 import { v4 } from 'uuid';

 import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
-import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
-import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/types/object-record-delete.event';
-import { ObjectRecordDestroyEvent } from 'src/engine/core-modules/event-emitter/types/object-record-destroy.event';
-import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { generateFakeObjectRecord } from 'src/modules/workflow/workflow-builder/utils/generate-fake-object-record';
+import { OutputSchema } from 'src/modules/workflow/workflow-builder/types/output-schema.type';

-export const generateFakeObjectRecordEvent = <Entity>(
+export const generateFakeObjectRecordEvent = (
  objectMetadataEntity: ObjectMetadataEntity,
  action: DatabaseEventAction,
-):
-  | ObjectRecordCreateEvent<Entity>
-  | ObjectRecordUpdateEvent<Entity>
-  | ObjectRecordDeleteEvent<Entity>
-  | ObjectRecordDestroyEvent<Entity> => {
+): OutputSchema => {
  const recordId = v4();
  const userId = v4();
  const workspaceMemberId = v4();

-  const after = generateFakeObjectRecord<Entity>(objectMetadataEntity);
+  const after = generateFakeObjectRecord(objectMetadataEntity);
+  const formattedObjectMetadataEntity = Object.entries(
+    objectMetadataEntity,
+  ).reduce((acc: OutputSchema, [key, value]) => {
+    acc[key] = { isLeaf: true, value };
+
+    return acc;
+  }, {});
+
+  const baseResult: OutputSchema = {
+    recordId: { isLeaf: true, type: 'string', value: recordId },
+    userId: { isLeaf: true, type: 'string', value: userId },
+    workspaceMemberId: {
+      isLeaf: true,
+      type: 'string',
+      value: workspaceMemberId,
+    },
+    objectMetadata: {
+      isLeaf: false,
+      value: formattedObjectMetadataEntity,
+    },
+  };

  if (action === DatabaseEventAction.CREATED) {
    return {
-      recordId,
-      userId,
-      workspaceMemberId,
-      objectMetadata: objectMetadataEntity,
+      ...baseResult,
      properties: {
-        after,
+        isLeaf: false,
+        value: { after: { isLeaf: false, value: after } },
      },
-    } satisfies ObjectRecordCreateEvent<Entity>;
+    };
  }

-  const before = generateFakeObjectRecord<Entity>(objectMetadataEntity);
+  const before = generateFakeObjectRecord(objectMetadataEntity);

  if (action === DatabaseEventAction.UPDATED) {
    return {
-      recordId,
-      userId,
-      workspaceMemberId,
-      objectMetadata: objectMetadataEntity,
+      ...baseResult,
      properties: {
-        before,
-        after,
+        isLeaf: false,
+        value: {
+          before: { isLeaf: false, value: before },
+          after: { isLeaf: false, value: after },
+        },
      },
-    } satisfies ObjectRecordUpdateEvent<Entity>;
+    };
  }

  if (action === DatabaseEventAction.DELETED) {
    return {
-      recordId,
-      userId,
-      workspaceMemberId,
-      objectMetadata: objectMetadataEntity,
+      ...baseResult,
      properties: {
-        before,
+        isLeaf: false,
+        value: {
+          before: { isLeaf: false, value: before },
+        },
      },
-    } satisfies ObjectRecordDeleteEvent<Entity>;
+    };
  }

  if (action === DatabaseEventAction.DESTROYED) {
    return {
-      recordId,
-      userId,
-      workspaceMemberId,
-      objectMetadata: objectMetadataEntity,
+      ...baseResult,
      properties: {
-        before,
+        isLeaf: false,
+        value: {
+          before: { isLeaf: false, value: before },
+        },
      },
-    } satisfies ObjectRecordDestroyEvent<Entity>;
+    };
  }

  throw new Error(`Unknown action '${action}'`);
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record.ts
@ -1,16 +1,40 @@
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { generateFakeValue } from 'src/engine/utils/generate-fake-value';
 import { shouldGenerateFieldFakeValue } from 'src/modules/workflow/workflow-builder/utils/should-generate-field-fake-value';
+import { OutputSchema } from 'src/modules/workflow/workflow-builder/types/output-schema.type';
+import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';

-export const generateFakeObjectRecord = <Entity>(
+export const generateFakeObjectRecord = (
  objectMetadataEntity: ObjectMetadataEntity,
-): Entity =>
-  objectMetadataEntity.fields.reduce((acc, field) => {
+): OutputSchema =>
+  objectMetadataEntity.fields.reduce((acc: OutputSchema, field) => {
    if (!shouldGenerateFieldFakeValue(field)) {
      return acc;
    }
+    const compositeType = compositeTypeDefinitions.get(field.type);

-    acc[field.name] = generateFakeValue(field.type);
+    if (!compositeType) {
+      acc[field.name] = {
+        isLeaf: true,
+        type: field.type,
+        icon: field.icon,
+        value: generateFakeValue(field.type),
+      };
+    } else {
+      acc[field.name] = {
+        isLeaf: false,
+        icon: field.icon,
+        value: compositeType.properties.reduce((acc, property) => {
+          acc[property.name] = {
+            isLeaf: true,
+            type: property.type,
+            value: generateFakeValue(property.type),
+          };
+
+          return acc;
+        }, {}),
+      };
+    }

    return acc;
-  }, {} as Entity);
+  }, {});
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.workspace-service.ts
@ -14,7 +14,6 @@ import { generateFakeValue } from 'src/engine/utils/generate-fake-value';
 import { CodeIntrospectionService } from 'src/modules/code-introspection/code-introspection.service';
 import { generateFakeObjectRecord } from 'src/modules/workflow/workflow-builder/utils/generate-fake-object-record';
 import { generateFakeObjectRecordEvent } from 'src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event';
-import { WorkflowSendEmailStepOutputSchema } from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action';
 import { WorkflowRecordCRUDType } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/types/workflow-record-crud-action-input.type';
 import {
  WorkflowAction,
@ -25,6 +24,8 @@ import {
  WorkflowTriggerType,
 } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
 import { isDefined } from 'src/utils/is-defined';
+import { OutputSchema } from 'src/modules/workflow/workflow-builder/types/output-schema.type';
+import { InputSchemaPropertyType } from 'src/modules/code-introspection/types/input-schema.type';

@Injectable()
 export class WorkflowBuilderWorkspaceService {
@ -41,7 +42,7 @@ export class WorkflowBuilderWorkspaceService {
  }: {
    step: WorkflowTrigger | WorkflowAction;
    workspaceId: string;
-  }): Promise<object> {
+  }): Promise<OutputSchema> {
    const stepType = step.type;

    switch (stepType) {
@ -100,7 +101,7 @@ export class WorkflowBuilderWorkspaceService {
    eventName: string;
    workspaceId: string;
    objectMetadataRepository: Repository<ObjectMetadataEntity>;
-  }) {
+  }): Promise<OutputSchema> {
    const [nameSingular, action] = eventName.split('.');

    if (!checkStringIsDatabaseEventAction(action)) {
@ -125,7 +126,7 @@ export class WorkflowBuilderWorkspaceService {
    );
  }

-  private async computeRecordCrudOutputSchema<Entity>({
+  private async computeRecordCrudOutputSchema({
    objectType,
    operationType,
    workspaceId,
@ -135,8 +136,8 @@ export class WorkflowBuilderWorkspaceService {
    operationType: string;
    workspaceId: string;
    objectMetadataRepository: Repository<ObjectMetadataEntity>;
-  }) {
-    const recordOutputSchema = await this.computeRecordOutputSchema<Entity>({
+  }): Promise<OutputSchema> {
+    const recordOutputSchema = await this.computeRecordOutputSchema({
      objectType,
      workspaceId,
      objectMetadataRepository,
@ -144,16 +145,21 @@ export class WorkflowBuilderWorkspaceService {

    if (operationType === WorkflowRecordCRUDType.READ) {
      return {
-        first: recordOutputSchema,
-        last: recordOutputSchema,
-        totalCount: generateFakeValue('number'),
+        first: { isLeaf: false, icon: 'IconAlpha', value: recordOutputSchema },
+        last: { isLeaf: false, icon: 'IconOmega', value: recordOutputSchema },
+        totalCount: {
+          isLeaf: true,
+          icon: 'IconSum',
+          type: 'number',
+          value: generateFakeValue('number'),
+        },
      };
    }

    return recordOutputSchema;
  }

-  private async computeRecordOutputSchema<Entity>({
+  private async computeRecordOutputSchema({
    objectType,
    workspaceId,
    objectMetadataRepository,
@ -161,7 +167,7 @@ export class WorkflowBuilderWorkspaceService {
    objectType: string;
    workspaceId: string;
    objectMetadataRepository: Repository<ObjectMetadataEntity>;
-  }) {
+  }): Promise<OutputSchema> {
    const objectMetadata = await objectMetadataRepository.findOneOrFail({
      where: {
        nameSingular: objectType,
@ -174,11 +180,11 @@ export class WorkflowBuilderWorkspaceService {
      return {};
    }

-    return generateFakeObjectRecord<Entity>(objectMetadata);
+    return generateFakeObjectRecord(objectMetadata);
  }

-  private computeSendEmailActionOutputSchema(): WorkflowSendEmailStepOutputSchema {
-    return { success: true };
+  private computeSendEmailActionOutputSchema(): OutputSchema {
+    return { success: { isLeaf: true, type: 'boolean', value: true } };
  }

  private async computeCodeActionOutputSchema({
@ -193,7 +199,7 @@ export class WorkflowBuilderWorkspaceService {
    workspaceId: string;
    serverlessFunctionService: ServerlessFunctionService;
    codeIntrospectionService: CodeIntrospectionService;
-  }) {
+  }): Promise<OutputSchema> {
    if (serverlessFunctionId === '') {
      return {};
    }
@ -223,6 +229,19 @@ export class WorkflowBuilderWorkspaceService {
        serverlessFunctionVersion,
      );

-    return resultFromFakeInput.data ?? {};
+    return resultFromFakeInput.data
+      ? Object.entries(resultFromFakeInput.data).reduce(
+          (acc: OutputSchema, [key, value]) => {
+            acc[key] = {
+              isLeaf: true,
+              value,
+              type: typeof value as InputSchemaPropertyType,
+            };
+
+            return acc;
+          },
+          {},
+        )
+      : {};
  }
 }