From ef12c0b58514570893217bf56dd8e24bb794b87c Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 2 Jul 2018 14:11:24 +0000 Subject: [PATCH] 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@169616 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../client/parametersfield/FileFld.java | 7 +++-- .../client/parametersfield/TabItem.java | 30 +++++-------------- .../client/parametersfield/TabularFld.java | 27 +++-------------- 4 files changed, 16 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index 1b78c4b..78c6d9a 100644 --- a/pom.xml +++ b/pom.xml @@ -259,7 +259,7 @@ org.gcube.portlets.widgets workspace-uploader - [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + [1.0.0-SNAPSHOT,3.0.0-SNAPSHOT) diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java index 40f7126..f2542d0 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java @@ -158,14 +158,15 @@ public class FileFld extends AbstractFld { showableTypes.addAll(Arrays.asList(ItemType.values())); wselectDialog = new WorkspaceExplorerSelectDialog("Select File", false); - // filterCriteria, selectableTypes); WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() { @Override public void onSelectedItem(Item item) { - if (item.isFolder() || item.isRoot()) { + if (item == null || item.getType() == ItemType.FOLDER || item.getType() == ItemType.PRIVATE_FOLDER + || item.getType() == ItemType.SHARED_FOLDER || item.getType() == ItemType.VRE_FOLDER) { + UtilsGXT3.info("Attention", "Select a valid file!"); } else { @@ -283,7 +284,7 @@ public class FileFld extends AbstractFld { selectedFileItem.setPublicLink(tabularResourceData.getTabularResourceId()); showFieldWithTRSelection(); } - + private void retrieveFileInformation(final Item item) { Log.debug("Retrieved: " + item); final ItemDescription itemDescription = new ItemDescription(item.getId(), item.getName(), item.getOwner(), diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java index d0ebdc8..961509f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java @@ -219,35 +219,19 @@ public class TabItem extends HBoxLayoutContainer { List showableTypes = new ArrayList(); showableTypes.addAll(Arrays.asList(ItemType.values())); - /* - * "application/zip", "application/x-zip", - * "application/x-zip-compressed", "application/octet-stream", - * "application/x-compress", "application/x-compressed", - * "multipart/x-zip" - */ - // List allowedMimeTypes = - // Arrays.asList("text/csv","text/plain","text/plain; - // charset=ISO-8859-1"); - - /** - * "zip" - */ - - /* - * List allowedFileExtensions = Arrays.asList("csv"); - * - * FilterCriteria filterCriteria = new FilterCriteria(allowedMimeTypes, - * allowedFileExtensions, new HashMap()); - */ + wselectDialog = new WorkspaceExplorerSelectDialog("Select CSV", false); - // filterCriteria, selectableTypes); - + WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() { @Override public void onSelectedItem(Item item) { - if (item.isFolder() || item.isRoot()) { + if (item == null || item.getType() == ItemType.FOLDER + || item.getType() == ItemType.PRIVATE_FOLDER + || item.getType() == ItemType.SHARED_FOLDER + || item.getType() == ItemType.VRE_FOLDER) { + UtilsGXT3.info("Attention", "Select a valid csv!"); } else { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java index 56b888a..280b4c6 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java @@ -183,36 +183,17 @@ public class TabularFld extends AbstractFld implements HasTabularFldChangeEventH showableTypes.addAll(Arrays.asList(ItemType.values())); try { - /* - * "application/zip", "application/x-zip", - * "application/x-zip-compressed", "application/octet-stream", - * "application/x-compress", "application/x-compressed", - * "multipart/x-zip" - */ - // List allowedMimeTypes = - // Arrays.asList("text/csv","text/plain","text/plain; - // charset=ISO-8859-1"); - /** - * "zip" - */ - - /* - * List allowedFileExtensions = Arrays.asList("csv"); - * - * FilterCriteria filterCriteria = new - * FilterCriteria(allowedMimeTypes, allowedFileExtensions, new - * HashMap()); - */ wselectDialog = new WorkspaceExplorerSelectDialog("Select CSV", false); - // filterCriteria, selectableTypes); - WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() { @Override public void onSelectedItem(Item item) { - if (item.isFolder() || item.isRoot()) { + if (item == null || item.getType() == ItemType.FOLDER + || item.getType() == ItemType.PRIVATE_FOLDER + || item.getType() == ItemType.SHARED_FOLDER + || item.getType() == ItemType.VRE_FOLDER) { UtilsGXT3.info("Attention", "Select a valid csv!"); } else {