Merge pull request #12703 from GordonSmith/HPCC-22384

HPCC-22384 ECL Watch Max Page not working on Topology

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/eclwatch/GridDetailsWidget.js

@@ -21,6 +21,7 @@ define([
     "dijit/layout/BorderContainer",
     "dijit/Toolbar",
     "dijit/form/Button",
+    "dijit/form/ToggleButton",
     "dijit/ToolbarSeparator",
     "dijit/layout/ContentPane"
 

esp/src/eclwatch/templates/DynamicESDLDefinitionDetailsWidget.html

@@ -2,10 +2,6 @@
     <div id="${id}BorderContainer" class="${baseClass}BorderContainer" style="width: 100%; height: 100%;" data-dojo-type="dijit.layout.BorderContainer">
         <div id="${id}TabContainer" data-dojo-props="region: 'center', tabPosition: 'top'" style="width: 100%; height: 100%" data-dojo-type="dijit.layout.TabContainer">
             <div id="${id}_Summary" style="width: 100%; height: 100%" data-dojo-props="title:'${i18n.XML}'" data-dojo-type="dijit.layout.BorderContainer">
-                <div id="${id}Toolbar" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.Toolbar">
-                    <div class="right" data-dojo-attach-event="onChange:_onMaximize" data-dojo-props="iconClass:'iconMaximize', showLabel:false" checked=false data-dojo-type="dijit.form.ToggleButton">${i18n.MaximizeRestore}</div>
-                    <div id="${id}NewPage" class="right" data-dojo-attach-event="onClick:_onNewPage" data-dojo-props="iconClass:'iconNewPage', showLabel:false" data-dojo-type="dijit.form.Button">${i18n.OpenInNewPage}</div>
-                </div>
                 <div id="${id}_XML" data-dojo-props="region: 'center'" data-dojo-type="ECLSourceWidget"></div>
             </div>
         </div>

esp/src/eclwatch/templates/TopologyDetailsWidget.html

@@ -4,9 +4,6 @@
             <div id="${id}_Summary" style="width: 100%; height: 100%" data-dojo-props="title:'${i18n.Summary}', iconClass:'iconWorkunit'" data-dojo-type="dijit.layout.BorderContainer">
                 <div id="${id}Toolbar" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.Toolbar">
                     <div id="${id}Refresh" data-dojo-attach-event="onClick:_onRefresh" data-dojo-props="iconClass:'iconRefresh'" data-dojo-type="dijit.form.Button">${i18n.Refresh}</div>
-                    <span data-dojo-type="dijit.ToolbarSeparator"></span>
-                    <div class="right" data-dojo-attach-event="onChange:_onMaximize" data-dojo-props="iconClass:'iconMaximize', showLabel:false" checked=false data-dojo-type="dijit.form.ToggleButton">${i18n.MaximizeRestore}</div>
-                    <div id="${id}NewPage" class="right" data-dojo-attach-event="onClick:_onNewPage" data-dojo-props="iconClass:'iconNewPage', showLabel:false" data-dojo-type="dijit.form.Button">${i18n.OpenInNewPage}</div>
                 </div>
                 <div id="${id}_Details" data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                     ${i18n.PleaseSelectATopologyItem}

esp/src/src/ESPUtil.ts

@@ -543,7 +543,7 @@ export function maximizeWidget(widget: any, max: boolean, prev?: IMaximizeState)
             var retVal: IMaximizeState = {
                 parentNode: widget.domNode.parentNode,
                 nextElementSibling: widget.domNode.nextElementSibling,
-                stylePosition: domStyle.set(widget.domNode, "position"),
+                stylePosition: domStyle.get(widget.domNode, "position"),
                 stubResize: stub.resize,
                 widgetResize: widget.resize
             };
@@ -566,7 +566,11 @@ export function maximizeWidget(widget: any, max: boolean, prev?: IMaximizeState)
             widget.resize = prev.widgetResize;
             stub.resize = prev.stubResize;
 
-            prev.parentNode.insertBefore(widget.domNode, prev.nextElementSibling);
+            if (prev.nextElementSibling) {
+                prev.parentNode.insertBefore(widget.domNode, prev.nextElementSibling);
+            } else {
+                prev.parentNode.appendChild(widget.domNode);
+            }
             domStyle.set(widget.domNode, "position", prev.stylePosition);
 
             stub.resize();