From 274223ca18146ae617daa43ac0db5c9e980ef288 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 29 Jun 2020 12:14:56 +0200
Subject: [PATCH] Added new features reported at #19544#note-8

---
 .../accounting/AccoutingInfoContainer.java    | 19 +++++++++++--------
 .../StorageHubToWorkpaceConverter.java        |  6 +++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
index 0b06f56..128c5cf 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
@@ -12,6 +12,7 @@ import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField;
 
 import com.extjs.gxt.ui.client.Style.ButtonScale;
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
+import com.extjs.gxt.ui.client.data.BaseModel;
 import com.extjs.gxt.ui.client.data.BaseModelData;
 import com.extjs.gxt.ui.client.data.ModelData;
 import com.extjs.gxt.ui.client.event.ButtonEvent;
@@ -128,7 +129,7 @@ public class AccoutingInfoContainer extends LayoutContainer {
 
 		List<ColumnConfig> columns = new ArrayList<ColumnConfig>();
 
-		ColumnConfig icon = createSortableColumnConfig("Type", "", 20);
+		ColumnConfig icon = createSortableColumnConfig("Type", "", 35);
 		columns.add(icon);
 
 		icon.setRenderer(new GridCellRenderer<ModelData>() {
@@ -183,7 +184,7 @@ public class AccoutingInfoContainer extends LayoutContainer {
 
 		});
 
-		ColumnConfig descr = createSortableColumnConfig(DESCRIPTION, DESCRIPTION, 230);
+		ColumnConfig descr = createSortableColumnConfig(DESCRIPTION, DESCRIPTION, 220);
 		columns.add(descr);
 
 		descr.setRenderer(new GridCellRenderer<ModelData>() {
@@ -191,14 +192,16 @@ public class AccoutingInfoContainer extends LayoutContainer {
 			public Object render(ModelData model, String property,
 					ColumnData config, int rowIndex, int colIndex,
 					ListStore<ModelData> store, Grid<ModelData> grid) {
-				// if(model.get(OPERATION).equals(GxtAccountingEntryType.READ))
-				// return "<b><p style=\"color: red;\">"
-				// + model.get(DESCRIPTION)+ "</p></b>";
-				return model.get(DESCRIPTION);
+				String thevalue = model.get(DESCRIPTION);
+				//I'm adding the tooltip
+				if(thevalue==null)
+					return "";
+				
+				return "<span title='" + thevalue + "' style='white-space:pre-line;'>" + thevalue + "</span>";
 			}
 
 		});
-
+		
 		ColumnConfig oper = createSortableColumnConfig(OPERATION_NAME, OPERATION, 70);
 		columns.add(oper);
 
@@ -207,7 +210,7 @@ public class AccoutingInfoContainer extends LayoutContainer {
 
 		ColumnConfig date = createSortableColumnConfig(DATE, DATE, 140);
 		columns.add(date);
-
+	
 		cm = new ColumnModel(columns);
 
 		final ColumnModel columnModel = cm;
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
index 036df1f..448b352 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
@@ -667,9 +667,9 @@ public class StorageHubToWorkpaceConverter implements Serializable{
 
 						String msg = "";
 						if(acc.getItemName()==null || acc.getItemName().isEmpty())
-							msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder";
+							msg = "\""+user.getName() + "\" "+GxtAccountingEntryType.SHARE.getName()+ " folder";
 						else
-							msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder "+acc.getItemName();
+							msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " folder "+acc.getItemName();
 
 						if(acc.getMembers()!=null && acc.getMembers().length>0)
 							msg+=" with "+UserUtil.separateFullNameToCommaForPortalLogin(Arrays.asList(acc.getMembers()));
@@ -685,7 +685,7 @@ public class StorageHubToWorkpaceConverter implements Serializable{
 						af.setOperation(GxtAccountingEntryType.UNSHARE);
 						AccountEntryUnshare uns = (AccountEntryUnshare) shubAccEntry;
 						String msg = "Folder ";
-						msg+= uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" ";
+						msg+= uns.getItemName()==null || uns.getItemName().isEmpty()?"":"\""+uns.getItemName()+"\" ";
 						//see Task #19544
 						if(shubAccEntry.getUser().equalsIgnoreCase("ALL")) {
 							//CASE ALL