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/10/31 14:58:02 UTC
(camel-karavan) branch main updated (8e2a9190 -> d70ab5df)
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 8e2a9190 mvolf-963 - Use findContainer helper method to get the correct container list in DockerService.pauseContainer and DockerService.stopContainer (#964)
new fcc6aa3d Missing properties for camel-main
new 5996049e Fix issue with Exception properties
new d70ab5df Fix #961
The 3 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-designer/public/example/demo.camel.yaml | 81 ++--------------------
karavan-designer/src/App.tsx | 4 +-
karavan-designer/src/designer/KaravanDesigner.tsx | 1 -
.../designer/route/property/DslPropertyField.tsx | 17 +++--
karavan-generator/pom.xml | 2 +-
karavan-vscode/package.json | 7 +-
6 files changed, 23 insertions(+), 89 deletions(-)
(camel-karavan) 02/03: Fix issue with Exception properties
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 5996049e5b9b5a6d61ea1a1e7cf05d614879bf81
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Tue Oct 31 10:32:54 2023 -0400
Fix issue with Exception properties
---
karavan-designer/public/example/demo.camel.yaml | 81 ++--------------------
karavan-designer/src/App.tsx | 4 +-
karavan-designer/src/designer/KaravanDesigner.tsx | 1 -
.../designer/route/property/DslPropertyField.tsx | 17 +++--
4 files changed, 17 insertions(+), 86 deletions(-)
diff --git a/karavan-designer/public/example/demo.camel.yaml b/karavan-designer/public/example/demo.camel.yaml
index 82e33ec2..b7f803a7 100644
--- a/karavan-designer/public/example/demo.camel.yaml
+++ b/karavan-designer/public/example/demo.camel.yaml
@@ -1,77 +1,4 @@
-- route:
- id: route-612d
- from:
- uri: kamelet:aws-s3-cdc-source
- id: from-e37e
-- route:
- id: route-605c
- from:
- uri: activemq
- id: from-3131
- parameters:
- destinationName: test
- steps:
- - marshal:
- id: marshal-1452
- - log:
- message: ${body}
- id: log-c8e7
-- route:
- id: route-e4bb
- from:
- uri: kamelet:timer-source
- id: from-dd68
- parameters:
- message: '1111'
- steps:
- - to:
- uri: activemq
- id: to-4fca
- parameters:
- destinationName: test
-- route:
- id: route-0a30
- from:
- uri: amqp
- id: from-ca7d
- parameters:
- destinationName: hello
- steps:
- - log:
- message: ${body}
- id: log-d0f4
- - to:
- uri: kamelet:kafka-not-secured-sink
- id: to-c86f
- parameters:
- topic: topic1
- bootstrapServers: localhost:9092
-- route:
- id: route-e39c
- from:
- uri: kamelet:kafka-not-secured-source
- id: from-d419
- parameters:
- bootstrapServers: localhost:9092
- topic: topic1
- steps:
- - to:
- uri: direct
- id: to-7401
- parameters:
- name: hello
-- route:
- id: route-be79
- from:
- uri: kamelet:kafka-not-secured-source
- id: from-27e8
- parameters:
- bootstrapServers: localhost:9092
- topic: topic2
-- route:
- id: hello
- from:
- uri: direct
- id: from-db43
- parameters:
- name: hello
+- routeConfiguration:
+ onException:
+ - onException:
+ id: onException-78ab
diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx
index af23ed39..649fd775 100644
--- a/karavan-designer/src/App.tsx
+++ b/karavan-designer/src/App.tsx
@@ -81,8 +81,8 @@ class App extends React.Component<Props, State> {
fetch("components/components.json"),
fetch("snippets/org.apache.camel.AggregationStrategy"),
fetch("snippets/org.apache.camel.Processor"),
- // fetch("example/demo.camel.yaml")
- fetch("example/aws-cloudwatch-sink.kamelet.yaml")
+ fetch("example/demo.camel.yaml")
+ // fetch("example/aws-cloudwatch-sink.kamelet.yaml")
// fetch("example/aws-s3-cdc-source.kamelet.yaml")
// fetch("components/supported-components.json"),
]).then(responses =>
diff --git a/karavan-designer/src/designer/KaravanDesigner.tsx b/karavan-designer/src/designer/KaravanDesigner.tsx
index b1af73c5..eb967d0e 100644
--- a/karavan-designer/src/designer/KaravanDesigner.tsx
+++ b/karavan-designer/src/designer/KaravanDesigner.tsx
@@ -96,7 +96,6 @@ export function KaravanDesigner(props: Props) {
EventBus.sendAlert("Error parsing YAML", (e as Error).message, 'danger')
return Integration.createNew(filename, 'plain');
}
-
}
function save(integration: Integration, propertyOnly: boolean): void {
diff --git a/karavan-designer/src/designer/route/property/DslPropertyField.tsx b/karavan-designer/src/designer/route/property/DslPropertyField.tsx
index 9ab39ce7..f42235dc 100644
--- a/karavan-designer/src/designer/route/property/DslPropertyField.tsx
+++ b/karavan-designer/src/designer/route/property/DslPropertyField.tsx
@@ -120,8 +120,9 @@ export function DslPropertyField(props: Props) {
function arrayChanged(fieldId: string, value: string) {
setArrayValues(prevState => {
- prevState.set(fieldId, value);
- return prevState;
+ const map: Map<string,string> = new Map<string, string>(prevState);
+ map.set(fieldId, value);
+ return map;
})
}
@@ -598,13 +599,16 @@ export function DslPropertyField(props: Props) {
}
function getMultiValueField(property: PropertyMeta, value: any) {
+ console.log(property)
return (
<div>
<TextInputGroup className="input-group">
<TextInputGroupMain value={arrayValues.get(property.name)}
- onChange={(e, v) => arrayChanged(property.name, v)} onKeyUp={e => {
- if (e.key === 'Enter') arraySave(property.name)
- }}>
+ onChange={(e, v) => arrayChanged(property.name, v)}
+ onKeyUp={e => {
+ if (e.key === 'Enter') arraySave(property.name)
+ }}
+ >
<ChipGroup>
{value && Array.from(value).map((v: any, index: number) => (
<Chip key={"chip-" + index} className="chip"
@@ -654,6 +658,7 @@ export function DslPropertyField(props: Props) {
</div>
)
}
+
function getExpandableComponentParameters(properties: ComponentProperty[], label: string) {
const element = props.element;
@@ -665,7 +670,7 @@ export function DslPropertyField(props: Props) {
if (isExpanded && !isShowAdvanced.includes(label)) {
prevState = [...prevState, label]
} else {
- prevState = prevState.filter(s => s!== label);
+ prevState = prevState.filter(s => s !== label);
}
return prevState;
})
(camel-karavan) 01/03: Missing properties for camel-main
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 fcc6aa3dad8c5079e21e95d10f19eff8b6b59fba
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Oct 27 19:48:33 2023 -0400
Missing properties for camel-main
---
karavan-vscode/package.json | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index e99004d0..de078823 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -284,13 +284,16 @@
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
"camel.jbang.version=4.1.0",
- "camel.jbang.runtime=$RUNTIME",
+ "camel.jbang.runtime=camel-main",
+ "camel.jbang.dependencies=camel-console,camel-platform-http-main",
"camel.jbang.exportDir=.export",
"camel.health.enabled=true",
"camel.health.exposure-level=full",
"camel.server.enabled=true",
"camel.server.healthCheckEnabled=true",
- "camel.server.devConsoleEnabled=true"
+ "camel.server.devConsoleEnabled=true",
+ "camel.main.tracingStandby=true",
+ "camel.context.dev-console=true"
],
"description": "Camel-main application.properties template",
"scope": "machine",
(camel-karavan) 03/03: Fix #961
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 d70ab5df09fc67b2abfc178f719510b35213718b
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Tue Oct 31 10:57:49 2023 -0400
Fix #961
---
karavan-generator/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index c3a78dad..445a7b10 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -29,7 +29,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<version.camel-core>4.1.0</version.camel-core>
- <version.camel-kamelet>4.0.1</version.camel-kamelet>
+ <version.camel-kamelet>4.1.0</version.camel-kamelet>
<camel.k.extension.version>6.7.2</camel.k.extension.version>
<version.vertx>4.4.3</version.vertx>
</properties>