From fb223e6c4927deaa6d3518b76992799117e12ff3 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 14 Feb 2020 11:53:15 +0100
Subject: [PATCH] Fixing [Bug #18577]

---
 changelog.xml                                    |  1 +
 .../client/view/windows/DialogShareableLink.java | 12 +++++++++++-
 .../view/windows/DialogShareableLink.ui.xml      | 16 +++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/changelog.xml b/changelog.xml
index d969505..5d00d03 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -6,6 +6,7 @@
 		</Change>
 		<Change>[Feature #18150] Get Shareable Link coy to clipboard facility
 		</Change>
+		<Change>[Bug #18577] Fixing Shareable link informative text for public file</Change>
 	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-user.workspace-portlet-tree.6-28-1"
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java
index 5975a71..aa803a1 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java
@@ -85,6 +85,9 @@ public class DialogShareableLink extends Composite {
 	@UiField
 	Well alertFilePublicLink;
 	
+	@UiField
+	Well alertVersionedFilePublicLink;
+	
 	@UiField
 	Well alertFolderPublicLink;
 	
@@ -430,6 +433,7 @@ public class DialogShareableLink extends Composite {
 		fieldPrivateSharing.setVisible(false);
 		cgPublicLink.setVisible(false);
 		alertFilePublicLink.setVisible(false);
+		alertVersionedFilePublicLink.setVisible(false);
 		alertFolderPublicLink.setVisible(false);
 		filedEnableDisableSharing.setVisible(false);
 		buttonShareSettings.setVisible(false);
@@ -489,7 +493,13 @@ public class DialogShareableLink extends Composite {
 			//panelFieldsContainer.setVisible(true);
 			cgPublicLink.setVisible(true);
 			filedEnableDisableSharing.setVisible(true);
-			alertFilePublicLink.setVisible(true);
+			
+			if(version!=null && !version.isEmpty()) {
+				alertVersionedFilePublicLink.setVisible(true); //Message for versioned File
+			}else {
+				alertFilePublicLink.setVisible(true); //Message for latest version of File
+			}
+			
 			if(!item.isPublic()) { //THE FILE IS PRIVATE
 				switchButton.setVisible(false);
 				if(version!=null && !version.isEmpty()) {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml
index e9beb54..af59c8a 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml
@@ -148,13 +148,19 @@
 						view
 						the
 						content. No login required</b:Well>
-					<b:Well ui:field="alertFilePublicLink" visible="false">By sharing
+					<b:Well ui:field="alertFilePublicLink" visible="false">Anyone with
+						this link can download it, no login is required. This link will
+						always point to the latest version of the file</b:Well>
+					<b:Well ui:field="alertVersionedFilePublicLink"
+						visible="false">By sharing
 						the following
-						Public Link, anyone with link can download it.
+						Public Link, anyone with link can
+						download it.
 						The
 						link will always point to the
 						version
-						of the file at the
+						of the file at
+						the
 						time of link
 						creation. No login required</b:Well>
 					<b:ControlLabel>Public Link</b:ControlLabel>
@@ -164,8 +170,8 @@
 							<b:TextBox ui:field="textPublicLink" readOnly="true">
 							</b:TextBox>
 							<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
-								<b:Button icon="COPY"
-									ui:field="publicLinkCopyButton" type="PRIMARY"></b:Button>
+								<b:Button icon="COPY" ui:field="publicLinkCopyButton"
+									type="PRIMARY"></b:Button>
 							</b:Tooltip>
 						</b:InputAddOn>
 						<b:Button ui:field="showPublicLongLinkButton" type="LINK"