Lot of changes in the user editor

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.ria / src / argeo-ria-lib / security / class / org / argeo / security / ria / UsersApplet.js

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
index 5eb44f42ed1b0feee5ebb76d97d51a8f3d74ebfb..9438113ffe9df51dc29ea7e184eb2d931777b658 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
@@ -34,7 +34,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                                shortcut        : "Control+n",
                                enabled         : true,
                                menu            : "Users",
-                               toolbar         : "userslist",
+                               toolbar         : null,
                                callback        : function(e){
                                        // Call service to delete
                                        var classObj = org.argeo.security.ria.UserEditorApplet;
@@ -49,7 +49,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                                shortcut        : "Control+s",
                                enabled         : true,
                                menu            : "Users",
-                               toolbar         : "userslist",
+                               toolbar         : null,
                                callback        : function(e){
                                        // Call service to delete
                                        var crtUsers = this.getViewSelection().getNodes();
@@ -69,13 +69,14 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                                shortcut        : "Control+u",
                                enabled         : true,
                                menu            : "Users",
-                               toolbar         : "userslist",
+                               toolbar         : null,
                                callback        : function(e){
                                        // Call service to delete
                                        var crtUser = this.getViewSelection().getNodes()[0];
+                                       var userObject = this.getUsersList()[crtUser];
                                        var classObj = org.argeo.security.ria.UserEditorApplet;
                                        var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", crtUser);
-                                       iView.load(crtUser);                                    
+                                       iView.load(userObject);                                 
                                },
                                selectionChange : function(viewName, data){
                                        if(viewName != "users") return;
@@ -95,6 +96,10 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                nullable:false, 
                check:"org.argeo.ria.components.ViewSelection"
        },
+       usersList : {
+               check : "Map",
+               event : "changeUsersList"
+       },
        instanceId : {init:""},
        instanceLabel : {init:""}
   },
@@ -107,7 +112,14 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
         */
        init : function(viewPane){
                this.setView(viewPane);
-               this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));                
+               this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));
+               
+               this.setUsersList({});
+               this.toolBar = new qx.ui.toolbar.ToolBar();
+               this.toolBarPart = new qx.ui.toolbar.Part();
+               this.toolBar.add(this.toolBarPart);             
+               viewPane.add(this.toolBar);
+                               
                this.tableModel = new qx.ui.table.model.Filtered();
                this.tableModel.setColumns(["username", "roles"]);
                this.table = new qx.ui.table.Table(this.tableModel, {
@@ -123,19 +135,24 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                this.table.getSelectionModel().addListener("changeSelection", function(){
                        this._selectionToValues(this.table.getSelectionModel(), this.getViewSelection());
                }, this);
-               
-               this.setGuiMode("chooser");
+               this.table.addListener("cellDblclick", function(cellEvent){
+                       this.getCommands()["edit_user"].command.execute();
+               }, this);
+               this.addListener("changeUsersList", function(){
+                       this._updateTableModel();               
+               }, this);
+               this.setGuiMode("clear");
        },
        
        _applyGuiMode : function(newMode, oldMode){
                this.table.getSelectionModel().clearSelection();
                this.resetHiddenRows();
                if(newMode == "filter"){
-                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_INTERVAL_SELECTION);
+                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_SELECTION);
                }else if(newMode == "chooser"){
                        this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.MULTIPLE_INTERVAL_SELECTION_TOGGLE);
                }else if(newMode == "clear"){
-                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_INTERVAL_SELECTION);
+                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_SELECTION);
                }
        },
        
@@ -166,8 +183,33 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
         * @param data {Element} The text xml description. 
         */
        load : function(){              
-               var data = [["root", "ROLE_ADMIN"], ["mbaudier", "ROLE_ADMIN,ROLE_USER"], ["cdujeu","ROLE_USER"], ["anonymous", ""]];
-               this.tableModel.setData(data);                  
+               var commands = this.getCommands();
+               this.toolBarPart.add(commands["new_user"].command.getToolbarButton());
+               this.toolBarPart.add(commands["delete_user"].command.getToolbarButton());
+               this.toolBarPart.add(commands["edit_user"].command.getToolbarButton());                 
+               this.toolBar.setShow("icon");
+
+               var request = org.argeo.security.ria.SecurityAPI.getListUsersService();
+               request.addListener("completed", function(response){
+                       var jSon = response.getContent();
+                       var usMap = {};
+                       for(var i=0;i<jSon.length;i++){
+                               var user = new org.argeo.security.ria.model.User();
+                               user.load(jSon[i], "json");
+                               usMap[user.getName()] = user;
+                       }
+                       this.setUsersList(usMap);                       
+               }, this);
+               request.send();
+       },
+       
+       _updateTableModel : function(){
+               var usList = this.getUsersList();
+               var data = [];
+               qx.lang.Object.getValues(usList).forEach(function(usObject){
+                       data.push([usObject.getName(), usObject.getRoles().join(",")]);
+               });
+               this.tableModel.setData(data);                                  
        },
        
        applySelection : function(selectionValues, target){