element options fixes

invana · Jun 2, 2021 · 285940b · 285940b
1 parent 6a04c16
commit 285940b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/web/interface/element-options.js b/src/web/interface/element-options.js
@@ -29,11 +29,13 @@ export default class ElementOptions extends DefaultRemoteComponent {
     // }
 
     componentDidMount() {
-        super.componentDidMount();
-        console.log("VO componentDidMount")
-        console.log("======", this.props, this.requestBuilder);
-        this.getElementInitialConfig();
+        if (this.props.elementOptionsToShow && this.props.elementOptionsToShow.label) {
 
+            super.componentDidMount();
+            console.log("VO componentDidMount")
+            console.log("======", this.props, this.requestBuilder);
+            this.getElementInitialConfig();
+        }
     }
 
     getElementLabel() {
@@ -69,14 +71,14 @@ export default class ElementOptions extends DefaultRemoteComponent {
 
     componentDidUpdate(prevProps) {
         console.log("VO componentDidUpdate")
-        // const label = this.getElementLabel();
-
-        const prevGroupName = prevProps.elementOptionsToShow ? prevProps.elementOptionsToShow.label : null;
-        const thisPropGroupName = this.props.elementOptionsToShow ? this.props.elementOptionsToShow.label : null;
-        if (prevGroupName !== thisPropGroupName) {
-            // already data exist
-            this.setState({nodeOptions: null});
-            this.getElementInitialConfig();
+        if (this.props.elementOptionsToShow && this.props.elementOptionsToShow.label) {
+            const prevGroupName = prevProps.elementOptionsToShow ? prevProps.elementOptionsToShow.label : null;
+            const thisPropGroupName = this.props.elementOptionsToShow ? this.props.elementOptionsToShow.label : null;
+            if ((prevGroupName && thisPropGroupName) && (prevGroupName !== thisPropGroupName)) {
+                // already data exist
+                this.setState({nodeOptions: null});
+                this.getElementInitialConfig();
+            }
         }
     }
 

diff --git a/src/web/viewlets/canvas/graph-canvas.js b/src/web/viewlets/canvas/graph-canvas.js
@@ -751,7 +751,9 @@ export default class GraphCanvas extends DefaultRemoteComponent {
                         : <React.Fragment/>
                 }
                 {
-                    this.state.modalContentName === "element-options" && this.state.elementOptionsToShow
+                    this.state.modalContentName === "element-options"
+                    && this.state.elementOptionsToShow
+                    && this.state.elementOptionsToShow.label
                         ? <Modal
                             className={"border-0 "}
                             size="lg"