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 a555ce28a6e0ffb6cca2ab78f8caea83162356f1
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Tue Feb 6 19:01:09 2024 -0500
Fix #1109
---
karavan-designer/src/App.tsx | 2 +-
karavan-designer/src/designer/route/DslConnections.tsx | 8 ++++++--
karavan-space/src/designer/route/DslConnections.tsx | 8 ++++++--
.../src/main/webui/src/designer/route/DslConnections.tsx | 8 ++++++--
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx
index c7a7e461..a6613131 100644
--- a/karavan-designer/src/App.tsx
+++ b/karavan-designer/src/App.tsx
@@ -69,7 +69,7 @@ interface State {
class App extends React.Component<Props, State> {
public state: State = {
- pageId: "topology",
+ pageId: "designer",
name: 'example.yaml',
key: '',
yaml: ''
diff --git a/karavan-designer/src/designer/route/DslConnections.tsx
b/karavan-designer/src/designer/route/DslConnections.tsx
index c7651aac..0cfb4d78 100644
--- a/karavan-designer/src/designer/route/DslConnections.tsx
+++ b/karavan-designer/src/designer/route/DslConnections.tsx
@@ -141,8 +141,7 @@ export function DslConnections() {
let outs: [string, number][] = Array.from(steps.values())
.filter(pos => outgoingDefinitions.includes(pos.step.dslName))
.filter(pos => pos.step.dslName !== 'KameletDefinition' ||
(pos.step.dslName === 'KameletDefinition' &&
!CamelUi.isActionKamelet(pos.step)))
- .filter(pos => pos.step.dslName === 'ToDefinition' &&
!CamelUi.isActionKamelet(pos.step) &&
!TopologyUtils.isElementInternalComponent(pos.step))
- .filter(pos => !(outgoingDefinitions.includes(pos.step.dslName) &&
TopologyUtils.hasInternalUri(pos.step)))
+ .filter(pos => pos.step.dslName === 'ToDefinition' &&
!CamelUi.isActionKamelet(pos.step))
.filter(pos => pos.step.dslName !== 'SagaDefinition')
.filter(pos => !CamelUi.isKameletSink(pos.step))
.sort((pos1: DslPosition, pos2: DslPosition) => {
@@ -189,6 +188,10 @@ export function DslConnections() {
function getOutgoingIcons(data: [string, number]) {
const pos = steps.get(data[0]);
if (pos) {
+ const step = (pos.step as any);
+ const uri = step?.uri;
+ const directOrSeda = step && uri && step?.dslName ===
'ToDefinition' && ['direct','seda'].includes(uri);
+ const label = directOrSeda ? (step?.parameters?.name) : '';
const r = pos.headerRect.height / 2;
const outgoingX = width - 20;
const outgoingY = data[1] + 15;
@@ -198,6 +201,7 @@ export function DslConnections() {
<div key={pos.step.uuid + "-icon"}
style={{display: "block", position: "absolute", top:
imageY, left: imageX}}>
{CamelUi.getConnectionIcon(pos.step)}
+ {directOrSeda && <div style={{position: 'absolute', right:
27, top: -10, whiteSpace: 'nowrap'}}>{label}</div>}
</div>
)
}
diff --git a/karavan-space/src/designer/route/DslConnections.tsx
b/karavan-space/src/designer/route/DslConnections.tsx
index c7651aac..0cfb4d78 100644
--- a/karavan-space/src/designer/route/DslConnections.tsx
+++ b/karavan-space/src/designer/route/DslConnections.tsx
@@ -141,8 +141,7 @@ export function DslConnections() {
let outs: [string, number][] = Array.from(steps.values())
.filter(pos => outgoingDefinitions.includes(pos.step.dslName))
.filter(pos => pos.step.dslName !== 'KameletDefinition' ||
(pos.step.dslName === 'KameletDefinition' &&
!CamelUi.isActionKamelet(pos.step)))
- .filter(pos => pos.step.dslName === 'ToDefinition' &&
!CamelUi.isActionKamelet(pos.step) &&
!TopologyUtils.isElementInternalComponent(pos.step))
- .filter(pos => !(outgoingDefinitions.includes(pos.step.dslName) &&
TopologyUtils.hasInternalUri(pos.step)))
+ .filter(pos => pos.step.dslName === 'ToDefinition' &&
!CamelUi.isActionKamelet(pos.step))
.filter(pos => pos.step.dslName !== 'SagaDefinition')
.filter(pos => !CamelUi.isKameletSink(pos.step))
.sort((pos1: DslPosition, pos2: DslPosition) => {
@@ -189,6 +188,10 @@ export function DslConnections() {
function getOutgoingIcons(data: [string, number]) {
const pos = steps.get(data[0]);
if (pos) {
+ const step = (pos.step as any);
+ const uri = step?.uri;
+ const directOrSeda = step && uri && step?.dslName ===
'ToDefinition' && ['direct','seda'].includes(uri);
+ const label = directOrSeda ? (step?.parameters?.name) : '';
const r = pos.headerRect.height / 2;
const outgoingX = width - 20;
const outgoingY = data[1] + 15;
@@ -198,6 +201,7 @@ export function DslConnections() {
<div key={pos.step.uuid + "-icon"}
style={{display: "block", position: "absolute", top:
imageY, left: imageX}}>
{CamelUi.getConnectionIcon(pos.step)}
+ {directOrSeda && <div style={{position: 'absolute', right:
27, top: -10, whiteSpace: 'nowrap'}}>{label}</div>}
</div>
)
}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
index c7651aac..0cfb4d78 100644
---
a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
@@ -141,8 +141,7 @@ export function DslConnections() {
let outs: [string, number][] = Array.from(steps.values())
.filter(pos => outgoingDefinitions.includes(pos.step.dslName))
.filter(pos => pos.step.dslName !== 'KameletDefinition' ||
(pos.step.dslName === 'KameletDefinition' &&
!CamelUi.isActionKamelet(pos.step)))
- .filter(pos => pos.step.dslName === 'ToDefinition' &&
!CamelUi.isActionKamelet(pos.step) &&
!TopologyUtils.isElementInternalComponent(pos.step))
- .filter(pos => !(outgoingDefinitions.includes(pos.step.dslName) &&
TopologyUtils.hasInternalUri(pos.step)))
+ .filter(pos => pos.step.dslName === 'ToDefinition' &&
!CamelUi.isActionKamelet(pos.step))
.filter(pos => pos.step.dslName !== 'SagaDefinition')
.filter(pos => !CamelUi.isKameletSink(pos.step))
.sort((pos1: DslPosition, pos2: DslPosition) => {
@@ -189,6 +188,10 @@ export function DslConnections() {
function getOutgoingIcons(data: [string, number]) {
const pos = steps.get(data[0]);
if (pos) {
+ const step = (pos.step as any);
+ const uri = step?.uri;
+ const directOrSeda = step && uri && step?.dslName ===
'ToDefinition' && ['direct','seda'].includes(uri);
+ const label = directOrSeda ? (step?.parameters?.name) : '';
const r = pos.headerRect.height / 2;
const outgoingX = width - 20;
const outgoingY = data[1] + 15;
@@ -198,6 +201,7 @@ export function DslConnections() {
<div key={pos.step.uuid + "-icon"}
style={{display: "block", position: "absolute", top:
imageY, left: imageX}}>
{CamelUi.getConnectionIcon(pos.step)}
+ {directOrSeda && <div style={{position: 'absolute', right:
27, top: -10, whiteSpace: 'nowrap'}}>{label}</div>}
</div>
)
}
