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/02/07 19:15:30 UTC
[camel-karavan] branch main updated: Fix #643
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 e17bd8a3 Fix #643
e17bd8a3 is described below
commit e17bd8a32f1f70714862d999576231c41e0d2d29
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Feb 7 14:15:15 2023 -0500
Fix #643
---
karavan-app/src/main/webui/src/designer/route/DslSelector.tsx | 4 ++--
karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx | 2 +-
karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx | 4 ++--
karavan-designer/package-lock.json | 6 +++---
karavan-designer/src/designer/route/DslSelector.tsx | 4 ++--
karavan-designer/src/designer/route/RouteDesigner.tsx | 2 +-
karavan-designer/src/designer/utils/CamelUi.tsx | 4 ++--
karavan-space/src/designer/route/DslSelector.tsx | 4 ++--
karavan-space/src/designer/route/RouteDesigner.tsx | 2 +-
karavan-space/src/designer/utils/CamelUi.tsx | 4 ++--
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx b/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
index c36d76ad..dd68403b 100644
--- a/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
+++ b/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
@@ -120,7 +120,7 @@ export class DslSelector extends React.Component<Props, State> {
}
render() {
- const parentDsl = this.props.parentDsl;
+ const {parentDsl, isOpen} = this.props;
const title = parentDsl === undefined ? "Select source/from" : "Select step";
const labelText: string = this.state.tabIndex ? this.state.tabIndex.toString() : "";
return (
@@ -156,7 +156,7 @@ export class DslSelector extends React.Component<Props, State> {
actions={{}}>
<PageSection variant={this.props.dark ? "darker" : "light"}>
<Gallery key={"gallery-" + labelText} hasGutter className="dsl-gallery">
- {CamelUi.getSelectorModelsForParentFiltered(parentDsl, labelText, this.props.showSteps)
+ {isOpen && CamelUi.getSelectorModelsForParentFiltered(parentDsl, labelText, this.props.showSteps)
.filter((dsl: DslMetaModel) => CamelUi.checkFilter(dsl, this.state.filter))
.map((dsl: DslMetaModel, index: number) => this.getCard(dsl, index))}
</Gallery>
diff --git a/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx b/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx
index dc0ab805..e174831d 100644
--- a/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx
+++ b/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx
@@ -221,7 +221,7 @@ export class RouteDesigner extends React.Component<Props, RouteDesignerState> {
</DrawerContent>
</Drawer>
</div>
- {this.getSelectorModal()}
+ {this.state.showSelector === true && this.getSelectorModal()}
{this.getDeleteConfirmation()}
</PageSection>
);
diff --git a/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx b/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx
index ab015eae..3abb026b 100644
--- a/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx
+++ b/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx
@@ -130,9 +130,9 @@ export class CamelUi {
}
static getSelectorModelsForParentFiltered = (parentDsl: string | undefined, navigation: string, showSteps: boolean = true): DslMetaModel[] => {
- return CamelUi.getSelectorModelsForParent(parentDsl, showSteps)
+ const models = CamelUi.getSelectorModelsForParent(parentDsl, showSteps)
.filter(dsl => dsl.navigation.includes(navigation));
-
+ return models;
}
static getSelectorModelsForParent = (parentDsl: string | undefined, showSteps: boolean = true): DslMetaModel[] => {
const result: DslMetaModel[] = [];
diff --git a/karavan-designer/package-lock.json b/karavan-designer/package-lock.json
index 313efbfd..964adfde 100644
--- a/karavan-designer/package-lock.json
+++ b/karavan-designer/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "karavan-designer",
- "version": "3.18.6",
+ "version": "3.20.1-SNAPSHOT",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "karavan-designer",
- "version": "3.18.6",
+ "version": "3.20.1-SNAPSHOT",
"license": "Apache-2.0",
"dependencies": {
"@monaco-editor/react": "4.3.1",
@@ -37,7 +37,7 @@
}
},
"../karavan-core": {
- "version": "3.18.6",
+ "version": "3.20.1-SNAPSHOT",
"license": "Apache-2.0",
"dependencies": {
"@types/js-yaml": "^4.0.5",
diff --git a/karavan-designer/src/designer/route/DslSelector.tsx b/karavan-designer/src/designer/route/DslSelector.tsx
index c36d76ad..dd68403b 100644
--- a/karavan-designer/src/designer/route/DslSelector.tsx
+++ b/karavan-designer/src/designer/route/DslSelector.tsx
@@ -120,7 +120,7 @@ export class DslSelector extends React.Component<Props, State> {
}
render() {
- const parentDsl = this.props.parentDsl;
+ const {parentDsl, isOpen} = this.props;
const title = parentDsl === undefined ? "Select source/from" : "Select step";
const labelText: string = this.state.tabIndex ? this.state.tabIndex.toString() : "";
return (
@@ -156,7 +156,7 @@ export class DslSelector extends React.Component<Props, State> {
actions={{}}>
<PageSection variant={this.props.dark ? "darker" : "light"}>
<Gallery key={"gallery-" + labelText} hasGutter className="dsl-gallery">
- {CamelUi.getSelectorModelsForParentFiltered(parentDsl, labelText, this.props.showSteps)
+ {isOpen && CamelUi.getSelectorModelsForParentFiltered(parentDsl, labelText, this.props.showSteps)
.filter((dsl: DslMetaModel) => CamelUi.checkFilter(dsl, this.state.filter))
.map((dsl: DslMetaModel, index: number) => this.getCard(dsl, index))}
</Gallery>
diff --git a/karavan-designer/src/designer/route/RouteDesigner.tsx b/karavan-designer/src/designer/route/RouteDesigner.tsx
index dc0ab805..e174831d 100644
--- a/karavan-designer/src/designer/route/RouteDesigner.tsx
+++ b/karavan-designer/src/designer/route/RouteDesigner.tsx
@@ -221,7 +221,7 @@ export class RouteDesigner extends React.Component<Props, RouteDesignerState> {
</DrawerContent>
</Drawer>
</div>
- {this.getSelectorModal()}
+ {this.state.showSelector === true && this.getSelectorModal()}
{this.getDeleteConfirmation()}
</PageSection>
);
diff --git a/karavan-designer/src/designer/utils/CamelUi.tsx b/karavan-designer/src/designer/utils/CamelUi.tsx
index ab015eae..3abb026b 100644
--- a/karavan-designer/src/designer/utils/CamelUi.tsx
+++ b/karavan-designer/src/designer/utils/CamelUi.tsx
@@ -130,9 +130,9 @@ export class CamelUi {
}
static getSelectorModelsForParentFiltered = (parentDsl: string | undefined, navigation: string, showSteps: boolean = true): DslMetaModel[] => {
- return CamelUi.getSelectorModelsForParent(parentDsl, showSteps)
+ const models = CamelUi.getSelectorModelsForParent(parentDsl, showSteps)
.filter(dsl => dsl.navigation.includes(navigation));
-
+ return models;
}
static getSelectorModelsForParent = (parentDsl: string | undefined, showSteps: boolean = true): DslMetaModel[] => {
const result: DslMetaModel[] = [];
diff --git a/karavan-space/src/designer/route/DslSelector.tsx b/karavan-space/src/designer/route/DslSelector.tsx
index c36d76ad..dd68403b 100644
--- a/karavan-space/src/designer/route/DslSelector.tsx
+++ b/karavan-space/src/designer/route/DslSelector.tsx
@@ -120,7 +120,7 @@ export class DslSelector extends React.Component<Props, State> {
}
render() {
- const parentDsl = this.props.parentDsl;
+ const {parentDsl, isOpen} = this.props;
const title = parentDsl === undefined ? "Select source/from" : "Select step";
const labelText: string = this.state.tabIndex ? this.state.tabIndex.toString() : "";
return (
@@ -156,7 +156,7 @@ export class DslSelector extends React.Component<Props, State> {
actions={{}}>
<PageSection variant={this.props.dark ? "darker" : "light"}>
<Gallery key={"gallery-" + labelText} hasGutter className="dsl-gallery">
- {CamelUi.getSelectorModelsForParentFiltered(parentDsl, labelText, this.props.showSteps)
+ {isOpen && CamelUi.getSelectorModelsForParentFiltered(parentDsl, labelText, this.props.showSteps)
.filter((dsl: DslMetaModel) => CamelUi.checkFilter(dsl, this.state.filter))
.map((dsl: DslMetaModel, index: number) => this.getCard(dsl, index))}
</Gallery>
diff --git a/karavan-space/src/designer/route/RouteDesigner.tsx b/karavan-space/src/designer/route/RouteDesigner.tsx
index dc0ab805..e174831d 100644
--- a/karavan-space/src/designer/route/RouteDesigner.tsx
+++ b/karavan-space/src/designer/route/RouteDesigner.tsx
@@ -221,7 +221,7 @@ export class RouteDesigner extends React.Component<Props, RouteDesignerState> {
</DrawerContent>
</Drawer>
</div>
- {this.getSelectorModal()}
+ {this.state.showSelector === true && this.getSelectorModal()}
{this.getDeleteConfirmation()}
</PageSection>
);
diff --git a/karavan-space/src/designer/utils/CamelUi.tsx b/karavan-space/src/designer/utils/CamelUi.tsx
index ab015eae..3abb026b 100644
--- a/karavan-space/src/designer/utils/CamelUi.tsx
+++ b/karavan-space/src/designer/utils/CamelUi.tsx
@@ -130,9 +130,9 @@ export class CamelUi {
}
static getSelectorModelsForParentFiltered = (parentDsl: string | undefined, navigation: string, showSteps: boolean = true): DslMetaModel[] => {
- return CamelUi.getSelectorModelsForParent(parentDsl, showSteps)
+ const models = CamelUi.getSelectorModelsForParent(parentDsl, showSteps)
.filter(dsl => dsl.navigation.includes(navigation));
-
+ return models;
}
static getSelectorModelsForParent = (parentDsl: string | undefined, showSteps: boolean = true): DslMetaModel[] => {
const result: DslMetaModel[] = [];