From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Sat, 19 Sep 2009 19:30:57 +0000 (+0000)
Subject: Adapt to the absence of getRolesList() service...
X-Git-Tag: argeo-commons-2.1.30~1773
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=f7c73e12f9534b0b796686e207dd4b43193977fa

Adapt to the absence of getRolesList() service...

git-svn-id: https://svn.argeo.org/commons/trunk@2982 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
index 138042195..289637628 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
@@ -49,9 +49,9 @@ qx.Class.define("org.argeo.security.ria.Perspective", {
 		initViews : function(viewsManager) {
 
 			var rolesView = viewsManager.initIViewClass(org.argeo.security.ria.RolesApplet, "roles");
-			rolesView.load();
-			
 			var usersView = viewsManager.initIViewClass(org.argeo.security.ria.UsersApplet, "users");
+			
+			rolesView.load();			
 			usersView.load();
 			
 		},
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
index da45d965b..676aaa3d9 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
@@ -263,10 +263,11 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
 			return;
 		}
 		var uniqueValue = this._selectionToValues(selectionModel)[0];
-		var initSelection = this.rolesUsersStub[uniqueValue];
+		//var initSelection = this.rolesUsersStub[uniqueValue];
+		this.usersAppletReference.applySelection(uniqueValue, "roles");
+		var initSelection = this.usersAppletReference.getViewSelection().getNodes(); 
 		this.setChooserOriginalSelection(initSelection);
 		this.setChooserSelectionModified(false);
-		this.usersAppletReference.applySelection(initSelection, "username");
 		this.saveButton.setEnabled(false);
   	},
   	
@@ -304,10 +305,21 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   	 * Load a given row : the data passed must be a simple data array.
   	 * @param data {Element} The text xml description. 
   	 */
-  	load : function(){  		
+  	load : function(){
+  		// WARNING, THE USERS APPLET MUST BE LOADED!
+		var vManager = org.argeo.ria.components.ViewsManager.getInstance();
+		this.usersAppletReference = vManager.getViewPaneById("users").getContent();
+  		
+  		this.usersAppletReference.addListener("changeRolesList", function(event){
+  			var rolesList = event.getData();
+  			var data = [];
+  			rolesList.forEach(function(el){data.push([el]);});
+  			this.tableModel.setData(data);
+  		}, this);
+  		/*
   		var data = [["ROLE_ADMIN"],["ROLE_USER"]];
   		this.tableModel.setData(data);
-  		
+  		*/
   		var commands = this.getCommands();
   		this.toolBarPart.add(commands["new_role"].command.getToolbarButton());
   		this.toolBarPart.add(commands["delete_role"].command.getToolbarButton());
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js
index e138d861b..af3fabf95 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js
@@ -4,22 +4,19 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		
 		DEFAULT_CONTEXT : "/org.argeo.security.webapp",
 		
+		CREDENTIALS_SERVICE : "getCredentials.security",
+		
 		USERS_LIST_SERVICE : "getUsersList.security",
 		USER_EXISTS_SERVICE : "userExists.security",		
 		DELETE_USER_SERVICE : "deleteUser.security",
 		GET_USER_DETAILS_SERVICE : "getUserDetails.security",
 		CREATE_USER_SERVICE : "createUser.security",
 		UPDATE_USER_PASS_SERVICE : "updateUserPassword.security",
+		UPDATE_PASS_SERVICE : "updatePassword.security",
 
 		ROLES_LIST_SERVICE : "getRolesList.security",
-		GET_USERS_ROLE_SERVICE : "getUsersForRole.security",
 		CREATE_ROLE_SERVICE : "createRole.security",
-		DELETE_ROLE_SERVICE : "deleteRole.security",
-		
-		UPDATE_USER_ROLE_LNK_SERVICE : "updateUserRoleLink.security",
-		CREATE_NATURE_SERVICE : "createUserNature.security",
-		DELETE_NATURE_SERVICE : "deleteUserNature.security",
-		UPDATE_NATURE_SERVICE : "updateUserNature.security",
+		DELETE_ROLE_SERVICE : "deleteRole.security",		
 
 	  	/**
 		 * Standard Request getter
@@ -36,7 +33,23 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 				"application/json");
 		},
 		
+		/**
+		 * 
+		 * @param {qx.io.remote.Request} request
+		 * @param {Array} argumentsArray
+		 * @param {Integer} startIndex
+		 */
 		parseOptionalArguments : function(request, argumentsArray, startIndex){
+			// Attach Error listener
+			request.addListener("completed", function(response){
+				var jSonContent = response.getContent();  
+				if(typeof jSonContent == "object" && jSonContent.status && jSonContent.status == "ERROR"){
+					org.argeo.ria.components.Logger.getInstance().error(jSonContent.message);
+				}
+				request.setState("failed");
+			});
+
+			// Attach ILoadStatusables & reloadEvents
 			if(argumentsArray.length <= startIndex) return;
 			var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
 			for(var i=startIndex;i<argumentsArray.length;i++){
@@ -49,12 +62,19 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 			}
 		},
 		
+		getCredentialsService : function(){
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREDENTIALS_SERVICE);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 0);
+			return req;			
+		},
+		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getListUsersService : function(){
+		getListUsersService : function(getNatures){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.USERS_LIST_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			req.setParameter("getNatures", (getNatures || false));
 			return req;
 		},
 		
@@ -64,7 +84,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getUserExistsService : function(userName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.USER_EXISTS_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			req.setParameter("username", userName);
 			return req;
 		},
 		
@@ -74,7 +94,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getDeleteUserService : function(userName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.DELETE_USER_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			req.setParameter("username", userName);
 			return req;
 		},
 		
@@ -84,55 +104,59 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getUserDetailsService : function(userName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.GET_USER_DETAILS_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			req.setParameter("username", userName);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getCreateUserService : function(userName){
+		getCreateUserService : function(userName, password){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREATE_USER_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
+			req.setParameter("username", userName);
+			req.setParameter("password", password);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getUpdateUserPassService : function(userName, userPassword){
+		getUpdatePassService : function(oldPassword, newPassword){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_PASS_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
-			req.addParameter("userPassword", userPassword);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
+			req.setParameter("password", newPassword);
+			req.setParameter("oldpassword", oldPassword);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getListRolesService : function(){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.ROLES_LIST_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+		getUpdateUserPassService : function(userName, userPassword){
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_PASS_SERVICE);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
+			req.setParameter("username", userName);
+			req.setParameter("password", userPassword);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getUsersForRolesService : function(){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.GET_USERS_ROLE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+		getListRolesService : function(){
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.ROLES_LIST_SERVICE);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 0);
 			return req;
 		},
-		
+				
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
 		getCreateRoleService : function(roleName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREATE_ROLE_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			req.setParameter("role", roleName);
 			return req;
 		},
 		
@@ -142,49 +166,8 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getDeleteRoleService : function(roleName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.DELETE_ROLE_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			req.setParameter("role", roleName);
 			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getUpdateUserRoleLinkService : function(roleName, userName){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_ROLE_LNK_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("roleName", roleName);
-			req.addParameter("userName", userName);
-			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getCreateNatureService : function(natureData){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREATE_NATURE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("natureData", natureData);
-			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getDeleteNatureService : function(natureUuid){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.DELETE_NATURE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParamter("natureUuid", natureUuid);
-			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getUpdateNatureService : function(natureUuid, natureData){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_NATURE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParamter("natureUuid", natureUuid);
-			req.addParameter("natureData", natureData);
-			return req;
-		}		
+		}				
 	}
 });
\ No newline at end of file
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 9438113ff..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,6 +28,18 @@ 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",
@@ -98,8 +110,13 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	},
   	usersList : {
   		check : "Map",
+  		apply : "_applyUsersList",
   		event : "changeUsersList"
   	},
+  	rolesList : {
+  		check : "Array",
+  		event : "changeRolesList"
+  	},
   	instanceId : {init:""},
   	instanceLabel : {init:""}
   },
@@ -114,7 +131,6 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		this.setView(viewPane);
   		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);  		
@@ -138,9 +154,8 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
 		this.table.addListener("cellDblclick", function(cellEvent){
 			this.getCommands()["edit_user"].command.execute();
 		}, this);
-  		this.addListener("changeUsersList", function(){
-			this._updateTableModel();  		
-  		}, this);
+		
+  		this.setUsersList({});		
   		this.setGuiMode("clear");
   	},
   	
@@ -188,7 +203,10 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		this.toolBarPart.add(commands["delete_user"].command.getToolbarButton());
   		this.toolBarPart.add(commands["edit_user"].command.getToolbarButton());  		
   		this.toolBar.setShow("icon");
-
+		this.loadUsersList();
+  	},
+  	
+  	loadUsersList : function(){
   		var request = org.argeo.security.ria.SecurityAPI.getListUsersService();
   		request.addListener("completed", function(response){
   			var jSon = response.getContent();
@@ -200,29 +218,33 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   			}
   			this.setUsersList(usMap);  			
   		}, this);
-  		request.send();
+  		request.send();  		
   	},
   	
-  	_updateTableModel : function(){
-  		var usList = this.getUsersList();
+  	_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(selectionValues, target){
+  	  	
+  	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);
   			}
   		}
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/view-refresh.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/view-refresh.png
new file mode 100644
index 000000000..bb3803b07
Binary files /dev/null and b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/view-refresh.png differ