From 5474b5e25bd1dde0361cc6a73ae1ee1e4a0b55ee Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 2 Feb 2023 16:56:50 +0100
Subject: [PATCH] #24520 Added parameter "force=true" to Delete Project

---
 .settings/org.eclipse.wst.common.component    | 33 ++++++++++++++-----
 CHANGELOG.md                                  |  7 ++++
 pom.xml                                       |  4 +--
 .../ui/relation/ViewRelationshipPanel.java    |  4 +--
 .../server/GeoportalDataEntryServiceImpl.java |  2 +-
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 3cd29ec..37bfc8d 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                                                                                            	
+                                                                                                                                                                                                                                                                                                                                	
+    
     
     
     
@@ -79,7 +80,8 @@
     
     
     <wb-module deploy-name="geoportal-data-entry-app-3.0.1">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -159,7 +161,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -239,7 +242,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -319,7 +323,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -351,7 +356,14 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        <dependent-module archiveName="metadata-profile-form-builder-widget-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/metadata-profile-form-builder-widget/metadata-profile-form-builder-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="geoportal-data-common-2.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -431,7 +443,8 @@
         
         
         <property name="context-root" value="geoportal-data-entry-app"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -511,7 +524,8 @@
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        	
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                	
+    
     
     
     
@@ -591,7 +605,8 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 701ee99..62c6031 100644
--- a/CHANGELOG.md
+++ b/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).
 
+## [v3.0.2-SNAPSHOT] - 2023-02-02
+
+#### Fixes
+
+- [#24520] Added parameter "force=true" to Delete Project
+- [#24475] Propagated the Access Policy in the fileset 
+
 ## [v3.0.1] - 2023-01-19
 
 #### Fixes
diff --git a/pom.xml b/pom.xml
index 5a0491e..c8fa3fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>geoportal-data-entry-app</artifactId>
 	<packaging>war</packaging>
-	<version>3.0.1</version>
+	<version>3.0.2-SNAPSHOT</version>
 	<name>GeoPortal Data Entry App</name>
 	<description>The GeoPortal Data Entry App is an application to build the web forms for data entries needed to create projects/documents (based on UCD) in the D4Science Geoportal service</description>
 	<scm>
@@ -25,7 +25,7 @@
 
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwt.version>2.9.0</gwt.version>
+		<gwt.version>2.10.0</gwt.version>
 		<!-- GWT needs at least java 1.6 -->
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/relation/ViewRelationshipPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/relation/ViewRelationshipPanel.java
index ce9d4cc..7b878ed 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/relation/ViewRelationshipPanel.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/relation/ViewRelationshipPanel.java
@@ -140,7 +140,7 @@ public class ViewRelationshipPanel extends Composite {
 		secondProjectPanelContainer.clear();
 		this.fromTheProject = project;
 
-		Entry<String, String> firstEntrySet = project.getFirstEntryOfMap();
+		Entry<String, Object> firstEntrySet = project.getFirstEntryOfMap();
 		String htmlMsg = firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b> (id: " + project.getId()
 				+ ")";
 		
@@ -203,7 +203,7 @@ public class ViewRelationshipPanel extends Composite {
 							@Override
 							public void onSuccess(ResultDocumentDV result) {
 								mapOfTargetProjectForId.put(relationDV.getTargetUCD(), result);
-								Entry<String, String> firstEntrySet = result.getFirstEntryOfMap();
+								Entry<String, Object> firstEntrySet = result.getFirstEntryOfMap();
 								String htmlMsg = firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue()
 										+ "</b> (id: " + result.getId() + ")";
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
index 7246dfd..2b2fda7 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
@@ -610,7 +610,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 			ProjectsCaller client = GeoportalClientCaller.projects();
 			SessionUtil.getCurrentContext(getThreadLocalRequest(), true);
 
-			client.deleteProject(profileID, projectID, false);
+			client.deleteProject(profileID, projectID, true);
 			// Updating count of Documents in session per profileID
 			Integer totalProjectForProfile = client.getTotalDocument(profileID);
 			SessionUtil.setTotalDocumentForProfileID(getThreadLocalRequest(), profileID, totalProjectForProfile);