diff --git a/CHANGELOG.md b/CHANGELOG.md index 16cc007..6b9928e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm [#19568] Unify and extend the tags allowed values [#20828] Revisited title size and format [#20868] Redesigned the "Manage Resources" user experience +[##21068] Add Resources facility: only HTTPS URLs must be allowed ## [v1.6.2] - 2021-02-08 diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java index 4fccdda..40c6023 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java @@ -277,9 +277,9 @@ public class CreateDatasetForm extends Composite{ List listOfSteps = null; if(isWorkspaceRequest) { - listOfSteps = Arrays.asList("Insert Base Information","Select Item Resources", "Insert Profile Information and Publish"); + listOfSteps = Arrays.asList("Edit Common Metadata","Select Item Resources", "Edit Item Specific Metadata & Publish"); }else { - listOfSteps = Arrays.asList("Insert Base Information", "Insert Profile Information and Publish"); + listOfSteps = Arrays.asList("Edit Common Metadata", "Edit Item Specific Metadata & Publish"); } this.wizCreator = new WizardCreator(listOfSteps); @@ -1419,7 +1419,7 @@ public class CreateDatasetForm extends Composite{ } }; - t.schedule(10000); + t.schedule(15000); } } diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java index 5347002..8b161a1 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java @@ -88,7 +88,13 @@ public class AddResourceToDataset extends Composite{ showAlert("Url and name fields cannot be empty", AlertType.ERROR); return; - + } + + //THE URL must be HTTPS, see #21068 + if(!(resourceNameTextBox.getText().toLowerCase().startsWith("https://"))){ + showAlert("The URL must be HTTPS and starts with \"https://\" (e.g. https://your-resource.com)", AlertType.ERROR); + return; + } // collect data and build up the bean diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml index 41b149b..600bf46 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml @@ -63,7 +63,7 @@ URL: - diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css index 9e2bd22..76dd3b1 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css @@ -65,7 +65,6 @@ /* WIZARD-CREATOR CLASSES */ .wizard-creator { width: 100%; - border-spacing: 6px; border-collapse: separate; display: table; } 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 6fc5fa2..c1f3732 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 @@ -388,11 +388,6 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C // get the list of resources and convert to ResourceBean List resources = null; ResourceElementBean resourcesToAdd = toCreate.getResourceRoot(); - - // we need to copy such resource in the .catalogue area of the user's ws -// if(resourcesToAdd != null){ -// resources = WorkspaceUtils.copyResourcesToUserCatalogueArea(toCreate.getId(), userName, toCreate); -// } //converting to resources to be added if(resourcesToAdd != null){ @@ -404,6 +399,13 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C String scope = getScopeFromOrgName(organizationNameOrId); DataCatalogue utils = getCatalogue(scope); + if (!isWithinPortal()) { + logger.debug("Should be added:"); + for (String key : customFields.keySet()) { + logger.debug("Custom field with key: "+key+", value: "+customFields.get(key)); + } + } + String datasetId = utils.createCkanDatasetMultipleCustomFields(userName, title, null, @@ -422,15 +424,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C true, true); - /** - * OLD CODE - - String userApiKey = utils.getApiKeyFromUsername(userName); - String datasetId = utils.createCKanDatasetMultipleCustomFields - (userApiKey, title, null, organizationNameOrId, author, authorMail, maintainer, - maintainerMail, version, description, licenseId, listOfTags, customFields, resources, setPublic); - */ if(datasetId != null){ logger.info("Dataset created!");