From b9f0dc6d3192adcbd4e9de8053b087e36759820e Mon Sep 17 00:00:00 2001
From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Sun, 20 Sep 2009 10:01:57 +0000
Subject: [PATCH] Various tweaks, everything is usable except password settings
 for the moment.

git-svn-id: https://svn.argeo.org/commons/trunk@2987 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org/argeo/security/ria/RolesApplet.js     | 31 ++++---
 .../org/argeo/security/ria/SecurityAPI.js     | 13 +--
 .../argeo/security/ria/UserEditorApplet.js    | 90 ++++++++++++++-----
 .../org/argeo/security/ria/UsersApplet.js     | 74 +++++++++++++--
 .../ria/components/CoworkerNatureImpl.js      |  5 +-
 .../org/argeo/security/ria/model/User.js      | 12 ++-
 6 files changed, 175 insertions(+), 50 deletions(-)

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 65b5427b3..353bedc28 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
@@ -59,13 +59,18 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   				callback	: function(e){
   					// Call service to delete
 					var roles = this.getViewSelection().getNodes();
-					for(var i=0;i<roles.length;i++){
-  						var service = org.argeo.security.ria.SecurityAPI.getDeleteRoleService(roles[i]);
-  						service.addListener("completed", function(response){
-  							this.loadRolesList();
-  						}, this);
-  						service.send();
-					}
+					var modal = new org.argeo.ria.components.Modal("Delete");					
+					modal.addConfirm("Are you sure you want to delete the selected roles?");
+					modal.addListener("ok", function(e){
+						for(var i=0;i<roles.length;i++){
+	  						var service = org.argeo.security.ria.SecurityAPI.getDeleteRoleService(roles[i]);
+	  						service.addListener("completed", function(response){
+	  							this.loadRolesList();
+	  						}, this);
+	  						service.send();
+						}
+					}, this);
+					modal.attachAndShow();					
   				},
   				selectionChange : function(viewName, data){
   					if(viewName != "roles") return;
@@ -253,8 +258,6 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   	},
   	
   	saveRoleModifications : function(deltaPlus, deltaMinus){
-  		//console.log(deltaPlus);
-  		//console.log(deltaMinus);
   		// LOAD CONCERNED USERS
   		var selectionModel = this.table.getSelectionModel();
 		if(!selectionModel.getSelectedCount()){
@@ -263,6 +266,8 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
 		var roleValue = this._selectionToValues(selectionModel)[0];
   		
   		var users = deltaPlus.concat(deltaMinus);
+  		var modal = new org.argeo.ria.components.Modal("Batch Update", "", "Please wait, updating roles for selected users");
+  		modal.attachAndShow();
   		for(var i=0;i<users.length;i++){
   			var user = users[i];
   			var userDetailService = org.argeo.security.ria.SecurityAPI.getUserDetailsService(users[i]);
@@ -274,13 +279,15 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   					qx.lang.Array.remove(userRoles, roleValue);
   				}
   				var userSaveService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(response.getContent());
-  				userSaveService.addListener("completed", function(e){
-  					this.fireDataEvent("changeRolesList", this.getRolesList());
-  				}, this);
+  				userSaveService.setAsynchronous(false);
   				userSaveService.send();
   			}, this);
+  			userDetailService.setAsynchronous(false);
   			userDetailService.send();
   		}
+  		this.fireDataEvent("changeRolesList", this.getRolesList());
+  		modal.hide();
+  		modal.destroy();
   	},
   	
   	monitorChooserSelectionChanges : function(event){
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 962f402d2..0d26d4776 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
@@ -46,8 +46,8 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 				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");
+					response.getTarget().abort();
+				}				
 			});
 
 			// Attach ILoadStatusables & reloadEvents
@@ -124,11 +124,12 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getCreateUserService : function(userName, password){
+		getCreateUserService : function(userObject){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREATE_USER_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
-			req.setParameter("username", userName);
-			req.setParameter("password", password);
+			req.setMethod("POST");
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			var jsonString = qx.util.Json.stringify(userObject);
+			req.setData(jsonString);
 			return req;
 		},
 		
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
index 55316d26e..38ca9c85c 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
@@ -9,12 +9,16 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
 {
   extend : qx.ui.container.Composite,
   implement : [org.argeo.ria.components.IView], 
-
+  
   construct : function(){
   	this.base(arguments);
 	this.setLayout(new qx.ui.layout.VBox(5));
   },
-
+  
+  events : {
+  	"savedUser" : "qx.event.type.Data"
+  },
+  
   properties : 
   {
   	/**
@@ -22,7 +26,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   	 */
   	view : {
   		init : null
-  	},
+  	},  	
   	/**
   	 * Commands definition, see {@link org.argeo.ria.event.CommandsManager#definitions} 
   	 */
@@ -251,12 +255,31 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		user.setName(this.usernameField.getValue());
   		user.setRoles((this.rolesField.getValue()||"").split(","));
   		// GO TO AND RETURN FROM SERVER
+  		if(user.isCreate()){
+  			var userExists = false;
+  			var req = org.argeo.security.ria.SecurityAPI.getUserExistsService(user.getName());
+  			req.addListener("completed", function(response){
+  				userExists = response.getContent().value;
+  			}, this);
+  			req.setAsynchronous(false);
+  			req.send();
+  			if(userExists){
+  				this.error("User already exists, choose another name!");
+  				return;
+  			}
+  		}
   		var userService = user.getSaveService();
   		userService.send();
-  		userService.addListener("completed", function(e){
+  		userService.addListener("completed", function(response){
+  			if(response.getContent().status && response.getContent().status == "ERROR"){
+  				return;
+  			}
+			this._setGuiInCreateMode(false);
+  			user.load(response.getContent(), "json");
   			this.partialRefreshUser(user, ["details","natures"]);
 			this.setModified(false);
 			this.getViewSelection().triggerEvent();
+			this.fireDataEvent("savedUser", user);
   		}, this);
   	},
   	
@@ -361,7 +384,19 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   			this._removeNatureTab(this.naturesTab.getSelected().getUserData("NATURE_CLASS"));
   		}
   	},
-  	  	
+  	  
+  	_setGuiInCreateMode : function(bool){
+  		if(bool){
+  			if(!this.natureButtonGB.isVisible()) return;
+  			this.natureButtonGB.hide();
+  			this.fakePane.setVisibility("excluded");
+  		}else{  			
+  			if(this.natureButtonGB.isVisible()) return;
+  			this.natureButtonGB.show();
+  			this.fakePane.setVisibility("visible");
+  		}
+  	},
+  	
   	_attachListeners : function(){
   		this.usernameField.addListener("changeValue", function(){
   			this.setModified(true);
@@ -387,30 +422,40 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		if(value) this.getViewSelection().triggerEvent();
   	},
   	
-  	loadUserData : function(user){
-  		this.setCurrentUser(user);
-  		this.usernameField.setValue(user.getName());
-  		this.usernameField.setReadOnly(true);
-  		this.rolesField.setValue(user.getRoles());
-		var userNatureTabs = this.naturesManager.detectNaturesInData(user.getNatures());
-		if(userNatureTabs.length){
-			userNatureTabs.forEach(function(el){
-				this._addNatureTab(el.NATURE_CLASS, el.NATURE_DATA);
-			}, this);
-		}  		
+  	loadUserData : function(userName){
+  		var userDataService = org.argeo.security.ria.SecurityAPI.getUserDetailsService(userName);
+  		userDataService.addListener("completed", function(response){
+  			var user = new org.argeo.security.ria.model.User();
+  			user.load(response.getContent(), "json");  			
+	  		this.setCurrentUser(user);
+	  		this.usernameField.setValue(user.getName());
+	  		this.usernameField.setReadOnly(true);
+	  		this.rolesField.setValue(user.getRoles());
+			var userNatureTabs = this.naturesManager.detectNaturesInData(user.getNatures());
+			if(userNatureTabs.length){
+				userNatureTabs.forEach(function(el){
+					this._addNatureTab(el.NATURE_CLASS, el.NATURE_DATA);
+				}, this);
+			}  	
+			this._attachListeners();			
+  		}, this);
+  		userDataService.send();
   	},
   	
   	partialRefreshUser : function(user, target){
   		if(!qx.lang.Array.isArray(target)) target = [target];
   		
   		if(qx.lang.Array.contains(target,"natures")){
+  			if(this.getSelectedNatureTab()){
+  				var selectedTab = this.getSelectedNatureTab().getUserData("NATURE_CLASS");
+  			}
   			this.removeAllTabs();
 			var userNatureTabs = this.naturesManager.detectNaturesInData(user.getNatures());
 			if(userNatureTabs.length){
 				userNatureTabs.forEach(function(el){
-					this._addNatureTab(el.NATURE_CLASS, el.NATURE_DATA);
+					this._addNatureTab(el.NATURE_CLASS, el.NATURE_DATA, (selectedTab && selectedTab == el.NATURE_CLASS));
 				}, this);
-			}  		  			
+			}			
   		}
   		if(qx.lang.Array.contains(target,"details")){
   			this.setInstanceLabel("User "+user.getName());
@@ -424,7 +469,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   	 * Load a given row : the data passed must be a simple data array.
   	 * @param data {Element} The text xml description. 
   	 */
-  	load : function(user){
+  	load : function(userName){
   		if(this.getLoaded()){
   			return;
   		}  		
@@ -452,11 +497,12 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		this.natureButtonGB.add(natureButton);
   		this.natureButtonGB.add(removeButton);
   		
-  		if(user){
-  			this.loadUserData(user);
-	  		this._attachListeners();
+  		if(userName){
+  			this.loadUserData(userName);
+  			this._setGuiInCreateMode(false);	  		
   		}else{
   			this.setCurrentUser(new org.argeo.security.ria.model.User());
+  			this._setGuiInCreateMode(true);
 	  		this._attachListeners();
   			this.setModified(true);
   		}
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 206bf1436..b107a3ee4 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
@@ -53,6 +53,9 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   					var initData = {USER:null,ROLES_LIST:this.getRolesList()};
 					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", initData);
 					iView.load();
+					iView.addListener("savedUser", function(e){
+						this.refreshUserEntry(e.getData());
+					}, this);					
   				},
   				command 	: null
   			},   	
@@ -65,14 +68,44 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   				toolbar  	: null,
   				callback	: function(e){
   					// Call service to delete
-					var crtUsers = this.getViewSelection().getNodes();
-					for(var i=0;i<crtUsers.length;i++){
-						alert("Delete " + crtUsers[i]);
+					var username = this.getViewSelection().getNodes()[0];					
+					var deleteService = org.argeo.security.ria.SecurityAPI.getDeleteUserService(username);
+					deleteService.addListener("completed", function(response){
+						if(response.getContent().status && response.getContent().status == "OK"){
+							this.loadUsersList();
+						}
+					}, this);
+					// Check if tab is opened before closing!
+					var editorTabPane = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor");
+					var iApplet = editorTabPane.contentExists(username);
+					var modal = new org.argeo.ria.components.Modal("Delete");
+					if(iApplet){
+ 						if(iApplet.getModified()){
+ 							modal.addConfirm("There are unsaved changes, are you sure you want to delete this user?");
+ 							modal.addListener("ok", function(e){
+ 								editorTabPane.closeCurrent();
+ 								deleteService.send();
+ 							}, this);
+ 							modal.attachAndShow();
+ 						}else{
+ 							modal.addConfirm("Are you sure you want to delete user " + username + "?");
+ 							modal.addListener("ok", function(e){
+ 								editorTabPane.closeCurrent();
+ 								deleteService.send();
+ 							}, this);
+ 							modal.attachAndShow();
+ 						}
+					}else{
+						modal.addConfirm("Are you sure you want to delete user " + username + "?");
+						modal.addListener("ok", function(e){
+							deleteService.send();
+						}, this);
+						modal.attachAndShow();
 					}
   				},
   				selectionChange : function(viewName, data){
   					if(viewName != "users") return;
-  					this.setEnabled(!(data == null || !data.length));  					
+  					this.setEnabled(!(data == null || !data.length || data.length>1));  					
   				},
   				command 	: null
   			},  			
@@ -85,12 +118,14 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   				toolbar  	: null,
   				callback	: function(e){
   					// Call service to delete
-					var crtUser = this.getViewSelection().getNodes()[0];
-					var userObject = this.getUsersList()[crtUser];
+					var crtUser = this.getViewSelection().getNodes()[0];					
   					var classObj = org.argeo.security.ria.UserEditorApplet;
   					var initData = {USER:crtUser,ROLES_LIST:this.getRolesList()};
 					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", initData);
-					iView.load(userObject);					
+					iView.load(crtUser);
+					iView.addListener("savedUser", function(e){
+						this.refreshUserEntry(e.getData());
+					}, this);
   				},
   				selectionChange : function(viewName, data){
   					if(viewName != "users") return;
@@ -216,6 +251,8 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	},
   	
   	loadUsersList : function(){
+  		var selectionModel = this.table.getSelectionModel();  		
+  		selectionModel.clearSelection();  		
   		var request = org.argeo.security.ria.SecurityAPI.getListUsersService();
   		request.addListener("completed", function(response){
   			var jSon = response.getContent();
@@ -230,6 +267,29 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		request.send();  		
   	},
   	
+  	/**
+  	 * 
+  	 * @param {org.argeo.security.ria.model.User} userObject
+  	 */
+  	refreshUserEntry : function(userObject){
+  		var userName = userObject.getName();
+  		var data = this.tableModel.getDataAsMapArray();
+  		var index = 0;
+  		var found = false;
+  		for(index=0;index<data.length;index++){
+  			if(data[index].username == userName){
+  				found =true;
+  				break;
+  			}
+  		}
+  		var newRows = [{username:userName,roles:userObject.getRoles().join(",")}];
+		if(found){
+			this.tableModel.setRowsAsMapArray(newRows, index);
+		}else{
+			this.tableModel.setRowsAsMapArray(newRows, index);
+		}
+  	},
+  	
   	_applyUsersList : function(usList){
   		var data = [];
   		qx.lang.Object.getValues(usList).forEach(function(usObject){
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
index e63d37479..41a4ca9dd 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
@@ -20,8 +20,9 @@ qx.Class.define("org.argeo.security.ria.components.CoworkerNatureImpl", {
 	  		grid.setColumnFlex(0,1);
 	  		grid.setColumnAlign(0,"right", "middle");
 	  		grid.setColumnFlex(1,3);
-			  		
-	  		this.descField = new qx.ui.form.TextField();
+			
+	  		grid.setRowAlign(0, "right", "top");
+	  		this.descField = new qx.ui.form.TextArea();
 	  		this.mobileField = new qx.ui.form.TextField();
 	  		this.phoneField = new qx.ui.form.TextField();
 	  		
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js
index 4595fbcb5..64ba63e4c 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js
@@ -13,22 +13,32 @@ qx.Class.define("org.argeo.security.ria.model.User", {
 		},
 		rawData : {
 			
+		},
+		create : {
+			check : "Boolean",
+			init : true
 		}
 	},
 	construct : function(){
 		this.base(arguments);
 		this.setRoles([]);
 		this.setNatures([]);
+		this.setRawData({"password":"{SHA}ieSV55Qc+eQOaYDRSha/AjzNTJE="});
 	},
 	members : {
 		load : function(data, format){
+			this.setCreate(false);
 			this.setName(data.username);
 			this.setRoles(data.roles);
 			this.setNatures(data.userNatures);
 			this.setRawData(data);
 		},
 		getSaveService : function(){
-	  		var userService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(this.toJSON());
+			if(this.isCreate()){
+		  		var userService = org.argeo.security.ria.SecurityAPI.getCreateUserService(this.toJSON());			
+			}else{
+		  		var userService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(this.toJSON());				
+			}
 	  		userService.addListener("completed", function(response){
 	  			if(!response || !response.username) return;
 	  			this.load(response.getContent(), "json");
-- 
2.30.2