patched issue https://support.d4science.org/issues/28044#note-28

to fix the issue https://support.d4science.org/issues/28426#note-7 added
`social-service-client` instead of `social-networking-library`
2024-11-25 17:35:15 +01:00 · 2024-11-13 14:35:58 +01:00 · 2024-11-13 11:21:35 +01:00 · 2024-11-13 11:07:44 +01:00 · 2024-11-13 11:06:58 +01:00 · 2024-08-02 17:13:37 +02:00
11 changed files with 740 additions and 482 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,11 +3,16 @@
 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] - 2022-05-03
+## [v2.1.1] - 2024-07-29
+
+- [#27898] Updated `uploadFile` and `uploadArchive` methods. They include the `fileSize` parameter
+- [#27934] Updated the data structure to handle asynchronous uploading of multiple files 
+
+## [v2.1.0] - 2022-05-03

 #### Enhancements

- [#23225] pdated the method to read the members of (VRE or Simple) shared folders
+- [#23225] Updated the method to read the members of (VRE or Simple) shared folders


 ## [v2.0.6] - 2020-07-15
--- a/pom.xml
+++ b/pom.xml
@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath />
 	</parent>

@ -12,7 +13,7 @@
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>workspace-uploader</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1</version>
 	<name>Workspace Uploader Widget</name>
 	<description>Workspace Uploader Widget allows your application to upload file/s in the gCube Workspace</description>
 	<scm>
@ -30,6 +31,7 @@
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<maven-portal-bom>4.0.0</maven-portal-bom>
 	</properties>

 	<dependencyManagement>
@ -37,26 +39,40 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.3</version>
+				<version>${maven-portal-bom}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

+	<!-- Profiles required for managing SHUB vesion via maven-portal-bom -->
 	<profiles>
+		<!-- PROD profile -->
 		<profile>
-			<id>localRun</id>
-			<dependencies>
-				<dependency>
-					<groupId>xerces</groupId>
-					<artifactId>xerces</artifactId>
-					<version>2.4.0</version>
-				</dependency>
-			</dependencies>
+			<id>workspace-release-profile</id>
+			<activation>
+				<property>
+					<name>Release</name>
+				</property>
+			</activation>
+			<properties>
+				<maven-portal-bom>4.0.0</maven-portal-bom>
+			</properties>
+		</profile>
+		<!-- DEV profile -->
+		<profile>
+			<id>workspace-snapshot-profile</id>
+			<activation>
+				<property>
+					<name>!Release</name>
+				</property>
+			</activation>
+			<properties>
+				<maven-portal-bom>4.0.0-SNAPSHOT</maven-portal-bom>
+			</properties>
 		</profile>
 	</profiles>
-
 	<dependencies>

 		<!-- Google Web Toolkit (GWT) -->
@ -117,7 +133,7 @@
 			<artifactId>storagehub-client-library</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>storagehub-client-wrapper</artifactId>
@ -131,7 +147,7 @@
 			<artifactId>json</artifactId>
 			<version>20090211</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>commons-httpclient</groupId>
 			<artifactId>commons-httpclient</artifactId>
@ -143,6 +159,11 @@
 			<scope>provided</scope>
 		</dependency>

+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+		</dependency>
+
 		<!-- Logger -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@ -154,13 +175,24 @@
 			<artifactId>slf4j-api</artifactId>
 			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>social-networking-library</artifactId>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.4</version>
 			<scope>provided</scope>
 		</dependency>

+		<dependency>
+			<groupId>org.gcube.social-networking</groupId>
+			<artifactId>social-service-client</artifactId>
+		</dependency>
+
+		<!-- <dependency> -->
+		<!-- <groupId>org.gcube.portal</groupId> -->
+		<!-- <artifactId>social-networking-library</artifactId> -->
+		<!-- <scope>provided</scope> -->
+		<!-- </dependency> -->
+
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslsocial</artifactId>
@ -262,8 +294,8 @@
 					</execution>
 				</executions>
 			</plugin>
-			
-			
+
+
 			<!-- GWT Maven Plugin - not needed -->
 			<!-- GWT Maven Plugin -->
 			<plugin>
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/ConstantsWorkspaceUploader.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/ConstantsWorkspaceUploader.java
@ -32,6 +32,8 @@ public class ConstantsWorkspaceUploader {
 	public static final String UPLOAD_FORM_ELEMENT = "uploadFormElement";

 	public static final String CLIENT_UPLOAD_KEYS = "client_upload_keys";
+	public static final String CLIENT_UPLOAD_FILEOBJ_FILENAME = "filename";
+	public static final String CLIENT_UPLOAD_FILEOBJ_FILESIZE= "filesize";
 	public static final String CANCEL_UPLOAD = "cancel_upload";
 	public static final String JSON_CLIENT_KEYS = "ClientKeys";

--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java
@ -15,11 +15,15 @@ import org.gcube.portlets.widgets.workspaceuploader.shared.WorkspaceUploaderItem
 import org.gcube.portlets.widgets.workspaceuploader.shared.WorkspaceUploaderItem.UPLOAD_STATUS;

 import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.json.client.JSONArray;
+import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
+import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONString;
+import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent;
 import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteHandler;
@ -43,21 +47,17 @@ public class MultipleDilaogUpload extends DialogUpload {
 	private String idFolder;
 	private UPLOAD_TYPE type;

-
 	/**
 	 * Instantiates a new multiple dilaog upload stream.
 	 *
-	 * @param headerTitle
-	 *            the header title
-	 * @param parentId
-	 *            the parent id
-	 * @param uploadType
-	 *            the upload type
+	 * @param headerTitle the header title
+	 * @param parentId    the parent id
+	 * @param uploadType  the upload type
 	 */
 	public MultipleDilaogUpload(String headerTitle, String parentId, UPLOAD_TYPE uploadType) {
 		super(headerTitle, parentId, uploadType);

-		this.type =uploadType;
+		this.type = uploadType;
 		this.idFolder = parentId;

 		fileUploadID = GenerateUUID.get(10, 16); // is tagID
@ -65,7 +65,9 @@ public class MultipleDilaogUpload extends DialogUpload {
 		this.addHandlers();
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see com.google.gwt.user.client.ui.DialogBox#show()
 	 */
 	@Override
@ -73,7 +75,9 @@ public class MultipleDilaogUpload extends DialogUpload {
 		super.show();
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see com.google.gwt.user.client.ui.PopupPanel#center()
 	 */
 	@Override
@ -84,40 +88,49 @@ public class MultipleDilaogUpload extends DialogUpload {
 	/**
 	 * Generate new upload client keys.
 	 *
-	 * @param files            the files
-	 * @param parentId            the parent id
+	 * @param files    the files
+	 * @param parentId the parent id
 	 * @return the list
 	 */
-	public void generateFakeUploaders(String filesSelected, String parentId) {
+	public void generateFakeUploaders(JSONArray filesSelected, String parentId) {

-		if(filesSelected==null || filesSelected.isEmpty())
+		if (filesSelected == null || filesSelected.size() == 0)
 			return;

-		String[] files = filesSelected.split(FILE_DELEMITER);
+		// String[] files = filesSelected.split(FILE_DELEMITER);

 		// NORMALIZE FILE NAMES
-		for (int i = 0; i < files.length; i++) {
-			String normalizedFileName = files[i];
+		for (int i = 0; i < filesSelected.size(); i++) {
+			JSONObject fileObject = (JSONObject) filesSelected.get(i);
+			GWT.log("checking filename for: " + fileObject.getJavaScriptObject().toString());
+			String normalizedFileName = fileObject.get("filename").isString().stringValue();
 			if (normalizedFileName.contains("\\")) {
-				files[i] = normalizedFileName.substring(normalizedFileName.lastIndexOf("\\") + 1); // remove C:\fakepath if exists
+				String sanitizedValue = normalizedFileName.substring(normalizedFileName.lastIndexOf("\\") + 1); // remove
+																												// C:\fakepath
+				// if exists
+				JSONValue jsonValue = JSONParser.parseStrict(sanitizedValue);
+				fileObject.put("filename", jsonValue);
+				filesSelected.set(i, fileObject);
 			}
 		}

-		GWT.log("generating fake uploaders on: "+Arrays.asList(files.toString()));
-		fakeUploaders = new ArrayList<WorkspaceUploaderItem>(files.length);
-		for (int i = 0; i < files.length; i++) {
+		fakeUploaders = new ArrayList<WorkspaceUploaderItem>(filesSelected.size());
+		for (int i = 0; i < filesSelected.size(); i++) {
+			JSONObject fileObject = (JSONObject) filesSelected.get(i);
 			WorkspaceUploaderItem fakeItem = new WorkspaceUploaderItem();
 			fakeItem.setClientUploadKey(GenerateUUID.get());
 			fakeItem.setUploadStatus(UPLOAD_STATUS.WAIT);
 			WorkspaceUploadFile fakeFile = new WorkspaceUploadFile();
-			fakeFile.setFileName(files[i]);
+			String fileName = fileObject.get("filename").isString().stringValue();
+			Long fileSize = (long) fileObject.get("size").isNumber().doubleValue();
+			fakeFile.setFileName(fileName);
+			fakeFile.setFileSize(fileSize);
 			fakeFile.setParentId(parentId);
 			fakeItem.setFile(fakeFile);
 			fakeUploaders.add(fakeItem);
 		}

-		GWT.log("fakeUploaders generated: "+fakeUploaders.toString());
-//		return fakeUploaders;
+		GWT.log("fakeUploaders generated: " + fakeUploaders.toString());
 	}

 	/*
@ -141,13 +154,11 @@ public class MultipleDilaogUpload extends DialogUpload {

 				if (result == null) {
 					removeLoading();
-					new DialogResult(null, "Error during upload",
-							"An error occurred during file upload.").center();
+					new DialogResult(null, "Error during upload", "An error occurred during file upload.").center();
 					return;
 				}
 				String strippedResult = new HTML(result).getText();
-				final HandlerResultMessage resultMessage = HandlerResultMessage
-						.parseResult(strippedResult);
+				final HandlerResultMessage resultMessage = HandlerResultMessage.parseResult(strippedResult);

 				switch (resultMessage.getStatus()) {
 				case ERROR:
@ -159,12 +170,12 @@ public class MultipleDilaogUpload extends DialogUpload {
 					GWT.log("Error during upload " + resultMessage.getMessage());
 					break;
 				case WARN: {
-					GWT.log("Upload completed with warnings "+ resultMessage.getMessage());
+					GWT.log("Upload completed with warnings " + resultMessage.getMessage());
 					removeLoading();
 					break;
 				}
-				case SESSION_EXPIRED:{
-					GWT.log("Upload aborted due to session expired: "+ resultMessage.getMessage());
+				case SESSION_EXPIRED: {
+					GWT.log("Upload aborted due to session expired: " + resultMessage.getMessage());
 					Window.alert("Session expired, please reload the page");
 					removeLoading();
 					break;
@ -193,24 +204,26 @@ public class MultipleDilaogUpload extends DialogUpload {
 			@Override
 			public void onChange(ChangeEvent event) {
 				GWT.log("browse return...");
-				if (fileUpload.getFilename() == null
-						|| fileUpload.getFilename().isEmpty()) {
+				if (fileUpload.getFilename() == null || fileUpload.getFilename().isEmpty()) {
 					GWT.log("No file specified ");
 					MultipleDilaogUpload.this.hide();
 					return;
 				}

-				String[] files = null;
-				GWT.log("Current Uploader has id: "+fileUploadID);
-				String filesSelected = getFilesSelected(fileUploadID, FILE_DELEMITER);
-				GWT.log("getFilesSelected: " + filesSelected);
-				files = filesSelected.split(FILE_DELEMITER);
+				GWT.log("Current Uploader has id: " + fileUploadID);
+				JavaScriptObject filesSelected = getFilesSelected(fileUploadID);
+				
+				JSONArray jsonArray = new JSONArray(filesSelected);
+				if(jsonArray!=null)
+					GWT.log("sono array");
+				
+				GWT.log("getFilesSelected: " + jsonArray);

-				if(isLimitExceeded(files.length))
+				if (isLimitExceeded(jsonArray.size()))
 					return;

 				// GENERATE NEW UPLOADERS
-				generateFakeUploaders(filesSelected, parentIdentifier);
+				generateFakeUploaders(jsonArray, parentIdentifier);
 				GWT.log(fakeUploaders.toString());
 				createJsonKeyForFiles();
 				GWT.log(jsonKeys);
@ -223,67 +236,23 @@ public class MultipleDilaogUpload extends DialogUpload {
 				// ADD TO FORM PANEL
 				// initJsonClientKeys();
 				jsonClientKeys.setValue(jsonKeys);
-
-//				// CASE 1 FILE
-//				if (files.length == 1) {
-//
-//					// recall: Some browser would write in
-//					// fileUploadField.getValue() C:\fakepath\$fileName
-//					final String label = files[0];
-//					WorkspaceUploaderServiceAsync.Util.getInstance()
-//							.itemExistsInWorkpaceFolder(parentIdentifier,
-//									label, new AsyncCallback<String>() {
-//
-//										@Override
-//										public void onSuccess(
-//												final String itemId) {
-//											GWT.log("itemExistsInWorkpaceFolder: "
-//													+ itemId);
-//											if (itemId != null) {
-//												removeItemAndSubmitForm(itemId);
-//												updateItemSubmitForm(itemId);
-////												if (Window.confirm(label+ " exists in folder. If you continue, a new version will be created")) {
-////													removeItemAndSubmitForm(itemId);
-////													updateItemSubmitForm(itemId);
-////												}
-//											} else
-//												submitForm(); // ITEM does NOT
-//																// EXIST SO
-//																// SUBMIT FORM;
-//										}
-//
-//										@Override
-//										public void onFailure(Throwable caught) {
-//											GWT.log("Sorry an error occurred on the server "
-//													+ caught.getLocalizedMessage()
-//													+ ". Please try again later");
-//											Window.alert(caught.getMessage());
-//										}
-//
-//									});
-//				} else
-					submitForm();
+				submitForm();

 			}
 		});

-
 	}

-
-
 	/**
 	 * Checks if is limit exceeded.
 	 *
 	 * @param numbOfFiles the numb of files
 	 * @return true, if is limit exceeded
 	 */
-	public boolean isLimitExceeded(int numbOfFiles){
+	public boolean isLimitExceeded(int numbOfFiles) {

 		if (numbOfFiles > ConstantsWorkspaceUploader.LIMIT_UPLOADS) {
-			Window.alert("Multiple upload limit is "
-					+ ConstantsWorkspaceUploader.LIMIT_UPLOADS
-					+ " files");
+			Window.alert("Multiple upload limit is " + ConstantsWorkspaceUploader.LIMIT_UPLOADS + " files");
 			MultipleDilaogUpload.this.hide();
 			return true;
 		}
@ -294,11 +263,12 @@ public class MultipleDilaogUpload extends DialogUpload {
 	/**
 	 * Adds the new submit to monitor.
 	 */
-	public void addNewSubmitToMonitor(){
+	public void addNewSubmitToMonitor() {
 		GWT.log("addNewSubmitToMonitor...");
 		int queueIndex = UploaderMonitor.getInstance().newQueue();
 		for (final WorkspaceUploaderItem workspaceUploaderItem : fakeUploaders) {
-			UploaderMonitor.getInstance().addNewUploaderToMonitorPanel(workspaceUploaderItem, workspaceUploaderItem.getFile().getFileName());
+			UploaderMonitor.getInstance().addNewUploaderToMonitorPanel(workspaceUploaderItem,
+					workspaceUploaderItem.getFile().getFileName());
 			setVisible(false);
 			removeLoading();
 			UploaderMonitor.getInstance().addNewUploaderToQueue(queueIndex, workspaceUploaderItem);
@ -308,7 +278,6 @@ public class MultipleDilaogUpload extends DialogUpload {
 		UploaderMonitor.getInstance().doStartPollingQueue(queueIndex);
 	}

-
 	/**
 	 * Creates the json key for files.
 	 *
@ -325,12 +294,16 @@ public class MultipleDilaogUpload extends DialogUpload {
 			for (int i = 0; i < fakeUploaders.size(); i++) {
 				WorkspaceUploaderItem file = fakeUploaders.get(i);
 				JSONObject obj = new JSONObject();
-				obj.put(file.getClientUploadKey(), new JSONString(file.getFile().getFileName()));
+				JSONObject fileObject = new JSONObject();
+				//Feature #27934
+				fileObject.put(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILENAME, new JSONString(file.getFile().getFileName()));
+				fileObject.put(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILESIZE, new JSONNumber(file.getFile().getFileSize()));
+				obj.put(file.getClientUploadKey(), fileObject);
 				jsonArray.set(i, obj);
 			}

 			jsonKeys = productObj.toString();
-			GWT.log("updated jsonKeys: "+jsonKeys);
+			GWT.log("updated jsonKeys: " + jsonKeys);
 		} catch (Exception e) {
 			GWT.log("error " + e.getMessage());
 			jsonKeys = null;
@ -394,22 +367,24 @@ public class MultipleDilaogUpload extends DialogUpload {
 	/**
 	 * Gets the files selected.
 	 *
-	 * @param tagId
-	 *            the tag id
-	 * @param fileDelimiter
-	 *            the file delimiter
+	 * @param tagId         the tag id
+	 * @param fileDelimiter the file delimiter
 	 * @return the files selected
 	 */
-	public static native String getFilesSelected(final String tagId, final String fileDelimiter) /*-{
+	public static native JavaScriptObject getFilesSelected(final String tagId) /*-{
 		var count = $wnd.$("#" + tagId)[0].files.length;
-		console.log(count);
-		var out = "";
+		console.log("number of files: "+count);
+		var outputs = [];

 		for (i = 0; i < count; i++) {
 			var file = $wnd.$("#" + tagId)[0].files[i];
-			//	        out += file.name + fileDelimiter + file.size + fileDelimiter;
-			out += file.name + fileDelimiter;
+			//out += file.name + fileDelimiter + file.size + fileDelimiter;
+			var the_file = { "filename": file.name, "size": file.size };
+			//var jsonString = JSON.stringify(the_file);
+			//console.log("the file is: "+jsonString);
+			outputs.push(the_file);
 		}
-		return out;
+		console.log("returning outputs: "+outputs);
+		return outputs;
 	}-*/;
 }
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/WorkspaceFieldsUploadManager.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/WorkspaceFieldsUploadManager.java
@ -14,24 +14,25 @@ import org.gcube.portlets.widgets.workspaceuploader.shared.WorkspaceUploaderItem

 import com.google.gwt.core.client.GWT;
 import com.google.gwt.json.client.JSONArray;
+import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
+import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONString;
+import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.client.Window;

 /**
 * The Class WorkspaceFieldsUpload.
 *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * Oct 20, 2015
+ * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Oct 20, 2015
 */
 public class WorkspaceFieldsUploadManager {

-	//FORM FIELD TO UPLOAD INTO WORKSPACE
+	// FORM FIELD TO UPLOAD INTO WORKSPACE
 	private String jsonKeys;
 	public static final String FILE_DELEMITER = ";";
 	private List<WorkspaceUploaderItem> fakeUploaders = new ArrayList<WorkspaceUploaderItem>();

-
 	public WorkspaceFieldsUploadManager() {
 	}

@ -41,12 +42,10 @@ public class WorkspaceFieldsUploadManager {
 	 * @param numbOfFiles the numb of files
 	 * @return true, if is limit exceeded
 	 */
-	public boolean isLimitExceeded(int numbOfFiles){
+	public boolean isLimitExceeded(int numbOfFiles) {

 		if (numbOfFiles > ConstantsWorkspaceUploader.LIMIT_UPLOADS) {
-			Window.alert("Multiple upload limit is "
-					+ ConstantsWorkspaceUploader.LIMIT_UPLOADS
-					+ " files");
+			Window.alert("Multiple upload limit is " + ConstantsWorkspaceUploader.LIMIT_UPLOADS + " files");
 			return true;
 		}

@ -56,18 +55,18 @@ public class WorkspaceFieldsUploadManager {
 	/**
 	 * Adds the new submit to monitor.
 	 */
-	public void addNewSubmitToMonitor(){
+	public void addNewSubmitToMonitor() {
 		GWT.log("addNewSubmitToMonitor...");
 		int queueIndex = UploaderMonitor.getInstance().newQueue();
 		for (final WorkspaceUploaderItem workspaceUploaderItem : fakeUploaders) {
-			UploaderMonitor.getInstance().addNewUploaderToMonitorPanel(workspaceUploaderItem, workspaceUploaderItem.getFile().getFileName());
+			UploaderMonitor.getInstance().addNewUploaderToMonitorPanel(workspaceUploaderItem,
+					workspaceUploaderItem.getFile().getFileName());
 			UploaderMonitor.getInstance().addNewUploaderToQueue(queueIndex, workspaceUploaderItem);
 //			UploaderMonitor.getInstance().pollWorkspaceUploader(workspaceUploaderItem);
 		}
 		UploaderMonitor.getInstance().doStartPollingQueue(queueIndex);
 	}

-
 	/**
 	 * Creates the json key for files.
 	 *
@ -84,12 +83,20 @@ public class WorkspaceFieldsUploadManager {
 			for (int i = 0; i < fakeUploaders.size(); i++) {
 				WorkspaceUploaderItem file = fakeUploaders.get(i);
 				JSONObject obj = new JSONObject();
-				obj.put(file.getClientUploadKey(), new JSONString(file.getFile().getFileName()));
+				JSONObject fileObject = new JSONObject();
+				// Feature #27934
+				fileObject.put(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILENAME,
+						new JSONString(file.getFile().getFileName()));
+				fileObject.put(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILESIZE,
+						new JSONNumber(file.getFile().getFileSize()));
+				obj.put(file.getClientUploadKey(), fileObject);
+				// obj.put(file.getClientUploadKey(), new
+				// JSONString(file.getFile().getFileName()));
 				jsonArray.set(i, obj);
 			}

 			jsonKeys = productObj.toString();
-			GWT.log("updated jsonKeys: "+jsonKeys);
+			GWT.log("updated jsonKeys: " + jsonKeys);
 		} catch (Exception e) {
 			GWT.log("error " + e.getMessage());
 			jsonKeys = null;
@ -100,44 +107,48 @@ public class WorkspaceFieldsUploadManager {
 	 * Generate new upload client keys.
 	 *
 	 * @param filesSelected the files selected
-	 * @param parentId            the parent id
+	 * @param parentId      the parent id
 	 * @return the list
 	 */
-	public void generateFakeUploaders(String filesSelected, String parentId) {
+	public void generateFakeUploaders(JSONArray filesSelected, String parentId) {

-		if(filesSelected==null || filesSelected.isEmpty())
+		if (filesSelected == null || filesSelected.size() == 0)
 			return;

-		String[] files = filesSelected.split(FILE_DELEMITER);
-
 		// NORMALIZE FILE NAMES
-		for (int i = 0; i < files.length; i++) {
-			String normalizedFileName = files[i];
+		for (int i = 0; i < filesSelected.size(); i++) {
+			JSONObject fileObject = (JSONObject) filesSelected.get(i);
+			GWT.log("checking filename for: " + fileObject.getJavaScriptObject().toString());
+			String normalizedFileName = fileObject.get("filename").isString().stringValue();
 			if (normalizedFileName.contains("\\")) {
-				files[i] = normalizedFileName.substring(normalizedFileName.lastIndexOf("\\") + 1); // remove
-																				// C:\fakepath\
-																				// if
-																				// exists
+				String sanitizedValue = normalizedFileName.substring(normalizedFileName.lastIndexOf("\\") + 1); // remove
+																												// C:\fakepath
+				// if exists
+				JSONValue jsonValue = JSONParser.parseStrict(sanitizedValue);
+				fileObject.put("filename", jsonValue);
+				filesSelected.set(i, fileObject);
 			}
 		}

-		GWT.log("generating fake uploaders on: "+Arrays.asList(files).toString());
-		fakeUploaders = new ArrayList<WorkspaceUploaderItem>(files.length);
-		for (int i = 0; i < files.length; i++) {
+		fakeUploaders = new ArrayList<WorkspaceUploaderItem>(filesSelected.size());
+		for (int i = 0; i < filesSelected.size(); i++) {
+			JSONObject fileObject = (JSONObject) filesSelected.get(i);
 			WorkspaceUploaderItem fakeItem = new WorkspaceUploaderItem();
 			fakeItem.setClientUploadKey(GenerateUUID.get());
 			fakeItem.setUploadStatus(UPLOAD_STATUS.WAIT);
 			WorkspaceUploadFile fakeFile = new WorkspaceUploadFile();
-			fakeFile.setFileName(files[i]);
+			String fileName = fileObject.get("filename").isString().stringValue();
+			Long fileSize = (long) fileObject.get("size").isNumber().doubleValue();
+			fakeFile.setFileName(fileName);
+			fakeFile.setFileSize(fileSize);
 			fakeFile.setParentId(parentId);
 			fakeItem.setFile(fakeFile);
 			fakeUploaders.add(fakeItem);
 		}

-		GWT.log("fakeUploaders generated: "+fakeUploaders.toString());
+		GWT.log("fakeUploaders generated: " + fakeUploaders.toString());
 	}

-
 	/**
 	 * @return the jsonKeys
 	 */
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/dragdrop/MultipleDNDUpload.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/dragdrop/MultipleDNDUpload.java
@ -14,7 +14,9 @@ import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploaderList
 import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE;
 import org.gcube.portlets.widgets.workspaceuploader.client.uploader.WorkspaceFieldsUploadManager;

+import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.shared.GWT;
+import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.user.client.Random;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HTML;
@ -252,9 +254,10 @@ public class MultipleDNDUpload extends LayoutPanel implements HasWorskpaceUpload
 	 * @param uploadUUID
 	 *            the upload uuid
 	 */
-	private void generateFakeUploaders(String filesSelected, String parentId, String uploadUUID) {
+	private void generateFakeUploaders(JavaScriptObject filesSelected, String parentId, String uploadUUID) {
 		WorkspaceFieldsUploadManager field = getFieldsUploadManager(uploadUUID);
-		field.generateFakeUploaders(filesSelected, parentId);
+		JSONArray jsonArray = new JSONArray(filesSelected);
+		field.generateFakeUploaders(jsonArray, parentId);
 	}


@ -607,14 +610,15 @@ public class MultipleDNDUpload extends LayoutPanel implements HasWorskpaceUpload

 						console.log("# of file/s: " + files.length);

-						var filesSelected = "";
-
+						var arrayFileSelected = [];
 						for (i = 0; i < files.length; i++) {
-							filesSelected += files[i].name + fileDelimiter;
+							var file = files[i];
+							var the_file = { "filename": file.name, "size": file.size };
+							arrayFileSelected.push(the_file);
 						}
-						console.log("filesSelected: " + filesSelected);
+						console.log("Object arrayFileSelected: " + arrayFileSelected);

-						instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::generateFakeUploaders(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(filesSelected,idfolder,uploadUUID);
+						instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::generateFakeUploaders(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Ljava/lang/String;)(arrayFileSelected,idfolder,uploadUUID);
 						instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::createJsonKeyForFiles(Ljava/lang/String;)(uploadUUID);
 						instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::updateJsonKeys(Ljava/lang/String;)(uploadUUID);
 						instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::setCurrentJsonKeValue(Ljava/lang/String;)(uploadUUID);
@ -657,10 +661,9 @@ public class MultipleDNDUpload extends LayoutPanel implements HasWorskpaceUpload
 						var numFolder = 0;
 						for (var i = 0; i < files.length; i++) {
 							var file = files[i];
-							var fileSelected = files[i].name + fileDelimiter;
 							if (!isFolder(file)) {
-								console.log("fileSelected: " + fileSelected);
-								console.log("files: " + files);
+								console.log("fileSelected: " + file.name);
+								//console.log("files: " + files);
 								formdata.append("isOverwrite", true);
 								formdata.append('uploadFormElement', file);
 							}else{
@ -668,6 +671,7 @@ public class MultipleDNDUpload extends LayoutPanel implements HasWorskpaceUpload
 							}
 						}

+						
 						xhr.send(formdata);
 						instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::addNewSubmitToMonitor(Ljava/lang/String;)(uploadUUID);

@ -686,6 +690,8 @@ public class MultipleDNDUpload extends LayoutPanel implements HasWorskpaceUpload
 							instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::showAlert(Ljava/lang/String;)(msg);
 						}
 						instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::reset()();
+						
+						
 					});
 			// Tells the browser that we *can* drop on this target
 			//			addEventHandler(drop, 'dragover', cancel);
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploader.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploader.java
@ -3,7 +3,6 @@
 */
 package org.gcube.portlets.widgets.workspaceuploader.server.notification;

-import java.util.ArrayList;
 import java.util.List;

 import javax.servlet.http.HttpServletRequest;
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/UploadItemProperties.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/UploadItemProperties.java
@ -0,0 +1,105 @@
+package org.gcube.portlets.widgets.workspaceuploader.server.upload;
+
+import java.io.Serializable;
+
+import org.gcube.portlets.widgets.workspaceuploader.client.ConstantsWorkspaceUploader;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Class UploadItemProperties.
+ * 
+ * contains properties sent from client for any file uploaded
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ *         Aug 1, 2024
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class UploadItemProperties implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7226677146789586756L;
+
+	@JsonProperty(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILENAME)
+	private String filename;
+	@JsonProperty(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILESIZE)
+	private Long filesize;
+
+	/**
+	 * Instantiates a new upload item properties.
+	 */
+	public UploadItemProperties() {
+
+	}
+
+	/**
+	 * Instantiates a new upload item properties.
+	 *
+	 * @param filename the filename
+	 * @param filesize the filesize
+	 */
+	public UploadItemProperties(String filename, Long filesize) {
+		super();
+		this.filename = filename;
+		this.filesize = filesize;
+	}
+
+	/**
+	 * Gets the filename.
+	 *
+	 * @return the filename
+	 */
+	@JsonProperty(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILENAME)
+	public String getFilename() {
+		return filename;
+	}
+
+	/**
+	 * Gets the filesize.
+	 *
+	 * @return the filesize
+	 */
+	@JsonProperty(ConstantsWorkspaceUploader.CLIENT_UPLOAD_FILEOBJ_FILESIZE)
+	public Long getFilesize() {
+		return filesize;
+	}
+
+	/**
+	 * Sets the filename.
+	 *
+	 * @param filename the new filename
+	 */
+	public void setFilename(String filename) {
+		this.filename = filename;
+	}
+
+	/**
+	 * Sets the filesize.
+	 *
+	 * @param filesize the new filesize
+	 */
+	public void setFilesize(Long filesize) {
+		this.filesize = filesize;
+	}
+
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("UploadItemProperties [filename=");
+		builder.append(filename);
+		builder.append(", filesize=");
+		builder.append(filesize);
+		builder.append("]");
+		return builder.toString();
+	}
+
+}
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/WorkspaceUploaderMng.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/WorkspaceUploaderMng.java
@ -77,7 +77,8 @@ public class WorkspaceUploaderMng {
 			
 			Long startTime = WorkspaceUploadServletStream.printStartTime();
 			//UPLOAD
-			createdItem = storageWrapper.getWorkspace().uploadFile(destinationFolder.getId(), uploadFile, itemName, "");
+			logger.info("calling upload file - [itemName: "+itemName+", totalBytes: "+totalBytes+"]");
+			createdItem = storageWrapper.getWorkspace().uploadFile(destinationFolder.getId(), uploadFile, itemName, "", totalBytes);

 			if(createdItem!=null){
 				WorkspaceUploadServletStream.printElapsedTime(startTime);
@ -199,13 +200,13 @@ public class WorkspaceUploaderMng {
 	 */
 	private static WorkspaceUploaderItem createWorkspaceUploaderArchive(StorageHubWrapper storageWrapper, final GCubeUser currUser, final String scopeGroupId, final WorkspaceUploaderItem workspaceUploader, final HttpServletRequest request, final InputStream uploadArchive, final String itemName, final WorkspaceFolder destinationFolder, final long totalBytes) throws InternalErrorException, IOException{
 		HttpSession httpSession  = request.getSession();
-		logger.info("calling upload archive - [itemName: "+itemName+"]");
+		logger.info("calling upload archive - [itemName: "+itemName+", totalBytes: "+totalBytes+"]");

 		WorkspaceItem createdItem = null;
 		try {
 			workspaceUploader.setUploadStatus(UPLOAD_STATUS.IN_PROGRESS);
 			workspaceUploader.setStatusDescription("Uploading "+itemName);
-			createdItem = storageWrapper.getWorkspace().uploadArchive(destinationFolder.getId(), uploadArchive, itemName);
+			createdItem = storageWrapper.getWorkspace().uploadArchive(destinationFolder.getId(), uploadArchive, itemName, totalBytes);

 			if(createdItem!=null){
 				logger.debug("StorageHub"+createdItem.getName() + " with id: "+createdItem.getId() + " uploaded correctly in "+destinationFolder.getPath());
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/shared/WorkspaceUploadFile.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/shared/WorkspaceUploadFile.java
@ -22,6 +22,7 @@ public class WorkspaceUploadFile implements Serializable{
 	private String fileName;
 	private String itemId;
 	private String versionName;
+	private Long fileSize;

 	/**
 	 * Instantiates a new workspace upload file.
@ -128,6 +129,20 @@ public class WorkspaceUploadFile implements Serializable{
 	public void setFileName(String fileName) {
 		this.fileName = fileName;
 	}
+	
+	
+
+	public Long getFileSize() {
+		return fileSize;
+	}
+
+
+
+	public void setFileSize(Long fileSize) {
+		this.fileSize = fileSize;
+	}
+
+

 	/*
 	 * (non-Javadoc)
@ -145,12 +160,8 @@ public class WorkspaceUploadFile implements Serializable{



-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
-
 		StringBuilder builder = new StringBuilder();
 		builder.append("WorkspaceUploadFile [parentId=");
 		builder.append(parentId);
@ -160,10 +171,10 @@ public class WorkspaceUploadFile implements Serializable{
 		builder.append(itemId);
 		builder.append(", versionName=");
 		builder.append(versionName);
+		builder.append(", fileSize=");
+		builder.append(fileSize);
 		builder.append("]");
 		return builder.toString();
 	}

-
-
 }
Author	SHA1	Message	Date
Francesco Mangiacrapa	97e58fcf91	patched issue https://support.d4science.org/issues/28044#note-28	2024-11-25 17:35:15 +01:00
Francesco Mangiacrapa	640a2bd097	to fix the issue https://support.d4science.org/issues/28426#note-7 added `social-service-client` instead of `social-networking-library`	2024-11-13 14:35:58 +01:00
Francesco Mangiacrapa	bb7f18e8af	updated `maven-portal-bom` at 4.0.0	2024-11-13 11:21:35 +01:00
Francesco Mangiacrapa	11a5fed7d1	removed -SNAPSHOT to be released	2024-11-13 11:07:44 +01:00
Francesco Mangiacrapa	c6b867198d	Merge pull request 'feature_27934' (!2 ) from feature_27934 into master Reviewed-on: #2	2024-11-13 11:06:58 +01:00
Francesco Mangiacrapa	9439ffa8c8	uncommented submit from for D&D	2024-08-02 17:13:37 +02:00
Francesco Mangiacrapa	4a3f31a0d7	Added UploadItemProperties class	2024-08-02 16:45:16 +02:00
Francesco Mangiacrapa	106dfc3a2b	in progress #27934	2024-08-01 12:46:24 +02:00
Francesco Mangiacrapa	284f2e5dca	added getHeaders iterator	2024-07-30 15:41:03 +02:00
Francesco Mangiacrapa	19ae7f2f66	- [#27898 ] Updated `uploadFile` and `uploadArchive` methods. They include the `fileSize` parameter	2024-07-29 16:02:57 +02:00
Francesco Mangiacrapa	0c903981d5	Removed -SNAPSHOT to be released.	2022-05-03 15:55:46 +02:00
Francesco Mangiacrapa	5c183c48ce	Merge pull request 'task_23225' (!1 ) from task_23225 into master Reviewed-on: #1	2022-05-03 15:54:23 +02:00