From b4ea5e79c6ffe1258c45c65100e7a70d9fb13dce Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Thu, 27 Apr 2017 15:22:04 +0000
Subject: [PATCH] minor fixes on loading and on number fields validation

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@147230 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                       | 16 +++++++++-----
 .../client/ui/form/CreateDatasetForm.java     | 21 +++++++++---------
 .../client/ui/metadata/CategoryPanel.ui.xml   |  2 +-
 .../ui/metadata/MetaDataFieldSkeleton.java    | 22 ++++++++++++++-----
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index f5feff9..40fe52b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,11 +55,11 @@
 	</dependencyManagement>
 
 	<dependencies>
-<!-- 		<dependency> -->
-<!-- 			<groupId>xerces</groupId> -->
-<!-- 			<artifactId>xercesImpl</artifactId> -->
-<!-- 			<version>2.9.1</version> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>xerces</groupId> -->
+		<!-- <artifactId>xercesImpl</artifactId> -->
+		<!-- <version>2.9.1</version> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
@@ -215,7 +215,11 @@
 							<goal>compile</goal>
 							<goal>test</goal>
 						</goals>
-					</execution>
+						<!-- <configuration> -->
+						<!-- <draftCompile>true</draftCompile> -->
+						<!-- <localWorkers>8</localWorkers> -->
+						<!-- </configuration> -->
+						</execution>
 				</executions>
 				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
 					documentation at codehaus.org -->
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
index a2a9bd0..ac8c599 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
@@ -318,15 +318,18 @@ public class CreateDatasetForm extends Composite{
 								authorEmailTextbox.setText(bean.getAuthorEmail());
 								maintainerTextbox.setText(bean.getAuthorSurname() + " " + bean.getAuthorName());
 								maintainerEmailTextbox.setText(bean.getMaintainerEmail());
-
-								// retrieve custom fields
-								Map<String, List<String>> customFieldsMap = bean.getCustomFields();	
-								List<String> vocabularyTags = bean.getTagsVocabulary();
+								
+								setAlertBlock("Retrieving information, please wait...", AlertType.INFO, true);
 
 								// vocabulary list of tags has preemption
+								List<String> vocabularyTags = bean.getTagsVocabulary();
 								tagsPanel.setVocabulary(vocabularyTags);
+								
+								// retrieve custom fields
+								Map<String, List<String>> customFieldsMap = bean.getCustomFields();	
 
-								if(customFieldsMap != null){
+								// TODO Check if these tags are ok for the vocabulary
+								if(customFieldsMap != null && vocabularyTags == null){
 
 									// get the keys and put them as tags 
 									Iterator<Entry<String, List<String>>> iteratorOverCustomField = customFieldsMap.entrySet().iterator();
@@ -382,9 +385,6 @@ public class CreateDatasetForm extends Composite{
 									}
 								});
 
-								// try to retrieve the profiles
-								setAlertBlock("Retrieving types, please wait...", AlertType.INFO, true);
-
 								// get the name of the organization from the title
 								final String orgName = nameTitleOrganizationMap.get(organizationsListbox.getSelectedItemText());
 
@@ -397,7 +397,6 @@ public class CreateDatasetForm extends Composite{
 
 										tagsPanel.setVocabulary(vocabulary);
 										tagsPanel.setVisible(true);
-										setAlertBlock("", AlertType.ERROR, false);
 									}
 
 									@Override
@@ -410,6 +409,8 @@ public class CreateDatasetForm extends Composite{
 									}
 								});
 
+								// try to retrieve the profiles
+								setAlertBlock("Retrieving types, please wait...", AlertType.INFO, true);
 
 								// perform remote request of profiles for the selected organization
 								ckanServices.getProfiles(orgName, new AsyncCallback<List<MetaDataProfileBean>>() {
@@ -492,7 +493,7 @@ public class CreateDatasetForm extends Composite{
 														});
 
 													}else{
-														setAlertBlock("Error while retrieving licenses, try later", AlertType.ERROR, true);
+														setAlertBlock("Error while retrieving licenses", AlertType.ERROR, true);
 													}
 												}
 											});
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml
index 585adfe..68e9845 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml
@@ -2,7 +2,7 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
 	<g:HTMLPanel>
-		<g:VerticalPanel>
+		<g:VerticalPanel width="100%">
 			<b:PageHeader ui:field="categoryHeader"></b:PageHeader>
 			<!-- Here will be placed the metadata fields formats -->
 			<g:VerticalPanel ui:field="fieldsPanel" visible="false"
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 37a9787..340cf87 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
@@ -66,7 +66,7 @@ public class MetaDataFieldSkeleton extends Composite{
 	@UiField FocusPanel focusPanelIconContainer;
 	@UiField ControlGroup metafieldControlGroup;
 
-	private static final String REGEX_IS_NUMBER = "[0-9]+[.]?[0-9]+";
+	//	private static final String REGEX_IS_NUMBER = "[0-9]+[.]?[0-9]+";
 
 	// the element that holds the value (it could be a checkbox, textbox or listbox, textarea, calendar, two calendars, more calendars)
 	private Widget holder;
@@ -428,7 +428,7 @@ public class MetaDataFieldSkeleton extends Composite{
 
 				if(!numberValue.trim().isEmpty())
 					if(field.getValidator() == null || field.getValidator().isEmpty())
-						return checkValidator(numberValue, REGEX_IS_NUMBER) ? null : MALFORMED_ATTRIBUTE;
+						return isANumber(numberValue) ? null : MALFORMED_ATTRIBUTE;
 					else return checkValidator(numberValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
 				else return " a mandatory attribute cannot be empty";
 
@@ -437,8 +437,11 @@ public class MetaDataFieldSkeleton extends Composite{
 				if(numberValue.trim().isEmpty())
 					return null;
 				else {
-					String validatorToUse  = field.getValidator() == null  || field.getValidator().isEmpty() ? REGEX_IS_NUMBER : field.getValidator(); 
-					return checkValidator(numberValue, validatorToUse) ? null : MALFORMED_ATTRIBUTE;
+					String validatorToUse  = field.getValidator();
+					if(validatorToUse != null && !validatorToUse.isEmpty())
+						return checkValidator(numberValue, validatorToUse) ? null : MALFORMED_ATTRIBUTE;
+					else
+						return isANumber(numberValue) ? null : MALFORMED_ATTRIBUTE;
 				}
 			}
 
@@ -486,6 +489,15 @@ public class MetaDataFieldSkeleton extends Composite{
 		}
 	}
 
+	/**
+	 * Check if this string is a number
+	 * @param numberValue
+	 * @return
+	 */
+	private boolean isANumber(String numberValue) {
+		return numberValue.matches("-?\\d+(\\.\\d+)?");
+	}
+
 	/**
 	 * Check if value matches validator (regex). In case validator is null, true is returned.
 	 * @param value
@@ -737,7 +749,7 @@ public class MetaDataFieldSkeleton extends Composite{
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Check if the group associated (if it exists) should be forced
 	 * @return