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
commit 37a2929cb00139dcf30e6766149710e306b9cf3f Author: Marat Gubaidullin <[email protected]> AuthorDate: Mon Sep 16 15:38:04 2024 -0400 Fix #1417 --- .../src/main/webui/src/designer/route/useRouteDesignerHook.tsx | 10 ++++++++-- karavan-designer/src/designer/route/useRouteDesignerHook.tsx | 10 ++++++++-- karavan-space/src/designer/route/useRouteDesignerHook.tsx | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx b/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx index 740a82e8..5ed8199b 100644 --- a/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx +++ b/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx @@ -20,11 +20,11 @@ import {DslMetaModel} from "../utils/DslMetaModel"; import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; import { ChoiceDefinition, - FromDefinition, JsonDataFormat, + FromDefinition, GroovyExpression, JsonDataFormat, LogDefinition, MarshalDefinition, RouteConfigurationDefinition, - RouteDefinition, UnmarshalDefinition + RouteDefinition, SplitDefinition, UnmarshalDefinition } from "karavan-core/lib/model/CamelDefinition"; import {CamelElement, MetadataLabels} from "karavan-core/lib/model/IntegrationDefinition"; import {CamelDefinitionApiExt} from "karavan-core/lib/api/CamelDefinitionApiExt"; @@ -283,6 +283,12 @@ export function useRouteDesignerHook() { // eslint-disable-next-line no-template-curly-in-string (step as LogDefinition).message = "${body}"; } + if (step.dslName === 'SplitDefinition') { + const split = (step as SplitDefinition); + if (split.expression?.groovy !== undefined && (split.expression?.groovy as GroovyExpression).expression === "") { + (split.expression?.groovy as GroovyExpression).expression = 'body'; + } + } if (step.dslName === 'ChoiceDefinition') { (step as ChoiceDefinition).when?.push(CamelDefinitionApi.createStep('WhenDefinition', undefined)); (step as ChoiceDefinition).otherwise = CamelDefinitionApi.createStep('OtherwiseDefinition', undefined); diff --git a/karavan-designer/src/designer/route/useRouteDesignerHook.tsx b/karavan-designer/src/designer/route/useRouteDesignerHook.tsx index 740a82e8..5ed8199b 100644 --- a/karavan-designer/src/designer/route/useRouteDesignerHook.tsx +++ b/karavan-designer/src/designer/route/useRouteDesignerHook.tsx @@ -20,11 +20,11 @@ import {DslMetaModel} from "../utils/DslMetaModel"; import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; import { ChoiceDefinition, - FromDefinition, JsonDataFormat, + FromDefinition, GroovyExpression, JsonDataFormat, LogDefinition, MarshalDefinition, RouteConfigurationDefinition, - RouteDefinition, UnmarshalDefinition + RouteDefinition, SplitDefinition, UnmarshalDefinition } from "karavan-core/lib/model/CamelDefinition"; import {CamelElement, MetadataLabels} from "karavan-core/lib/model/IntegrationDefinition"; import {CamelDefinitionApiExt} from "karavan-core/lib/api/CamelDefinitionApiExt"; @@ -283,6 +283,12 @@ export function useRouteDesignerHook() { // eslint-disable-next-line no-template-curly-in-string (step as LogDefinition).message = "${body}"; } + if (step.dslName === 'SplitDefinition') { + const split = (step as SplitDefinition); + if (split.expression?.groovy !== undefined && (split.expression?.groovy as GroovyExpression).expression === "") { + (split.expression?.groovy as GroovyExpression).expression = 'body'; + } + } if (step.dslName === 'ChoiceDefinition') { (step as ChoiceDefinition).when?.push(CamelDefinitionApi.createStep('WhenDefinition', undefined)); (step as ChoiceDefinition).otherwise = CamelDefinitionApi.createStep('OtherwiseDefinition', undefined); diff --git a/karavan-space/src/designer/route/useRouteDesignerHook.tsx b/karavan-space/src/designer/route/useRouteDesignerHook.tsx index 740a82e8..5ed8199b 100644 --- a/karavan-space/src/designer/route/useRouteDesignerHook.tsx +++ b/karavan-space/src/designer/route/useRouteDesignerHook.tsx @@ -20,11 +20,11 @@ import {DslMetaModel} from "../utils/DslMetaModel"; import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; import { ChoiceDefinition, - FromDefinition, JsonDataFormat, + FromDefinition, GroovyExpression, JsonDataFormat, LogDefinition, MarshalDefinition, RouteConfigurationDefinition, - RouteDefinition, UnmarshalDefinition + RouteDefinition, SplitDefinition, UnmarshalDefinition } from "karavan-core/lib/model/CamelDefinition"; import {CamelElement, MetadataLabels} from "karavan-core/lib/model/IntegrationDefinition"; import {CamelDefinitionApiExt} from "karavan-core/lib/api/CamelDefinitionApiExt"; @@ -283,6 +283,12 @@ export function useRouteDesignerHook() { // eslint-disable-next-line no-template-curly-in-string (step as LogDefinition).message = "${body}"; } + if (step.dslName === 'SplitDefinition') { + const split = (step as SplitDefinition); + if (split.expression?.groovy !== undefined && (split.expression?.groovy as GroovyExpression).expression === "") { + (split.expression?.groovy as GroovyExpression).expression = 'body'; + } + } if (step.dslName === 'ChoiceDefinition') { (step as ChoiceDefinition).when?.push(CamelDefinitionApi.createStep('WhenDefinition', undefined)); (step as ChoiceDefinition).otherwise = CamelDefinitionApi.createStep('OtherwiseDefinition', undefined);
