Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6658 workflows add a first twenty piece email sender #6965

Merged
merged 24 commits into from
Sep 12, 2024
+1,144 −1,038
Merged

6658 workflows add a first twenty piece email sender #6965

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6339a4e
Add system action executor
martmull Sep 9, 2024
e484c60
Add send email step
martmull Sep 9, 2024
4528242
Remove logo from workflow email
martmull Sep 10, 2024
cb33021
Sanitize html
martmull Sep 10, 2024
2e44781
Fix typing
martmull Sep 10, 2024
4978270
Remove front check
martmull Sep 10, 2024
52ac80d
Fix missing data in deleted event
martmull Sep 10, 2024
d030c01
Validate email
martmull Sep 10, 2024
5b50565
Use templating
martmull Sep 10, 2024
77e78a8
Remove useless factory
martmull Sep 11, 2024
2f4a6de
Remove useless changes
martmull Sep 11, 2024
fa03414
Code review return: fix factory naming
martmull Sep 11, 2024
8fca876
Code review return: separate types
martmull Sep 11, 2024
4bcb226
Code review return: update naming
martmull Sep 11, 2024
f99d805
Code review return: reorganize folders
martmull Sep 11, 2024
98fdcfb
Code review return: split workflow/common
martmull Sep 11, 2024
3e74a5d
Simplify folder tree
martmull Sep 11, 2024
5726382
Reorganize workflow-runner
martmull Sep 11, 2024
611b4ca
Reorganize workflow-status
martmull Sep 11, 2024
c8b0b4a
Rename services folders
martmull Sep 11, 2024
b3bde02
Simplify workflow/common
martmull Sep 11, 2024
6ecd69d
Merge integration and core_modules
martmull Sep 11, 2024
d0d9376
Fix lint
martmull Sep 11, 2024
7afe454
WIP: move workflow actions to dedicated modules
martmull Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Code review return: split workflow/common
  • Loading branch information
@martmull
martmull committed Sep 11, 2024
commit 98fdcfb9eafc06375f051806f48e16caabb57bf4
2 changes: 1 addition & 1 deletion ...rkflow/common/query-hooks/workflow-version/utils/assert-workflow-version-is-draft.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
WorkflowVersionStatus,
WorkflowVersionWorkspaceEntity,
} from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
import { WorkflowTrigger } from 'src/modules/workflow/common/types/workflow-trigger.type';
import { WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';

export const assertWorkflowVersionIsDraft = (
workflowVersion: Omit<WorkflowVersionWorkspaceEntity, 'trigger'> & {
Expand Down
2 changes: 1 addition & 1 deletion ...s/twenty-server/src/modules/workflow/common/services/workflow-common.workspace-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';

import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
import { WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
import { WorkflowTrigger } from 'src/modules/workflow/common/types/workflow-trigger.type';
import { WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
import {
WorkflowTriggerException,
WorkflowTriggerExceptionCode,
Expand Down
4 changes: 2 additions & 2 deletions ...-server/src/modules/workflow/common/standard-objects/workflow-version.workspace-entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import {
import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
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/common/types/workflow-step.type';
import { WorkflowTrigger } from 'src/modules/workflow/common/types/workflow-trigger.type';
import { WorkflowStep } from 'src/modules/workflow/workflow-executor/types/workflow-step.type';
import { WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';

export enum WorkflowVersionStatus {
DRAFT = 'DRAFT',
Expand Down
2 changes: 1 addition & 1 deletion ...flow/workflow-executor/factories/workflow-step-executor/workflow-step-executor.factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';

import { WorkflowStepExecutor } from 'src/modules/workflow/workflow-executor/interfaces/workflow-step-executor.interface';

import { WorkflowStepType } from 'src/modules/workflow/common/types/workflow-step.type';
import { WorkflowStepType } from 'src/modules/workflow/workflow-executor/types/workflow-step.type';
import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
Expand Down
4 changes: 2 additions & 2 deletions ...r/factories/workflow-step-executor/workflow-step-executors/code.workflow-step-executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';

import { ServerlessFunctionService } from 'src/engine/metadata-modules/serverless-function/serverless-function.service';
import { ScopedWorkspaceContextFactory } from 'src/engine/twenty-orm/factories/scoped-workspace-context.factory';
import { WorkflowStepResult } from 'src/modules/workflow/common/types/workflow-step-result.type';
import { WorkflowCodeStep } from 'src/modules/workflow/common/types/workflow-step.type';
import { WorkflowStepResult } from 'src/modules/workflow/workflow-executor/types/workflow-step-result.type';
import { WorkflowCodeStep } from 'src/modules/workflow/workflow-executor/types/workflow-step.type';
import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
Expand Down
4 changes: 2 additions & 2 deletions ...ories/workflow-step-executor/workflow-step-executors/send-email.workflow-step-executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import DOMPurify from 'dompurify';
import { WorkflowActionEmail } from 'twenty-emails';
import { render } from '@react-email/components';

import { WorkflowStepResult } from 'src/modules/workflow/common/types/workflow-step-result.type';
import { WorkflowSendEmailStep } from 'src/modules/workflow/common/types/workflow-step.type';
import { WorkflowStepResult } from 'src/modules/workflow/workflow-executor/types/workflow-step-result.type';
import { WorkflowSendEmailStep } from 'src/modules/workflow/workflow-executor/types/workflow-step.type';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { EmailService } from 'src/engine/integrations/email/email.service';

Expand Down
4 changes: 2 additions & 2 deletions ...ver/src/modules/workflow/workflow-executor/interfaces/workflow-step-executor.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { WorkflowStepResult } from 'src/modules/workflow/common/types/workflow-step-result.type';
import { WorkflowStep } from 'src/modules/workflow/common/types/workflow-step.type';
import { WorkflowStepResult } from 'src/modules/workflow/workflow-executor/types/workflow-step-result.type';
import { WorkflowStep } from 'src/modules/workflow/workflow-executor/types/workflow-step.type';

export interface WorkflowStepExecutor {
execute({
Expand Down
2 changes: 1 addition & 1 deletion ...er/src/modules/workflow/workflow-executor/services/workflow-executor.workspace-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';

import { WorkflowStep } from 'src/modules/workflow/common/types/workflow-step.type';
import { WorkflowStep } from 'src/modules/workflow/workflow-executor/types/workflow-step.type';
import {
WorkflowExecutorException,
WorkflowExecutorExceptionCode,
Expand Down
0 ...common/types/workflow-step-result.type.ts → ...ecutor/types/workflow-step-result.type.ts
View file
Open in desktop
File renamed without changes.
0 ...mmon/types/workflow-step-settings.type.ts → ...utor/types/workflow-step-settings.type.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rkflow/common/types/workflow-step.type.ts → ...flow-executor/types/workflow-step.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
WorkflowCodeStepSettings,
WorkflowSendEmailStepSettings,
} from 'src/modules/workflow/common/types/workflow-step-settings.type';
} from 'src/modules/workflow/workflow-executor/types/workflow-step-settings.type';

export enum WorkflowStepType {
CODE_ACTION = 'CODE_ACTION',
Expand Down
2 changes: 1 addition & 1 deletion ...odules/workflow/workflow-trigger/database-event-trigger/database-event-trigger.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { EntityManager } from 'typeorm';

import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
import { WorkflowEventListenerWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-event-listener.workspace-entity';
import { WorkflowDatabaseEventTrigger } from 'src/modules/workflow/common/types/workflow-trigger.type';
import { WorkflowDatabaseEventTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';

@Injectable()
export class DatabaseEventTriggerService {
Expand Down
0 ...low/common/types/workflow-trigger.type.ts → ...ow-trigger/types/workflow-trigger.type.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...erver/src/modules/workflow/workflow-trigger/utils/assert-version-can-be-activated.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
import {
WorkflowTrigger,
WorkflowTriggerType,
} from 'src/modules/workflow/common/types/workflow-trigger.type';
} from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
import {
WorkflowTriggerException,
WorkflowTriggerExceptionCode,
Expand Down
2 changes: 1 addition & 1 deletion ...twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.workspace-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
import {
WorkflowTrigger,
WorkflowTriggerType,
} from 'src/modules/workflow/common/types/workflow-trigger.type';
} from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-runner.workspace-service';
import { WorkflowVersionStatusUpdate } from 'src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job';
import { DatabaseEventTriggerService } from 'src/modules/workflow/workflow-trigger/database-event-trigger/database-event-trigger.service';
Expand Down