Merge pull request #6949 from GordonSmith/HPCC-12532

HPCC-12532 Superfile delete/remove confusion

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

esp/src/eclwatch/SFDetailsWidget.js

@@ -204,6 +204,9 @@ define([
                 },
                 store: this.subfilesStore
             }, this.id + "SubfilesGrid");
+            this.subfilesGrid.onSelectionChanged(function (event) {
+                context.refreshActionState();
+            });
             this.subfilesGrid.startup();
         },
 
@@ -256,6 +259,11 @@ define([
                 domClass.remove(this.id + "StateIdImage");
                 domClass.add(this.id + "StateIdImage", this.logicalFile.getStateIconClass());
             }
+        },
+
+        refreshActionState: function () {
+            var selection = this.subfilesGrid.getSelected();
+            registry.byId(this.id + "Remove").set("disabled", !selection.length);
         }
     });
 });

esp/src/eclwatch/nls/hpcc.js

@@ -89,6 +89,7 @@ define({root:
     DeleteSelectedUsers: "Delete selected user(s)?",
     DeleteSelectedWorkunits: "Delete Selected Workunits?",
     DeleteSuperfile: "Delete Superfile?",
+    DeleteSuperfile2: "Delete Superfile",
     DeleteThisPackage: "Delete this package?",
     Delimited: "Delimited",
     DenyAccess: "<center>Deny<br>Access</center>",
@@ -375,6 +376,7 @@ define({root:
     RemoteDali: "Remote Dali",
     RemoteDaliIP: "Remote Dali IP Address",
     Remove: "Remove",
+    RemoveSubfiles: "Remove Subfile(s)",
     RemoveUser: "You are about to remove yourself from the group:",
     Rename: "Rename",
     RenderedSVG: "Rendered SVG",

esp/src/eclwatch/templates/SFDetailsWidget.html

@@ -6,7 +6,7 @@
                     <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 id="${id}Save" data-dojo-attach-event="onClick:_onSave" data-dojo-type="dijit.form.Button">${i18n.Save}</div>
-                    <div id="${id}Delete" data-dojo-attach-event="onClick:_onDelete" data-dojo-type="dijit.form.Button">${i18n.Delete}</div>
+                    <div id="${id}Delete" data-dojo-attach-event="onClick:_onDelete" data-dojo-type="dijit.form.Button">${i18n.DeleteSuperfile2}</div>
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
                     <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>
@@ -29,7 +29,7 @@
                 </div>
                 <div style="width: 100%; height: 66%" data-dojo-props="region: 'bottom', splitter: true, minSize: 120" data-dojo-type="dijit.layout.BorderContainer">
                     <div class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.Toolbar">
-                        <div id="${id}Remove" data-dojo-attach-event="onClick:_onRemove" data-dojo-type="dijit.form.Button">${i18n.Remove}</div>
+                        <div id="${id}Remove" data-dojo-attach-event="onClick:_onRemove" data-dojo-type="dijit.form.Button">${i18n.RemoveSubfiles}</div>
                     </div>
                     <div id="${id}SubfilesGridCP" style="padding: 0px; border:0px; border-color:none" data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                         <div id="${id}SubfilesGrid">