mirror of
https://github.com/lingble/twenty.git
synced 2025-11-02 05:37:56 +00:00
Delete workflow step (#7373)
- Allows the deletion of triggers and steps in workflows. If the workflow can not be edited right now, we create a new draft version. - The workflow right drawer can now render nothing. It's necessary to behave that way because a deleted step will still be displayed for a short amount of time in the drawer. The drawer will be filled with blank content when it disappears. https://github.com/user-attachments/assets/abd5184e-d3db-4fe7-8870-ccc78ff23d41 Closes #7057
This commit is contained in:
committed by
GitHub
parent
3a0c32a88d
commit
35361093bf
@@ -7,7 +7,7 @@ import { useUpdateWorkflowVersionTrigger } from '@/workflow/hooks/useUpdateWorkf
|
|||||||
import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState';
|
import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState';
|
||||||
import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
|
import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
|
||||||
import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
|
import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
|
||||||
import { findStepPositionOrThrow } from '@/workflow/utils/findStepPositionOrThrow';
|
import { findStepPosition } from '@/workflow/utils/findStepPosition';
|
||||||
import { useRecoilValue } from 'recoil';
|
import { useRecoilValue } from 'recoil';
|
||||||
import { isDefined } from 'twenty-ui';
|
import { isDefined } from 'twenty-ui';
|
||||||
|
|
||||||
@@ -43,10 +43,13 @@ const getStepDefinitionOrThrow = ({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectedNodePosition = findStepPositionOrThrow({
|
const selectedNodePosition = findStepPosition({
|
||||||
steps: currentVersion.steps,
|
steps: currentVersion.steps,
|
||||||
stepId: stepId,
|
stepId: stepId,
|
||||||
});
|
});
|
||||||
|
if (!isDefined(selectedNodePosition)) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
type: 'action',
|
type: 'action',
|
||||||
@@ -76,6 +79,9 @@ export const RightDrawerWorkflowEditStepContent = ({
|
|||||||
stepId: workflowSelectedNode,
|
stepId: workflowSelectedNode,
|
||||||
workflow,
|
workflow,
|
||||||
});
|
});
|
||||||
|
if (!isDefined(stepDefinition)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
switch (stepDefinition.type) {
|
switch (stepDefinition.type) {
|
||||||
case 'trigger': {
|
case 'trigger': {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { WorkflowDiagramStepNodeData } from '@/workflow/types/WorkflowDiagram';
|
|||||||
import styled from '@emotion/styled';
|
import styled from '@emotion/styled';
|
||||||
import { Handle, Position } from '@xyflow/react';
|
import { Handle, Position } from '@xyflow/react';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { isDefined } from 'twenty-ui';
|
||||||
import { capitalize } from '~/utils/string/capitalize';
|
import { capitalize } from '~/utils/string/capitalize';
|
||||||
|
|
||||||
type Variant = 'placeholder';
|
type Variant = 'placeholder';
|
||||||
@@ -76,16 +77,24 @@ export const StyledTargetHandle = styled(Handle)`
|
|||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const StyledRightFloatingElementContainer = styled.div`
|
||||||
|
position: absolute;
|
||||||
|
transform: translateX(100%);
|
||||||
|
right: ${({ theme }) => theme.spacing(-2)};
|
||||||
|
`;
|
||||||
|
|
||||||
export const WorkflowDiagramBaseStepNode = ({
|
export const WorkflowDiagramBaseStepNode = ({
|
||||||
nodeType,
|
nodeType,
|
||||||
label,
|
label,
|
||||||
variant,
|
variant,
|
||||||
Icon,
|
Icon,
|
||||||
|
RightFloatingElement,
|
||||||
}: {
|
}: {
|
||||||
nodeType: WorkflowDiagramStepNodeData['nodeType'];
|
nodeType: WorkflowDiagramStepNodeData['nodeType'];
|
||||||
label: string;
|
label: string;
|
||||||
variant?: Variant;
|
variant?: Variant;
|
||||||
Icon?: React.ReactNode;
|
Icon?: React.ReactNode;
|
||||||
|
RightFloatingElement?: React.ReactNode;
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
<StyledStepNodeContainer>
|
<StyledStepNodeContainer>
|
||||||
@@ -101,6 +110,12 @@ export const WorkflowDiagramBaseStepNode = ({
|
|||||||
|
|
||||||
{label}
|
{label}
|
||||||
</StyledStepNodeLabel>
|
</StyledStepNodeLabel>
|
||||||
|
|
||||||
|
{isDefined(RightFloatingElement) ? (
|
||||||
|
<StyledRightFloatingElementContainer>
|
||||||
|
{RightFloatingElement}
|
||||||
|
</StyledRightFloatingElementContainer>
|
||||||
|
) : null}
|
||||||
</StyledStepNodeInnerContainer>
|
</StyledStepNodeInnerContainer>
|
||||||
|
|
||||||
<StyledSourceHandle type="source" position={Position.Bottom} />
|
<StyledSourceHandle type="source" position={Position.Bottom} />
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
|
import { FloatingIconButton } from '@/ui/input/button/components/FloatingIconButton';
|
||||||
import { WorkflowDiagramBaseStepNode } from '@/workflow/components/WorkflowDiagramBaseStepNode';
|
import { WorkflowDiagramBaseStepNode } from '@/workflow/components/WorkflowDiagramBaseStepNode';
|
||||||
|
import { useDeleteOneStep } from '@/workflow/hooks/useDeleteOneStep';
|
||||||
|
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
|
||||||
|
import { workflowIdState } from '@/workflow/states/workflowIdState';
|
||||||
import { WorkflowDiagramStepNodeData } from '@/workflow/types/WorkflowDiagram';
|
import { WorkflowDiagramStepNodeData } from '@/workflow/types/WorkflowDiagram';
|
||||||
import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
|
import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
|
||||||
|
import { assertWorkflowWithCurrentVersionIsDefined } from '@/workflow/utils/assertWorkflowWithCurrentVersionIsDefined';
|
||||||
import { useTheme } from '@emotion/react';
|
import { useTheme } from '@emotion/react';
|
||||||
import styled from '@emotion/styled';
|
import styled from '@emotion/styled';
|
||||||
import { IconCode, IconMail, IconPlaylistAdd } from 'twenty-ui';
|
import { useRecoilValue } from 'recoil';
|
||||||
|
import { IconCode, IconMail, IconPlaylistAdd, IconTrash } from 'twenty-ui';
|
||||||
|
|
||||||
const StyledStepNodeLabelIconContainer = styled.div`
|
const StyledStepNodeLabelIconContainer = styled.div`
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -15,12 +21,26 @@ const StyledStepNodeLabelIconContainer = styled.div`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const WorkflowDiagramStepNode = ({
|
export const WorkflowDiagramStepNode = ({
|
||||||
|
id,
|
||||||
data,
|
data,
|
||||||
|
selected,
|
||||||
}: {
|
}: {
|
||||||
|
id: string;
|
||||||
data: WorkflowDiagramStepNodeData;
|
data: WorkflowDiagramStepNodeData;
|
||||||
|
selected?: boolean;
|
||||||
}) => {
|
}) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
|
|
||||||
|
const workflowId = useRecoilValue(workflowIdState);
|
||||||
|
|
||||||
|
const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(workflowId);
|
||||||
|
assertWorkflowWithCurrentVersionIsDefined(workflowWithCurrentVersion);
|
||||||
|
|
||||||
|
const { deleteOneStep } = useDeleteOneStep({
|
||||||
|
workflow: workflowWithCurrentVersion,
|
||||||
|
stepId: id,
|
||||||
|
});
|
||||||
|
|
||||||
const renderStepIcon = () => {
|
const renderStepIcon = () => {
|
||||||
switch (data.nodeType) {
|
switch (data.nodeType) {
|
||||||
case 'trigger': {
|
case 'trigger': {
|
||||||
@@ -67,6 +87,16 @@ export const WorkflowDiagramStepNode = ({
|
|||||||
nodeType={data.nodeType}
|
nodeType={data.nodeType}
|
||||||
label={data.label}
|
label={data.label}
|
||||||
Icon={renderStepIcon()}
|
Icon={renderStepIcon()}
|
||||||
|
RightFloatingElement={
|
||||||
|
selected ? (
|
||||||
|
<FloatingIconButton
|
||||||
|
Icon={IconTrash}
|
||||||
|
onClick={() => {
|
||||||
|
return deleteOneStep();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
) : undefined
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
||||||
|
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
|
||||||
|
import { TRIGGER_STEP_ID } from '@/workflow/constants/TriggerStepId';
|
||||||
|
import { useCreateNewWorkflowVersion } from '@/workflow/hooks/useCreateNewWorkflowVersion';
|
||||||
|
import {
|
||||||
|
WorkflowVersion,
|
||||||
|
WorkflowWithCurrentVersion,
|
||||||
|
} from '@/workflow/types/Workflow';
|
||||||
|
import { removeStep } from '@/workflow/utils/removeStep';
|
||||||
|
|
||||||
|
export const useDeleteOneStep = ({
|
||||||
|
stepId,
|
||||||
|
workflow,
|
||||||
|
}: {
|
||||||
|
stepId: string;
|
||||||
|
workflow: WorkflowWithCurrentVersion;
|
||||||
|
}) => {
|
||||||
|
const { updateOneRecord: updateOneWorkflowVersion } =
|
||||||
|
useUpdateOneRecord<WorkflowVersion>({
|
||||||
|
objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { createNewWorkflowVersion } = useCreateNewWorkflowVersion({
|
||||||
|
workflowId: workflow.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
const deleteOneStep = async () => {
|
||||||
|
if (workflow.currentVersion.status !== 'DRAFT') {
|
||||||
|
const newVersionName = `v${workflow.versions.length + 1}`;
|
||||||
|
|
||||||
|
if (stepId === TRIGGER_STEP_ID) {
|
||||||
|
await createNewWorkflowVersion({
|
||||||
|
name: newVersionName,
|
||||||
|
status: 'DRAFT',
|
||||||
|
trigger: null,
|
||||||
|
steps: workflow.currentVersion.steps,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
await createNewWorkflowVersion({
|
||||||
|
name: newVersionName,
|
||||||
|
status: 'DRAFT',
|
||||||
|
trigger: workflow.currentVersion.trigger,
|
||||||
|
steps: removeStep({
|
||||||
|
steps: workflow.currentVersion.steps ?? [],
|
||||||
|
stepId,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stepId === TRIGGER_STEP_ID) {
|
||||||
|
await updateOneWorkflowVersion({
|
||||||
|
idToUpdate: workflow.currentVersion.id,
|
||||||
|
updateOneRecordInput: {
|
||||||
|
trigger: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
await updateOneWorkflowVersion({
|
||||||
|
idToUpdate: workflow.currentVersion.id,
|
||||||
|
updateOneRecordInput: {
|
||||||
|
steps: removeStep({
|
||||||
|
steps: workflow.currentVersion.steps ?? [],
|
||||||
|
stepId,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
deleteOneStep,
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
import { WorkflowStep, WorkflowVersion } from '@/workflow/types/Workflow';
|
||||||
|
import { removeStep } from '../removeStep';
|
||||||
|
|
||||||
|
it('returns a deep copy of the provided steps array instead of mutating it', () => {
|
||||||
|
const stepToBeRemoved = {
|
||||||
|
id: 'step-1',
|
||||||
|
name: '',
|
||||||
|
settings: {
|
||||||
|
errorHandlingOptions: {
|
||||||
|
retryOnFailure: { value: true },
|
||||||
|
continueOnFailure: { value: false },
|
||||||
|
},
|
||||||
|
serverlessFunctionId: 'first',
|
||||||
|
},
|
||||||
|
type: 'CODE',
|
||||||
|
valid: true,
|
||||||
|
} satisfies WorkflowStep;
|
||||||
|
const workflowVersionInitial = {
|
||||||
|
__typename: 'WorkflowVersion',
|
||||||
|
status: 'ACTIVE',
|
||||||
|
createdAt: '',
|
||||||
|
id: '1',
|
||||||
|
name: '',
|
||||||
|
steps: [stepToBeRemoved],
|
||||||
|
trigger: {
|
||||||
|
settings: { eventName: 'company.created' },
|
||||||
|
type: 'DATABASE_EVENT',
|
||||||
|
},
|
||||||
|
updatedAt: '',
|
||||||
|
workflowId: '',
|
||||||
|
} satisfies WorkflowVersion;
|
||||||
|
|
||||||
|
const stepsUpdated = removeStep({
|
||||||
|
steps: workflowVersionInitial.steps,
|
||||||
|
stepId: stepToBeRemoved.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(workflowVersionInitial.steps).not.toBe(stepsUpdated);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('removes a step in a non-empty steps array', () => {
|
||||||
|
const stepToBeRemoved: WorkflowStep = {
|
||||||
|
id: 'step-2',
|
||||||
|
name: '',
|
||||||
|
settings: {
|
||||||
|
errorHandlingOptions: {
|
||||||
|
retryOnFailure: { value: true },
|
||||||
|
continueOnFailure: { value: false },
|
||||||
|
},
|
||||||
|
serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
|
||||||
|
},
|
||||||
|
type: 'CODE',
|
||||||
|
valid: true,
|
||||||
|
};
|
||||||
|
const workflowVersionInitial = {
|
||||||
|
__typename: 'WorkflowVersion',
|
||||||
|
status: 'ACTIVE',
|
||||||
|
createdAt: '',
|
||||||
|
id: '1',
|
||||||
|
name: '',
|
||||||
|
steps: [
|
||||||
|
{
|
||||||
|
id: 'step-1',
|
||||||
|
name: '',
|
||||||
|
settings: {
|
||||||
|
errorHandlingOptions: {
|
||||||
|
retryOnFailure: { value: true },
|
||||||
|
continueOnFailure: { value: false },
|
||||||
|
},
|
||||||
|
serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
|
||||||
|
},
|
||||||
|
type: 'CODE',
|
||||||
|
valid: true,
|
||||||
|
},
|
||||||
|
stepToBeRemoved,
|
||||||
|
{
|
||||||
|
id: 'step-3',
|
||||||
|
name: '',
|
||||||
|
settings: {
|
||||||
|
errorHandlingOptions: {
|
||||||
|
retryOnFailure: { value: true },
|
||||||
|
continueOnFailure: { value: false },
|
||||||
|
},
|
||||||
|
serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
|
||||||
|
},
|
||||||
|
type: 'CODE',
|
||||||
|
valid: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
trigger: {
|
||||||
|
settings: { eventName: 'company.created' },
|
||||||
|
type: 'DATABASE_EVENT',
|
||||||
|
},
|
||||||
|
updatedAt: '',
|
||||||
|
workflowId: '',
|
||||||
|
} satisfies WorkflowVersion;
|
||||||
|
|
||||||
|
const stepsUpdated = removeStep({
|
||||||
|
steps: workflowVersionInitial.steps,
|
||||||
|
stepId: stepToBeRemoved.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
const expectedUpdatedSteps: Array<WorkflowStep> = [
|
||||||
|
workflowVersionInitial.steps[0],
|
||||||
|
workflowVersionInitial.steps[2],
|
||||||
|
];
|
||||||
|
expect(stepsUpdated).toEqual(expectedUpdatedSteps);
|
||||||
|
});
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { TRIGGER_STEP_ID } from '@/workflow/constants/TriggerStepId';
|
||||||
|
import { WorkflowStep } from '@/workflow/types/Workflow';
|
||||||
|
import { isDefined } from 'twenty-ui';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function returns the reference of the array where the step should be positioned
|
||||||
|
* and at which index.
|
||||||
|
*/
|
||||||
|
export const findStepPosition = ({
|
||||||
|
steps,
|
||||||
|
stepId,
|
||||||
|
}: {
|
||||||
|
steps: Array<WorkflowStep>;
|
||||||
|
stepId: string | undefined;
|
||||||
|
}): { steps: Array<WorkflowStep>; index: number } | undefined => {
|
||||||
|
if (!isDefined(stepId) || stepId === TRIGGER_STEP_ID) {
|
||||||
|
return {
|
||||||
|
steps,
|
||||||
|
index: 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [index, step] of steps.entries()) {
|
||||||
|
if (step.id === stepId) {
|
||||||
|
return {
|
||||||
|
steps,
|
||||||
|
index,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: When condition will have been implemented, put recursivity here.
|
||||||
|
// if (step.type === "CONDITION") {
|
||||||
|
// return findNodePosition({
|
||||||
|
// workflowSteps: step.conditions,
|
||||||
|
// stepId,
|
||||||
|
// })
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
return undefined;
|
||||||
|
};
|
||||||
@@ -1,41 +1,21 @@
|
|||||||
import { TRIGGER_STEP_ID } from '@/workflow/constants/TriggerStepId';
|
|
||||||
import { WorkflowStep } from '@/workflow/types/Workflow';
|
import { WorkflowStep } from '@/workflow/types/Workflow';
|
||||||
|
import { findStepPosition } from '@/workflow/utils/findStepPosition';
|
||||||
import { isDefined } from 'twenty-ui';
|
import { isDefined } from 'twenty-ui';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This function returns the reference of the array where the step should be positioned
|
* This function returns the reference of the array where the step should be positioned
|
||||||
* and at which index.
|
* and at which index.
|
||||||
*/
|
*/
|
||||||
export const findStepPositionOrThrow = ({
|
export const findStepPositionOrThrow = (props: {
|
||||||
steps,
|
|
||||||
stepId,
|
|
||||||
}: {
|
|
||||||
steps: Array<WorkflowStep>;
|
steps: Array<WorkflowStep>;
|
||||||
stepId: string | undefined;
|
stepId: string | undefined;
|
||||||
}): { steps: Array<WorkflowStep>; index: number } => {
|
}): { steps: Array<WorkflowStep>; index: number } => {
|
||||||
if (!isDefined(stepId) || stepId === TRIGGER_STEP_ID) {
|
const result = findStepPosition(props);
|
||||||
return {
|
if (!isDefined(result)) {
|
||||||
steps,
|
throw new Error(
|
||||||
index: 0,
|
`Couldn't locate the step. Unreachable step id: ${props.stepId}.`,
|
||||||
};
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const [index, step] of steps.entries()) {
|
return result;
|
||||||
if (step.id === stepId) {
|
|
||||||
return {
|
|
||||||
steps,
|
|
||||||
index,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: When condition will have been implemented, put recursivity here.
|
|
||||||
// if (step.type === "CONDITION") {
|
|
||||||
// return findNodePosition({
|
|
||||||
// workflowSteps: step.conditions,
|
|
||||||
// stepId,
|
|
||||||
// })
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new Error(`Couldn't locate the step. Unreachable step id: ${stepId}.`);
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import { WorkflowStep } from '@/workflow/types/Workflow';
|
||||||
|
import { findStepPositionOrThrow } from '@/workflow/utils/findStepPositionOrThrow';
|
||||||
|
|
||||||
|
export const removeStep = ({
|
||||||
|
steps: stepsInitial,
|
||||||
|
stepId,
|
||||||
|
}: {
|
||||||
|
steps: Array<WorkflowStep>;
|
||||||
|
stepId: string | undefined;
|
||||||
|
}) => {
|
||||||
|
const steps = structuredClone(stepsInitial);
|
||||||
|
|
||||||
|
const parentStepPosition = findStepPositionOrThrow({
|
||||||
|
steps,
|
||||||
|
stepId,
|
||||||
|
});
|
||||||
|
|
||||||
|
parentStepPosition.steps.splice(parentStepPosition.index, 1);
|
||||||
|
|
||||||
|
return steps;
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user