Merge pull request 'task_24166' (!2) from task_24166 into master

Reviewed-on: #2

.settings/com.gwtplugins.gdt.eclipse.core.prefs

@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
-lastWarOutDir=/home/francesco-mangiacrapa/git/metadata-profile-form-builder-widget/target/metadata-profile-form-builder-widget-0.1.0-SNAPSHOT
+jarsExcludedFromWebInfLib=
-warSrcDir=src/main/webapp
+lastWarOutDir=/home/francesco-mangiacrapa/git/metadata-profile-form-builder-widget/target/metadata-profile-form-builder-widget-2.0.0
+warSrcDir=
 warSrcDirIsOutput=false

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.component

@@ -1,62 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="2.0.0">
-                            
+                                
     
     
     
     
     
-    <wb-module deploy-name="metadata-profile-form-builder-widget-0.1.0-SNAPSHOT">
+    
-                                                        
+    <wb-module deploy-name="metadata-profile-form-builder-widget-2.0.0">
+                                                                
         
         
         
         
         
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                        
-        
-        
-        
-        
-        
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                        
-        
-        
-        
-        
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+                
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <property name="context-root" value="metadata-profile-form-builder-widget"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <property name="java-output-path" value="/metadata-profile-form-builder-widget/target/classes"/>
-                                                    
+                                                            
+    
     
     
     
     
     
     </wb-module>
-                        
+                            
+
 
 
 

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -2,7 +2,6 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="java" version="1.7"/>
-  <installed facet="jst.web" version="2.3"/>
   <installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>

CHANGELOG.md

@@ -4,6 +4,13 @@
 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).
 
+## [v2.1.0-SNAPSHOT] - 2023-02-01
+
+#### Enhancements
+
+- [#23188] Improved Legend "is required field"
+- [#24515] Managed the files already uploaded
+
 ## [v2.0.0] - 2022-11-14
 
 #### Enhancements

pom.xml

@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>metadata-profile-form-builder-widget</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.0</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<name>Metadata Profile Form Builder</name>
 	<description>
 		The Metadata Profile Form Builder is a widget able to build dynamically a web form by reading "gCube Metadata Profile/s" 
@@ -53,7 +53,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.4</version>
+				<version>3.7.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/MetadataProfileFormBuilderServiceAsync.java

@@ -10,17 +10,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 
 public interface MetadataProfileFormBuilderServiceAsync {
 
-	/**
-	 * GWT-RPC service asynchronous (client-side) interface
-	 * 
-	 * @see org.gcube.portlets.widgets.mpformbuilder.client.MetadataProfileFormBuilderService
-	 */
-
-	void getProfilesInTheScope(String scope, String genericResourceSecondaryType, AsyncCallback<List<MetaDataProfileBean>> callback);
-
-	void getProfileForMetadata(String metadata,
-			AsyncCallback<MetaDataProfileBean> callback);
-
 	/**
 	 * Utility class to get the RPC Async interface from client-side code
 	 */
@@ -39,6 +28,17 @@ public interface MetadataProfileFormBuilderServiceAsync {
 		}
 	}
 
+	/**
+	 * GWT-RPC service asynchronous (client-side) interface
+	 * 
+	 * @see org.gcube.portlets.widgets.mpformbuilder.client.MetadataProfileFormBuilderService
+	 */
+
+	void getProfilesInTheScope(String scope, String genericResourceSecondaryType,
+			AsyncCallback<List<MetaDataProfileBean>> callback);
+
+	void getProfileForMetadata(String metadata, AsyncCallback<MetaDataProfileBean> callback);
+
 	void getUploadStatus(String clientUploadKey, AsyncCallback<FileUploadingState> asyncCallback);
 
 	void purgeFilesUploaded(AsyncCallback<Integer> callback);

src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.ui.xml

@@ -59,10 +59,6 @@
 			<b:Fieldset styleName="{style.fieldset-border-style}">
 				<b:Legend styleName="{style.legend-style}">
 					Choose a Profile
-					<!-- <small> -->
-					<!-- <span style="color:red;">*</span> -->
-					<!-- is required -->
-					<!-- </small> -->
 				</b:Legend>
 
 				<!-- Alert blocks for info/errors -->
@@ -91,18 +87,11 @@
 					</b:Controls>
 				</b:ControlGroup>
 
-				<!-- TAGS Panel -->
-				<!-- <m:TagsPanel ui:field="tagsPanel"></m:TagsPanel> -->
-
 				<!-- Alert block on continue -->
 				<b:AlertBlock type="INFO" close="false"
 					animation="true" visible="false" ui:field="onContinueAlertBlock">
 				</b:AlertBlock>
 
-				<!-- <b:Button title="Continue" ui:field="continueButton" type="PRIMARY" -->
-				<!-- block="true">Continue</b:Button> -->
-				<!-- <b:Button title="Reset" ui:field="resetButton" block="true">Reset</b:Button> -->
-
 			</b:Fieldset>
 		</b:Form>
 
@@ -112,14 +101,6 @@
 		<b:Form type="HORIZONTAL" styleName="{style.form-main-style}"
 			ui:field="formThirdStep" visible="false">
 			<b:Fieldset styleName="{style.fieldset-border-style}">
-				<!-- <b:Legend styleName="{style.legend-style}" -->
-				<!-- ui:field="legendInsertInformation"> -->
-				<!-- Insert Information -->
-				<!-- <small> -->
-				<!-- <span style="color:red;">*</span> -->
-				<!-- is required -->
-				<!-- </small> -->
-				<!-- </b:Legend> -->
 
 				<u:CustomLegend ui:field="customLegend">
 					Insert Information
@@ -135,6 +116,9 @@
 				<!-- Here will be placed the metadata fields formats -->
 				<g:VerticalPanel ui:field="metadataFieldsPanel"
 					visible="false" width="100%"></g:VerticalPanel>
+					
+				<g:VerticalPanel ui:field="filesUploadedPanel"
+					visible="false" width="100%"></g:VerticalPanel>
 
 				<!-- Custom fields can be dinamically added -->
 				<b:ControlGroup ui:field="customFields"
@@ -165,27 +149,12 @@
 					styleName="{style.block-alert-style}">
 				</b:AlertBlock>
 
-				<!-- <g:HorizontalPanel ui:field="goToDatasetButtonPanel" visible="false"> -->
-				<!-- <g:Label>Go to the Item</g:Label> -->
-				<!-- <b:Button title="Go to the Item" ui:field="goToDatasetButton" -->
-				<!-- type="LINK" visible="false" styleName="{style.the-margin-left}"></b:Button> -->
-				<!-- </g:HorizontalPanel> -->
-
-				<!-- <b:Button title="Add resources to the just created item" -->
-				<!-- block="true" type="PRIMARY" visible="false" ui:field="addResourcesButton">Add 
-					Resources</b:Button> -->
-
 				<b:Button title="Create Item" ui:field="createButton"
 					type="PRIMARY" block="true">Create</b:Button>
 
 				<b:Button title="Edit Item" ui:field="editButton"
 					type="PRIMARY" block="true" visible="false">Edit</b:Button>
 
-
-				<!-- <b:Button title="Go Back" ui:field="goBackButtonSecondStep" -->
-				<!-- block="true">Go -->
-				<!-- Back</b:Button> -->
-
 			</b:Fieldset>
 		</b:Form>
 	</g:HTMLPanel>

src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/UploadedFilesBrowse.java

@@ -0,0 +1,130 @@
+package org.gcube.portlets.widgets.mpformbuilder.client.form.generic;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploaded;
+import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploadedRemote;
+
+import com.github.gwtbootstrap.client.ui.Button;
+import com.github.gwtbootstrap.client.ui.constants.IconType;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.Widget;
+
+public class UploadedFilesBrowse<T extends FileUploaded> extends Composite {
+
+	private static UploadedFilesBrowseUiBinder uiBinder = GWT.create(UploadedFilesBrowseUiBinder.class);
+
+	interface UploadedFilesBrowseUiBinder extends UiBinder<Widget, UploadedFilesBrowse> {
+	}
+
+	private List<T> listFileUploaded;
+
+	@UiField
+	HTMLPanel uploadFileContainer;
+
+	private FlexTable table = new FlexTable();
+
+	private List<Button> listButtonRemove = new ArrayList<Button>();
+
+	private HashMap<Integer, T> mapPositionalFU = new HashMap<Integer, T>();
+
+	public UploadedFilesBrowse(List<T> fileUploaded) {
+		initWidget(uiBinder.createAndBindUi(this));
+		this.listFileUploaded = fileUploaded;
+		// Filling map of files uploaded
+		int i = 0;
+		for (T file : listFileUploaded) {
+			mapPositionalFU.put(i, file);
+			i++;
+		}
+
+		showFileBrowseInteraction();
+
+	}
+
+	private void showFileBrowseInteraction() {
+		uploadFileContainer.clear();
+		// pathIndex = pathContentIndex;
+		// GWT.log("showing pathContentIndex: "+pathContentIndex);
+		GWT.log("showing files: " + listFileUploaded);
+		table.clear();
+		if (listFileUploaded.size() > 0) {
+			table.addStyleName("table-current-content");
+			table.setHTML(0, 0, "<span style='color:rgb(155, 80, 78); font-weight:bold;'>Current content:</span>");
+			table.setHTML(1, 0, "<span style='color:rgb(155, 80, 78);'>Filename</span>");
+			table.setHTML(1, 1, "<span style='color:rgb(155, 80, 78);'>MimeType<span>");
+			table.setHTML(1, 2, "<span style='color:rgb(155, 80, 78);'>Field Label</span>");
+			table.setHTML(1, 3, "<span style='color:rgb(155, 80, 78);'>Link</span>");
+
+			int i = 2;
+			int index = 0;
+
+			for (final FileUploaded file : listFileUploaded) {
+				final int filePointer = index;
+				int columnIndex = 0;
+				table.setHTML(i, columnIndex, file.getFileName());
+				if (file instanceof FileUploadedRemote) {
+					FileUploadedRemote fur = (FileUploadedRemote) file;
+					table.setHTML(i, ++columnIndex, fur.getMimeType());
+					String fieldLabel = file.getFilePath().getFormFieldLabel();
+					table.setHTML(i, ++columnIndex, fieldLabel);
+					String link = "<a target=\"_blank\" href=" + fur.getUrl() + ">View</a>";
+					table.setHTML(i, ++columnIndex, link);
+				}
+
+				final int rowIndexToRem = i;
+				Button buttonRemoveFile = new Button();
+				buttonRemoveFile.setIcon(IconType.TRASH);
+				buttonRemoveFile.setTitle("Remove this file");
+				buttonRemoveFile.addClickHandler(new ClickHandler() {
+
+					@Override
+					public void onClick(ClickEvent event) {
+						mapPositionalFU.remove(filePointer);
+						table.getRowFormatter().getElement(rowIndexToRem).setAttribute("hidden", "hidden");
+					}
+				});
+				listButtonRemove.add(buttonRemoveFile);
+				table.setWidget(i, ++columnIndex, buttonRemoveFile);
+				i++;
+				index++;
+			}
+
+			uploadFileContainer.add(table);
+		}
+
+	}
+
+	public void enableManageOfContent(boolean bool) {
+
+		for (Button button : listButtonRemove) {
+			button.setEnabled(bool);
+		}
+
+		double opacity = bool ? 1 : 0.8;
+
+		uploadFileContainer.getElement().getStyle().setOpacity(opacity);
+
+	}
+
+	public List<T> getListRemainingFileUploaded() {
+
+		Collection<T> collFileUplaoded = mapPositionalFU.values();
+
+		if (collFileUplaoded != null)
+			return new ArrayList<T>(collFileUplaoded);
+
+		return null;
+	}
+
+}

src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/UploadedFilesBrowse.ui.xml

@@ -0,0 +1,20 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<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">
+	<ui:style>
+	.important {
+		font-weight: bold;
+	}
+	
+	.padding-panel {
+		padding-left: 30px;
+		padding-right: 30px;
+		padding-bottom: 30px;
+	}
+	</ui:style>
+	<g:HTMLPanel>
+		<g:HTMLPanel ui:field="uploadFileContainer"
+			addStyleNames="{style.padding-panel}"></g:HTMLPanel>
+	</g:HTMLPanel>
+</ui:UiBinder> 

src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/MetaDataFieldSkeleton.java

@@ -149,7 +149,7 @@ public class MetaDataFieldSkeleton extends Composite {
 
 			if (operation.equals(OPERATION.UPDATE)) {
 				try {
-					if (field.getCurrentValue() != null)
+					if (field.getCurrentSingleValue() != null)
 						((CheckBox) holder).setValue(Boolean.valueOf(field.getDefaultValue()));
 				} catch (Exception e) {
 					// TODO: handle exception
@@ -171,8 +171,8 @@ public class MetaDataFieldSkeleton extends Composite {
 
 			if (operation.equals(OPERATION.UPDATE)) {
 				try {
-					if (field.getCurrentValue() != null)
+					if (field.getCurrentSingleValue() != null)
-						textArea.setText((String) field.getCurrentValue());
+						textArea.setText((String) field.getCurrentSingleValue());
 				} catch (Exception e) {
 					// TODO: handle exception
 				}
@@ -243,8 +243,8 @@ public class MetaDataFieldSkeleton extends Composite {
 
 			if (operation.equals(OPERATION.UPDATE)) {
 				try {
-					if (field.getCurrentValue() != null)
+					if (field.getCurrentSingleValue() != null)
-						((TextArea) holder).setText((String) field.getCurrentValue());
+						((TextArea) holder).setText((String) field.getCurrentSingleValue());
 				} catch (Exception e) {
 					// TODO: handle exception
 				}
@@ -268,8 +268,8 @@ public class MetaDataFieldSkeleton extends Composite {
 			if (operation.equals(OPERATION.UPDATE)) {
 				// set time, if present
 				try {
-					if (field.getCurrentValue() != null) {
+					if (field.getCurrentSingleValue() != null) {
-						String currentValue = (String) field.getCurrentValue();
+						String currentValue = (String) field.getCurrentSingleValue();
 						String[] dateAndTime = currentValue.split(" ");
 						if (dateAndTime.length > 0) {
 							ref.setStartDate(dateAndTime[0], dateAndTime.length > 1 ? dateAndTime[1] : null);
@@ -290,7 +290,7 @@ public class MetaDataFieldSkeleton extends Composite {
 			if (operation.equals(OPERATION.UPDATE)) {
 				// set time, if present
 				try {
-					setRangeTimeInTimeBox((String) field.getCurrentValue(), rangeBox);
+					setRangeTimeInTimeBox((String) field.getCurrentSingleValue(), rangeBox);
 				} catch (Exception e) {
 					// TODO: handle exception
 				}
@@ -313,7 +313,7 @@ public class MetaDataFieldSkeleton extends Composite {
 
 			if (operation.equals(OPERATION.UPDATE)) {
 				try {
-					setRangeTimeInTimeBox((String) field.getCurrentValue(), rangeBoxFirst);
+					setRangeTimeInTimeBox((String) field.getCurrentSingleValue(), rangeBoxFirst);
 				} catch (Exception e) {
 					// TODO: handle exception
 				}
@@ -373,8 +373,8 @@ public class MetaDataFieldSkeleton extends Composite {
 
 			if (operation.equals(OPERATION.UPDATE)) {
 				try {
-					if (field.getCurrentValue() != null)
+					if (field.getCurrentSingleValue() != null)
-						((TextBox) holder).setText((String) field.getCurrentValue());
+						((TextBox) holder).setText((String) field.getCurrentSingleValue());
 				} catch (Exception e) {
 					// TODO: handle exception
 				}
@@ -401,8 +401,8 @@ public class MetaDataFieldSkeleton extends Composite {
 
 				if (operation.equals(OPERATION.UPDATE)) {
 					try {
-						if (field.getCurrentValue() != null)
+						if (field.getCurrentSingleValue() != null)
-							((TextBox) holder).setText((String) field.getCurrentValue());
+							((TextBox) holder).setText((String) field.getCurrentSingleValue());
 					} catch (Exception e) {
 						// TODO: handle exception
 					}
@@ -431,17 +431,31 @@ public class MetaDataFieldSkeleton extends Composite {
 				List<String> vocabulary = field.getVocabulary();
 
 				for (String term : vocabulary) {
-					tempListBox.addItem(term);
+					tempListBox.addItem(term, term);
 				}
 
 				// set default value
 				if (field.getDefaultValue() != null)
 					tempListBox.setSelectedValue(field.getDefaultValue());
 
+				//to be sure
+				tempListBox.setMultipleSelect(field.isMultiSelection());
+				
 				if (operation.equals(OPERATION.UPDATE)) {
 					try {
-						if (field.getCurrentValue() != null)
+						if (field.getCurrentValues() != null) {
-							tempListBox.setSelectedValue((String) field.getCurrentValue());
+							if (field.isMultiSelection()) {
+								//Buggy in Bootstrap
+								for (String value : field.getCurrentValues()) {
+									GWT.log("Multiple Selecting: "+value);
+									tempListBox.setSelectedValue((String) value);
+								}
+							}else {
+								GWT.log("Selecting: "+field.getCurrentSingleValue());
+								tempListBox.setSelectedValue((String) field.getCurrentSingleValue());
+							}
+							
+						}
 					} catch (Exception e) {
 						// TODO: handle exception
 					}
@@ -984,7 +998,7 @@ public class MetaDataFieldSkeleton extends Composite {
 			break;
 
 		case File:
-			GWT.log("here");
+			
 			if (holder.getClass().equals(MultipleDilaogUpload.class) || holder.getClass().equals(DialogUpload.class)) {
 				DialogUpload dUpload = (DialogUpload) holder;
 				dUpload.enableUpload(!bool);

src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/upload/MultipleDilaogUpload.java

@@ -22,7 +22,6 @@ import com.google.gwt.json.client.JSONString;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HTML;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class MultipleDilaogUploadStream.
  *
@@ -46,8 +45,11 @@ public class MultipleDilaogUpload extends DialogUpload {
 	/** The id folder. */
 	private String idFolder;
 
+
 	/**
 	 * Instantiates a new multiple dilaog upload.
+	 *
+	 * @param fieldName the field name used in the web form
 	 */
 	public MultipleDilaogUpload(String fieldName) {
 		this.fileUploadID = GenerateUUID.get(10, 16); // is tagID
@@ -87,7 +89,7 @@ public class MultipleDilaogUpload extends DialogUpload {
 			FileUploaded fakeFile = new FileUploaded();
 			fakeFile.setFileName(files[i]);
 			fakeItem.setFile(fakeFile);
-			fakeFile.setFilePaths(new FilePath(getFieldName())); // The Form Field Label is unique for single-multiple
+			fakeFile.setFilePath(new FilePath(getFieldName())); // The Form Field Label is unique for single-multiple
 																	// upload
 			fakeUploaders.add(fakeItem);
 		}

src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/utils/CustomLegend.java

@@ -46,7 +46,7 @@ public class CustomLegend extends Legend {
 		
 		String htmlToAdd = text;
 		if (addIsRequiredTxt)
-			htmlToAdd += "<small><span style='color:red;'>&nbsp*</span> is required</small>";
+			htmlToAdd += "<small><span style='color:red;'>&nbsp*</span> is required field</small>";
 		
 		HTML toHMTL = new HTML(htmlToAdd);
 

src/main/java/org/gcube/portlets/widgets/mpformbuilder/public/MetadataProfileFormBuilder.css

@@ -3,6 +3,13 @@
 
 .legend-style {
 	width: auto;
-	padding: 10px;
+	padding-left: 10px;
 	margin-bottom: 0px;
+	border-bottom: 0px;
+	padding-right: 10px;
+}
+
+.legend-style small {
+	display: block;
+	font-size: 12px !important;
 }

src/main/java/org/gcube/portlets/widgets/mpformbuilder/server/MetadataDiscovery.java

@@ -21,7 +21,6 @@ import org.gcube.common.metadataprofilediscovery.jaxb.MetadataValidator;
 import org.gcube.common.metadataprofilediscovery.jaxb.MetadataVocabulary;
 import org.gcube.common.metadataprofilediscovery.jaxb.NamespaceCategory;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.portlets.widgets.mpformbuilder.server.util.WsUtil;
 import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.CategoryWrapper;
 import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.DataTypeWrapper;
 import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.FieldAsGroup;
@@ -119,10 +118,10 @@ public class MetadataDiscovery {
 				MetaDataProfileBean bean = toMetaDataProfileBean(metadata, categories, profile.getName());
 				beans.add(bean);
 
-				if(!WsUtil.isWithinPortal()) {
+//				if(!WsUtil.isWithinPortal()) {
-					LOG.info("DEV MODE ENABLED - Out of portal!");
+//					LOG.info("DEV MODE ENABLED - Out of portal!");
-					randomizeCurrentValues(bean.getMetadataFields());
+//					randomizeCurrentValues(bean.getMetadataFields());
-				}
+//				}
 			}
 
 			prettyPrintList(beans);
@@ -145,14 +144,14 @@ public class MetadataDiscovery {
 			
 			switch (dtw) {
 			case Boolean:
-				metadataFieldWrapper.setCurrentValue(Boolean.FALSE.toString());
+				metadataFieldWrapper.setCurrentValues(Boolean.FALSE.toString());
 				break;
 			case Number:
-				metadataFieldWrapper.setCurrentValue(new Random().nextInt()+"");
+				metadataFieldWrapper.setCurrentValues(new Random().nextInt()+"");
 				break;
 			case String:
 			case Text:
-				metadataFieldWrapper.setCurrentValue("Text "+UUID.randomUUID());
+				metadataFieldWrapper.setCurrentValues("Text "+UUID.randomUUID());
 				break;
 			default:
 				break;

src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java

@@ -7,72 +7,66 @@ import java.util.List;
 import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
 import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploaded;
 
-
 /**
  * The Class GenericDatasetBean.
  *
  * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
  * 
- * Oct 19, 2020
+ *         Oct 19, 2020
  */
-public class GenericDatasetBean implements Serializable {
+public class GenericDatasetBean<T extends MetaDataProfileBean, F extends FileUploaded> implements Serializable {
-	
+
 	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = -5215392381589702647L;
-	
+
-	
 	/** The metadata profile list. */
-	private List<MetaDataProfileBean> metadataProfileList;
+	private List<T> metadataProfileList;
-	
+
 	/** The form data entry fields. */
 	private LinkedHashMap<String, List<String>> formDataEntryFields;
-	
+
 	/** The files uploaded. */
-	private List<FileUploaded> filesUploaded;
+	private List<F> filesUploaded;
 
 	/**
 	 * Instantiates a new generic dataset bean.
 	 */
-	public GenericDatasetBean(){
+	public GenericDatasetBean() {
 	}
-	
+
-	
 	/**
 	 * Instantiates a new generic dataset bean.
 	 *
 	 * @param metadataProfileList the metadata profile list
 	 * @param formDataEntryFields the form data entry fields
-	 * @param filesUploaded the files uploaded
+	 * @param filesUploaded       the files uploaded
 	 */
-	public GenericDatasetBean(List<MetaDataProfileBean> metadataProfileList, LinkedHashMap<String, List<String>> formDataEntryFields,
+	public GenericDatasetBean(List<T> metadataProfileList, LinkedHashMap<String, List<String>> formDataEntryFields,
-			List<FileUploaded> filesUploaded) {
+			List<F> filesUploaded) {
 		super();
 		this.metadataProfileList = metadataProfileList;
 		this.formDataEntryFields = formDataEntryFields;
 		this.filesUploaded = filesUploaded;
 	}
 
-
 	/**
 	 * Gets the metadata profile list.
 	 *
 	 * @return the metadata profile list
 	 */
-	public List<MetaDataProfileBean> getMetadataProfileList() {
+	public List<T> getMetadataProfileList() {
 		return metadataProfileList;
 	}
 
-
 	/**
 	 * Sets the metadata profile list.
 	 *
 	 * @param metadataProfileList the new metadata profile list
 	 */
-	public void setMetadataProfileList(List<MetaDataProfileBean> metadataProfileList) {
+	public void setMetadataProfileList(List<T> metadataProfileList) {
 		this.metadataProfileList = metadataProfileList;
 	}
 
-
 	/**
 	 * Gets the form data entry fields.
 	 *
@@ -82,7 +76,6 @@ public class GenericDatasetBean implements Serializable {
 		return formDataEntryFields;
 	}
 
-
 	/**
 	 * Sets the form data entry fields.
 	 *
@@ -92,27 +85,24 @@ public class GenericDatasetBean implements Serializable {
 		this.formDataEntryFields = formDataEntryFields;
 	}
 
-
 	/**
 	 * Gets the files uploaded.
 	 *
 	 * @return the files uploaded
 	 */
-	public List<FileUploaded> getFilesUploaded() {
+	public List<F> getFilesUploaded() {
 		return filesUploaded;
 	}
 
-
 	/**
 	 * Sets the files uploaded.
 	 *
 	 * @param filesUploaded the new files uploaded
 	 */
-	public void setFilesUploaded(List<FileUploaded> filesUploaded) {
+	public void setFilesUploaded(List<F> filesUploaded) {
 		this.filesUploaded = filesUploaded;
 	}
 
-
 	/**
 	 * To string.
 	 *
@@ -124,6 +114,4 @@ public class GenericDatasetBean implements Serializable {
 				+ formDataEntryFields + ", filesUploaded=" + filesUploaded + "]";
 	}
 
-	
-	
 }

src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/metadata/MetaDataProfileBean.java

@@ -3,15 +3,14 @@ package org.gcube.portlets.widgets.mpformbuilder.shared.metadata;
 import java.io.Serializable;
 import java.util.List;
 
-
 /**
  * The Class MetaDataProfileBean.
  *
  * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
  * 
- * Mar 3, 2022
+ *         Mar 3, 2022
  */
-public class MetaDataProfileBean implements Serializable{
+public class MetaDataProfileBean implements Serializable {
 
 	/**
 	 * 
@@ -25,21 +24,19 @@ public class MetaDataProfileBean implements Serializable{
 	/**
 	 * Instantiates a new meta data profile bean.
 	 */
-	public MetaDataProfileBean(){
+	public MetaDataProfileBean() {
 		super();
 	}
-	
+
 	/**
 	 * Instantiates a new meta data profile bean.
 	 *
-	 * @param type the type
+	 * @param type           the type
-	 * @param title the title
+	 * @param title          the title
 	 * @param metadataFields the metadata fields
-	 * @param categories the categories
+	 * @param categories     the categories
 	 */
-	public MetaDataProfileBean(String type,
+	public MetaDataProfileBean(String type, String title, List<MetadataFieldWrapper> metadataFields,
-			String title,
-			List<MetadataFieldWrapper> metadataFields,
 			List<CategoryWrapper> categories) {
 		super();
 		this.type = type;
@@ -48,96 +45,51 @@ public class MetaDataProfileBean implements Serializable{
 		this.metadataFields = metadataFields;
 	}
 
-	/**
-	 * Gets the type.
-	 *
-	 * @return the type
-	 */
 	public String getType() {
 		return type;
 	}
-	
+
-	/**
+	public String getTitle() {
-	 * Sets the type.
+		return title;
-	 *
-	 * @param type the type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	/**
-	 * Gets the metadata fields.
-	 *
-	 * @return the metadataFields
-	 */
-	public List<MetadataFieldWrapper> getMetadataFields() {
-		return metadataFields;
-	}
-	
-	/**
-	 * Sets the metadata fields.
-	 *
-	 * @param metadataFields the metadataFields to set
-	 */
-	public void setMetadataFields(List<MetadataFieldWrapper> metadataFields) {
-		this.metadataFields = metadataFields;
 	}
 
-	/**
-	 * Gets the categories.
-	 *
-	 * @return the categories
-	 */
 	public List<CategoryWrapper> getCategories() {
 		return categories;
 	}
 
-	/**
+	public List<MetadataFieldWrapper> getMetadataFields() {
-	 * Sets the categories.
+		return metadataFields;
-	 *
-	 * @param categories the new categories
-	 */
-	public void setCategories(List<CategoryWrapper> categories) {
-		this.categories = categories;
 	}
-	
+
-	/**
+	public void setType(String type) {
-	 * Gets the title.
+		this.type = type;
-	 *
-	 * @return the title
-	 */
-	public String getTitle() {
-		return title;
 	}
-	
+
-	/**
-	 * Sets the title.
-	 *
-	 * @param title the new title
-	 */
 	public void setTitle(String title) {
 		this.title = title;
 	}
-	
+
-	/**
+	public void setCategories(List<CategoryWrapper> categories) {
-	 * To string.
+		this.categories = categories;
-	 *
+	}
-	 * @return the string
+
-	 */
+	public void setMetadataFields(List<MetadataFieldWrapper> metadataFields) {
+		this.metadataFields = metadataFields;
+	}
+
 	@Override
 	public String toString() {
-		final int maxLen = 10;
+		StringBuilder builder = new StringBuilder();
-		return "MetaDataProfileBean [type="
+		builder.append("MetaDataProfileBean [type=");
-				+ type
+		builder.append(type);
-				+ ", title="
+		builder.append(", title=");
-				+ title
+		builder.append(title);
-				+ ", categories="
+		builder.append(", categories=");
-				+ (categories != null ? categories.subList(0,
+		builder.append(categories);
-						Math.min(categories.size(), maxLen)) : null)
+		builder.append(", metadataFields=");
-				+ ", metadataFields="
+		builder.append(metadataFields);
-				+ (metadataFields != null ? metadataFields.subList(0,
+		builder.append("]");
-						Math.min(metadataFields.size(), maxLen)) : null) + "]";
+		return builder.toString();
 	}
-	
+
 }

src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/metadata/MetadataFieldWrapper.java

@@ -1,6 +1,7 @@
 package org.gcube.portlets.widgets.mpformbuilder.shared.metadata;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -29,7 +30,7 @@ public class MetadataFieldWrapper implements UpdatableField, Serializable {
 
 	private Integer maxOccurs = 1;
 
-	private String currentValue;
+	private String[] currentValues;
 
 	/**
 	 * Instantiates a new metadata field.
@@ -331,24 +332,42 @@ public class MetadataFieldWrapper implements UpdatableField, Serializable {
 	}
 
 	/**
-	 * Sets the current value.
+	 * Gets the current values.
 	 *
-	 * @param value the new current value
+	 * @return the current values
 	 */
-	public void setCurrentValue(String value) {
+	public List<String> getCurrentValues() {
-		this.currentValue = value;
+		if (currentValues == null)
-
+			return null;
+		return Arrays.asList(currentValues);
 	}
 
 	/**
-	 * Gets the current value.
+	 * Sets the current values.
 	 *
-	 * @return the current value
+	 * @param currentValues the new current values
 	 */
-	public String getCurrentValue() {
+	public void setCurrentValues(String... currentValues) {
-		return currentValue;
+		this.currentValues = currentValues;
 	}
 
+	/**
+	 * Gets the current single value.
+	 *
+	 * @return the current single value
+	 */
+	public String getCurrentSingleValue() {
+		if (this.currentValues != null && this.currentValues.length > 0)
+			return this.currentValues[0];
+
+		return null;
+	}
+
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
@@ -380,12 +399,10 @@ public class MetadataFieldWrapper implements UpdatableField, Serializable {
 		builder.append(asTag);
 		builder.append(", maxOccurs=");
 		builder.append(maxOccurs);
-		builder.append(", currentValue=");
+		builder.append(", currentValues=");
-		builder.append(currentValue);
+		builder.append(currentValues);
 		builder.append("]");
 		return builder.toString();
 	}
 
-	
-
 }

src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/metadata/UpdatableField.java

@@ -1,8 +1,10 @@
 package org.gcube.portlets.widgets.mpformbuilder.shared.metadata;
 
+import java.util.List;
+
 public interface UpdatableField {
 
-	void setCurrentValue(String value);
+	void setCurrentValues(String... values);
 
-	String getCurrentValue();
+	List<String> getCurrentValues();
 }

src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/upload/FilePath.java

@@ -7,15 +7,16 @@ import java.io.Serializable;
  *
  * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
  * 
- *         Mar 21, 2022
+ *         Apr 13, 2023
  */
 public class FilePath implements Serializable {
 
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 5321133561716734223L;
+	private static final long serialVersionUID = -1544808784879956412L;
-	String formFieldLabel; // is the gcubeProfileFieldName in the UCD of Geoportal
+	private String formFieldLabel; // It is the gcubeProfileFieldName registered in the UCD of Geoportal
+	private String fieldName; // It is the fieldName registered in the UCD of Geoportal
 
 	/**
 	 * Instantiates a new file paths.
@@ -32,6 +33,17 @@ public class FilePath implements Serializable {
 		this.formFieldLabel = formFieldLabel;
 	}
 
+	/**
+	 * Instantiates a new file path.
+	 *
+	 * @param formFieldLabel the form field label
+	 * @param fieldName      the field name
+	 */
+	public FilePath(String formFieldLabel, String fieldName) {
+		this.formFieldLabel = formFieldLabel;
+		this.fieldName = fieldName;
+	}
+
 	/**
 	 * Gets the form field label.
 	 *
@@ -50,6 +62,24 @@ public class FilePath implements Serializable {
 		this.formFieldLabel = formFieldLabel;
 	}
 
+	/**
+	 * Gets the field name.
+	 *
+	 * @return the field name
+	 */
+	public String getFieldName() {
+		return fieldName;
+	}
+
+	/**
+	 * Sets the field name.
+	 *
+	 * @param fieldName the new field name
+	 */
+	public void setFieldName(String fieldName) {
+		this.fieldName = fieldName;
+	}
+
 	/**
 	 * To string.
 	 *
@@ -60,6 +90,8 @@ public class FilePath implements Serializable {
 		StringBuilder builder = new StringBuilder();
 		builder.append("FilePath [formFieldLabel=");
 		builder.append(formFieldLabel);
+		builder.append(", fieldName=");
+		builder.append(fieldName);
 		builder.append("]");
 		return builder.toString();
 	}

src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/upload/FileUploaded.java

@@ -117,32 +117,14 @@ public class FileUploaded implements Serializable, IsSerializable {
 	}
 
 	/**
-	 * Sets the file paths.
+	 * Sets the file path.
 	 *
-	 * @param filePaths the new file paths
+	 * @param filePath the new file path
 	 */
-	public void setFilePaths(FilePath filePaths) {
+	public void setFilePath(FilePath filePath) {
-		this.filePath = filePaths;
+		this.filePath = filePath;
 	}
 
-	/**
+
-	 * To string.
-	 *
-	 * @return the string
-	 */
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("FileUploaded [fileName=");
-		builder.append(fileName);
-		builder.append(", tempSystemPath=");
-		builder.append(tempSystemPath);
-		builder.append(", createdByUser=");
-		builder.append(createdByUser);
-		builder.append(", filePath=");
-		builder.append(filePath);
-		builder.append("]");
-		return builder.toString();
-	}
 
 }

src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/upload/FileUploadedRemote.java

@@ -0,0 +1,74 @@
+package org.gcube.portlets.widgets.mpformbuilder.shared.upload;
+
+/**
+ * The Class FileUploadedRemote.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ *         Feb 1, 2023
+ */
+public class FileUploadedRemote extends FileUploaded {
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2991541932545131966L;
+	private String url;
+	private String mimeType;
+
+	/**
+	 * Instantiates a new file uploaded remote.
+	 */
+	public FileUploadedRemote() {
+
+	}
+
+	/**
+	 * Gets the url.
+	 *
+	 * @return the url
+	 */
+	public String getUrl() {
+		return url;
+	}
+
+	/**
+	 * Sets the url.
+	 *
+	 * @param url the new url
+	 */
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	/**
+	 * Gets the mime type.
+	 *
+	 * @return the mime type
+	 */
+	public String getMimeType() {
+		return mimeType;
+	}
+
+	/**
+	 * Sets the mime type.
+	 *
+	 * @param mimeType the new mime type
+	 */
+	public void setMimeType(String mimeType) {
+		this.mimeType = mimeType;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("FileUploadedRemote [url=");
+		builder.append(url);
+		builder.append(", mimeType=");
+		builder.append(mimeType);
+		builder.append("]");
+		return builder.toString();
+	}
+
+}