X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.ria%2Fsrc%2Fargeo-ria-lib%2Fsecurity%2Fclass%2Forg%2Fargeo%2Fsecurity%2Fria%2FUsersApplet.js;h=6a00e787cdcb9d2b82db3826169e907063761cc2;hb=f7c73e12f9534b0b796686e207dd4b43193977fa;hp=5eb44f42ed1b0feee5ebb76d97d51a8f3d74ebfb;hpb=829163c2a8aa042407a6fd2ee45d10cea69e933f;p=lgpl%2Fargeo-commons.git

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 5eb44f42e..6a00e787c 100644
--- 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
@@ -28,13 +28,25 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	 */
   	commands : {
   		init : {
+  			"load_users" : {
+  				label 		: "Reload Users",
+  				icon 		: "org.argeo.security.ria/view-refresh.png",
+  				shortcut	: "Control+h",
+  				enabled 	: true,
+  				menu		: "Users",
+  				toolbar		: "users",
+  				callback	: function(e){
+  					this.loadUsersList();
+  				},
+  				command		: null
+  			},
   			"new_user" : {
   				label	 	: "New User", 
   				icon 		: "org.argeo.security.ria/list-add.png",
   				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 +61,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 +81,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 +108,15 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		nullable:false, 
   		check:"org.argeo.ria.components.ViewSelection"
   	},
+  	usersList : {
+  		check : "Map",
+  		apply : "_applyUsersList",
+  		event : "changeUsersList"
+  	},
+  	rolesList : {
+  		check : "Array",
+  		event : "changeRolesList"
+  	},
   	instanceId : {init:""},
   	instanceLabel : {init:""}
   },
@@ -107,7 +129,13 @@ 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.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 +151,23 @@ 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.setUsersList({});		
+  		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,21 +198,53 @@ 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");
+		this.loadUsersList();
   	},
   	
-  	applySelection : function(selectionValues, target){
+  	loadUsersList : function(){
+  		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();  		
+  	},
+  	
+  	_applyUsersList : function(usList){
+  		var data = [];
+  		var rolesList = [];
+  		qx.lang.Object.getValues(usList).forEach(function(usObject){
+  			var roles = usObject.getRoles();
+  			rolesList = qx.lang.Array.unique(rolesList.concat(roles));
+  			data.push([usObject.getName(), usObject.getRoles().join(",")]);
+  		});
+  		this.setRolesList(rolesList);
+  		this.tableModel.setData(data);  		  		
+  	},
+  	  	
+  	applySelection : function(selectionValue, target, ignoreCase){
   		var selectionModel = this.table.getSelectionModel();  		
   		selectionModel.clearSelection();
-  		if(!selectionValues){
+  		if(!selectionValue){
   			return;
   		}
   		selectionModel.setBatchMode(true);
   		var data = this.tableModel.getData();
   		for(var i=0;i<this.tableModel.getRowCount();i++){
   			var value = this.tableModel.getRowDataAsMap(i)[target];
-  			if(qx.lang.Array.contains(selectionValues, value)){
+  			var pattern = new RegExp(selectionValue, "g"+(ignoreCase?"i":""));
+  			if(pattern.test(value)){
   				selectionModel.addSelectionInterval(i, i);
   			}
   		}