From 9c49f8bcdfb394062ce1d6f4b99cd9b7c6070330 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 16 Nov 2017 17:03:09 +0000 Subject: [PATCH] Removed pagination ticket #9114 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@158580 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 1 - .../computations/ComputationsExecutedPanel.java | 12 ++++++------ .../client/dataspace/InputDataSetsPanel.java | 10 +++++----- .../client/dataspace/OutputDataSetsPanel.java | 10 +++++----- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index b30fea6..67b4bf9 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -2,7 +2,6 @@ Added NetCDF files support - Updated to support pagination in Workspace Explorer [ticket #9114] diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java index 9a6dc11..80afc61 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java @@ -25,7 +25,7 @@ import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload; -import org.gcube.portlets.widgets.wsexplorer.client.explore.WorkspaceResourcesExplorerPanelPaginated; +import org.gcube.portlets.widgets.wsexplorer.client.explore.WorkspaceResourcesExplorerPanel; import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener; import org.gcube.portlets.widgets.wsexplorer.client.view.grid.ItemsTable.DISPLAY_FIELD; import org.gcube.portlets.widgets.wsexplorer.shared.FilterCriteria; @@ -59,8 +59,8 @@ public class ComputationsExecutedPanel extends FramedPanel { private Item selectedItem; private MultipleDNDUpload dnd; - private WorkspaceResourcesExplorerPanelPaginated wsResourcesExplorerPanel; - // private WorkspaceResourcesExplorerPanel wsResourcesExplorerPanel; + //private WorkspaceResourcesExplorerPanelPaginated wsResourcesExplorerPanel; + private WorkspaceResourcesExplorerPanel wsResourcesExplorerPanel; private TextButton btnShow; private TextButton btnDownload; private TextButton btnDelete; @@ -233,7 +233,7 @@ public class ComputationsExecutedPanel extends FramedPanel { + event.getDataMinerWorkArea().getComputations().getFolder().getId() + ", false, " + showProperties + ", " + filterCriteria + ", true, " + DISPLAY_FIELD.CREATION_DATE + "]"); - wsResourcesExplorerPanel = new WorkspaceResourcesExplorerPanelPaginated( + wsResourcesExplorerPanel = new WorkspaceResourcesExplorerPanel( event.getDataMinerWorkArea().getComputations().getFolder().getId(), false, showProperties, filterCriteria, true, DISPLAY_FIELD.CREATION_DATE); Log.debug("Created wsResourcesExplorerPanel"); @@ -264,8 +264,8 @@ public class ComputationsExecutedPanel extends FramedPanel { Log.debug("Add WorkspaceExplorerSelectNotificationListener"); wsResourcesExplorerPanel.addWorkspaceExplorerSelectNotificationListener(wsResourceExplorerListener); wsResourcesExplorerPanel.ensureDebugId("wsResourceExplorerPanelComputaions"); - Log.debug("Set Height to internal SCROLL 270"); - wsResourcesExplorerPanel.setHeightToInternalScroll(270); + Log.debug("Set Height to internal 300 Normal or 270 if paginated"); + wsResourcesExplorerPanel.setHeightToInternalScroll(300); /* * VerticalLayoutContainer vResourcesExplorerContainer = new diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java index d538941..ded016c 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java @@ -22,7 +22,7 @@ import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload; -import org.gcube.portlets.widgets.wsexplorer.client.explore.WorkspaceResourcesExplorerPanelPaginated; +import org.gcube.portlets.widgets.wsexplorer.client.explore.WorkspaceResourcesExplorerPanel; import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener; import org.gcube.portlets.widgets.wsexplorer.client.view.grid.ItemsTable.DISPLAY_FIELD; import org.gcube.portlets.widgets.wsexplorer.shared.FilterCriteria; @@ -56,8 +56,8 @@ public class InputDataSetsPanel extends FramedPanel { private Item selectedItem; private MultipleDNDUpload dnd; - private WorkspaceResourcesExplorerPanelPaginated wsResourcesExplorerPanel; - //private WorkspaceResourcesExplorerPanel wsResourcesExplorerPanel; + //private WorkspaceResourcesExplorerPanelPaginated wsResourcesExplorerPanel; + private WorkspaceResourcesExplorerPanel wsResourcesExplorerPanel; private TextButton btnDownload; private TextButton btnDelete; private TextButton btnRefresh; @@ -219,7 +219,7 @@ public class InputDataSetsPanel extends FramedPanel { + event.getDataMinerWorkArea().getInputDataSets().getFolder().getId() + ", false, " + showProperties+", "+ filterCriteria + ", true, " + DISPLAY_FIELD.CREATION_DATE + "]"); - wsResourcesExplorerPanel = new WorkspaceResourcesExplorerPanelPaginated( + wsResourcesExplorerPanel = new WorkspaceResourcesExplorerPanel( event.getDataMinerWorkArea().getInputDataSets().getFolder().getId(), false, showProperties, filterCriteria, true, DISPLAY_FIELD.CREATION_DATE); WorskpaceExplorerSelectNotificationListener wsResourceExplorerListener = new WorskpaceExplorerSelectNotificationListener() { @@ -249,7 +249,7 @@ public class InputDataSetsPanel extends FramedPanel { wsResourcesExplorerPanel.addWorkspaceExplorerSelectNotificationListener(wsResourceExplorerListener); wsResourcesExplorerPanel.ensureDebugId("wsResourceExplorerPanelForInput"); - wsResourcesExplorerPanel.setHeightToInternalScroll(270); + wsResourcesExplorerPanel.setHeightToInternalScroll(300); Log.debug("Define DND for InputDataSetsPanel"); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java index cf87f5f..37fe137 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java @@ -22,7 +22,7 @@ import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload; -import org.gcube.portlets.widgets.wsexplorer.client.explore.WorkspaceResourcesExplorerPanelPaginated; +import org.gcube.portlets.widgets.wsexplorer.client.explore.WorkspaceResourcesExplorerPanel; import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener; import org.gcube.portlets.widgets.wsexplorer.client.view.grid.ItemsTable.DISPLAY_FIELD; import org.gcube.portlets.widgets.wsexplorer.shared.FilterCriteria; @@ -57,8 +57,8 @@ public class OutputDataSetsPanel extends FramedPanel { private Item selectedItem; private MultipleDNDUpload dnd; - private WorkspaceResourcesExplorerPanelPaginated wsResourcesExplorerPanel; - // private WorkspaceResourcesExplorerPanel wsResourcesExplorerPanel; + //private WorkspaceResourcesExplorerPanelPaginated wsResourcesExplorerPanel; + private WorkspaceResourcesExplorerPanel wsResourcesExplorerPanel; private TextButton btnDownload; private TextButton btnDelete; private TextButton btnRefresh; @@ -217,7 +217,7 @@ public class OutputDataSetsPanel extends FramedPanel { Log.debug("Create wsResourcesExplorerPanel for Output: [" + event.getDataMinerWorkArea().getOutputDataSets().getFolder().getId() + ", false, " + showProperties + ", " + filterCriteria + ", true, " + DISPLAY_FIELD.CREATION_DATE + "]"); - wsResourcesExplorerPanel = new WorkspaceResourcesExplorerPanelPaginated( + wsResourcesExplorerPanel = new WorkspaceResourcesExplorerPanel( event.getDataMinerWorkArea().getOutputDataSets().getFolder().getId(), false, showProperties, filterCriteria, true, DISPLAY_FIELD.CREATION_DATE); @@ -248,7 +248,7 @@ public class OutputDataSetsPanel extends FramedPanel { wsResourcesExplorerPanel.addWorkspaceExplorerSelectNotificationListener(wsResourceExplorerListener); wsResourcesExplorerPanel.ensureDebugId("wsResourceExplorerPanelForOutput"); - wsResourcesExplorerPanel.setHeightToInternalScroll(270); + wsResourcesExplorerPanel.setHeightToInternalScroll(300); Log.debug("Define DND for InputDataSetsPanel");