From 98c2719d08b7d1791eb2080b4488bba810044608 Mon Sep 17 00:00:00 2001
From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Fri, 18 Sep 2009 16:33:23 +0000
Subject: [PATCH] Lot of changes in the user editor

git-svn-id: https://svn.argeo.org/commons/trunk@2973 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org/argeo/security/ria/RolesApplet.js     |  28 +-
 .../org/argeo/security/ria/SecurityAPI.js     |   4 +-
 .../argeo/security/ria/UserEditorApplet.js    | 327 +++++++++++++++---
 .../org/argeo/security/ria/UsersApplet.js     |  37 +-
 .../ria/components/CoworkerNatureImpl.js      |  15 +-
 .../security/ria/components/INaturePane.js    |  13 +-
 .../security/ria/components/NaturesManager.js |  39 +++
 .../ria/components/SimpleUserNatureImpl.js    |  35 +-
 .../org/argeo/security/ria/model/Nature.js    |   5 +-
 .../org/argeo/security/ria/model/User.js      |  13 +
 .../org.argeo.security.ria/dialog-apply.png   | Bin 0 -> 872 bytes
 .../org.argeo.security.ria/dialog-cancel.png  | Bin 0 -> 786 bytes
 .../document-properties-22.png                | Bin 0 -> 925 bytes
 .../org.argeo.security.ria/identity.png       | Bin 0 -> 5091 bytes
 .../preferences-users.png                     | Bin 0 -> 1870 bytes
 15 files changed, 429 insertions(+), 87 deletions(-)
 create mode 100644 security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/NaturesManager.js
 create mode 100644 security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/dialog-apply.png
 create mode 100644 security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/dialog-cancel.png
 create mode 100644 security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-properties-22.png
 create mode 100644 security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/identity.png
 create mode 100644 security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/preferences-users.png

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 6cd0b4399..da45d965b 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
@@ -126,7 +126,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			this._selectionToValues(this.table.getSelectionModel(), this.getViewSelection());
   		}, this);
   		
-  		this.rolesUsersStub = {"ROLE_ADMIN":["root","mbaudier"],"ROLE_USER":["mbaudier","cdujeu"]};
+  		this.rolesUsersStub = {"ROLE_ADMIN":["gandalf"],"ROLE_USER":["demo","frodo","gandalf"]};
   		  		  	
   		this.toggleButton = new qx.ui.form.ToggleButton("Filter", "org.argeo.security.ria/go-next.png");
   		this.toggleButton.set({
@@ -157,8 +157,14 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		});
 		
   		this.saveButton.addListener("execute", function(){
-  			alert("Saving changes...");
-  			this.setGuiMode(this.initialState);
+  			if(!this.usersAppletReference){
+  				this.setGuiMode(this.initialState);
+  				return;
+  			}
+  			var newSelection = this.usersAppletReference.getViewSelection().getNodes();
+  			var diff = this._selectionDiff(this.getChooserOriginalSelection(), newSelection);
+  			this.saveRoleModifications(diff.deltaPlus, diff.deltaMinus);
+			this.setGuiMode(this.initialState);
   		}, this);
   		this.cancelButton.addListener("execute", function(){
   			if(!this.getChooserSelectionModified()){
@@ -224,13 +230,17 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		}
   	},
   	
+  	saveRoleModifications : function(deltaPlus, deltaMinus){
+  		console.log(deltaPlus);
+  		console.log(deltaMinus);
+  	},
+  	
   	monitorChooserSelectionChanges : function(event){
   		if(!this.usersAppletReference || this.getChooserSelectionModified()) return;
   		var initialSelection = this.getChooserOriginalSelection();
   		var crtSelection = event.getTarget().getNodes();
   		if(!qx.lang.Array.equals(initialSelection.sort(), crtSelection.sort())){
-  			this.setChooserSelectionModified(true);
-  			console.log("Changed!");
+  			this.setChooserSelectionModified(true);  			
   			this.saveButton.setEnabled(true);
   		}
   	},
@@ -282,6 +292,14 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		return values;
   	},
   	
+  	_selectionDiff : function(initialSelection, modifiedSelection){
+  		var deltaMinus = qx.lang.Array.clone(initialSelection);
+  		var deltaPlus = qx.lang.Array.clone(modifiedSelection);
+  		qx.lang.Array.exclude(deltaPlus, initialSelection);
+  		qx.lang.Array.exclude(deltaMinus, modifiedSelection);
+  		return {deltaPlus : deltaPlus, deltaMinus : deltaMinus};
+  	},
+  	
   	/**
   	 * Load a given row : the data passed must be a simple data array.
   	 * @param data {Element} The text xml description. 
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 e4f3e846e..e138d861b 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
@@ -2,7 +2,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 	extend : qx.core.Object,
 	statics : {
 		
-		DEFAULT_CONTEXT : "org.argeo.security.ria",
+		DEFAULT_CONTEXT : "/org.argeo.security.webapp",
 		
 		USERS_LIST_SERVICE : "getUsersList.security",
 		USER_EXISTS_SERVICE : "userExists.security",		
@@ -31,7 +31,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getServiceRequest : function(serviceName) {
 			var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
 			return serviceManager.getRequest(
-				org.argeo.slc.ria.SlcApi.DEFAULT_CONTEXT + "/" + serviceName, 
+				org.argeo.security.ria.SecurityAPI.DEFAULT_CONTEXT + "/" + serviceName, 
 				"GET",
 				"application/json");
 		},
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 772cf2e7f..2d51a172e 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
@@ -36,14 +36,62 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   				menu	   	: "Users",
   				toolbar  	: "user",
   				callback	: function(e){
-  					
+  					// CALL SERVICE AND GET UP TO DATE USER
+  					this.saveUser();
   				},
-  				selectionChange : function(viewName, data){
+				selectionChange : function(viewName, data){
   					if(viewName != "editor") return;
   					var iApplet = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor").getContent();
-  					if(iApplet == null) this.setEnabled(true);
   					this.setEnabled(iApplet.getModified());
-  					//this.setEnabled(!(data == null || !data.length || data.length > 1));  					
+				},
+				command 	: null
+  			},
+  			"add_nature" : {
+  				label	 	: "Add Nature ...", 
+  				icon 		: "org.argeo.security.ria/list-add.png",
+  				shortcut 	: null,
+  				enabled  	: true,
+  				menu	   	: "Natures",
+  				toolbar  	: null,
+  				callback	: function(e){
+  				},
+  				submenuCallback : function(commandClass){
+  					this._addNatureTab(commandClass, null, true);
+  				},
+  				submenu		: [
+  					{"label" : "Totot", "icon":"","commandId" : "toto"},
+  					{"label" : "Totot", "icon":"","commandId" : "toto"}
+  				],
+  				selectionChange : function(viewName, data){
+  					if(viewName != "editor") return;
+  					var iApplet = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor").getContent();
+  					if(iApplet && iApplet.getCurrentNatureTabs() && iApplet.getAvailableNatures()
+  						&& iApplet.getCurrentNatureTabs().length < qx.lang.Object.getLength(iApplet.getAvailableNatures())){
+  						this.setEnabled(true);
+  					}else{
+  						this.setEnabled(false);
+  					}
+  				},
+  				command 	: null  				
+  			},
+  			"remove_nature" : {
+  				label	 	: "Remove Nature", 
+  				icon 		: "org.argeo.security.ria/list-remove.png",
+  				shortcut 	: null,
+  				enabled  	: true,
+  				menu	   	: "Natures",
+  				toolbar  	: null,
+  				callback	: function(e){
+  					this.removeSelectedTab();
+  				},
+  				selectionChange : function(viewName, data){
+  					if(viewName != "editor") return;
+  					var iApplet = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor").getContent();
+  					if(iApplet && iApplet.getSelectedNatureTab() && iApplet.getSelectedNatureTab().getUserData("NATURE_CLASS")){
+  						this.setEnabled(true);
+  					}else{
+  						this.setEnabled(false);
+  					}
   				},
   				command 	: null
   			},
@@ -57,7 +105,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   				callback	: function(e){
   					// Call service to delete
 					var iApplet = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor").getContent();
-					if(!iApplet.getModified()){
+					if(!iApplet.getModified() && !iApplet.getNaturesModified()){
 						this.getView().closeCurrent();
 						return;
 					}
@@ -78,7 +126,11 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   	},
   	modified : {
   		init : false,
-  		apply : "_applyModified"
+  		apply : "_applyDetailsModified"
+  	},
+  	naturesModified : {
+  		init : false,
+  		apply : "_applyNaturesModified"
   	},
   	rolesList : {
   		
@@ -87,6 +139,16 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   	instanceLabel : {init:"Editor"},
   	loaded : {
   		init : false
+  	},
+  	currentNatureTabs : {  		
+  	},
+  	availableNatures : {  		
+  	},
+  	selectedNatureTab : {  	
+  		nullable : true
+  	},
+  	currentUser : {
+  		
   	}
   },
 
@@ -106,13 +168,28 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
 	  		this.setInstanceLabel("User " + data);
   		}
   		this.setView(viewPane);
-  		this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));  		
+  		this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));
+
+  		this.naturesManager = new org.argeo.security.ria.components.NaturesManager();
+  		var detectedNatures = this.naturesManager.getDetectedNatures();
+  		this.setAvailableNatures(detectedNatures);
   		
   		// TOOLBAR
   		this.buttonGB = new qx.ui.container.Composite(new qx.ui.layout.HBox(5, "right"));
   		this.add(this.buttonGB);
   		
+  		this.setCurrentNatureTabs([]);
+  		this.naturesTab = new qx.ui.tabview.TabView("top");
+  		this.naturesTab.addListener("changeSelected", function(e){
+  			this.setSelectedNatureTab(e.getData());
+  			this.getViewSelection().triggerEvent();
+  		}, this);
+  		
+  		this.basicPage = new qx.ui.tabview.Page("Basic Information");
+  		this.basicPage.setLayout(new qx.ui.layout.VBox(5));
+  		
   		// GROUPBOXES
+  		
   		this.basicGB = new qx.ui.groupbox.GroupBox("Base Informations");
   		var grid = new qx.ui.layout.Grid(5,5);
   		this.basicGB.setLayout(grid);
@@ -125,13 +202,8 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		this.passGB.setLayout(new qx.ui.layout.VBox());
   		this._initializeGroupBox(this.passGB);
 
-  		this.naturesGB = new qx.ui.groupbox.GroupBox("User Natures");
-  		this.naturesGB.setLayout(new qx.ui.layout.Dock());
-  		this._initializeGroupBox(this.naturesGB);
-  		
   		this.add(this.basicGB);
   		this.add(this.passGB);
-  		this.add(this.naturesGB, {flex:1});  		
   		
   		// FIELDS
   		this.usernameField = new qx.ui.form.TextField();
@@ -146,23 +218,137 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		this.passPane = new org.argeo.security.ria.components.PasswordCredentialImpl();
   		this.passGB.add(this.passPane.getContainer());
   		
-  		this.naturesTab = new qx.ui.tabview.TabView("top");
+  		//this.naturesTab.add(this.basicPage);
+  		this.natureButtonGB = new qx.ui.container.Composite(new qx.ui.layout.HBox(5, "right"));
+  		this.natureButtonGB.setMarginTop(15);
+  		this.add(this.natureButtonGB);
   		
-  		this.simpleNature = new org.argeo.security.ria.components.SimpleUserNatureImpl();  		
-  		var page1 = new qx.ui.tabview.Page(this.simpleNature.getNatureLabel());
-  		page1.setLayout(new qx.ui.layout.Dock());
-  		page1.add(this.simpleNature.getContainer(), {edge:"center"});
-  		this.naturesTab.add(page1);
+	
+  		this.add(this.naturesTab, {flex:1});
   		
-  		this.coWorkerNature = new org.argeo.security.ria.components.CoworkerNatureImpl();  		
-  		var page2 = new qx.ui.tabview.Page(this.coWorkerNature.getNatureLabel());
-  		page2.setLayout(new qx.ui.layout.Dock());
-  		page2.add(this.coWorkerNature.getContainer(), {edge:"center"});
-  		this.naturesTab.add(page2);
+		this.naturesTab.setVisibility("excluded");
+		this.fakePane = new qx.ui.container.Composite(new qx.ui.layout.Canvas());
+		this.fakePane.setVisibility("visible");
+		this.fakePane.setDecorator("tabview-pane");
+		this.fakePane.setMarginTop(30);
+		this.add(this.fakePane, {flex:1});
   		
-  		this.naturesGB.add(this.naturesTab, {edge:"center"});
+  		title = new qx.ui.basic.Atom("User Details", "org.argeo.security.ria/preferences-users.png");
+  		title.setFont(qx.bom.Font.fromString("16px sans-serif bold"));  		
+  		this.buttonGB.add(title);
+  		this.buttonGB.add(new qx.ui.core.Spacer(), {flex:1});
+
+  		var title2 = new qx.ui.basic.Atom("User Natures", "org.argeo.security.ria/identity.png");
+  		title2.setFont(qx.bom.Font.fromString("16px sans-serif bold"));  		
+  		this.natureButtonGB.add(title2);
+  		this.natureButtonGB.add(new qx.ui.core.Spacer(), {flex:1});  		
+		
   		  	  		
   	},
+  	
+  	saveUser : function(){
+  		var user = this.getCurrentUser();
+  		user.setName(this.usernameField.getValue());
+  		user.setRoles((this.rolesField.getValue()||"").split(","));
+  		// GO TO AND RETURN FROM SERVER  		
+  		user.setNatures([
+	  		{
+			    "email" : "",
+			    "firstName" : "",
+			    "lastName" : "",
+			    "type" : "org.argeo.security.nature.SimpleUserNature"
+			}]
+  		);
+  		this.partialRefreshUser(user, ["details","natures"]);
+		this.setModified(false);  		
+  	},
+  	
+  	_addNatureTab : function(natureClass, natureData, select){
+  		var crtTabs = this.getCurrentNatureTabs();
+  		if(qx.lang.Array.contains(crtTabs, natureClass.NATURE_TYPE)){
+  			this.error("There can only be one instance of a given nature type!");
+  			return null;
+  		}
+  		if(!this.naturesTab.isVisible()){
+  			if(this.fakePane) this.fakePane.setVisibility("excluded");
+  			this.naturesTab.setVisibility("visible");
+  		}
+  		var page = new qx.ui.tabview.Page("Nature : " + natureClass.NATURE_LABEL);
+  		page.setLayout(new qx.ui.layout.Dock());
+  		page.setUserData("NATURE_CLASS", natureClass);
+		var newClass = new natureClass();
+  		page.add(newClass.getContainer(), {edge:"center"});
+  		
+  		buttons = new qx.ui.container.Composite(new qx.ui.layout.HBox(5, "center"));
+  		var editB = new qx.ui.form.Button("Edit this Nature", "org.argeo.security.ria/document-properties-22.png");
+  		var saveB = new qx.ui.form.Button("Save", "org.argeo.security.ria/dialog-apply.png");
+  		var cancelB = new qx.ui.form.Button("Cancel", "org.argeo.security.ria/dialog-cancel.png");
+  		buttons.add(editB);
+  		buttons.add(saveB);
+  		buttons.add(cancelB);
+  		page.add(buttons, {edge:"south"});
+  		editB.addListener("execute", function(){
+  			newClass.setEditMode(true);
+  			editB.setVisibility("excluded");
+  			saveB.setVisibility("visible");
+  			cancelB.setVisibility("visible");
+  		});
+  		cancelB.addListener("execute", function(){
+  			newClass.setEditMode(false);
+  			editB.setVisibility("visible");
+  			saveB.setVisibility("excluded");
+  			cancelB.setVisibility("excluded");
+  		});
+  		saveB.addListener("execute", function(){
+  			// SAVE CURRENT NATURE
+  			this.setNaturesModified(false);
+  			newClass.setEditMode(false);
+  			editB.setVisibility("visible");
+  			saveB.setVisibility("excluded");
+  			cancelB.setVisibility("excluded");
+  		}, this);
+  		if(natureData){
+  			newClass.setData(natureData);
+  			cancelB.execute();
+  		}else{
+  			editB.execute();
+  		}
+  		this.naturesTab.add(page);
+  		crtTabs.push(natureClass.NATURE_TYPE);
+  		this.getViewSelection().triggerEvent();
+  		newClass.addListener("modified", function(){
+  			this.setNaturesModified(true);
+  		}, this);  
+  		if(select){
+  			this.naturesTab.setSelected(page);
+  		}
+  		return page;
+  	},
+  	
+  	_removeNatureTab : function(natureClass){
+  		this.naturesTab.getChildren().forEach(function(el){
+  			if(el.getUserData("NATURE_CLASS") == natureClass){
+  				this.naturesTab.remove(el);
+  				qx.lang.Array.remove(this.getCurrentNatureTabs(), natureClass.NATURE_TYPE);
+  				this.getViewSelection().triggerEvent();
+  			}
+  		}, this);
+  		if(this.naturesTab.getChildren().length == 0){
+  			this.naturesTab.setVisibility("excluded");
+  			this.fakePane.setVisibility("visible");
+  		}
+  	},
+  	
+  	removeSelectedTab : function(){
+  		var selected = this.naturesTab.getSelected();
+  		this._removeNatureTab(selected.getUserData("NATURE_CLASS"));
+  	},
+  	
+  	removeAllTabs : function(){
+  		while(this.naturesTab.getSelected()){
+  			this._removeNatureTab(this.naturesTab.getSelected().getUserData("NATURE_CLASS"));
+  		}
+  	},
   	  	
   	_attachListeners : function(){
   		this.usernameField.addListener("changeValue", function(){
@@ -174,12 +360,6 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		this.passPane.addListener("modified", function(){
   			this.setModified(true);
   		}, this);
-  		this.simpleNature.addListener("modified", function(){
-  			this.setModified(true);
-  		}, this);  		
-  		this.coWorkerNature.addListener("modified", function(){
-  			this.setModified(true);
-  		}, this);  		
   	},
   	
   	_initializeGroupBox: function(groupBox){
@@ -187,32 +367,91 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		groupBox.getChildrenContainer().setPadding(8);  		
   	},
   	
-  	_applyModified : function(value){
+  	_applyDetailsModified : function(value){  		
   		if(value) this.getViewSelection().triggerEvent();
   	},
   	
+  	_applyNaturesModified : function(value){
+  		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);
+		}  		
+  	},
+  	
+  	partialRefreshUser : function(user, target){
+  		if(!qx.lang.Array.isArray(target)) target = [target];
+  		
+  		if(qx.lang.Array.contains(target,"natures")){
+  			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);
+			}  		  			
+  		}
+  		if(qx.lang.Array.contains(target,"details")){
+  			this.setInstanceLabel("User "+user.getName());
+	  		this.usernameField.setValue(user.getName());
+	  		this.rolesField.setValue(user.getRoles());  
+	  		this.usernameField.setReadOnly(true);
+  		}
+  	},
+  	
   	/**
   	 * Load a given row : the data passed must be a simple data array.
   	 * @param data {Element} The text xml description. 
   	 */
-  	load : function(userData){
+  	load : function(user){
   		if(this.getLoaded()){
   			return;
   		}
-  		if(userData){
-	  		this.usernameField.setValue(userData);
-  		}
   		this.setRolesList(["ROLE_ADMIN", "ROLE_USER"]);
-  		this._attachListeners();
-  		var title = new qx.ui.basic.Atom(this.getInstanceLabel(), "org.argeo.security.ria/preferences-user.png");
-  		title.setFont(qx.bom.Font.fromString("16px sans-serif bold"));  		
-  		this.buttonGB.add(title);
-  		this.buttonGB.add(new qx.ui.core.Spacer(), {flex:1});
+  		
+  		// MUST BE DONE AFTER COMMANDS ARE INITIALIZED! 
   		var commands = this.getCommands();
-  		var button = new qx.ui.form.Button("Save", "org.argeo.security.ria/document-save.png", commands["save_user"].command);  		
-  		var button2 = new qx.ui.form.Button("Close", "org.argeo.security.ria/window-close.png", commands["close"].command);  		
-  		this.buttonGB.add(button);
-  		this.buttonGB.add(button2);
+  		var saveButton = commands["save_user"].command.getFormButton(); 
+  		var closeButton = commands["close"].command.getFormButton(); 
+  		var removeButton = commands["remove_nature"].command.getFormButton();
+  		var natureButton = commands["add_nature"].command.getFormButton();
+  		
+  		var detectedNatures = this.getAvailableNatures();
+  		var newMenu = [];
+  		for(var key in detectedNatures){
+  			newMenu.push({"label" : detectedNatures[key].NATURE_LABEL, "icon":"", "commandId" : detectedNatures[key]});
+  		}
+  		commands["add_nature"].command.setMenu(newMenu);
+  		
+  		natureButton.setShow("icon");
+  		removeButton.setShow("icon");
+  		saveButton.setShow("icon");
+  		closeButton.setShow("icon");
+  		
+  		this.buttonGB.add(saveButton);
+  		this.buttonGB.add(closeButton);  		
+  		this.natureButtonGB.add(natureButton);
+  		this.natureButtonGB.add(removeButton);
+  		
+  		if(user){
+  			this.loadUserData(user);
+	  		this._attachListeners();
+  		}else{
+  			this.setCurrentUser(new org.argeo.security.ria.model.User());
+	  		this._attachListeners();
+  			this.setModified(true);
+  		}
+  		
+  		
   		this.setLoaded(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 f5e13c121..9438113ff 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
@@ -73,9 +73,10 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   				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:""}
   },
@@ -109,6 +114,7 @@ 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);  		
@@ -132,7 +138,9 @@ 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.setGuiMode("clear");
   	},
   	
@@ -175,14 +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){
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 da11c7247..a495563e6 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
@@ -1,10 +1,9 @@
 qx.Class.define("org.argeo.security.ria.components.CoworkerNatureImpl", {
 	extend : org.argeo.security.ria.components.SimpleUserNatureImpl,
-	properties : {
-		natureType : {
-			refine : true,
-			init : "Coworker"
-		}
+	statics : {
+		NATURE_TYPE : "org.argeo.security.nature.CoworkerNature",
+		NATURE_LABEL : "Co-Worker",
+		NATURE_ICON : ""
 	},
 	
 	construct : function(){
@@ -39,10 +38,6 @@ qx.Class.define("org.argeo.security.ria.components.CoworkerNatureImpl", {
 	  			this.add(this.fields[key], {row:j,column:1});
 	  			j++;
 	  		}			
-		},
-		
-		getNatureLabel : function(){
-			return "Co-Worker";
-		}
+		}		
 	}
 });
\ 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/components/INaturePane.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
index 038a26d1a..5d5c97e4d 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
@@ -1,11 +1,18 @@
 qx.Interface.define("org.argeo.security.ria.components.INaturePane", {
 	extend  : org.argeo.security.ria.components.IUserDataPane,
+	statics : {
+		NATURE_TYPE : "",
+		NATURE_LABEL : "",
+		NATURE_ICON : ""
+	},
 	properties : {
-		natureUuid : {},
-		natureType : {}
+		editMode : {
+			init : true,
+			apply : "_applyEditMode",			
+			event : "changeEditMode"
+		}
 	},
 	members : {
-		getNatureLabel : function(){return true},
 		setData : function(dataMap, format){return true;}
 	}
 });
\ 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/components/NaturesManager.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/NaturesManager.js
new file mode 100644
index 000000000..f15bb336b
--- /dev/null
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/NaturesManager.js
@@ -0,0 +1,39 @@
+qx.Class.define("org.argeo.security.ria.components.NaturesManager",{
+	extend : qx.core.Object,
+	properties : {
+		detectedNatures : {
+			check : "Map"
+		}
+	},
+	construct : function(){
+		this.base(arguments);
+		this.detectNatures();
+	},
+	members : {
+		detectNatures : function(){			
+			var natures = {};
+			for (var key in qx.Bootstrap.$$registry) {
+				if (qx.Class.hasInterface(qx.Bootstrap.$$registry[key],	org.argeo.security.ria.components.INaturePane)) {
+					// FILTER BY ROLE HERE!
+					var klass = qx.Bootstrap.$$registry[key];
+					natures[klass.NATURE_TYPE] = klass;
+				}
+			}
+			this.setDetectedNatures(natures);
+		},
+		detectNaturesInData : function(userNaturesList){
+			var detected = this.getDetectedNatures();
+			var userDetected = [];
+			for(var i = 0;i<userNaturesList.length;i++){
+				var type = userNaturesList[i].type;
+				if(detected[type]){
+					userDetected.push({
+						NATURE_CLASS : detected[type],
+						NATURE_DATA  : userNaturesList[i]
+					});
+				}
+			}
+			return userDetected;
+		}
+	}
+});
\ 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/components/SimpleUserNatureImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
index 4b5e4c84b..342cee246 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
@@ -4,27 +4,32 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 	events : {
 		"modified" : "qx.event.type.Event"		
 	},
+	statics : {
+		NATURE_TYPE : "org.argeo.security.nature.SimpleUserNature",
+		NATURE_LABEL : "Simple User",
+		NATURE_ICON : ""
+	},
 	properties : {
 		valid : {
 			init : false
 		},
-		natureUuid : {
-			init : ""
-		},
-		natureType : {
-			init : "SimpleUser"
-		},
 		dataMap : {
 			
-		}
+		},
+		editMode : {
+			init : true,
+			apply : "_applyEditMode",
+			event : "changeEditMode"
+		}		
 	},
 	
 	construct : function(){
 		this.base(arguments);  	
 		this._createGui();
+ 		this.setEditMode(false);		
 	},
 		
-	members : {
+	members : {		
 		
 		_createGui : function(){
 	  		var grid = new qx.ui.layout.Grid(5,5);
@@ -52,17 +57,19 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 	  			this.fields[key].addListener("changeValue", function(e){this.fireEvent("modified");}, this);
 	  			this.add(this.fields[key], {row:j,column:1});
 	  			j++;
-	  		}			
+	  		}	
+		},
+		
+		_applyEditMode : function(value){
+			for(var key in this.fields){
+				this.fields[key].setEnabled(value);
+			}
 		},
+		
 		getContainer  : function(){
 			return this;
 		},
-		getNatureLabel : function(){
-			return "Simple User";
-		},
 		setData    : function(dataMap, format){
-			this.setNatureUuid(dataMap["uuid"]);
-			this.setNatureType(dataMap["type"]);
 			for(var key in this.fields){
 				if(dataMap[key]){
 					this.fields[key].setValue(dataMap[key]);
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/Nature.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/Nature.js
index ff61c7be5..981476b3c 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/Nature.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/Nature.js
@@ -1,9 +1,6 @@
 qx.Class.define("org.argeo.security.ria.model.Nature", {
 	extend : qx.core.Object,
 	properties : {
-		uuid : {
-			check : "String"
-		},
 		type : {
 			check : "String"
 		},
@@ -16,7 +13,7 @@ qx.Class.define("org.argeo.security.ria.model.Nature", {
 	},
 	members : {
 		load : function(data, format){
-			
+			this.setData(data);
 		}
 	}	
 });
\ 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/model/User.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js
index acf55725d..935538863 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
@@ -2,6 +2,7 @@ qx.Class.define("org.argeo.security.ria.model.User", {
 	extend : qx.core.Object,
 	properties : {
 		name : {
+			init : "",
 			check : "String"
 		},
 		roles : {
@@ -9,16 +10,28 @@ qx.Class.define("org.argeo.security.ria.model.User", {
 		},
 		natures :{
 			check : "Array"
+		},
+		rawData : {
+			
 		}
 	},
 	construct : function(){
 		this.base(arguments);
+		this.setRoles([]);
+		this.setNatures([]);
 	},
 	members : {
 		load : function(data, format){
 			this.setName(data.username);
 			this.setRoles(data.roles);
 			this.setNatures(data.userNatures);
+			this.setRawData(data);
+		},
+		toJSON : function(){
+			var rawData = this.getRawData();
+			rawData.username = this.getName();
+			rawData.roles = this.getRoles();
+			rawData.userNatures = this.getNatures();
 		}
 	}
 	
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/dialog-apply.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/dialog-apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3ae53617eb22e9aa46ddfa4c45b20439fa549c1
GIT binary patch
literal 872
zcmV-u1DE`XP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm0007E0007E0l_d;`Tzg`8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10_90WK~y-6&6P_?RACr~-|x&h$2oIxbQDLMF&)Q7)WFiwE?O3e
z;E)!ELW>ry!dkWHB1D^L(XLkRYT=@=k_x2DCM3fw$E>lNrk3SY-bT}$%b9cj7NK~j
zNWl-j&CmBgyu9Db{}W>jYf;>qP}en>s>wudie6PPl~azCEcwa~mW@#rRjvw{+>~Y9
zY;3J9uhmuLS7?mc#+y`02mT98Wt0(@6ZgEPs7A8e?J$@PI8}U#6CL6$a+3o9_<0wq
z$)we5o6LIikZ;IW#TuBh2)durEIF3;s{BKGo7IZ3(J=r(AQ->~!v>9IvxS=nCO1Xv
zY`RyaJNBh$c`cfnA2buuE;c9VR6!f9nbr<>UWvh)n1sp638*T=_~-=cJ@w4rGk&7K
zp}%Jq>^kNWq$H_x_ttGGnKmbY2nt<!g{{iV$3(Q3F~+EztTu<Ov(!~+vc$(@a@r47
zVUT~xxaqmWMtVk1Dh*2Aj0he8`X>9fr8$%B=?N*A3i!eCKz6DFkd@+A_4OmFrX#jw
zo42IE6>E+&Vk$fiHNqe&BJO$~;_Ex#8KqIVGS4!`7>J03YT;Sl7H2_rx)YqpffE2;
z!_e*Z;eGd@TwIhX#3Y%Zs4CP55KCs<Z)<_~&4+W!E#=~(UCdZWdx;kl#J26Z8M$_+
z1rPxZ4+tDV9*ID2GeHT-2!+C+Afd}UjCQa0f_z&(zhrXeK0@RoL2^hhcDmAYjHyAW
zLIk|XK_vxK;c-M{1!7Q#FP<p$e*S(b)EGLubRZYxn6)!GkQFF++Sc>-XD=ZVHGx3X
z2xOffVhn>>XT%SW79R(`U0w;gNb&69QPN6&sk3BHYKFFG7^<j1H*G-Ibq%`u2kXN3
z!pB#FE>b+J{2B`e#K6`kEd%{RM<NpWICS68psRQA>fb>BKp0!LGfu}F^={p#O@|Yi
y;1=pvnqAm`H&h14zd#vdOMAQ;wSIq)<?1)$Y>D+-BIREI0000<MNUMnLSTZj{)<ll

literal 0
HcmV?d00001

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/dialog-cancel.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/dialog-cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..df093e9a7404e7ecf7cb9304c8af96ef42834145
GIT binary patch
literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000Aa000Aa0e#hi%m4rY8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10*^^VK~y-6wUkdtR8bVhe`o%@_eP3xLMU7)Wi8Ye(zMWa8MFvm
z6ecbssqIX((TzlqwVGMBsBD#}(Jn~Hb{3>jk`4p~x)2wFV~fh>Wv9ivZ@j)4Z4n+g
z-23kN?)Sd?-9MtL>_x=(gcV5aRvZxN0Q!M8g;u~9m{pjG!PH&Vw>!<1T2|Z^Y1xEf
zfy;pG^6!yfkh`b)?VrSVL{7$G3TUu~eP9uAfTjq?vOw>E>a;z$&EvdCOA4l3Xm9}+
zN*-MGVc($Yi9yxo6dZD(*M${>X>?%hzQ}<ci4!pFLW5(ZIZ&U3gF~w25R+3~yQMlF
zgLVfd4X!Z-`I=Td5b21)djd~OK)r>_T~{qceS9R6-h_GJ2!KM@4YQ#Y#UAv#Aa0=G
zrUN;%R9whE5y?i0uc@xNkPUGjbX%*h5Vx7GABU$ss^w7;WNV4}Q4#tg%Io0O=GN!w
zuv1a&LaX`nVvq5(Pqknx_aOf~qP!<iy<{+%Dq;_OQ*`W!muir|h>*KbHuYo`aS~=t
zv1w8yZBM+QTJR#|uMPQxh~q-D883!&Y>#Jvi>7}L7`MsKsure2P|Nda5e~z;Y$;s`
z@s;EDPNY-djTvA04egz(YeZsJBx{i)P}1ONs=%p?>IVQ+wUQs<@f@hhmkW@#>tW78
z*20B3VPm%4y#0ZX%f`#|ahU%sa;0c_UKDX0Sa+dho%7WM4A@*%kI+|<GXi5kW5k6e
zpbRu)?LM#ybRSjyWP__7`eVT>)dq}2N=?9Vi&TMU3SCjsnu_iC5^QKU!HvoYBo&GR
z3xD8YOSn-rVprn-i3EU%#0mBx1$ZV?K%Ldr5m@H~KY*X6-7x(P;Ja!4zn>ff_-W0j
QYybcN07*qoM6N<$g3jw@p#T5?

literal 0
HcmV?d00001

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-properties-22.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-properties-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a94ed982125ebde36a016643e72a1dd9a211573
GIT binary patch
literal 925
zcmV;O17iG%P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000Aa000Aa0e#hi%m4rY8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10~$$0K~y-6wbe;z6Hy!n@bCX79jc8MY85S1Ypsn+LF!T}B6z5J
z@gTT>7m<pn6-2xVqNq1LD7fIkrQ!l^sJNk(9*UN<G-)teh0;R}4MwZA?U0#t^4{Nr
zSvnKriVq%nWXLby`(_?P%#8mrJn01yl>;dMM=!$65eE#QJRUb++O`cM07M`n5K`;$
zpV>6ogqj9j*Ovpxfng;QFijIe5QGrlVfS?XQD*46Bf0}lgMR}PQGS?+plRPhK?HK+
zX}|^3@4!UawBkpJU2vKcE?Br>2Py<eh|G6AJw0f?cs^B^fFR1O|2Q#-aOKKne0cvF
z@7{D`*~*QXow$FSA5Lv4jVflGJ+c~upFU#knx&w40k$^o%vSOfSh%icPzG@6_<Gb#
z>BN`MQB0P8*oCzie^MR2yGBmOBm|fl*G_Fg)uc8&=qSR;eNz$p^c9;nZ-cJuj!yI8
zIaM$-?wsF^nfg;a3rxcCJw<rY{S^}y-oT8qnJ6eI_+<?_uwusD=DnDX`*_}6grhqq
zqAf54&w{I{_SL}a^+MCMyjZ>}#P!pSm}cKZOP2=+c2=M*@C7{g5~_VQC@wCBuIr9%
zE2WT3CSlt)lv25giAe0<?rSci`*_l+<6x5y?OnY{R$jn-Ukyr1N>Er>m;pydMi7g|
zU|ANVln_F|FpL2JvGKTeX!oMG50B}*W8DOfwk+gFCrbJDt?L{Phk0;tkQ0dnODS0?
z#Y!m-hr^k*l#+wNfLU2txrCXKo}LY>r$3(Wn=!AWuNa4$A_%<dN21~!W>?HbX=y3E
zUN1bJ?5&Ve!m=zNb)&=KSN5)5+gJ7V^>sPAsIM)bGrLSn`tLRJ!!xzq^6U|ZLLrVs
zB5W82CzDA>TGKSSy}g~KlpG3mk2N$jtQns)J;BVVtE*eFsG53$0YCTl_Hr~D<<Zem
z9vd6Wfepi8zrTZn!GKv`zj*nN&<vb9O)G|nhk0mdh~x1%+qTV8N(ZWxV#~6)wY7Di
zs;a6sAIi+2^bt+H^Jb+Q;?&GH2AH}3XV39Bnj^$zoxcBX00000NkvXXu0mjfxHP3+

literal 0
HcmV?d00001

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/identity.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/identity.png
new file mode 100644
index 0000000000000000000000000000000000000000..69abedd91988243d8b2cec2a5e166068742c1e87
GIT binary patch
literal 5091
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
FV1huos>A>Q

literal 0
HcmV?d00001

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/preferences-users.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/preferences-users.png
new file mode 100644
index 0000000000000000000000000000000000000000..53f3a2858fdf334cd6374baaa41fccedadac806e
GIT binary patch
literal 1870
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
IM6N<$f_LtE@c;k-

literal 0
HcmV?d00001

-- 
2.30.2