Merge branch 'candidate-7.4.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

docs/EN_US/InstantCloud/InstantCloud.xml

@@ -318,8 +318,8 @@
     <sect1 id="InstaCloud_LaunchNewHPCC">
       <title>Launch a New HPCC Cluster</title>
 
-      <para>In this section, you will launch a set of Ubuntu 12.04 machines to
-      use for your HPCC Systems Thor platform. The Instant Cloud page uses the
+      <para>In this section, you will launch a set of Ubuntu machines to use
+      for your HPCC Systems Thor platform. The Instant Cloud page uses the
       input you specify to create your cluster for you.</para>
 
       <para>When you press the <emphasis role="bold">Launch Cluster

esp/src/eclwatch/ActivityWidget.js

@@ -83,7 +83,7 @@ define([
             //  Hitched actions  ---
             _onRefresh: function (event) {
                 this.inherited(arguments);
-                this.refreshUsage(true);
+                this.refreshUsage(false);
             },
 
             _onPause: function (event, params) {

esp/src/eclwatch/LFDetailsWidget.js

@@ -34,6 +34,7 @@ define([
     "hpcc/FileBelongsToWidget",
     "src/FileSpray",
     "hpcc/FileHistoryWidget",
+    "src/DataPatternsWidget",
 
     "dojo/text!../templates/LFDetailsWidget.html",
 
@@ -49,7 +50,7 @@ define([
 
 ], function (exports, declare, lang, i18n, nlsHPCC, arrayUtil, dom, domAttr, domClass, domForm, query,
     BorderContainer, TabContainer, ContentPane, Toolbar, TooltipDialog, Form, SimpleTextarea, TextBox, Button, DropDownButton, TitlePane, registry,
-    _TabContainerWidget, DelayLoadWidget, TargetSelectWidget, TargetComboBoxWidget, Clippy, ESPLogicalFile, ESPDFUWorkunit, FileBelongsToWidget, FileSpray, FileHistoryWidget,
+    _TabContainerWidget, DelayLoadWidget, TargetSelectWidget, TargetComboBoxWidget, Clippy, ESPLogicalFile, ESPDFUWorkunit, FileBelongsToWidget, FileSpray, FileHistoryWidget, DataPatternsWidget,
     template) {
         exports.fixCircularDependency = declare("LFDetailsWidget", [_TabContainerWidget], {
             templateString: template,
@@ -460,7 +461,7 @@ define([
                 this.setDisabled(this.id + "RenameDropDown", this.logicalFile.isDeleted());
                 this.setDisabled(this.id + "DesprayDropDown", this.logicalFile.isDeleted());
                 this.setDisabled(this.id + "_Content", this.logicalFile.isDeleted() || !this.logicalFile.Ecl);
-                this.setDisabled(this.id + "_DataPatterns", this.logicalFile.isDeleted() || this.logicalFile.ContentType === "key");
+                this.setDisabled(this.id + "_DataPatterns", this.logicalFile.isDeleted() || !DataPatternsWidget.supportedFileType(this.logicalFile.ContentType));
                 this.setDisabled(this.id + "_Source", this.logicalFile.isDeleted() || !this.logicalFile.Ecl);
                 this.setDisabled(this.id + "_DEF", this.logicalFile.isDeleted() || !this.logicalFile.Ecl);
                 this.setDisabled(this.id + "_XML", this.logicalFile.isDeleted() || !this.logicalFile.Ecl);

esp/src/src/DataPatternsWidget.ts

@@ -49,6 +49,8 @@ type _TabContainerWidget = {
     addChild(tabItem: any, pos: number);
 };
 
+export const supportedFileType = (contentType: string): boolean => ["flat", "csv", "thor"].indexOf((contentType || "").toLowerCase()) >= 0;
+
 export interface DataPatternsWidget extends _TabContainerWidget {
 }
 

esp/src/src/DiskUsage.ts

@@ -11,7 +11,7 @@ Palette.rainbow("DiskUsage", ["green", "green", "green", "green", "green", "gree
 
 export class Summary extends FlexGrid {
 
-    private _connection = new MachineService({ baseUrl: "" });
+    private _connection = new MachineService({ baseUrl: "", timeoutSecs: 360 });
     private _loadingMsg;
     private _usage: { [id: string]: { details: GetTargetClusterUsageEx.TargetClusterUsage, gauge: Gauge } } = {};