428: TDM - Support the new Workspace Explorer

Task-Url: https://support.d4science.org/issues/428 Updated support to workspace explorer git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-codelistmapping-import-widget@117641 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-08-03 16:56:14 +00:00 · 2015-08-03 16:56:14 +00:00 · a7b3f43ece
parent 60a6c072a2
commit a7b3f43ece
5 changed files with 86 additions and 89 deletions
--- a/pom.xml
+++ b/pom.xml
@ -133,10 +133,11 @@
 		<!-- WSLT dependencies -->
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>workspace-light-tree</artifactId>
-			<version>[2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+			<artifactId>workspace-explorer</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library</artifactId>
@ -166,9 +167,9 @@
 			<version>4.8.1</version>
 			<scope>test</scope>
 		</dependency>
-	
+
 	</dependencies>
-	
+
 	<build>
 		<!-- Generate compiled stuff in the folder used for developing mode -->
 		<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingWorkSpaceSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingWorkSpaceSelectionCard.java
@ -3,7 +3,11 @@
 */
 package org.gcube.portlets.user.td.codelistmappingimportwidget.client;

-import org.gcube.portlets.user.td.codelistmappingimportwidget.client.workspace.WorkspacePanel;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException;
@ -12,15 +16,18 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpire
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
-import org.gcube.portlets.widgets.lighttree.client.Item;
-import org.gcube.portlets.widgets.lighttree.client.ItemType;
-import org.gcube.portlets.widgets.lighttree.client.event.ItemSelectionEvent;
-import org.gcube.portlets.widgets.lighttree.client.event.ItemSelectionHandler;
+import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
+import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectPanel;
+import org.gcube.portlets.widgets.wsexplorer.shared.FilterCriteria;
+import org.gcube.portlets.widgets.wsexplorer.shared.Item;
+import org.gcube.portlets.widgets.wsexplorer.shared.ItemType;

 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.sencha.gxt.core.client.util.Margins;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;

 /**
 * 
@ -30,12 +37,17 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
 */
 public class CodelistMappingWorkSpaceSelectionCard extends WizardCard {

-	protected CodelistMappingSession codelistMappingSession;
-	protected CodelistMappingWorkSpaceSelectionCard thisCard;
+	/*
+	public interface HtmlLayoutContainerTemplate extends XTemplates {
+		@XTemplate("<div class=\"wspaceSelectionCard\" style=\"margin:auto;padding:auto;\"></div>")
+		SafeHtml getTemplate();
+	}*/

-	protected Item item;
-	protected VerticalLayoutContainer p;
-	protected WorkspacePanel wpanel;
+	private CodelistMappingSession codelistMappingSession;
+	private CodelistMappingWorkSpaceSelectionCard thisCard;
+
+	private VerticalLayoutContainer p;
+	private WorkspaceExplorerSelectPanel wpanel;

 	public CodelistMappingWorkSpaceSelectionCard(
 			final CodelistMappingSession codelistMappingSession) {
@ -44,23 +56,38 @@ public class CodelistMappingWorkSpaceSelectionCard extends WizardCard {
 		this.codelistMappingSession = codelistMappingSession;
 		thisCard = this;

+		
+		/*HtmlLayoutContainerTemplate templates = GWT
+				.create(HtmlLayoutContainerTemplate.class);
+
+		HtmlLayoutContainer htmlLayoutContainer = new HtmlLayoutContainer(
+				templates.getTemplate());
+		htmlLayoutContainer.add(button1, new HtmlData(".wspaceSelectionCard"));*/
+
 		p = new VerticalLayoutContainer();

 		Log.debug("Set Workspace Panel");
-		wpanel = new WorkspacePanel();
-		wpanel.setSpWidth("536px");
-		wpanel.setSpHeight("384px");
-		// wpanel.setShowableTypes(ItemType.EXTERNAL_FILE);
-		wpanel.setSelectableTypes(ItemType.EXTERNAL_FILE);
-		wpanel.getSelectableTypes().remove(ItemType.ROOT);
-		wpanel.getSelectableTypes().remove(ItemType.FOLDER);
-		wpanel.setAllowedMimeTypes("application/xml", "application/zip",
-				"application/x-zip", "application/x-zip-compressed",
-				"application/octet", "application/octet-stream");
-		wpanel.addSelectionHandler(new ItemSelectionHandler() {
+		List<ItemType> selectableTypes = new ArrayList<ItemType>();
+		selectableTypes.add(ItemType.EXTERNAL_FILE);
+		List<ItemType> showableTypes = new ArrayList<ItemType>();
+		showableTypes.addAll(Arrays.asList(ItemType.values()));

-			public void onSelection(ItemSelectionEvent event) {
-				item = event.getSelectedItem();
+		List<String> allowedMimeTypes = Arrays.asList("application/xml",
+				"application/zip", "application/x-zip",
+				"application/x-zip-compressed", "application/octet",
+				"application/octet-stream");
+		List<String> allowedFileExtensions = Arrays.asList("xml", "zip");
+
+		FilterCriteria filterCriteria = new FilterCriteria(allowedMimeTypes,
+				allowedFileExtensions, new HashMap<String, String>());
+
+		wpanel = new WorkspaceExplorerSelectPanel(new String(
+				"Workspace Selection"), filterCriteria);
+
+		WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() {
+
+			@Override
+			public void onSelectedItem(Item item) {
 				Log.debug("Selected Item:" + item);
 				if (item.getType() == ItemType.EXTERNAL_FILE) {
 					String filename = item.getName();
@ -80,10 +107,29 @@ public class CodelistMappingWorkSpaceSelectionCard extends WizardCard {
 					Log.debug("Item type:" + item.getType());
 					getWizardWindow().setEnableNextButton(false);
 				}
+
 			}
-		});
-		p.add(wpanel);
-		wpanel.loadTree();
+
+			@Override
+			public void onFailed(Throwable throwable) {
+				Log.error("Error in workspaceExplorer: "
+						+ throwable.getLocalizedMessage());
+				throwable.printStackTrace();
+			}
+
+			@Override
+			public void onAborted() {
+				Log.debug("WorkspaceExplorer Aborted");
+
+			}
+		};
+
+		wpanel.addWorkspaceExplorerSelectNotificationListener(handler);
+
+		p.add(wpanel, new VerticalLayoutData(1, 1, new Margins(0)));
+		
+		
+
 		setContent(p);

 	}
@ -96,8 +142,6 @@ public class CodelistMappingWorkSpaceSelectionCard extends WizardCard {
 			public void execute() {
 				Log.debug("CodelistMappingWorkSpaceSelectionCard Call sayNextCard wpanel:"
 						+ wpanel);
-				wpanel.disable();
-				wpanel.startWaiting();
 				getWizardWindow().setEnableNextButton(false);
 				getWizardWindow().setEnableBackButton(false);
 				getFileFromWorkspace();
@ -130,7 +174,6 @@ public class CodelistMappingWorkSpaceSelectionCard extends WizardCard {
 				new AsyncCallback<Void>() {

 					public void onFailure(Throwable caught) {
-						wpanel.endWaiting();
 						if (caught instanceof TDGWTSessionExpiredException) {
 							getEventBus()
 									.fireEvent(
@ -160,7 +203,6 @@ public class CodelistMappingWorkSpaceSelectionCard extends WizardCard {
 					}

 					public void onSuccess(Void result) {
-						wpanel.endWaiting();
 						goNext();

 					}
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/workspace/WorkspacePanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/workspace/WorkspacePanel.java
@ -1,47 +0,0 @@
-package org.gcube.portlets.user.td.codelistmappingimportwidget.client.workspace;
-
-import org.gcube.portlets.widgets.lighttree.client.WorkspaceLightTreePanel;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox;
-import com.sencha.gxt.widget.core.client.event.DisableEvent;
-import com.sencha.gxt.widget.core.client.event.EnableEvent;
-
-public class WorkspacePanel extends WorkspaceLightTreePanel {
-
-	AutoProgressMessageBox box;
-
-	public void setSpWidth(String w) {
-		sp.setWidth(w);
-
-	}
-
-	public void setSpHeight(String h) {
-		sp.setHeight(h);
-	}
-
-	public void disable() {
-		Log.debug("WorkspacePanel Disable");
-		fireEvent(new DisableEvent());
-	}
-
-	public void enable() {
-		Log.debug("WorkspacePanel Enable");
-		fireEvent(new EnableEvent());
-	}
-
-	public void startWaiting() {
-		box= new AutoProgressMessageBox("Loading",
-					"Retriving data from workspace, please wait...");
-		box.setProgressText("Loading...");
-		box.setModal(false);
-		box.auto();
-		box.show();
-
-	}
-
-	public void endWaiting() {
-		box.hide();
-	}
-
-}
--- a/src/main/resources/org/gcube/portlets/user/td/codelistmappingimportwidget/CodelistMappingImportWizardTD.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/codelistmappingimportwidget/CodelistMappingImportWizardTD.gwt.xml
@ -21,8 +21,8 @@
  <inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
  <inherits name='org.gcube.portlets.user.td.monitorwidget.MonitorWidgetTD' />
   
-  <inherits	name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
- 
+  <inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
+
  
  <!-- Specify the app entry point class.                         -->
  <!-- <entry-point class='org.gcube.portlets.user.SDMXImportWizardTD.client.SDMXImportWizardTDEntry' /> -->
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@ -17,8 +17,8 @@
 	</servlet>

 	<servlet>
-		<servlet-name>WorkspaceLightService</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
+		<servlet-name>workspaceExplorer</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl</servlet-class>
 	</servlet>
 	
 	<servlet>
@ -31,18 +31,19 @@
 	<!-- Servlets Mapping -->
 	<servlet-mapping>
 		<servlet-name>TDGWTService</servlet-name>
-		<url-pattern>tdgwtservice/TDGWTService</url-pattern>
+		<url-pattern>/CodelistMappingImportWizardWidgets/TDGWTService</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>jUnitHostImpl</servlet-name>
-		<url-pattern>CodelistMappingImportWizardWidgets/junithost/*</url-pattern>
+		<url-pattern>/CodelistMappingImportWizardWidgets/junithost/*</url-pattern>
 	</servlet-mapping>
 	
 	<servlet-mapping>
-		<servlet-name>WorkspaceLightService</servlet-name>
-		<url-pattern>/CodelistMappingImportWizardWidgets/WorkspaceLightService</url-pattern>
+		<servlet-name>workspaceExplorer</servlet-name>
+		<url-pattern>/CodelistMappingImportWizardWidgets/WorkspaceExplorerService</url-pattern>
 	</servlet-mapping>
 	
+	
 	<servlet-mapping>
 		<servlet-name>CodelistMappingUploadServlet</servlet-name>
 		<url-pattern>/CodelistMappingImportWizardWidgets/CodelistMappingUploadServlet</url-pattern>