diff --git a/karavan-core/src/core/api/CamelDefinitionYaml.ts b/karavan-core/src/core/api/CamelDefinitionYaml.ts index 44feabdd64a..aa6f425bd87 100644 --- a/karavan-core/src/core/api/CamelDefinitionYaml.ts +++ b/karavan-core/src/core/api/CamelDefinitionYaml.ts @@ -237,25 +237,24 @@ export class CamelDefinitionYaml { return integration; }; - static yamlIsIntegration = (text: string): boolean => { + static yamlIsIntegration = (text: string): 'crd' | 'plain' | 'kamelet' | 'none' => { try { const fromYaml: any = yaml.load(text); const camelized: any = CamelUtil.camelizeObject(fromYaml); - if ( - camelized?.apiVersion && - camelized.apiVersion.startsWith('camel.apache.org') && - camelized.kind && - camelized.kind === 'Integration' - ) { - return true; + if (camelized?.apiVersion && camelized.apiVersion.startsWith('camel.apache.org') && camelized.kind) { + if (camelized.kind === 'Integration') { + return 'crd'; + } else if (camelized.kind === 'Kamelet') { + return 'kamelet'; + } } else if (Array.isArray(camelized)) { - return true; + return 'plain'; } else { - return false; + return 'none'; } } catch (e) { - return false; } + return 'none'; }; static flowsToCamelElements = (flows: any[]): any[] => { const rules: { [key: string]: (flow: any) => any } = { diff --git a/karavan-core/src/core/model/IntegrationDefinition.ts b/karavan-core/src/core/model/IntegrationDefinition.ts index c6c53d46a30..696e2da17c1 100644 --- a/karavan-core/src/core/model/IntegrationDefinition.ts +++ b/karavan-core/src/core/model/IntegrationDefinition.ts @@ -17,7 +17,7 @@ import { v4 as uuidv4 } from 'uuid'; import { RegistryBeanDefinition } from './CamelDefinition'; -export class KameletDefinitionProperty { +export class DefinitionProperty { title: string = ''; description: string = ''; type: 'string' | 'integer' | 'boolean' = 'string'; @@ -25,27 +25,26 @@ export class KameletDefinitionProperty { example?: any; format?: string; "x-descriptors"?: string[]; - properties: any = {}; - public constructor(init?: Partial) { + public constructor(init?: Partial) { Object.assign(this, init); } } -export class KameletDefinition { +export class Definition { title: string = ''; description: string = ''; required: string[] = []; type: string = 'object'; properties: any = {}; - public constructor(init?: Partial) { + public constructor(init?: Partial) { Object.assign(this, init); } } export class Spec { - definition?: KameletDefinition; + definition?: Definition; types?: any; flows?: any[] = []; template?: any; @@ -56,30 +55,31 @@ export class Spec { } } -export class MetadataLabel { - "camel.apache.org/kamelet.type": "sink" | "source" | "action" +export class MetadataLabels { + "camel.apache.org/kamelet.type": "sink" | "source" | "action" = 'source' - public constructor(init?: Partial) { + public constructor(init?: Partial) { Object.assign(this, init); } } -export class MetadataAnnotation { - "camel.apache.org/catalog.version"?: string; - "camel.apache.org/kamelet.icon"?: string; - "camel.apache.org/provider"?: string; - "camel.apache.org/kamelet.group"?: string; - "camel.apache.org/kamelet.namespace"?: string; +export class MetadataAnnotations { + "camel.apache.org/kamelet.support.level:": string = 'Preview'; + "camel.apache.org/catalog.version": string = ''; + "camel.apache.org/kamelet.icon": string = ''; + "camel.apache.org/provider": string = ''; + "camel.apache.org/kamelet.group": string = ''; + "camel.apache.org/kamelet.namespace": string = ''; - public constructor(init?: Partial) { + public constructor(init?: Partial) { Object.assign(this, init); } } export class Metadata { name: string = ''; - annotations?: MetadataAnnotation; - labels?: MetadataLabel[]; + annotations?: MetadataAnnotations; + labels?: MetadataLabels; public constructor(init?: Partial) { Object.assign(this, init); @@ -98,10 +98,18 @@ export class Integration { } static createNew(name?: string, type: 'crd' | 'plain' | 'kamelet' = 'plain'): Integration { - return new Integration({ type: type, + const i = new Integration({ type: type, metadata: new Metadata({ name: name }), kind : type === 'kamelet' ? 'Kamelet' : 'Integration', spec: new Spec({ flows: [] }) }); + + if (type === 'kamelet') { + i.metadata.annotations = new MetadataAnnotations({}) + i.spec.definition = new Definition({}) + i.spec.types = {} + } + + return i; } } diff --git a/karavan-core/test/isIntegration.spec.ts b/karavan-core/test/isIntegration.spec.ts index a14ed140638..61f3c218e21 100644 --- a/karavan-core/test/isIntegration.spec.ts +++ b/karavan-core/test/isIntegration.spec.ts @@ -27,13 +27,19 @@ describe('Is Integration', () => { it('Is not integration', () => { const yaml = fs.readFileSync('test/is-not-integration.yaml',{encoding:'utf8', flag:'r'}); const i = CamelDefinitionYaml.yamlIsIntegration(yaml); - expect(i).to.equal(false); + expect(i).to.equal('none'); }); - it('Is integration', () => { + it('Is integration CRD', () => { const yaml = fs.readFileSync('test/integration1.yaml',{encoding:'utf8', flag:'r'}); const i = CamelDefinitionYaml.yamlIsIntegration(yaml); - expect(i).to.equal(true); + expect(i).to.equal('crd'); + }); + + it('Is integration plain', () => { + const yaml = fs.readFileSync('test/plain1.yaml',{encoding:'utf8', flag:'r'}); + const i = CamelDefinitionYaml.yamlIsIntegration(yaml); + expect(i).to.equal('plain'); }); }); \ No newline at end of file diff --git a/karavan-core/test/kamelet.spec.ts b/karavan-core/test/kamelet.spec.ts index 691bf48ed1c..65e9498700b 100644 --- a/karavan-core/test/kamelet.spec.ts +++ b/karavan-core/test/kamelet.spec.ts @@ -14,29 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {expect} from 'chai'; import * as fs from 'fs'; import 'mocha'; import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml"; -import { - ChoiceDefinition, - ExpressionDefinition, - FilterDefinition, FromDefinition, LogDefinition, - ToDefinition, - WhenDefinition, -} from '../src/core/model/CamelDefinition'; +import { FromDefinition, LogDefinition, } from '../src/core/model/CamelDefinition'; import { RouteDefinition} from "../src/core/model/CamelDefinition"; -import { Beans, Integration, MetadataAnnotation } from '../src/core/model/IntegrationDefinition'; -import { KameletMetadata } from '../lib/model/KameletModels'; -import { RegistryBeanDefinition } from '../lib/model/CamelDefinition'; +import { Beans, Definition, Integration } from '../src/core/model/IntegrationDefinition'; +import { RegistryBeanDefinition } from '../src/core/model/CamelDefinition'; +import { MetadataAnnotations } from '../src/core/model/IntegrationDefinition'; describe('Kamelet <=> YAML', () => { it('Yaml to Kamelet', () => { const yaml = fs.readFileSync('test/postgresql-source.kamelet.yaml',{encoding:'utf8', flag:'r'}); const i = CamelDefinitionYaml.yamlToIntegration("postgresql-source.kamelet.yaml", yaml); - console.log(i) - console.log(CamelDefinitionYaml.integrationToYaml(i)) + // console.log(i) }); it('Kamelet to YAML with beans', () => { @@ -50,7 +42,7 @@ describe('Kamelet <=> YAML', () => { b.beans.push(new RegistryBeanDefinition({name: "beanDS1", type: "String.class"})); b.beans.push(new RegistryBeanDefinition({name: "beanDS2", type: "String.class"})); i.spec.flows?.push(b); - const a = new MetadataAnnotation({"camel.apache.org/kamelet.group" : "hello world"}) + const a = new MetadataAnnotations({"camel.apache.org/kamelet.group" : "hello world"}) i.metadata.annotations = a }); @@ -60,6 +52,8 @@ describe('Kamelet <=> YAML', () => { const flow1 = new FromDefinition({uri: "direct1"}); flow1.steps?.push(new LogDefinition({logName: 'log11', message: "hello11"})); i.spec.flows?.push(new RouteDefinition({from:flow1})); + + console.log(CamelDefinitionYaml.integrationToYaml(i)) }); diff --git a/karavan-core/test/topology.spec.ts b/karavan-core/test/topology.spec.ts index e76ead2bd43..db689f210e7 100644 --- a/karavan-core/test/topology.spec.ts +++ b/karavan-core/test/topology.spec.ts @@ -30,7 +30,6 @@ describe('Topology functions', () => { const tin = TopologyUtils.findTopologyIncomingNodes([i1, i2]); const trn = TopologyUtils.findTopologyRestNodes([i1, i2]); const ton = TopologyUtils.findTopologyOutgoingNodes([i1, i2]); - console.log(tin) }); }); diff --git a/karavan-designer/public/example/postgresql-source.kamelet.yaml b/karavan-designer/public/example/postgresql-source.kamelet.yaml new file mode 100644 index 00000000000..2fcd541ed32 --- /dev/null +++ b/karavan-designer/public/example/postgresql-source.kamelet.yaml @@ -0,0 +1,114 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- +apiVersion: camel.apache.org/v1 +kind: Kamelet +metadata: + name: postgresql-source + annotations: + camel.apache.org/kamelet.support.level: "Stable" + camel.apache.org/catalog.version: "4.1.0-SNAPSHOT" + camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PostgreSQL icon</title><path d="M17.128 0a10.134 10.134 0 0 0-2.755.403l-.063.02A10.922 10.922 0 0 0 12.6.258C11.422.238 10.41.524 9.594 1 8.79.721 7.122.24 5.364.336 4.14.403 2.804.775 1.814 1.82.827 2.865.305 4.482.415 6.682c.03.607.203 1.597.49 2.879s.69 2.783 1.193 4.152c.503 1.37 1.054 2.6 1.915 3.436.43.419 1.022.771 1.72.742.49-.02.933-.235 1.315-.552.186.245.385.352.566.451.228.125.45.21.68.266.413.103 1.12.241 1.948.1.282-.047.579-.139.875-.27.011.33.024.653.037.98.041 1.036.067 1.993.378 2.832.05.137.187.843.727 1.466.54.624 1.598 1.013 2.803.755.85-.182 1.931-.51 2.649-1.532.71-1.01 1.03-2.459 1.093-4.809.016-.127.035-.235.055-.336l.169.015h.02c.907.041 1.891-.088 2.713-.47.728-.337 1.279-.678 1.68-1.283.1-.15.21-.331.24-.643s-.149-.8-.446-1.025c-.595-.452-.969-.28-1.37-.197a6.27 6.27 0 0 1-1.202.146c1.156-1.947 1.985-4.015 2.458-5.845.28-1.08.437-2.076.45-2.947.013-.871-.058-1.642-.58-2.309C21.36.6 19.067.024 17.293.004c-.055-.001-.11-.002-.165-.001zm-.047.64c1.678-.016 3.822.455 5.361 2.422.346.442.449 1.088.437 1.884-.013.795-.16 1.747-.429 2.79-.522 2.02-1.508 4.375-2.897 6.488a.756.756 0 0 0 .158.086c.29.12.951.223 2.27-.048.332-.07.575-.117.827.075a.52.52 0 0 1 .183.425.704.704 0 0 1-.13.336c-.255.383-.758.746-1.403 1.045-.571.266-1.39.405-2.116.413-.364.004-.7-.024-.985-.113l-.018-.007c-.11 1.06-.363 3.153-.528 4.108-.132.77-.363 1.382-.804 1.84-.44.458-1.063.734-1.901.914-1.038.223-1.795-.017-2.283-.428-.487-.41-.71-.954-.844-1.287-.092-.23-.14-.528-.186-.926-.046-.398-.08-.885-.103-1.434a51.426 51.426 0 0 1-.03-2.523 3.061 3.061 0 0 1-1.552.76c-.689.117-1.304.002-1.671-.09a2.276 2.276 0 0 1-.52-.201c-.17-.091-.332-.194-.44-.397a.56.56 0 0 1-.057-.381.61.61 0 0 1 .218-.331c.198-.161.46-.251.855-.333.719-.148.97-.249 1.123-.37.13-.104.277-.314.537-.622a1.16 1.16 0 0 1-.003-.041 2.96 2.96 0 0 1-1.33-.358c-.15.158-.916.968-1.85 2.092-.393.47-.827.74-1.285.759-.458.02-.872-.211-1.224-.552-.703-.683-1.264-1.858-1.753-3.186-.488-1.328-.885-2.807-1.167-4.067-.283-1.26-.45-2.276-.474-2.766-.105-2.082.382-3.485 1.217-4.37.836-.885 1.982-1.22 3.099-1.284 2.005-.115 3.909.584 4.294.734.742-.504 1.698-.818 2.892-.798a7.39 7.39 0 0 1 1.681.218l.02-.009a6.854 6.854 0 0 1 .739-.214A9.626 9.626 0 0 1 17.08.642zm.152.67h-.146a8.74 8.74 0 0 0-1.704.192c1.246.552 2.187 1.402 2.85 2.25a8.44 8.44 0 0 1 1.132 1.92c.11.264.184.487.226.66.021.087.035.16.04.236.002.038.004.077-.012.144 0 .003-.005.01-.006.013.03.876-.187 1.47-.213 2.306-.02.606.135 1.318.173 2.095.036.73-.052 1.532-.526 2.319.04.048.076.096.114.144 1.254-1.975 2.158-4.16 2.64-6.023.258-1.003.395-1.912.407-2.632.01-.72-.124-1.242-.295-1.46-1.342-1.716-3.158-2.153-4.68-2.165zm-4.79.256c-1.182.003-2.03.36-2.673.895-.663.553-1.108 1.31-1.4 2.085-.347.92-.466 1.81-.513 2.414l.013-.008c.357-.2.826-.4 1.328-.516.502-.115 1.043-.151 1.533.039s.895.637 1.042 1.315c.704 3.257-.219 4.468-.559 5.382a9.61 9.61 0 0 0-.331 1.013c.043-.01.086-.022.129-.026.24-.02.428.06.54.108.342.142.577.44.704.78.033.089.057.185.071.284a.336.336 0 0 1 .02.127 55.14 55.14 0 0 0 .013 3.738c.023.538.057 1.012.1 1.386.043.373.104.657.143.753.128.32.315.739.653 1.024.338.284.823.474 1.709.284.768-.165 1.242-.394 1.559-.723.316-.329.505-.787.626-1.488.181-1.05.545-4.095.589-4.668-.02-.432.044-.764.182-1.017.142-.26.362-.419.552-.505.095-.043.184-.072.257-.093a5.956 5.956 0 0 0-.243-.325 4.456 4.456 0 0 1-.666-1.099 8.296 8.296 0 0 0-.257-.483c-.133-.24-.301-.54-.477-.877-.352-.675-.735-1.493-.934-2.29-.198-.796-.227-1.62.281-2.201.45-.516 1.24-.73 2.426-.61-.035-.105-.056-.192-.115-.332a7.817 7.817 0 0 0-1.041-1.764c-1.005-1.285-2.632-2.559-5.146-2.6h-.115zm-6.642.052c-.127 0-.254.004-.38.011-1.01.058-1.965.351-2.648 1.075-.684.724-1.134 1.911-1.036 3.876.019.372.181 1.414.459 2.652.277 1.238.67 2.695 1.142 3.982.473 1.287 1.046 2.407 1.59 2.937.274.265.512.372.728.363.217-.01.478-.135.797-.518a43.244 43.244 0 0 1 1.81-2.048 3.497 3.497 0 0 1-1.167-3.15c.103-.739.117-1.43.105-1.976-.012-.532-.05-.886-.05-1.107a.336.336 0 0 1 0-.019v-.005l-.001-.006v-.001a9.893 9.893 0 0 1 .592-3.376c.28-.744.697-1.5 1.322-2.112-.614-.202-1.704-.51-2.884-.568a7.603 7.603 0 0 0-.38-.01zM18.199 6.9c-.679.009-1.06.184-1.26.413-.283.325-.31.895-.134 1.597.175.703.537 1.489.877 2.142.17.327.335.621.468.86.134.24.232.41.292.555.055.134.116.252.178.362.263-.555.31-1.1.283-1.668-.035-.703-.198-1.422-.174-2.15.027-.851.195-1.405.21-2.063a5.793 5.793 0 0 0-.74-.048zm-8.234.115a2.82 2.82 0 0 0-.616.074 4.665 4.665 0 0 0-1.153.449 2.417 2.417 0 0 0-.349.228l-.022.02c.006.146.035.5.047 1.021.012.57-.002 1.297-.112 2.084-.239 1.71 1.002 3.126 2.46 3.128.085-.351.225-.707.365-1.082.406-1.094 1.205-1.892.532-5.006-.11-.51-.328-.716-.628-.832a1.474 1.474 0 0 0-.524-.084zm7.917.204h.05c.066.002.127.009.18.022.054.012.1.03.138.055a.164.164 0 0 1 .075.11l-.001.008h.001-.001a.24.24 0 0 1-.035.135.668.668 0 0 1-.11.15.677.677 0 0 1-.386.212.59.59 0 0 1-.41-.103.608.608 0 0 1-.13-.118.26.26 0 0 1-.063-.127.17.17 0 0 1 .042-.128.384.384 0 0 1 .117-.09c.096-.054.226-.094.373-.116.055-.008.109-.012.16-.013zm-7.82.168c.053 0 .109.005.166.013.153.021.289.062.393.122a.446.446 0 0 1 .133.106.223.223 0 0 1 .054.17.302.302 0 0 1-.075.154.649.649 0 0 1-.143.13.64.64 0 0 1-.448.113.728.728 0 0 1-.42-.228.71.71 0 0 1-.118-.164.28.28 0 0 1-.041-.177c.015-.108.104-.164.191-.195a.866.866 0 0 1 .307-.04zm9.06 7.343l-.003.001c-.147.053-.268.075-.37.12a.452.452 0 0 0-.239.214c-.063.115-.117.319-.101.666a.51.51 0 0 0 .148.07c.171.052.458.086.778.081.638-.007 1.423-.156 1.84-.35a3.95 3.95 0 0 0 .943-.615h-.001c-1.393.288-2.18.211-2.663.012a1.315 1.315 0 0 1-.332-.2zm-8.031.094h-.021c-.053.005-.13.023-.279.188-.348.39-.47.635-.757.864-.287.228-.66.35-1.405.503-.236.048-.371.101-.461.144.029.024.026.03.07.053.109.06.249.113.362.142.32.08.846.173 1.395.08.549-.094 1.12-.357 1.607-1.04.084-.118.093-.292.024-.479-.07-.187-.223-.348-.331-.393a.653.653 0 0 0-.204-.06z"/></svg>" + camel.apache.org/provider: "Apache Software Foundation" + camel.apache.org/kamelet.group: "SQL" + camel.apache.org/kamelet.namespace: "Database" + labels: + camel.apache.org/kamelet.type: "source" +spec: + definition: + title: "PostgreSQL Source" + description: |- + Query data from a PostgreSQL Database. + required: + - serverName + - username + - password + - query + - databaseName + type: object + properties: + serverName: + title: Server Name + description: The server name for the data source. + type: string + example: localhost + serverPort: + title: Server Port + description: The server port for the data source. + type: string + default: 5432 + username: + title: Username + description: The username to access a secured PostgreSQL Database. + type: string + x-descriptors: + - urn:camel:group:credentials + password: + title: Password + description: The password to access a secured PostgreSQL Database. + type: string + format: password + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:password + - urn:camel:group:credentials + query: + title: Query + description: The query to execute against the PostgreSQL Database. + type: string + example: 'INSERT INTO accounts (username,city) VALUES (:#username,:#city)' + databaseName: + title: Database Name + description: The name of the PostgreSQL Database. + type: string + consumedQuery: + title: Consumed Query + description: A query to run on a tuple consumed. + type: string + example: 'DELETE FROM accounts where user_id = :#user_id' + delay: + title: Delay + description: The number of milliseconds before the next poll + type: integer + default: 500 + types: + out: + mediaType: application/json + dependencies: + - "camel:jackson" + - "camel:kamelet" + - "camel:sql" + - "mvn:org.postgresql:postgresql:42.6.0" + - "mvn:org.apache.commons:commons-dbcp2:2.10.0" + template: + beans: + - name: dsBean + type: "#class:org.apache.commons.dbcp2.BasicDataSource" + properties: + username: '{{username}}' + password: '{{password}}' + url: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}' + driverClassName: 'org.postgresql.Driver' + from: + uri: "sql:{{query}}" + parameters: + dataSource: "#bean:{{dsBean}}" + onConsume: "{{?consumedQuery}}" + delay: "{{delay}}" + steps: + - marshal: + json: + library: Jackson + - to: "kamelet:sink" \ No newline at end of file diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx index b71267ba954..dcea7fc114d 100644 --- a/karavan-designer/src/App.tsx +++ b/karavan-designer/src/App.tsx @@ -69,7 +69,8 @@ class App extends React.Component { fetch("components/components.json"), fetch("snippets/org.apache.camel.AggregationStrategy"), fetch("snippets/org.apache.camel.Processor"), - fetch("example/demo.camel.yaml") + // fetch("example/demo.camel.yaml") + fetch("example/postgresql-source.kamelet.yaml") // fetch("components/supported-components.json"), ]).then(responses => Promise.all(responses.map(response => response.text())) @@ -88,7 +89,8 @@ class App extends React.Component { 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: "demo.camel.yaml"}) + this.setState({yaml: data[4], name: "postgresql-source.kamelet.yaml"}) } if (data[5]) { diff --git a/karavan-designer/src/designer/KaravanDesigner.tsx b/karavan-designer/src/designer/KaravanDesigner.tsx index cb58a377fbb..316a71be417 100644 --- a/karavan-designer/src/designer/KaravanDesigner.tsx +++ b/karavan-designer/src/designer/KaravanDesigner.tsx @@ -42,6 +42,7 @@ import {RestDesigner} from "./rest/RestDesigner"; import {BeansDesigner} from "./beans/BeansDesigner"; import {CodeEditor} from "./editor/CodeEditor"; import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon'; +import {KameletDesigner} from "./kamelet/KameletDesigner"; interface Props { onSave: (filename: string, yaml: string, propertyOnly: boolean) => void @@ -71,7 +72,9 @@ export function KaravanDesigner(props: Props) { InfrastructureAPI.setOnSave(props.onSave); setSelectedStep(undefined); - setIntegration(makeIntegration(props.yaml, props.filename), false); + const i = makeIntegration(props.yaml, props.filename); + setIntegration(i, false); + setTab(i.kind === 'Kamelet' ? 'kamelet' : 'routes') reset(); setDark(props.dark); setHideLogDSL(props.hideLogDSL === true); @@ -84,8 +87,10 @@ export function KaravanDesigner(props: Props) { function makeIntegration(yaml: string, filename: string): Integration { try { - if (yaml && CamelDefinitionYaml.yamlIsIntegration(yaml)) { - return CamelDefinitionYaml.yamlToIntegration(props.filename, props.yaml) + const type = CamelDefinitionYaml.yamlIsIntegration(yaml); + if (yaml && type !== 'none') { + const i = CamelDefinitionYaml.yamlToIntegration(props.filename, props.yaml) + return i; } else { return Integration.createNew(filename, 'plain'); } @@ -126,6 +131,8 @@ export function KaravanDesigner(props: Props) { ) } + const isKamelet = integration.type === 'kamelet'; + return ( @@ -137,8 +144,9 @@ export function KaravanDesigner(props: Props) { setSelectedStep(undefined); }} style={{width: "100%"}}> + {isKamelet && } - + {!isKamelet && } {props.showCodeTab && } @@ -156,6 +164,7 @@ export function KaravanDesigner(props: Props) { {/* />*/} {/*}*/} + {tab === 'kamelet' && } {tab === 'routes' && } {tab === 'rest' && } {tab === 'beans' && } diff --git a/karavan-designer/src/designer/beans/BeanProperties.tsx b/karavan-designer/src/designer/beans/BeanProperties.tsx index 15b8f086a44..c27ea28c351 100644 --- a/karavan-designer/src/designer/beans/BeanProperties.tsx +++ b/karavan-designer/src/designer/beans/BeanProperties.tsx @@ -194,7 +194,8 @@ export function BeanProperties (props: Props) { const icon = InfrastructureAPI.infrastructure === 'kubernetes' ? : return (
- { propertyChanged(i, beanFieldName, value, showPassword) }}/> @@ -211,8 +212,8 @@ export function BeanProperties (props: Props) { type={isSecret && !showPassword ? "password" : "text"} className="text-field" isRequired - id="value" - name="value" + id={"value-" + i} + name={"value-" + i} value={value} onChange={(_, value) => { propertyChanged(i, key, value, showPassword) diff --git a/karavan-designer/src/designer/kamelet/KameletAnnotationsPanel.tsx b/karavan-designer/src/designer/kamelet/KameletAnnotationsPanel.tsx new file mode 100644 index 00000000000..3c997173fc9 --- /dev/null +++ b/karavan-designer/src/designer/kamelet/KameletAnnotationsPanel.tsx @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import React from 'react'; +import { + capitalize, + Card, + CardBody, + CardTitle, + Form, + FormGroup, Grid, GridItem, + InputGroup, + InputGroupItem, + InputGroupText, + TextInput, ToggleGroup, ToggleGroupItem, +} from '@patternfly/react-core'; +import '../karavan.css'; +import './kamelet.css'; +import {useIntegrationStore} from "../KaravanStore"; +import {shallow} from "zustand/shallow"; + +const PREFIX = 'camel.apache.org/'; + +export function KameletAnnotationsPanel() { + + const [integration, setIntegration] = useIntegrationStore((s) => [s.integration, s.setIntegration], shallow) + + function setValue(key: string, value: string) { + if (key && value && value.length > 0) { + (integration.metadata.annotations as any)[PREFIX + key] = value; + setIntegration(integration, true); + } + } + + function getValue(key: string): string { + const annotations = integration.metadata.annotations; + if (annotations) { + return (annotations as any)[PREFIX + key]; + } else { + return ''; + } + } + + function getElement(key: string, label: string, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { + return ( + + + + + setValue(key, value)} + value={getValue(key)}/> + + + + + ) + } + + function getElementToggleGroup(key: string, label: string, values: string[], span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { + return ( + + + {/* eslint-disable-next-line react/jsx-no-undef */} + + {values.map(value => + setValue(key, value) } + /> + )} + + + + ) + } + + function getElementIcon(key: string, label: string, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { + return ( + + + + + + + + + + setValue(key, value)} + value={getValue(key)}/> + + + + + ) + } + + return ( + + Annotations + +
+ + {getElementToggleGroup('kamelet.support.level', 'Support Level', ['Preview', 'Stable'], 2)} + {getElementIcon('kamelet.icon', 'Icon', 10)} + {getElement('catalog.version', 'Version', 3)} + {getElement('provider', 'Provider', 3)} + {getElement('kamelet.group', 'Group', 3)} + {getElement('kamelet.namespace', 'Namespace', 3)} + +
+ + + ) +} diff --git a/karavan-designer/src/designer/kamelet/KameletDefinitionPropertyCard.tsx b/karavan-designer/src/designer/kamelet/KameletDefinitionPropertyCard.tsx new file mode 100644 index 00000000000..a478c101264 --- /dev/null +++ b/karavan-designer/src/designer/kamelet/KameletDefinitionPropertyCard.tsx @@ -0,0 +1,221 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import React, {useState} from 'react'; +import { + Button, + Card, + CardBody, + CardTitle, Flex, FlexItem, + FormGroup, FormSelect, FormSelectOption, + Grid, + GridItem, Label, Modal, Switch, + TextInput, +} from '@patternfly/react-core'; +import '../karavan.css'; +import './kamelet.css'; +import {useIntegrationStore} from "../KaravanStore"; +import {shallow} from "zustand/shallow"; +import {DefinitionProperty} from "karavan-core/lib/model/IntegrationDefinition"; + +interface Props { + index: number + propKey: string + property: DefinitionProperty +} + +export function KameletDefinitionPropertyCard(props: Props) { + + const [integration, setIntegration] = useIntegrationStore((s) => [s.integration, s.setIntegration], shallow) + const [showDeleteConfirmation, setShowDeleteConfirmation] = useState(false); + + const key = props.propKey; + const required = integration.spec.definition?.required || []; + + function setPropertyValue(field: string, value: string) { + if (integration.spec.definition?.properties) { + (integration.spec.definition?.properties as any)[key][field] = value; + setIntegration(integration, true); + } + } + + function getPropertyValue(field: string) { + const properties: any = integration.spec.definition?.properties; + if (properties) { + return properties[key][field]; + } + return undefined; + } + + + function getPropertyField(field: string, label: string, isRequired: boolean, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { + return ( + + + setPropertyValue(field, value)} + value={getPropertyValue(field)}/> + + + ) + } + + function getPropertyTypeField(field: string, label: string, isRequired: boolean, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { + return ( + + + setPropertyValue(field, value)} + aria-label="FormSelect Input" + ouiaId="BasicFormSelect" + > + {['string', 'number', 'boolean'].map((option, index) => ( + + ))} + + + + ) + } + + function renameProperty(newKey: string) { + const oldKey = key; + newKey = newKey.replace(/[\W_]+/g,''); + if (oldKey !== newKey) { + if (integration.spec.definition?.properties) { + const o = (integration.spec.definition?.properties as any) + const newObject: any = {}; + Object.keys(o).forEach(k => { + if (k !== oldKey) { + newObject[k] = o[k]; + } else { + newObject[newKey] = o[k]; + } + }) + integration.spec.definition.properties = newObject; + setIntegration(integration, true); + } + } + } + + function deleteProperty() { + if (integration.spec.definition?.properties) { + delete integration.spec.definition.properties[key]; + setIntegration(integration, true); + } + } + + function getDeleteConfirmation() { + return ( setShowDeleteConfirmation(false)} + actions={[ + , + + ]} + onEscapePress={e => setShowDeleteConfirmation(false)}> +
+ Delete {key} property? +
+ ) + } + + function setRequired(checked: boolean) { + console.log(required, key) + const newRequired = [...required]; + if (checked && !newRequired.includes(key)) { + newRequired.push(key); + } else if (!checked && newRequired.includes(key)) { + const index = newRequired.findIndex(r => r === key); + newRequired.splice(index, 1); + } + // console.log(newRequired) + if (integration.spec.definition?.required) { + integration.spec.definition.required.length = 0; + integration.spec.definition.required.push(...newRequired) + } + setIntegration(integration, true); + } + + function getTitle() { + return ( + + + + + + setRequired(checked)} + isReversed + /> + + + ) + } + + + return ( + + + {getTitle()} + + + + {getPropertyField("title", "Title", true, 3)} + {getPropertyField("description", "Description", true, 6)} + {getPropertyTypeField("type", "Type", true, 3)} + {getPropertyField("format", "Format", false, 3)} + {getPropertyField("example", "Example", false, 6)} + {getPropertyField("default", "Default", false, 3)} + {/*{getPropertyField("x-descriptors", "Descriptors", false, 12)}*/} + + + {getDeleteConfirmation()} + + ) +} diff --git a/karavan-designer/src/designer/kamelet/KameletDefinitionsPanel.tsx b/karavan-designer/src/designer/kamelet/KameletDefinitionsPanel.tsx new file mode 100644 index 00000000000..4c638ee3f26 --- /dev/null +++ b/karavan-designer/src/designer/kamelet/KameletDefinitionsPanel.tsx @@ -0,0 +1,108 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import React from 'react'; +import { + Button, + Card, + CardBody, + CardTitle, Flex, FlexItem, + Form, + FormGroup, + Grid, + GridItem, + TextInput, +} from '@patternfly/react-core'; +import '../karavan.css'; +import './kamelet.css'; +import {useIntegrationStore} from "../KaravanStore"; +import {shallow} from "zustand/shallow"; +import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-circle-icon"; +import {KameletDefinitionPropertyCard} from "./KameletDefinitionPropertyCard"; + +export function KameletDefinitionsPanel() { + + const [integration, setIntegration] = useIntegrationStore((s) => [s.integration, s.setIntegration], shallow) + + function setValue(key: string, value: string) { + if (key && value && value.length > 0) { + (integration.spec.definition as any)[key] = value; + setIntegration(integration, true); + } + } + + function getValue(key: string): string { + const annotations = integration.spec.definition; + if (annotations) { + return (annotations as any)[key]; + } else { + return ''; + } + } + + function getElement(key: string, label: string, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { + return ( + + + setValue(key, value)} + value={getValue(key)}/> + + + ) + } + + const properties = integration.spec.definition?.properties ? Object.keys(integration.spec.definition?.properties) : []; + return ( + <> + + Definitions + +
+ + {getElement('title', 'Title', 4)} + {getElement('description', 'Description', 6)} + {getElement('type', 'Type', 2)} + +
+ + +
+ + + + Properties + + + + + + +
+ {properties.map((key: string, index: number) => { + const property = (integration.spec.definition?.properties as any)[key]; + return + })} + +
+ + + + ) +} diff --git a/karavan-designer/src/designer/kamelet/KameletDesigner.tsx b/karavan-designer/src/designer/kamelet/KameletDesigner.tsx new file mode 100644 index 00000000000..3c0b5fa89f7 --- /dev/null +++ b/karavan-designer/src/designer/kamelet/KameletDesigner.tsx @@ -0,0 +1,132 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import React from 'react'; +import { + Button, Card, CardBody, CardFooter, CardTitle, Divider, + Drawer, + DrawerContent, + DrawerContentBody, + DrawerPanelContent, Flex, FlexItem, Gallery, GalleryItem, + Modal, + PageSection, +} from '@patternfly/react-core'; +import '../karavan.css'; +import './kamelet.css'; +import {RegistryBeanDefinition} from "karavan-core/lib/model/CamelDefinition"; +import {CamelUi} from "../utils/CamelUi"; +import PlusIcon from "@patternfly/react-icons/dist/esm/icons/plus-icon"; +import {CamelDefinitionApiExt} from "karavan-core/lib/api/CamelDefinitionApiExt"; +import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; +import {useDesignerStore, useIntegrationStore} from "../KaravanStore"; +import {shallow} from "zustand/shallow"; +import {BeanProperties} from "../beans/BeanProperties"; +import {BeanCard} from "../beans/BeanCard"; +import {KameletAnnotationsPanel} from "./KameletAnnotationsPanel"; +import {KameletDefinitionsPanel} from "./KameletDefinitionsPanel"; +import {KameletProperties} from "./KameletProperties"; + +export function KameletDesigner() { + + const [integration, setIntegration] = useIntegrationStore((s) => [s.integration, s.setIntegration], shallow) + const [dark, selectedStep, showDeleteConfirmation, setShowDeleteConfirmation, setSelectedStep] = useDesignerStore((s) => + [s.dark, s.selectedStep, s.showDeleteConfirmation, s.setShowDeleteConfirmation, s.setSelectedStep], shallow) + + + function onShowDeleteConfirmation(bean: RegistryBeanDefinition) { + setSelectedStep(bean); + setShowDeleteConfirmation(true); + } + + function deleteBean() { + const i = CamelDefinitionApiExt.deleteBeanFromIntegration(integration, selectedStep); + setIntegration(i, false); + setShowDeleteConfirmation(false); + setSelectedStep(undefined); + } + + function changeBean(bean: RegistryBeanDefinition) { + const clone = CamelUtil.cloneIntegration(integration); + const i = CamelDefinitionApiExt.addBeanToIntegration(clone, bean); + setIntegration(i, false); + setSelectedStep(bean); + } + + function getDeleteConfirmation() { + return ( setShowDeleteConfirmation(false)} + actions={[ + , + + ]} + onEscapePress={e => setShowDeleteConfirmation(false)}> +
+ Delete bean from integration? +
+ ) + } + + function selectBean(bean?: RegistryBeanDefinition) { + setSelectedStep(bean); + } + + function unselectBean(evt: React.MouseEvent) { + if ((evt.target as any).dataset.click === 'BEANS') { + evt.stopPropagation() + setSelectedStep(undefined); + } + }; + + function createBean() { + changeBean(new RegistryBeanDefinition()); + } + + function getPropertiesPanel() { + return ( + + + + ) + } + + return ( + + + + + + +
+ + + + + + {getDeleteConfirmation()} + + ) +} diff --git a/karavan-designer/src/designer/kamelet/KameletProperties.tsx b/karavan-designer/src/designer/kamelet/KameletProperties.tsx new file mode 100644 index 00000000000..93c696fa831 --- /dev/null +++ b/karavan-designer/src/designer/kamelet/KameletProperties.tsx @@ -0,0 +1,249 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import React, {useEffect, useState} from 'react'; +import { + Form, + FormGroup, + TextInput, Button, Title, Tooltip, Popover, InputGroup, InputGroupItem, +} from '@patternfly/react-core'; +import '../karavan.css'; +import "@patternfly/patternfly/patternfly.css"; +import { + RegistryBeanDefinition, +} from "karavan-core/lib/model/CamelDefinition"; +import {Integration} from "karavan-core/lib/model/IntegrationDefinition"; +import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; +import {SensitiveKeys} from "karavan-core/lib/model/CamelMetadata"; +import {v4 as uuidv4} from "uuid"; +import DeleteIcon from "@patternfly/react-icons/dist/js/icons/times-icon"; +import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-circle-icon"; +import CloneIcon from '@patternfly/react-icons/dist/esm/icons/clone-icon' +import HelpIcon from "@patternfly/react-icons/dist/js/icons/help-icon"; +import {InfrastructureSelector} from "../route/property/InfrastructureSelector"; +import KubernetesIcon from "@patternfly/react-icons/dist/js/icons/openshift-icon"; +import {InfrastructureAPI} from "../utils/InfrastructureAPI"; +import ShowIcon from "@patternfly/react-icons/dist/js/icons/eye-icon"; +import HideIcon from "@patternfly/react-icons/dist/js/icons/eye-slash-icon"; +import DockerIcon from "@patternfly/react-icons/dist/js/icons/docker-icon"; +import {useDesignerStore} from "../KaravanStore"; +import {shallow} from "zustand/shallow"; +import {IntegrationHeader} from "../utils/IntegrationHeader"; + + +interface Props { + integration: Integration + dark: boolean + onChange: (bean: RegistryBeanDefinition) => void + onClone: (bean: RegistryBeanDefinition) => void +} + +export function KameletProperties (props: Props) { + + const [selectedStep] = useDesignerStore((s) => [s.selectedStep], shallow); + const [infrastructureSelector, setInfrastructureSelector] = useState(false); + const [infrastructureSelectorProperty, setInfrastructureSelectorProperty] = useState(undefined); + const [infrastructureSelectorUuid, setInfrastructureSelectorUuid] = useState(undefined); + const [properties, setProperties] = useState>(new Map()); + + useEffect(()=> { + setProperties(preparePropertiesMap((selectedStep as RegistryBeanDefinition)?.properties)) + }, [selectedStep?.uuid]) + + function preparePropertiesMap (properties: any): Map { + const result = new Map(); + if (properties) { + Object.keys(properties).forEach((k, i, a) => result.set(uuidv4(), [k, properties[k], false])); + } + return result; + } + + function onBeanPropertyUpdate () { + if (selectedStep) { + const bean = CamelUtil.cloneBean(selectedStep); + const beanProperties: any = {}; + properties.forEach((p: any) => beanProperties[p[0]] = p[1]); + bean.properties = beanProperties; + props.onChange(bean); + } + } + + function beanFieldChanged (fieldId: string, value: string) { + if (selectedStep) { + const bean = CamelUtil.cloneBean(selectedStep); + (bean as any)[fieldId] = value; + props.onChange(bean); + } + } + + function propertyChanged (uuid: string, key: string, value: string, showPassword: boolean) { + setProperties(prevState => { + prevState.set(uuid, [key, value, showPassword]); + return prevState; + }); + onBeanPropertyUpdate(); + } + + function propertyDeleted (uuid: string) { + setProperties(prevState => { + prevState.delete(uuid); + return prevState; + }) + onBeanPropertyUpdate(); + } + + function selectInfrastructure (value: string) { + const propertyId = infrastructureSelectorProperty; + const uuid = infrastructureSelectorUuid; + if (propertyId && uuid){ + if (value.startsWith("config") || value.startsWith("secret")) value = "{{" + value + "}}"; + propertyChanged(uuid, propertyId, value, false); + setInfrastructureSelector(false); + setInfrastructureSelectorProperty(undefined); + } + } + + function openInfrastructureSelector (uuid: string, propertyName: string) { + setInfrastructureSelector(true); + setInfrastructureSelectorProperty(propertyName); + setInfrastructureSelectorUuid(uuid); + } + + function closeInfrastructureSelector () { + setInfrastructureSelector(false); + } + + function getInfrastructureSelectorModal() { + return ( + closeInfrastructureSelector()} + onSelect={selectInfrastructure}/>) + } + + function cloneBean () { + if (selectedStep) { + const bean = CamelUtil.cloneBean(selectedStep); + bean.uuid = uuidv4(); + props.onClone(bean); + } + } + + function getLabelIcon (displayName: string, description: string) { + return ( + + Required +
+ }> + + + ) + } + function getBeanForm() { + const bean = (selectedStep as RegistryBeanDefinition); + return ( + <> +
+
+ Bean + +
+
+ + beanFieldChanged("name", value)}/> + + + beanFieldChanged("type", value)}/> + + + {Array.from(properties.entries()).map((v, index, array) => { + const i = v[0]; + const key = v[1][0]; + const value = v[1][1]; + const showPassword = v[1][2]; + const isSecret = key !== undefined && SensitiveKeys.includes(key.toLowerCase()); + const inInfrastructure = InfrastructureAPI.infrastructure !== 'local'; + const icon = InfrastructureAPI.infrastructure === 'kubernetes' ? : + return ( +
+ { + propertyChanged(i, beanFieldName, value, showPassword) + }}/> + + {inInfrastructure && + + + } + + { + propertyChanged(i, key, value, showPassword) + }}/> + + {isSecret && + + } + + +
+ ) + })} + + + + ) + } + + const bean = (selectedStep as RegistryBeanDefinition); + return ( +
+
event.preventDefault()}> + {bean === undefined && } + {bean !== undefined && getBeanForm()} + + {getInfrastructureSelectorModal()} +
+ ) +} diff --git a/karavan-designer/src/designer/kamelet/kamelet.css b/karavan-designer/src/designer/kamelet/kamelet.css new file mode 100644 index 00000000000..bbdf28a9859 --- /dev/null +++ b/karavan-designer/src/designer/kamelet/kamelet.css @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.karavan .kamelet-designer { + display: block; + height: 100vh; + width: 100%; + overflow-y: auto; + padding-bottom: 106px; +} + +.karavan .kamelet-designer .main { + background-color: var(--pf-v5-global--BackgroundColor--light-300); +} +.karavan .kamelet-designer .icon { + height: 20px; + width: 20px; + border: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; +} + +.karavan .kamelet-designer .properties { + padding: 10px 10px 10px 10px; + background: transparent; + width: 100%; + height: 100%; + overflow: auto; + display: flex; + flex-direction: column; + justify-content: space-between; +} \ No newline at end of file diff --git a/karavan-designer/src/designer/route/DslProperties.tsx b/karavan-designer/src/designer/route/DslProperties.tsx index 697291218a3..ef933585ea1 100644 --- a/karavan-designer/src/designer/route/DslProperties.tsx +++ b/karavan-designer/src/designer/route/DslProperties.tsx @@ -46,8 +46,7 @@ export function DslProperties(props: Props) { const {cloneElement, onDataFormatChange, onPropertyChange, onParametersChange, onExpressionChange} = usePropertiesHook(props.isRouteDesigner); - const [selectedStep, dark, setSelectedStep, setSelectedUuids] = useDesignerStore((s) => - [s.selectedStep, s.dark, s.setSelectedStep, s.setSelectedUuids], shallow) + const [selectedStep, dark] = useDesignerStore((s) => [s.selectedStep, s.dark], shallow) const [showAdvanced, setShowAdvanced] = useState(false); const [isDescriptionExpanded, setIsDescriptionExpanded] = useState(false); diff --git a/karavan-designer/src/designer/utils/IntegrationHeader.tsx b/karavan-designer/src/designer/utils/IntegrationHeader.tsx index c117d434872..0725d1e12a8 100644 --- a/karavan-designer/src/designer/utils/IntegrationHeader.tsx +++ b/karavan-designer/src/designer/utils/IntegrationHeader.tsx @@ -23,19 +23,36 @@ export function IntegrationHeader () { const [integration] = useIntegrationStore((state) => [state.integration], shallow) + const isKamelet = integration.type === 'kamelet'; + + function getKameletType(): string { + // const labels = integration.metadata.labels; + // if (labels && labels.l) + // "camel.apache.org/kamelet.type" + return ''; + } + return (
- Integration + {/*Integration*/} {/**/} {/* */} {/**/} + + + + {isKamelet && + + }
) } diff --git a/karavan-designer/src/designer/utils/KaravanIcons.tsx b/karavan-designer/src/designer/utils/KaravanIcons.tsx index 677945f514d..906ba86e047 100644 --- a/karavan-designer/src/designer/utils/KaravanIcons.tsx +++ b/karavan-designer/src/designer/utils/KaravanIcons.tsx @@ -263,21 +263,38 @@ export function CamelIcon(props?: (JSX.IntrinsicAttributes & React.SVGProps - - + if (icon === 'kamelet') return ( + + {"application"} + + + ) + if (icon === 'code') return ( + + + + ) if (icon === 'routes') return (