removed -SNAPSHOT to be released

Merge pull request 'feature_27467' (!6 ) from feature_27467 into master
Reviewed-on: #6
2024-05-16 10:51:43 +02:00 · 2024-05-16 10:42:59 +02:00 · 2024-05-15 10:08:40 +02:00 · 2024-05-15 10:02:17 +02:00 · 2024-05-15 09:56:50 +02:00 · 2024-05-14 16:31:28 +02:00
26 changed files with 1302 additions and 281 deletions
--- a/.classpath
+++ b/.classpath
@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/gcube-ckan-datacatalog-2.2.3/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/gcube-ckan-datacatalog-2.3.1/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/gcube-ckan-datacatalog-2.2.3/WEB-INF/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="test" value="true"/>
@ -35,5 +30,10 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/gcube-ckan-datacatalog-2.2.3/WEB-INF/classes"/>
+	<classpathentry excluding="**" kind="src" output="target/gcube-ckan-datacatalog-2.3.1/WEB-INF/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/gcube-ckan-datacatalog-2.3.1/WEB-INF/classes"/>
 </classpath>
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@ -1,6 +1,5 @@
->>>>>>>=refs/heads/task_20699
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francescomangiacrapa/git/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-2.2.3
+lastWarOutDir=/home/francescomangiacrapa/git/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-2.3.1
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.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
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                            
    
    
    
@ -29,8 +29,120 @@
    
    
    
-    <wb-module deploy-name="gcube-ckan-datacatalog-2.2.3">
-                                                                                                                                                                                                                                                        
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <wb-module deploy-name="gcube-ckan-datacatalog-2.3.1">
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
        
        
        
@ -61,7 +173,63 @@
        
        
        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
        
        
        
@ -92,7 +260,63 @@
        
        
        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
        
        
        
@ -123,23 +347,7 @@
        
        
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+                                                                                                                        
        
        
        
@ -154,7 +362,66 @@
        
        
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                                                                                                                                                                                                        
+        <dependent-module archiveName="metadata-profile-form-builder-widget-2.1.1.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>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
        
        
        
@ -185,7 +452,63 @@
        
        
        <property name="context-root" value="gcube-ckan-datacatalog"/>
-                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
        
        
        
@ -216,7 +539,63 @@
        
        
        <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
    
    
    
@ -247,7 +626,63 @@
    
    
    </wb-module>
-                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+



--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@ -6,5 +6,5 @@
  <installed facet="liferay.portlet" version="6.0"/>
  <installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
  <installed facet="jst.jaxrs" version="2.0"/>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,42 @@
 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.3.1] - 2024-05-14
+
+- Included `ckan-metadata-publisher-widget` with bug fix [#27455] and new feature [#27467]
+
+## [v2.3.0] - 2024-02-02
+
+- Supported the Edit facility [#26639]
+- Supported the Delete facility [#26793]
+- Revisited the Navigation Bar
+- Revisited the "Select Item Resources" step when publishing from Workspace [#26874]
+- Catalogue at root VO or VO level works in read only mode [#26854]
+
+## [v2.2.7] - 2023-12-21
+
+- Including "Upload to Zenodo" fix [#26166]
+
+## [v2.2.6] - 2023-07-25
+
+- Just rebuilt the Portlet, fixing issue [#25275]
+- Moved to GWT 2.10.0
+
+## [v2.2.5] - 2023-03-02
+
+#### Enhancements
+
+- [#23903] Catalogue Moderation: allow to send a message to the moderators
+- [#24309] Inform the VRE users that the catalogue is controlled/moderated 
+
+## [v2.2.4] - 2022-10-27
+
+#### Enhancements
+
+- [#24038] Moved to GWT 2.9
+- [#23811] Just to release the grsf-manage-widget
+
+
 ## [v2.2.3] - 2022-08-01

 #### Enhancements
--- a/README.md
+++ b/README.md
@ -1,16 +1,51 @@
 # gCube D4Science Data Catalog

-The gCube Data Catalog Portlet powered by CKAN
+The "gCube Data Catalogue" or "Catalogue" is a system that provides facilities for: a) (meta)data publishing and management based on roles; b) vres' products publishing; c) making data products publicly available; d) enriching products of metadata to maximise their potential reuse and making them searchable (via title, tags etc) are based on the CKAN technology. The Catalogue application allows to show all the metadata available in the CKAN instance, as well as publish a new product, retrieve the list of organizations (i.e. Virtual Research Environments) to which the user belongs and his/her already published products. Moreover, the "Catalogue" application (via configuration) provides moderation of its content enabling the user/s with the Moderator role to approve/reject the products under review.

 ## Built With

 * [OpenJDK](https://openjdk.java.net/) - The JDK used
 * [Maven](https://maven.apache.org/) - Dependency Management

+**Uses**
+
+* GWT v.2.9.0. [GWT](http://www.gwtproject.org) is licensed under [Apache License 2.0](http://www.gwtproject.org/terms.html)
+* GWT-Bootstrap v.2.3.2.0. [GWT-Bootstrap](https://github.com/gwtbootstrap) is licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+* CKAN v.2.6.x. [CKAN](https://ckan.org/) is licensed under [Creative Commons Attribution ShareAlike 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
+
+**Related Components**
+
+* [Catalogue Sharing Widget](https://code-repo.d4science.org/gCubeSystem/catalogue-sharing-widget)
+* [Catalogue Content Moderator Widget](https://code-repo.d4science.org/gCubeSystem/ckan-content-moderator-widget)
+* [GRSF Manage Widget](https://code-repo.d4science.org/gCubeSystem/grsf-manage-widget)
+* [Catalogue Metadata Publisher Widget](https://code-repo.d4science.org/gCubeSystem/ckan-metadata-publisher-widget)
+* [Ckan2Zenodo Publisher Widget](https://code-repo.d4science.org/gCubeSystem/ckan2zenodo-publisher-widget)
+
+and others. You can discovery all dependencies via dependency hierarchy (e.g. use [dependency:tree](https://maven.apache.org/plugins/maven-dependency-plugin/tree-mojo.html))
+
+## Showcase
+
+**SoBigData Catalogue**
+
+see at [SoBigData Catalogue](https://sobigdata.d4science.org/catalogue-sobigdata)
+
+<img src="https://gcube.wiki.gcube-system.org/images_gcube/0/0e/Catalogue-SBG-Gateway.png" style="max-width:800px;" alt="SoBigData Catalogue" />
+
+<br />
+<br />
+
+**Ecosystem Approach to Fisheries Catalogue**
+
+see at [Ecosystem Approach to Fisheries Catalogue](https://i-marine.d4science.org/catalogue-imarine)
+
+<img src="https://gcube.wiki.gcube-system.org/images_gcube/3/30/Catalogue-I-Marine-Gateway.png" style="max-width:800px;" alt="Ecosystem Approach to Fisheries Catalogue" />
+
 ## Documentation

 You can find the D4Science Catalogue documentation at [GCat Background Wiki Page](https://wiki.gcube-system.org/GCat_Background)

+Technical note (ITA) [D4Science_Catalogue_Service](https://gcube.wiki.gcube-system.org/images_gcube/4/4f/D4Science_Catalogue_Service.pdf)
+
 ## Change log

 See the [Releases](https://code-repo.d4science.org/gCubeSystem/gcube-ckan-datacatalog/releases)
--- a/pom.xml
+++ b/pom.xml
@ -7,26 +7,27 @@
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath />
 	</parent>

 	<groupId>org.gcube.portlets.gcubeckan</groupId>
 	<artifactId>gcube-ckan-datacatalog</artifactId>
 	<packaging>war</packaging>
-	<version>2.2.3</version>
+	<version>2.3.1</version>
 	<name>gCube CKAN Data Catalog</name>
 	<description>The gCube CKAN Data Catalog portlet</description>

 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.7.0</gwtVersion>
+		<gwtVersion>2.10.0</gwtVersion>
 		<!-- GWT needs at least java 1.6 -->
 		<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.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
+		<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
 	</properties>

 	<scm>
@ -35,12 +36,41 @@
 		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>

+	<profiles>
+		<!-- PROD profile -->
+<!-- 		<profile> -->
+<!-- 			<id>catalogue-release-profile</id> -->
+<!-- 			<activation> -->
+<!-- 				<property> -->
+<!-- 					<name>Release</name> -->
+<!-- 				</property> -->
+<!-- 			</activation> -->
+<!-- 			<properties> -->
+<!-- 				<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version> -->
+<!-- 				<storagehub-version-range>[1.0.0,2.0.0-SNAPSHOT)</storagehub-version-range> -->
+<!-- 			</properties> -->
+<!-- 		</profile> -->
+		<!-- DEV profile -->
+<!-- 		<profile> -->
+<!-- 			<id>catalogue-snapshot-profile</id> -->
+<!-- 			<activation> -->
+<!-- 				<property> -->
+<!-- 					<name>!Release</name> -->
+<!-- 				</property> -->
+<!-- 			</activation> -->
+<!-- 			<properties> -->
+<!-- 				<gcube-portal-bom-version>3.8.0-SNAPSHOT</gcube-portal-bom-version> -->
+<!-- 				<storagehub-version-range>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</storagehub-version-range> -->
+<!-- 			</properties> -->
+<!-- 		</profile> -->
+	</profiles>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.4</version>
+				<version>${gcube-portal-bom-version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 				<exclusions>
@ -55,10 +85,21 @@
 				</exclusions>
 			</dependency>
 		</dependencies>
-
 	</dependencyManagement>

 	<dependencies>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.gwt</groupId>
+			<artifactId>gwt-servlet</artifactId>
+			<version>${gwtVersion}</version>
+			<scope>runtime</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
@ -71,12 +112,6 @@
 			<version>${gwtVersion}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.gwt</groupId>
-			<artifactId>gwt-servlet</artifactId>
-			<version>${gwtVersion}</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.github.gwtbootstrap</groupId>
 			<artifactId>gwt-bootstrap</artifactId>
@ -119,10 +154,16 @@
 			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
 		</dependency>

+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>metadata-profile-form-builder-widget</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>ckan-metadata-publisher-widget</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0)</version>
+			<version>[2.1.0,3.0.0)</version>
 			<scope>compile</scope>
 		</dependency>

@ -194,6 +235,14 @@
 			<artifactId>commons-codec</artifactId>
 		</dependency>

+		<!-- REQUIRED FOR JDK_11 -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.4</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- LOGGER -->
 		<dependency>
 			<groupId>log4j</groupId>
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
@ -20,6 +20,10 @@

 	<inherits
 		name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' />
+
+	<inherits
+		name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
+
 	<inherits
 		name='org.gcube.portlets.widgets.ckandatapublisherwidget.CKanMetadataPublisher' />
 	<inherits
@ -29,6 +33,9 @@
 	<inherits
 		name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />

+	<inherits
+		name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
+
 	<inherits
 		name='org.gcube.portlets.widgets.switchbutton.SwitchButton' />
 	<inherits
@ -36,7 +43,6 @@
 	<inherits
 		name='org.gcube.portlets.widgets.ckancontentmoderator.CkanContentModeratorWidget' />

-
 	<!-- Specify the app entry point class. -->
 	<entry-point
 		class='org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.GCubeCkanDataCatalog' />
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
@ -7,6 +7,8 @@ import org.gcube.datacatalogue.grsf_manage_widget.client.view.ManageProductWidge
 import org.gcube.datacatalogue.utillibrary.shared.ItemStatus;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.ClickedCMSManageProductButtonEvent;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.ClickedCMSManageProductButtonEventHandler;
+import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.DeleteItemEvent;
+import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.DeleteItemEventHandler;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.EditMetadataEvent;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.EditMetadataEventHandler;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.InsertMetadataEvent;
@ -39,7 +41,11 @@ import org.gcube.portlets.widgets.ckancontentmoderator.client.CkanContentModerat
 import org.gcube.portlets.widgets.ckancontentmoderator.client.CkanContentModeratorWidgetTrusted;
 import org.gcube.portlets.widgets.ckancontentmoderator.client.ContentModeratorWidgetConstants;
 import org.gcube.portlets.widgets.ckancontentmoderator.shared.DISPLAY_FIELD;
+import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.ReloadDatasetPageEvent;
+import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.ReloadDatasetPageEventHandler;
+import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.action.DeleteItemPanel;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form.CreateDatasetForm;
+import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form.UpdateDatasetForm;
 import org.gcube.portlets_widgets.catalogue_sharing_widget.client.ShareCatalogueWidget;

 import com.github.gwtbootstrap.client.ui.Modal;
@ -95,6 +101,7 @@ public class CkanEventHandlerManager {

 			}
 		});
+
 		// bind on insert metadata
 		eventBus.addHandler(InsertMetadataEvent.TYPE, new InsertMetadataEventHandler() {

@ -117,7 +124,7 @@ public class CkanEventHandlerManager {
 //					public void onHide(HideEvent hideEvent) {
 //						GWT.log("HideEvent on modal fired");
 //						GWT.log(hideEvent.toDebugString());
-//						eventBus.fireEvent(new CloseCreationFormEvent());
+//						eventBus.fireEvent(new CloseCreationFormProfileEvent());
 //						
 //						hideEvent.preventDefault();
 //						hideEvent.stopPropagation();
@ -130,15 +137,6 @@ public class CkanEventHandlerManager {
 				modal.show();
 			}
 		});
-		// bind on edit (TODO)
-		eventBus.addHandler(EditMetadataEvent.TYPE, new EditMetadataEventHandler() {
-
-			@Override
-			public void onEditMetadata(EditMetadataEvent editMetadataEvent) {
-
-				// TODO Auto-generated method stub
-			}
-		});

 		// show datasets event
 		eventBus.addHandler(ShowDatasetsEvent.TYPE, new ShowDatasetsEventHandler() {
@ -146,14 +144,37 @@ public class CkanEventHandlerManager {
 			@Override
 			public void onShowDatasets(ShowDatasetsEvent showUserDatasetsEvent) {
 				String request = null;
-				if (showUserDatasetsEvent.isOwnOnly())
-					request = getCkanRequest("/dashboard/datasets", null);
-				else
-					request = getCkanRequest("/dataset", null);
+
+				if (showUserDatasetsEvent.getDatasetId() == null) {
+					if (showUserDatasetsEvent.isOwnOnly()) {
+						request = getCkanRequest("/dashboard/datasets", null);
+					} else {
+						request = getCkanRequest("/dataset", null);
+					}
+				} else {
+					String datasetId = showUserDatasetsEvent.getDatasetId();
+					request = getCkanRequest("/dataset/" + datasetId, null);
+
+				}
 				gcubeCkanDataCatalogue.instanceCkanFrame(request);
 			}
 		});

+		// ReloadDatasetPageEvent is declared in the Publisher Widget
+		eventBus.addHandler(ReloadDatasetPageEvent.TYPE, new ReloadDatasetPageEventHandler() {
+
+			@Override
+			public void onReloadDatasetPage(ReloadDatasetPageEvent addResourceEvent) {
+
+				if (addResourceEvent.getDatasetIDorName() != null) {
+					eventBus.fireEvent(new ShowDatasetsEvent(false, addResourceEvent.getDatasetIDorName()));
+				} else {
+					eventBus.fireEvent(new ShowDatasetsEvent(false));
+				}
+
+			}
+		});
+
 		eventBus.addHandler(ShowTypesEvent.TYPE, new ShowTypesEventHandler() {

 			@Override
@ -201,29 +222,6 @@ public class CkanEventHandlerManager {
 			}
 		});

-		// eventBus.addHandler(NotifyLogoutEvent.TYPE, new NotifyLogoutEventHandler() {
-		//
-		// @Override
-		// public void onLogout(NotifyLogoutEvent editMetadataEvent) {
-		//
-		// // CKanLeaveFrame frame = new
-		// CKanLeaveFrame(GCubeCkanDataCatalog.CKAN_LOGUT_SERVICE);
-		// // DOM.appendChild(RootPanel.getBodyElement(), frame.getElement());
-		// }
-		// });
-		//
-		// eventBus.addHandler(IFrameInstanciedEvent.TYPE, new
-		// IFrameInstanciedEventHandler() {
-		//
-		// @Override
-		// public void onNewInstance(IFrameInstanciedEvent iFrameInstanciedEvent) {
-		//
-		// gcubeCkanDataCatalogue.updateSize();
-		// if(logoutFromCKANURL==null)
-		// instanceLogoutSystem();
-		// }
-		// });
-
 		eventBus.addHandler(ShowManageProductWidgetEvent.TYPE, new ShowManageProductWidgetEventHandler() {

 			@Override
@ -305,6 +303,55 @@ public class CkanEventHandlerManager {
 			}

 		});
+
+		eventBus.addHandler(EditMetadataEvent.TYPE, new EditMetadataEventHandler() {
+
+			@Override
+			public void onEditMetadata(EditMetadataEvent editMetadataEvent) {
+				GWT.log("editMetadataEvent: " + editMetadataEvent);
+
+				if (editMetadataEvent.getItemID() != null) {
+
+					final Modal modal = new ExtModal(true, true);
+
+					modal.setTitle("Update Item");
+					modal.addStyleName("insert-metadata-modal-style");
+					modal.addStyleName("modal-top-custom");
+					((Element) modal.getElement().getChildNodes().getItem(1)).addClassName("modal-body-custom");
+					modal.add(new UpdateDatasetForm(eventBus, editMetadataEvent.getItemID()));
+					modal.setCloseVisible(true);
+
+					GWT.log("show");
+					modal.show();
+
+				}
+			}
+		});
+
+		eventBus.addHandler(DeleteItemEvent.TYPE, new DeleteItemEventHandler() {
+
+			@Override
+			public void onDeleteItem(DeleteItemEvent deleteItemEvent) {
+				GWT.log("deleteItemEvent: " + deleteItemEvent);
+
+				if (deleteItemEvent.getItemID() != null) {
+
+					GWT.log("deleteItemEvent: " + deleteItemEvent);
+					final Modal modal = new ExtModal(true, true);
+
+					modal.setTitle("Delete Item");
+					modal.addStyleName("modal-top-custom");
+					((Element) modal.getElement().getChildNodes().getItem(1)).addClassName("modal-body-custom");
+					modal.add(new DeleteItemPanel(eventBus, deleteItemEvent.getItemID()));
+					modal.setCloseVisible(true);
+
+					GWT.log("show");
+					modal.show();
+
+				}
+
+			}
+		});
 	}

 	/**
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GCubeCkanDataCatalog.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GCubeCkanDataCatalog.java
@ -26,6 +26,8 @@ public class GCubeCkanDataCatalog implements EntryPoint {
 	public static final String GET_QUERY_STRING_PARAMETER = "query_string";
 	public static final String REVERT_QUERY_PARAM = "manage";
 	public static final String GCUBE_CKAN_IFRAME = "gcube-ckan-iframe";
+	
+	//public static final String LOGGED_IN_DIV = "logged_in";

 	/**
 	 * This is the entry point method.
@ -36,5 +38,8 @@ public class GCubeCkanDataCatalog implements EntryPoint {
 				eventManager.getEventBus());
 		eventManager.setPanel(panel);
 	}
+	
+	
+	

 }
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/DeleteItemEvent.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/DeleteItemEvent.java
@ -0,0 +1,66 @@
+package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event;
+
+import com.google.gwt.event.shared.GwtEvent;
+
+/**
+ * The Class DeleteItemEvent.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ *         Feb 19, 2024
+ */
+public class DeleteItemEvent extends GwtEvent<DeleteItemEventHandler> {
+	public static Type<DeleteItemEventHandler> TYPE = new Type<DeleteItemEventHandler>();
+	private String itemID;
+
+	/**
+	 * Instantiates a new delete item event.
+	 *
+	 * @param itemID the item ID
+	 */
+	public DeleteItemEvent(String itemID) {
+		this.itemID = itemID;
+	}
+
+	/**
+	 * Gets the associated type.
+	 *
+	 * @return the associated type
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see com.google.gwt.event.shared.GwtEvent#getAssociatedType()
+	 */
+	@Override
+	public Type<DeleteItemEventHandler> getAssociatedType() {
+		return TYPE;
+	}
+
+	/**
+	 * Dispatch.
+	 *
+	 * @param handler the handler
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.
+	 * EventHandler)
+	 */
+	@Override
+	protected void dispatch(DeleteItemEventHandler handler) {
+		handler.onDeleteItem(this);
+	}
+
+	/**
+	 * Gets the item ID.
+	 *
+	 * @return the item ID
+	 */
+	public String getItemID() {
+		return itemID;
+	}
+
+}
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/DeleteItemEventHandler.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/DeleteItemEventHandler.java
@ -0,0 +1,21 @@
+package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event;
+
+import com.google.gwt.event.shared.EventHandler;
+
+/**
+ * The Interface DeleteItemEventHandler.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ * Feb 19, 2024
+ */
+public interface DeleteItemEventHandler extends EventHandler {
+
+	/**
+	 * On delete item.
+	 *
+	 * @param deleteItemEvent the delete item event
+	 */
+	void onDeleteItem(DeleteItemEvent deleteItemEvent);
+
+}
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/EditMetadataEvent.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/EditMetadataEvent.java
@ -11,14 +11,22 @@ import com.google.gwt.event.shared.GwtEvent;
 */
 public class EditMetadataEvent extends GwtEvent<EditMetadataEventHandler> {
 	public static Type<EditMetadataEventHandler> TYPE = new Type<EditMetadataEventHandler>();
-
+	private String itemID;

 	/**
-	 * Instantiates a new insert metadata event.
+	 * Instantiates a new edits the metadata event.
+	 *
+	 * @param itemID the item ID
 	 */
-	public EditMetadataEvent() {
+	public EditMetadataEvent(String itemID) {
+		this.itemID = itemID;
 	}

+	/**
+	 * Gets the associated type.
+	 *
+	 * @return the associated type
+	 */
 	/* (non-Javadoc)
 	 * @see com.google.gwt.event.shared.GwtEvent#getAssociatedType()
 	 */
@ -27,6 +35,11 @@ public class EditMetadataEvent extends GwtEvent<EditMetadataEventHandler> {
 		return TYPE;
 	}

+	/**
+	 * Dispatch.
+	 *
+	 * @param handler the handler
+	 */
 	/* (non-Javadoc)
 	 * @see com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.EventHandler)
 	 */
@ -34,5 +47,9 @@ public class EditMetadataEvent extends GwtEvent<EditMetadataEventHandler> {
 	protected void dispatch(EditMetadataEventHandler handler) {
 		handler.onEditMetadata(this);
 	}
+	
+	public String getItemID() {
+		return itemID;
+	}

 }
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/IFrameInstanciedEvent.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/IFrameInstanciedEvent.java
@ -2,25 +2,28 @@ package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event;

 import com.google.gwt.event.shared.GwtEvent;

-
-
 /**
- * The Class NotifyLogoutEvent.
+ * The Class IFrameInstanciedEvent.
 *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * Jun 23, 2016
+ * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Jun 23, 2016
 */
 public class IFrameInstanciedEvent extends GwtEvent<IFrameInstanciedEventHandler> {
 	public static Type<IFrameInstanciedEventHandler> TYPE = new Type<IFrameInstanciedEventHandler>();

-
 	/**
 	 * Instantiates a new insert metadata event.
 	 */
 	public IFrameInstanciedEvent() {
 	}

-	/* (non-Javadoc)
+	/**
+	 * Gets the associated type.
+	 *
+	 * @return the associated type
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see com.google.gwt.event.shared.GwtEvent#getAssociatedType()
 	 */
 	@Override
@ -28,8 +31,17 @@ public class IFrameInstanciedEvent extends GwtEvent<IFrameInstanciedEventHandler
 		return TYPE;
 	}

-	/* (non-Javadoc)
-	 * @see com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.EventHandler)
+	/**
+	 * Dispatch.
+	 *
+	 * @param handler the handler
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.
+	 * EventHandler)
 	 */
 	@Override
 	protected void dispatch(IFrameInstanciedEventHandler handler) {
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/IFrameInstanciedEventHandler.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/IFrameInstanciedEventHandler.java
@ -2,17 +2,15 @@ package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event;

 import com.google.gwt.event.shared.EventHandler;

-
-
 /**
- * The Interface IFrameInstanciedEentHandler.
+ * The Interface IFrameInstanciedEventHandler.
 *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * Jun 23, 2016
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ *         Feb 13, 2024
 */
 public interface IFrameInstanciedEventHandler extends EventHandler {

-
 	/**
 	 * On new instance.
 	 *
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/ShowDatasetsEvent.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/event/ShowDatasetsEvent.java
@ -3,29 +3,57 @@ package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event;
 import com.google.gwt.event.shared.GwtEvent;

 /**
- * Raised when the user wants to see his datasets.
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+ * The Class ShowDatasetsEvent.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ *         Feb 13, 2024
 */
-public class ShowDatasetsEvent extends GwtEvent<ShowDatasetsEventHandler>{
-	
+public class ShowDatasetsEvent extends GwtEvent<ShowDatasetsEventHandler> {
+
 	public static Type<ShowDatasetsEventHandler> TYPE = new Type<ShowDatasetsEventHandler>();
-	
+
 	private boolean ownOnly;
-	
+
+	private String datasetId;
+
 	/**
 	 * Instantiates a new show user datasets event.
+	 *
+	 * @param ownOnly the own only
 	 */
 	public ShowDatasetsEvent(boolean ownOnly) {
-		
 		this.ownOnly = ownOnly;
-		
 	}
-	
+
+	/**
+	 * Instantiates a new show user datasets event.
+	 *
+	 * @param ownOnly   the own only
+	 * @param datasetId the dataset id
+	 */
+	public ShowDatasetsEvent(boolean ownOnly, String datasetId) {
+		this.ownOnly = ownOnly;
+		this.datasetId = datasetId;
+	}
+
+	/**
+	 * Checks if is own only.
+	 *
+	 * @return true, if is own only
+	 */
 	public boolean isOwnOnly() {
 		return ownOnly;
 	}

-	/* (non-Javadoc)
+	/**
+	 * Gets the associated type.
+	 *
+	 * @return the associated type
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see com.google.gwt.event.shared.GwtEvent#getAssociatedType()
 	 */
 	@Override
@ -33,12 +61,25 @@ public class ShowDatasetsEvent extends GwtEvent<ShowDatasetsEventHandler>{
 		return TYPE;
 	}

-	/* (non-Javadoc)
-	 * @see com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.EventHandler)
+	/**
+	 * Dispatch.
+	 *
+	 * @param handler the handler
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.
+	 * EventHandler)
 	 */
 	@Override
 	protected void dispatch(ShowDatasetsEventHandler handler) {
 		handler.onShowDatasets(this);
 	}
+	
+	public String getDatasetId() {
+		return datasetId;
+	}

 }
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java
@ -4,6 +4,7 @@
 package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.view;

 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.ClickedCMSManageProductButtonEvent;
+import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.DeleteItemEvent;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.EditMetadataEvent;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.InsertMetadataEvent;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.PublishOnZenodoEvent;
@ -16,11 +17,14 @@ import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.ShowOrgani
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.ShowStatisticsEvent;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.ShowTypesEvent;

-import com.github.gwtbootstrap.client.ui.AlertBlock;
 import com.github.gwtbootstrap.client.ui.Button;
-import com.github.gwtbootstrap.client.ui.constants.AlertType;
+import com.github.gwtbootstrap.client.ui.DropdownButton;
+import com.github.gwtbootstrap.client.ui.Label;
+import com.github.gwtbootstrap.client.ui.NavLink;
+import com.github.gwtbootstrap.client.ui.Navbar;
 import com.github.gwtbootstrap.client.ui.constants.ButtonType;
 import com.github.gwtbootstrap.client.ui.constants.IconType;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Style.Float;
 import com.google.gwt.dom.client.Style.FontWeight;
 import com.google.gwt.dom.client.Style.Unit;
@ -39,18 +43,19 @@ import com.google.gwt.user.client.ui.InlineHTML;
 */
 public class CkanMetadataManagementPanel extends FlowPanel {

-	/**
-	 *
-	 */
+	private static final String MESSAGE_MODERATED_CATALOGUE = "Moderation Enabled";
+
+	public static final String CATALOGUE_ITEMS_WERE_APPROVED_BY_CATALOGUE_MODERATOR_S = "Catalogue items were approved by Catalogue Moderator(s).";
+
 	private static final String MY_PREFIX = "My ";

 	private static final String MANAGE_GRSF_ITEM_TOOLTIP = "By pushing on this button, you will be able to manage the item you are viewing."
 			+ " Manageable items are the GRSF ones.";

-	private static final String MANAGE_CMS_ITEMS_TOOLTIP = "By pushing on this button, you will be able to manage (APPROVING or REJECTING) the item under approval"
-			+ "Manageable items are not APPROVED and NOT PUBLISHED in the Catalogue.";
+	private static final String MANAGE_CMS_ITEMS_TOOLTIP = "By pushing on this button, you will be able to manage (APPROVING or REJECTING) the item under approval."
+			+ " Manageable items are not APPROVED and NOT PUBLISHED in the Catalogue.";

-	private AlertBlock nav = new AlertBlock();
+	private Navbar nav = new Navbar();

 	// generic
 	private Button home = new Button("Home");
@ -60,11 +65,14 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 	private Button types = new Button("Types");

 	// user's own
-	private InlineHTML separatorMyInfo = null;
-	private InlineHTML separatorAdminButtons = null;
-	private Button myDatasets = new Button("My Items");
-	private Button myOrganizations = new Button("My Organizations");
-	private Button myGroups = new Button("My Groups");
+	private InlineHTML pipe_MyInfo_start = null;
+	private InlineHTML pipe_PublishItem_start = null;
+	private InlineHTML pipe_SelectedItemOptions_start = null;
+
+	private DropdownButton dropMyOptionButtons = new DropdownButton("My...");
+	private NavLink myDatasets = new NavLink("My Items");
+	private NavLink myOrganizations = new NavLink("My Organizations");
+	private NavLink myGroups = new NavLink("My Groups");

 	// statistics
 	private Button statistics = new Button("Statistics");
@ -73,9 +81,13 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 	private Button shareLink = new Button("Share Link");
 	private Button uploadToZenodo = new Button("Upload to Zenodo");
 	private Button insertMeta = new Button("Publish Item");
-	private Button editMeta = new Button("Edit Item");
-	private Button manageGRSFProduct = new Button("Manage GRSF Item"); //GRSF Manage
-	private Button manageCModS = new Button("Manage Items"); //Moderation
+	private Button editMeta = new Button("Update Item");
+	private Button deleteItem = new Button("Delete Item");
+	private Button manageGRSFProduct = new Button("Manage GRSF Item"); // GRSF Manage
+	private Button manageCModS = new Button("Manage Items"); // Moderation
+
+	private Label messageModerationEnanbled = new Label(); // Moderation message
+
 	private HandlerManager eventBus;

 	/**
@ -95,16 +107,13 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		items.setType(ButtonType.LINK);
 		types.setType(ButtonType.LINK);

-		myDatasets.setType(ButtonType.LINK);
-		myOrganizations.setType(ButtonType.LINK);
-		myGroups.setType(ButtonType.LINK);
-
 		statistics.setType(ButtonType.LINK);

 		shareLink.setType(ButtonType.LINK);
 		uploadToZenodo.setType(ButtonType.LINK);
 		insertMeta.setType(ButtonType.LINK);
 		editMeta.setType(ButtonType.LINK);
+		deleteItem.setType(ButtonType.LINK);
 		manageGRSFProduct.setType(ButtonType.PRIMARY);
 		manageGRSFProduct.getElement().getStyle().setFloat(Float.RIGHT);

@ -112,6 +121,10 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		manageCModS.getElement().getStyle().setFloat(Float.RIGHT);
 		manageCModS.getElement().getStyle().setMarginRight(20, Unit.PX);

+		messageModerationEnanbled.setTitle(MESSAGE_MODERATED_CATALOGUE);
+		messageModerationEnanbled.getElement().setInnerHTML("<i class='icon-user'></i> " + MESSAGE_MODERATED_CATALOGUE);
+		messageModerationEnanbled.addStyleName("moderation-enabled-flag");
+
 		// set icons
 		home.setIcon(IconType.HOME);
 		organizations.setIcon(IconType.BUILDING);
@ -125,19 +138,29 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		myGroups.setIcon(IconType.GROUP);
 		insertMeta.setIcon(IconType.FILE);
 		editMeta.setIcon(IconType.EDIT_SIGN);
+		deleteItem.setIcon(IconType.REMOVE_CIRCLE);
 		statistics.setIcon(IconType.BAR_CHART);
 		manageGRSFProduct.setIcon(IconType.CHECK_SIGN);
 		manageCModS.setIcon(IconType.CHECK_SIGN);

-		// hide edit and insert
+		// disabling share and upload
 		shareLink.setEnabled(false);
 		uploadToZenodo.setEnabled(false);
+
+		// hide upload to zenodo
+		uploadToZenodo.setVisible(false);
+
+		// hide publish/update/delete
 		editMeta.setVisible(false);
+		deleteItem.setVisible(false);
 		insertMeta.setVisible(false);
+
+		// hide manage GRSF product and Moderation
 		manageGRSFProduct.setVisible(false);
 		manageGRSFProduct.setEnabled(false);
 		manageCModS.setVisible(false);
 		manageCModS.setEnabled(false);
+		messageModerationEnanbled.setVisible(false);

 		// manage GRSF item info
 		manageGRSFProduct.setTitle(MANAGE_GRSF_ITEM_TOOLTIP);
@ -147,6 +170,10 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		manageCModS.setTitle(MANAGE_CMS_ITEMS_TOOLTIP);
 		manageCModS.getElement().getStyle().setFontWeight(FontWeight.BOLD);

+		nav.add(messageModerationEnanbled);
+
+		nav.setId("the_catalogue_nav_bar");
+		nav.addStyleName("nav_bar_catalogue");
 		// add to navigation bar
 		nav.add(home);
 		nav.add(organizations);
@ -154,25 +181,37 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		nav.add(items);
 		nav.add(types);
 		nav.add(statistics);
-		separatorMyInfo = new InlineHTML("<span style=\"font-weight:bold;vertical-alignment:middle;\">|</span>");
-		separatorMyInfo.setVisible(true);
-		nav.add(separatorMyInfo);
-		nav.add(myOrganizations);
-		nav.add(myGroups);
-		nav.add(myDatasets);
-		separatorAdminButtons = new InlineHTML("<span style=\"font-weight:bold;vertical-alignment:middle;\">|</span>");
-		separatorAdminButtons.setVisible(true);
-		nav.add(separatorAdminButtons);
+		pipe_MyInfo_start = new InlineHTML(
+				"<span style=\"font-weight:bold;vertical-alignment:middle;margin:0 5px;\">|</span>");
+		pipe_MyInfo_start.setVisible(true);
+		nav.add(pipe_MyInfo_start);
+
+		dropMyOptionButtons.setBaseIcon(IconType.USER);
+		dropMyOptionButtons.add(myOrganizations);
+		dropMyOptionButtons.add(myGroups);
+		dropMyOptionButtons.add(myDatasets);
+		dropMyOptionButtons.setType(ButtonType.LINK);
+		nav.add(dropMyOptionButtons);
+
+		pipe_PublishItem_start = new InlineHTML(
+				"<span style=\"font-weight:bold;vertical-alignment:middle;margin:0 5px;\">|</span>");
+		pipe_PublishItem_start.setVisible(false);
+		nav.add(pipe_PublishItem_start);
+		nav.add(insertMeta);
+
+		pipe_SelectedItemOptions_start = new InlineHTML(
+				"<span style=\"font-weight:bold;vertical-alignment:middle;margin:0 5px;\">|</span>");
+		pipe_SelectedItemOptions_start.setVisible(true);
+		nav.add(pipe_SelectedItemOptions_start);
+
+		nav.add(editMeta);
+		nav.add(deleteItem);
 		nav.add(shareLink);
 		nav.add(uploadToZenodo);
-		nav.add(insertMeta);
-		nav.add(editMeta);
+
 		nav.add(manageGRSFProduct);
 		nav.add(manageCModS);
-		nav.setClose(false);
-		nav.setType(AlertType.INFO);
-		nav.getElement().getStyle().setMarginBottom(0, Unit.PX);
-		nav.getElement().getStyle().setBackgroundColor("#FFF");
+
 		addHandlers();
 		add(nav);
 	}
@ -245,8 +284,18 @@ public class CkanMetadataManagementPanel extends FlowPanel {

 			@Override
 			public void onClick(ClickEvent event) {
+				GWT.log("Edit Meta clicked");
+				eventBus.fireEvent(
+						new EditMetadataEvent(GCubeCkanDataCatalogPanel.getLatestSelectedProductIdentifier()));
+			}
+		});

-				eventBus.fireEvent(new EditMetadataEvent());
+		deleteItem.addClickHandler(new ClickHandler() {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				GWT.log("Delete item clicked");
+				eventBus.fireEvent(new DeleteItemEvent(GCubeCkanDataCatalogPanel.getLatestSelectedProductIdentifier()));
 			}
 		});

@ -342,17 +391,12 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 	}

 	/**
-	 * Those buttons can be only visible when the logged user has role
-	 * edit/admin/sysadmin.
+	 * Enable publish button.
 	 *
-	 * @param show the show
+	 * @param enable the enable
 	 */
-	public void showInsertAndEditProductButtons(boolean show) {
-
-		// editMeta.setVisible(show); TODO
-		// separatorAdminButtons.setVisible(show);
-		insertMeta.setVisible(show);
-
+	public void enablePublishItemButton(boolean enable) {
+		insertMeta.setEnabled(enable);
 	}

 	/**
@ -374,7 +418,8 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 	}

 	/**
-	 * Button to manage the products under moderation via Content Moderation System (CMS)
+	 * Button to manage the products under moderation via Content Moderation System
+	 * (CMS).
 	 *
 	 * @param value true or false
 	 */
@ -382,6 +427,16 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		manageCModS.setVisible(value);
 	}

+	/**
+	 * Show message catalogue is moderated.
+	 *
+	 * @param isContentModerationEnabled the is content moderation enabled
+	 */
+	public void showMessageCatalogueIsModerated(boolean isContentModerationEnabled) {
+		messageModerationEnanbled.setVisible(isContentModerationEnabled);
+
+	}
+
 	/**
 	 * Enable manage CMS products button.
 	 *
@ -408,7 +463,25 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 	public void enablePublishOnZenodoButton(boolean value) {
 		uploadToZenodo.setEnabled(value);
 	}
-	
+
+	/**
+	 * Enable edit item button.
+	 *
+	 * @param value the value
+	 */
+	public void enableEditItemButton(boolean value) {
+		editMeta.setEnabled(value);
+	}
+
+	/**
+	 * Enable delete item button.
+	 *
+	 * @param value the value
+	 */
+	public void enableDeleteItemButton(boolean value) {
+		deleteItem.setEnabled(value);
+	}
+
 	/**
 	 * Visibility publish on zenodo button.
 	 *
@ -418,20 +491,55 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		uploadToZenodo.setVisible(value);
 	}

+	/**
+	 * Visibility publish item button.
+	 *
+	 * @param value       the value
+	 * @param alsoThePipe the also the pipe. If true set bool value also the related
+	 *                    pipe 'pipe_PublishItem_start'
+	 */
+	public void visibilityPublishItemButton(boolean bool, boolean alsoThePipe) {
+		insertMeta.setVisible(bool);
+		if (alsoThePipe) {
+			pipe_PublishItem_start.setVisible(bool);
+		}
+	}
+
+	/**
+	 * Visibility edit item button.
+	 *
+	 * @param value the value
+	 */
+	public void visibilityEditItemButton(boolean value) {
+		editMeta.setVisible(value);
+	}
+
+	/**
+	 * Visibility delete item button.
+	 *
+	 * @param value the value
+	 */
+	public void visibilityDeleteItemButton(boolean value) {
+		deleteItem.setVisible(value);
+	}
+
 	/**
 	 * Show only home/statistics buttons.
 	 */
 	public void doNotShowUserRelatedInfo() {

-		separatorMyInfo.setVisible(false);
-		separatorAdminButtons.setVisible(false);
+		pipe_MyInfo_start.setVisible(false);
+		pipe_PublishItem_start.setVisible(false);
+		pipe_SelectedItemOptions_start.setVisible(false);
 		shareLink.setVisible(false);
 		uploadToZenodo.setVisible(false);
 		insertMeta.setVisible(false);
 		editMeta.setVisible(false);
-		myDatasets.setVisible(false);
-		myOrganizations.setVisible(false);
-		myGroups.setVisible(false);
+		deleteItem.setVisible(false);
+		dropMyOptionButtons.setVisible(false);
+//		myDatasets.setVisible(false);
+//		myOrganizations.setVisible(false);
+//		myGroups.setVisible(false);
 		manageGRSFProduct.setVisible(false);
 		manageCModS.setVisible(false);

@ -447,11 +555,12 @@ public class CkanMetadataManagementPanel extends FlowPanel {
 		groups.setVisible(false);
 		items.setVisible(false);
 		types.setVisible(false);
-		separatorMyInfo.setVisible(false);
-		separatorAdminButtons.setVisible(false);
-		myDatasets.setVisible(false);
-		myOrganizations.setVisible(false);
-		myGroups.setVisible(false);
+		pipe_MyInfo_start.setVisible(false);
+		pipe_PublishItem_start.setVisible(false);
+		dropMyOptionButtons.setVisible(false);
+//		myDatasets.setVisible(false);
+//		myOrganizations.setVisible(false);
+//		myGroups.setVisible(false);
 		statistics.setVisible(false);
 		manageGRSFProduct.setVisible(false);
 		manageCModS.setVisible(false);
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java
@ -36,6 +36,7 @@ import com.google.gwt.user.client.Cookies;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Frame;
+import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
@ -109,13 +110,13 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
 		String queryStringParameter = paramsMap.get(GCubeCkanDataCatalog.GET_QUERY_STRING_PARAMETER);

 		if (queryStringParameter != null) {
-			GWT.log("Read "+GCubeCkanDataCatalog.GET_QUERY_STRING_PARAMETER+ " as: "+queryStringParameter);
+			GWT.log("Read " + GCubeCkanDataCatalog.GET_QUERY_STRING_PARAMETER + " as: " + queryStringParameter);
 			String base64DecodeQueryString = QueryStringUtil.base64DecodeQueryString(queryStringParameter);

 			ModerationBuilder moderationBuilder = new ModerationQueryStringUtil()
 					.toModerationBuilder(base64DecodeQueryString);
 			if (moderationBuilder != null) {
-				GWT.log("Moderation Builder is: "+moderationBuilder);
+				GWT.log("Moderation Builder is: " + moderationBuilder);
 				CkanContentModeratorWidget ccmw = new CkanContentModeratorWidget(moderationBuilder);
 				ccmw.showAsModal("Manage Items");
 			}
@ -181,24 +182,59 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {

 								@Override
 								public void onFailure(Throwable caught) {
-									showEditInsertButtons(false);
+									managementPanel.visibilityEditItemButton(false);
+									managementPanel.visibilityDeleteItemButton(false);
+									managementPanel.visibilityPublishItemButton(false, true);
 								}

 								@Override
 								public void onSuccess(RolesCkanGroupOrOrg result) {
-									switch (result) {
-									case ADMIN:
-										showEditInsertButtons(true);
-										break;
-									case EDITOR:
-										showEditInsertButtons(true);
-										break;
-									case MEMBER:
-										showEditInsertButtons(false);
-										break;
-									default:
-										showEditInsertButtons(false);
-										break;
+									GWT.log("isUserLoggedInVRE: "+ckanAccessPoint.isUserLoggedInVRE());
+									GWT.log("getLoggedInScope: "+ckanAccessPoint.getLoggedInScope());
+
+									if (ckanAccessPoint.isUserLoggedInVRE()) {
+
+										switch (result) {
+										case ADMIN: {
+											managementPanel.visibilityPublishItemButton(true, true);
+											managementPanel.visibilityEditItemButton(true);
+											managementPanel.visibilityDeleteItemButton(true);
+											managementPanel.enablePublishItemButton(true);
+											//RootPanel.get(GCubeCkanDataCatalog.LOGGED_IN_DIV).add(new HTML("Logged in as "+RolesCkanGroupOrOrg.ADMIN));
+											break;
+										}
+										case EDITOR: {
+											managementPanel.visibilityPublishItemButton(true, true);
+											managementPanel.visibilityEditItemButton(true);
+											managementPanel.visibilityDeleteItemButton(true);
+											managementPanel.enablePublishItemButton(true);
+											//RootPanel.get(GCubeCkanDataCatalog.LOGGED_IN_DIV).add(new HTML("Logged in as "+RolesCkanGroupOrOrg.EDITOR));
+											break;
+										}
+										case MEMBER: {
+											managementPanel.visibilityEditItemButton(false);
+											managementPanel.visibilityDeleteItemButton(false);
+											// Disable the button "Publish Item" is to inform the user that he/she has
+											// not the rights to publish
+											managementPanel.visibilityPublishItemButton(true, true);
+											managementPanel.enablePublishItemButton(false);
+											//RootPanel.get(GCubeCkanDataCatalog.LOGGED_IN_DIV).add(new HTML("Logged in as "+RolesCkanGroupOrOrg.MEMBER));
+											break;
+										}
+										default: {
+											managementPanel.visibilityEditItemButton(false);
+											managementPanel.visibilityDeleteItemButton(false);
+											// Disable the button "Publish Item" is to inform the user that he/she has
+											// not the rights to publish
+											managementPanel.visibilityPublishItemButton(true, true);
+											managementPanel.enablePublishItemButton(false);
+											break;
+										}
+										}
+									} else {
+										managementPanel.visibilityPublishItemButton(false, true);
+										managementPanel.visibilityEditItemButton(false);
+										managementPanel.visibilityDeleteItemButton(false);
 									}

 								}
@ -268,6 +304,10 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
 									GWT.log("Moderator role is assigned? " + isModeratorRoleAssingned);
 									GWT.log("isExistsMyItemInModeration? " + isExistsMyItemInModeration);

+									if (isContentModerationEnabled) {
+										managementPanel.showMessageCatalogueIsModerated(isContentModerationEnabled);
+									}
+
 									// Enabling moderation if the moderation is active in the context and
 									// the user has the role of MODERATOR in the context
 									if (isContentModerationEnabled && isModeratorRoleAssingned) {
@ -410,15 +450,15 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
 		updateSize();
 	}

-	/**
-	 * show or hide edit/insert buttons according to the role.
-	 *
-	 * @param show the show
-	 */
-	public void showEditInsertButtons(boolean show) {
-
-		managementPanel.showInsertAndEditProductButtons(show);
-	}
+//	/**
+//	 * show or hide the Publish/Update/Delete buttons according to the role.
+//	 *
+//	 * @param show the show
+//	 */
+//	public void showPublishUpdateDeleteButtons(boolean show) {
+//
+//		managementPanel.visibilityUpdateDeleteButtons(show);
+//	}

 	/**
 	 * Instance ckan frame.
@ -559,6 +599,8 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
 			if (!isProductKeyMissing) {
 				latestSelectedProductIdentifier = productId.toString();
 				managementPanel.enableShareItemButton(productId != null && !productId.isEmpty());
+				managementPanel.enableEditItemButton(productId != null && !productId.isEmpty());
+				managementPanel.enableDeleteItemButton(productId != null && !productId.isEmpty());
 				managementPanel.enablePublishOnZenodoButton(productId != null && !productId.isEmpty());
 				managementPanel.enableManageGRSFProductButton(
 						productId != null && !productId.isEmpty() && manageProductResponse.isManageEnabled());
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java
@ -88,7 +88,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem
 		try{

 			// just get the current scope and set it into ScopeProvider...
-			SessionUtil.getCurrentContext(getThreadLocalRequest(), true);
+			String loggedInScope = SessionUtil.getCurrentContext(getThreadLocalRequest(), true);

 			// retrieve scope per current portlet url
 			String scopePerCurrentUrl = SessionUtil.getScopeFromClientUrl(getThreadLocalRequest());
@ -112,7 +112,15 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem
 				pathInfoParameter = isViewPerVREEnabled(browserLocationURL);
 			}

+			//#26854
 			CkanConnectorAccessPoint ckAP = getCkanConnectorAccessPoint(browserLocationURL, pathInfoParameter, queryStringParameters, scopePerCurrentUrl);
+			ckAP.setLoggedInScope(loggedInScope);
+			ckAP.setOperativeScope(scopePerCurrentUrl);
+			if(loggedInScope!=null) {
+				ScopeBean scopeBeanLS = new ScopeBean(loggedInScope);
+				boolean loggedInVRE = scopeBeanLS.is(Type.VRE);
+				ckAP.setUserLoggedInVRE(loggedInVRE);
+			}
 			SessionUtil.saveCkanAccessPoint(this.getThreadLocalRequest().getSession(), scopePerCurrentUrl, ckAP);
 			logger.info("Built the URI to CKAN (connector in case of user logged): "+ckAP.buildURI());
 			logger.debug("returning ckanConnectorUri: "+ckAP);
@ -238,8 +246,8 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem
 		RolesCkanGroupOrOrg toReturn = RolesCkanGroupOrOrg.MEMBER;

 		if(!SessionUtil.isIntoPortal()){
-			logger.warn("OUT FROM PORTAL DETECTED RETURNING ROLE: "+RolesCkanGroupOrOrg.ADMIN);
 			toReturn = RolesCkanGroupOrOrg.ADMIN;
+			logger.warn("OUT FROM PORTAL DETECTED RETURNING ROLE: "+toReturn);
 		}else{

 			HttpSession httpSession = this.getThreadLocalRequest().getSession();
@ -552,6 +560,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem
 		String scopePerCurrentUrl = SessionUtil.getScopeFromClientUrl(getThreadLocalRequest());
 		DataCatalogue catalogue = getCatalogue(scopePerCurrentUrl);
 		boolean moderationEnabled = catalogue.isModerationEnabled(reloadConfig);
+		logger.info("moderation Enabled? "+moderationEnabled);
 		return new ManageProductResponse(moderationEnabled, scopePerCurrentUrl);
 		
 	}
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/shared/CkanConnectorAccessPoint.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/shared/CkanConnectorAccessPoint.java
@ -10,14 +10,12 @@ import java.util.Set;

 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.GcubeCkanDataCatalogServiceImpl;

-
 /**
 * The Class CkanConnectorAccessPoint.
 *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * Jun 23, 2016
+ * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Jun 23, 2016
 */
-public class CkanConnectorAccessPoint implements Serializable{
+public class CkanConnectorAccessPoint implements Serializable {

 	/**
 	 *
@ -37,6 +35,10 @@ public class CkanConnectorAccessPoint implements Serializable{
 	private boolean outsideLoginOnPortal = false;
 	private String catalogueBaseUrl = null;

+	private String operativeScope = null;
+	private String loggedInScope = null;
+	private boolean isUserLoggedInVRE = false;
+
 	/**
 	 * Instantiates a new ckan connector access point.
 	 */
@ -46,10 +48,10 @@ public class CkanConnectorAccessPoint implements Serializable{
 	/**
 	 * Instantiates a new ckan connector access point.
 	 *
-	 * @param baseUrl the base url
+	 * @param baseUrl        the base url
 	 * @param serviceContext the service context
 	 */
-	public CkanConnectorAccessPoint(String baseUrl, String serviceContext){
+	public CkanConnectorAccessPoint(String baseUrl, String serviceContext) {
 		this.baseUrl = baseUrl;
 		this.catalogueBaseUrl = baseUrl.split("ckan-connector")[0];
 		this.serviceContext = serviceContext;
@ -58,29 +60,29 @@ public class CkanConnectorAccessPoint implements Serializable{
 	/**
 	 * Adds the generic parameter.
 	 *
-	 * @param key the key
+	 * @param key   the key
 	 * @param value the value
 	 */
-	public void addGenericParameter(String key, String value){
-		queryStringParameters=queryStringParameters==null?key+"="+value:queryStringParameters+"&"+key+"="+value;
+	public void addGenericParameter(String key, String value) {
+		queryStringParameters = queryStringParameters == null ? key + "=" + value
+				: queryStringParameters + "&" + key + "=" + value;
 	}

-
 	/**
 	 * Adds the query string.
 	 *
 	 * @param queryString the query string
 	 */
-	public void addQueryString(String queryString){
+	public void addQueryString(String queryString) {

-		if(queryString==null || queryString.isEmpty())
+		if (queryString == null || queryString.isEmpty())
 			return;

-		if(queryString.startsWith("&") || queryString.startsWith("?")){
-			queryString = queryString.substring(1, queryString.length()); //removes '&' or '?'
+		if (queryString.startsWith("&") || queryString.startsWith("?")) {
+			queryString = queryString.substring(1, queryString.length()); // removes '&' or '?'
 		}

-		queryStringParameters=queryStringParameters==null?queryString:queryStringParameters+"&"+queryString;
+		queryStringParameters = queryStringParameters == null ? queryString : queryStringParameters + "&" + queryString;
 	}

 	/**
@ -88,8 +90,8 @@ public class CkanConnectorAccessPoint implements Serializable{
 	 *
 	 * @param value the value
 	 */
-	public void addGubeToken(String value){
-		if(!outsideLoginOnPortal){
+	public void addGubeToken(String value) {
+		if (!outsideLoginOnPortal) {
 			this.gcubeTokenValue = value;
 			addGenericParameter(GCUBE_TOKEN_PARAMETER, value);
 		}
@ -100,18 +102,19 @@ public class CkanConnectorAccessPoint implements Serializable{
 	 *
 	 * @param listVREs the list vr es
 	 */
-	public void addListOfVREs(Map<String, String> listVREs){
+	public void addListOfVREs(Map<String, String> listVREs) {
 		this.mapVresRoles = listVREs;
 		String vres = "";
-		if(listVREs!=null && listVREs.size()>0){
+		if (listVREs != null && listVREs.size() > 0) {
 			Set<Entry<String, String>> set = listVREs.entrySet();
 			for (Entry<String, String> entry : set) {
 				vres += entry.getKey().toLowerCase() + "|" + entry.getValue() + ",";
 			}
-			vres = vres.substring(0, vres.length()-1); //remove last "," and to lower case. A CKAN Organization ID must be lower case
+			vres = vres.substring(0, vres.length() - 1); // remove last "," and to lower case. A CKAN Organization ID
+															// must be lower case
 		}

-		if(vres.length()>0){
+		if (vres.length() > 0) {
 			addGenericParameter(LIST_OF_VRES_PARAMETER, vres);
 		}
 	}
@ -121,27 +124,75 @@ public class CkanConnectorAccessPoint implements Serializable{
 	 *
 	 * @param pathInfo the path info
 	 */
-	public void addPathInfo(String pathInfo){
+	public void addPathInfo(String pathInfo) {
 		pathInfoParameter = pathInfo;
 	}

-
 	/**
-	 * Builds the URI to contact the CKAN (connector in case of user logged)
+	 * Builds the URI to contact the CKAN (connector in case of user logged).
 	 *
 	 * @return the string
 	 */
-	public String buildURI(){
+	public String buildURI() {

-		String path =  "";
-		String query =  "";
+		String path = "";
+		String query = "";
 		path = checkURLPathSeparator(pathInfoParameter, true, false);
 		query = checkNullString(queryStringParameters);
-		String url = getBaseUrlWithContext()+path;
-		url+= !query.isEmpty()?"?"+query:"";
+		String url = getBaseUrlWithContext() + path;
+		url += !query.isEmpty() ? "?" + query : "";
 		return url;
 	}

+	/**
+	 * Gets the operative scope.
+	 *
+	 * @return the operative scope
+	 */
+	public String getOperativeScope() {
+		return operativeScope;
+	}
+
+	/**
+	 * Gets the logged in scope.
+	 *
+	 * @return the logged in scope
+	 */
+	public String getLoggedInScope() {
+		return loggedInScope;
+	}
+
+	public boolean isUserLoggedInVRE() {
+		return isUserLoggedInVRE;
+	}
+
+	/**
+	 * Sets the user logged in VRE.
+	 *
+	 * @param isUserLoggedInVRE the new user logged in VRE
+	 */
+	public void setUserLoggedInVRE(boolean isUserLoggedInVRE) {
+		this.isUserLoggedInVRE = isUserLoggedInVRE;
+	}
+
+	/**
+	 * Sets the operative scope.
+	 *
+	 * @param operativeScope the new operative scope
+	 */
+	public void setOperativeScope(String operativeScope) {
+		this.operativeScope = operativeScope;
+	}
+
+	/**
+	 * Sets the logged in scope.
+	 *
+	 * @param loggedInScope the new logged in scope
+	 */
+	public void setLoggedInScope(String loggedInScope) {
+		this.loggedInScope = loggedInScope;
+	}
+
 	/**
 	 * Gets the base url with context.
 	 *
@ -149,10 +200,9 @@ public class CkanConnectorAccessPoint implements Serializable{
 	 */
 	public String getBaseUrlWithContext() {

-		return baseUrl+serviceContext;
+		return baseUrl + serviceContext;
 	}

-
 	/**
 	 * Gets the path info parameter.
 	 *
@ -163,7 +213,6 @@ public class CkanConnectorAccessPoint implements Serializable{
 		return pathInfoParameter;
 	}

-
 	/**
 	 * Gets the query string parameters.
 	 *
@ -174,7 +223,6 @@ public class CkanConnectorAccessPoint implements Serializable{
 		return queryStringParameters;
 	}

-
 	/**
 	 * Gets the gcube token value.
 	 *
@ -185,7 +233,6 @@ public class CkanConnectorAccessPoint implements Serializable{
 		return gcubeTokenValue;
 	}

-
 	/**
 	 * Gets the list of v res.
 	 *
@ -199,25 +246,29 @@ public class CkanConnectorAccessPoint implements Serializable{
 	/**
 	 * Check url path separator.
 	 *
-	 * @param url the url
-	 * @param head - checks the {@link GcubeCkanDataCatalogServiceImpl.URL_PATH_SEPARATOR} in head adding if do not exist
-	 * @param tail - checks the {@link GcubeCkanDataCatalogServiceImpl.URL_PATH_SEPARATOR} in tail adding if do not exist
-	 * @return the string - if null return an empty string otherwise a string with {@link GcubeCkanDataCatalogServiceImpl.URL_PATH_SEPARATOR}
+	 * @param url  the url
+	 * @param head - checks the
+	 *             {@link GcubeCkanDataCatalogServiceImpl.URL_PATH_SEPARATOR} in
+	 *             head adding if do not exist
+	 * @param tail - checks the
+	 *             {@link GcubeCkanDataCatalogServiceImpl.URL_PATH_SEPARATOR} in
+	 *             tail adding if do not exist
+	 * @return the string - if null return an empty string otherwise a string with
+	 *         {@link GcubeCkanDataCatalogServiceImpl.URL_PATH_SEPARATOR}
 	 */
-	public static String checkURLPathSeparator(String url, boolean head, boolean tail){
+	public static String checkURLPathSeparator(String url, boolean head, boolean tail) {

-		if(url!=null && url.length()>0){
-			if(head)
-				url=url.startsWith(URL_PATH_SEPARATOR)?url:URL_PATH_SEPARATOR+url;
-			if(tail)
-				url=url.endsWith(URL_PATH_SEPARATOR)?url:url+URL_PATH_SEPARATOR;
-		}else
+		if (url != null && url.length() > 0) {
+			if (head)
+				url = url.startsWith(URL_PATH_SEPARATOR) ? url : URL_PATH_SEPARATOR + url;
+			if (tail)
+				url = url.endsWith(URL_PATH_SEPARATOR) ? url : url + URL_PATH_SEPARATOR;
+		} else
 			url = "";

 		return url;
 	}

-
 	/**
 	 * Gets the base url.
 	 *
@ -228,23 +279,20 @@ public class CkanConnectorAccessPoint implements Serializable{
 		return baseUrl;
 	}

-
 	/**
 	 * Check null string.
 	 *
 	 * @param value the value
 	 * @return the string if is not null otherwise an empty string
 	 */
-	public static String checkNullString(String value){
+	public static String checkNullString(String value) {

-		if(value==null)
+		if (value == null)
 			return "";
 		else
 			return value;
 	}

-
-	
 	/**
 	 * Checks if is outside login on portal.
 	 *
@ -255,7 +303,6 @@ public class CkanConnectorAccessPoint implements Serializable{
 		return outsideLoginOnPortal;
 	}

-	
 	/**
 	 * Sets the outside login on portal.
 	 *
@ -275,8 +322,14 @@ public class CkanConnectorAccessPoint implements Serializable{
 		return catalogueBaseUrl;
 	}

-
-	/* (non-Javadoc)
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
--- a/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
@ -20,6 +20,10 @@

 	<inherits
 		name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' />
+
+	<inherits
+		name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
+
 	<inherits
 		name='org.gcube.portlets.widgets.ckandatapublisherwidget.CKanMetadataPublisher' />
 	<inherits
@ -29,6 +33,9 @@
 	<inherits
 		name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />

+	<inherits
+		name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
+
 	<inherits
 		name='org.gcube.portlets.widgets.switchbutton.SwitchButton' />
 	<inherits
@ -36,7 +43,6 @@
 	<inherits
 		name='org.gcube.portlets.widgets.ckancontentmoderator.CkanContentModeratorWidget' />

-
 	<!-- Specify the app entry point class. -->
 	<entry-point
 		class='org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.GCubeCkanDataCatalog' />
--- a/src/main/webapp/GCubeCkanDataCatalog.css
+++ b/src/main/webapp/GCubeCkanDataCatalog.css
@ -157,4 +157,33 @@ h1 {

 .modal-content-moderator .modal-body {
 	min-height: 720px;
+}
+
+.moderation-enabled-flag {
+	float: right;
+	margin-right: 10px;
+	padding: 8px !important;
+	border-radius: 12px !important;
+	margin-top: 5px;
+}
+
+.nav_bar_catalogue {
+	background-color: none !important;
+	margin-bottom: 0px !important;
+	margin-left: 10px;
+	margin-right: 5px;
+	padding: 5px;
+}
+
+.nav_bar_catalogue .navbar-inner {
+	background-image: none !important;
+	padding: 10px 5px;
+	background-color: #FAFAFA;
+}
+
+.logged_in_label {
+	float: right;
+	margin-right: 20px;
+	font-size: 12px;
+	padding-top: 5px;
 }
--- a/src/main/webapp/GCubeCkanDataCatalog.html
+++ b/src/main/webapp/GCubeCkanDataCatalog.html
@ -37,6 +37,7 @@
 			Your web browser must have JavaScript enabled in order for this
 			application to display correctly.</div>
 	</noscript>
+	<div id="logged_in" class="logged_in_label"></div>
 	<div id="gCubeCkanDataCatalog"></div>
 </body>
 </html>
--- a/src/main/webapp/WEB-INF/jsp/GCubeCkanDataCatalogPortlet_view.jsp
+++ b/src/main/webapp/WEB-INF/jsp/GCubeCkanDataCatalogPortlet_view.jsp
@ -28,9 +28,9 @@

 <!-- <script type="text/javascript" -->
 <%-- 	src='<%=request.getContextPath()%>/js/jquery.min.js'></script> --%>
-	
+
 <script type="text/javascript"
 	src='<%=request.getContextPath()%>/js/jquery.autosize.js'></script>

-
+<div id="logged_in" class="logged_in_label"></div>
 <div id="gCubeCkanDataCatalog"></div>
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@ -11,13 +11,6 @@
 		<param-value>/gcube/service/connect</param-value>
 	</context-param>

-	<!-- <context-param> -->
-	<!-- <description>Used like GET parameter in order to hide header section 
-		of CKAN template from gCube Portal</description> -->
-	<!-- <param-name>CkanHideHeader</param-name> -->
-	<!-- <param-value>hh</param-value> -->
-	<!-- </context-param> -->
-
 	<context-param>
 		<description>ckan connector logout from CKAN</description>
 		<param-name>CkanConnectorLogout</param-name>
@ -30,16 +23,6 @@
 		<servlet-class>org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.GcubeCkanDataCatalogServiceImpl</servlet-class>
 	</servlet>

-	<!-- <servlet> -->
-	<!-- <servlet-name>gcubeckanlogout</servlet-name> -->
-	<!-- <servlet-class>org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.CkanLogout</servlet-class> -->
-	<!-- </servlet> -->
-
-	<!-- <servlet> -->
-	<!-- <servlet-name>checkServlet</servlet-name> -->
-	<!-- <servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class> -->
-	<!-- </servlet> -->
-
 	<servlet>
 		<servlet-name>ckanpublisherservices</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.ckandatapublisherwidget.server.CKANPublisherServicesImpl</servlet-class>
@ -55,6 +38,11 @@
 		<servlet-class>org.gcube.portlets_widgets.catalogue_sharing_widget.server.ShareServicesImpl</servlet-class>
 	</servlet>

+	<servlet>
+		<servlet-name>workspaceExplorer</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl</servlet-class>
+	</servlet>
+
 	<!-- Servlets -->
 	<servlet>
 		<servlet-name>ckanToZenodoServlet</servlet-name>
@ -66,12 +54,23 @@
 		<servlet-class>org.gcube.portlets.widgets.ckancontentmoderator.server.CkanContentModeratorServiceImpl</servlet-class>
 	</servlet>

+	<servlet>
+		<servlet-name>metadataProfileFormBuilderUploadServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.mpformbuilder.server.MetadataProfileFormBuilderUploadServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>metadataProfileFormBuilderUploadServlet</servlet-name>
+		<url-pattern>/gCubeCkanDataCatalog/metadataProfileFormBuilderUploadServlet</url-pattern>
+	</servlet-mapping>
+
+
 	<servlet-mapping>
 		<servlet-name>ckanContentModeratorServlet</servlet-name>
 		<url-pattern>/gCubeCkanDataCatalog/ckanContentModeratorService</url-pattern>
 	</servlet-mapping>
-	
-	
+
+
 	<servlet-mapping>
 		<servlet-name>ckanToZenodoServlet</servlet-name>
 		<url-pattern>/gCubeCkanDataCatalog/ckantozenodo</url-pattern>
@ -97,6 +96,12 @@
 		<url-pattern>/gCubeCkanDataCatalog/grsfmanageservice</url-pattern>
 	</servlet-mapping>

+	<servlet-mapping>
+		<servlet-name>workspaceExplorer</servlet-name>
+		<url-pattern>/gCubeCkanDataCatalog/WorkspaceExplorerService</url-pattern>
+	</servlet-mapping>
+
+
 	<!-- <servlet-mapping> -->
 	<!-- <servlet-name>gcubeckanlogout</servlet-name> -->
 	<!-- <url-pattern>/gCubeCkanDataCatalog/gcubeckanlogout</url-pattern> -->
Author	SHA1	Message	Date
Francesco Mangiacrapa	08f9d04157	removed -SNAPSHOT to be released	2024-05-16 10:51:43 +02:00
Francesco Mangiacrapa	82d771e31d	Merge pull request 'feature_27467' (!6 ) from feature_27467 into master Reviewed-on: #6	2024-05-16 10:42:59 +02:00
Francesco Mangiacrapa	d6508586bc	updated CHANGELOG	2024-05-15 10:08:40 +02:00
Francesco Mangiacrapa	d0ca04fa44	removed padding	2024-05-15 10:02:17 +02:00
Francesco Mangiacrapa	b0dc259d6c	Hiding "Logged in as {ROLE}" as discussed	2024-05-15 09:56:50 +02:00
Francesco Mangiacrapa	8281aed5e4	updated version into pom at v2.3.1-SNAPSHOT	2024-05-14 16:31:28 +02:00
Francesco Mangiacrapa	6a18e040c0	updated CSS	2024-05-14 16:05:29 +02:00
Francesco Mangiacrapa	f468c745b2	fixed typo	2024-04-04 09:38:24 +02:00
Francesco Mangiacrapa	fc4270954c	removed -SNAPSHOT to be released	2024-03-19 10:31:59 +01:00
Francesco Mangiacrapa	b8c6ec5daa	Merge pull request 'edit_facility_26115' (!5 ) from edit_facility_26115 into master Reviewed-on: #5	2024-03-19 10:28:52 +01:00
Francesco Mangiacrapa	74da9f2159	updated changelog	2024-03-19 10:28:35 +01:00
Francesco Mangiacrapa	6e01560b72	commented profiles	2024-02-28 11:05:22 +01:00
Francesco Mangiacrapa	03cce83564	Added the proper ranges in the `catalogue-snapshot-profile`	2024-02-26 15:23:44 +01:00
Francesco Mangiacrapa	27d0a38747	Using production ranges of `gcube-portal-bom-version` and `storagehub-version-rang`	2024-02-26 15:07:45 +01:00
Francesco Mangiacrapa	c9811d3fb0	Catalogue at root VO or VO level works in read only mode [#26854 ]	2024-02-23 15:30:05 +01:00
Francesco Mangiacrapa	36f32bf438	Updated Drop My Buttons	2024-02-19 18:04:28 +01:00
Francesco Mangiacrapa	81a76f51b8	Managed the event showdatasetevent from the publisher widget	2024-02-19 17:41:28 +01:00
Francesco Mangiacrapa	573c0b14de	Revisited the Navigation Bar	2024-02-19 16:08:58 +01:00
Francesco Mangiacrapa	733841fd5e	Updated Navigation Bar with Catalogue functionalities	2024-02-19 13:07:50 +01:00
Francesco Mangiacrapa	a9a7f1ccb7	updated pom	2024-02-16 15:43:04 +01:00
Francesco Mangiacrapa	94a13f5005	Updated the pom	2024-02-16 15:36:14 +01:00
Francesco Mangiacrapa	1493d20bbe	replaced OrganizationBeanProfile with OrganizationBean	2024-02-15 17:31:54 +01:00
Francesco Mangiacrapa	a5efc60c57	Updated the ShowDatasetsEvents	2024-02-13 17:00:47 +01:00
Francesco Mangiacrapa	2f6ddcf2a0	commented code	2024-02-12 17:33:52 +01:00
Francesco Mangiacrapa	4518439788	renamed to "Update Item"	2024-02-09 15:12:27 +01:00
Francesco Mangiacrapa	2257e3450e	Added Updated Item button	2024-02-05 17:30:15 +01:00
Francesco Mangiacrapa	f98ccd3bfc	[#26639 ] sync ckan-metadata-publisher-widget -> metadata-profile-form-builder-widget model	2024-02-05 17:03:25 +01:00
Francesco Mangiacrapa	b188a63e68	removed -SNAPSHOT to be released. Including "Upload to Zenodo" fix [#26166]	2023-12-21 09:09:23 +01:00
Francesco Mangiacrapa	4c3e8b8245	- Including "Upload to Zenodo" fix [#26166 ]	2023-12-06 09:36:25 +01:00
Francesco Mangiacrapa	857ea04ff1	removed -SNAPSHOT to be released	2023-07-28 16:38:08 +02:00
Francesco Mangiacrapa	36ac735b8b	added gwt-servlet 2.10.0 at runtime	2023-07-28 15:41:59 +02:00
Francesco Mangiacrapa	755cc29f5d	removed unused import	2023-07-28 13:58:30 +02:00
Francesco Mangiacrapa	f77888f037	Moved to GWT 2.10.0	2023-07-25 15:32:58 +02:00
Francesco Mangiacrapa	74d9c693b8	forcing ckan2zenodo-library at 1.0.3-SNAPSHOT	2023-07-25 14:22:05 +02:00
Francesco Mangiacrapa	ce3181a07a	Updated at GWT 2.10.0	2023-07-25 12:40:54 +02:00
Francesco Mangiacrapa	585460b5a4	added maven-parent v.1.2.0	2023-07-25 12:35:11 +02:00
Francesco Mangiacrapa	51e3337921	Merge branch 'master' of https://code-repo.d4science.org/gCubeSystem/gcube-ckan-datacatalog.git	2023-07-25 12:04:17 +02:00
Francesco Mangiacrapa	c94cad0e3b	- Just rebuilt the Portlet, fixing issue [#25275 ]	2023-07-25 12:01:45 +02:00
Francesco Mangiacrapa	62b495fcfc	Update 'README.md'	2023-07-12 23:32:06 +02:00
Francesco Mangiacrapa	fdc6c6029c	Update 'README.md'	2023-07-12 23:31:37 +02:00
Francesco Mangiacrapa	b3cb78c2f3	Updated README	2023-07-10 10:38:06 +02:00
Francesco Mangiacrapa	27e0fc8330	Updated README	2023-07-10 09:50:52 +02:00
Francesco Mangiacrapa	a45e11848e	Updated README	2023-07-10 09:48:37 +02:00
Francesco Mangiacrapa	394f0608b6	Updated	2023-07-08 19:02:23 +02:00
Francesco Mangiacrapa	e67db3ab8f	Updated README	2023-07-08 19:01:55 +02:00
Francesco Mangiacrapa	0b90b0d45d	Updated README	2023-07-08 19:01:06 +02:00
Francesco Mangiacrapa	48fdc42c44	Updated README	2023-07-08 18:59:39 +02:00
Francesco Mangiacrapa	f3ce58daa2	Updated README	2023-07-08 18:50:06 +02:00
Francesco Mangiacrapa	78e8cc02ce	Update 'README.md'	2023-06-28 09:49:32 +02:00
Francesco Mangiacrapa	c2dfa0ee63	Update 'README.md'	2023-06-21 09:25:06 +02:00
Francesco Mangiacrapa	9422e63002	Removed -SNAPSHOT to be released	2023-03-10 12:11:55 +01:00
Francesco Mangiacrapa	1070d312c8	Moved to 2.9.0	2023-03-10 11:53:29 +01:00
Francesco Mangiacrapa	97cd62cfdb	Moved to SNAPSHOT and gwt-2.10	2023-03-10 10:52:46 +01:00
Francesco Mangiacrapa	353496b576	maven-portal-bom fixed at 3.6.4	2023-03-03 09:41:34 +01:00
Francesco Mangiacrapa	e4c87305b6	Updated CSS	2023-03-02 17:10:17 +01:00
Francesco Mangiacrapa	607e480793	removed -SNAPSHOT to be released	2023-03-02 17:03:57 +01:00
Francesco Mangiacrapa	6b320cb216	Improved the Moderation Enabled Flag	2023-03-02 16:52:59 +01:00
Francesco Mangiacrapa	b8dc526855	updated comment	2023-02-28 15:35:31 +01:00
Francesco Mangiacrapa	3680ffd875	Merge pull request 'feature_23903' (!4 ) from feature_23903 into master Reviewed-on: #4	2023-02-07 08:43:29 +01:00
Francesco Mangiacrapa	cda233bfa0	moved to gwt 2.9	2023-02-07 08:42:41 +01:00
Francesco Mangiacrapa	f8026d6a72	Fixing CMS button tooltip	2023-01-27 16:44:57 +01:00
Francesco Mangiacrapa	b1a17f1ea5	#24309 done	2023-01-27 16:35:35 +01:00
Francesco Mangiacrapa	45c178579b	removed commented servlets	2023-01-27 15:16:52 +01:00
Francesco Mangiacrapa	d730066655	Moved to 2.2.5-SNAPSHOT. Integrating feature #23903	2023-01-26 12:27:58 +01:00
Francesco Mangiacrapa	c4c68de7ba	Removed -SNAPSHOT to be released	2022-10-27 16:43:40 +02:00
Francesco Mangiacrapa	d1dac9e321	Updated ckan-metadata-publisher-widget range at [2.1.0,3.0.0)	2022-10-27 13:52:30 +02:00
Francesco Mangiacrapa	e67dda8c4a	Moved to 2.2.4-SNAPSHOT	2022-10-27 12:15:52 +02:00
Francesco Mangiacrapa	2b2aa95034	removed -SNAPSHOT to be released	2022-10-27 10:32:55 +02:00
Francesco Mangiacrapa	20e8e2290b	Added lombok v1.18.4 at provided	2022-10-27 10:26:07 +02:00
Francesco Mangiacrapa	6a91e8a013	Moved to gwt 2.9.0. Component v.2.2.4-SNAPSHOT	2022-10-27 10:05:35 +02:00