diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts index e994edab11..7cc857677b 100644 --- a/packages/twenty-front/src/generated-metadata/graphql.ts +++ b/packages/twenty-front/src/generated-metadata/graphql.ts @@ -965,7 +965,6 @@ export enum FeatureFlagKey { IS_TWO_FACTOR_AUTHENTICATION_ENABLED = 'IS_TWO_FACTOR_AUTHENTICATION_ENABLED', IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED', IS_WORKFLOW_BRANCH_ENABLED = 'IS_WORKFLOW_BRANCH_ENABLED', - IS_WORKFLOW_FILTERING_ENABLED = 'IS_WORKFLOW_FILTERING_ENABLED', IS_WORKSPACE_MIGRATION_V2_ENABLED = 'IS_WORKSPACE_MIGRATION_V2_ENABLED' } diff --git a/packages/twenty-front/src/generated/graphql.ts b/packages/twenty-front/src/generated/graphql.ts index a1038667d0..c64fb13810 100644 --- a/packages/twenty-front/src/generated/graphql.ts +++ b/packages/twenty-front/src/generated/graphql.ts @@ -929,7 +929,6 @@ export enum FeatureFlagKey { IS_TWO_FACTOR_AUTHENTICATION_ENABLED = 'IS_TWO_FACTOR_AUTHENTICATION_ENABLED', IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED', IS_WORKFLOW_BRANCH_ENABLED = 'IS_WORKFLOW_BRANCH_ENABLED', - IS_WORKFLOW_FILTERING_ENABLED = 'IS_WORKFLOW_FILTERING_ENABLED', IS_WORKSPACE_MIGRATION_V2_ENABLED = 'IS_WORKSPACE_MIGRATION_V2_ENABLED' } diff --git a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInCommandMenuSideEffects.ts b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInCommandMenuSideEffects.ts index 1d1164870f..b22e9e2f29 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInCommandMenuSideEffects.ts +++ b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInCommandMenuSideEffects.ts @@ -27,9 +27,6 @@ export const useRunWorkflowRunOpeningInCommandMenuSideEffects = () => { const { objectPermissionsByObjectMetadataId } = useObjectPermissions(); - const isWorkflowFilteringEnabled = useIsFeatureEnabled( - FeatureFlagKey.IS_WORKFLOW_FILTERING_ENABLED, - ); const isWorkflowBranchEnabled = useIsFeatureEnabled( FeatureFlagKey.IS_WORKFLOW_BRANCH_ENABLED, ); @@ -65,7 +62,6 @@ export const useRunWorkflowRunOpeningInCommandMenuSideEffects = () => { steps: workflowRunRecord.state.flow.steps, stepInfos: workflowRunRecord.state.stepInfos, trigger: workflowRunRecord.state.flow.trigger, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, }); @@ -136,7 +132,6 @@ export const useRunWorkflowRunOpeningInCommandMenuSideEffects = () => { [ apolloCoreClient.cache, objectPermissionsByObjectMetadataId, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, openWorkflowRunViewStepInCommandMenu, getIcon, diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx index f77bf76694..184db42988 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx @@ -6,7 +6,7 @@ import { WorkflowDiagramBlankEdge } from '@/workflow/workflow-diagram/components import { WorkflowDiagramCanvasBase } from '@/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase'; import { WorkflowDiagramCanvasEditableEffect } from '@/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect'; import { WorkflowDiagramDefaultEdgeEditable } from '@/workflow/workflow-diagram/components/WorkflowDiagramDefaultEdgeEditable'; -import { WorkflowDiagramFilteringDisabledEdgeEditable } from '@/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeEditable'; + import { workflowDiagramComponentState } from '@/workflow/workflow-diagram/states/workflowDiagramComponentState'; import { workflowDiagramRightClickMenuPositionState } from '@/workflow/workflow-diagram/states/workflowDiagramRightClickMenuPositionState'; import { @@ -125,8 +125,6 @@ export const WorkflowDiagramCanvasEditable = () => { }} edgeTypes={{ blank: WorkflowDiagramBlankEdge, - 'filtering-disabled--editable': - WorkflowDiagramFilteringDisabledEdgeEditable, 'empty-filter--editable': WorkflowDiagramDefaultEdgeEditable, 'filter--editable': WorkflowDiagramFilterEdgeEditable, }} diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx index 867da0e415..0357dca8b5 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx @@ -1,7 +1,7 @@ import { type WorkflowVersionStatus } from '@/workflow/types/Workflow'; import { WorkflowDiagramCanvasBase } from '@/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase'; import { WorkflowDiagramDefaultEdgeReadonly } from '@/workflow/workflow-diagram/components/WorkflowDiagramDefaultEdgeReadonly'; -import { WorkflowDiagramFilteringDisabledEdgeReadonly } from '@/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeReadonly'; + import { getWorkflowVersionStatusTagProps } from '@/workflow/workflow-diagram/utils/getWorkflowVersionStatusTagProps'; import { WorkflowDiagramEmptyTriggerReadonly } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramEmptyTriggerReadonly'; import { WorkflowDiagramFilterEdgeReadonly } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramFilterEdgeReadonly'; @@ -25,8 +25,6 @@ export const WorkflowDiagramCanvasReadonly = ({ 'empty-trigger': WorkflowDiagramEmptyTriggerReadonly, }} edgeTypes={{ - 'filtering-disabled--readonly': - WorkflowDiagramFilteringDisabledEdgeReadonly, 'empty-filter--readonly': WorkflowDiagramDefaultEdgeReadonly, 'filter--readonly': WorkflowDiagramFilterEdgeReadonly, }} diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx index b1dfbddea0..2829372e41 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx @@ -40,10 +40,6 @@ export const WorkflowDiagramEffect = () => { workflowLastCreatedStepIdComponentState, ); - const isWorkflowFilteringEnabled = useIsFeatureEnabled( - FeatureFlagKey.IS_WORKFLOW_FILTERING_ENABLED, - ); - const isWorkflowBranchEnabled = useIsFeatureEnabled( FeatureFlagKey.IS_WORKFLOW_BRANCH_ENABLED, ); @@ -58,7 +54,6 @@ export const WorkflowDiagramEffect = () => { const nextWorkflowDiagram = getWorkflowVersionDiagram({ workflowVersion: currentVersion, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, isEditable: true, }); @@ -95,7 +90,6 @@ export const WorkflowDiagramEffect = () => { }, [ workflowDiagramState, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, workflowLastCreatedStepIdState, ], diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeEditable.tsx deleted file mode 100644 index 4ffd115ed1..0000000000 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeEditable.tsx +++ /dev/null @@ -1,87 +0,0 @@ -import { WORKFLOW_DIAGRAM_EDGE_OPTIONS_CLICK_OUTSIDE_ID } from '@/workflow/workflow-diagram/constants/WorkflowDiagramEdgeOptionsClickOutsideId'; -import { useStartNodeCreation } from '@/workflow/workflow-diagram/hooks/useStartNodeCreation'; -import { type WorkflowDiagramEdge } from '@/workflow/workflow-diagram/types/WorkflowDiagram'; -import { - EdgeLabelRenderer, - type EdgeProps, - getBezierPath, -} from '@xyflow/react'; -import { IconPlus } from 'twenty-ui/display'; -import { WorkflowDiagramEdgeV2Container } from '@/workflow/workflow-diagram/components/WorkflowDiagramEdgeV2Container'; -import { WorkflowDiagramEdgeV2VisibilityContainer } from '@/workflow/workflow-diagram/components/WorkflowDiagramEdgeV2VisibilityContainer'; -import { useEdgeHovered } from '@/workflow/workflow-diagram/hooks/useEdgeHovered'; -import { WorkflowDiagramBaseEdge } from '@/workflow/workflow-diagram/components/WorkflowDiagramBaseEdge'; -import { WorkflowDiagramEdgeButtonGroup } from '@/workflow/workflow-diagram/components/WorkflowDiagramEdgeButtonGroup'; - -type WorkflowDiagramFilteringDisabledEdgeEditableProps = - EdgeProps; - -export const WorkflowDiagramFilteringDisabledEdgeEditable = ({ - id, - markerStart, - markerEnd, - source, - sourceY, - sourceX, - target, - targetX, - targetY, -}: WorkflowDiagramFilteringDisabledEdgeEditableProps) => { - const { isEdgeHovered } = useEdgeHovered(); - - const [edgePath, labelX, labelY] = getBezierPath({ - sourceX, - sourceY, - targetX, - targetY, - }); - - const { startNodeCreation, isNodeCreationStarted } = useStartNodeCreation(); - - const nodeCreationStarted = isNodeCreationStarted({ - parentStepId: source, - nextStepId: target, - }); - - const handleAddNodeButtonClick = () => { - startNodeCreation({ - parentStepId: source, - nextStepId: target, - position: { x: labelX, y: labelY }, - }); - }; - - return ( - <> - - - - - - - - - - - ); -}; diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeReadonly.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeReadonly.tsx deleted file mode 100644 index 46aa2bd6f3..0000000000 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeReadonly.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import { type WorkflowDiagramEdge } from '@/workflow/workflow-diagram/types/WorkflowDiagram'; -import { useTheme } from '@emotion/react'; -import { BaseEdge, type EdgeProps, getBezierPath } from '@xyflow/react'; - -type WorkflowDiagramFilteringDisabledEdgeReadonlyProps = - EdgeProps; - -export const WorkflowDiagramFilteringDisabledEdgeReadonly = ({ - markerStart, - markerEnd, - sourceX, - sourceY, - targetX, - targetY, -}: WorkflowDiagramFilteringDisabledEdgeReadonlyProps) => { - const theme = useTheme(); - - const [edgePath] = getBezierPath({ - sourceX, - sourceY, - targetX, - targetY, - }); - - return ( - - ); -}; diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeRun.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeRun.tsx deleted file mode 100644 index 03ee52df78..0000000000 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeRun.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import { WorkflowRunDiagramBaseEdge } from '@/workflow/workflow-diagram/components/WorkflowRunDiagramBaseEdge'; -import { type WorkflowDiagramEdge } from '@/workflow/workflow-diagram/types/WorkflowDiagram'; -import { type EdgeProps, getBezierPath } from '@xyflow/react'; - -type WorkflowDiagramFilteringDisabledEdgeRunProps = - EdgeProps; - -export const WorkflowDiagramFilteringDisabledEdgeRun = ({ - sourceX, - sourceY, - targetX, - targetY, - markerStart, - markerEnd, -}: WorkflowDiagramFilteringDisabledEdgeRunProps) => { - const [edgePath] = getBezierPath({ - sourceX, - sourceY, - targetX, - targetY, - }); - - return ( - - ); -}; diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunDiagramCanvas.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunDiagramCanvas.tsx index 80aae2ee61..d75ce012bd 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunDiagramCanvas.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunDiagramCanvas.tsx @@ -2,9 +2,9 @@ import { type WorkflowRunStatus } from '@/workflow/types/Workflow'; import { WorkflowDiagramCanvasBase } from '@/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase'; import { WorkflowDiagramDefaultEdgeRun } from '@/workflow/workflow-diagram/components/WorkflowDiagramDefaultEdgeRun'; import { WorkflowDiagramFilterEdgeRun } from '@/workflow/workflow-diagram/components/WorkflowDiagramFilterEdgeRun'; -import { WorkflowDiagramFilteringDisabledEdgeRun } from '@/workflow/workflow-diagram/components/WorkflowDiagramFilteringDisabledEdgeRun'; -import { WorkflowRunDiagramStepNode } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode'; + import { getWorkflowRunStatusTagProps } from '@/workflow/workflow-diagram/utils/getWorkflowRunStatusTagProps'; +import { WorkflowRunDiagramStepNode } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode'; import { ReactFlowProvider } from '@xyflow/react'; export const WorkflowRunDiagramCanvas = ({ @@ -23,7 +23,6 @@ export const WorkflowRunDiagramCanvas = ({ default: WorkflowRunDiagramStepNode, }} edgeTypes={{ - 'filtering-disabled--run': WorkflowDiagramFilteringDisabledEdgeRun, 'empty-filter--run': WorkflowDiagramDefaultEdgeRun, 'filter--run': WorkflowDiagramFilterEdgeRun, }} diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx index aa3cfc96f8..e5de5272c8 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx @@ -71,9 +71,6 @@ export const WorkflowRunVisualizerEffect = ({ const { isInRightDrawer } = useContext(ActionMenuContext); - const isWorkflowFilteringEnabled = useIsFeatureEnabled( - FeatureFlagKey.IS_WORKFLOW_FILTERING_ENABLED, - ); const isWorkflowBranchEnabled = useIsFeatureEnabled( FeatureFlagKey.IS_WORKFLOW_BRANCH_ENABLED, ); @@ -136,7 +133,6 @@ export const WorkflowRunVisualizerEffect = ({ trigger: workflowRunState.flow.trigger, steps: workflowRunState.flow.steps, stepInfos: workflowRunState.stepInfos, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, }); @@ -209,7 +205,6 @@ export const WorkflowRunVisualizerEffect = ({ flowState, getIcon, isWorkflowBranchEnabled, - isWorkflowFilteringEnabled, openWorkflowRunViewStepInCommandMenu, workflowDiagramState, workflowDiagramStatusState, diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizerEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizerEffect.tsx index 641927230b..8168e9e8d8 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizerEffect.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizerEffect.tsx @@ -31,10 +31,6 @@ export const WorkflowVersionVisualizerEffect = ({ const { populateStepsOutputSchema } = useStepsOutputSchema(); - const isWorkflowFilteringEnabled = useIsFeatureEnabled( - FeatureFlagKey.IS_WORKFLOW_FILTERING_ENABLED, - ); - const isWorkflowBranchEnabled = useIsFeatureEnabled( FeatureFlagKey.IS_WORKFLOW_BRANCH_ENABLED, ); @@ -70,18 +66,12 @@ export const WorkflowVersionVisualizerEffect = ({ const nextWorkflowDiagram = getWorkflowVersionDiagram({ workflowVersion, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, isEditable: false, }); setWorkflowDiagram(nextWorkflowDiagram); - }, [ - isWorkflowBranchEnabled, - isWorkflowFilteringEnabled, - setWorkflowDiagram, - workflowVersion, - ]); + }, [isWorkflowBranchEnabled, setWorkflowDiagram, workflowVersion]); useEffect(() => { if (!isDefined(workflowVersion)) { diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/types/WorkflowDiagram.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/types/WorkflowDiagram.ts index b172ca861d..a75c123304 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/types/WorkflowDiagram.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/types/WorkflowDiagram.ts @@ -96,9 +96,6 @@ export type WorkflowDiagramNodeType = 'default' | 'empty-trigger'; export type WorkflowDiagramEdgeType = | 'blank' - | 'filtering-disabled--editable' - | 'filtering-disabled--readonly' - | 'filtering-disabled--run' | 'empty-filter--editable' | 'empty-filter--readonly' | 'empty-filter--run' diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts index 7917c6ff5b..66353e1798 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts @@ -104,7 +104,7 @@ describe('generateWorkflowRunDiagram', () => { trigger, steps, stepInfos, - isWorkflowFilteringEnabled: true, + isWorkflowBranchEnabled: true, }); @@ -334,7 +334,7 @@ describe('generateWorkflowRunDiagram', () => { trigger, steps, stepInfos, - isWorkflowFilteringEnabled: true, + isWorkflowBranchEnabled: true, }); @@ -564,7 +564,7 @@ describe('generateWorkflowRunDiagram', () => { trigger, steps, stepInfos, - isWorkflowFilteringEnabled: true, + isWorkflowBranchEnabled: true, }); @@ -813,7 +813,7 @@ describe('generateWorkflowRunDiagram', () => { trigger, steps, stepInfos, - isWorkflowFilteringEnabled: true, + isWorkflowBranchEnabled: true, }); @@ -1042,7 +1042,7 @@ describe('generateWorkflowRunDiagram', () => { trigger, steps, stepInfos, - isWorkflowFilteringEnabled: true, + isWorkflowBranchEnabled: true, }); diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts index 6e1e43c61e..b6d05d2e9a 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts @@ -10,7 +10,6 @@ describe('getWorkflowVersionDiagram', () => { const result = getWorkflowVersionDiagram({ workflowVersion: undefined, isEditable: true, - isWorkflowFilteringEnabled: true, }); expect(result).toMatchInlineSnapshot(` @@ -35,7 +34,6 @@ describe('getWorkflowVersionDiagram', () => { workflowId: '', }, isEditable: true, - isWorkflowFilteringEnabled: true, }); expect(result).toMatchInlineSnapshot(` @@ -80,7 +78,6 @@ describe('getWorkflowVersionDiagram', () => { workflowId: '', }, isEditable: true, - isWorkflowFilteringEnabled: true, }); expect(result).toMatchInlineSnapshot(` @@ -149,7 +146,6 @@ describe('getWorkflowVersionDiagram', () => { workflowId: '', }, isEditable: true, - isWorkflowFilteringEnabled: true, }); expect(result).toMatchInlineSnapshot(` diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.ts index 67cd553378..d013e48a5a 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.ts @@ -19,13 +19,11 @@ export const generateWorkflowRunDiagram = ({ trigger, steps, stepInfos, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, }: { trigger: WorkflowTrigger; steps: Array; stepInfos: WorkflowRunStepInfos | undefined; - isWorkflowFilteringEnabled: boolean; isWorkflowBranchEnabled: boolean; }): { diagram: WorkflowRunDiagram; @@ -46,7 +44,7 @@ export const generateWorkflowRunDiagram = ({ const workflowDiagram = generateWorkflowDiagram({ trigger, steps, - defaultEdgeType: 'filtering-disabled--readonly', + defaultEdgeType: 'empty-filter--readonly', }); const workflowRunDiagramNodes: WorkflowRunDiagramNode[] = @@ -91,9 +89,7 @@ export const generateWorkflowRunDiagram = ({ const stepInfo = stepInfos?.[parentNode.id]; - const edgeType: WorkflowDiagramEdgeType = isWorkflowFilteringEnabled - ? 'empty-filter--run' - : 'filtering-disabled--run'; + const edgeType: WorkflowDiagramEdgeType = 'empty-filter--run'; return { ...edge, @@ -106,16 +102,6 @@ export const generateWorkflowRunDiagram = ({ }; }); - if (!isWorkflowFilteringEnabled) { - return { - diagram: { - nodes: workflowRunDiagramNodes, - edges: workflowRunDiagramEdges, - }, - stepToOpenByDefault, - }; - } - return { diagram: transformFilterNodesAsEdges({ nodes: workflowRunDiagramNodes, diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionDiagram.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionDiagram.ts index 9b2999461f..41c73dd672 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionDiagram.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionDiagram.ts @@ -13,29 +13,19 @@ const EMPTY_DIAGRAM: WorkflowDiagram = { }; const getEdgeTypeToCreateByDefault = ({ - isWorkflowFilteringEnabled, isEditable, }: { - isWorkflowFilteringEnabled: boolean; isEditable: boolean; }): WorkflowDiagramEdgeType => { - if (isWorkflowFilteringEnabled) { - return isEditable ? 'empty-filter--editable' : 'empty-filter--readonly'; - } - - return isEditable - ? 'filtering-disabled--editable' - : 'filtering-disabled--readonly'; + return isEditable ? 'empty-filter--editable' : 'empty-filter--readonly'; }; export const getWorkflowVersionDiagram = ({ workflowVersion, - isWorkflowFilteringEnabled, isWorkflowBranchEnabled, isEditable, }: { workflowVersion: WorkflowVersion | undefined; - isWorkflowFilteringEnabled: boolean; isWorkflowBranchEnabled?: boolean; isEditable: boolean; }): WorkflowDiagram => { @@ -47,7 +37,6 @@ export const getWorkflowVersionDiagram = ({ trigger: workflowVersion.trigger ?? undefined, steps: workflowVersion.steps ?? [], defaultEdgeType: getEdgeTypeToCreateByDefault({ - isWorkflowFilteringEnabled, isEditable, }), isWorkflowBranchEnabled, diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts index 8409eddd8b..ee5fd7cb61 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts @@ -40,16 +40,6 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [ 'https://twenty.com/images/lab/is-fields-permissions-enabled.png', }, }, - { - key: FeatureFlagKey.IS_WORKFLOW_FILTERING_ENABLED, - metadata: { - label: 'Workflow Filter Step', - description: - 'Continue to the next node only if the filter conditions are met', - imagePath: - 'https://twenty.com/images/lab/is-worklfow-filtering-enabled.png', - }, - }, { key: FeatureFlagKey.IS_WORKFLOW_BRANCH_ENABLED, metadata: { diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts index 9bf1a216b1..9bc03eb866 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts @@ -7,7 +7,6 @@ export enum FeatureFlagKey { IS_AI_ENABLED = 'IS_AI_ENABLED', IS_IMAP_SMTP_CALDAV_ENABLED = 'IS_IMAP_SMTP_CALDAV_ENABLED', IS_MORPH_RELATION_ENABLED = 'IS_MORPH_RELATION_ENABLED', - IS_WORKFLOW_FILTERING_ENABLED = 'IS_WORKFLOW_FILTERING_ENABLED', IS_WORKFLOW_BRANCH_ENABLED = 'IS_WORKFLOW_BRANCH_ENABLED', IS_RELATION_CONNECT_ENABLED = 'IS_RELATION_CONNECT_ENABLED', IS_FIELDS_PERMISSIONS_ENABLED = 'IS_FIELDS_PERMISSIONS_ENABLED', diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts index 21213ddaee..d51d593519 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts @@ -12,15 +12,6 @@ describe('featureFlagValidator', () => { ).not.toThrow(); }); - it('should not throw error for new workflow filtering feature flag', () => { - expect(() => - featureFlagValidator.assertIsFeatureFlagKey( - 'IS_WORKFLOW_FILTERING_ENABLED', - new UnknownException('Error', 'Error'), - ), - ).not.toThrow(); - }); - it('should throw error if featureFlagKey is invalid', () => { const invalidKey = 'InvalidKey'; const exception = new UnknownException('Error', 'Error'); diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts index 5e8a8736c6..93270270c0 100644 --- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts @@ -130,7 +130,7 @@ describe('WorkspaceEntityManager', () => { IS_AI_ENABLED: false, IS_IMAP_SMTP_CALDAV_ENABLED: false, IS_MORPH_RELATION_ENABLED: false, - IS_WORKFLOW_FILTERING_ENABLED: false, + IS_WORKFLOW_BRANCH_ENABLED: false, IS_RELATION_CONNECT_ENABLED: false, IS_FIELDS_PERMISSIONS_ENABLED: false, @@ -157,7 +157,7 @@ describe('WorkspaceEntityManager', () => { IS_AI_ENABLED: false, IS_IMAP_SMTP_CALDAV_ENABLED: false, IS_MORPH_RELATION_ENABLED: false, - IS_WORKFLOW_FILTERING_ENABLED: false, + IS_RELATION_CONNECT_ENABLED: false, IS_FIELDS_PERMISSIONS_ENABLED: true, IS_CORE_VIEW_SYNCING_ENABLED: false, diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts index 9e55ec06a5..218874b3d9 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts @@ -40,11 +40,6 @@ export const seedFeatureFlags = async ( workspaceId: workspaceId, value: true, }, - { - key: FeatureFlagKey.IS_WORKFLOW_FILTERING_ENABLED, - workspaceId: workspaceId, - value: false, - }, { key: FeatureFlagKey.IS_WORKFLOW_BRANCH_ENABLED, workspaceId: workspaceId, diff --git a/packages/twenty-website/public/images/lab/is-worklfow-filtering-enabled.png b/packages/twenty-website/public/images/lab/is-worklfow-filtering-enabled.png deleted file mode 100644 index de5050b64e..0000000000 Binary files a/packages/twenty-website/public/images/lab/is-worklfow-filtering-enabled.png and /dev/null differ