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 5907ec1e Add properties for #893
5907ec1e is described below
commit 5907ec1ed45c74818332f5f6267bf69542e7a310
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Mon Sep 18 16:21:12 2023 -0400
Add properties for #893
---
karavan-core/src/core/api/TopologyUtils.ts | 4 +-
karavan-core/src/core/model/TopologyDefinition.ts | 10 +++--
.../src/main/webui/src/project/file/FileEditor.tsx | 2 -
.../main/webui/src/project/topology/CustomNode.tsx | 19 +---------
.../webui/src/project/topology/TopologyApi.tsx | 15 ++++++--
.../project/topology/TopologyPropertiesPanel.tsx | 43 ++++++++++++++++++++--
.../webui/src/project/topology/TopologyStore.ts | 11 +++++-
.../webui/src/project/topology/TopologyTab.tsx | 27 ++++++++++++--
.../main/webui/src/project/topology/topology.css | 28 ++++++++++++++
9 files changed, 124 insertions(+), 35 deletions(-)
diff --git a/karavan-core/src/core/api/TopologyUtils.ts
b/karavan-core/src/core/api/TopologyUtils.ts
index 0a14cd73..4f99f295 100644
--- a/karavan-core/src/core/api/TopologyUtils.ts
+++ b/karavan-core/src/core/api/TopologyUtils.ts
@@ -128,7 +128,7 @@ export class TopologyUtils {
if (d.to) uris.push(d.to);
});
const title = 'REST: ' + (rest.description ? rest.description
: rest.id);
- result.push(new TopologyRestNode(rest.path || '', '' +
rest.id, uris, title, filename))
+ result.push(new TopologyRestNode(rest.path || '', '' +
rest.id, uris, title, filename, rest))
})
})
return result;
@@ -158,7 +158,7 @@ export class TopologyUtils {
const routeElements = routes?.map(r => {
const id = 'route-' + r.id;
const title = '' + (r.description ? r.description : r.id)
- return new TopologyRouteNode(id, r.id, title, filename,
r.from);
+ return new TopologyRouteNode(id, r.id, title, filename,
r.from, r);
}) || [];
result.push(...routeElements)
})
diff --git a/karavan-core/src/core/model/TopologyDefinition.ts
b/karavan-core/src/core/model/TopologyDefinition.ts
index 2b18ac38..9b3cfe40 100644
--- a/karavan-core/src/core/model/TopologyDefinition.ts
+++ b/karavan-core/src/core/model/TopologyDefinition.ts
@@ -16,7 +16,7 @@
*/
import { CamelElement } from './IntegrationDefinition';
-import { FromDefinition } from './CamelDefinition';
+import { FromDefinition, RestDefinition, RouteDefinition } from
'./CamelDefinition';
export class TopologyRestNode {
path: string;
@@ -24,13 +24,15 @@ export class TopologyRestNode {
uris: string[];
title: string;
fileName: string;
+ rest: RestDefinition;
- constructor(path: string, id: string, uris: string[], title: string,
fileName: string) {
+ constructor(path: string, id: string, uris: string[], title: string,
fileName: string, rest: RestDefinition) {
this.path = path;
this.id = id;
this.uris = uris;
this.title = title;
this.fileName = fileName;
+ this.rest = rest;
}
}
@@ -58,13 +60,15 @@ export class TopologyRouteNode {
title: string;
fileName: string;
from: FromDefinition;
+ route: RouteDefinition
- constructor(id: string, routeId: string, title: string, fileName: string,
from: FromDefinition) {
+ constructor(id: string, routeId: string, title: string, fileName: string,
from: FromDefinition, route: RouteDefinition) {
this.id = id;
this.routeId = routeId;
this.title = title;
this.fileName = fileName;
this.from = from;
+ this.route = route;
}
}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/file/FileEditor.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/file/FileEditor.tsx
index 8f3e0789..e323ca83 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/file/FileEditor.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/file/FileEditor.tsx
@@ -87,8 +87,6 @@ export function FileEditor (props: Props) {
const isYaml = file !== undefined && file.name.endsWith("yaml");
const isIntegration = isYaml && file?.code &&
CamelDefinitionYaml.yamlIsIntegration(file.code);
const isProperties = file !== undefined &&
file.name.endsWith("properties");
- const isScript = file !== undefined && file.name.endsWith("sh");
- const isCode = file !== undefined && (file.name.endsWith("java") ||
file.name.endsWith("groovy") || file.name.endsWith("json"));
const showDesigner = isYaml && isIntegration;
const showEditor = !showDesigner;
return (
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/topology/CustomNode.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/topology/CustomNode.tsx
index ed987471..f0c249a7 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/topology/CustomNode.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/topology/CustomNode.tsx
@@ -1,12 +1,10 @@
import * as React from 'react';
-import { RegionsIcon } from '@patternfly/react-icons';
+import {RegionsIcon} from '@patternfly/react-icons';
-import { DefaultNode, observer} from '@patternfly/react-topology';
+import {DefaultNode, observer} from '@patternfly/react-topology';
import {getDesignerIcon} from "../../designer/utils/KaravanIcons";
import {CamelUi} from "../../designer/utils/CamelUi";
import './topology.css';
-import {useFilesStore, useFileStore, useProjectStore} from
"../../api/ProjectStore";
-import {shallow} from "zustand/shallow";
function getIcon(data: any) {
if (['route', 'rest'].includes(data.icon)) {
@@ -27,25 +25,12 @@ function getIcon(data: any) {
const CustomNode: React.FC<any> = observer(({ element, ...rest }) => {
- const [files] = useFilesStore((s) => [s.files], shallow);
- const [setFile] = useFileStore((s) => [s.setFile], shallow);
-
const data = element.getData();
- function openFile(data: any) {
- if (data.fileName) {
- const file = files.filter(f => f.name === data.fileName)?.at(0);
- if (file) {
- setFile('select', file);
- }
- }
- }
-
return (
<DefaultNode
className="common-node"
element={element} {...rest}
- onSelect={e => openFile(data)}
>
{getIcon(data)}
</DefaultNode>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyApi.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyApi.tsx
index 99461f5f..ab544e82 100644
---
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyApi.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyApi.tsx
@@ -50,7 +50,9 @@ export function getIncomingNodes(tins:
TopologyIncomingNode[]): NodeModel[] {
isAlternate: false,
badge: tin.type,
icon: 'element',
+ type: 'step',
step: tin.from,
+ fileName: tin.fileName
}
}
});
@@ -68,7 +70,9 @@ export function getRoutes(tins: TopologyRouteNode[]):
NodeModel[] {
status: NodeStatus.default,
data: {
isAlternate: false,
+ type: 'route',
icon: 'route',
+ step: tin.route,
routeId: tin.routeId,
fileName: tin.fileName,
}
@@ -90,8 +94,10 @@ export function getOutgoingNodes(tons:
TopologyOutgoingNode[]): NodeModel[] {
data: {
isAlternate: false,
icon: 'element',
+ type: 'step',
step: tin.step,
- badge: tin.type
+ badge: tin.type,
+ fileName: tin.fileName
}
}
return node;
@@ -126,7 +132,7 @@ export function getOutgoingEdges(tons:
TopologyOutgoingNode[]): EdgeModel[] {
});
}
-export function getRest(tins: TopologyRestNode[]): NodeModel[] {
+export function getRestNodes(tins: TopologyRestNode[]): NodeModel[] {
return tins.map(tin => {
return {
id: tin.id,
@@ -139,6 +145,9 @@ export function getRest(tins: TopologyRestNode[]):
NodeModel[] {
data: {
isAlternate: false,
icon: 'rest',
+ type: 'rest',
+ step: tin.rest,
+ fileName: tin.fileName
}
}
});
@@ -208,7 +217,7 @@ export function getModel(files: ProjectFile[]): Model {
}
})
- nodes.push(...getRest(trestns))
+ nodes.push(...getRestNodes(trestns))
nodes.push(...getIncomingNodes(tins))
nodes.push(...getRoutes(troutes))
nodes.push(...getOutgoingNodes(tons))
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyPropertiesPanel.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyPropertiesPanel.tsx
index 34aa7285..48aabcd7 100644
---
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyPropertiesPanel.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyPropertiesPanel.tsx
@@ -19,16 +19,53 @@ import '../../designer/karavan.css';
import {shallow} from "zustand/shallow";
import {TopologySideBar} from "@patternfly/react-topology";
import {useTopologyStore} from "./TopologyStore";
+import {DslProperties} from "../../designer/route/DslProperties";
+import {Button, Flex, FlexItem, Text, Tooltip, TooltipPosition} from
"@patternfly/react-core";
+import CloseIcon from "@patternfly/react-icons/dist/esm/icons/times-icon";
+import {useFilesStore, useFileStore} from "../../api/ProjectStore";
export function TopologyPropertiesPanel () {
- const [selectedIds, setSelectedIds] = useTopologyStore((s) =>
[s.selectedIds, s.setSelectedIds], shallow);
+
+ const [setFile] = useFileStore((s) => [s.setFile], shallow);
+ const [files] = useFilesStore((s) => [s.files], shallow);
+ const [selectedIds, setSelectedIds, fileName] = useTopologyStore((s) =>
+ [s.selectedIds, s.setSelectedIds, s.fileName], shallow);
+
+
+ function getHeader() {
+ return (
+ <Flex className="properties-header" direction={{default: "row"}}
justifyContent={{default: "justifyContentFlexStart"}}>
+ <FlexItem spacer={{ default: 'spacerNone' }}>
+ <Text>Filename:</Text>
+ </FlexItem>
+ <FlexItem>
+ <Button variant="link" onClick={event => {
+ if (fileName) {
+ const file = files.filter(f => f.name ===
fileName)?.at(0);
+ if (file) {
+ setFile('select', file);
+ }
+ }
+ }}
+ >{fileName}
+ </Button>
+ </FlexItem>
+ <FlexItem align={{ default: 'alignRight' }}>
+ <Tooltip content={"Close"} position={TooltipPosition.top}>
+ <Button variant="link" icon={<CloseIcon/>}
onClick={event => setSelectedIds([])}/>
+ </Tooltip>
+ </FlexItem>
+ </Flex>
+ )
+ }
+
return (
<TopologySideBar
className="topology-sidebar"
show={selectedIds.length > 0}
- onClose={() => setSelectedIds([])}
+ header={getHeader()}
>
- <div style={{ marginTop: 27, marginLeft: 20, height: '800px'
}}>{selectedIds[0]}</div>
+ <DslProperties isRouteDesigner={false}/>
</TopologySideBar>
)
}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyStore.ts
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyStore.ts
index dce4b08c..750d1e16 100644
---
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyStore.ts
+++
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyStore.ts
@@ -19,8 +19,10 @@ import {createWithEqualityFn} from "zustand/traditional";
import {shallow} from "zustand/shallow";
interface TopologyState {
- selectedIds: string [],
- setSelectedIds: (images: string []) => void;
+ selectedIds: string []
+ fileName?: string
+ setSelectedIds: (selectedIds: string []) => void
+ setFileName: (fileName?: string) => void
}
export const useTopologyStore = createWithEqualityFn<TopologyState>((set) => ({
@@ -31,5 +33,10 @@ export const useTopologyStore =
createWithEqualityFn<TopologyState>((set) => ({
state.selectedIds.push(...selectedIds);
return {selectedIds: state.selectedIds};
});
+ },
+ setFileName: (fileName?: string) => {
+ set((state: TopologyState) => {
+ return {fileName: fileName};
+ });
}
}), shallow)
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyTab.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyTab.tsx
index 49b47f21..cfd79092 100644
---
a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyTab.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyTab.tsx
@@ -13,18 +13,38 @@ import {
VisualizationProvider,
VisualizationSurface,
DagreLayout,
- SELECTION_EVENT,
+ SELECTION_EVENT, Model,
} from '@patternfly/react-topology';
import {customComponentFactory, getModel} from "./TopologyApi";
import {useFilesStore} from "../../api/ProjectStore";
import {shallow} from "zustand/shallow";
import {useTopologyStore} from "./TopologyStore";
import {TopologyPropertiesPanel} from "./TopologyPropertiesPanel";
+import {useDesignerStore} from "../../designer/KaravanStore";
export const TopologyTab: React.FC = () => {
const [files] = useFilesStore((s) => [s.files], shallow);
- const [selectedIds, setSelectedIds] = useTopologyStore((s) =>
[s.selectedIds, s.setSelectedIds], shallow);
+ const [selectedIds, setSelectedIds, setFileName] = useTopologyStore((s) =>
+ [s.selectedIds, s.setSelectedIds, s.setFileName], shallow);
+ const [setSelectedStep] = useDesignerStore((s) => [s.setSelectedStep],
shallow)
+
+ function setTopologySelected(model: Model, ids: string []) {
+ setSelectedIds(ids);
+ if (ids.length > 0) {
+ const node = model.nodes?.filter(node => node.id === ids[0]);
+ if (node && node.length > 0) {
+ const data = node[0].data;
+ setFileName(data.fileName)
+ if (data.step) {
+ setSelectedStep(data.step)
+ } else {
+ setSelectedStep(undefined);
+ setFileName(undefined)
+ }
+ }
+ }
+ }
const controller = React.useMemo(() => {
const model = getModel(files);
@@ -32,7 +52,7 @@ export const TopologyTab: React.FC = () => {
newController.registerLayoutFactory((_, graph) => new
DagreLayout(graph));
newController.registerComponentFactory(customComponentFactory);
- // newController.addEventListener(SELECTION_EVENT, setSelectedIds);
+ newController.addEventListener(SELECTION_EVENT, args =>
setTopologySelected(model, args));
// newController.addEventListener(SELECTION_EVENT, args => {
// console.log(args)
// });
@@ -45,6 +65,7 @@ export const TopologyTab: React.FC = () => {
}, []);
React.useEffect(() => {
+ setSelectedIds([])
const model = getModel(files);
controller.fromModel(model, false);
}, []);
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/topology/topology.css
b/karavan-web/karavan-app/src/main/webui/src/project/topology/topology.css
index f39a1941..3e4ec7be 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/topology/topology.css
+++ b/karavan-web/karavan-app/src/main/webui/src/project/topology/topology.css
@@ -1,4 +1,32 @@
+.karavan .pf-v5-c-toolbar {
+ padding-bottom: 0;
+}
+
+.karavan .properties-header {
+ padding: 10px;
+}
+
.karavan .common-node .icon {
height: 32px;
width: 32px;
+}
+
+.karavan .topology-sidebar .pf-topology-side-bar__header {
+ margin-right: 0;
+}
+.karavan .topology-sidebar {
+ overflow: hidden;
+}
+
+.karavan .topology-sidebar .pf-topology-side-bar__dismiss {
+ display: none;
+}
+
+.karavan .pf-topology-side-bar > .pf-topology-side-bar__header + * {
+ margin-top: 0;
+}
+
+.karavan .topology-sidebar .properties .pf-v5-c-form {
+ pointer-events: none;
+ opacity: 0.7;
}
\ No newline at end of file