Skip to content

The open alternative to Salesforce, designed for AI.

Remove the legacy workflow step and edge workspace services (#27858)

Thomas Trompette6fc4db5762ce
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts
index b10f49ead81..777c318fc49 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts
@@ -634,10 +634,9 @@ export class CoreWorkflowMutationWorkspaceService {
.softDelete({ id: In(mirrorWorkflowIds) });
}, authContext);
- await this.workflowCommonWorkspaceService.handleWorkflowSubEntities({
+ await this.workflowCommonWorkspaceService.deleteWorkflowSubEntities({
workflowIds: mirrorWorkflowIds,
workspaceId,
- operation: 'delete',
});
}
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
index 2bc6cde0467..300aafa4ea4 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
@@ -884,34 +884,6 @@ export class WorkflowVersionCoreSyncService {
await this.deleteFromCore(workspaceId, coreWorkflowVersionIds);
}
- async recreateCoreVersionsByWorkflowId(
- workspaceId: string,
- workflowId: string,
- ): Promise<void> {
- await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- await this.workspaceOrmManager.runInWorkspaceTransaction(
- async (transactionScope) => {
- const workflowVersionRepository =
- transactionScope.getRepository<WorkflowVersionWorkspaceEntity>(
- 'workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
- const versions = await workflowVersionRepository.find({
- where: { workflowId },
- });
-
- await this.mirrorWorkflowVersionWrites({
- workspaceId,
- transactionScope,
- workflowVersions: versions,
- });
- },
- );
- }, buildSystemAuthContext(workspaceId));
-
- await this.invalidateAutomatedTriggerMaps(workspaceId);
- }
-
private async writeBackCoreVersionIds(
workspaceId: string,
coreVersionIdByWorkspaceRecordId: Map<string, string>,
diff --git a/packages/twenty-server/src/modules/workflow/common/utils/assert-workflow-version-is-draft.util.ts b/packages/twenty-server/src/modules/workflow/common/utils/assert-workflow-version-is-draft.util.ts
deleted file mode 100644
index 4e16f4383cd..00000000000
--- a/packages/twenty-server/src/modules/workflow/common/utils/assert-workflow-version-is-draft.util.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { msg } from '@lingui/core/macro';
-
-import {
- WorkflowQueryValidationException,
- WorkflowQueryValidationExceptionCode,
-} from 'src/modules/workflow/common/exceptions/workflow-query-validation.exception';
-import {
- WorkflowVersionStatus,
- type WorkflowVersionWorkspaceEntity,
-} from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
-
-export const assertWorkflowVersionIsDraft = (
- workflowVersion: WorkflowVersionWorkspaceEntity,
-) => {
- if (workflowVersion.status !== WorkflowVersionStatus.DRAFT) {
- throw new WorkflowQueryValidationException(
- 'Workflow version is not in draft status',
- WorkflowQueryValidationExceptionCode.FORBIDDEN,
- {
- userFriendlyMessage: msg`Workflow version is not in draft status`,
- },
- );
- }
-};
diff --git a/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts b/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts
index 63677468855..b7bc11ae1d3 100644
--- a/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts
@@ -2,14 +2,6 @@ import { WorkflowStatus } from 'src/engine/core-modules/workflow/enums/workflow-
import { WorkflowCoreSyncService } from 'src/engine/core-modules/workflow/services/workflow-core-sync.service';
import { Injectable } from '@nestjs/common';
-import { isNonEmptyString } from '@sniptt/guards';
-
-import { isDefined } from 'twenty-shared/utils';
-import { In } from 'typeorm';
-
-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { WorkflowVersionCoreSyncService } from 'src/engine/core-modules/workflow/services/workflow-version-core-sync.service';
-import { CommandMenuItemService } from 'src/engine/metadata-modules/command-menu-item/command-menu-item.service';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -22,17 +14,11 @@ import {
WorkflowMetadataReadService,
} from 'src/modules/workflow/common/workspace-services/workflow-metadata-read.workspace-service';
import { type WorkflowAutomatedTriggerWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-automated-trigger.workspace-entity';
-import { type WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
import {
WorkflowVersionStatus,
type WorkflowVersionWorkspaceEntity,
} from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
import { type WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';
-import {
- WorkflowTriggerException,
- WorkflowTriggerExceptionCode,
-} from 'src/modules/workflow/workflow-trigger/exceptions/workflow-trigger.exception';
-import { getWorkflowCommandMenuItemLabel } from 'src/modules/workflow/workflow-trigger/utils/get-workflow-command-menu-item-label.util';
export type { ObjectMetadataInfo };
@@ -42,177 +28,8 @@ export class WorkflowCommonWorkspaceService {
private readonly workflowCoreSyncService: WorkflowCoreSyncService,
private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly workflowMetadataReadService: WorkflowMetadataReadService,
- private readonly commandMenuItemService: CommandMenuItemService,
- private readonly workflowVersionCoreSyncService: WorkflowVersionCoreSyncService,
) {}
- async getWorkflowVersionOrFail({
- workspaceId,
- workflowVersionId,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- }): Promise<WorkflowVersionWorkspaceEntity> {
- if (!workflowVersionId) {
- throw new WorkflowTriggerException(
- 'Workflow version ID is required',
- WorkflowTriggerExceptionCode.INVALID_INPUT,
- );
- }
-
- const authContext = buildSystemAuthContext(workspaceId);
-
- return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(
- 'workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
-
- const workflowVersion = await workflowVersionRepository.findOne({
- where: {
- id: workflowVersionId,
- },
- });
-
- const validWorkflowVersion =
- await this.getValidWorkflowVersionOrFail(workflowVersion);
-
- return this.overlayCoreWorkflowVersionContent(
- workspaceId,
- validWorkflowVersion,
- );
- }, authContext);
- }
-
- private async overlayCoreWorkflowVersionContent(
- workspaceId: string,
- workflowVersion: WorkflowVersionWorkspaceEntity,
- ): Promise<WorkflowVersionWorkspaceEntity> {
- if (!isDefined(workflowVersion.coreWorkflowVersionId)) {
- return workflowVersion;
- }
-
- const coreWorkflowVersion =
- await this.workflowVersionCoreSyncService.findCoreVersionById(
- workspaceId,
- workflowVersion.coreWorkflowVersionId,
- );
-
- if (!isDefined(coreWorkflowVersion)) {
- return workflowVersion;
- }
-
- return {
- ...workflowVersion,
- trigger: coreWorkflowVersion.triggers?.[0] ?? null,
- steps: coreWorkflowVersion.steps,
- status: coreWorkflowVersion.status as unknown as WorkflowVersionStatus,
- };
- }
-
- async getValidWorkflowVersionOrFail(
- workflowVersion: WorkflowVersionWorkspaceEntity | null,
- ): Promise<WorkflowVersionWorkspaceEntity> {
- if (!workflowVersion) {
- throw new WorkflowTriggerException(
- 'Workflow version not found',
- WorkflowTriggerExceptionCode.INVALID_INPUT,
- );
- }
-
- return { ...workflowVersion, trigger: workflowVersion.trigger };
- }
-
- async syncCommandMenuItemLabelForWorkflows(
- workflowIds: string[],
- authContext: WorkspaceAuthContext,
- ): Promise<void> {
- const workspaceId = authContext.workspace?.id;
-
- if (!isDefined(workspaceId) || workflowIds.length === 0) {
- return;
- }
-
- const workflows = await this.workspaceOrmManager.executeInWorkspaceContext(
- async () => {
- const workflowRepository =
- this.workspaceOrmManager.getRepository<WorkflowWorkspaceEntity>(
- 'workflow',
- { shouldBypassPermissionChecks: true },
- );
-
- return workflowRepository.find({
- where: { id: In(workflowIds) },
- });
- },
- authContext,
- );
-
- await Promise.all(
- workflows.map((workflow) =>
- this.syncCommandMenuItemLabelForWorkflow(workflow, workspaceId),
- ),
- );
- }
-
- private async syncCommandMenuItemLabelForWorkflow(
- workflow: WorkflowWorkspaceEntity,
- workspaceId: string,
- ): Promise<void> {
- if (!isNonEmptyString(workflow.lastPublishedVersionId)) {
- return;
- }
- const lastPublishedVersionId = workflow.lastPublishedVersionId;
-
- const workflowVersion =
- await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowVersionRepository =
- this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(
- 'workflowVersion',
- { shouldBypassPermissionChecks: true },
- );
-
- return workflowVersionRepository.findOne({
- where: { id: lastPublishedVersionId },
- withDeleted: true,
- });
- }, buildSystemAuthContext(workspaceId));
- const existingCommandMenuItem =
- (isDefined(workflowVersion?.coreWorkflowVersionId)
- ? await this.commandMenuItemService.findByCoreWorkflowVersionId(
- workflowVersion.coreWorkflowVersionId,
- workspaceId,
- )
- : null) ??
- (await this.commandMenuItemService.findByWorkflowVersionId(
- lastPublishedVersionId,
- workspaceId,
- ));
-
- if (!isDefined(existingCommandMenuItem)) {
- return;
- }
-
- const label = getWorkflowCommandMenuItemLabel(workflow);
-
- if (
- existingCommandMenuItem.label === label &&
- existingCommandMenuItem.shortLabel === label
- ) {
- return;
- }
-
- await this.commandMenuItemService.update(
- {
- id: existingCommandMenuItem.id,
- label,
- shortLabel: label,
- },
- workspaceId,
- );
- }
-
async getFlatEntityMaps(workspaceId: string): Promise<{
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
@@ -244,17 +61,13 @@ export class WorkflowCommonWorkspaceService {
);
}
- async handleWorkflowSubEntities({
+ async deleteWorkflowSubEntities({
workflowIds,
workspaceId,
- operation,
}: {
workflowIds: string[];
workspaceId: string;
- operation: 'restore' | 'delete' | 'destroy';
}): Promise<void> {
- const authContext = buildSystemAuthContext(workspaceId);
-
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const workflowVersionRepository =
this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(
@@ -262,12 +75,6 @@ export class WorkflowCommonWorkspaceService {
{ shouldBypassPermissionChecks: true },
);
- const workflowRepository =
- this.workspaceOrmManager.getRepository<WorkflowWorkspaceEntity>(
- 'workflow',
- { shouldBypassPermissionChecks: true },
- );
-
const workflowAutomatedTriggerRepository =
this.workspaceOrmManager.getRepository<WorkflowAutomatedTriggerWorkspaceEntity>(
'workflowAutomatedTrigger',
@@ -275,115 +82,29 @@ export class WorkflowCommonWorkspaceService {
);
for (const workflowId of workflowIds) {
- switch (operation) {
- case 'delete':
- await workflowAutomatedTriggerRepository.softDelete({
- workflowId,
- });
-
- await workflowVersionRepository.softDelete({
- workflowId,
- });
-
- break;
- case 'restore':
- await this.workflowCoreSyncService.upsertToCore(workspaceId, [
- workflowId,
- ]);
-
- await workflowVersionRepository.restore({
- workflowId,
- });
-
- await this.workflowVersionCoreSyncService.recreateCoreVersionsByWorkflowId(
- workspaceId,
- workflowId,
- );
-
- const workflow = await workflowRepository.findOne({
- where: { id: workflowId },
- select: { coreWorkflowId: true },
- });
- const workflowVersions = await workflowVersionRepository.find({
- where: { workflowId },
- select: { id: true, coreWorkflowVersionId: true },
- });
-
- if (
- !isDefined(workflow?.coreWorkflowId) ||
- workflowVersions.some(
- (workflowVersion) =>
- !isDefined(workflowVersion.coreWorkflowVersionId),
- )
- ) {
- throw new Error(
- `Missing core mapping while restoring workflow ${workflowId}`,
- );
- }
-
- await this.workspaceOrmManager.runInWorkspaceTransaction(
- async ({ getRepository }) => {
- const transactionalWorkflowRunRepository =
- getRepository<WorkflowRunWorkspaceEntity>('workflowRun', {
- shouldBypassPermissionChecks: true,
- });
-
- await transactionalWorkflowRunRepository.restore({
- workflowId,
- });
- await transactionalWorkflowRunRepository.update(
- { workflowId },
- { coreWorkflowId: workflow.coreWorkflowId },
- );
-
- for (const workflowVersion of workflowVersions) {
- await transactionalWorkflowRunRepository.update(
- { workflowId, workflowVersionId: workflowVersion.id },
- {
- coreWorkflowVersionId:
- workflowVersion.coreWorkflowVersionId,
- },
- );
- }
- },
- );
-
- await workflowAutomatedTriggerRepository.restore({
- workflowId,
- });
-
- break;
- }
+ await workflowAutomatedTriggerRepository.softDelete({ workflowId });
+ await workflowVersionRepository.softDelete({ workflowId });
await this.deactivateVersionOnDelete({
workflowVersionRepository,
workflowId,
- operation,
});
- if (operation !== 'destroy') {
- await this.workflowCoreSyncService.reconcileWorkspaceWorkflows(
- workspaceId,
- [workflowId],
- );
- }
+ await this.workflowCoreSyncService.reconcileWorkspaceWorkflows(
+ workspaceId,
+ [workflowId],
+ );
}
- }, authContext);
+ }, buildSystemAuthContext(workspaceId));
}
private async deactivateVersionOnDelete({
workflowVersionRepository,
workflowId,
- operation,
}: {
workflowVersionRepository: WorkspaceRepository<WorkflowVersionWorkspaceEntity>;
workflowId: string;
- operation: 'restore' | 'delete' | 'destroy';
}) {
- if (operation !== 'delete') {
- return;
- }
-
const workflowVersions = await workflowVersionRepository.find({
where: { workflowId },
withDeleted: true,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts
index a6c9daaa9d3..67ca059ac46 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts
@@ -2,18 +2,9 @@ import { Module } from '@nestjs/common';
import { WorkflowSchemaModule } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module';
import { WorkflowVersionStepModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module';
-import { WorkflowVersionEdgeModule } from 'src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.module';
@Module({
- imports: [
- WorkflowSchemaModule,
- WorkflowVersionStepModule,
- WorkflowVersionEdgeModule,
- ],
- exports: [
- WorkflowSchemaModule,
- WorkflowVersionStepModule,
- WorkflowVersionEdgeModule,
- ],
+ imports: [WorkflowSchemaModule, WorkflowVersionStepModule],
+ exports: [WorkflowSchemaModule, WorkflowVersionStepModule],
})
export class WorkflowBuilderModule {}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.module.ts
deleted file mode 100644
index 2736824b9d3..00000000000
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkflowVersionCoreModule } from 'src/engine/core-modules/workflow/workflow-version-core.module';
-import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
-import { WorkflowVersionEdgeWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.workspace-service';
-
-@Module({
- imports: [WorkflowCommonModule, WorkflowVersionCoreModule],
- providers: [WorkflowVersionEdgeWorkspaceService],
- exports: [WorkflowVersionEdgeWorkspaceService],
-})
-export class WorkflowVersionEdgeModule {}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.workspace-service.ts
deleted file mode 100644
index e4e32f212e6..00000000000
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.workspace-service.ts
+++ /dev/null
@@ -1,407 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { isDefined } from 'twenty-shared/utils';
-import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-
-import { type WorkflowVersionStepChangesDTO } from 'src/engine/core-modules/workflow/dtos/workflow-version-step-changes.dto';
-import { WorkflowVersionCoreSyncService } from 'src/engine/core-modules/workflow/services/workflow-version-core-sync.service';
-import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import {
- WorkflowVersionEdgeException,
- WorkflowVersionEdgeExceptionCode,
-} from 'src/modules/workflow/common/exceptions/workflow-version-edge.exception';
-import { type WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
-import { assertWorkflowVersionIsDraft } from 'src/modules/workflow/common/utils/assert-workflow-version-is-draft.util';
-import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';
-import { computeWorkflowVersionStepChanges } from 'src/modules/workflow/workflow-builder/utils/compute-workflow-version-step-updates.util';
-import {
- assertEdgeConnectionOptionsAreSupported,
- buildSourceStepWithAddedEdge,
- buildSourceStepWithRemovedEdge,
-} from 'src/modules/workflow/workflow-builder/workflow-version-edge/utils/build-updated-source-step-for-edge.util';
-import { type WorkflowStepConnectionOptions } from 'src/modules/workflow/workflow-builder/workflow-version-step/types/workflow-step-connection-options.type';
-import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
-import { type WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
-
-@Injectable()
-export class WorkflowVersionEdgeWorkspaceService {
- constructor(
- private readonly workspaceOrmManager: WorkspaceOrmManager,
- private readonly workflowCommonWorkspaceService: WorkflowCommonWorkspaceService,
- private readonly workflowVersionCoreSyncService: WorkflowVersionCoreSyncService,
- ) {}
-
- async createWorkflowVersionEdge({
- source,
- target,
- workflowVersionId,
- workspaceId,
- sourceConnectionOptions,
- }: {
- source: string;
- target: string;
- workflowVersionId: string;
- workspaceId: string;
- sourceConnectionOptions?: WorkflowStepConnectionOptions;
- }): Promise<WorkflowVersionStepChangesDTO> {
- assertEdgeConnectionOptionsAreSupported(sourceConnectionOptions);
-
- const authContext = buildSystemAuthContext(workspaceId);
-
- return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowVersion =
- await this.workflowCommonWorkspaceService.getWorkflowVersionOrFail({
- workflowVersionId,
- workspaceId,
- });
-
- assertWorkflowVersionIsDraft(workflowVersion);
-
- const trigger = workflowVersion.trigger;
- const steps = workflowVersion.steps || [];
-
- const targetStep = steps.find((step) => step.id === target);
-
- if (!isDefined(targetStep)) {
- throw new WorkflowVersionEdgeException(
- `Target step '${target}' not found in workflowVersion '${workflowVersionId}'`,
- WorkflowVersionEdgeExceptionCode.NOT_FOUND,
- );
- }
-
- const isSourceTrigger = source === TRIGGER_STEP_ID;
-
- if (isSourceTrigger) {
- return this.createTriggerEdge({
- trigger,
- steps,
- target,
- workflowVersion,
- workspaceId,
- });
- } else {
- return this.createStepEdge({
- trigger,
- steps,
- source,
- target,
- sourceConnectionOptions,
- workflowVersion,
- workspaceId,
- });
- }
- }, authContext);
- }
-
- async deleteWorkflowVersionEdge({
- source,
- target,
- workflowVersionId,
- workspaceId,
- sourceConnectionOptions,
- }: {
- source: string;
- target: string;
- workflowVersionId: string;
- workspaceId: string;
- sourceConnectionOptions?: WorkflowStepConnectionOptions;
- }): Promise<WorkflowVersionStepChangesDTO> {
- assertEdgeConnectionOptionsAreSupported(sourceConnectionOptions);
-
- const authContext = buildSystemAuthContext(workspaceId);
-
- return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowVersion =
- await this.workflowCommonWorkspaceService.getWorkflowVersionOrFail({
- workflowVersionId,
- workspaceId,
- });
-
- assertWorkflowVersionIsDraft(workflowVersion);
-
- const trigger = workflowVersion.trigger;
- const steps = workflowVersion.steps || [];
-
- const targetStep = steps.find((step) => step.id === target);
-
- if (!isDefined(targetStep)) {
- throw new WorkflowVersionEdgeException(
- `Target step '${target}' not found in workflowVersion '${workflowVersionId}'`,
- WorkflowVersionEdgeExceptionCode.NOT_FOUND,
- );
- }
-
- const isSourceTrigger = source === TRIGGER_STEP_ID;
-
- if (isSourceTrigger) {
- return this.deleteTriggerEdge({
- trigger,
- steps,
- target,
- workflowVersion,
- workspaceId,
- });
- } else {
- return this.deleteStepEdge({
- trigger,
- steps,
- source,
- target,
- workflowVersion,
- workspaceId,
- sourceConnectionOptions,
- });
- }
- }, authContext);
- }
-
- private async createTriggerEdge({
- trigger,
- steps,
- target,
- workflowVersion,
- workspaceId,
- }: {
- trigger: WorkflowTrigger | null;
- steps: WorkflowAction[];
- target: string;
- workflowVersion: WorkflowVersionWorkspaceEntity;
- workspaceId: string;
- }): Promise<WorkflowVersionStepChangesDTO> {
- if (!isDefined(trigger)) {
- throw new WorkflowVersionEdgeException(
- `Trigger not found in workflowVersion '${workflowVersion.id}'`,
- WorkflowVersionEdgeExceptionCode.NOT_FOUND,
- );
- }
-
- if (trigger.nextStepIds?.includes(target)) {
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- });
- }
-
- const updatedTrigger = {
- ...trigger,
- nextStepIds: [...(trigger.nextStepIds ?? []), target],
- };
-
- await this.workflowVersionCoreSyncService.writeWorkflowVersionAndMirror(
- workspaceId,
- async (workflowVersionRepository) => {
- await workflowVersionRepository.update(workflowVersion.id, {
- trigger: updatedTrigger,
- });
-
- return workflowVersion.id;
- },
- );
-
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- updatedTrigger,
- });
- }
-
- private async createStepEdge({
- trigger,
- steps,
- source,
- target,
- workflowVersion,
- workspaceId,
- sourceConnectionOptions,
- }: {
- trigger: WorkflowTrigger | null;
- steps: WorkflowAction[];
- source: string;
- target: string;
- workflowVersion: WorkflowVersionWorkspaceEntity;
- workspaceId: string;
- sourceConnectionOptions?: WorkflowStepConnectionOptions;
- }): Promise<WorkflowVersionStepChangesDTO> {
- const sourceStep = steps.find((step) => step.id === source);
-
- if (!isDefined(sourceStep)) {
- throw new WorkflowVersionEdgeException(
- `Source step '${source}' not found in workflowVersion '${workflowVersion.id}'`,
- WorkflowVersionEdgeExceptionCode.NOT_FOUND,
- );
- }
-
- if (
- sourceStep.nextStepIds?.includes(target) &&
- !isDefined(sourceConnectionOptions)
- ) {
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- });
- }
-
- const { updatedSourceStep, shouldPersist } = buildSourceStepWithAddedEdge({
- sourceStep,
- target,
- sourceConnectionOptions,
- });
-
- const updatedSteps = steps.map((step) => {
- if (step.id === source) {
- return updatedSourceStep;
- }
-
- return step;
- });
-
- if (shouldPersist) {
- await this.workflowVersionCoreSyncService.writeWorkflowVersionAndMirror(
- workspaceId,
- async (workflowVersionRepository) => {
- await workflowVersionRepository.update(workflowVersion.id, {
- steps: updatedSteps,
- });
-
- return workflowVersion.id;
- },
- );
- }
-
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- updatedSteps,
- });
- }
-
- private async deleteTriggerEdge({
- trigger,
- steps,
- target,
- workflowVersion,
- workspaceId,
- }: {
- trigger: WorkflowTrigger | null;
- steps: WorkflowAction[];
- target: string;
- workflowVersion: WorkflowVersionWorkspaceEntity;
- workspaceId: string;
- }): Promise<WorkflowVersionStepChangesDTO> {
- if (!isDefined(trigger)) {
- throw new WorkflowVersionEdgeException(
- `Trigger not found in workflowVersion '${workflowVersion.id}'`,
- WorkflowVersionEdgeExceptionCode.NOT_FOUND,
- );
- }
-
- if (!trigger.nextStepIds?.includes(target)) {
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- });
- }
-
- const updatedTrigger = {
- ...trigger,
- nextStepIds: trigger.nextStepIds?.filter(
- (nextStepId: string) => nextStepId !== target,
- ),
- };
-
- await this.workflowVersionCoreSyncService.writeWorkflowVersionAndMirror(
- workspaceId,
- async (workflowVersionRepository) => {
- await workflowVersionRepository.update(workflowVersion.id, {
- trigger: updatedTrigger,
- });
-
- return workflowVersion.id;
- },
- );
-
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- updatedTrigger,
- });
- }
-
- private async deleteStepEdge({
- trigger,
- steps,
- source,
- target,
- workflowVersion,
- workspaceId,
- sourceConnectionOptions,
- }: {
- trigger: WorkflowTrigger | null;
- steps: WorkflowAction[];
- source: string;
- target: string;
- workflowVersion: WorkflowVersionWorkspaceEntity;
- workspaceId: string;
- sourceConnectionOptions?: WorkflowStepConnectionOptions;
- }): Promise<WorkflowVersionStepChangesDTO> {
- const sourceStep = steps.find((step) => step.id === source);
-
- if (!isDefined(sourceStep)) {
- throw new WorkflowVersionEdgeException(
- `Source step '${source}' not found in workflowVersion '${workflowVersion.id}'`,
- WorkflowVersionEdgeExceptionCode.NOT_FOUND,
- );
- }
-
- if (
- !sourceStep.nextStepIds?.includes(target) &&
- !isDefined(sourceConnectionOptions)
- ) {
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- });
- }
-
- const { updatedSourceStep, shouldPersist } = buildSourceStepWithRemovedEdge(
- {
- sourceStep,
- target,
- sourceConnectionOptions,
- },
- );
-
- if (!shouldPersist) {
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- });
- }
-
- const updatedSteps = steps.map((step) => {
- if (step.id === source) {
- return updatedSourceStep;
- }
-
- return step;
- });
-
- await this.workflowVersionCoreSyncService.writeWorkflowVersionAndMirror(
- workspaceId,
- async (workflowVersionRepository) => {
- await workflowVersionRepository.update(workflowVersion.id, {
- steps: updatedSteps,
- });
-
- return workflowVersion.id;
- },
- );
-
- return computeWorkflowVersionStepChanges({
- existingTrigger: trigger,
- existingSteps: steps,
- updatedSteps,
- });
- }
-}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-creation.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-creation.workspace-service.ts
deleted file mode 100644
index 4a269dd9b15..00000000000
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-creation.workspace-service.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { type CreateWorkflowVersionStepInput } from 'src/engine/core-modules/workflow/dtos/create-workflow-version-step.input';
-import { type WorkflowVersionStepChangesDTO } from 'src/engine/core-modules/workflow/dtos/workflow-version-step-changes.dto';
-import {
- WorkflowVersionStepException,
- WorkflowVersionStepExceptionCode,
-} from 'src/modules/workflow/common/exceptions/workflow-version-step.exception';
-import { computeWorkflowVersionStepChanges } from 'src/modules/workflow/workflow-builder/utils/compute-workflow-version-step-updates.util';
-import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
-import { insertStep } from 'src/modules/workflow/workflow-builder/workflow-version-step/utils/insert-step';
-import { WorkflowVersionStepHelpersWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service';
-import { WorkflowVersionStepOperationsWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service';
-import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
-
-@Injectable()
-export class WorkflowVersionStepCreationWorkspaceService {
- constructor(
- private readonly workflowSchemaWorkspaceService: WorkflowSchemaWorkspaceService,
- private readonly workflowVersionStepOperationsWorkspaceService: WorkflowVersionStepOperationsWorkspaceService,
- private readonly workflowVersionStepHelpersWorkspaceService: WorkflowVersionStepHelpersWorkspaceService,
- ) {}
-
- async createWorkflowVersionStep({
- workspaceId,
- input,
- }: {
- workspaceId: string;
- input: CreateWorkflowVersionStepInput;
- }): Promise<WorkflowVersionStepChangesDTO> {
- const {
- workflowVersionId,
- stepType,
- parentStepId,
- nextStepId,
- position,
- parentStepConnectionOptions,
- id,
- defaultSettings,
- } = input;
-
- const workflowVersion =
- await this.workflowVersionStepHelpersWorkspaceService.getValidatedDraftWorkflowVersion(
- {
- workflowVersionId,
- workspaceId,
- },
- );
-
- const existingSteps = workflowVersion.steps;
- const existingTrigger = workflowVersion.trigger;
-
- const { builtStep, additionalCreatedSteps } =
- await this.workflowVersionStepOperationsWorkspaceService.runStepCreationSideEffectsAndBuildStep(
- {
- type: stepType,
- workspaceId,
- position,
- id,
- defaultSettings,
- },
- );
-
- const enrichedNewStep =
- await this.workflowSchemaWorkspaceService.enrichOutputSchema({
- step: builtStep,
- workspaceId,
- workflowVersionContent: {
- trigger: existingTrigger,
- steps: existingSteps,
- },
- });
-
- const { updatedSteps, updatedTrigger } = insertStep({
- existingSteps: existingSteps ?? [],
- existingTrigger,
- insertedStep: enrichedNewStep,
- additionalCreatedSteps,
- parentStepId,
- nextStepId,
- parentStepConnectionOptions,
- });
-
- await this.workflowVersionStepHelpersWorkspaceService.updateWorkflowVersionStepsAndTrigger(
- {
- workspaceId,
- workflowVersionId: workflowVersion.id,
- trigger: updatedTrigger,
- steps: updatedSteps,
- },
- );
-
- return computeWorkflowVersionStepChanges({
- existingTrigger,
- existingSteps,
- updatedTrigger,
- updatedSteps,
- });
- }
-
- async duplicateWorkflowVersionStep({
- workspaceId,
- workflowVersionId,
- stepId,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- stepId: string;
- }): Promise<WorkflowVersionStepChangesDTO> {
- const workflowVersion =
- await this.workflowVersionStepHelpersWorkspaceService.getValidatedDraftWorkflowVersion(
- {
- workflowVersionId,
- workspaceId,
- },
- );
-
- const stepToDuplicate = workflowVersion.steps?.find(
- (step) => step.id === stepId,
- );
-
- if (!isDefined(stepToDuplicate)) {
- throw new WorkflowVersionStepException(
- 'Step not found',
- WorkflowVersionStepExceptionCode.NOT_FOUND,
- );
- }
-
- const clonedStep =
- await this.workflowVersionStepOperationsWorkspaceService.cloneStep({
- step: stepToDuplicate,
- workspaceId,
- });
-
- const duplicatedStep =
- this.workflowVersionStepOperationsWorkspaceService.markStepAsDuplicate({
- step: clonedStep,
- });
-
- const { updatedSteps, updatedTrigger } = insertStep({
- existingSteps: workflowVersion.steps ?? [],
- existingTrigger: workflowVersion.trigger,
- insertedStep: duplicatedStep,
- });
-
- await this.workflowVersionStepHelpersWorkspaceService.updateWorkflowVersionStepsAndTrigger(
- {
- workspaceId,
- workflowVersionId: workflowVersion.id,
- steps: updatedSteps,
- trigger: updatedTrigger,
- },
- );
-
- return computeWorkflowVersionStepChanges({
- existingTrigger: workflowVersion.trigger,
- existingSteps: workflowVersion.steps,
- updatedTrigger,
- updatedSteps,
- });
- }
-
- async createDraftStep({
- step,
- workspaceId,
- }: {
- step: WorkflowAction;
- workspaceId: string;
- }): Promise<WorkflowAction> {
- return this.workflowVersionStepOperationsWorkspaceService.createDraftStep({
- step,
- workspaceId,
- });
- }
-}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-deletion.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-deletion.workspace-service.ts
deleted file mode 100644
index 8fe95283199..00000000000
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-deletion.workspace-service.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { isDefined } from 'twenty-shared/utils';
-import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-
-import { type WorkflowVersionStepChangesDTO } from 'src/engine/core-modules/workflow/dtos/workflow-version-step-changes.dto';
-import {
- WorkflowVersionStepException,
- WorkflowVersionStepExceptionCode,
-} from 'src/modules/workflow/common/exceptions/workflow-version-step.exception';
-import { computeWorkflowVersionStepChanges } from 'src/modules/workflow/workflow-builder/utils/compute-workflow-version-step-updates.util';
-import { removeStep } from 'src/modules/workflow/workflow-builder/workflow-version-step/utils/remove-step';
-import { WorkflowVersionStepOperationsWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service';
-import { WorkflowVersionStepHelpersWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service';
-
-@Injectable()
-export class WorkflowVersionStepDeletionWorkspaceService {
- constructor(
- private readonly workflowVersionStepOperationsWorkspaceService: WorkflowVersionStepOperationsWorkspaceService,
- private readonly workflowVersionStepHelpersWorkspaceService: WorkflowVersionStepHelpersWorkspaceService,
- ) {}
-
- async deleteWorkflowVersionStep({
- workspaceId,
- workflowVersionId,
- stepIdToDelete,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- stepIdToDelete: string;
- }): Promise<WorkflowVersionStepChangesDTO> {
- const workflowVersion =
- await this.workflowVersionStepHelpersWorkspaceService.getValidatedDraftWorkflowVersion(
- {
- workflowVersionId,
- workspaceId,
- },
- );
-
- const existingTrigger = workflowVersion.trigger;
-
- const isDeletingTrigger =
- stepIdToDelete === TRIGGER_STEP_ID && isDefined(existingTrigger);
-
- if (!isDeletingTrigger && !isDefined(workflowVersion.steps)) {
- throw new WorkflowVersionStepException(
- "Can't delete step from undefined steps",
- WorkflowVersionStepExceptionCode.INVALID_REQUEST,
- );
- }
-
- const stepToDelete = workflowVersion.steps?.find(
- (step) => step.id === stepIdToDelete,
- );
-
- if (!isDeletingTrigger && !isDefined(stepToDelete)) {
- throw new WorkflowVersionStepException(
- "Can't delete not existing step",
- WorkflowVersionStepExceptionCode.NOT_FOUND,
- );
- }
-
- const stepToDeleteChildrenIds = isDeletingTrigger
- ? (existingTrigger?.nextStepIds ?? [])
- : (stepToDelete?.nextStepIds ?? []);
-
- const { updatedSteps, updatedTrigger, removedStepIds } = removeStep({
- existingTrigger,
- existingSteps: workflowVersion.steps,
- stepIdToDelete,
- stepToDeleteChildrenIds,
- });
-
- await this.workflowVersionStepHelpersWorkspaceService.updateWorkflowVersionStepsAndTrigger(
- {
- workspaceId,
- workflowVersionId: workflowVersion.id,
- steps: updatedSteps,
- trigger: updatedTrigger,
- },
- );
-
- const removedSteps =
- workflowVersion.steps?.filter((step) =>
- removedStepIds.includes(step.id),
- ) ?? [];
-
- await Promise.all(
- removedSteps.map((step) =>
- this.workflowVersionStepOperationsWorkspaceService.runWorkflowVersionStepDeletionSideEffects(
- {
- step,
- workspaceId,
- },
- ),
- ),
- );
-
- return computeWorkflowVersionStepChanges({
- existingTrigger,
- existingSteps: workflowVersion.steps,
- updatedTrigger,
- updatedSteps,
- });
- }
-}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service.ts
deleted file mode 100644
index 94cb7cd89a3..00000000000
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { WorkflowVersionCoreSyncService } from 'src/engine/core-modules/workflow/services/workflow-version-core-sync.service';
-import { type WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
-import { assertWorkflowVersionIsDraft } from 'src/modules/workflow/common/utils/assert-workflow-version-is-draft.util';
-import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';
-import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
-import { type WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
-
-@Injectable()
-export class WorkflowVersionStepHelpersWorkspaceService {
- constructor(
- private readonly workflowCommonWorkspaceService: WorkflowCommonWorkspaceService,
- private readonly workflowVersionCoreSyncService: WorkflowVersionCoreSyncService,
- ) {}
-
- async getValidatedDraftWorkflowVersion({
- workflowVersionId,
- workspaceId,
- }: {
- workflowVersionId: string;
- workspaceId: string;
- }): Promise<WorkflowVersionWorkspaceEntity> {
- const workflowVersion =
- await this.workflowCommonWorkspaceService.getWorkflowVersionOrFail({
- workflowVersionId,
- workspaceId,
- });
-
- assertWorkflowVersionIsDraft(workflowVersion);
-
- return workflowVersion;
- }
-
- async updateWorkflowVersionStepsAndTrigger({
- workspaceId,
- workflowVersionId,
- steps,
- trigger,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- steps?: WorkflowAction[] | null;
- trigger?: WorkflowTrigger | null;
- }): Promise<void> {
- const updateData: Pick<
- Partial<WorkflowVersionWorkspaceEntity>,
- 'steps' | 'trigger'
- > = {};
-
- if (steps !== undefined) {
- updateData.steps = steps;
- }
-
- if (trigger !== undefined) {
- updateData.trigger = trigger;
- }
-
- await this.workflowVersionCoreSyncService.writeWorkflowVersionAndMirror(
- workspaceId,
- async (workflowVersionRepository) => {
- await workflowVersionRepository.update(workflowVersionId, updateData);
-
- return workflowVersionId;
- },
- );
- }
-}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-update.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-update.workspace-service.ts
deleted file mode 100644
index 90f9c1a00ab..00000000000
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-update.workspace-service.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { WorkflowActionDTO } from 'src/engine/core-modules/workflow/dtos/workflow-action.dto';
-import {
- WorkflowVersionStepException,
- WorkflowVersionStepExceptionCode,
-} from 'src/modules/workflow/common/exceptions/workflow-version-step.exception';
-import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
-import { getNextStepIdsForStepTypeChange } from 'src/modules/workflow/workflow-builder/workflow-version-step/utils/get-next-step-ids-for-step-type-change.util';
-import { WorkflowVersionStepHelpersWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service';
-import { WorkflowVersionStepOperationsWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service';
-import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
-import { type WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
-
-@Injectable()
-export class WorkflowVersionStepUpdateWorkspaceService {
- constructor(
- private readonly workflowSchemaWorkspaceService: WorkflowSchemaWorkspaceService,
- private readonly workflowVersionStepOperationsWorkspaceService: WorkflowVersionStepOperationsWorkspaceService,
- private readonly workflowVersionStepHelpersWorkspaceService: WorkflowVersionStepHelpersWorkspaceService,
- ) {}
-
- async updateWorkflowVersionStep({
- workspaceId,
- workflowVersionId,
- step,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- step: WorkflowAction;
- }): Promise<WorkflowActionDTO> {
- const workflowVersion =
- await this.workflowVersionStepHelpersWorkspaceService.getValidatedDraftWorkflowVersion(
- {
- workflowVersionId,
- workspaceId,
- },
- );
-
- if (!isDefined(workflowVersion.steps)) {
- throw new WorkflowVersionStepException(
- "Can't update step from undefined steps",
- WorkflowVersionStepExceptionCode.INVALID_REQUEST,
- );
- }
-
- const existingStep = workflowVersion.steps.find(
- (existingStep) => existingStep.id === step.id,
- );
-
- if (!isDefined(existingStep)) {
- throw new WorkflowVersionStepException(
- 'Step not found',
- WorkflowVersionStepExceptionCode.NOT_FOUND,
- );
- }
-
- const isStepTypeChanged = existingStep.type !== step.type;
-
- const workflowVersionContent = {
- trigger: workflowVersion.trigger,
- steps: workflowVersion.steps,
- };
-
- const { updatedStep, additionalCreatedSteps } = isStepTypeChanged
- ? await this.updateWorkflowVersionStepType({
- existingStep,
- newStep: step,
- workspaceId,
- workflowVersionContent,
- })
- : {
- updatedStep: await this.updateWorkflowVersionStepSettings({
- newStep: step,
- workspaceId,
- workflowVersionContent,
- }),
- additionalCreatedSteps: undefined,
- };
-
- const updatedSteps = workflowVersion.steps.map((existingStep) => {
- if (existingStep.id === step.id) {
- return updatedStep;
- } else {
- return existingStep;
- }
- });
-
- if (isDefined(additionalCreatedSteps)) {
- updatedSteps.push(...additionalCreatedSteps);
- }
-
- await this.workflowVersionStepHelpersWorkspaceService.updateWorkflowVersionStepsAndTrigger(
- {
- workspaceId,
- workflowVersionId: workflowVersion.id,
- steps: updatedSteps,
- },
- );
-
- return updatedStep;
- }
-
- private async updateWorkflowVersionStepType({
- existingStep,
- newStep,
- workspaceId,
- workflowVersionContent,
- }: {
- existingStep: WorkflowAction;
- newStep: WorkflowAction;
- workspaceId: string;
- workflowVersionContent: {
- trigger: WorkflowTrigger | null;
- steps: WorkflowAction[] | null;
- };
- }): Promise<{
- updatedStep: WorkflowAction;
- additionalCreatedSteps?: WorkflowAction[];
- }> {
- await this.workflowVersionStepOperationsWorkspaceService.runWorkflowVersionStepDeletionSideEffects(
- {
- step: existingStep,
- workspaceId,
- },
- );
-
- const { builtStep, additionalCreatedSteps } =
- await this.workflowVersionStepOperationsWorkspaceService.runStepCreationSideEffectsAndBuildStep(
- {
- type: newStep.type,
- workspaceId,
- position: newStep.position,
- id: existingStep.id,
- defaultSettings: newStep.settings,
- },
- );
-
- const updatedStep =
- await this.workflowSchemaWorkspaceService.enrichOutputSchema({
- step: {
- ...builtStep,
- nextStepIds: getNextStepIdsForStepTypeChange({
- existingStep,
- builtStep,
- }),
- position: existingStep.position,
- },
- workspaceId,
- workflowVersionContent,
- });
-
- return { updatedStep, additionalCreatedSteps };
- }
-
- private async updateWorkflowVersionStepSettings({
- newStep,
- workspaceId,
- workflowVersionContent,
- }: {
- newStep: WorkflowAction;
- workspaceId: string;
- workflowVersionContent: {
- trigger: WorkflowTrigger | null;
- steps: WorkflowAction[] | null;
- };
- }): Promise<WorkflowAction> {
- return this.workflowSchemaWorkspaceService.enrichOutputSchema({
- step: newStep,
- workspaceId,
- workflowVersionContent,
- });
- }
-}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
index 690c13e3465..60234885870 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
@@ -14,12 +14,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
import { WorkflowSchemaModule } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module';
import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/code-step/code-step-build.module';
-import { WorkflowVersionStepCreationWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-creation.workspace-service';
-import { WorkflowVersionStepDeletionWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-deletion.workspace-service';
-import { WorkflowVersionStepHelpersWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service';
import { WorkflowVersionStepOperationsWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service';
-import { WorkflowVersionStepUpdateWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-update.workspace-service';
-import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service';
import { RecordCrudModule } from 'src/engine/core-modules/record-crud/record-crud.module';
@Module({
@@ -38,18 +33,10 @@ import { RecordCrudModule } from 'src/engine/core-modules/record-crud/record-cru
RecordCrudModule,
],
providers: [
- WorkflowVersionStepWorkspaceService,
WorkflowVersionStepOperationsWorkspaceService,
- WorkflowVersionStepHelpersWorkspaceService,
- WorkflowVersionStepCreationWorkspaceService,
- WorkflowVersionStepUpdateWorkspaceService,
- WorkflowVersionStepDeletionWorkspaceService,
provideWorkspaceScopedRepository(RoleTargetEntity),
provideWorkspaceScopedRepository(ObjectMetadataEntity),
],
- exports: [
- WorkflowVersionStepWorkspaceService,
- WorkflowVersionStepOperationsWorkspaceService,
- ],
+ exports: [WorkflowVersionStepOperationsWorkspaceService],
})
export class WorkflowVersionStepModule {}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service.ts
deleted file mode 100644
index 4dc5462f3a3..00000000000
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { type CreateWorkflowVersionStepInput } from 'src/engine/core-modules/workflow/dtos/create-workflow-version-step.input';
-import { WorkflowActionDTO } from 'src/engine/core-modules/workflow/dtos/workflow-action.dto';
-import { type WorkflowVersionStepChangesDTO } from 'src/engine/core-modules/workflow/dtos/workflow-version-step-changes.dto';
-import { type WorkflowVersionTriggerDTO } from 'src/engine/core-modules/workflow/dtos/workflow-version-trigger.dto';
-import { WorkflowVersionStepCreationWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-creation.workspace-service';
-import { WorkflowVersionStepDeletionWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-deletion.workspace-service';
-import { WorkflowVersionStepHelpersWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service';
-import { WorkflowVersionStepUpdateWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-update.workspace-service';
-import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
-import { type WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type';
-
-@Injectable()
-export class WorkflowVersionStepWorkspaceService {
- constructor(
- private readonly workflowVersionStepCreationWorkspaceService: WorkflowVersionStepCreationWorkspaceService,
- private readonly workflowVersionStepUpdateWorkspaceService: WorkflowVersionStepUpdateWorkspaceService,
- private readonly workflowVersionStepDeletionWorkspaceService: WorkflowVersionStepDeletionWorkspaceService,
- private readonly workflowVersionStepHelpersWorkspaceService: WorkflowVersionStepHelpersWorkspaceService,
- ) {}
-
- async createWorkflowVersionStep({
- workspaceId,
- input,
- }: {
- workspaceId: string;
- input: CreateWorkflowVersionStepInput;
- }): Promise<WorkflowVersionStepChangesDTO> {
- return this.workflowVersionStepCreationWorkspaceService.createWorkflowVersionStep(
- {
- workspaceId,
- input,
- },
- );
- }
-
- async updateWorkflowVersionStep({
- workspaceId,
- workflowVersionId,
- step,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- step: WorkflowAction;
- }): Promise<WorkflowActionDTO> {
- return this.workflowVersionStepUpdateWorkspaceService.updateWorkflowVersionStep(
- {
- workspaceId,
- workflowVersionId,
- step,
- },
- );
- }
-
- async updateWorkflowVersionTrigger({
- workspaceId,
- workflowVersionId,
- trigger,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- trigger: WorkflowTrigger;
- }): Promise<WorkflowVersionTriggerDTO> {
- await this.workflowVersionStepHelpersWorkspaceService.getValidatedDraftWorkflowVersion(
- {
- workflowVersionId,
- workspaceId,
- },
- );
-
- await this.workflowVersionStepHelpersWorkspaceService.updateWorkflowVersionStepsAndTrigger(
- {
- workspaceId,
- workflowVersionId,
- trigger,
- },
- );
-
- return { trigger };
- }
-
- async deleteWorkflowVersionStep({
- workspaceId,
- workflowVersionId,
- stepIdToDelete,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- stepIdToDelete: string;
- }): Promise<WorkflowVersionStepChangesDTO> {
- return this.workflowVersionStepDeletionWorkspaceService.deleteWorkflowVersionStep(
- {
- workspaceId,
- workflowVersionId,
- stepIdToDelete,
- },
- );
- }
-
- async duplicateWorkflowVersionStep({
- workspaceId,
- workflowVersionId,
- stepId,
- }: {
- workspaceId: string;
- workflowVersionId: string;
- stepId: string;
- }): Promise<WorkflowVersionStepChangesDTO> {
- return this.workflowVersionStepCreationWorkspaceService.duplicateWorkflowVersionStep(
- {
- workspaceId,
- workflowVersionId,
- stepId,
- },
- );
- }
-
- async createDraftStep({
- step,
- workspaceId,
- }: {
- step: WorkflowAction;
- workspaceId: string;
- }): Promise<WorkflowAction> {
- return this.workflowVersionStepCreationWorkspaceService.createDraftStep({
- step,
- workspaceId,
- });
- }
-}