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 e4a9d77d Fix #1297 e4a9d77d is described below commit e4a9d77d8da87e30e1c19ff68ad08d90d8e174a5 Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Fri May 24 18:20:04 2024 -0400 Fix #1297 --- .../src/main/webui/src/designer/utils/CamelUi.tsx | 7 +++++-- karavan-designer/public/example/demo.camel.yaml | 17 ++++------------- karavan-designer/src/designer/utils/CamelUi.tsx | 7 +++++-- karavan-space/src/designer/utils/CamelUi.tsx | 7 +++++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx b/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx index e824a895..a556fffe 100644 --- a/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx +++ b/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx @@ -339,8 +339,11 @@ export class CamelUi { .forEach((r: RouteDefinition) => { const uri = r.from.uri; const name = r.from.parameters.name; - if (showComponentName) result.push(uri + ":" + name); - else result.push(name); + if (showComponentName && name) { + result.push(uri + ":" + name); + } else if (name){ + result.push(name); + } }); return result; } diff --git a/karavan-designer/public/example/demo.camel.yaml b/karavan-designer/public/example/demo.camel.yaml index 57f6252a..2c843d16 100644 --- a/karavan-designer/public/example/demo.camel.yaml +++ b/karavan-designer/public/example/demo.camel.yaml @@ -1,18 +1,9 @@ - route: - id: route-3d00 - nodePrefixId: route-01c + id: route-d1dc + nodePrefixId: route-0f1 from: - id: from-4a08 + id: from-852d uri: direct - parameters: - name: adsdasdas steps: - loadBalance: - id: loadBalance-55de - steps: - - to: - id: to-87b5 - uri: direct - - to: - id: to-f061 - uri: direct + id: loadBalance-d8f0 diff --git a/karavan-designer/src/designer/utils/CamelUi.tsx b/karavan-designer/src/designer/utils/CamelUi.tsx index e824a895..a556fffe 100644 --- a/karavan-designer/src/designer/utils/CamelUi.tsx +++ b/karavan-designer/src/designer/utils/CamelUi.tsx @@ -339,8 +339,11 @@ export class CamelUi { .forEach((r: RouteDefinition) => { const uri = r.from.uri; const name = r.from.parameters.name; - if (showComponentName) result.push(uri + ":" + name); - else result.push(name); + if (showComponentName && name) { + result.push(uri + ":" + name); + } else if (name){ + result.push(name); + } }); return result; } diff --git a/karavan-space/src/designer/utils/CamelUi.tsx b/karavan-space/src/designer/utils/CamelUi.tsx index e824a895..a556fffe 100644 --- a/karavan-space/src/designer/utils/CamelUi.tsx +++ b/karavan-space/src/designer/utils/CamelUi.tsx @@ -339,8 +339,11 @@ export class CamelUi { .forEach((r: RouteDefinition) => { const uri = r.from.uri; const name = r.from.parameters.name; - if (showComponentName) result.push(uri + ":" + name); - else result.push(name); + if (showComponentName && name) { + result.push(uri + ":" + name); + } else if (name){ + result.push(name); + } }); return result; }