[camel-karavan] branch main updated: Fix multicast drag/drop (#222)

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new af6d5cb  Fix multicast drag/drop (#222)
af6d5cb is described below

commit af6d5cb3a7d24103ccf8418b178568c323d70006
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Fri Mar 18 15:23:51 2022 -0400

    Fix multicast drag/drop (#222)
---
 karavan-core/src/core/api/CamelDefinitionApiExt.ts    | 7 ++++---
 karavan-designer/src/designer/route/RouteDesigner.tsx | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/karavan-core/src/core/api/CamelDefinitionApiExt.ts 
b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
index 535430e..1c3e309 100644
--- a/karavan-core/src/core/api/CamelDefinitionApiExt.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
@@ -128,11 +128,12 @@ export class CamelDefinitionApiExt {
         return new CamelElementMeta(result?.step, result?.parentUuid, 
result?.position, result?.pathUuids);
     }
 
-    static moveElement = (integration: Integration, source: string, target: 
string): Integration => {
-        const sourceFindStep = 
CamelDefinitionApiExt.findStep(integration.spec.flows, source);
+    static moveRouteElement = (integration: Integration, source: string, 
target: string): Integration => {
+        const routes = integration.spec.flows?.filter(f => f.dslName === 
'RouteDefinition');
+        const sourceFindStep = CamelDefinitionApiExt.findStep(routes, source);
         const sourceStep = sourceFindStep.step;
         const sourceUuid = sourceStep?.uuid;
-        const targetFindStep = 
CamelDefinitionApiExt.findStep(integration.spec.flows, target);
+        const targetFindStep = CamelDefinitionApiExt.findStep(routes, target);
         const parentUuid = targetFindStep.parentUuid;
         if (sourceUuid && parentUuid && sourceStep && 
!targetFindStep.pathUuids.includes(source)) {
             CamelDefinitionApiExt.deleteStepFromIntegration(integration, 
sourceUuid);
diff --git a/karavan-designer/src/designer/route/RouteDesigner.tsx 
b/karavan-designer/src/designer/route/RouteDesigner.tsx
index 9983f32..aa5c31b 100644
--- a/karavan-designer/src/designer/route/RouteDesigner.tsx
+++ b/karavan-designer/src/designer/route/RouteDesigner.tsx
@@ -194,7 +194,7 @@ export class RouteDesigner extends React.Component<Props, 
State> {
     }
 
     moveElement = (source: string, target: string) => {
-        const i = CamelDefinitionApiExt.moveElement(this.state.integration, 
source, target);
+        const i = 
CamelDefinitionApiExt.moveRouteElement(this.state.integration, source, target);
         const clone = CamelUtil.cloneIntegration(i);
         const selectedStep = 
CamelDefinitionApiExt.findElementInIntegration(clone, source);
         this.setState({