You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/11/29 04:43:45 UTC
(camel-karavan) branch main updated (143a9208 -> a51f59cb)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 143a9208 Fix #908
new 0f300da1 Set default expression as Simple
new a51f59cb UI prototype for #956
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
karavan-core/src/core/api/CamelDefinitionApi.ts | 1 +
karavan-designer/src/App.tsx | 4 +--
.../src/designer/editor/CodeEditor.tsx | 9 +++--
karavan-designer/src/designer/route/DslElement.css | 17 +++++++++-
karavan-designer/src/designer/route/DslElement.tsx | 39 +++++++++++++++++++---
.../generator/CamelDefinitionApiGenerator.java | 7 ++--
6 files changed, 64 insertions(+), 13 deletions(-)
(camel-karavan) 02/02: UI prototype for #956
Posted by ma...@apache.org.
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 a51f59cb12b205bc3a4c0306cee5b949493bbf54
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Tue Nov 28 23:43:37 2023 -0500
UI prototype for #956
---
karavan-designer/src/App.tsx | 4 +--
.../src/designer/editor/CodeEditor.tsx | 9 +++--
karavan-designer/src/designer/route/DslElement.css | 17 +++++++++-
karavan-designer/src/designer/route/DslElement.tsx | 39 +++++++++++++++++++---
4 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx
index 649fd775..d4a2b788 100644
--- a/karavan-designer/src/App.tsx
+++ b/karavan-designer/src/App.tsx
@@ -102,8 +102,8 @@ class App extends React.Component<Props, State> {
TemplateApi.saveTemplate("org.apache.camel.Processor", data[3]);
if (data[4]) {
- // this.setState({yaml: data[4], name: "demo.camel.yaml"})
- this.setState({yaml: data[4], name: "aws-s3-cdc-source.kamelet.yaml"})
+ this.setState({yaml: data[4], name: "demo.camel.yaml"})
+ // this.setState({yaml: data[4], name: "aws-s3-cdc-source.kamelet.yaml"})
}
if (data[5]) {
diff --git a/karavan-designer/src/designer/editor/CodeEditor.tsx b/karavan-designer/src/designer/editor/CodeEditor.tsx
index cd6a4f36..d421ecaa 100644
--- a/karavan-designer/src/designer/editor/CodeEditor.tsx
+++ b/karavan-designer/src/designer/editor/CodeEditor.tsx
@@ -29,8 +29,13 @@ export function CodeEditor () {
const [code, setCode] = useState<string>('');
useEffect(() => {
- const c = CamelDefinitionYaml.integrationToYaml(integration);
- setCode(c);
+ try {
+ const c = CamelDefinitionYaml.integrationToYaml(integration);
+ setCode(c);
+ } catch (e: any) {
+ const message: string = e?.message ? e.message : e.reason;
+ setNotification(true, ['Error in YAML, Integration can not be saved!', message]);
+ }
return () => {
setNotification(false, ['', '']);
}
diff --git a/karavan-designer/src/designer/route/DslElement.css b/karavan-designer/src/designer/route/DslElement.css
index 71621b45..d3ed7177 100644
--- a/karavan-designer/src/designer/route/DslElement.css
+++ b/karavan-designer/src/designer/route/DslElement.css
@@ -1,3 +1,18 @@
.disabled {
opacity: 0.5;
-}
\ No newline at end of file
+}
+.menu-button {
+ position: absolute;
+ top: 26px;
+ line-height: 1;
+ border: 0;
+ padding: 0;
+ margin: 0 0 0 10px;
+ background: transparent;
+ color: var(--pf-v5-global--primary-color--100);
+ visibility: hidden;
+}
+
+.dsl-element:hover .menu-button {
+ visibility: visible;
+}
diff --git a/karavan-designer/src/designer/route/DslElement.tsx b/karavan-designer/src/designer/route/DslElement.tsx
index efeaeff8..e3dfdbfc 100644
--- a/karavan-designer/src/designer/route/DslElement.tsx
+++ b/karavan-designer/src/designer/route/DslElement.tsx
@@ -15,13 +15,13 @@
* limitations under the License.
*/
import React, {CSSProperties, useMemo, useState} from 'react';
-import {
- Text, Tooltip,
-} from '@patternfly/react-core';
+import {Menu, MenuContent, MenuItem, MenuList, Popover, Text, Tooltip,} from '@patternfly/react-core';
import '../karavan.css';
import './DslElement.css';
import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-circle-icon";
import DeleteIcon from "@patternfly/react-icons/dist/js/icons/times-circle-icon";
+import SyncIcon from "@patternfly/react-icons/dist/js/icons/sync-icon";
+import TurnIcon from "@patternfly/react-icons/dist/js/icons/chevron-circle-right-icon";
import InsertIcon from "@patternfly/react-icons/dist/js/icons/arrow-alt-circle-right-icon";
import {CamelElement} from "karavan-core/lib/model/IntegrationDefinition";
import {CamelUi} from "../utils/CamelUi";
@@ -222,7 +222,7 @@ export function DslElement(props: Props) {
const headerClass = ['RouteConfigurationDefinition', 'RouteDefinition'].includes(step.dslName) ? "header-route" : "header"
const headerClasses = isElementSelected() ? headerClass + " selected" : headerClass;
return (
- <div className={headerClasses} style={getHeaderStyle()} ref={headerRef}>
+ <div className={"dsl-element " + headerClasses} style={getHeaderStyle()} ref={headerRef}>
{!['RouteConfigurationDefinition', 'RouteDefinition'].includes(props.step.dslName) &&
<div
ref={el => sendPosition(el)}
@@ -237,6 +237,7 @@ export function DslElement(props: Props) {
</div>
{showInsertButton && getInsertElementButton()}
{getDeleteButton()}
+ {/*{getMenuButton()}*/}
{showAddButton && getAddElementButton()}
</div>
)
@@ -408,11 +409,39 @@ export function DslElement(props: Props) {
return (
<Tooltip position={"right"} content={<div>{"Delete element"}</div>}>
<button type="button" aria-label="Delete" onClick={e => onDeleteElement(e)} className="delete-button">
- <DeleteIcon/></button>
+ <DeleteIcon/>
+ </button>
</Tooltip>
)
}
+ function getMenuButton() {
+ return (
+ <Popover
+ aria-label="Convert Popover"
+ hasNoPadding
+ position={"right"}
+ hideOnOutsideClick={true}
+ showClose={false}
+ bodyContent={
+ <Menu activeItemId={''} onSelect={event => {}} isPlain>
+ <MenuContent>
+ <MenuList>
+ <MenuItem itemId={0} icon={<SyncIcon aria-hidden />}>Convert to SetHeader</MenuItem>
+ {/*<MenuItem itemId={1}>Action</MenuItem>*/}
+ {/*<MenuItem itemId={2}>Action</MenuItem>*/}
+ </MenuList>
+ </MenuContent>
+ </Menu>
+ }
+ >
+ <button type="button" aria-label="Menu" onClick={e => {}} className="menu-button">
+ <TurnIcon/>
+ </button>
+ </Popover>
+ )
+ }
+
const element: CamelElement = props.step;
const className = "step-element"
+ (isElementSelected() ? " step-element-selected" : "") + (!props.step.showChildren ? " hidden-step" : "")
(camel-karavan) 01/02: Set default expression as Simple
Posted by ma...@apache.org.
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 0f300da1db239875adeb5f91cb71ccac7223c464
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Tue Nov 28 23:43:02 2023 -0500
Set default expression as Simple
---
karavan-core/src/core/api/CamelDefinitionApi.ts | 1 +
.../camel/karavan/generator/CamelDefinitionApiGenerator.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts b/karavan-core/src/core/api/CamelDefinitionApi.ts
index aea9a15c..ea782fb0 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -2374,6 +2374,7 @@ export class CamelDefinitionApi {
static createExpressionDefinition = (element: any): ExpressionDefinition => {
const def = element ? new ExpressionDefinition({...element}) : new ExpressionDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
+ element = element !== undefined ? element : {simple: CamelDefinitionApi.createSimpleExpression({expression: ""})}
if (element?.constant !== undefined) {
def.constant = CamelDefinitionApi.createConstantExpression(element.constant);
}
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
index 5e4ad388..eba2bb46 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
@@ -137,6 +137,9 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
List<String> attrs = new ArrayList<>();
AtomicBoolean hasId = new AtomicBoolean(false);
+ if (className.equals("ExpressionDefinition")) {
+ attrs.add(" element = element !== undefined ? element : {simple: CamelDefinitionApi.createSimpleExpression({expression: \"\"})}");
+ }
properties.keySet().stream().sorted(getComparator(stepName)).forEach(name -> {
JsonObject aValue = properties.get(name);
if ("id".equals(name)) {
@@ -164,13 +167,11 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
" }";
String code = String.format(template, name, getAttributeClass(aValue));
attrs.add(code);
- } else {
-
}
});
String stringToRequired = getStringToRequired(obj, className);
String s2 = stringToRequired.isEmpty() ? "" : "\n" + stringToRequired;
- String s3 = attrs.size() > 0 ? "\n" + attrs.stream().collect(Collectors.joining("\n")) : "";
+ String s3 = !attrs.isEmpty() ? "\n" + String.join("\n", attrs) : "";
return String.format(readFileText(modelTemplate), className, s2, s3);
}