diff --git a/distro/README b/distro/README index d5c0995..1e5bceb 100644 --- a/distro/README +++ b/distro/README @@ -15,7 +15,7 @@ Author Version and Release Date ------------------------ -v. 6.6.6 +v. 6.6.7 Description diff --git a/distro/changelog.xml b/distro/changelog.xml index 704b4bd..835eb8f 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,9 @@ + + Support Ticket ##813 Broken Breadcrumb for long path + + #2798 Sharing Panel usability improved diff --git a/pom.xml b/pom.xml index 475a559..1c7424c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.portlets.user workspace-tree-widget - 6.6.6-SNAPSHOT + 6.6.7-SNAPSHOT gCube Workspace Tree Widget gCube Workspace Tree Widget. diff --git a/src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java b/src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java new file mode 100644 index 0000000..7d78de2 --- /dev/null +++ b/src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java @@ -0,0 +1,125 @@ +/** + * + */ +package org.gcube.portlets.user.workspace; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; +import org.gcube.common.homelibrary.home.HomeLibrary; +import org.gcube.common.homelibrary.home.workspace.Workspace; +import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType; +import org.gcube.common.homelibrary.home.workspace.search.SearchItem; +import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.common.scope.impl.ScopeBean; +import org.gcube.portlets.user.workspace.client.interfaces.GXTCategoryItemInterface; +import org.gcube.portlets.user.workspace.client.model.FileGridModel; +import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; + +/** + * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @Jul 3, 2013 + * + */ +public class SmartFolderTest { + + + protected static Logger logger = Logger.getLogger(SmartFolderTest.class); + +// public static String DEFAULT_SCOPE = "/d4science.research-infrastructures.eu/gCubeApps/EcologicalModelling"; //PRODUCTION + public static String DEFAULT_SCOPE = "/gcube/devsec"; //DEV + + private static Workspace workspace; + + public static void main(String[] args) { + + try { + + ScopeBean scope = new ScopeBean(DEFAULT_SCOPE); + ScopeProvider.instance.set(scope.toString()); + + System.out.println("instancing workspace"); + workspace = HomeLibrary + .getHomeManagerFactory() + .getHomeManager() + .getHome("francesco.mangiacrapa") + .getWorkspace(); + // + System.out.println("start"); + List smarts = getSmartFolderResultsByCategory(GXTCategoryItemInterface.SMF_IMAGES); + + for (FileGridModel fileGridModel : smarts) { + System.out.println(fileGridModel.toString()); + } + System.out.println("end"); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static List getSmartFolderResultsByCategory(String category) throws Exception { + + try { + + + GWTWorkspaceBuilder builder = new GWTWorkspaceBuilder(); + + List listWorkspaceItems = new ArrayList(); + + //Category IMAGES + if(category.equals(GXTCategoryItemInterface.SMF_IMAGES.toString())){ + + listWorkspaceItems = workspace.getFolderItems(FolderItemType.IMAGE_DOCUMENT, FolderItemType.EXTERNAL_IMAGE); + + //Category BIODIVERSITY + }else if(category.equals(GXTCategoryItemInterface.SMF_BIODIVERSITY.toString())){ + + listWorkspaceItems = workspace.getFolderItems(FolderItemType.AQUAMAPS_ITEM); + + //Category DOCUMENTS + }else if(category.equals(GXTCategoryItemInterface.SMF_DOCUMENTS.toString())){ + + listWorkspaceItems = workspace.getFolderItems( + FolderItemType.EXTERNAL_FILE, + FolderItemType.EXTERNAL_PDF_FILE, + FolderItemType.QUERY, + FolderItemType.PDF_DOCUMENT, + FolderItemType.METADATA, + FolderItemType.WORKFLOW_REPORT, + FolderItemType.WORKFLOW_TEMPLATE, +// FolderItemType.URL_DOCUMENT, + FolderItemType.DOCUMENT + ); + + //Category LINKS + }else if(category.equals(GXTCategoryItemInterface.SMF_LINKS.toString())){ + + listWorkspaceItems = workspace.getFolderItems(FolderItemType.EXTERNAL_URL, FolderItemType.URL_DOCUMENT, FolderItemType.EXTERNAL_RESOURCE_LINK); + + //Category REPORTS + }else if(category.equals(GXTCategoryItemInterface.SMF_REPORTS.toString())){ + + listWorkspaceItems = workspace.getFolderItems(FolderItemType.REPORT_TEMPLATE, FolderItemType.REPORT); + + //Category TIME SERIES + }else if(category.equals(GXTCategoryItemInterface.SMF_TIMESERIES.toString())){ + + listWorkspaceItems = workspace.getFolderItems(FolderItemType.TIME_SERIES); + } + else + new Exception("Smart folder category unknown"); + + + return builder.filterListFileGridModelItemByCategory(listWorkspaceItems, category); + + + } catch (Exception e) { + System.out.println("Error in server get smart folder by category"); + e.printStackTrace(); + throw new Exception(e.getMessage()); + } + + } + +}