HPCC-9036 Remove "Legacy" pages

Remove legacy tabs from new ECL Watch.
Re-instate links on Wu Details Page.

Fixes HPCC-9036

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>

esp/eclwatch/ws_XSLT/wuidcommon.xslt

@@ -45,6 +45,8 @@
                   <xsl:value-of select="$wuid"/>
                   &nbsp;
                   <a href="/esp/iframe?esp_iframe_title=ECL Workunit XML - {$wuid}&amp;inner=/WsWorkunits/WUFile%3fWuid%3d{$wuid}%26Type%3dXML" >XML</a>
+                  &nbsp;
+                  <a href="/esp/iframe?esp_iframe_title=ECL Playground - {$wuid}&amp;inner=/esp/files/stub.htm%3fWidget%3dECLPlaygroundWidget%26Wuid%3d{$wuid}%26Target%3d{Cluster}" >ECL Playground</a>
                 </xsl:otherwise>
               </xsl:choose>
             </td>
@@ -396,6 +398,8 @@
                 <A href="javascript:void(0)" onclick="toggleElement('Results');" id="explinkresults" class="wusectionexpand">
                   Results: (<xsl:value-of select="ResultCount"/>)
                 </A>
+                &nbsp;-&nbsp;
+                <a href="/esp/iframe?esp_iframe_title=Results - {$wuid}&amp;inner=/esp/files/stub.htm%3fWidget%3dResultsWidget%26Wuid%3d{$wuid}%26TabPosition%3dtop" >Show</a>
               </div>
             </div>
             <div id="Results" class="wusectioncontent">

esp/files/scripts/DFUWUQueryWidget.js

@@ -65,8 +65,6 @@ define([
         baseClass: "DFUWUQueryWidget",
         workunitsTab: null,
         workunitsGrid: null,
-        legacyPane: null,
-        legacyPaneLoaded: false,
 
         tabMap: [],
 
@@ -74,7 +72,6 @@ define([
             this.inherited(arguments);
             this.workunitsTab = registry.byId(this.id + "_Workunits");
             this.workunitsGrid = registry.byId(this.id + "WorkunitsGrid");
-            this.legacyPane = registry.byId(this.id + "_Legacy");
             this.clusterTargetSelect = registry.byId(this.id + "ClusterTargetSelect");
         },
 
@@ -196,7 +193,6 @@ define([
                 return;
             this.initalized = true;
 
-            this.selectChild(this.legacyPane, true);
             this.clusterTargetSelect.init({
                 Groups: true,
                 includeBlank: true
@@ -207,14 +203,6 @@ define([
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
                 if (currSel.id == this.workunitsTab.id) {
-                } else if (currSel.id == this.legacyPane.id) {
-                    if (!this.legacyPaneLoaded) {
-                        this.legacyPaneLoaded = true;
-                        this.legacyPane.set("content", dojo.create("iframe", {
-                            src: "/WsDfu/DFUQuery",
-                            style: "border: 0; width: 100%; height: 100%"
-                        }));
-                    }
                 } else {
                     if (!currSel.initalized) {
                         currSel.init(currSel._hpccParams);

esp/files/scripts/GetDFUWorkunitsWidget.js

@@ -217,7 +217,6 @@ define([
             if (this.initalized)
                 return;
             this.initalized = true;
-            this.tabContainer.selectChild(this.legacyPane);
         },
 
         initWorkunitsGrid: function() {

esp/files/scripts/LFDetailsWidget.js

@@ -76,8 +76,6 @@ define([
         workunitWidgetLoaded: false,
         dfuWorkunitWidget: null,
         dfuWorkunitWidgetLoaded: false,
-        legacyPane: null,
-        legacyPaneLoaded: false,
 
         logicalFile: null,
         prevState: "",
@@ -93,7 +91,6 @@ define([
             this.filePartsWidget = registry.byId(this.id + "_FileParts");
             this.workunitWidget = registry.byId(this.id + "_Workunit");
             this.dfuWorkunitWidget = registry.byId(this.id + "_DFUWorkunit");
-            this.legacyPane = registry.byId(this.id + "_Legacy");
             this.copyTargetSelect = registry.byId(this.id + "CopyTargetSelect");
             this.desprayTargetSelect = registry.byId(this.id + "DesprayTargetSelect");
         },
@@ -216,12 +213,6 @@ define([
                 this.dfuWorkunitWidget.init({
                     Wuid: this.logicalFile.Wuid
                 });
-            } else if (currSel.id == this.legacyPane.id && !this.legacyPaneLoaded) {
-                this.legacyPaneLoaded = true;
-                this.legacyPane.set("content", dojo.create("iframe", {
-                    src: "/WsDfu/DFUInfo?Name=" + this.logicalFile.Name,//+ "&Cluster=" + this.logicalFile.cluster,
-                    style: "border: 0; width: 100%; height: 100%"
-                }));
             }
         },
 

esp/files/scripts/ResultsWidget.js

@@ -39,9 +39,9 @@ define([
         baseClass: "ResultsWidget",
 
         //borderContainer: null,
-        tabContainer: null,
         tabMap: [],
         selectedTab: null,
+        TabPosition: "bottom",
 
         onErrorClick: function (line, col) {
         },

esp/files/scripts/SFDetailsWidget.js

@@ -68,8 +68,6 @@ define([
         borderContainer: null,
         tabContainer: null,
         summaryWidget: null,
-        legacyPane: null,
-        legacyPaneLoaded: false,
         subfilesGrid: null,
 
         logicalFile: null,
@@ -79,7 +77,6 @@ define([
         postCreate: function (args) {
             this.inherited(arguments);
             this.summaryWidget = registry.byId(this.id + "_Summary");
-            this.legacyPane = registry.byId(this.id + "_Legacy");
             this.subfilesGrid = registry.byId(this.id + "SubfilesGrid");
         },
 
@@ -226,13 +223,6 @@ define([
 
         initTab: function () {
             var currSel = this.getSelectedChild();
-            if (currSel.id == this.legacyPane.id && !this.legacyPaneLoaded) {
-                this.legacyPaneLoaded = true;
-                this.legacyPane.set("content", dojo.create("iframe", {
-                    src: "/WsDfu/DFUInfo?Name=" + this.logicalFile.Name,//+ "&Cluster=" + this.logicalFile.cluster,
-                    style: "border: 0; width: 100%; height: 100%"
-                }));
-            }
         },
 
         showMessage: function (msg) {

esp/files/scripts/WUDetailsWidget.js

@@ -72,8 +72,6 @@ define([
         playgroundWidgetLoaded: false,
         xmlWidget: null,
         xmlWidgetLoaded: false,
-        legacyPane: null,
-        legacyPaneLoaded: false,
 
         initalized: false,
         wu: null,
@@ -90,7 +88,6 @@ define([
             this.logsWidget = registry.byId(this.id + "_Logs");
             this.playgroundWidget = registry.byId(this.id + "_Playground");
             this.xmlWidget = registry.byId(this.id + "_XML");
-            this.legacyPane = registry.byId(this.id + "_Legacy");
 
             this.infoGridWidget = registry.byId(this.id + "InfoContainer");
         },
@@ -202,12 +199,6 @@ define([
                 this.xmlWidget.init({
                     Wuid: this.wu.Wuid
                 });
-            } else if (currSel.id == this.legacyPane.id && !this.legacyPaneLoaded) {
-                this.legacyPaneLoaded = true;
-                this.legacyPane.set("content", dojo.create("iframe", {
-                    src: "/WsWorkunits/WUInfo?Wuid=" + this.wu.Wuid + "&IncludeExceptions=0&IncludeGraphs=0&IncludeSourceFiles=0&IncludeResults=0&IncludeVariables=0&IncludeTimers=0&IncludeDebugValues=0&IncludeApplicationValues=0&IncludeWorkflows&SuppressResultSchemas=1",
-                    style: "border: 0; width: 100%; height: 100%"
-                }));
             }
         },
 

esp/files/scripts/WUQueryWidget.js

@@ -64,8 +64,6 @@ define([
 
         workunitsTab: null,
         workunitsGrid: null,
-        legacyPane: null,
-        legacyPaneLoaded: false,
 
         tabMap: [],
 
@@ -75,7 +73,6 @@ define([
             this.inherited(arguments);
             this.workunitsTab = registry.byId(this.id + "_Workunits");
             this.workunitsGrid = registry.byId(this.id + "WorkunitsGrid");
-            this.legacyPane = registry.byId(this.id + "_Legacy");
         },
 
         startup: function (args) {
@@ -314,14 +311,6 @@ define([
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
                 if (currSel.id == this.workunitsTab.id) {
-                } else if (currSel.id == this.legacyPane.id) {
-                    if (!this.legacyPaneLoaded) {
-                        this.legacyPaneLoaded = true;
-                        this.legacyPane.set("content", dojo.create("iframe", {
-                            src: "/WsWorkunits/WUQuery",
-                            style: "border: 0; width: 100%; height: 100%"
-                        }));
-                    }
                 } else {
                     if (!currSel.initalized) {
                         currSel.init(currSel.params);

esp/files/stub.js

@@ -14,6 +14,7 @@
 #    limitations under the License.
 ############################################################################## */
 define([
+    "dojo/_base/lang",
     "dojo/_base/fx",
     "dojo/_base/window",
     "dojo/dom",
@@ -25,7 +26,7 @@ define([
 
     "dojox/widget/Toaster",
     "dojox/widget/Standby"
-], function (fx, baseWindow, dom, domStyle, domGeometry, ioQuery, topic, ready,
+], function (lang, fx, baseWindow, dom, domStyle, domGeometry, ioQuery, topic, ready,
         Toaster, Standby) {
 
     var initUi = function () {
@@ -34,20 +35,19 @@ define([
         require(
             ["hpcc/" + params.Widget],
             function (WidgetClass) {
-                var params = {
+                var webParams = {
                     id: "stub",
                     "class": "hpccApp"
                 };
-                var widget = WidgetClass.fixCircularDependency ? new WidgetClass.fixCircularDependency(params) : new WidgetClass(params);
+                if (params.TabPosition) {
+                    lang.mixin(webParams, {
+                        TabPosition: params.TabPosition
+                    });
+                }
+                var widget = WidgetClass.fixCircularDependency ? new WidgetClass.fixCircularDependency(webParams) : new WidgetClass(webParams);
 
                 var standbyBackground = new Standby({
-                    /*
-                    color: "red",
-                    image: "img/loading.gif",
-                    imageText: "Loading...",
-                    duration: 1,
-                    zIndex: 1000,
-                    */
+                    color: "#FAFAFA",
                     text: "",
                     centerIndicator: "text",
                     target: "stub"

esp/files/templates/DFUWUQueryWidget.html

@@ -55,8 +55,6 @@
                 }" data-dojo-type="dojox.grid.EnhancedGrid">
                 </div>
             </div>
-            <div id="${id}_Legacy" title="Legacy Web Page" data-dojo-type="dijit.layout.ContentPane">
-            </div>
         </div>
     </div>
 </div>

esp/files/templates/LFDetailsWidget.html

@@ -212,8 +212,6 @@
             </div>
             <div id="${id}_DFUWorkunit" title="Workunit" data-dojo-type="DFUWUDetailsWidget">
             </div>
-            <div id="${id}_Legacy" title="Legacy Web Page" data-dojo-type="dijit.layout.ContentPane">
-            </div>
         </div>
     </div>
 </div>

esp/files/templates/ResultsWidget.html

@@ -1,4 +1,4 @@
 <div class="${baseClass}">
-    <div id="${id}TabContainer" style="width: 100%; height: 100%" data-dojo-props="tabPosition: 'bottom'" data-dojo-type="dijit.layout.TabContainer">
+    <div id="${id}TabContainer" style="width: 100%; height: 100%" data-dojo-props="tabPosition: '${TabPosition}'" data-dojo-type="dijit.layout.TabContainer">
     </div>
 </div>

esp/files/templates/SFDetailsWidget.html

@@ -39,8 +39,6 @@
                     </div>
                 </div>
             </div>
-            <div id="${id}_Legacy" title="Legacy Web Page" data-dojo-type="dijit.layout.ContentPane">
-            </div>
         </div>
     </div>
 </div>

esp/files/templates/WUDetailsWidget.html

@@ -93,8 +93,6 @@
             </div>
             <div id="${id}_XML" title="XML" data-dojo-props="WUXml: true" data-dojo-type="ECLSourceWidget">
             </div>
-            <div id="${id}_Legacy" title="Legacy Web Page" data-dojo-type="dijit.layout.ContentPane">
-            </div>
         </div>
     </div>
 </div>

esp/files/templates/WUQueryWidget.html

@@ -85,8 +85,6 @@
                 }" data-dojo-type="dojox.grid.EnhancedGrid">
                 </div>
             </div>
-            <div id="${id}_Legacy" title="Legacy Web Page" data-dojo-type="dijit.layout.ContentPane">
-            </div>
         </div>
     </div>
 </div>