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
The following commit(s) were added to refs/heads/main by this push:
new fbec807a Upgrade dependencies
fbec807a is described below
commit fbec807a94bf1ccee26bf08d3f15a36860ac06bf
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Jun 7 15:22:53 2024 -0400
Upgrade dependencies
---
karavan-core/test/beans.spec.ts | 2 +-
karavan-core/test/checkRequired.spec.ts | 2 +-
karavan-core/test/circuitBreaker.spec.ts | 4 ++--
karavan-core/test/demo.spec.ts | 2 +-
karavan-core/test/expression.spec.ts | 2 +-
karavan-core/test/findStep.spec.ts | 2 +-
karavan-core/test/getExpressionLanguage.spec.ts | 2 +-
karavan-core/test/integrationToYaml.spec.ts | 2 +-
karavan-core/test/intercept.spec.ts | 4 ++--
karavan-core/test/multiObjectProperties.spec.ts | 2 +-
karavan-core/test/supportedComponents.spec.ts | 2 +-
karavan-core/test/updateStep.spec.ts | 2 +-
karavan-core/tsconfig.json | 4 +---
karavan-vscode/webview/topology/CustomNode.tsx | 3 +++
karavan-vscode/webview/topology/TopologyApi.tsx | 9 ++++-----
karavan-vscode/webview/topology/TopologyStore.ts | 3 ++-
karavan-vscode/webview/topology/TopologyToolbar.tsx | 2 +-
karavan-vscode/webview/topology/topology.css | 10 ++++++++++
18 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/karavan-core/test/beans.spec.ts b/karavan-core/test/beans.spec.ts
index 5c85a31b..e7d29f5a 100644
--- a/karavan-core/test/beans.spec.ts
+++ b/karavan-core/test/beans.spec.ts
@@ -18,7 +18,7 @@ import { expect } from 'chai';
import * as fs from 'fs';
import 'mocha';
import { CamelDefinitionYaml } from '../src/core/api/CamelDefinitionYaml';
-import { Beans, Integration } from '../lib/model/IntegrationDefinition';
+import { Beans, Integration } from '../src/core/model/IntegrationDefinition';
import { BeanFactoryDefinition } from '../src/core/model/CamelDefinition';
describe('bean configuration', () => {
diff --git a/karavan-core/test/checkRequired.spec.ts
b/karavan-core/test/checkRequired.spec.ts
index 8c80af9e..e1cfeac9 100644
--- a/karavan-core/test/checkRequired.spec.ts
+++ b/karavan-core/test/checkRequired.spec.ts
@@ -21,7 +21,7 @@ import {
} from "../src/core/model/CamelDefinition";
import {CamelDefinitionApi} from "../src/core/api/CamelDefinitionApi";
import {CamelUtil} from "../src/core/api/CamelUtil";
-import { SetHeaderDefinition } from '../lib/model/CamelDefinition';
+import { SetHeaderDefinition } from '../src/core/model/CamelDefinition';
describe('Check required properties', () => {
diff --git a/karavan-core/test/circuitBreaker.spec.ts
b/karavan-core/test/circuitBreaker.spec.ts
index 6a8cbf18..d4a6f604 100644
--- a/karavan-core/test/circuitBreaker.spec.ts
+++ b/karavan-core/test/circuitBreaker.spec.ts
@@ -30,8 +30,8 @@ import {CamelDefinitionYaml} from
"../src/core/api/CamelDefinitionYaml";
import {SimpleExpression} from "../src/core/model/CamelDefinition";
import {Integration} from "../src/core/model/IntegrationDefinition";
import * as fs from 'fs';
-import {CamelModelMetadata, ElementMeta} from "../lib/model/CamelMetadata";
-import {CircuitBreakerDefinition, Resilience4jConfigurationDefinition} from
"../lib/model/CamelDefinition";
+import {CamelModelMetadata, ElementMeta} from
"../src/core/model/CamelMetadata";
+import {CircuitBreakerDefinition, Resilience4jConfigurationDefinition} from
"../src/core/model/CamelDefinition";
describe('Circuit Breaker', () => {
diff --git a/karavan-core/test/demo.spec.ts b/karavan-core/test/demo.spec.ts
index cf4376a2..2d1b642d 100644
--- a/karavan-core/test/demo.spec.ts
+++ b/karavan-core/test/demo.spec.ts
@@ -21,7 +21,7 @@ import {CamelUtil} from "../src/core/api/CamelUtil";
import {CamelDefinitionApiExt} from "../src/core/api/CamelDefinitionApiExt";
import {CatchDefinition, FromDefinition} from
"../src/core/model/CamelDefinition";
import {expect} from "chai";
-import {TryDefinition} from "../lib/model/CamelDefinition";
+import {TryDefinition} from "../src/core/model/CamelDefinition";
describe('Demo', () => {
diff --git a/karavan-core/test/expression.spec.ts
b/karavan-core/test/expression.spec.ts
index 0a408a99..219f8b87 100644
--- a/karavan-core/test/expression.spec.ts
+++ b/karavan-core/test/expression.spec.ts
@@ -30,7 +30,7 @@ import {
} from "../src/core/model/CamelDefinition";
import { RouteDefinition} from "../src/core/model/CamelDefinition";
import {Integration} from "../src/core/model/IntegrationDefinition";
-import {AggregateDefinition, ExpressionSubElementDefinition, FilterDefinition}
from "../lib/model/CamelDefinition";
+import {AggregateDefinition, ExpressionSubElementDefinition, FilterDefinition}
from "../src/core/model/CamelDefinition";
describe('Expression to yaml', () => {
diff --git a/karavan-core/test/findStep.spec.ts
b/karavan-core/test/findStep.spec.ts
index fada15e3..e85c087d 100644
--- a/karavan-core/test/findStep.spec.ts
+++ b/karavan-core/test/findStep.spec.ts
@@ -30,7 +30,7 @@ import {CamelDefinitionApiExt} from
"../src/core/api/CamelDefinitionApiExt";
import {Integration} from "../src/core/model/IntegrationDefinition";
import * as fs from 'fs';
import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
-import {StepDefinition} from "../lib/model/CamelDefinition";
+import {StepDefinition} from "../src/core/model/CamelDefinition";
describe('Find Step', () => {
diff --git a/karavan-core/test/getExpressionLanguage.spec.ts
b/karavan-core/test/getExpressionLanguage.spec.ts
index 3a23b0a7..6767f7d4 100644
--- a/karavan-core/test/getExpressionLanguage.spec.ts
+++ b/karavan-core/test/getExpressionLanguage.spec.ts
@@ -20,7 +20,7 @@ import {
ExpressionDefinition
} from "../src/core/model/CamelDefinition";
import {CamelDefinitionApiExt} from "../src/core/api/CamelDefinitionApiExt";
-import {SimpleExpression} from "../lib/model/CamelDefinition";
+import {SimpleExpression} from "../src/core/model/CamelDefinition";
describe('Get Expression Language', () => {
diff --git a/karavan-core/test/integrationToYaml.spec.ts
b/karavan-core/test/integrationToYaml.spec.ts
index 622a6d06..5f0bddfb 100644
--- a/karavan-core/test/integrationToYaml.spec.ts
+++ b/karavan-core/test/integrationToYaml.spec.ts
@@ -18,7 +18,7 @@ import {expect} from 'chai';
import * as fs from 'fs';
import 'mocha';
import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
-import { BeanFactoryDefinition } from '../lib/model/CamelDefinition';
+import { BeanFactoryDefinition } from '../src/core/model/CamelDefinition';
describe('Integration to YAML', () => {
diff --git a/karavan-core/test/intercept.spec.ts
b/karavan-core/test/intercept.spec.ts
index 6f5a31ab..0b308306 100644
--- a/karavan-core/test/intercept.spec.ts
+++ b/karavan-core/test/intercept.spec.ts
@@ -33,8 +33,8 @@ import {
SagaDefinition,
ToDefinition,
TryDefinition
-} from "../lib/model/CamelDefinition";
-import {Integration} from "../lib/model/IntegrationDefinition";
+} from "../src/core/model/CamelDefinition";
+import {Integration} from "../src/core/model/IntegrationDefinition";
describe('Intercept', () => {
diff --git a/karavan-core/test/multiObjectProperties.spec.ts
b/karavan-core/test/multiObjectProperties.spec.ts
index 79fe1f5d..a0830f48 100644
--- a/karavan-core/test/multiObjectProperties.spec.ts
+++ b/karavan-core/test/multiObjectProperties.spec.ts
@@ -19,7 +19,7 @@ import 'mocha';
import {FromDefinition, ExpressionDefinition, PropertyExpressionDefinition}
from "../src/core/model/CamelDefinition";
import {Integration} from "../src/core/model/IntegrationDefinition";
import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
-import {RouteDefinition, SagaDefinition, ToDefinition} from
"../lib/model/CamelDefinition";
+import {RouteDefinition, SagaDefinition, ToDefinition} from
"../src/core/model/CamelDefinition";
import * as fs from 'fs';
describe('Multi object property', () => {
diff --git a/karavan-core/test/supportedComponents.spec.ts
b/karavan-core/test/supportedComponents.spec.ts
index aee091a5..9fc10864 100644
--- a/karavan-core/test/supportedComponents.spec.ts
+++ b/karavan-core/test/supportedComponents.spec.ts
@@ -18,7 +18,7 @@ import {expect} from 'chai';
import * as fs from 'fs';
import 'mocha';
import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
-import {ComponentApi} from "../lib/api/ComponentApi";
+import {ComponentApi} from "../src/core/api/ComponentApi";
import {SupportedComponent} from "../src/core/model/ComponentModels";
diff --git a/karavan-core/test/updateStep.spec.ts
b/karavan-core/test/updateStep.spec.ts
index be114263..4e35fa69 100644
--- a/karavan-core/test/updateStep.spec.ts
+++ b/karavan-core/test/updateStep.spec.ts
@@ -21,7 +21,7 @@ import {CamelUtil} from "../src/core/api/CamelUtil";
import {CamelDefinitionApiExt} from "../src/core/api/CamelDefinitionApiExt";
import {FilterDefinition, SimpleExpression} from
"../src/core/model/CamelDefinition";
import {Integration} from "../src/core/model/IntegrationDefinition";
-import {RouteDefinition} from "../lib/model/CamelDefinition";
+import {RouteDefinition} from "../src/core/model/CamelDefinition";
describe('Update Step', () => {
diff --git a/karavan-core/tsconfig.json b/karavan-core/tsconfig.json
index 27c81606..d0507e2c 100644
--- a/karavan-core/tsconfig.json
+++ b/karavan-core/tsconfig.json
@@ -16,12 +16,10 @@
"ES2021",
"ES2021.String"
],
- /* Bundler mode */
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
- "noEmit": true,
- "jsx": "react-jsx"
+ "noEmit": true
},
"tsc-alias": {
"resolveFullPaths": true,
diff --git a/karavan-vscode/webview/topology/CustomNode.tsx
b/karavan-vscode/webview/topology/CustomNode.tsx
index 88263966..83792a0c 100644
--- a/karavan-vscode/webview/topology/CustomNode.tsx
+++ b/karavan-vscode/webview/topology/CustomNode.tsx
@@ -44,6 +44,9 @@ const CustomNode: React.FC<any> = observer(({ element,
...rest }) => {
const data = element.getData();
const badge:string = data.badge?.substring(0,1).toUpperCase();
+ if (element.getLabel()?.length > 30) {
+ element.setLabel(element.getLabel()?.substring(0,30) + '...');
+ }
return (
<DefaultNode
diff --git a/karavan-vscode/webview/topology/TopologyApi.tsx
b/karavan-vscode/webview/topology/TopologyApi.tsx
index 8c8aff65..bb09ce8f 100644
--- a/karavan-vscode/webview/topology/TopologyApi.tsx
+++ b/karavan-vscode/webview/topology/TopologyApi.tsx
@@ -204,7 +204,8 @@ export function getRestNodes(tins: TopologyRestNode[]):
NodeModel[] {
icon: 'rest',
type: 'rest',
step: tin.rest,
- fileName: tin.fileName
+ fileName: tin.fileName,
+ secondaryLabel: tin.title
}
}
});
@@ -273,8 +274,7 @@ export function getModel(files: IntegrationFile[],
grouping?: boolean): Model {
group: true,
label: 'Consumer group',
style: {
- padding: 10,
- strokeWidth: "2px",
+ padding: 25,
}
})
@@ -286,8 +286,7 @@ export function getModel(files: IntegrationFile[],
grouping?: boolean): Model {
group: true,
label: 'Producer group',
style: {
- padding: 10,
- strokeWidth: "2px"
+ padding: 25,
}
})
diff --git a/karavan-vscode/webview/topology/TopologyStore.ts
b/karavan-vscode/webview/topology/TopologyStore.ts
index 514f1b37..63b7ed4f 100644
--- a/karavan-vscode/webview/topology/TopologyStore.ts
+++ b/karavan-vscode/webview/topology/TopologyStore.ts
@@ -28,7 +28,7 @@ interface TopologyState {
setRanker: (ranker: string) => void
nodeData: any
setNodeData: (nodeData: any) => void
- showGroups?: boolean
+ showGroups: boolean
setShowGroups: (showGroups: boolean) => void
}
@@ -56,6 +56,7 @@ export const useTopologyStore =
createWithEqualityFn<TopologyState>((set) => ({
return {nodeData: nodeData};
});
},
+ showGroups: false,
setShowGroups: (showGroups: boolean) => {
set((state: TopologyState) => {
return {showGroups: showGroups};
diff --git a/karavan-vscode/webview/topology/TopologyToolbar.tsx
b/karavan-vscode/webview/topology/TopologyToolbar.tsx
index 0de61fee..0b23c542 100644
--- a/karavan-vscode/webview/topology/TopologyToolbar.tsx
+++ b/karavan-vscode/webview/topology/TopologyToolbar.tsx
@@ -17,7 +17,7 @@
import * as React from 'react';
import {
- Button, Switch, ToolbarContent,
+ Button, Switch,
ToolbarItem, Tooltip
} from '@patternfly/react-core';
import PlusIcon from "@patternfly/react-icons/dist/esm/icons/plus-icon";
diff --git a/karavan-vscode/webview/topology/topology.css
b/karavan-vscode/webview/topology/topology.css
index 7d21c7b2..0521a9a9 100644
--- a/karavan-vscode/webview/topology/topology.css
+++ b/karavan-vscode/webview/topology/topology.css
@@ -92,7 +92,17 @@
pointer-events: none;
opacity: 0.7;
}
+
.karavan .topology-sidebar .properties .pf-v5-c-form
.pf-v5-c-form__group-label-help {
pointer-events: auto;
opacity: 1;
+}
+
+.karavan .topology-panel .pf-topology__group .pf-topology__group__background {
+ stroke-width: 2px;
+ stroke-dasharray: 3;
+}
+
+.karavan .topology-panel .pf-topology__group
.pf-topology__node__label__background {
+ opacity: 0.5;
}
\ No newline at end of file
