Skip to content

The open alternative to Salesforce, designed for AI.

feat(front): delete a workflow step from the diagram node (#24292)

Thomas Trompettec81af4e7e5bd
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
index 51a3197223b..88e23ff6f35 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
@@ -10,6 +10,7 @@ import { workflowSelectedNodeComponentState } from '@/workflow/workflow-diagram/
import { type WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
import { getWorkflowNodeIconKey } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIconKey';
import { WorkflowDiagramStepNodeEditableContent } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent';
+import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { useIcons } from 'twenty-ui/icon';
@@ -37,6 +38,8 @@ export const WorkflowDiagramStepNodeEditable = ({
const { resetWorkflowInsertStepIds } = useResetWorkflowInsertStepIds();
+ const { deleteStep } = useDeleteStep();
+
const { commandMenuContextApi } = useContext(CommandMenuContext);
const isInSidePanel = commandMenuContextApi.isInSidePanel;
@@ -65,12 +68,17 @@ export const WorkflowDiagramStepNodeEditable = ({
}
};
+ const handleDelete = () => {
+ deleteStep(data.stepId);
+ };
+
return (
<WorkflowDiagramStepNodeEditableContent
id={id}
data={data}
selected={selected}
onClick={handleClick}
+ onDelete={handleDelete}
/>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx
index 2c651cae1c8..97d57451210 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx
@@ -10,6 +10,7 @@ import { WorkflowDiagramHandleSource } from '@/workflow/workflow-diagram/workflo
import { WorkflowDiagramHandleTarget } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramHandleTarget';
import { WorkflowDiagramStepNodeIcon } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeIcon';
import { WorkflowNodeContainer } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeContainer';
+import { WorkflowNodeDeleteButton } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton';
import { WorkflowNodeIconContainer } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeIconContainer';
import { WorkflowNodeLabel } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel';
import { WorkflowNodeLabelWithCounterPart } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabelWithCounterPart';
@@ -45,11 +46,13 @@ export const WorkflowDiagramStepNodeEditableContent = ({
data,
selected,
onClick,
+ onDelete,
}: {
id: string;
data: WorkflowDiagramStepNodeData;
selected: boolean;
onClick?: () => void;
+ onDelete?: () => void;
}) => {
const { i18n } = useLingui();
@@ -124,6 +127,13 @@ export const WorkflowDiagramStepNodeEditableContent = ({
{data.name}
</WorkflowNodeTitle>
</WorkflowNodeRightPart>
+
+ {id !== EMPTY_NODE_ID && isDefined(onDelete) && (
+ <WorkflowNodeDeleteButton
+ shouldDisplay={isHovered && !isConnectionInProgress}
+ onDelete={onDelete}
+ />
+ )}
</WorkflowNodeContainer>
{!data.hasNextStepIds &&
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton.tsx
new file mode 100644
index 00000000000..08c74a827ce
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton.tsx
@@ -0,0 +1,49 @@
+import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { type MouseEvent } from 'react';
+import { IconTrash } from 'twenty-ui/icon';
+import { IconButtonGroup } from 'twenty-ui/input';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const StyledDeleteButtonContainer = styled.div<{ shouldDisplay: boolean }>`
+ left: 100%;
+ opacity: ${({ shouldDisplay }) => (shouldDisplay ? 1 : 0)};
+ padding-left: ${themeCssVariables.spacing[2]};
+ pointer-events: ${({ shouldDisplay }) => (shouldDisplay ? 'all' : 'none')};
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
+`;
+
+type WorkflowNodeDeleteButtonProps = {
+ shouldDisplay: boolean;
+ onDelete: () => void;
+};
+
+export const WorkflowNodeDeleteButton = ({
+ shouldDisplay,
+ onDelete,
+}: WorkflowNodeDeleteButtonProps) => {
+ const { t } = useLingui();
+
+ const handleClick = (event: MouseEvent) => {
+ event.stopPropagation();
+
+ onDelete();
+ };
+
+ return (
+ <StyledDeleteButtonContainer shouldDisplay={shouldDisplay}>
+ <IconButtonGroup
+ className="nodrag nopan"
+ iconButtons={[
+ {
+ Icon: IconTrash,
+ ariaLabel: t`Delete node`,
+ onClick: handleClick,
+ },
+ ]}
+ />
+ </StyledDeleteButtonContainer>
+ );
+};