diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2da6bf2..8a839ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,16 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [v2.2.2-SNAPSHOT] - 2024-05-14
+
+**Bug fixes**
+
+- Incident Catalogue edit is leading to duplicate fields [#27455]
+
+**Enhancement**
+
+- The Catalogue should read the (Liferay) Highest Role in the VRE (i.e. the Organization) [#27467]
+
## [v2.2.1] - 2024-03-19
**Enhancement**
diff --git a/pom.xml b/pom.xml
index 05e8b5d..79ce3f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.portlets.widgets
ckan-metadata-publisher-widget
- 2.2.1
+ 2.2.2-SNAPSHOT
gCube Ckan metadata publisher widget
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java
index 29a1128..c3854fd 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java
@@ -9,6 +9,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.stream.Collectors;
import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanMetadataPublisher;
import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanPublisherServiceAsync;
@@ -566,6 +567,8 @@ public class UpdateDatasetForm extends Composite {
public void onSuccess(
final MetadataProfileBeanForUpdate metadataProfileForUpdate) {
setAlertBlock("", null, AlertType.ERROR, false);
+
+ GWT.log("MetadataProfileBeanForUpdate: "+metadataProfileForUpdate);
List profiles = metadataProfileForUpdate
.getListProfileBean();
@@ -817,6 +820,7 @@ public class UpdateDatasetForm extends Composite {
GWT.log("There are " + categories.size() + " categories for profile " + bean.getTitle());
+ //Adding fields without categories
if (categories == null || categories.isEmpty()) {
for (MetadataFieldWrapper field : fields) {
@@ -830,12 +834,41 @@ public class UpdateDatasetForm extends Composite {
}
}
} else {
+
+ // create the categories, then parse the fields. Fields do not belonging to a
+ // category are put at the end
+
+ //Collecting and showing the fields for categories
+ for (CategoryWrapper categoryWrapper : categories) {
+
+ List fieldsForThisCategory = fields.stream().filter(f -> f.getOwnerCategory().getId()==categoryWrapper.getId()).collect(Collectors.toList());
+
+ CategoryPanel cp = new CategoryPanel(categoryWrapper.getTitle(),
+ categoryWrapper.getDescription());
+ fields.removeAll(fieldsForThisCategory);
+
+ for (MetadataFieldWrapper metadataFieldWrapper : fieldsForThisCategory) {
+
+ MetaDataField fieldWidget;
+ try {
+ fieldWidget = new MetaDataField(metadataFieldWrapper, eventBusPublisherWidget,
+ operation);
+ cp.addField(fieldWidget);
+ listOfMetadataFields.add(fieldWidget);
+ } catch (Exception e) {
+ GWT.log("Unable to build such widget", e);
+ }
+ }
+ metadataFieldsPanel.add(cp);
+ }
+
// create the categories, then parse the fields. Fields do not belonging to a
// category are put at the end
- for (CategoryWrapper categoryWrapper : categories) {
+ /*for (CategoryWrapper categoryWrapper : categories) {
if (categoryWrapper.getFieldsForThisCategory() != null
&& categoryWrapper.getFieldsForThisCategory().size() > 0) {
+
CategoryPanel cp = new CategoryPanel(categoryWrapper.getTitle(),
categoryWrapper.getDescription());
List fieldsForThisCategory = categoryWrapper
@@ -856,7 +889,7 @@ public class UpdateDatasetForm extends Composite {
}
metadataFieldsPanel.add(cp);
}
- }
+ }*/
// add the remaining one at the end of the categories
CategoryPanel extrasCategory = new CategoryPanel("Other", null);
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
index 9eb5e71..15662f8 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
@@ -29,6 +29,7 @@ import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense;
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
+import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanPair;
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource;
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanTag;
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
@@ -485,9 +486,12 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
}
bean.setResources(list);
}
-
+
+ logger.debug("extras are #: "+dataset.getExtras().size());
// Settings the dataset type
Map> extras = dataset.getListExtrasAsHashMap();
+ printExtras(dataset);
+
if (extras != null) {
List theDatasetType = extras.get(SYS_TYPE);
if (theDatasetType != null && theDatasetType.size() > 0) {
@@ -499,6 +503,18 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
logger.info("Returning the bean for dataset title {} and type {}" + bean.getTitle(), bean.getChosenType());
return bean;
}
+
+ private void printExtras(CkanDataset dataset) {
+ if(logger.isDebugEnabled()) {
+ logger.trace("extras are: "+dataset.getExtras());
+ if (dataset.getExtras() != null) {
+ int i = 0;
+ for (CkanPair cp : dataset.getExtras()) {
+ logger.debug(++i+") key:" + cp.getKey() + ", value: "+cp.getValue());
+ }
+ }
+ }
+ }
/**
* Discover from the IS the vocabulary of tags for this scope, if present.
@@ -1277,7 +1293,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
String scopePerCurrentUrl = GenericUtils.getScopeFromClientUrl(getThreadLocalRequest());
if (!isWithinPortal()) {
- role = RolesCkanGroupOrOrg.EDITOR;
+ role = RolesCkanGroupOrOrg.ADMIN;
logger.warn("OUT FROM PORTAL SETTING HARD-CODED ROLE " + role);
} else {
String keyPerScopeRole = CatalogueUtilMethods
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java
index c94c7f0..ff63895 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java
@@ -2,6 +2,7 @@ package org.gcube.portlets.widgets.ckandatapublisherwidget.server.utils;
import java.util.HashSet;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import org.gcube.datacatalogue.utillibrary.server.DataCatalogue;
@@ -23,17 +24,18 @@ import org.gcube.vomanagement.usermanagement.model.GatewayRolesNames;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-
/**
* Facilities to check roles into the catalogue.
*/
public class CatalogueRoleManager {
-
+
private static final Logger logger = LoggerFactory.getLogger(CatalogueRoleManager.class);
/**
- * Retrieve the highest ckan role the user has and also retrieve the list of organizations (scopes) in which the user has the ckan-admin or ckan-editor role
+ * Retrieve the highest ckan role the user has and also retrieve the list of
+ * organizations (scopes) in which the user has the ckan-admin or ckan-editor
+ * role
+ *
* @param currentScope
* @param username
* @param groupName
@@ -41,12 +43,14 @@ public class CatalogueRoleManager {
* @param orgsInWhichAtLeastEditorRole
* @return the highest among the roles
*/
- public static RolesCkanGroupOrOrg getHighestRole(String currentScope, String username, String groupName, CKANPublisherServicesImpl gcubeCkanDataCatalogServiceImpl, List orgsInWhichAtLeastEditorRole, String gatewayHostname){
+ public static RolesCkanGroupOrOrg getHighestRole(String currentScope, String username, String groupName,
+ CKANPublisherServicesImpl gcubeCkanDataCatalogServiceImpl,
+ List orgsInWhichAtLeastEditorRole, String gatewayHostname) {
// base role as default value
RolesCkanGroupOrOrg toReturn = RolesCkanGroupOrOrg.MEMBER;
- try{
+ try {
UserManager userManager = new LiferayUserManager();
RoleManager roleManager = new LiferayRoleManager();
@@ -58,80 +62,89 @@ public class CatalogueRoleManager {
// retrieve current group id
long currentGroupId = groupManager.getGroupIdFromInfrastructureScope(currentScope);
- logger.debug("Group id is " + currentGroupId + " and scope is " + currentScope + "and gateway is "+gatewayHostname);
-
+ logger.debug("Group id is " + currentGroupId + " and scope is " + currentScope + "and gateway is "
+ + gatewayHostname);
+
Set groups;
- //Updated by Francesco see Task #12480
- if(gatewayHostname!=null && !gatewayHostname.isEmpty()) {
+ // Updated by Francesco see Task #12480
+ if (gatewayHostname != null && !gatewayHostname.isEmpty()) {
// retrieve the list of organizations for the current user filtered for gateway
groups = groupManager.listGroupsByUserAndSite(userid, gatewayHostname);
for (GCubeGroup gCubeGroup : groups) {
- logger.info("Found group (alias VRE) belonging to "+gatewayHostname+": "+gCubeGroup.getGroupName());
+ logger.info("Found group (alias VRE) belonging to " + gatewayHostname + ": "
+ + gCubeGroup.getGroupName());
}
- }else {
+ } else {
// retrieve the flat list of organizations for the current user
List listGroups = groupManager.listGroupsByUser(userid);
groups = new HashSet(listGroups);
}
-
- //Used by Workspace?
- // root (so check into the root, the VOs and the VRES)
- if(groupManager.isRootVO(currentGroupId)){
- logger.info("The current scope is the Root Vo, so the list of organizations of the user " + username + " has " + groups.size() + " group/s");
+ // Used by Workspace?
+ // root (so check into the root, the VOs and the VRES)
+ if (groupManager.isRootVO(currentGroupId)) {
+
+ logger.info("The current scope is the Root Vo, so the list of organizations of the user " + username
+ + " has " + groups.size() + " group/s");
for (GCubeGroup gCubeGroup : groups) {
-
- if(!groupManager.isVRE(gCubeGroup.getGroupId()))
+
+ if (!groupManager.isVRE(gCubeGroup.getGroupId()))
continue;
// get the name of this group
String gCubeGroupName = gCubeGroup.getGroupName();
-
+
logger.info("Cheking role of the user " + username + " in the VRE " + gCubeGroupName);
-
+
// get the role of the users in this group
- List roles = roleManager.listRolesByUserAndGroup(userid, groupManager.getGroupId(gCubeGroupName));
+ List roles = roleManager.listRolesByUserAndGroup(userid,
+ groupManager.getGroupId(gCubeGroupName));
// get highest role
RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
// be sure it is so
- checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(),
- correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole);
+ checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(),
+ correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl,
+ orgsInWhichAtLeastEditorRole);
toReturn = RolesCkanGroupOrOrg.getHigher(toReturn, correspondentRoleToCheck);
-
- logger.info("Found the role "+toReturn+" for " + username + " in the VRE " + gCubeGroupName);
+
+ logger.info("Found the role " + toReturn + " for " + username + " in the VRE " + gCubeGroupName);
}
- }else if(groupManager.isVO(currentGroupId)){
+ } else if (groupManager.isVO(currentGroupId)) {
- logger.debug("The list of organizations of the user " + username + " to scan is the one under the VO " + groupName);
+ logger.debug("The list of organizations of the user " + username + " to scan is the one under the VO "
+ + groupName);
for (GCubeGroup gCubeGroup : groups) {
// if the gCubeGroup is not under the VO or it is not the VO continue
- if(currentGroupId != gCubeGroup.getParentGroupId() || currentGroupId != gCubeGroup.getGroupId())
+ if (currentGroupId != gCubeGroup.getParentGroupId() || currentGroupId != gCubeGroup.getGroupId())
continue;
String gCubeGroupName = gCubeGroup.getGroupName();
- List roles = roleManager.listRolesByUserAndGroup(userid, groupManager.getGroupId(gCubeGroupName));
+ List roles = roleManager.listRolesByUserAndGroup(userid,
+ groupManager.getGroupId(gCubeGroupName));
// get highest role
RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
// be sure it is so
- checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(),
- correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole);
+ checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(),
+ correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl,
+ orgsInWhichAtLeastEditorRole);
toReturn = RolesCkanGroupOrOrg.getHigher(toReturn, correspondentRoleToCheck);
}
- }else if(groupManager.isVRE(currentGroupId)){
- List roles = roleManager.listRolesByUserAndGroup(userManager.getUserId(username), groupManager.getGroupId(groupName));
+ } else if (groupManager.isVRE(currentGroupId)) {
+ List roles = roleManager.listRolesByUserAndGroup(userManager.getUserId(username),
+ groupManager.getGroupId(groupName));
logger.debug("The current scope is the vre " + groupName);
@@ -139,24 +152,26 @@ public class CatalogueRoleManager {
RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
// be sure it is so
- checkIfRoleIsSetInCkanInstance(username, groupName, currentGroupId,
- correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole);
+ checkIfRoleIsSetInCkanInstance(username, groupName, currentGroupId, correspondentRoleToCheck,
+ groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole);
toReturn = correspondentRoleToCheck;
}
- }catch(Exception e){
+ } catch (Exception e) {
logger.error("Unable to retrieve the role information for this user. Returning member role", e);
return RolesCkanGroupOrOrg.MEMBER;
}
// return the role
- logger.debug("Returning role " + toReturn + " for user " + username);
+ logger.debug("Returning role " + toReturn + " for user " + username);
return toReturn;
}
/**
- * Check if the role admin is set or must be set into the ckan instance at this scope
+ * Check if the role admin is set or must be set into the ckan instance at this
+ * scope
+ *
* @param username
* @param gCubeGroupName
* @param groupId
@@ -167,43 +182,53 @@ public class CatalogueRoleManager {
* @throws UserManagementSystemException
* @throws GroupRetrievalFault
*/
- private static void checkIfRoleIsSetInCkanInstance(String username,
- String gCubeGroupName, long groupId,
- RolesCkanGroupOrOrg correspondentRoleToCheck,
- GroupManager groupManager, CKANPublisherServicesImpl ckanPublisherServicesImpl, List orgs) throws UserManagementSystemException, GroupRetrievalFault {
+ private static void checkIfRoleIsSetInCkanInstance(String username, String gCubeGroupName, long groupId,
+ RolesCkanGroupOrOrg correspondentRoleToCheck, GroupManager groupManager,
+ CKANPublisherServicesImpl ckanPublisherServicesImpl, List orgs)
+ throws UserManagementSystemException, GroupRetrievalFault {
- // with this invocation, we check if the role is present in ckan and if it is not it will be added
+ // with this invocation, we check if the role is present in ckan and if it is
+ // not it will be added
DataCatalogue catalogue = ckanPublisherServicesImpl.getCatalogue(groupManager.getInfrastructureScope(groupId));
// if there is an instance of ckan in this scope..
- if(catalogue != null){
+ if (catalogue != null) {
boolean res = catalogue.checkRoleIntoOrganization(username, gCubeGroupName, correspondentRoleToCheck);
- if(res && !correspondentRoleToCheck.equals(RolesCkanGroupOrOrg.MEMBER)){
+ if (res && !correspondentRoleToCheck.equals(RolesCkanGroupOrOrg.MEMBER)) {
// get the orgs of the user and retrieve its title and name
CkanOrganization organization = catalogue.getOrganizationByName(gCubeGroupName.toLowerCase());
orgs.add(new OrganizationBean(organization.getTitle(), organization.getName(), true));
}
- }else
- logger.warn("It seems there is no ckan instance into scope " + groupManager.getInfrastructureScope(groupId));
+ } else
+ logger.warn(
+ "It seems there is no ckan instance into scope " + groupManager.getInfrastructureScope(groupId));
}
/**
- * Retrieve the ckan roles among a list of liferay roles
+ * Retrieve the highest ckan role among a list of liferay roles
+ *
* @param roles
- * @return
+ * @return Updated by Francesco M. see #27467
*/
- private static RolesCkanGroupOrOrg getLiferayHighestRoleInOrg(
- List roles) {
- // NOTE: it is supposed that there is just one role for this person correspondent to the one in the catalog
- for (GCubeRole gCubeRole : roles) {
- if(gCubeRole.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_ADMIN.getRoleName())){
- return RolesCkanGroupOrOrg.ADMIN;
- }
- if(gCubeRole.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_EDITOR.getRoleName())){
- return RolesCkanGroupOrOrg.EDITOR;
- }
- }
+ private static RolesCkanGroupOrOrg getLiferayHighestRoleInOrg(List roles) {
+
+ if (roles == null || roles.isEmpty())
+ return RolesCkanGroupOrOrg.MEMBER;
+
+ Optional admin = roles.stream()
+ .filter(r -> r.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_ADMIN.getRoleName()))
+ .findFirst();
+
+ if (admin.isPresent())
+ return RolesCkanGroupOrOrg.ADMIN;
+
+ Optional editor = roles.stream()
+ .filter(r -> r.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_EDITOR.getRoleName()))
+ .findFirst();
+
+ if (editor.isPresent())
+ return RolesCkanGroupOrOrg.EDITOR;
+
return RolesCkanGroupOrOrg.MEMBER;
}
-
}