Merge pull request #5962 from GordonSmith/HPCC-11530

HPCC-11530 Disable sorting in permission pages

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

esp/src/eclwatch/GroupDetailsWidget.js

@@ -32,8 +32,7 @@ define([
 
     "hpcc/_TabContainerWidget",
     "hpcc/ws_access",
-    "hpcc/MembersWidget",
-    "hpcc/PermissionsWidget",
+    "hpcc/DelayLoadWidget",
 
     "dojo/text!../templates/GroupDetailsWidget.html",
 
@@ -48,7 +47,7 @@ define([
 ], function (declare, lang, i18n, nlsHPCC, dom, domAttr,
                 registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
-                _TabContainerWidget, WsAccess, MembersWidget, PermissionsWidget,
+                _TabContainerWidget, WsAccess, DelayLoadWidget,
                 template) {
     return declare("GroupDetailsWidget", [_TabContainerWidget], {
         templateString: template,

esp/src/eclwatch/UserDetailsWidget.js

@@ -33,8 +33,7 @@ define([
 
     "hpcc/_TabContainerWidget",
     "hpcc/ws_access",
-    "hpcc/MemberOfWidget",
-    "hpcc/PermissionsWidget",
+    "hpcc/DelayLoadWidget",
 
     "dojo/text!../templates/UserDetailsWidget.html",
 
@@ -52,7 +51,7 @@ define([
 ], function (declare, lang, i18n, nlsHPCC, dom, domAttr, domForm,
                 registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
-                _TabContainerWidget, WsAccess, MemberOfWidget, PermissionsWidget,
+                _TabContainerWidget, WsAccess, DelayLoadWidget,
                 template) {
     return declare("UserDetailsWidget", [_TabContainerWidget], {
         templateString: template,

esp/src/eclwatch/UserQueryWidget.js

@@ -137,6 +137,7 @@ define([
                     request: request
                 }).then(function (response) {
                     context.refreshGroupsGrid(true);
+                    return response;
                 });
             }
         },
@@ -155,7 +156,11 @@ define([
                 WsAccess.GroupAdd({
                     request: request
                 }).then(function (response) {
-                    context.refreshGroupsGrid();
+                    if (lang.exists("GroupAddResponse.retcode", response) && response.GroupAddResponse.retcode === 0) {
+                        context.refreshGroupsGrid();
+                        context._onGroupsRowDblClick(response.GroupAddResponse.groupname);
+                    }
+                    return response;
                 });
                 registry.byId(this.id + "AddGroupsDropDown").closeDropDown();
             }
@@ -222,7 +227,11 @@ define([
                 WsAccess.AddUser({
                     request: request
                 }).then(function (response) {
-                    context.refreshUsersGrid();
+                    if (lang.exists("AddUserResponse.retcode", response) && response.AddUserResponse.retcode === 0) {
+                        context.refreshUsersGrid();
+                        context._onUsersRowDblClick(request.username);
+                    }
+                    return response;
                 });
                 registry.byId(this.id + "AddUsersDropDown").closeDropDown();
             }
@@ -242,6 +251,7 @@ define([
                     request: request
                 }).then(function (response) {
                     context.refreshPermissionsGrid();
+                    return response;
                 });
                 registry.byId(this.id + "AddPermissionsDropDown").closeDropDown();
             }
@@ -304,6 +314,7 @@ define([
                         label: " "
                     }, "checkbox"),
                     name: {
+                        sortable: false,
                         label: this.i18n.GroupName
                     }
                 }
@@ -390,13 +401,16 @@ define([
                     },"checkbox"),
                     username: {
                         width: 180,
+                        sortable: false,
                         label: this.i18n.Username
                     },
                     fullname: {
+                        sortable: false,
                         label: this.i18n.FullName
                     },
                     passwordexpiration: {
                         width: 180,
+                        sortable: false,
                         label: this.i18n.PasswordExpiration
                     }
                 }
@@ -507,9 +521,11 @@ define([
                     }, "checkbox"),
                     DisplayName: tree({
                         width: 360,
+                        sortable: false,
                         label: this.i18n.Name
                     }),
                     basedn: {
+                        sortable: false,
                         label: "basedn"
                     }
                 }

esp/src/eclwatch/templates/GroupDetailsWidget.html

@@ -21,8 +21,8 @@
                     </form>
                 </div>
             </div>
-            <div id="${id}_Members" data-dojo-props='title:"${i18n.Members}", iconClass:"iconGroups"' data-dojo-type="MembersWidget"></div>
-            <div id="${id}_Permissions" data-dojo-props='title:"${i18n.GroupPermissions}", iconClass:"iconFolder"' data-dojo-type="PermissionsWidget"></div>
+            <div id="${id}_Members" data-dojo-props="delayWidget: 'MembersWidget', title:'${i18n.Members}', iconClass:'iconGroups'" data-dojo-type="DelayLoadWidget"></div>
+            <div id="${id}_Permissions" data-dojo-props="delayWidget: 'PermissionsWidget', title:'${i18n.GroupPermissions}', iconClass:'iconFolder'" data-dojo-type="DelayLoadWidget"></div>
         </div>
     </div>
 </div>

esp/src/eclwatch/templates/UserDetailsWidget.html

@@ -43,8 +43,8 @@
                     </form>
                 </div>
             </div>
-            <div id="${id}_MemberOf" data-dojo-props='title:"${i18n.MemberOf}", iconClass:"iconGroups"' data-dojo-type="MemberOfWidget"></div>
-            <div id="${id}_UserPermissions" data-dojo-props='title:"${i18n.UserPermissions}", iconClass:"iconFolder"' data-dojo-type="PermissionsWidget"></div>
+            <div id="${id}_MemberOf" data-dojo-props="delayWidget: 'MemberOfWidget', title:'${i18n.MemberOf}', iconClass:'iconGroups'" data-dojo-type="DelayLoadWidget"></div>
+            <div id="${id}_UserPermissions" data-dojo-props="delayWidget: 'PermissionsWidget', title:'${i18n.UserPermissions}', iconClass:'iconFolder'" data-dojo-type="DelayLoadWidget"></div>
         </div>
     </div>
 </div>