From 5366db1197b575a8655928578d76fcd9b268d6ae Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 10 Feb 2021 15:04:15 +0100
Subject: [PATCH] fixing the issue reported at
 https://support.d4science.org/issues/20663#note-12

---
 CHANGELOG.md                                  |  3 ++-
 pom.xml                                       |  2 +-
 .../ui/metadata/MetaDataFieldSkeleton.java    | 19 +++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2221cca..12d1778 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [v1.6.2] - 2021-02-08
+## [v1.6.2-SNAPSHOT] - 2021-02-08
 
 **Bug Fixes**
 
 [#20446] Catalogue Publishing Widget: field value unexpectedly added in case of optional field 
+[#20663] Fixing Time_Interval placeholder 
 
 
 ## [v1.6.1] [r4.24.0] - 2020-06-18
diff --git a/pom.xml b/pom.xml
index 9f2564e..affac91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>ckan-metadata-publisher-widget</artifactId>
-	<version>1.6.2</version>
+	<version>1.6.2-SNAPSHOT</version>
 	<name>gCube Ckan metadata publisher widget</name>
 
 	<description>
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
index d3d2e39..5dd231b 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
@@ -638,13 +638,20 @@ public class MetaDataFieldSkeleton extends Composite{
 		case Time_Interval:
 
 			manipulatedTemp = rangesList.get(0).getCurrentValue().replaceAll(DataTimeBox.MISSING_RANGE_VALUE_START, "").replaceAll(DataTimeBox.MISSING_RANGE_VALUE_END, UPPER_RANGE_NOT_SPECIFIED);
-			if(toReturn.equals(DataTimeBox.RANGE_SEPARATOR_START_END + UPPER_RANGE_NOT_SPECIFIED))
-				manipulatedTemp = "";
-
+			
+			//fixed by Francesco, see #20663#note-12
+			if(!field.getMandatory()) {
+				if(manipulatedTemp.equals(DataTimeBox.RANGE_SEPARATOR_START_END + UPPER_RANGE_NOT_SPECIFIED))
+					manipulatedTemp = "";
+			}
+			
 			// split to check if the extreme are equals
-			String[] temp = manipulatedTemp.split(DataTimeBox.RANGE_SEPARATOR_START_END);
-			if(temp[0].equals(temp[1]))
-				manipulatedTemp = temp[0];
+			//fixed by Francesco
+			if(!manipulatedTemp.isEmpty()) {
+				String[] temp = manipulatedTemp.split(DataTimeBox.RANGE_SEPARATOR_START_END);
+				if(temp[0].equals(temp[1]))
+					manipulatedTemp = temp[0];
+			}
 
 			toReturn.add(manipulatedTemp);
 			break;