From c295cdc794b59fd32561da785e3a38cea148dad1 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 14 May 2024 14:46:40 +0200 Subject: [PATCH] Bug fixing incident #27455 --- CHANGELOG.md | 6 +++ pom.xml | 2 +- .../client/ui/form/UpdateDatasetForm.java | 37 ++++++++++++++++++- .../server/CKANPublisherServicesImpl.java | 20 +++++++++- 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2da6bf2..0e35e06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ 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] + ## [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