From 1aa6abb03137918d18ac17b4bb4f251cbc795ea0 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Tue, 20 Feb 2018 14:51:25 +0000
Subject: [PATCH] fix for #11210

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@164449 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component           |  6 ------
 .../client/CkanEventHandlerManager.java              |  3 ++-
 .../client/view/GCubeCkanDataCatalogPanel.java       | 12 ++++++++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7dc2878..9a48316 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,15 +4,9 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="grsf-manage-widget-1.3.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-manage-widget/grsf-manage-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="ckan-metadata-publisher-widget-1.3.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="gcube-ckan-datacatalog"/>
         <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
index a81ac97..53076dd 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
@@ -81,7 +81,8 @@ public class CkanEventHandlerManager {
 
 			@Override
 			public void onShowHome(ShowHomeEvent showHomeEvent) {
-				String request = getCkanRequest(panel.getPathInfo(), null);
+				String pathToUse = panel.isViewPerVREEnabled() ? panel.getPathInfo() : null;
+				String request = getCkanRequest(pathToUse, null);
 				panel.instanceCkanFrame(request);
 
 			}
diff --git 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
index 130d99e..5299ff7 100644
--- 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
@@ -50,6 +50,7 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
 	private HandlerManager eventBus;
 	private CkanConnectorAccessPoint ckanAccessPoint;
 	private boolean isManageProductToShow = false;
+	private String viewPerVREPath = null;
 	private static String latestSelectedProductIdentifier;
 	public static final int IFRAME_FIX_HEIGHT = 1800;
 	private JSONObject obj;
@@ -163,6 +164,9 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
 										
 										// set real relative path
 										ckanAccessPoint.addPathInfo(result);
+										
+										// save this information
+										viewPerVREPath = result;
 									}
 									
 								}
@@ -530,4 +534,12 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
 		managementPanel.showManageProductButton(show);
 		
 	}
+
+	/**
+	 * Check if the view per vre is enabled
+	 */
+	public boolean isViewPerVREEnabled() {
+		return viewPerVREPath != null;
+	}
+	
 }