From 6c3c4d5c414cf1830c4d9ba0790e5f40e8eb8316 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 18 Jun 2021 09:37:34 -0700 Subject: [PATCH 1/4] #1140 Fix hide/show controls behavior in layers component to match behavior in term info's button bar controls. --- .../configuration/VFBTermInfo/VFBTermInfoConfiguration.js | 4 ++-- components/interface/VFBListViewer/ListViewerControlsMenu.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/configuration/VFBTermInfo/VFBTermInfoConfiguration.js b/components/configuration/VFBTermInfo/VFBTermInfoConfiguration.js index 9937b79f6..93841525d 100644 --- a/components/configuration/VFBTermInfo/VFBTermInfoConfiguration.js +++ b/components/configuration/VFBTermInfo/VFBTermInfoConfiguration.js @@ -44,14 +44,14 @@ const buttonBarConfiguration = { "condition": "(function() { var visible = false; if ($instance$.isVisible != undefined) {visible=$instance$.isVisible(); } return visible; })()", "false": { "id": "visibility", - "actions": ["$instance$.show(); setTimeout(() => {if (StackViewer1!=undefined && StackViewer1.updateStackWidget!=undefined) { StackViewer1.updateStackWidget(); }}, 1000)"], + "actions": ["$instance$.show();StackViewer1?.updateStackWidget()"], "icon": "fa-eye-slash", "label": "Hidden", "tooltip": "Show" }, "true": { "id": "visibility", - "actions": ["$instance$.hide(); setTimeout(() => {if (StackViewer1!=undefined && StackViewer1.updateStackWidget!=undefined) { StackViewer1.updateStackWidget(); }}, 1000)"], + "actions": ["$instance$.hide(); StackViewer1?.updateStackWidget()"], "icon": "fa-eye", "label": "Visible", "tooltip": "Hide" diff --git a/components/interface/VFBListViewer/ListViewerControlsMenu.js b/components/interface/VFBListViewer/ListViewerControlsMenu.js index 623cb7ee5..3ec9e5a6c 100644 --- a/components/interface/VFBListViewer/ListViewerControlsMenu.js +++ b/components/interface/VFBListViewer/ListViewerControlsMenu.js @@ -47,9 +47,11 @@ class ListViewerControlsMenu extends Component { switch (action.handlerAction){ case ACTIONS.SHOW: this.props.instance.show(); + StackViewer1?.updateStackWidget(); break; case ACTIONS.HIDE: this.props.instance.hide(); + StackViewer1?.updateStackWidget(); break; case ACTIONS.SELECT: this.props.instance.select(); From c1e92aff52f718c62336449f5ce6e3b51109d6d6 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 18 Jun 2021 16:18:47 -0700 Subject: [PATCH 2/4] #1140 Fix eslint --- .../interface/VFBListViewer/ListViewerControlsMenu.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/interface/VFBListViewer/ListViewerControlsMenu.js b/components/interface/VFBListViewer/ListViewerControlsMenu.js index 3ec9e5a6c..5d3c0202e 100644 --- a/components/interface/VFBListViewer/ListViewerControlsMenu.js +++ b/components/interface/VFBListViewer/ListViewerControlsMenu.js @@ -47,11 +47,15 @@ class ListViewerControlsMenu extends Component { switch (action.handlerAction){ case ACTIONS.SHOW: this.props.instance.show(); - StackViewer1?.updateStackWidget(); + if ( StackViewer1 !=== undefined ) { + StackViewer1?.updateStackWidget(); + } break; case ACTIONS.HIDE: this.props.instance.hide(); - StackViewer1?.updateStackWidget(); + if ( StackViewer1 !=== undefined ) { + StackViewer1?.updateStackWidget(); + } break; case ACTIONS.SELECT: this.props.instance.select(); From 384eef55d04fef7825f3bcdb559ae0f7cf5b15ed Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 18 Jun 2021 17:32:55 -0700 Subject: [PATCH 3/4] #1140 eslint fix --- components/interface/VFBListViewer/ListViewerControlsMenu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/interface/VFBListViewer/ListViewerControlsMenu.js b/components/interface/VFBListViewer/ListViewerControlsMenu.js index 5d3c0202e..d180fdc9f 100644 --- a/components/interface/VFBListViewer/ListViewerControlsMenu.js +++ b/components/interface/VFBListViewer/ListViewerControlsMenu.js @@ -47,13 +47,13 @@ class ListViewerControlsMenu extends Component { switch (action.handlerAction){ case ACTIONS.SHOW: this.props.instance.show(); - if ( StackViewer1 !=== undefined ) { + if ( StackViewer1 !== undefined ) { StackViewer1?.updateStackWidget(); } break; case ACTIONS.HIDE: this.props.instance.hide(); - if ( StackViewer1 !=== undefined ) { + if ( StackViewer1 !== undefined ) { StackViewer1?.updateStackWidget(); } break; From 64f7b716821a9a0a5e24ec94b256b77c4a5f6f90 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 18 Jun 2021 21:22:07 -0700 Subject: [PATCH 4/4] #1140 eslint fix --- .../interface/VFBListViewer/ListViewerControlsMenu.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/interface/VFBListViewer/ListViewerControlsMenu.js b/components/interface/VFBListViewer/ListViewerControlsMenu.js index d180fdc9f..31f071130 100644 --- a/components/interface/VFBListViewer/ListViewerControlsMenu.js +++ b/components/interface/VFBListViewer/ListViewerControlsMenu.js @@ -47,14 +47,14 @@ class ListViewerControlsMenu extends Component { switch (action.handlerAction){ case ACTIONS.SHOW: this.props.instance.show(); - if ( StackViewer1 !== undefined ) { - StackViewer1?.updateStackWidget(); + if ( window["StackViewer1"] !== null ) { + window["StackViewer1"]?.updateStackWidget(); } break; case ACTIONS.HIDE: this.props.instance.hide(); - if ( StackViewer1 !== undefined ) { - StackViewer1?.updateStackWidget(); + if ( window["StackViewer1"] !== null ) { + window["StackViewer1"]?.updateStackWidget(); } break; case ACTIONS.SELECT: