diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index 860ef46..8fc3dd9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -241,38 +241,22 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt if(folderId != null && !folderId.isEmpty()){ final Modal modal = new Modal(true, true); - // request who's doing the insert - rpcWorkspaceService.getUser(new AsyncCallback() { + + modal.setTitle("Publish Product"); + modal.addStyleName("insert-metadata-modal-style"); + modal.add(new CreateDatasetForm(folderId, eventBus)); + modal.setCloseVisible(true); + modal.show(); + + // hide any popup panel opened + modal.addHideHandler(new HideHandler() { @Override - public void onSuccess(String username) { - - if (username != null) { - modal.setTitle("Publish Product"); - modal.addStyleName("insert-metadata-modal-style"); - modal.add(new CreateDatasetForm(folderId, username, eventBus)); - modal.setCloseVisible(true); - modal.show(); - - // hide any popup panel opened - modal.addHideHandler(new HideHandler() { - - @Override - public void onHide(HideEvent hideEvent) { - eventBus.fireEvent(new CloseCreationFormEvent()); - } - }); - } - else - Window.alert("Sorry, it is not possible to publish on the catalogue at the moment."); - } - - @Override - public void onFailure(Throwable caught) { - - Window.alert("Sorry, it is not possible to publish on the catalogue at the moment."); + public void onHide(HideEvent hideEvent) { + eventBus.fireEvent(new CloseCreationFormEvent()); } }); + } } }); @@ -970,7 +954,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt dlg.setPopupPosition(Window.getClientWidth() - (FolderDownloadDialog.WIDTH + 50), Window.getClientHeight() - (FolderDownloadDialog.HEIGHT + 120)); dlg.show(); } - + else { try { new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET,ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, "id="+fileDownloadEvent.getItemIdentifier(), "_self", downloadHandlerCallback); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java index 82d5d46..5cf6d60 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java @@ -694,12 +694,6 @@ public interface GWTWorkspaceService extends RemoteService{ FileModel getItemForFileTree(String itemId) throws Exception; - /** - * Retrieve the username of the user into the session - * @return the username of the current user - */ - String getUser(); - /** * @return */ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java index cb7821d..49e69e2 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java @@ -694,14 +694,6 @@ public interface GWTWorkspaceServiceAsync { void setGcubeItemProperties(String itemId, Map properties, AsyncCallback callback); - /** - * Retrieve the username of the user into the session. - * - * @param callback the callback - * @return the username of the current user - */ - void getUser(AsyncCallback callback); - /** * Gets the my first name. * diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 8ec47cd..0785dec 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -42,7 +42,6 @@ import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem; import org.gcube.common.homelibrary.home.workspace.search.SearchItem; import org.gcube.common.homelibrary.home.workspace.trash.WorkspaceTrashFolder; import org.gcube.common.homelibrary.home.workspace.trash.WorkspaceTrashItem; -import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.datacatalogue.ckanutillibrary.ApplicationProfileScopePerUrlReader; import org.gcube.datacatalogue.ckanutillibrary.CKanUtils; @@ -66,7 +65,6 @@ import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceItem; import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.WorkspaceHandledException; import org.gcube.portlets.user.workspace.server.notifications.NotificationsProducer; import org.gcube.portlets.user.workspace.server.notifications.NotificationsUtil; -import org.gcube.portlets.user.workspace.server.property.PortalUrlGroupGatewayProperty; import org.gcube.portlets.user.workspace.server.reader.ApplicationProfile; import org.gcube.portlets.user.workspace.server.reader.ApplicationProfileReader; import org.gcube.portlets.user.workspace.server.resolver.UriResolverReaderParameterForResolverIndex; @@ -3540,16 +3538,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT return role; } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#getUser() - */ - @Override - public String getUser() { - ASLSession session = WsUtil.getAslSession(this.getThreadLocalRequest().getSession()); - return session.getUsername(); - } - - /* (non-Javadoc) * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#markFolderAsPublicForFolderItemId(java.lang.String, boolean) */