diff --git a/src/designer/elsa-workflows-designer/src/components.d.ts b/src/designer/elsa-workflows-designer/src/components.d.ts index c601f4f97..3b195b81c 100644 --- a/src/designer/elsa-workflows-designer/src/components.d.ts +++ b/src/designer/elsa-workflows-designer/src/components.d.ts @@ -6,20 +6,19 @@ */ import { HTMLStencilElement, JSXBase } from "@stencil/core/internal"; import { ActivityDefinition, ActivityDefinitionPropsUpdatedArgs, ActivityDefinitionSummary, ActivityDefinitionUpdatedArgs } from "./modules/activity-definitions/models"; -import { ActivityDriverRegistry } from "./services"; +import { ActivityDriverRegistry, ContainerActivityComponent } from "./services"; import { ActionDefinition, ActionInvokedArgs, Activity, ActivityDeletedArgs, ActivitySelectedArgs, ChildActivitySelectedArgs, ContainerSelectedArgs, EditChildActivityArgs, GraphUpdatedArgs, IntellisenseContext, SelectListItem, TabChangedArgs, TabDefinition, Variable, WorkflowInstance, WorkflowInstanceSummary } from "./models"; import { ActivityIdUpdatedArgs, ActivityUpdatedArgs, DeleteActivityRequestedArgs } from "./modules/workflow-definitions/components/activity-properties-editor"; import { PublishClickedArgs } from "./modules/activity-definitions/components/publish-button"; import { Button } from "./components/shared/button-group/models"; -import { ContainerActivityComponent } from "./components/activities/container-activity-component"; import { AddActivityArgs, UpdateActivityArgs } from "./components/designer/canvas/canvas"; import { ActivityInputContext } from "./services/node-input-driver"; import { ContextMenuAnchorPoint, MenuItem, MenuItemGroup } from "./components/shared/context-menu/models"; import { DropdownButtonItem, DropdownButtonOrigin } from "./components/shared/dropdown-button/models"; -import { Flowchart, FlowchartNavigationItem } from "./components/activities/flowchart/models"; +import { Flowchart, FlowchartNavigationItem } from "./modules/flowchart/models"; import { Graph } from "@antv/x6"; import { AddActivityArgs as AddActivityArgs1, UpdateActivityArgs as UpdateActivityArgs1 } from "./components/designer/canvas/canvas"; -import { ActivityNodeShape } from "./components/activities/flowchart/shapes"; +import { ActivityNodeShape } from "./modules/flowchart/shapes"; import { ExpressionChangedArs } from "./components/designer/input-control-switch/input-control-switch"; import { CreateLabelEventArgs, DeleteLabelEventArgs, Label, UpdateLabelEventArgs } from "./modules/labels/models"; import { MonacoLib, MonacoValueChangedArgs } from "./components/shared/monaco-editor/monaco-editor"; diff --git a/src/designer/elsa-workflows-designer/src/components/designer/canvas/canvas.tsx b/src/designer/elsa-workflows-designer/src/components/designer/canvas/canvas.tsx index a9e203fb8..36c424e84 100644 --- a/src/designer/elsa-workflows-designer/src/components/designer/canvas/canvas.tsx +++ b/src/designer/elsa-workflows-designer/src/components/designer/canvas/canvas.tsx @@ -1,5 +1,5 @@ import {Component, h, Method, Prop} from '@stencil/core'; -import {ContainerActivityComponent} from '../../activities/container-activity-component'; +import {ContainerActivityComponent} from '../../../services'; import {Activity, ActivityDescriptor} from '../../../models'; export interface AddActivityArgs { diff --git a/src/designer/elsa-workflows-designer/src/modules/activity-definitions/components/properties.tsx b/src/designer/elsa-workflows-designer/src/modules/activity-definitions/components/properties.tsx index 89a5db238..6b731cf64 100644 --- a/src/designer/elsa-workflows-designer/src/modules/activity-definitions/components/properties.tsx +++ b/src/designer/elsa-workflows-designer/src/modules/activity-definitions/components/properties.tsx @@ -39,7 +39,7 @@ export class Properties { await this.slideOverPanel.hide(); } - @Watch('workflowDefinition') + @Watch('activityDefinition') async onWorkflowDefinitionChanged() { await this.createModel(); } diff --git a/src/designer/elsa-workflows-designer/src/modules/activity-definitions/plugin.tsx b/src/designer/elsa-workflows-designer/src/modules/activity-definitions/plugin.tsx index b2242f179..441cd8472 100644 --- a/src/designer/elsa-workflows-designer/src/modules/activity-definitions/plugin.tsx +++ b/src/designer/elsa-workflows-designer/src/modules/activity-definitions/plugin.tsx @@ -4,7 +4,7 @@ import {Container, Service} from "typedi"; import {ActivityDescriptor, Plugin} from "../../models"; import newButtonItemStore from "../../data/new-button-item-store"; import {MenuItem} from "../../components/shared/context-menu/models"; -import {Flowchart} from "../../components/activities/flowchart/models"; +import {Flowchart} from "../flowchart/models"; import {generateUniqueActivityName} from '../../utils/generate-activity-name'; import descriptorsStore from "../../data/descriptors-store"; import studioComponentStore from "../../data/studio-component-store"; diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/activity-node-handler.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/activity-node-handler.ts similarity index 81% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/activity-node-handler.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/activity-node-handler.ts index 2d74c7fba..58d03c031 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/activity-node-handler.ts +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/activity-node-handler.ts @@ -1,5 +1,5 @@ import {Node} from "@antv/x6"; -import {Activity, ActivityDescriptor} from "../../../models"; +import {Activity, ActivityDescriptor} from "../../models"; export interface ActivityNodeHandler { createDesignerNode: (context: CreateUINodeContext) => Node.Metadata; diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/default-activity-template.tsx b/src/designer/elsa-workflows-designer/src/modules/flowchart/default-activity-template.tsx similarity index 98% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/default-activity-template.tsx rename to src/designer/elsa-workflows-designer/src/modules/flowchart/default-activity-template.tsx index 186c48c12..eedce40ed 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/default-activity-template.tsx +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/default-activity-template.tsx @@ -1,9 +1,9 @@ import {Component, h, Prop, State, Event, EventEmitter, Listen, Element} from "@stencil/core"; -import {ActivityIcon, ActivityIconRegistry, PortProviderRegistry} from "../../../services"; +import {ActivityIcon, ActivityIconRegistry, PortProviderRegistry} from "../../services"; import {Container} from "typedi"; -import {Activity, ActivityDescriptor, ActivityKind, ActivitySelectedArgs, ChildActivitySelectedArgs, EditChildActivityArgs, Port, PortMode} from "../../../models"; -import descriptorsStore from "../../../data/descriptors-store"; -import {isNullOrWhitespace} from "../../../utils"; +import {Activity, ActivityDescriptor, ActivityKind, ActivitySelectedArgs, ChildActivitySelectedArgs, EditChildActivityArgs, Port, PortMode} from "../../models"; +import descriptorsStore from "../../data/descriptors-store"; +import {isNullOrWhitespace} from "../../utils"; import FlowchartTunnel from "./state"; @Component({ diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/default-node-handler.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/default-node-handler.ts similarity index 93% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/default-node-handler.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/default-node-handler.ts index 7e9f9053c..6386d04a1 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/default-node-handler.ts +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/default-node-handler.ts @@ -2,8 +2,8 @@ import 'reflect-metadata'; import {Node} from "@antv/x6"; import {Container, Service} from "typedi" import {ActivityNodeHandler, CreateUINodeContext} from "./activity-node-handler"; -import {PortProviderContext, PortProviderRegistry} from "../../../services"; -import {PortMode} from "../../../models"; +import {PortProviderContext, PortProviderRegistry} from "../../services"; +import {PortMode} from "../../models"; @Service() export class DefaultNodeHandler implements ActivityNodeHandler { diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/events.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/events.ts similarity index 90% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/events.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/events.ts index ef95d5f62..5d568ebc7 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/events.ts +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/events.ts @@ -1,6 +1,6 @@ import {Connection} from "./models"; import {Edge, Graph, Node} from "@antv/x6"; -import {Activity} from "../../../models"; +import {Activity} from "../../models"; export const FlowchartEvents = { ConnectionCreated: 'connection-created' diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/flowchart.scss b/src/designer/elsa-workflows-designer/src/modules/flowchart/flowchart.scss similarity index 100% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/flowchart.scss rename to src/designer/elsa-workflows-designer/src/modules/flowchart/flowchart.scss diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/flowchart.tsx b/src/designer/elsa-workflows-designer/src/modules/flowchart/flowchart.tsx similarity index 97% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/flowchart.tsx rename to src/designer/elsa-workflows-designer/src/modules/flowchart/flowchart.tsx index 986b543b1..66e67f28c 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/flowchart.tsx +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/flowchart.tsx @@ -5,23 +5,22 @@ import {Edge, Graph, Model, Node, NodeView, Point} from '@antv/x6'; import './shapes'; import './ports'; import {ActivityNodeShape} from './shapes'; -import {ContainerActivityComponent} from '../container-activity-component'; -import {AddActivityArgs, UpdateActivityArgs} from '../../designer/canvas/canvas'; -import {Activity, ActivityDeletedArgs, ActivityDescriptor, ActivitySelectedArgs, ContainerSelectedArgs, EditChildActivityArgs, GraphUpdatedArgs} from '../../../models'; +import {AddActivityArgs, UpdateActivityArgs} from '../../components/designer/canvas/canvas'; +import {Activity, ActivityDeletedArgs, ActivityDescriptor, ActivitySelectedArgs, ContainerSelectedArgs, EditChildActivityArgs, GraphUpdatedArgs} from '../../models'; import {createGraph} from './graph-factory'; import {Connection, Flowchart, FlowchartModel, FlowchartNavigationItem} from './models'; import {NodeFactory} from "./node-factory"; import {Container} from "typedi"; -import {ActivityNode, createActivityLookup, EventBus, flatten, PortProviderRegistry, walkActivities} from "../../../services"; +import {ActivityNode, ContainerActivityComponent, createActivityLookup, EventBus, flatten, PortProviderRegistry, walkActivities} from "../../services"; import {ConnectionCreatedEventArgs, FlowchartEvents} from "./events"; -import {ContextMenuAnchorPoint, MenuItemGroup} from "../../shared/context-menu/models"; -import descriptorsStore from "../../../data/descriptors-store"; -import {Hash} from "../../../utils"; +import {ContextMenuAnchorPoint, MenuItemGroup} from "../../components/shared/context-menu/models"; +import descriptorsStore from "../../data/descriptors-store"; +import {Hash} from "../../utils"; import PositionEventArgs = NodeView.PositionEventArgs; import FromJSONData = Model.FromJSONData; import PointLike = Point.PointLike; import FlowchartTunnel, {FlowchartState} from "./state"; -import {generateUniqueActivityName} from "../../../utils/generate-activity-name"; +import {generateUniqueActivityName} from "../../utils/generate-activity-name"; const FlowchartTypeName = 'Elsa.Flowchart'; diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/graph-factory.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/graph-factory.ts similarity index 100% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/graph-factory.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/graph-factory.ts diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/models.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/models.ts similarity index 89% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/models.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/models.ts index 440105f63..4e7f70b21 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/models.ts +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/models.ts @@ -1,4 +1,4 @@ -import {Activity, Container} from '../../../models'; +import {Activity, Container} from '../../models'; export interface Flowchart extends Container { start: string; diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/node-factory.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/node-factory.ts similarity index 90% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/node-factory.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/node-factory.ts index 4526bb9a9..7cd7b3dbb 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/node-factory.ts +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/node-factory.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; import {Graph, Node} from '@antv/x6'; -import {Activity, ActivityDescriptor, Port} from '../../../models'; +import {Activity, ActivityDescriptor, Port} from '../../models'; import {Container, Service} from "typedi"; import {NodeHandlerRegistry} from "./node-handler-registry"; diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/node-handler-registry.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/node-handler-registry.ts similarity index 100% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/node-handler-registry.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/node-handler-registry.ts diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/ports.tsx b/src/designer/elsa-workflows-designer/src/modules/flowchart/ports.tsx similarity index 100% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/ports.tsx rename to src/designer/elsa-workflows-designer/src/modules/flowchart/ports.tsx diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/shapes.ts b/src/designer/elsa-workflows-designer/src/modules/flowchart/shapes.ts similarity index 98% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/shapes.ts rename to src/designer/elsa-workflows-designer/src/modules/flowchart/shapes.ts index ddc1f0da8..84903ea93 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/shapes.ts +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/shapes.ts @@ -1,7 +1,7 @@ import {Cell, Graph, Shape} from '@antv/x6'; import {Container} from 'typedi'; -import {Activity, ActivityDescriptor} from '../../../models'; -import {ActivityDriverRegistry, ActivityDisplayContext} from '../../../services'; +import {Activity, ActivityDescriptor} from '../../models'; +import {ActivityDriverRegistry, ActivityDisplayContext} from '../../services'; export class ActivityNodeShape extends Shape.HTML { get text() { diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/state.tsx b/src/designer/elsa-workflows-designer/src/modules/flowchart/state.tsx similarity index 83% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/state.tsx rename to src/designer/elsa-workflows-designer/src/modules/flowchart/state.tsx index 71393fe30..fa026679e 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/state.tsx +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/state.tsx @@ -1,7 +1,7 @@ import {createProviderConsumer} from "@stencil/state-tunnel"; import {h} from "@stencil/core"; -import {Activity} from "../../../models"; -import {Hash} from "../../../utils"; +import {Activity} from "../../models"; +import {Hash} from "../../utils"; import {Flowchart} from './models'; export interface FlowchartState { diff --git a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/workflow-navigator.tsx b/src/designer/elsa-workflows-designer/src/modules/flowchart/workflow-navigator.tsx similarity index 96% rename from src/designer/elsa-workflows-designer/src/components/activities/flowchart/workflow-navigator.tsx rename to src/designer/elsa-workflows-designer/src/modules/flowchart/workflow-navigator.tsx index 82d9f7e17..57d6a549d 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/flowchart/workflow-navigator.tsx +++ b/src/designer/elsa-workflows-designer/src/modules/flowchart/workflow-navigator.tsx @@ -1,9 +1,9 @@ import {Component, FunctionalComponent, h, Prop, Event, EventEmitter} from "@stencil/core"; import {Container} from "typedi"; -import {ActivityIconRegistry, ActivityNode, flatten, PortProviderRegistry, walkActivities} from "../../../services"; +import {ActivityIconRegistry, ActivityNode, flatten, PortProviderRegistry, walkActivities} from "../../services"; import {Flowchart, FlowchartNavigationItem} from "./models"; -import {Port} from "../../../models"; -import descriptorsStore from "../../../data/descriptors-store"; +import {Port} from "../../models"; +import descriptorsStore from "../../data/descriptors-store"; @Component({ tag: 'elsa-workflow-navigator', diff --git a/src/designer/elsa-workflows-designer/src/modules/workflow-definitions/plugin.tsx b/src/designer/elsa-workflows-designer/src/modules/workflow-definitions/plugin.tsx index 5661229f9..95ee85d3a 100644 --- a/src/designer/elsa-workflows-designer/src/modules/workflow-definitions/plugin.tsx +++ b/src/designer/elsa-workflows-designer/src/modules/workflow-definitions/plugin.tsx @@ -4,7 +4,7 @@ import {Container, Service} from "typedi"; import {ActivityDescriptor, Plugin} from "../../models"; import newButtonItemStore from "../../data/new-button-item-store"; import {MenuItem} from "../../components/shared/context-menu/models"; -import {Flowchart} from "../../components/activities/flowchart/models"; +import {Flowchart} from "../flowchart/models"; import {generateUniqueActivityName} from '../../utils/generate-activity-name'; import descriptorsStore from "../../data/descriptors-store"; import studioComponentStore from "../../data/studio-component-store"; diff --git a/src/designer/elsa-workflows-designer/src/components/activities/container-activity-component.tsx b/src/designer/elsa-workflows-designer/src/services/container-activity-component.tsx similarity index 75% rename from src/designer/elsa-workflows-designer/src/components/activities/container-activity-component.tsx rename to src/designer/elsa-workflows-designer/src/services/container-activity-component.tsx index 2e69ef654..cfc4c3cc3 100644 --- a/src/designer/elsa-workflows-designer/src/components/activities/container-activity-component.tsx +++ b/src/designer/elsa-workflows-designer/src/services/container-activity-component.tsx @@ -1,5 +1,5 @@ -import {AddActivityArgs, UpdateActivityArgs} from '../designer/canvas/canvas'; -import {Activity} from '../../models'; +import {AddActivityArgs, UpdateActivityArgs} from '../components/designer/canvas/canvas'; +import {Activity} from "../models"; export interface ContainerActivityComponent { newRoot(): Promise; diff --git a/src/designer/elsa-workflows-designer/src/services/index.ts b/src/designer/elsa-workflows-designer/src/services/index.ts index 07da99adc..0e3227f38 100644 --- a/src/designer/elsa-workflows-designer/src/services/index.ts +++ b/src/designer/elsa-workflows-designer/src/services/index.ts @@ -2,6 +2,7 @@ export * from './activity-descriptor-manager'; export * from './activity-driver'; export * from './activity-driver-registry'; export * from './activity-icon-registry'; +export * from './container-activity-component'; export * from './custom-event-bus'; export * from './api-client/api-client'; export * from './event-bus';