From 5da744ebc5ffe3f64d3fc08f437e6ee5e651ab26 Mon Sep 17 00:00:00 2001 From: Thomas Trompette Date: Thu, 2 Jan 2025 13:23:07 +0100 Subject: [PATCH] Continue workflow folders re-ordering (#9315) - put actions in steps - move hooks - move states --- .../utils/getDefaultFunctionInputFromInputSchema.ts | 2 +- .../utils/getFunctionInputFromSourceCode.ts | 2 +- .../mergeDefaultFunctionInputAndFunctionInput.ts | 2 +- .../components/RightDrawerContainer.tsx | 2 +- .../right-drawer/components/RightDrawerRouter.tsx | 6 +++--- .../components/WorkflowDiagramCanvasBase.tsx | 2 +- .../WorkflowDiagramCanvasEditableEffect.tsx | 6 +++--- .../WorkflowDiagramCanvasReadonlyEffect.tsx | 4 ++-- .../components/WorkflowDiagramStepNodeEditable.tsx | 2 +- .../__tests__/useTriggerNodeSelection.test.tsx | 8 ++++---- .../hooks/useStartNodeCreation.ts | 2 +- .../hooks/useTriggerNodeSelection.ts | 2 +- .../workflowDiagramTriggerNodeSelectionState.ts | 0 .../states/workflowReactFlowRefState.ts | 0 .../states/workflowSelectedNodeState.ts | 0 .../components/RightDrawerWorkflowEditStep.tsx | 2 +- .../RightDrawerWorkflowEditStepContent.tsx | 8 ++++---- .../components/RightDrawerWorkflowViewStep.tsx | 2 +- .../RightDrawerWorkflowViewStepContent.tsx | 4 ++-- .../components/WorkflowStepBody.tsx | 0 .../components/WorkflowStepDetail.tsx | 10 +++++----- .../components/WorkflowStepHeader.tsx | 0 .../hooks/__tests__/useCreateStep.test.ts | 11 +++++++---- .../hooks/__tests__/useDeleteStep.test.ts | 2 +- .../hooks/__tests__/useUpdateStep.test.ts | 13 ++++++++----- .../{ => workflow-steps}/hooks/useCreateStep.ts | 6 +++--- .../hooks/useCreateWorkflowVersionStep.ts | 0 .../{ => workflow-steps}/hooks/useDeleteStep.ts | 0 .../{ => workflow-steps}/hooks/useUpdateStep.ts | 4 ++-- .../hooks/useUpdateWorkflowVersionStep.ts | 0 .../workflowCreateStepFromParentStepIdState.ts | 0 .../components/RightDrawerWorkflowSelectAction.tsx | 2 +- .../RightDrawerWorkflowSelectActionContent.tsx | 4 ++-- .../WorkflowEditActionFormCreateRecord.tsx | 4 ++-- .../WorkflowEditActionFormDeleteRecord.tsx | 6 +++--- .../components/WorkflowEditActionFormSendEmail.tsx | 4 ++-- .../WorkflowEditActionFormServerlessFunction.tsx | 10 +++++----- ...rkflowEditActionFormServerlessFunctionFields.tsx | 2 +- .../WorkflowEditActionFormUpdateRecord.tsx | 6 +++--- .../components/WorkflowSingleRecordFieldChip.tsx | 2 +- .../components/WorkflowSingleRecordPicker.tsx | 2 +- .../workflow-actions/constants/Actions.ts | 0 .../WorkflowServerlessFunctionTabListComponentId.ts | 0 .../workflow-actions/types/FunctionInput.ts | 0 .../utils/__tests__/setNestedValue.test.ts | 2 +- .../workflow-actions/utils/setNestedValue.ts | 0 .../RightDrawerWorkflowSelectTriggerTypeContent.tsx | 4 ++-- .../WorkflowEditTriggerDatabaseEventForm.tsx | 4 ++-- .../components/WorkflowEditTriggerManualForm.tsx | 4 ++-- .../hooks/useUpdateWorkflowVersionTrigger.ts | 0 .../WorkflowVariablesDropdownFieldItems.tsx | 6 +++--- .../hooks/useAvailableVariablesInWorkflowStep.ts | 2 +- 52 files changed, 86 insertions(+), 80 deletions(-) rename packages/twenty-front/src/modules/workflow/{ => workflow-diagram}/hooks/__tests__/useTriggerNodeSelection.test.tsx (87%) rename packages/twenty-front/src/modules/workflow/{ => workflow-diagram}/hooks/useStartNodeCreation.ts (95%) rename packages/twenty-front/src/modules/workflow/{ => workflow-diagram}/hooks/useTriggerNodeSelection.ts (93%) rename packages/twenty-front/src/modules/workflow/{ => workflow-diagram}/states/workflowDiagramTriggerNodeSelectionState.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-diagram}/states/workflowReactFlowRefState.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-diagram}/states/workflowSelectedNodeState.ts (100%) rename packages/twenty-front/src/modules/workflow/{workflow-step => workflow-steps}/components/RightDrawerWorkflowEditStep.tsx (90%) rename packages/twenty-front/src/modules/workflow/{workflow-step => workflow-steps}/components/RightDrawerWorkflowEditStepContent.tsx (68%) rename packages/twenty-front/src/modules/workflow/{workflow-step => workflow-steps}/components/RightDrawerWorkflowViewStep.tsx (92%) rename packages/twenty-front/src/modules/workflow/{workflow-step => workflow-steps}/components/RightDrawerWorkflowViewStepContent.tsx (76%) rename packages/twenty-front/src/modules/workflow/{workflow-step => workflow-steps}/components/WorkflowStepBody.tsx (100%) rename packages/twenty-front/src/modules/workflow/{workflow-step => workflow-steps}/components/WorkflowStepDetail.tsx (91%) rename packages/twenty-front/src/modules/workflow/{workflow-step => workflow-steps}/components/WorkflowStepHeader.tsx (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/__tests__/useCreateStep.test.ts (87%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/__tests__/useDeleteStep.test.ts (95%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/__tests__/useUpdateStep.test.ts (84%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/useCreateStep.ts (87%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/useCreateWorkflowVersionStep.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/useDeleteStep.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/useUpdateStep.ts (89%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/hooks/useUpdateWorkflowVersionStep.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/states/workflowCreateStepFromParentStepIdState.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/RightDrawerWorkflowSelectAction.tsx (87%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx (84%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx (96%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx (94%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowEditActionFormSendEmail.tsx (97%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx (95%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields.tsx (96%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx (96%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowSingleRecordFieldChip.tsx (95%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/components/WorkflowSingleRecordPicker.tsx (99%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/constants/Actions.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/types/FunctionInput.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/utils/__tests__/setNestedValue.test.ts (88%) rename packages/twenty-front/src/modules/workflow/{ => workflow-steps}/workflow-actions/utils/setNestedValue.ts (100%) rename packages/twenty-front/src/modules/workflow/{ => workflow-trigger}/hooks/useUpdateWorkflowVersionTrigger.ts (100%) diff --git a/packages/twenty-front/src/modules/serverless-functions/utils/getDefaultFunctionInputFromInputSchema.ts b/packages/twenty-front/src/modules/serverless-functions/utils/getDefaultFunctionInputFromInputSchema.ts index 6d5c043a0..8aec5bce2 100644 --- a/packages/twenty-front/src/modules/serverless-functions/utils/getDefaultFunctionInputFromInputSchema.ts +++ b/packages/twenty-front/src/modules/serverless-functions/utils/getDefaultFunctionInputFromInputSchema.ts @@ -1,5 +1,5 @@ import { InputSchema } from '@/workflow/types/InputSchema'; -import { FunctionInput } from '@/workflow/workflow-actions/types/FunctionInput'; +import { FunctionInput } from '@/workflow/workflow-steps/workflow-actions/types/FunctionInput'; import { isDefined } from '~/utils/isDefined'; export const getDefaultFunctionInputFromInputSchema = ( diff --git a/packages/twenty-front/src/modules/serverless-functions/utils/getFunctionInputFromSourceCode.ts b/packages/twenty-front/src/modules/serverless-functions/utils/getFunctionInputFromSourceCode.ts index 4dc6643c3..ac84b6682 100644 --- a/packages/twenty-front/src/modules/serverless-functions/utils/getFunctionInputFromSourceCode.ts +++ b/packages/twenty-front/src/modules/serverless-functions/utils/getFunctionInputFromSourceCode.ts @@ -1,6 +1,6 @@ import { getDefaultFunctionInputFromInputSchema } from '@/serverless-functions/utils/getDefaultFunctionInputFromInputSchema'; import { getFunctionInputSchema } from '@/serverless-functions/utils/getFunctionInputSchema'; -import { FunctionInput } from '@/workflow/workflow-actions/types/FunctionInput'; +import { FunctionInput } from '@/workflow/workflow-steps/workflow-actions/types/FunctionInput'; import { isObject } from '@sniptt/guards'; import { isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/serverless-functions/utils/mergeDefaultFunctionInputAndFunctionInput.ts b/packages/twenty-front/src/modules/serverless-functions/utils/mergeDefaultFunctionInputAndFunctionInput.ts index 22cb16b65..c3c66b3be 100644 --- a/packages/twenty-front/src/modules/serverless-functions/utils/mergeDefaultFunctionInputAndFunctionInput.ts +++ b/packages/twenty-front/src/modules/serverless-functions/utils/mergeDefaultFunctionInputAndFunctionInput.ts @@ -1,4 +1,4 @@ -import { FunctionInput } from '@/workflow/workflow-actions/types/FunctionInput'; +import { FunctionInput } from '@/workflow/workflow-steps/workflow-actions/types/FunctionInput'; import { isObject } from '@sniptt/guards'; export const mergeDefaultFunctionInputAndFunctionInput = ({ diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerContainer.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerContainer.tsx index 578d26830..901d8ecfb 100644 --- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerContainer.tsx +++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerContainer.tsx @@ -9,7 +9,7 @@ import { ClickOutsideMode, useListenClickOutside, } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; -import { workflowReactFlowRefState } from '@/workflow/states/workflowReactFlowRefState'; +import { workflowReactFlowRefState } from '@/workflow/workflow-diagram/states/workflowReactFlowRefState'; import styled from '@emotion/styled'; import { useRef } from 'react'; import { useRecoilCallback, useRecoilValue } from 'recoil'; diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx index 959fe4986..de47fbf31 100644 --- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx +++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx @@ -10,9 +10,9 @@ import { isRightDrawerMinimizedState } from '@/ui/layout/right-drawer/states/isR import { RightDrawerContainer } from '@/ui/layout/right-drawer/components/RightDrawerContainer'; import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar'; import { ComponentByRightDrawerPage } from '@/ui/layout/right-drawer/types/ComponentByRightDrawerPage'; -import { RightDrawerWorkflowSelectAction } from '@/workflow/workflow-actions/components/RightDrawerWorkflowSelectAction'; -import { RightDrawerWorkflowEditStep } from '@/workflow/workflow-step/components/RightDrawerWorkflowEditStep'; -import { RightDrawerWorkflowViewStep } from '@/workflow/workflow-step/components/RightDrawerWorkflowViewStep'; +import { RightDrawerWorkflowEditStep } from '@/workflow/workflow-steps/components/RightDrawerWorkflowEditStep'; +import { RightDrawerWorkflowViewStep } from '@/workflow/workflow-steps/components/RightDrawerWorkflowViewStep'; +import { RightDrawerWorkflowSelectAction } from '@/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectAction'; import { RightDrawerWorkflowSelectTriggerType } from '@/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerType'; import { isDefined } from 'twenty-ui'; import { rightDrawerPageState } from '../states/rightDrawerPageState'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx index 3c72f609e..2c98c1a30 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx @@ -2,10 +2,10 @@ import { useListenRightDrawerClose } from '@/ui/layout/right-drawer/hooks/useLis import { isRightDrawerMinimizedState } from '@/ui/layout/right-drawer/states/isRightDrawerMinimizedState'; import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; -import { workflowReactFlowRefState } from '@/workflow/states/workflowReactFlowRefState'; import { WorkflowVersionStatus } from '@/workflow/types/Workflow'; import { WorkflowVersionStatusTag } from '@/workflow/workflow-diagram/components/WorkflowVersionStatusTag'; import { workflowDiagramState } from '@/workflow/workflow-diagram/states/workflowDiagramState'; +import { workflowReactFlowRefState } from '@/workflow/workflow-diagram/states/workflowReactFlowRefState'; import { WorkflowDiagram, WorkflowDiagramEdge, diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx index 41a0dcbf2..c8b8c4dc8 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx @@ -2,11 +2,11 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer'; import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; -import { useStartNodeCreation } from '@/workflow/hooks/useStartNodeCreation'; -import { useTriggerNodeSelection } from '@/workflow/hooks/useTriggerNodeSelection'; -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; import { CREATE_STEP_STEP_ID } from '@/workflow/workflow-diagram/constants/CreateStepStepId'; import { EMPTY_TRIGGER_STEP_ID } from '@/workflow/workflow-diagram/constants/EmptyTriggerStepId'; +import { useStartNodeCreation } from '@/workflow/workflow-diagram/hooks/useStartNodeCreation'; +import { useTriggerNodeSelection } from '@/workflow/workflow-diagram/hooks/useTriggerNodeSelection'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; import { WorkflowDiagramNode } from '@/workflow/workflow-diagram/types/WorkflowDiagram'; import { OnSelectionChangeParams, useOnSelectionChange } from '@xyflow/react'; import { useCallback } from 'react'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx index c86fdf09d..f14acd87f 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx @@ -2,8 +2,8 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer'; import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; -import { useTriggerNodeSelection } from '@/workflow/hooks/useTriggerNodeSelection'; -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; +import { useTriggerNodeSelection } from '@/workflow/workflow-diagram/hooks/useTriggerNodeSelection'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; import { WorkflowDiagramNode } from '@/workflow/workflow-diagram/types/WorkflowDiagram'; import { OnSelectionChangeParams, useOnSelectionChange } from '@xyflow/react'; import { useCallback } from 'react'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx index e77af8bd0..845bb6217 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx @@ -1,9 +1,9 @@ -import { useDeleteStep } from '@/workflow/hooks/useDeleteStep'; import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { workflowIdState } from '@/workflow/states/workflowIdState'; import { assertWorkflowWithCurrentVersionIsDefined } from '@/workflow/utils/assertWorkflowWithCurrentVersionIsDefined'; import { WorkflowDiagramStepNodeBase } from '@/workflow/workflow-diagram/components/WorkflowDiagramStepNodeBase'; import { WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram'; +import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep'; import { useRecoilValue } from 'recoil'; import { FloatingIconButton, IconTrash } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useTriggerNodeSelection.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/__tests__/useTriggerNodeSelection.test.tsx similarity index 87% rename from packages/twenty-front/src/modules/workflow/hooks/__tests__/useTriggerNodeSelection.test.tsx rename to packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/__tests__/useTriggerNodeSelection.test.tsx index 1cb5e62cd..d28c33ba5 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useTriggerNodeSelection.test.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/__tests__/useTriggerNodeSelection.test.tsx @@ -1,8 +1,8 @@ -import { renderHook, act } from '@testing-library/react'; -import { useTriggerNodeSelection } from '@/workflow/hooks/useTriggerNodeSelection'; -import { RecoilRoot, useRecoilState } from 'recoil'; +import { useTriggerNodeSelection } from '@/workflow/workflow-diagram/hooks/useTriggerNodeSelection'; +import { workflowDiagramTriggerNodeSelectionState } from '@/workflow/workflow-diagram/states/workflowDiagramTriggerNodeSelectionState'; +import { act, renderHook } from '@testing-library/react'; import { useReactFlow } from '@xyflow/react'; -import { workflowDiagramTriggerNodeSelectionState } from '@/workflow/states/workflowDiagramTriggerNodeSelectionState'; +import { RecoilRoot, useRecoilState } from 'recoil'; jest.mock('@xyflow/react', () => ({ useReactFlow: jest.fn(), diff --git a/packages/twenty-front/src/modules/workflow/hooks/useStartNodeCreation.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useStartNodeCreation.ts similarity index 95% rename from packages/twenty-front/src/modules/workflow/hooks/useStartNodeCreation.ts rename to packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useStartNodeCreation.ts index 04f09d61d..d3d159192 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/useStartNodeCreation.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useStartNodeCreation.ts @@ -2,7 +2,7 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer'; import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; -import { workflowCreateStepFromParentStepIdState } from '@/workflow/states/workflowCreateStepFromParentStepIdState'; +import { workflowCreateStepFromParentStepIdState } from '@/workflow/workflow-steps/states/workflowCreateStepFromParentStepIdState'; import { useCallback } from 'react'; import { useSetRecoilState } from 'recoil'; diff --git a/packages/twenty-front/src/modules/workflow/hooks/useTriggerNodeSelection.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useTriggerNodeSelection.ts similarity index 93% rename from packages/twenty-front/src/modules/workflow/hooks/useTriggerNodeSelection.ts rename to packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useTriggerNodeSelection.ts index f91a0cf3f..6168eec8e 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/useTriggerNodeSelection.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useTriggerNodeSelection.ts @@ -1,4 +1,4 @@ -import { workflowDiagramTriggerNodeSelectionState } from '@/workflow/states/workflowDiagramTriggerNodeSelectionState'; +import { workflowDiagramTriggerNodeSelectionState } from '@/workflow/workflow-diagram/states/workflowDiagramTriggerNodeSelectionState'; import { WorkflowDiagramEdge, WorkflowDiagramNode, diff --git a/packages/twenty-front/src/modules/workflow/states/workflowDiagramTriggerNodeSelectionState.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/states/workflowDiagramTriggerNodeSelectionState.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/states/workflowDiagramTriggerNodeSelectionState.ts rename to packages/twenty-front/src/modules/workflow/workflow-diagram/states/workflowDiagramTriggerNodeSelectionState.ts diff --git a/packages/twenty-front/src/modules/workflow/states/workflowReactFlowRefState.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/states/workflowReactFlowRefState.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/states/workflowReactFlowRefState.ts rename to packages/twenty-front/src/modules/workflow/workflow-diagram/states/workflowReactFlowRefState.ts diff --git a/packages/twenty-front/src/modules/workflow/states/workflowSelectedNodeState.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/states/workflowSelectedNodeState.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/states/workflowSelectedNodeState.ts rename to packages/twenty-front/src/modules/workflow/workflow-diagram/states/workflowSelectedNodeState.ts diff --git a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowEditStep.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowEditStep.tsx similarity index 90% rename from packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowEditStep.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowEditStep.tsx index 35f60b368..4e71b7dd1 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowEditStep.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowEditStep.tsx @@ -1,6 +1,6 @@ import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { workflowIdState } from '@/workflow/states/workflowIdState'; -import { RightDrawerWorkflowEditStepContent } from '@/workflow/workflow-step/components/RightDrawerWorkflowEditStepContent'; +import { RightDrawerWorkflowEditStepContent } from '@/workflow/workflow-steps/components/RightDrawerWorkflowEditStepContent'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowEditStepContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowEditStepContent.tsx similarity index 68% rename from packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowEditStepContent.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowEditStepContent.tsx index 7fabd563b..0dbda0539 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowEditStepContent.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowEditStepContent.tsx @@ -1,8 +1,8 @@ -import { useUpdateStep } from '@/workflow/hooks/useUpdateStep'; -import { useUpdateWorkflowVersionTrigger } from '@/workflow/hooks/useUpdateWorkflowVersionTrigger'; -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow'; -import { WorkflowStepDetail } from '@/workflow/workflow-step/components/WorkflowStepDetail'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; +import { WorkflowStepDetail } from '@/workflow/workflow-steps/components/WorkflowStepDetail'; +import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep'; +import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowViewStep.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowViewStep.tsx similarity index 92% rename from packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowViewStep.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowViewStep.tsx index dfb5f6f84..896c07117 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowViewStep.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowViewStep.tsx @@ -1,6 +1,6 @@ import { useWorkflowVersion } from '@/workflow/hooks/useWorkflowVersion'; import { workflowVersionIdState } from '@/workflow/states/workflowVersionIdState'; -import { RightDrawerWorkflowViewStepContent } from '@/workflow/workflow-step/components/RightDrawerWorkflowViewStepContent'; +import { RightDrawerWorkflowViewStepContent } from '@/workflow/workflow-steps/components/RightDrawerWorkflowViewStepContent'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowViewStepContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowViewStepContent.tsx similarity index 76% rename from packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowViewStepContent.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowViewStepContent.tsx index 658cd5756..1e54e35f6 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-step/components/RightDrawerWorkflowViewStepContent.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/RightDrawerWorkflowViewStepContent.tsx @@ -1,6 +1,6 @@ -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; import { WorkflowVersion } from '@/workflow/types/Workflow'; -import { WorkflowStepDetail } from '@/workflow/workflow-step/components/WorkflowStepDetail'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; +import { WorkflowStepDetail } from '@/workflow/workflow-steps/components/WorkflowStepDetail'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-step/components/WorkflowStepBody.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepBody.tsx similarity index 100% rename from packages/twenty-front/src/modules/workflow/workflow-step/components/WorkflowStepBody.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepBody.tsx diff --git a/packages/twenty-front/src/modules/workflow/workflow-step/components/WorkflowStepDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepDetail.tsx similarity index 91% rename from packages/twenty-front/src/modules/workflow/workflow-step/components/WorkflowStepDetail.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepDetail.tsx index 420ee54f9..aa67fdf6e 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-step/components/WorkflowStepDetail.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepDetail.tsx @@ -5,10 +5,10 @@ import { } from '@/workflow/types/Workflow'; import { assertUnreachable } from '@/workflow/utils/assertUnreachable'; import { getStepDefinitionOrThrow } from '@/workflow/utils/getStepDefinitionOrThrow'; -import { WorkflowEditActionFormCreateRecord } from '@/workflow/workflow-actions/components/WorkflowEditActionFormCreateRecord'; -import { WorkflowEditActionFormDeleteRecord } from '@/workflow/workflow-actions/components/WorkflowEditActionFormDeleteRecord'; -import { WorkflowEditActionFormSendEmail } from '@/workflow/workflow-actions/components/WorkflowEditActionFormSendEmail'; -import { WorkflowEditActionFormUpdateRecord } from '@/workflow/workflow-actions/components/WorkflowEditActionFormUpdateRecord'; +import { WorkflowEditActionFormCreateRecord } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord'; +import { WorkflowEditActionFormDeleteRecord } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord'; +import { WorkflowEditActionFormSendEmail } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormSendEmail'; +import { WorkflowEditActionFormUpdateRecord } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord'; import { WorkflowEditTriggerDatabaseEventForm } from '@/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm'; import { WorkflowEditTriggerManualForm } from '@/workflow/workflow-trigger/components/WorkflowEditTriggerManualForm'; import { Suspense, lazy } from 'react'; @@ -17,7 +17,7 @@ import { RightDrawerSkeletonLoader } from '~/loading/components/RightDrawerSkele const WorkflowEditActionFormServerlessFunction = lazy(() => import( - '@/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunction' + '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction' ).then((module) => ({ default: module.WorkflowEditActionFormServerlessFunction, })), diff --git a/packages/twenty-front/src/modules/workflow/workflow-step/components/WorkflowStepHeader.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepHeader.tsx similarity index 100% rename from packages/twenty-front/src/modules/workflow/workflow-step/components/WorkflowStepHeader.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepHeader.tsx diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.ts similarity index 87% rename from packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateStep.test.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.ts index 78ea61435..fde2dc6c4 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateStep.test.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.ts @@ -20,11 +20,14 @@ jest.mock('@/ui/layout/right-drawer/hooks/useRightDrawer', () => ({ }), })); -jest.mock('@/workflow/hooks/useCreateWorkflowVersionStep', () => ({ - useCreateWorkflowVersionStep: () => ({ - createWorkflowVersionStep: mockCreateWorkflowVersionStep, +jest.mock( + '@/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep', + () => ({ + useCreateWorkflowVersionStep: () => ({ + createWorkflowVersionStep: mockCreateWorkflowVersionStep, + }), }), -})); +); jest.mock('@/workflow/hooks/useCreateNewWorkflowVersion', () => ({ useCreateNewWorkflowVersion: () => ({ diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useDeleteStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.ts similarity index 95% rename from packages/twenty-front/src/modules/workflow/hooks/__tests__/useDeleteStep.test.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.ts index d866c9aef..fc26dad3e 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useDeleteStep.test.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.ts @@ -1,6 +1,6 @@ import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow'; +import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep'; import { renderHook } from '@testing-library/react'; -import { useDeleteStep } from '@/workflow/hooks/useDeleteStep'; const mockCloseRightDrawer = jest.fn(); const mockCreateNewWorkflowVersion = jest.fn(); diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useUpdateStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts similarity index 84% rename from packages/twenty-front/src/modules/workflow/hooks/__tests__/useUpdateStep.test.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts index 1f23cb309..4c4cd2202 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useUpdateStep.test.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts @@ -1,6 +1,6 @@ import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow'; +import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep'; import { renderHook } from '@testing-library/react'; -import { useUpdateStep } from '@/workflow/hooks/useUpdateStep'; const mockCreateNewWorkflowVersion = jest.fn(); const mockUpdateWorkflowVersionStep = jest.fn(); @@ -11,11 +11,14 @@ jest.mock('recoil', () => ({ atom: (params: any) => params, })); -jest.mock('@/workflow/hooks/useUpdateWorkflowVersionStep', () => ({ - useUpdateWorkflowVersionStep: () => ({ - updateWorkflowVersionStep: mockUpdateWorkflowVersionStep, +jest.mock( + '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep', + () => ({ + useUpdateWorkflowVersionStep: () => ({ + updateWorkflowVersionStep: mockUpdateWorkflowVersionStep, + }), }), -})); +); jest.mock('@/workflow/hooks/useCreateNewWorkflowVersion', () => ({ useCreateNewWorkflowVersion: () => ({ diff --git a/packages/twenty-front/src/modules/workflow/hooks/useCreateStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateStep.ts similarity index 87% rename from packages/twenty-front/src/modules/workflow/hooks/useCreateStep.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateStep.ts index c2678a4ed..330b89e11 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/useCreateStep.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateStep.ts @@ -1,14 +1,14 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer'; import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; -import { useCreateWorkflowVersionStep } from '@/workflow/hooks/useCreateWorkflowVersionStep'; import { useGetUpdatableWorkflowVersion } from '@/workflow/hooks/useGetUpdatableWorkflowVersion'; -import { workflowCreateStepFromParentStepIdState } from '@/workflow/states/workflowCreateStepFromParentStepIdState'; import { workflowLastCreatedStepIdState } from '@/workflow/states/workflowLastCreatedStepIdState'; -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; import { WorkflowStepType, WorkflowWithCurrentVersion, } from '@/workflow/types/Workflow'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; +import { useCreateWorkflowVersionStep } from '@/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep'; +import { workflowCreateStepFromParentStepIdState } from '@/workflow/workflow-steps/states/workflowCreateStepFromParentStepIdState'; import { useRecoilValue, useSetRecoilState } from 'recoil'; import { isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/hooks/useCreateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/hooks/useCreateWorkflowVersionStep.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts diff --git a/packages/twenty-front/src/modules/workflow/hooks/useDeleteStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteStep.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/hooks/useDeleteStep.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteStep.ts diff --git a/packages/twenty-front/src/modules/workflow/hooks/useUpdateStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts similarity index 89% rename from packages/twenty-front/src/modules/workflow/hooks/useUpdateStep.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts index f78409e12..e38e334ae 100644 --- a/packages/twenty-front/src/modules/workflow/hooks/useUpdateStep.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts @@ -1,10 +1,10 @@ +import { useGetUpdatableWorkflowVersion } from '@/workflow/hooks/useGetUpdatableWorkflowVersion'; import { WorkflowStep, WorkflowWithCurrentVersion, } from '@/workflow/types/Workflow'; +import { useUpdateWorkflowVersionStep } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep'; import { isDefined } from 'twenty-ui'; -import { useGetUpdatableWorkflowVersion } from '@/workflow/hooks/useGetUpdatableWorkflowVersion'; -import { useUpdateWorkflowVersionStep } from '@/workflow/hooks/useUpdateWorkflowVersionStep'; export const useUpdateStep = ({ workflow, diff --git a/packages/twenty-front/src/modules/workflow/hooks/useUpdateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/hooks/useUpdateWorkflowVersionStep.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts diff --git a/packages/twenty-front/src/modules/workflow/states/workflowCreateStepFromParentStepIdState.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/states/workflowCreateStepFromParentStepIdState.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/states/workflowCreateStepFromParentStepIdState.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/states/workflowCreateStepFromParentStepIdState.ts diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/RightDrawerWorkflowSelectAction.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectAction.tsx similarity index 87% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/RightDrawerWorkflowSelectAction.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectAction.tsx index 1aa6be07b..39c009d82 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/RightDrawerWorkflowSelectAction.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectAction.tsx @@ -1,6 +1,6 @@ import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { workflowIdState } from '@/workflow/states/workflowIdState'; -import { RightDrawerWorkflowSelectActionContent } from '@/workflow/workflow-actions/components/RightDrawerWorkflowSelectActionContent'; +import { RightDrawerWorkflowSelectActionContent } from '@/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx similarity index 84% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx index 84f93ce8c..9c0b5bcef 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx @@ -1,6 +1,6 @@ -import { useCreateStep } from '@/workflow/hooks/useCreateStep'; import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow'; -import { ACTIONS } from '@/workflow/workflow-actions/constants/Actions'; +import { useCreateStep } from '@/workflow/workflow-steps/hooks/useCreateStep'; +import { ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/Actions'; import styled from '@emotion/styled'; import { MenuItem } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx similarity index 96% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx index 86193b3d9..adc43134e 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx @@ -4,8 +4,8 @@ import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/util import { FormFieldInput } from '@/object-record/record-field/components/FormFieldInput'; import { Select, SelectOption } from '@/ui/input/components/Select'; import { WorkflowCreateRecordAction } from '@/workflow/types/Workflow'; -import { WorkflowStepBody } from '@/workflow/workflow-step/components/WorkflowStepBody'; -import { WorkflowStepHeader } from '@/workflow/workflow-step/components/WorkflowStepHeader'; +import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody'; +import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader'; import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker'; import { useTheme } from '@emotion/react'; import { useEffect, useState } from 'react'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx similarity index 94% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx index d1c78cb05..3fb5e1619 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx @@ -1,8 +1,8 @@ import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; import { Select, SelectOption } from '@/ui/input/components/Select'; import { WorkflowDeleteRecordAction } from '@/workflow/types/Workflow'; -import { WorkflowSingleRecordPicker } from '@/workflow/workflow-actions/components/WorkflowSingleRecordPicker'; -import { WorkflowStepHeader } from '@/workflow/workflow-step/components/WorkflowStepHeader'; +import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader'; +import { WorkflowSingleRecordPicker } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker'; import { useTheme } from '@emotion/react'; import { useEffect, useState } from 'react'; import { @@ -12,7 +12,7 @@ import { useIcons, } from 'twenty-ui'; -import { WorkflowStepBody } from '@/workflow/workflow-step/components/WorkflowStepBody'; +import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody'; import { JsonValue } from 'type-fest'; import { useDebouncedCallback } from 'use-debounce'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormSendEmail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormSendEmail.tsx similarity index 97% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormSendEmail.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormSendEmail.tsx index 279f10047..d3d450090 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormSendEmail.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormSendEmail.tsx @@ -7,8 +7,8 @@ import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAut import { Select, SelectOption } from '@/ui/input/components/Select'; import { workflowIdState } from '@/workflow/states/workflowIdState'; import { WorkflowSendEmailAction } from '@/workflow/types/Workflow'; -import { WorkflowStepBody } from '@/workflow/workflow-step/components/WorkflowStepBody'; -import { WorkflowStepHeader } from '@/workflow/workflow-step/components/WorkflowStepHeader'; +import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody'; +import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader'; import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker'; import { useTheme } from '@emotion/react'; import { useEffect, useState } from 'react'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx similarity index 95% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx index 61ac06490..5b843afe4 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx @@ -5,8 +5,8 @@ import { useGetUpdatableWorkflowVersion } from '@/workflow/hooks/useGetUpdatable import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { workflowIdState } from '@/workflow/states/workflowIdState'; import { WorkflowCodeAction } from '@/workflow/types/Workflow'; -import { setNestedValue } from '@/workflow/workflow-actions/utils/setNestedValue'; -import { WorkflowStepHeader } from '@/workflow/workflow-step/components/WorkflowStepHeader'; +import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader'; +import { setNestedValue } from '@/workflow/workflow-steps/workflow-actions/utils/setNestedValue'; import { CmdEnterActionButton } from '@/action-menu/components/CmdEnterActionButton'; import { ServerlessFunctionExecutionResult } from '@/serverless-functions/components/ServerlessFunctionExecutionResult'; @@ -20,9 +20,9 @@ import { RightDrawerFooter } from '@/ui/layout/right-drawer/components/RightDraw import { TabList } from '@/ui/layout/tab/components/TabList'; import { useTabList } from '@/ui/layout/tab/hooks/useTabList'; import { serverlessFunctionTestDataFamilyState } from '@/workflow/states/serverlessFunctionTestDataFamilyState'; -import { WorkflowEditActionFormServerlessFunctionFields } from '@/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields'; -import { WORKFLOW_SERVERLESS_FUNCTION_TAB_LIST_COMPONENT_ID } from '@/workflow/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId'; -import { WorkflowStepBody } from '@/workflow/workflow-step/components/WorkflowStepBody'; +import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody'; +import { WorkflowEditActionFormServerlessFunctionFields } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields'; +import { WORKFLOW_SERVERLESS_FUNCTION_TAB_LIST_COMPONENT_ID } from '@/workflow/workflow-steps/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId'; import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields.tsx similarity index 96% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields.tsx index bb3933ff8..e09c32b1c 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields.tsx @@ -2,7 +2,7 @@ import { FormNestedFieldInputContainer } from '@/object-record/record-field/form import { FormTextFieldInput } from '@/object-record/record-field/form-types/components/FormTextFieldInput'; import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent'; import { InputLabel } from '@/ui/input/components/InputLabel'; -import { FunctionInput } from '@/workflow/workflow-actions/types/FunctionInput'; +import { FunctionInput } from '@/workflow/workflow-steps/workflow-actions/types/FunctionInput'; import styled from '@emotion/styled'; import { isObject } from '@sniptt/guards'; import { ReactNode } from 'react'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx similarity index 96% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx index c19787b6b..49c494d80 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx @@ -13,9 +13,9 @@ import { import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition'; import { FormFieldInput } from '@/object-record/record-field/components/FormFieldInput'; import { FormMultiSelectFieldInput } from '@/object-record/record-field/form-types/components/FormMultiSelectFieldInput'; -import { WorkflowSingleRecordPicker } from '@/workflow/workflow-actions/components/WorkflowSingleRecordPicker'; -import { WorkflowStepBody } from '@/workflow/workflow-step/components/WorkflowStepBody'; -import { WorkflowStepHeader } from '@/workflow/workflow-step/components/WorkflowStepHeader'; +import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody'; +import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader'; +import { WorkflowSingleRecordPicker } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker'; import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker'; import { JsonValue } from 'type-fest'; import { useDebouncedCallback } from 'use-debounce'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowSingleRecordFieldChip.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordFieldChip.tsx similarity index 95% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowSingleRecordFieldChip.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordFieldChip.tsx index 0facb4da0..c1231d172 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowSingleRecordFieldChip.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordFieldChip.tsx @@ -6,7 +6,7 @@ import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariabl import { RecordId, Variable, -} from '@/workflow/workflow-actions/components/WorkflowSingleRecordPicker'; +} from '@/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker'; import styled from '@emotion/styled'; const StyledRecordChip = styled(RecordChip)` diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowSingleRecordPicker.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker.tsx similarity index 99% rename from packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowSingleRecordPicker.tsx rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker.tsx index 622e858ea..c049db474 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/components/WorkflowSingleRecordPicker.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker.tsx @@ -17,7 +17,7 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString'; -import { WorkflowSingleRecordFieldChip } from '@/workflow/workflow-actions/components/WorkflowSingleRecordFieldChip'; +import { WorkflowSingleRecordFieldChip } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordFieldChip'; import { WorkflowVariablesDropdown } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdown'; import { css } from '@emotion/react'; import styled from '@emotion/styled'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/constants/Actions.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/Actions.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/workflow-actions/constants/Actions.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/Actions.ts diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId.ts diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/types/FunctionInput.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/types/FunctionInput.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/workflow-actions/types/FunctionInput.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/types/FunctionInput.ts diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/utils/__tests__/setNestedValue.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/setNestedValue.test.ts similarity index 88% rename from packages/twenty-front/src/modules/workflow/workflow-actions/utils/__tests__/setNestedValue.test.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/setNestedValue.test.ts index ba3b1369f..7fe11463e 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-actions/utils/__tests__/setNestedValue.test.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/setNestedValue.test.ts @@ -1,4 +1,4 @@ -import { setNestedValue } from '@/workflow/workflow-actions/utils/setNestedValue'; +import { setNestedValue } from '@/workflow/workflow-steps/workflow-actions/utils/setNestedValue'; describe('setNestedValue', () => { it('should set nested value properly', () => { diff --git a/packages/twenty-front/src/modules/workflow/workflow-actions/utils/setNestedValue.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/setNestedValue.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/workflow-actions/utils/setNestedValue.ts rename to packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/setNestedValue.ts diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx index f7bcfcada..bf8cf359f 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx @@ -1,11 +1,11 @@ import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer'; import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; -import { useUpdateWorkflowVersionTrigger } from '@/workflow/hooks/useUpdateWorkflowVersionTrigger'; -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; import { TRIGGER_STEP_ID } from '@/workflow/workflow-trigger/constants/TriggerStepId'; import { TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/TriggerTypes'; +import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger'; import { getTriggerDefaultDefinition } from '@/workflow/workflow-trigger/utils/getTriggerDefaultDefinition'; import styled from '@emotion/styled'; import { useSetRecoilState } from 'recoil'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx index 798a4f1b0..873c5ab2e 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx @@ -2,8 +2,8 @@ import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilte import { Select, SelectOption } from '@/ui/input/components/Select'; import { WorkflowDatabaseEventTrigger } from '@/workflow/types/Workflow'; import { splitWorkflowTriggerEventName } from '@/workflow/utils/splitWorkflowTriggerEventName'; -import { WorkflowStepBody } from '@/workflow/workflow-step/components/WorkflowStepBody'; -import { WorkflowStepHeader } from '@/workflow/workflow-step/components/WorkflowStepHeader'; +import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody'; +import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader'; import { OBJECT_EVENT_TRIGGERS } from '@/workflow/workflow-trigger/constants/ObjectEventTriggers'; import { useTheme } from '@emotion/react'; import { IconPlaylistAdd, isDefined } from 'twenty-ui'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManualForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManualForm.tsx index 6c6b9dfd9..c889c8838 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManualForm.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManualForm.tsx @@ -4,8 +4,8 @@ import { WorkflowManualTrigger, WorkflowManualTriggerAvailability, } from '@/workflow/types/Workflow'; -import { WorkflowStepBody } from '@/workflow/workflow-step/components/WorkflowStepBody'; -import { WorkflowStepHeader } from '@/workflow/workflow-step/components/WorkflowStepHeader'; +import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody'; +import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader'; import { MANUAL_TRIGGER_AVAILABILITY_OPTIONS } from '@/workflow/workflow-trigger/constants/ManualTriggerAvailabilityOptions'; import { getManualTriggerDefaultSettings } from '@/workflow/workflow-trigger/utils/getManualTriggerDefaultSettings'; import { useTheme } from '@emotion/react'; diff --git a/packages/twenty-front/src/modules/workflow/hooks/useUpdateWorkflowVersionTrigger.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts similarity index 100% rename from packages/twenty-front/src/modules/workflow/hooks/useUpdateWorkflowVersionTrigger.ts rename to packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx index 03486f673..289863a80 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx @@ -12,9 +12,9 @@ import { isBaseOutputSchema } from '@/workflow/workflow-variables/utils/isBaseOu import { isRecordOutputSchema } from '@/workflow/workflow-variables/utils/isRecordOutputSchema'; import { useTabList } from '@/ui/layout/tab/hooks/useTabList'; -import { workflowDiagramTriggerNodeSelectionState } from '@/workflow/states/workflowDiagramTriggerNodeSelectionState'; -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; -import { WORKFLOW_SERVERLESS_FUNCTION_TAB_LIST_COMPONENT_ID } from '@/workflow/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId'; +import { workflowDiagramTriggerNodeSelectionState } from '@/workflow/workflow-diagram/states/workflowDiagramTriggerNodeSelectionState'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; +import { WORKFLOW_SERVERLESS_FUNCTION_TAB_LIST_COMPONENT_ID } from '@/workflow/workflow-steps/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId'; import { isLinkOutputSchema } from '@/workflow/workflow-variables/utils/isLinkOutputSchema'; import { useState } from 'react'; import { useSetRecoilState } from 'recoil'; diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts index b141971d8..3707ea72d 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts @@ -1,7 +1,7 @@ import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { workflowIdState } from '@/workflow/states/workflowIdState'; -import { workflowSelectedNodeState } from '@/workflow/states/workflowSelectedNodeState'; import { getStepDefinitionOrThrow } from '@/workflow/utils/getStepDefinitionOrThrow'; +import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; import { OutputSchema, StepOutputSchema,