gCubeSystem
/
workspace-tree-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to handler data publishing 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@129475 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2016-06-27 14:27:48 +00:00
parent 6a022fa18c
commit 99166e43d8
10 changed files with 393 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
View File

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WS_UPLOAD_TYPE;
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation;
import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEvent;
@ -60,6 +59,8 @@ import org.gcube.portlets.user.workspace.client.event.OpenUrlEvent;
import org.gcube.portlets.user.workspace.client.event.OpenUrlEventHandler;
import org.gcube.portlets.user.workspace.client.event.PasteItemEvent;
import org.gcube.portlets.user.workspace.client.event.PasteItemEventHandler;
import org.gcube.portlets.user.workspace.client.event.PublishOnDataCatalogueEvent;
import org.gcube.portlets.user.workspace.client.event.PublishOnDataCatalogueEventHandler;
import org.gcube.portlets.user.workspace.client.event.RefreshFolderEvent;
import org.gcube.portlets.user.workspace.client.event.RefreshItemEventHandler;
import org.gcube.portlets.user.workspace.client.event.RenameItemEvent;
@ -133,6 +134,7 @@ import org.gcube.portlets.user.workspace.shared.ReportAssignmentACL;
import org.gcube.portlets.user.workspace.shared.SessionExpiredException;
import org.gcube.portlets.user.workspace.shared.UserBean;
import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField;
import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.CreateDatasetForm;
import org.gcube.portlets.widgets.workspacesharingwidget.client.ConstantsSharing.LOAD_CONTACTS_AS;
import org.gcube.portlets.widgets.workspacesharingwidget.client.MultiDragConstants;
import org.gcube.portlets.widgets.workspacesharingwidget.client.MultiDragContactsEditPermissions;
@ -150,11 +152,13 @@ import com.extjs.gxt.ui.client.event.MessageBoxEvent;
import com.extjs.gxt.ui.client.widget.Dialog;
import com.extjs.gxt.ui.client.widget.Info;
import com.extjs.gxt.ui.client.widget.MessageBox;
import com.github.gwtbootstrap.client.ui.Modal;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HasWidgets;
@ -176,6 +180,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
// private FileUploader fileUploader;
public static String myLogin;
public static String myLoginFirstName;
public static boolean ckanEditorOrAdmin;
//PRE-LOAD LIST OF USER FORM LIFERAY
private UserStore userStore = new UserStore();
@ -225,6 +230,44 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
*/
private void bind() {
eventBus.addHandler(PublishOnDataCatalogueEvent.TYPE, new PublishOnDataCatalogueEventHandler() {
@Override
public void onPublish(PublishOnDataCatalogueEvent publishEvent) {
// get the folder id
final String folderId = publishEvent.getFolderId();
if(folderId != null && !folderId.isEmpty()){
final Modal modal = new Modal(true, true);
// request who's doing the insert
rpcWorkspaceService.getUser(new AsyncCallback<String>() {
@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));
modal.setCloseVisible(true);
modal.show();
}
else
Window.alert("Please, logout and login again then retry.");
}
@Override
public void onFailure(Throwable caught) {
Window.alert("Please, logout and login again then retry.");
}
});
}
}
});
eventBus.addHandler(UpdateWorkspaceSizeEvent.TYPE, new UpdateWorkspaceSizeEventHandler() {
@Override
@ -2234,6 +2277,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
GWT.log("My login is: "+user.getUsername());
myLogin = user.getUsername();
myLoginFirstName = user.getFirstName();
ckanEditorOrAdmin = user.hasCataloguePermission();
}
});
}

1
src/main/java/org/gcube/portlets/user/workspace/client/ConstantsExplorer.java
View File

@ -32,6 +32,7 @@ public class ConstantsExplorer {
public static final String MESSAGE_ADD_SMART_FOLDER = "New Smart Folder";
public static final String MESSAGE_ADD_FOLDER = "New Folder";
public static final String MESSAGE_ADD_SHARED_FOLDER = "New Shared Folder";
public static final String MESSAGE_DATA_CATALOGUE_PUBLISH = "Publish on Catalogue";
public static final String MESSAGE_ADD = "Add";
public static final String MESSAGE_ADD_FOLDER_IN = "Create a new folder in: ";
public static final String MESSAGE_ITEM_NAME = "Item Name";

1
src/main/java/org/gcube/portlets/user/workspace/client/constant/WorkspaceOperation.java
View File

@ -10,6 +10,7 @@ public enum WorkspaceOperation {
PREVIEW("PRW", "PRW"),
RENAME("RNM", "RNM"),
INSERT_SHARED_FOLDER("ISHF", "ASHF"), // Insert shared Folder
PUBLISH_ON_DATA_CATALOGUE("PODC", "PODC"),
SHARE("SHR", "SHR"), // SHARE
UNSHARE("USHR", "USHR"), // UNSHARE
UPLOAD_ARCHIVE("UPA", "UPA"), // Upload Archive

46
src/main/java/org/gcube/portlets/user/workspace/client/event/PublishOnDataCatalogueEvent.java Normal file
View File

@ -0,0 +1,46 @@
package org.gcube.portlets.user.workspace.client.event;
import com.google.gwt.event.shared.GwtEvent;
/**
* The Class PublishOnDataCatalogueEvent
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
*/
public class PublishOnDataCatalogueEvent extends GwtEvent<PublishOnDataCatalogueEventHandler> {
public static Type<PublishOnDataCatalogueEventHandler> TYPE = new Type<PublishOnDataCatalogueEventHandler>();
private String folderId;
/**
* Instantiates a new insert metadata event.
*/
public PublishOnDataCatalogueEvent(String folderId) {
this.folderId = folderId;
}
/**
* @return the folderId
*/
public String getFolderId() {
return folderId;
}
/* (non-Javadoc)
* @see com.google.gwt.event.shared.GwtEvent#getAssociatedType()
*/
@Override
public Type<PublishOnDataCatalogueEventHandler> getAssociatedType() {
return TYPE;
}
/* (non-Javadoc)
* @see com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.EventHandler)
*/
@Override
protected void dispatch(PublishOnDataCatalogueEventHandler handler) {
handler.onPublish(this);
}
}

18
src/main/java/org/gcube/portlets/user/workspace/client/event/PublishOnDataCatalogueEventHandler.java Normal file
View File

@ -0,0 +1,18 @@
package org.gcube.portlets.user.workspace.client.event;
import com.google.gwt.event.shared.EventHandler;
/**
* The Interface PublishOnDataCatalogueEventHandler
* @author Costantino Perciante at ISTI-CNR
* (costantino.perciante@isti.cnr.it)
*/
public interface PublishOnDataCatalogueEventHandler extends EventHandler {
/**
* On insert metadata.
*
* @param loadSelecteReleaseEvent the load selecte release event
*/
void onPublish(PublishOnDataCatalogueEvent loadSelecteReleaseEvent);
}

5
src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
View File

@ -701,4 +701,9 @@ public interface GWTWorkspaceService extends RemoteService{
*/
boolean hasUserRoleAdminOrEditor();
/**
* Retrieve the username of the user into the session
* @return the username of the current user
*/
String getUser();
}

6
src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java
View File

@ -690,4 +690,10 @@ public interface GWTWorkspaceServiceAsync {
*/
void hasUserRoleAdminOrEditor(AsyncCallback<Boolean> callback);
/**
* Retrieve the username of the user into the session
* @return the username of the current user
*/
void getUser(AsyncCallback<String> callback);
}

24
src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
View File

@ -26,6 +26,7 @@ import org.gcube.portlets.user.workspace.client.event.ImagePreviewEvent;
import org.gcube.portlets.user.workspace.client.event.OpenReportsEvent;
import org.gcube.portlets.user.workspace.client.event.OpenUrlEvent;
import org.gcube.portlets.user.workspace.client.event.PasteItemEvent;
import org.gcube.portlets.user.workspace.client.event.PublishOnDataCatalogueEvent;
import org.gcube.portlets.user.workspace.client.event.RefreshFolderEvent;
import org.gcube.portlets.user.workspace.client.event.RenameItemEvent;
import org.gcube.portlets.user.workspace.client.event.SendMessageEvent;
@ -305,6 +306,26 @@ public class ContextMenuTree {
});
contextMenu.add(createShareFolder);
// publish on data catalogue
MenuItem publishOnDataCatalogue = new MenuItem();
publishOnDataCatalogue.setId(WorkspaceOperation.PUBLISH_ON_DATA_CATALOGUE.getId());
publishOnDataCatalogue.setText(ConstantsExplorer.MESSAGE_DATA_CATALOGUE_PUBLISH);
publishOnDataCatalogue.setIcon(Resources.getIconPublicLink()); // TODO change icon
publishOnDataCatalogue.addSelectionListener(new SelectionListener<MenuEvent>() {
public void componentSelected(MenuEvent ce) {
FileModel sourceFileModel = listSelectedItems.get(0);
String folderId = sourceFileModel.getIdentifier();
if (sourceFileModel != null) {
eventBus.fireEvent(new PublishOnDataCatalogueEvent(folderId));
}
}
});
publishOnDataCatalogue.setVisible(false);
contextMenu.add(publishOnDataCatalogue);
MenuItem editPermissions = new MenuItem();
editPermissions.setId(WorkspaceOperation.EDIT_PERMISSIONS.getId());
@ -824,6 +845,9 @@ public class ContextMenuTree {
//CASE DIRECTORY
if(selectedItem.isDirectory()){
if(AppControllerExplorer.ckanEditorOrAdmin)
contextMenu.getItemByItemId(WorkspaceOperation.PUBLISH_ON_DATA_CATALOGUE.getId()).setVisible(true);
contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(true); //SHARE
contextMenu.getItemByItemId(WorkspaceOperation.SHOW.getId()).setVisible(false); //show
contextMenu.getItemByItemId(WorkspaceOperation.REFRESH_FOLDER.getId()).setVisible(true); //refresh

98
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -118,18 +118,28 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
// ckan utils methods
private CKanUtilsImpl instance;
private Object LOCK = new Object();
@Override
public void init(){
/**
* Retrieve the ckan utils object
* @return
*/
private CKanUtilsImpl getCkanUtils(){
// retrieve ckan information
if(instance == null){
synchronized (LOCK) {
if(instance == null){
try{
String currentScope = ScopeProvider.instance.get();
String currentScope = WsUtil.getAslSession(this.getThreadLocalRequest().getSession()).getScope();
instance = new CKanUtilsImpl(currentScope);
}catch(Exception e){
workspaceLogger.error("Unable to retrieve ckan information");
}
}
}
}
return instance;
}
/**
* Gets the GWT workspace builder.
@ -2685,7 +2695,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
String email = username+"@isti.cnr.it";
String firstName = "Testing";
String lastName = "User";
boolean catalogueEditor = false;
if (isWithinPortal() && username.compareTo(WsUtil.TEST_USER) != 0) {
try {
@ -2694,6 +2704,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
firstName = user.getFirstName();
lastName = user.getLastName();
email = user.getEmail();
// check if he has catalogue role
catalogueEditor = hasUserRoleAdminOrEditor();
}catch (UserManagementSystemException e) {
workspaceLogger.error("UserManagementSystemException for username: "+username);
}
@ -2702,7 +2715,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
}
}
return new UserBean(username, firstName, lastName, email);
return new UserBean(username, firstName, lastName, email, catalogueEditor);
}
/**
@ -3421,30 +3434,29 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
ASLSession asl = WsUtil.getAslSession(this.getThreadLocalRequest().getSession());
String username = asl.getUsername();
// check if this information was already into the ASL Session
String role = (String)asl.getAttribute(CKAN_ROLE);
if(role != null)
switch(role){
case "editor" :
case "admin" : return true;
default: return false; // member
}
try{
if(!isWithinPortal()){
workspaceLogger.warn("OUT FROM PORTAL DETECTED RETURNING TRUE");
asl.setAttribute(CKAN_ROLE, "editor");
return true;
}
// check if this information was already into the ASL Session (true means the user has at least in one org
// the role editor/admin), false that he is just a member so he cannot publish
Boolean role = (Boolean)asl.getAttribute(CKAN_ROLE);
// if the attribute was already set..
if(role != null)
return role;
else{
try{
// first of all, check if the user is a sysadmin in the catalog (in this case he can do everything)
boolean isSysAdmin = instance.isSysAdmin(username, getUserCKanTokenFromSession());
boolean isSysAdmin = getCkanUtils().isSysAdmin(username, getUserCKanTokenFromSession());
if(isSysAdmin){
workspaceLogger.debug("The user is a sysadmin of the catalog -> he can edit/add");
asl.setAttribute(CKAN_ROLE, "admin");
asl.setAttribute(CKAN_ROLE, true);
return true;
}else{
@ -3454,8 +3466,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
RoleManager roleManager = new LiferayRoleManager();
GroupManager groupManager = new LiferayGroupManager();
// we need to iterate over vres
List<GCubeGroup> groups = groupManager.listGroups();
// we need to iterate over vres of the user
List<GCubeGroup> groups = groupManager.listGroupsByUser(userManager.getUserId(username));
workspaceLogger.debug("The list of organizations of the user " + username + " is " + groups);
boolean toReturn = false;
for (GCubeGroup gCubeGroup : groups) {
@ -3469,41 +3485,37 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
// the default one
RolesIntoOrganization correspondentRoleToCheck = RolesIntoOrganization.MEMBER;
String roleToSetInSession = null;
// NOTE: it is supposed that there is just one role for this person correspondent to the one in the catalog
for (GCubeRole gCubeRole : roles) {
workspaceLogger.debug("User " + username + " has role " + gCubeRole.getRoleName() + " in " + groupName);
if(gCubeRole.getRoleName().equalsIgnoreCase(CkanRolesIntoLiferay.CATALOG_ADMIN.toString())){
if(gCubeRole.getRoleName().equalsIgnoreCase(CkanRolesIntoLiferay.CATALOG_ADMIN)){
correspondentRoleToCheck = RolesIntoOrganization.ADMIN;
roleToSetInSession = "admin";
toReturn = true;
break;
}else if(gCubeRole.getRoleName().equalsIgnoreCase(CkanRolesIntoLiferay.CATALOG_EDITOR.toString())){
}else if(gCubeRole.getRoleName().equalsIgnoreCase(CkanRolesIntoLiferay.CATALOG_EDITOR)){
correspondentRoleToCheck = RolesIntoOrganization.EDITOR;
roleToSetInSession = "editor";
toReturn = true;
break;
}
}
// if the role is member, keep continuing
// if the role is member, continue
if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER))
continue;
// with this invocation, we check if the role is present in ckan and if it is not it will be added
boolean res = instance.checkRole(username, groupName, correspondentRoleToCheck);
// set the role in the asl session
if(res){
toReturn &= getCkanUtils().checkRole(username, groupName, correspondentRoleToCheck);
}
return res;
// set true in the asl session
workspaceLogger.debug("Setting CKAN_ROLE for " + username + " to " + toReturn);
asl.setAttribute(CKAN_ROLE, toReturn);
return toReturn;
}
}
}catch(Exception e){
workspaceLogger.error("Unable to retrieve the role information for this user. Returning FALSE", e);
}
@ -3511,11 +3523,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
workspaceLogger.debug("Unable to check the role into ckan organization, returning FALSE");
// set the role member into the asl
asl.setAttribute(CKAN_ROLE, "member");
asl.setAttribute(CKAN_ROLE, false);
// return false
return false;
}
}
/**
* Get current user's token.
@ -3534,7 +3547,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
token = (String)this.getThreadLocalRequest().getSession().getAttribute(CKAN_TOKEN_KEY);
else{
token = instance.getApiKeyFromUsername(username);
token = getCkanUtils().getApiKeyFromUsername(username);
this.getThreadLocalRequest().getSession().setAttribute(CKAN_TOKEN_KEY, token);
workspaceLogger.debug("Ckan token has been set for user " + username);
}
@ -3543,4 +3556,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
return token;
}
@Override
public String getUser() {
HttpSession httpSession = this.getThreadLocalRequest().getSession();
ASLSession session = WsUtil.getAslSession(httpSession);
return session.getUsername();
}
}

23
src/main/java/org/gcube/portlets/user/workspace/shared/UserBean.java
View File

@ -8,13 +8,12 @@ public class UserBean implements Serializable {
private String firstName;
private String lastName;
private String email;
private boolean cataloguePermission;
public UserBean(String username, String firstName, String lastName,
String email) {
String email, boolean cataloguePermission) {
super();
this.cataloguePermission = cataloguePermission;
this.username = username;
this.firstName = firstName;
this.lastName = lastName;
@ -46,7 +45,17 @@ public class UserBean implements Serializable {
public void setEmail(String email) {
this.email = email;
}
public boolean hasCataloguePermission() {
return cataloguePermission;
}
public void setCataloguePermission(boolean cataloguePermission) {
this.cataloguePermission = cataloguePermission;
}
@Override
public String toString() {
return "UserBean [username=" + username + ", firstName=" + firstName
+ ", lastName=" + lastName + ", email=" + email
+ ", cataloguePermission=" + cataloguePermission + "]";
}
}