gCubeSystem
/
data-miner-manager-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 11720: TDM - Update to StorageHUB 

https://support.d4science.org/issues/11879

Updated to StorageHub 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/data-miner-manager-widget@169518 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2018-06-28 09:09:01 +00:00
parent 492894e1b8
commit 1aad7b879a
4 changed files with 161 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java
View File

@ -16,7 +16,7 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer;
*
*/
public class DataSpacePanel extends SimpleContainer {
private TabPanel dataSpaceTabPanel;
private OutputDataSetsPanel outputDataSetsPanel;
private InputDataSetsPanel inputDataSetsPanel;
@ -31,32 +31,25 @@ public class DataSpacePanel extends SimpleContainer {
}
private void create() {
outputDataSetsPanel = new OutputDataSetsPanel();
inputDataSetsPanel = new InputDataSetsPanel();
dataSpaceTabPanel=new TabPanel();
outputDataSetsPanel = new OutputDataSetsPanel();
dataSpaceTabPanel = new TabPanel();
dataSpaceTabPanel.setBorders(false);
dataSpaceTabPanel.setBodyBorder(false);
TabItemConfig outputDataItemConf = new TabItemConfig("Output Data Sets",
false);
outputDataItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore());
TabItemConfig outputDataItemConf = new TabItemConfig("Output Data Sets", false);
outputDataItemConf.setIcon(DataMinerManagerPanel.resources.folderExplore());
dataSpaceTabPanel.add(outputDataSetsPanel, outputDataItemConf);
TabItemConfig inputDataSetsItemConf = new TabItemConfig(
"Input Data Sets", false);
inputDataSetsItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore());
TabItemConfig inputDataSetsItemConf = new TabItemConfig("Input Data Sets", false);
inputDataSetsItemConf.setIcon(DataMinerManagerPanel.resources.folderExplore());
dataSpaceTabPanel.add(inputDataSetsPanel, inputDataSetsItemConf);
dataSpaceTabPanel.setActiveWidget(outputDataSetsPanel);
add(dataSpaceTabPanel);
forceLayout();
}
}

65
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java
View File

@ -7,12 +7,14 @@ import java.util.Map;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portal.clientcontext.client.GCubeClientContext;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.RefreshDataMinerWorkAreaEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SyncRefreshUploadDataSpaceEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.UIStateEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaElementType;
@ -23,7 +25,7 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.Sessio
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 +59,9 @@ 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;
@ -82,7 +85,7 @@ public class InputDataSetsPanel extends FramedPanel {
setHeaderVisible(false);
setResize(true);
setAnimCollapse(false);
setCollapsible(true);
setCollapsible(false);
setHeadingText("Input Data Sets");
setBodyStyle("backgroundColor:white;");
}
@ -120,6 +123,17 @@ public class InputDataSetsPanel extends FramedPanel {
});
EventBusProvider.INSTANCE.addHandler(SyncRefreshUploadDataSpaceEvent.TYPE,
new SyncRefreshUploadDataSpaceEvent.SyncRefreshUploadDataSpaceEventHandler() {
@Override
public void onRefresh(SyncRefreshUploadDataSpaceEvent event) {
manageSyncRefreshUploadDataSpaceEvents();
}
});
}
private void manageStateEvents(UIStateEvent event) {
@ -176,7 +190,6 @@ public class InputDataSetsPanel extends FramedPanel {
Log.error("RefreshDataMinerWorkAreaEvent");
return;
}
switch (event.getDataMinerWorkAreaElementType()) {
case Computations:
break;
@ -191,8 +204,14 @@ public class InputDataSetsPanel extends FramedPanel {
}
private void manageSyncRefreshUploadDataSpaceEvents() {
Log.debug("InputDataSetsPanel received SyncRefreshUploadDataSpaceEvents: ");
refreshWSResourceExplorerPanel();
}
private void create(DataMinerWorkAreaEvent event) {
Log.debug("Create InputDataSetsPanel");
Log.debug("DataMinerWorkAreaEvent: " + event);
try {
if (event == null || event.getDataMinerWorkArea() == null
@ -220,9 +239,10 @@ 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() {
@Override
public void onSelectedItem(Item item) {
@ -259,37 +279,45 @@ public class InputDataSetsPanel extends FramedPanel {
dnd = new MultipleDNDUpload();
dnd.setParameters(event.getDataMinerWorkArea().getInputDataSets().getFolder().getId(), UPLOAD_TYPE.File);
dnd.addUniqueContainer(wsResourcesExplorerPanel);
WorskpaceUploadNotificationListener workspaceUploaderListener = new WorskpaceUploadNotificationListener() {
WorskpaceUploadNotificationListener workspaceUploaderListenerInputDataSetsPanel = new WorskpaceUploadNotificationListener() {
@Override
public void onUploadCompleted(String parentId, String itemId) {
Log.debug("Upload completed: [parentID: " + parentId + ", itemId: " + itemId + "]");
wsResourcesExplorerPanel.refreshRootFolderView();
forceLayout();
Log.debug("InputDataSetsPanel Upload completed: [parentID: " + parentId + ", itemId: " + itemId
+ "]");
SyncRefreshUploadDataSpaceEvent ev=new SyncRefreshUploadDataSpaceEvent();
EventBusProvider.INSTANCE.fireEvent(ev);
//wsResourcesExplorerPanel.refreshRootFolderView();
//forceLayout();
}
@Override
public void onUploadAborted(String parentId, String itemId) {
Log.debug("Upload Aborted: [parentID: " + parentId + ", itemId: " + itemId + "]");
Log.debug(
"InputDataSetsPanel Upload Aborted: [parentID: " + parentId + ", itemId: " + itemId + "]");
}
@Override
public void onError(String parentId, String itemId, Throwable throwable) {
Log.debug("Upload Error: [parentID: " + parentId + ", itemId: " + itemId + "]");
Log.debug("InputDataSetsPanel Upload Error: [parentID: " + parentId + ", itemId: " + itemId + "]");
throwable.printStackTrace();
}
@Override
public void onOverwriteCompleted(String parentId, String itemId) {
Log.debug("Upload Override Completed: [parentID: " + parentId + ", itemId: " + itemId + "]");
wsResourcesExplorerPanel.refreshRootFolderView();
forceLayout();
Log.debug("InputDataSetsPanel Upload Override Completed: [parentID: " + parentId + ", itemId: "
+ itemId + "]");
SyncRefreshUploadDataSpaceEvent ev=new SyncRefreshUploadDataSpaceEvent();
EventBusProvider.INSTANCE.fireEvent(ev);
//wsResourcesExplorerPanel.refreshRootFolderView();
//forceLayout();
}
};
dnd.addWorkspaceUploadNotificationListener(workspaceUploaderListener);
dnd.addWorkspaceUploadNotificationListener(workspaceUploaderListenerInputDataSetsPanel);
Log.debug("Create ToolBar for InputDataSetsPanel");
// ToolBar
btnDownload = new TextButton("Download");
btnDownload.setIcon(DataMinerManagerPanel.resources.download());
@ -367,7 +395,6 @@ public class InputDataSetsPanel extends FramedPanel {
private void refreshWSResourceExplorerPanel() {
if (wsResourcesExplorerPanel != null) {
try {
// wsResourcesExplorerPanel.hardRefresh();
wsResourcesExplorerPanel.refreshRootFolderView();
} catch (Exception e) {
Log.error("Error retrieving data: " + e.getLocalizedMessage());
@ -420,7 +447,6 @@ public class InputDataSetsPanel extends FramedPanel {
Log.debug("Retrieved link: " + actionUrl);
Window.open(actionUrl.toString(), selectedItem.getName(), "");
} else {
final ItemDescription itemDescription = new ItemDescription(selectedItem.getId(),
selectedItem.getName(), selectedItem.getOwner(), selectedItem.getPath(),
selectedItem.getType().name());
@ -432,7 +458,7 @@ public class InputDataSetsPanel extends FramedPanel {
if (caught instanceof SessionExpiredServiceException) {
EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent());
} else {
Log.error("Error open file: " + caught.getLocalizedMessage());
Log.error("Error open file: " + caught.getLocalizedMessage(), caught);
UtilsGXT3.alert("Error", caught.getLocalizedMessage());
}
caught.printStackTrace();
@ -453,4 +479,5 @@ public class InputDataSetsPanel extends FramedPanel {
}
}

69
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java
View File

@ -13,17 +13,17 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMiner
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.RefreshDataMinerWorkAreaEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SyncRefreshUploadDataSpaceEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.UIStateEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaElementType;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3;
import org.gcube.portlets.widgets.dataminermanagerwidget.shared.Constants;
import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException;
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;
@ -55,11 +55,12 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
*/
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;
@ -83,6 +84,7 @@ public class OutputDataSetsPanel extends FramedPanel {
setHeaderVisible(false);
setResize(true);
setAnimCollapse(false);
setCollapsible(false);
setHeadingText("Output Data Sets");
setBodyStyle("backgroundColor:white;");
}
@ -120,6 +122,17 @@ public class OutputDataSetsPanel extends FramedPanel {
});
EventBusProvider.INSTANCE.addHandler(SyncRefreshUploadDataSpaceEvent.TYPE,
new SyncRefreshUploadDataSpaceEvent.SyncRefreshUploadDataSpaceEventHandler() {
@Override
public void onRefresh(SyncRefreshUploadDataSpaceEvent event) {
manageSyncRefreshUploadDataSpaceEvents();
}
});
}
private void manageStateEvents(UIStateEvent event) {
@ -189,9 +202,17 @@ public class OutputDataSetsPanel extends FramedPanel {
}
}
private void manageSyncRefreshUploadDataSpaceEvents() {
Log.debug("OutputDataSetsPanel received SyncRefreshUploadDataSpaceEvents: ");
refreshWSResourceExplorerPanel();
}
private void create(DataMinerWorkAreaEvent event) {
Log.debug("Create OutputDataSetsPanel");
Log.debug("DataMinerWorkAreaEvent: " + event);
try {
if (event == null || event.getDataMinerWorkArea() == null
@ -218,7 +239,8 @@ 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);
@ -251,44 +273,49 @@ public class OutputDataSetsPanel extends FramedPanel {
wsResourcesExplorerPanel.ensureDebugId("wsResourceExplorerPanelForOutput");
wsResourcesExplorerPanel.setHeightToInternalScroll(300);
Log.debug("Define DND for InputDataSetsPanel");
Log.debug("Define DND for OutputDataSetsPanel");
// DND
dnd = new MultipleDNDUpload();
dnd.setParameters(event.getDataMinerWorkArea().getOutputDataSets().getFolder().getId(), UPLOAD_TYPE.File);
dnd.addUniqueContainer(wsResourcesExplorerPanel);
WorskpaceUploadNotificationListener workspaceUploaderListener = new WorskpaceUploadNotificationListener() {
WorskpaceUploadNotificationListener workspaceUploaderListenerOutputDataSetsPanel = new WorskpaceUploadNotificationListener() {
@Override
public void onUploadCompleted(String parentId, String itemId) {
Log.debug("Upload completed: [parentID: " + parentId + ", itemId: " + itemId + "]");
wsResourcesExplorerPanel.refreshRootFolderView();
forceLayout();
Log.debug("OutputDataSetsPanel Upload completed: [parentID: " + parentId + ", itemId: " + itemId + "]");
SyncRefreshUploadDataSpaceEvent ev=new SyncRefreshUploadDataSpaceEvent();
EventBusProvider.INSTANCE.fireEvent(ev);
//wsResourcesExplorerPanel.refreshRootFolderView();
//forceLayout();
}
@Override
public void onUploadAborted(String parentId, String itemId) {
Log.debug("Upload Aborted: [parentID: " + parentId + ", itemId: " + itemId + "]");
Log.debug("OutputDataSetsPanel Upload Aborted: [parentID: " + parentId + ", itemId: " + itemId + "]");
}
@Override
public void onError(String parentId, String itemId, Throwable throwable) {
Log.debug("Upload Error: [parentID: " + parentId + ", itemId: " + itemId + "]");
Log.debug("OutputDataSetsPanel Upload Error: [parentID: " + parentId + ", itemId: " + itemId + "]");
throwable.printStackTrace();
}
@Override
public void onOverwriteCompleted(String parentId, String itemId) {
Log.debug("Upload Override Completed: [parentID: " + parentId + ", itemId: " + itemId + "]");
wsResourcesExplorerPanel.refreshRootFolderView();
forceLayout();
Log.debug("OutputDataSetsPanel Upload Override Completed: [parentID: " + parentId + ", itemId: " + itemId + "]");
SyncRefreshUploadDataSpaceEvent ev=new SyncRefreshUploadDataSpaceEvent();
EventBusProvider.INSTANCE.fireEvent(ev);
//wsResourcesExplorerPanel.refreshRootFolderView();
//forceLayout();
}
};
dnd.addWorkspaceUploadNotificationListener(workspaceUploaderListener);
dnd.addWorkspaceUploadNotificationListener(workspaceUploaderListenerOutputDataSetsPanel);
Log.debug("Create ToolBar for OutputDatasetsPanel");
// ToolBar
btnDownload = new TextButton("Download");
btnDownload.setIcon(DataMinerManagerPanel.resources.download());
@ -338,6 +365,7 @@ public class OutputDataSetsPanel extends FramedPanel {
toolBar.add(btnRefresh, new BoxLayoutData(new Margins(0)));
v = new VerticalLayoutContainer();
v.setItemId("OutputDataSetsPanelVert");
v.add(toolBar, new VerticalLayoutData(1, -1, new Margins(0)));
v.add(dnd, new VerticalLayoutData(1, 1, new Margins(0)));
@ -366,8 +394,6 @@ public class OutputDataSetsPanel extends FramedPanel {
if (wsResourcesExplorerPanel != null) {
try {
wsResourcesExplorerPanel.refreshRootFolderView();
// wsResourcesExplorerPanel.hardRefresh();
} catch (Exception e) {
Log.error("Error retrieving data: " + e.getLocalizedMessage());
@ -430,7 +456,7 @@ public class OutputDataSetsPanel extends FramedPanel {
if (caught instanceof SessionExpiredServiceException) {
EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent());
} else {
Log.error("Error open file: " + caught.getLocalizedMessage());
Log.error("Error open file: " + caught.getLocalizedMessage(), caught);
UtilsGXT3.alert("Error", caught.getLocalizedMessage());
}
caught.printStackTrace();
@ -445,7 +471,6 @@ public class OutputDataSetsPanel extends FramedPanel {
});
}
} else {
UtilsGXT3.info("Attention", "Select a file!");
}

57
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/SyncRefreshUploadDataSpaceEvent.java Normal file
View File

@ -0,0 +1,57 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client.events;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.GwtEvent;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.event.shared.HasHandlers;
/**
* SyncRefreshUpload
*
*
* @author Giancarlo Panichi
*
*
*/
public class SyncRefreshUploadDataSpaceEvent
extends GwtEvent<SyncRefreshUploadDataSpaceEvent.SyncRefreshUploadDataSpaceEventHandler> {
public static Type<SyncRefreshUploadDataSpaceEventHandler> TYPE = new Type<SyncRefreshUploadDataSpaceEventHandler>();
public interface SyncRefreshUploadDataSpaceEventHandler extends EventHandler {
void onRefresh(SyncRefreshUploadDataSpaceEvent event);
}
public interface HasSyncRefreshUploadDataSpaceEventHandler extends HasHandlers {
public HandlerRegistration addSyncRefreshUploadDataSpaceEventHandler(
SyncRefreshUploadDataSpaceEventHandler handler);
}
public SyncRefreshUploadDataSpaceEvent() {
}
@Override
protected void dispatch(SyncRefreshUploadDataSpaceEventHandler handler) {
handler.onRefresh(this);
}
@Override
public Type<SyncRefreshUploadDataSpaceEventHandler> getAssociatedType() {
return TYPE;
}
public static Type<SyncRefreshUploadDataSpaceEventHandler> getType() {
return TYPE;
}
public static void fire(HasHandlers source, SyncRefreshUploadDataSpaceEvent deleteItemEvent) {
source.fireEvent(deleteItemEvent);
}
@Override
public String toString() {
return "SyncRefreshUploadDataSpaceEvent []";
}
}