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 3308dfb1df7a6559c027d236243de15e7481cd88 Author: Marat Gubaidullin <[email protected]> AuthorDate: Mon Dec 8 11:18:09 2025 -0500 Prepare 4.14.3 --- .github/workflows/app.yml | 6 +----- .gitignore | 3 ++- .../designer/property/MainPropertiesPanel.tsx | 6 +++--- .../features/integration/developer/DesignerEditor.tsx | 2 +- .../features/integration/developer/DeveloperEditor.tsx | 15 +++------------ .../integration/developer/DeveloperManager.tsx | 18 +----------------- 6 files changed, 11 insertions(+), 39 deletions(-) diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml index 353eef60..f9d03f74 100644 --- a/.github/workflows/app.yml +++ b/.github/workflows/app.yml @@ -40,11 +40,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: '20' - - - name: Karavan Core install - working-directory: ./karavan/karavan-core - run: npm ci + node-version: '22' - name: Create Multi Platfrom Builder run: docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder diff --git a/.gitignore b/.gitignore index 4774ac35..34e57bdc 100644 --- a/.gitignore +++ b/.gitignore @@ -82,4 +82,5 @@ docs/install/karavan-docker/data/* **/dependency-reduced-pom.xml -.env \ No newline at end of file +.env +stats.html \ No newline at end of file diff --git a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/MainPropertiesPanel.tsx b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/MainPropertiesPanel.tsx index 49b2d8d8..f038d3cb 100644 --- a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/MainPropertiesPanel.tsx +++ b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/MainPropertiesPanel.tsx @@ -69,11 +69,11 @@ export function MainPropertiesPanel() { function getPropertiesPanel() { if (tab === "routes") { - return <DslProperties designerType={"routes"} expressionEditor={ExpressionEditor}/> + return <DslProperties expressionEditor={ExpressionEditor}/> } else if (tab === "rest") { - return <DslProperties designerType={"rest"} expressionEditor={ExpressionEditor}/> + return <DslProperties expressionEditor={ExpressionEditor}/> } else if (tab === "beans") { - return <DslProperties designerType={"beans"} expressionEditor={ExpressionEditor}/> + return <DslProperties expressionEditor={ExpressionEditor}/> } else { return <></> } diff --git a/karavan-app/src/main/webui/src/karavan/features/integration/developer/DesignerEditor.tsx b/karavan-app/src/main/webui/src/karavan/features/integration/developer/DesignerEditor.tsx index 26420818..e7b57ea9 100644 --- a/karavan-app/src/main/webui/src/karavan/features/integration/developer/DesignerEditor.tsx +++ b/karavan-app/src/main/webui/src/karavan/features/integration/developer/DesignerEditor.tsx @@ -130,7 +130,7 @@ export function DesignerEditor() { onCreateNewRoute={onCreateNewRoute} onCreateNewFile={onCreateNewFile} files={files.map(f => new IntegrationFile(f.name, f.code))} - mainRightPanel={<DslProperties designerType={"routes"} expressionEditor={ExpressionEditor}/>} + mainRightPanel={<DslProperties expressionEditor={ExpressionEditor}/>} /> : <></> ) diff --git a/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperEditor.tsx b/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperEditor.tsx index 4cda7fe5..653fcba6 100644 --- a/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperEditor.tsx +++ b/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperEditor.tsx @@ -1,28 +1,19 @@ import React, {JSX, useEffect, useState} from 'react'; import {CodeEditor} from "./CodeEditor"; import './DeveloperManager.css' -import {useNavigate} from "react-router-dom"; -import {EditorType} from "@features/integration/developer/EditorConfig"; import { useDesignerStore } from "../designer/DesignerStore"; import {useDeveloperStore } from "@stores/DeveloperStore"; import {shallow} from "zustand/shallow"; -import {useFilesStore, useFileStore} from "@stores/ProjectStore"; +import {useFileStore} from "@stores/ProjectStore"; import {ProjectService} from "@services/ProjectService"; import {EditorErrorBoundaryWrapper} from "@features/integration/developer/EditorErrorBoundaryWrapper"; -export interface DeveloperEditorProps { - editorType: EditorType; -} - -function DeveloperEditor(props: DeveloperEditorProps): JSX.Element { +function DeveloperEditor(): JSX.Element { - const {editorType} = props const [setDesignerSwitch] = useDesignerStore((s) => [s.setDesignerSwitch], shallow) const {setLoading} = useDeveloperStore() - const [file, setFile] = useFileStore((s) => [s.file, s.setFile], shallow) - const [files] = useFilesStore((s) => [s.files], shallow); + const [file] = useFileStore((s) => [s.file], shallow) const [code, setCode] = useState<string>(""); - const navigate = useNavigate(); useEffect(() => { setDesignerSwitch(false); diff --git a/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperManager.tsx b/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperManager.tsx index c13dc50c..17043101 100644 --- a/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperManager.tsx +++ b/karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperManager.tsx @@ -29,30 +29,14 @@ export function DeveloperManager() { } function getDeveloperUI() { - const isYaml = file !== undefined && (file.name.endsWith(".yaml") || file.name.endsWith(".yml")); const isCamelYaml = yamlIsCamel(); const isKameletYaml = file !== undefined && file.name.endsWith(".kamelet.yaml"); const isIntegration = isCamelYaml && file?.code && CamelDefinitionYaml.yamlIsIntegration(file.code); const showDesigner = designerSwitch && ((isCamelYaml && isIntegration) || isKameletYaml); - const isMarkdown = file !== undefined && file.name.endsWith(".md"); - const isGroovy = file !== undefined && file.name.endsWith(".groovy"); - const isXml = file !== undefined && file.name.endsWith(".xml"); if (showDesigner) { return <DesignerEditor/>; } else { - let editorType: EditorType; - if (isGroovy) { - editorType = 'groovy'; - } else if (isYaml || isCamelYaml || isKameletYaml) { - editorType = 'yaml'; - } else if (isMarkdown) { - editorType = 'markdown'; - } else if (isXml) { - editorType = 'xml'; - } else { - editorType = 'json'; // default - } - return <DeveloperEditor editorType={editorType}/> + return <DeveloperEditor/> } }
