From bd622a42f069ea1083d22313fd39ba455bbb737b Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 19 Jul 2017 12:59:05 +0000 Subject: [PATCH] bug fixing: on select for Workspace Explorer Paginated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@151159 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../WorkspaceResourcesExplorerPanel.java | 5 ++-- ...kspaceResourcesExplorerPanelPaginated.java | 24 ++++++++++--------- .../client/view/WorkspaceExplorer.java | 1 + .../view/WorkspaceExplorerPaginated.java | 2 -- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java index 0c2f957..798671f 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java @@ -188,6 +188,7 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor * @throws Exception the exception */ protected void initExplorer(String folderId, String folderName, ItemType[] selectableTypes, ItemType[] showableTypes, List showProperties, FilterCriteria filter, boolean showGcubeInfo, DISPLAY_FIELD sortByColumn) throws Exception{ + GWT.log("Using base init"); setParameters(folderId, folderName, showProperties, filter); bindEvents(); wsExplorer = new WorkspaceExplorer(eventBus, filter, showableTypes, selectableTypes, showProperties, showGcubeInfo, sortByColumn, new DISPLAY_FIELD[]{DISPLAY_FIELD.ICON, DISPLAY_FIELD.NAME,DISPLAY_FIELD.CREATION_DATE}); @@ -431,8 +432,8 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor * @return true, if successful */ public boolean itemIsSelectable(Item item){ - GWT.log("Selectable type: "+wsExplorer.getSelectableTypes()); - GWT.log("item: "+item); + //GWT.log("Selectable type: "+wsExplorer.getSelectableTypes()); + //GWT.log("item: "+item); if (item!=null){ boolean selectable = wsExplorer.getSelectableTypes().contains(item.getType()); return selectable?true:false; diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java index 8e677f3..eb2a1ac 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java @@ -29,7 +29,7 @@ import com.google.gwt.user.client.ui.DockPanel; */ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResourcesExplorerPanel { - protected WorkspaceExplorerPaginated wsExplorer; + protected WorkspaceExplorerPaginated wsExplorerPaginated; /** @@ -101,13 +101,16 @@ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResources */ @Override protected void initExplorer(String folderId, String folderName, ItemType[] selectableTypes, ItemType[] showableTypes, List showProperties, FilterCriteria filter, boolean showGcubeInfo, DISPLAY_FIELD sortByColumn) throws Exception{ + GWT.log("Using paginated init"); setParameters(folderId, folderName, showProperties, filter); bindEvents(); - wsExplorer = new WorkspaceExplorerPaginated(eventBus, filter, showableTypes, selectableTypes, showProperties, showGcubeInfo, sortByColumn, new DISPLAY_FIELD[]{DISPLAY_FIELD.ICON, DISPLAY_FIELD.NAME, DISPLAY_FIELD.CREATION_DATE}); - wsExplorer.initPagination(ITEMS_PER_PAGE); + wsExplorerPaginated = new WorkspaceExplorerPaginated(eventBus, filter, showableTypes, selectableTypes, showProperties, showGcubeInfo, sortByColumn, new DISPLAY_FIELD[]{DISPLAY_FIELD.ICON, DISPLAY_FIELD.NAME, DISPLAY_FIELD.CREATION_DATE}); + wsExplorerPaginated.initPagination(ITEMS_PER_PAGE); + //wsExplorer.initTable(dataProvider); Item item = new Item(folderId, folderName, true); - wsExplorer.loadFolder(item, true, ITEM_START_INDEX, ITEMS_PER_PAGE, true); + wsExplorerPaginated.loadFolder(item, true, ITEM_START_INDEX, ITEMS_PER_PAGE, true); initPanel(""); + super.wsExplorer = wsExplorerPaginated; } @@ -115,7 +118,7 @@ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResources * Purge cache. It performs cache purge. */ public void purgeCache(){ - wsExplorer.purgeCache(); + wsExplorerPaginated.purgeCache(); } /** @@ -124,7 +127,7 @@ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResources * @throws Exception the exception */ public void hardRefresh() throws Exception{ - wsExplorer.purgeCache(); + wsExplorerPaginated.purgeCache(); super.refreshRootFolderView(); } @@ -139,7 +142,7 @@ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResources setTitle(super.captionTxt); add(breadcrumbs, DockPanel.NORTH); setCellHeight(breadcrumbs, offsetBreadcrumb+"px"); - centerScrollable.add(wsExplorer.getPagerPanel()); + centerScrollable.add(wsExplorerPaginated.getPagerPanel()); add(centerScrollable, DockPanel.CENTER); } @@ -153,15 +156,14 @@ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResources @Override public void onClick(final ClickItemEvent clickItemEvent) { isSelect = false; - Item item = wsExplorer.getItemSelected(); - + Item item = wsExplorerPaginated.getItemSelected(); //Return if item is not selectable if(!itemIsSelectable(item)){ notifyNotValidSelection(); return; } - notifySelectedItem(wsExplorer.getItemSelected()); + notifySelectedItem(wsExplorerPaginated.getItemSelected()); isSelect = true; } }); @@ -177,7 +179,7 @@ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResources Item item = (Item) loadFolderEvent.getTargetItem(); if(item.isFolder()){ try { - wsExplorer.loadFolder(item, true, ITEM_START_INDEX, ITEMS_PER_PAGE, true); + wsExplorerPaginated.loadFolder(item, true, ITEM_START_INDEX, ITEMS_PER_PAGE, true); loadParentBreadcrumbByItemId(item.getId(), true); clearMoreInfo(); } catch (Exception e) { diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java index a2c7394..5988116 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java @@ -84,6 +84,7 @@ public class WorkspaceExplorer implements ShowableTypes, SelectableTypes, Folder this.sortByColumn = sortByColumn; this.displayProperties = displayProperties; this.explorerPanel = new ScrollPanel(); + GWT.log("Base constructor "+WorkspaceExplorer.class.getSimpleName() + " "+ selectableTypes); setShowableTypes(showableTypes); setSelectableTypes(selectableTypes); } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java index fbb1d38..9a8d16a 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java @@ -384,8 +384,6 @@ public class WorkspaceExplorerPaginated extends WorkspaceExplorer{ } - - /** * Purge cache. */