WIP

packages/twenty-server/src/engine/core-modules/workflow/dtos/compute-step-output-schema-input.dto.ts

@@ -2,8 +2,8 @@ import { Field, InputType } from '@nestjs/graphql';
 
 import graphqlTypeJson from 'graphql-type-json';
 
+import { WorkflowStep } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
 import { WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
-import { WorkflowStep } from 'src/modules/workflow/workflow-executor/types/workflow-action.type';
 
 @InputType()
 export class ComputeStepOutputSchemaInput {

packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-builder.resolver.ts

@@ -10,7 +10,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { WorkflowBuilderWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-builder.workspace-service';
-import { OutputSchema } from 'src/modules/workflow/workflow-executor/types/workflow-step-settings.type';
+import { OutputSchema } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-settings.type';
 
 @Resolver()
 @UseGuards(WorkspaceAuthGuard, UserAuthGuard)

packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-version.workspace-entity.ts

@@ -21,7 +21,7 @@ import { FavoriteWorkspaceEntity } from 'src/modules/favorite/standard-objects/f
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 import { WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
 import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';
-import { WorkflowStep } from 'src/modules/workflow/workflow-executor/types/workflow-action.type';
+import { WorkflowStep } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
 import { WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
 
 export enum WorkflowVersionStatus {

packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.workspace-service.ts

@@ -11,13 +11,13 @@ import { INDEX_FILE_NAME } from 'src/engine/core-modules/serverless/drivers/cons
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ServerlessFunctionService } from 'src/engine/metadata-modules/serverless-function/serverless-function.service';
 import { CodeIntrospectionService } from 'src/modules/code-introspection/code-introspection.service';
-import { WorkflowSendEmailStepOutputSchema } from 'src/modules/mail-sender/workflow-actions/send-email.workflow-action';
 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 {
+  WorkflowAction,
   WorkflowActionType,
-  WorkflowStep,
-} from 'src/modules/workflow/workflow-executor/types/workflow-action.type';
+} from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
 import {
   WorkflowTrigger,
   WorkflowTriggerType,
@@ -37,7 +37,7 @@ export class WorkflowBuilderWorkspaceService {
     step,
     workspaceId,
   }: {
-    step: WorkflowTrigger | WorkflowStep;
+    step: WorkflowTrigger | WorkflowAction;
     workspaceId: string;
   }): Promise<object> {
     const stepType = step.type;

packages/twenty-server/src/modules/workflow/workflow-executor/factories/workflow-action.factory.ts

@@ -2,14 +2,14 @@ import { Injectable } from '@nestjs/common';
 
 import { WorkflowAction } from 'src/modules/workflow/workflow-executor/interfaces/workflow-action.interface';
 
-import { SendEmailWorkflowAction } from 'src/modules/mail-sender/workflow-actions/send-email.workflow-action';
-import { CodeWorkflowAction } from 'src/modules/serverless/workflow-actions/code.workflow-action';
 import {
   WorkflowStepExecutorException,
   WorkflowStepExecutorExceptionCode,
 } from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { WorkflowActionType } from 'src/modules/workflow/workflow-executor/types/workflow-action.type';
-import { CreateRecordWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/create-record.workflow-action';
+import { CodeWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/code/code.workflow-action';
+import { CreateRecordWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/create-record/create-record.workflow-action';
+import { SendEmailWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action';
+import { WorkflowActionType } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
 
 @Injectable()
 export class WorkflowActionFactory {

packages/twenty-server/src/modules/workflow/workflow-executor/interfaces/workflow-action.interface.ts

@@ -1,4 +1,4 @@
-import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/types/workflow-action-result.type';
+import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-result.type';
 
 export interface WorkflowAction {
   execute(workflowStepInput: unknown): Promise<WorkflowActionResult>;

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/code-action.module.ts

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless-function/serverless-function.module';
+import { ScopedWorkspaceContextFactory } from 'src/engine/twenty-orm/factories/scoped-workspace-context.factory';
+import { CodeWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/code/code.workflow-action';
+
+@Module({
+  imports: [ServerlessFunctionModule],
+  providers: [ScopedWorkspaceContextFactory, CodeWorkflowAction],
+  exports: [CodeWorkflowAction],
+})
+export class CodeActionModule {}

packages/twenty-server/src/modules/serverless/workflow-actions/code.workflow-action.ts → packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/code.workflow-action.ts

@@ -8,8 +8,8 @@ import {
   WorkflowStepExecutorException,
   WorkflowStepExecutorExceptionCode,
 } from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/types/workflow-action-result.type';
-import { WorkflowCodeStepInput } from 'src/modules/workflow/workflow-executor/types/workflow-step-settings.type';
+import { WorkflowCodeActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/code/types/workflow-code-action-input.type';
+import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-result.type';
 
 @Injectable()
 export class CodeWorkflowAction implements WorkflowAction {
@@ -19,7 +19,7 @@ export class CodeWorkflowAction implements WorkflowAction {
   ) {}
 
   async execute(
-    workflowStepInput: WorkflowCodeStepInput,
+    workflowActionInput: WorkflowCodeActionInput,
   ): Promise<WorkflowActionResult> {
     try {
       const { workspaceId } = this.scopedWorkspaceContextFactory.create();
@@ -33,9 +33,9 @@ export class CodeWorkflowAction implements WorkflowAction {
 
       const result =
         await this.serverlessFunctionService.executeOneServerlessFunction(
-          workflowStepInput.serverlessFunctionId,
+          workflowActionInput.serverlessFunctionId,
           workspaceId,
-          workflowStepInput.serverlessFunctionInput,
+          workflowActionInput.serverlessFunctionInput,
         );
 
       if (result.error) {

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/types/workflow-code-action-input.type.ts

@@ -0,0 +1,7 @@
+export type WorkflowCodeActionInput = {
+  serverlessFunctionId: string;
+  serverlessFunctionVersion: string;
+  serverlessFunctionInput: {
+    [key: string]: any;
+  };
+};

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/types/workflow-code-action-settings.type.ts

@@ -0,0 +1,6 @@
+import { WorkflowCodeActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/code/types/workflow-code-action-input.type';
+import { BaseWorkflowActionSettings } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-settings.type';
+
+export type WorkflowCodeActionSettings = BaseWorkflowActionSettings & {
+  input: WorkflowCodeActionInput;
+};

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/create-record/create-record-action.module.ts

@@ -0,0 +1,4 @@
+import { Module } from '@nestjs/common';
+
+@Module({})
+export class CreateRecordActionModule {}

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/create-record.workflow-action.ts → packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/create-record/create-record.workflow-action.ts

@@ -3,28 +3,22 @@ import { Injectable } from '@nestjs/common';
 import { WorkflowAction } from 'src/modules/workflow/workflow-executor/interfaces/workflow-action.interface';
 
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
-import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/types/workflow-action-result.type';
-
-type ObjectRecord = Record<string, any>;
-
-export type WorkflowCreateRecordStepInput = {
-  objectName: string;
-  objectRecord: ObjectRecord;
-};
+import { WorkflowCreateRecordActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/create-record/types/workflow-create-record-action-input.type';
+import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-result.type';
 
 @Injectable()
 export class CreateRecordWorkflowAction implements WorkflowAction {
   constructor(private readonly twentyORMManager: TwentyORMManager) {}
 
   async execute(
-    workflowStepInput: WorkflowCreateRecordStepInput,
+    workflowActionInput: WorkflowCreateRecordActionInput,
   ): Promise<WorkflowActionResult> {
     const repository = await this.twentyORMManager.getRepository(
-      workflowStepInput.objectName,
+      workflowActionInput.objectName,
     );
 
     const objectRecord = await repository.create(
-      workflowStepInput.objectRecord,
+      workflowActionInput.objectRecord,
     );
 
     const createdObjectRecord = await repository.save(objectRecord);

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/create-record/types/workflow-create-record-action-input.type.ts

@@ -0,0 +1,6 @@
+type ObjectRecord = Record<string, any>;
+
+export type WorkflowCreateRecordActionInput = {
+  objectName: string;
+  objectRecord: ObjectRecord;
+};

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/create-record/types/workflow-create-record-action-settings.type.ts

@@ -0,0 +1,6 @@
+import { WorkflowCreateRecordActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/create-record/types/workflow-create-record-action-input.type';
+import { BaseWorkflowActionSettings } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-settings.type';
+
+export type WorkflowCreateRecordActionSettings = BaseWorkflowActionSettings & {
+  input: WorkflowCreateRecordActionInput;
+};

packages/twenty-server/src/modules/mail-sender/exceptions/mail-sender.exception.ts → packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/exceptions/send-email-action.exception.ts

@@ -1,13 +1,13 @@
 import { CustomException } from 'src/utils/custom-exception';
 
-export class MailSenderException extends CustomException {
-  code: MailSenderExceptionCode;
-  constructor(message: string, code: MailSenderExceptionCode) {
+export class SendEmailActionException extends CustomException {
+  code: SendEmailActionExceptionCode;
+  constructor(message: string, code: SendEmailActionExceptionCode) {
     super(message, code);
   }
 }
 
-export enum MailSenderExceptionCode {
+export enum SendEmailActionExceptionCode {
   PROVIDER_NOT_SUPPORTED = 'PROVIDER_NOT_SUPPORTED',
   CONNECTED_ACCOUNT_NOT_FOUND = 'CONNECTED_ACCOUNT_NOT_FOUND',
 }

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email-action.module.ts

@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common';
+
+import { ScopedWorkspaceContextFactory } from 'src/engine/twenty-orm/factories/scoped-workspace-context.factory';
+import { OAuth2ClientManagerModule } from 'src/modules/connected-account/oauth2-client-manager/oauth2-client-manager.module';
+import { GmailClientProvider } from 'src/modules/messaging/message-import-manager/drivers/gmail/providers/gmail-client.provider';
+import { SendEmailWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action';
+
+@Module({
+  imports: [OAuth2ClientManagerModule],
+  providers: [
+    GmailClientProvider,
+    ScopedWorkspaceContextFactory,
+    SendEmailWorkflowAction,
+  ],
+  exports: [SendEmailWorkflowAction],
+})
+export class SendEmailActionModule {}

packages/twenty-server/src/modules/mail-sender/workflow-actions/send-email.workflow-action.ts → packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action.ts

@@ -9,17 +9,17 @@ import { WorkflowAction } from 'src/modules/workflow/workflow-executor/interface
 import { ScopedWorkspaceContextFactory } from 'src/engine/twenty-orm/factories/scoped-workspace-context.factory';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
-import {
-  MailSenderException,
-  MailSenderExceptionCode,
-} from 'src/modules/mail-sender/exceptions/mail-sender.exception';
 import { GmailClientProvider } from 'src/modules/messaging/message-import-manager/drivers/gmail/providers/gmail-client.provider';
 import {
   WorkflowStepExecutorException,
   WorkflowStepExecutorExceptionCode,
 } from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/types/workflow-action-result.type';
-import { WorkflowSendEmailStepInput } from 'src/modules/workflow/workflow-executor/types/workflow-step-settings.type';
+import {
+  SendEmailActionException,
+  SendEmailActionExceptionCode,
+} from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/exceptions/send-email-action.exception';
+import { WorkflowSendEmailActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/types/workflow-send-email-action-input.type';
+import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-result.type';
 import { isDefined } from 'src/utils/is-defined';
 
 export type WorkflowSendEmailStepOutputSchema = {
@@ -55,30 +55,30 @@ export class SendEmailWorkflowAction implements WorkflowAction {
     });
 
     if (!isDefined(connectedAccount)) {
-      throw new MailSenderException(
+      throw new SendEmailActionException(
         `Connected Account '${connectedAccountId}' not found`,
-        MailSenderExceptionCode.CONNECTED_ACCOUNT_NOT_FOUND,
+        SendEmailActionExceptionCode.CONNECTED_ACCOUNT_NOT_FOUND,
       );
     }
 
     switch (connectedAccount.provider) {
       case 'google':
         return await this.gmailClientProvider.getGmailClient(connectedAccount);
       default:
-        throw new MailSenderException(
+        throw new SendEmailActionException(
           `Provider ${connectedAccount.provider} is not supported`,
-          MailSenderExceptionCode.PROVIDER_NOT_SUPPORTED,
+          SendEmailActionExceptionCode.PROVIDER_NOT_SUPPORTED,
         );
     }
   }
 
   async execute(
-    workflowStepInput: WorkflowSendEmailStepInput,
+    workflowActionInput: WorkflowSendEmailActionInput,
   ): Promise<WorkflowActionResult> {
     const emailProvider = await this.getEmailClient(
-      workflowStepInput.connectedAccountId,
+      workflowActionInput.connectedAccountId,
     );
-    const { email, body, subject } = workflowStepInput;
+    const { email, body, subject } = workflowActionInput;
 
     try {
       const emailSchema = z.string().trim().email('Invalid email');

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/types/workflow-send-email-action-input.type.ts

@@ -0,0 +1,6 @@
+export type WorkflowSendEmailActionInput = {
+  connectedAccountId: string;
+  email: string;
+  subject?: string;
+  body?: string;
+};

packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/types/workflow-send-email-action-settings.type.ts

@@ -0,0 +1,6 @@
+import { WorkflowSendEmailActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/types/workflow-send-email-action-input.type';
+import { BaseWorkflowActionSettings } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-settings.type';
+
+export type WorkflowSendEmailActionSettings = BaseWorkflowActionSettings & {
+  input: WorkflowSendEmailActionInput;
+};