Skip to content

Commit 3308dfb

Browse files
committed
Prepare 4.14.3
1 parent 01f9a96 commit 3308dfb

6 files changed

Lines changed: 11 additions & 39 deletions

File tree

.github/workflows/app.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ jobs:
4040
- name: Set up Node
4141
uses: actions/setup-node@v4
4242
with:
43-
node-version: '20'
44-
45-
- name: Karavan Core install
46-
working-directory: ./karavan/karavan-core
47-
run: npm ci
43+
node-version: '22'
4844

4945
- name: Create Multi Platfrom Builder
5046
run: docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,5 @@ docs/install/karavan-docker/data/*
8282

8383
**/dependency-reduced-pom.xml
8484

85-
.env
85+
.env
86+
stats.html

karavan-app/src/main/webui/src/karavan/features/integration/designer/property/MainPropertiesPanel.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ export function MainPropertiesPanel() {
6969

7070
function getPropertiesPanel() {
7171
if (tab === "routes") {
72-
return <DslProperties designerType={"routes"} expressionEditor={ExpressionEditor}/>
72+
return <DslProperties expressionEditor={ExpressionEditor}/>
7373
} else if (tab === "rest") {
74-
return <DslProperties designerType={"rest"} expressionEditor={ExpressionEditor}/>
74+
return <DslProperties expressionEditor={ExpressionEditor}/>
7575
} else if (tab === "beans") {
76-
return <DslProperties designerType={"beans"} expressionEditor={ExpressionEditor}/>
76+
return <DslProperties expressionEditor={ExpressionEditor}/>
7777
} else {
7878
return <></>
7979
}

karavan-app/src/main/webui/src/karavan/features/integration/developer/DesignerEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export function DesignerEditor() {
130130
onCreateNewRoute={onCreateNewRoute}
131131
onCreateNewFile={onCreateNewFile}
132132
files={files.map(f => new IntegrationFile(f.name, f.code))}
133-
mainRightPanel={<DslProperties designerType={"routes"} expressionEditor={ExpressionEditor}/>}
133+
mainRightPanel={<DslProperties expressionEditor={ExpressionEditor}/>}
134134
/>
135135
: <></>
136136
)

karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperEditor.tsx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
import React, {JSX, useEffect, useState} from 'react';
22
import {CodeEditor} from "./CodeEditor";
33
import './DeveloperManager.css'
4-
import {useNavigate} from "react-router-dom";
5-
import {EditorType} from "@features/integration/developer/EditorConfig";
64
import { useDesignerStore } from "../designer/DesignerStore";
75
import {useDeveloperStore } from "@stores/DeveloperStore";
86
import {shallow} from "zustand/shallow";
9-
import {useFilesStore, useFileStore} from "@stores/ProjectStore";
7+
import {useFileStore} from "@stores/ProjectStore";
108
import {ProjectService} from "@services/ProjectService";
119
import {EditorErrorBoundaryWrapper} from "@features/integration/developer/EditorErrorBoundaryWrapper";
1210

13-
export interface DeveloperEditorProps {
14-
editorType: EditorType;
15-
}
16-
17-
function DeveloperEditor(props: DeveloperEditorProps): JSX.Element {
11+
function DeveloperEditor(): JSX.Element {
1812

19-
const {editorType} = props
2013
const [setDesignerSwitch] = useDesignerStore((s) => [s.setDesignerSwitch], shallow)
2114
const {setLoading} = useDeveloperStore()
22-
const [file, setFile] = useFileStore((s) => [s.file, s.setFile], shallow)
23-
const [files] = useFilesStore((s) => [s.files], shallow);
15+
const [file] = useFileStore((s) => [s.file], shallow)
2416
const [code, setCode] = useState<string>("");
25-
const navigate = useNavigate();
2617

2718
useEffect(() => {
2819
setDesignerSwitch(false);

karavan-app/src/main/webui/src/karavan/features/integration/developer/DeveloperManager.tsx

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,14 @@ export function DeveloperManager() {
2929
}
3030

3131
function getDeveloperUI() {
32-
const isYaml = file !== undefined && (file.name.endsWith(".yaml") || file.name.endsWith(".yml"));
3332
const isCamelYaml = yamlIsCamel();
3433
const isKameletYaml = file !== undefined && file.name.endsWith(".kamelet.yaml");
3534
const isIntegration = isCamelYaml && file?.code && CamelDefinitionYaml.yamlIsIntegration(file.code);
3635
const showDesigner = designerSwitch && ((isCamelYaml && isIntegration) || isKameletYaml);
37-
const isMarkdown = file !== undefined && file.name.endsWith(".md");
38-
const isGroovy = file !== undefined && file.name.endsWith(".groovy");
39-
const isXml = file !== undefined && file.name.endsWith(".xml");
4036
if (showDesigner) {
4137
return <DesignerEditor/>;
4238
} else {
43-
let editorType: EditorType;
44-
if (isGroovy) {
45-
editorType = 'groovy';
46-
} else if (isYaml || isCamelYaml || isKameletYaml) {
47-
editorType = 'yaml';
48-
} else if (isMarkdown) {
49-
editorType = 'markdown';
50-
} else if (isXml) {
51-
editorType = 'xml';
52-
} else {
53-
editorType = 'json'; // default
54-
}
55-
return <DeveloperEditor editorType={editorType}/>
39+
return <DeveloperEditor/>
5640
}
5741
}
5842

0 commit comments

Comments
 (0)