edit_facility_26115 #3

Merged
francesco.mangiacrapa merged 11 commits from edit_facility_26115 into master 2024-03-19 10:17:19 +01:00
4 changed files with 351 additions and 345 deletions
Showing only changes of commit 471c1f373c - Show all commits

View File

@ -4,6 +4,12 @@
All notable changes to this project will be documented in this file. 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). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v2.1.1-SNAPSHOT] - 2024-02-02
#### Enhancements
- [#26656] Aligned the data-model to ckan-metadata-publisher-widget
## [v2.1.0] - 2023-02-01 ## [v2.1.0] - 2023-02-01
#### Enhancements #### Enhancements

View File

@ -14,7 +14,7 @@
<groupId>org.gcube.portlets.widgets</groupId> <groupId>org.gcube.portlets.widgets</groupId>
<artifactId>metadata-profile-form-builder-widget</artifactId> <artifactId>metadata-profile-form-builder-widget</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.1.0</version> <version>2.1.1-SNAPSHOT</version>
<name>Metadata Profile Form Builder</name> <name>Metadata Profile Form Builder</name>
<description> <description>
The Metadata Profile Form Builder is a widget able to build dynamically a web form by reading "gCube Metadata Profile/s" The Metadata Profile Form Builder is a widget able to build dynamically a web form by reading "gCube Metadata Profile/s"

View File

@ -1,4 +1,4 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui" xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
xmlns:m="urn:import:org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.tags"> xmlns:m="urn:import:org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.tags">
@ -62,7 +62,7 @@
</small> </small>
</b:Legend> </b:Legend>
<!-- Alert blocks for info/errors --> Alert blocks for info/errors
<b:AlertBlock type="INFO" close="false" animation="true" <b:AlertBlock type="INFO" close="false" animation="true"
visible="false" ui:field="infoBlock" styleName="{style.block-alert-style}"></b:AlertBlock> visible="false" ui:field="infoBlock" styleName="{style.block-alert-style}"></b:AlertBlock>
@ -104,7 +104,7 @@
</b:Controls> </b:Controls>
</b:ControlGroup> </b:ControlGroup>
<!-- TAGS Panel --> TAGS Panel
<m:TagsPanel ui:field="tagsPanel"></m:TagsPanel> <m:TagsPanel ui:field="tagsPanel"></m:TagsPanel>
<b:ControlGroup> <b:ControlGroup>
@ -294,13 +294,13 @@
</b:Controls> </b:Controls>
</b:ControlGroup> </b:ControlGroup>
<!-- Alert block on continue --> Alert block on continue
<b:AlertBlock animation="true" visible="false" <b:AlertBlock animation="true" visible="false"
ui:field="alertNoResources" ui:field="alertNoResources"
text="Please note that the item you are going to publish will not have resources."> text="Please note that the item you are going to publish will not have resources.">
</b:AlertBlock> </b:AlertBlock>
<!-- Alert block on continue --> Alert block on continue
<b:AlertBlock type="INFO" close="false" animation="true" <b:AlertBlock type="INFO" close="false" animation="true"
visible="false" ui:field="onContinueAlertBlock"> visible="false" ui:field="onContinueAlertBlock">
</b:AlertBlock> </b:AlertBlock>
@ -359,11 +359,11 @@
<b:Paragraph ui:field="selectedProfile" styleName="{style.selected-profile}"></b:Paragraph> <b:Paragraph ui:field="selectedProfile" styleName="{style.selected-profile}"></b:Paragraph>
<!-- Here will be placed the metadata fields formats --> Here will be placed the metadata fields formats
<g:VerticalPanel ui:field="metadataFieldsPanel" <g:VerticalPanel ui:field="metadataFieldsPanel"
visible="false" width="100%"></g:VerticalPanel> visible="false" width="100%"></g:VerticalPanel>
<!-- Custom fields can be dinamically added --> Custom fields can be dinamically added
<b:ControlGroup ui:field="customFields"> <b:ControlGroup ui:field="customFields">
<b:ControlLabel>Custom Field(s):</b:ControlLabel> <b:ControlLabel>Custom Field(s):</b:ControlLabel>
</b:ControlGroup> </b:ControlGroup>
@ -383,7 +383,7 @@
</b:Controls> </b:Controls>
</b:ControlGroup> </b:ControlGroup>
<!-- Alert block on create --> Alert block on create
<b:AlertBlock type="INFO" close="false" animation="true" <b:AlertBlock type="INFO" close="false" animation="true"
visible="false" ui:field="onCreateAlertBlock" styleName="{style.block-alert-style}"> visible="false" ui:field="onCreateAlertBlock" styleName="{style.block-alert-style}">
</b:AlertBlock> </b:AlertBlock>
@ -407,4 +407,4 @@
</b:Fieldset> </b:Fieldset>
</b:Form> </b:Form>
</g:HTMLPanel> </g:HTMLPanel>
</ui:UiBinder> </ui:UiBinder> -->

View File

@ -1,335 +1,335 @@
package org.gcube.portlets.widgets.mpformbuilder.shared.catalogue; //package org.gcube.portlets.widgets.mpformbuilder.shared.catalogue;
//
import java.io.Serializable; //import java.io.Serializable;
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
//
import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean; //import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
//
/** ///**
* This bean will contain during ckan metadata creation information related to the future build. // * This bean will contain during ckan metadata creation information related to the future build.
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) // * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
*/ // */
@SuppressWarnings("serial") //@SuppressWarnings("serial")
public class DatasetBean implements Serializable { //public class DatasetBean implements Serializable {
//
private String id; // private String id;
private String title; // private String title;
private String description; // private String description;
private String license; // chosen by the user // private String license; // chosen by the user
private String source; // url of the folder in the workspace // private String source; // url of the folder in the workspace
private String authorName; // author name // private String authorName; // author name
private String authorSurname; // author surname // private String authorSurname; // author surname
private String authorFullName; // private String authorFullName;
private String authorEmail; // owner's email // private String authorEmail; // owner's email
private String maintainer; // private String maintainer;
private String maintainerEmail; // private String maintainerEmail;
private String ownerIdentifier; // owner of the folder into the workspace (e.g., andrea.rossi) // private String ownerIdentifier; // owner of the folder into the workspace (e.g., andrea.rossi)
private String chosenType; // the name of the MetaDataType chosen // private String chosenType; // the name of the MetaDataType chosen
private String selectedOrganization; // private String selectedOrganization;
private long version; // version 1, 2 ... // private long version; // version 1, 2 ...
private boolean visible; // Private (false) or Public(true) // private boolean visible; // Private (false) or Public(true)
private List<OrganizationBean> organizationList; // list of organization in which the user is present and could create the dataset // private List<OrganizationBean> organizationList; // list of organization in which the user is present and could create the dataset
private ResourceElementBean resourceRoot; // in case of workspace, this is the directory root or the single file information // private ResourceElementBean resourceRoot; // in case of workspace, this is the directory root or the single file information
private List<MetaDataProfileBean> metadataList; // private List<MetaDataProfileBean> metadataList;
private List<String> tags; // on retrieve, they are the keys of the product // private List<String> tags; // on retrieve, they are the keys of the product
private List<String> tagsVocabulary; // when available // private List<String> tagsVocabulary; // when available
private Map<String, List<String>> customFields; // private Map<String, List<String>> customFields;
private List<OrganizationBean> groups; // private List<OrganizationBean> groups;
private List<OrganizationBean> groupsForceCreation; // private List<OrganizationBean> groupsForceCreation;
//
public DatasetBean(){ // public DatasetBean(){
super(); // super();
} // }
//
/** Create a metadata bean object. // /** Create a metadata bean object.
* @param id // * @param id
* @param title // * @param title
* @param description // * @param description
* @param customFields // * @param customFields
* @param tags // * @param tags
* @param license // * @param license
* @param visibility // * @param visibility
* @param source // * @param source
* @param version // * @param version
* @param author // * @param author
* @param authorEmail // * @param authorEmail
* @param maintainer // * @param maintainer
* @param maintainerEmail // * @param maintainerEmail
* @param ownerIdentifier // * @param ownerIdentifier
* @param organizationList // * @param organizationList
* @param selectedOrganization // * @param selectedOrganization
* @param resourcesIds // * @param resourcesIds
* @param addResources // * @param addResources
* @param metadataList // * @param metadataList
*/ // */
public DatasetBean(String id, String title, String description, // public DatasetBean(String id, String title, String description,
Map<String, List<String>> customFields, List<String> tags, // Map<String, List<String>> customFields, List<String> tags,
String license, boolean visible, String source, long version, // String license, boolean visible, String source, long version,
String authorName, String authorSurname, String authorEmail, String maintainer, // String authorName, String authorSurname, String authorEmail, String maintainer,
String maintainerEmail, String ownerIdentifier, // String maintainerEmail, String ownerIdentifier,
List<OrganizationBean> organizationList, String selectedOrganization, // List<OrganizationBean> organizationList, String selectedOrganization,
ResourceElementBean resourceRoot, // ResourceElementBean resourceRoot,
List<MetaDataProfileBean> metadataList, List<OrganizationBean> groups, List<String> tagsVocabulary) { // List<MetaDataProfileBean> metadataList, List<OrganizationBean> groups, List<String> tagsVocabulary) {
super(); // super();
this.id = id; // this.id = id;
this.title = title; // this.title = title;
this.description = description; // this.description = description;
this.customFields = customFields; // this.customFields = customFields;
this.tags = tags; // this.tags = tags;
this.license = license; // this.license = license;
this.visible = visible; // this.visible = visible;
this.source = source; // this.source = source;
this.version = version; // this.version = version;
this.authorName = authorName; // this.authorName = authorName;
this.authorSurname = authorSurname; // this.authorSurname = authorSurname;
this.authorEmail = authorEmail; // this.authorEmail = authorEmail;
this.maintainer = maintainer; // this.maintainer = maintainer;
this.maintainerEmail = maintainerEmail; // this.maintainerEmail = maintainerEmail;
this.ownerIdentifier = ownerIdentifier; // this.ownerIdentifier = ownerIdentifier;
this.organizationList = organizationList; // this.organizationList = organizationList;
this.selectedOrganization = selectedOrganization; // this.selectedOrganization = selectedOrganization;
this.resourceRoot = resourceRoot; // this.resourceRoot = resourceRoot;
this.metadataList = metadataList; // this.metadataList = metadataList;
this.groups = groups; // this.groups = groups;
this.tagsVocabulary = tagsVocabulary; // this.tagsVocabulary = tagsVocabulary;
} // }
//
public String getChosenType() { // public String getChosenType() {
return chosenType; // return chosenType;
} // }
//
public void setChosenType(String chosenType) { // public void setChosenType(String chosenType) {
this.chosenType = chosenType; // this.chosenType = chosenType;
} // }
//
public List<MetaDataProfileBean> getMetadataList() { // public List<MetaDataProfileBean> getMetadataList() {
return metadataList; // return metadataList;
} // }
//
public void setMetadataList(List<MetaDataProfileBean> metadataListTypes) { // public void setMetadataList(List<MetaDataProfileBean> metadataListTypes) {
this.metadataList = metadataListTypes; // this.metadataList = metadataListTypes;
} // }
//
public String getId() { // public String getId() {
return id; // return id;
} // }
//
public void setId(String id) { // public void setId(String id) {
this.id = id; // this.id = id;
} // }
//
public String getOwnerIdentifier() { // public String getOwnerIdentifier() {
return ownerIdentifier; // return ownerIdentifier;
} // }
//
public void setOwnerIdentifier(String ownerIdentifier) { // public void setOwnerIdentifier(String ownerIdentifier) {
this.ownerIdentifier = ownerIdentifier; // this.ownerIdentifier = ownerIdentifier;
} // }
//
public String getTitle() { // public String getTitle() {
return title; // return title;
} // }
//
public void setTitle(String title) { // public void setTitle(String title) {
this.title = title; // this.title = title;
} // }
//
public String getDescription() { // public String getDescription() {
return description; // return description;
} // }
//
public void setDescription(String description) { // public void setDescription(String description) {
this.description = description; // this.description = description;
} // }
//
public Map<String, List<String>> getCustomFields() { // public Map<String, List<String>> getCustomFields() {
return customFields; // return customFields;
} // }
//
public void setCustomFields(Map<String, List<String>> customFields) { // public void setCustomFields(Map<String, List<String>> customFields) {
this.customFields = customFields; // this.customFields = customFields;
} // }
//
public List<String> getTags() { // public List<String> getTags() {
return tags; // return tags;
} // }
//
public void setTags(List<String> tags) { // public void setTags(List<String> tags) {
this.tags = tags; // this.tags = tags;
} // }
//
public String getLicense() { // public String getLicense() {
return license; // return license;
} // }
//
public void setLicense(String license) { // public void setLicense(String license) {
this.license = license; // this.license = license;
} // }
//
public boolean getVisibility() { // public boolean getVisibility() {
return visible; // return visible;
} // }
//
public void setVisibile(boolean visibile) { // public void setVisibile(boolean visibile) {
this.visible = visibile; // this.visible = visibile;
} // }
//
public String getSource() { // public String getSource() {
return source; // return source;
} // }
//
public void setSource(String source) { // public void setSource(String source) {
this.source = source; // this.source = source;
} // }
//
public long getVersion() { // public long getVersion() {
return version; // return version;
} // }
//
public void setVersion(long version) { // public void setVersion(long version) {
this.version = version; // this.version = version;
} // }
//
public String getAuthorName() { // public String getAuthorName() {
return authorName; // return authorName;
} // }
//
public void setAuthorName(String authorName) { // public void setAuthorName(String authorName) {
this.authorName = authorName; // this.authorName = authorName;
} // }
//
public String getAuthorSurname() { // public String getAuthorSurname() {
return authorSurname; // return authorSurname;
} // }
//
public void setAuthorSurname(String authorSurname) { // public void setAuthorSurname(String authorSurname) {
this.authorSurname = authorSurname; // this.authorSurname = authorSurname;
} // }
//
public String getAuthorEmail() { // public String getAuthorEmail() {
return authorEmail; // return authorEmail;
} // }
//
public void setAuthorEmail(String authorEmail) { // public void setAuthorEmail(String authorEmail) {
this.authorEmail = authorEmail; // this.authorEmail = authorEmail;
} // }
//
public String getMaintainer() { // public String getMaintainer() {
return maintainer; // return maintainer;
} // }
//
public void setMaintainer(String maintainer) { // public void setMaintainer(String maintainer) {
this.maintainer = maintainer; // this.maintainer = maintainer;
} // }
//
public String getMaintainerEmail() { // public String getMaintainerEmail() {
return maintainerEmail; // return maintainerEmail;
} // }
//
public void setMaintainerEmail(String maintainerEmail) { // public void setMaintainerEmail(String maintainerEmail) {
this.maintainerEmail = maintainerEmail; // this.maintainerEmail = maintainerEmail;
} // }
//
public List<OrganizationBean> getOrganizationList() { // public List<OrganizationBean> getOrganizationList() {
return organizationList; // return organizationList;
} // }
//
public void setOrganizationList(List<OrganizationBean> organizationList) { // public void setOrganizationList(List<OrganizationBean> organizationList) {
this.organizationList = organizationList; // this.organizationList = organizationList;
} // }
//
public String getSelectedOrganization() { // public String getSelectedOrganization() {
return selectedOrganization; // return selectedOrganization;
} // }
//
public void setSelectedOrganization(String selectedOrganization) { // public void setSelectedOrganization(String selectedOrganization) {
this.selectedOrganization = selectedOrganization; // this.selectedOrganization = selectedOrganization;
} // }
//
public ResourceElementBean getResourceRoot() { // public ResourceElementBean getResourceRoot() {
return resourceRoot; // return resourceRoot;
} // }
//
public void setResourceRoot(ResourceElementBean resourceRoot) { // public void setResourceRoot(ResourceElementBean resourceRoot) {
this.resourceRoot = resourceRoot; // this.resourceRoot = resourceRoot;
} // }
//
public String getAuthorFullName() { // public String getAuthorFullName() {
return authorFullName; // return authorFullName;
} // }
//
public void setAuthorFullName(String authorFullName) { // public void setAuthorFullName(String authorFullName) {
this.authorFullName = authorFullName; // this.authorFullName = authorFullName;
} // }
//
public List<OrganizationBean> getGroups() { // public List<OrganizationBean> getGroups() {
return groups; // return groups;
} // }
//
public void setGroups(List<OrganizationBean> groups) { // public void setGroups(List<OrganizationBean> groups) {
this.groups = groups; // this.groups = groups;
} // }
//
public List<String> getTagsVocabulary() { // public List<String> getTagsVocabulary() {
return tagsVocabulary; // return tagsVocabulary;
} // }
//
public void setTagsVocabulary(List<String> tagsVocabulary) { // public void setTagsVocabulary(List<String> tagsVocabulary) {
this.tagsVocabulary = tagsVocabulary; // this.tagsVocabulary = tagsVocabulary;
} // }
//
public List<OrganizationBean> getGroupsForceCreation() { // public List<OrganizationBean> getGroupsForceCreation() {
return groupsForceCreation; // return groupsForceCreation;
} // }
//
public void setGroupsForceCreation(List<OrganizationBean> groupsForceCreation) { // public void setGroupsForceCreation(List<OrganizationBean> groupsForceCreation) {
this.groupsForceCreation = groupsForceCreation; // this.groupsForceCreation = groupsForceCreation;
} // }
//
@Override // @Override
public String toString() { // public String toString() {
return "DatasetBean [" // return "DatasetBean ["
+ (id != null ? "id=" + id + ", " : "") // + (id != null ? "id=" + id + ", " : "")
+ (title != null ? "title=" + title + ", " : "") // + (title != null ? "title=" + title + ", " : "")
+ (description != null ? "description=" + description + ", " // + (description != null ? "description=" + description + ", "
: "") // : "")
+ (license != null ? "license=" + license + ", " : "") // + (license != null ? "license=" + license + ", " : "")
+ (source != null ? "source=" + source + ", " : "") // + (source != null ? "source=" + source + ", " : "")
+ (authorName != null ? "authorName=" + authorName + ", " : "") // + (authorName != null ? "authorName=" + authorName + ", " : "")
+ (authorSurname != null ? "authorSurname=" + authorSurname // + (authorSurname != null ? "authorSurname=" + authorSurname
+ ", " : "") // + ", " : "")
+ (authorFullName != null ? "authorFullName=" + authorFullName // + (authorFullName != null ? "authorFullName=" + authorFullName
+ ", " : "") // + ", " : "")
+ (authorEmail != null ? "authorEmail=" + authorEmail + ", " // + (authorEmail != null ? "authorEmail=" + authorEmail + ", "
: "") // : "")
+ (maintainer != null ? "maintainer=" + maintainer + ", " : "") // + (maintainer != null ? "maintainer=" + maintainer + ", " : "")
+ (maintainerEmail != null ? "maintainerEmail=" // + (maintainerEmail != null ? "maintainerEmail="
+ maintainerEmail + ", " : "") // + maintainerEmail + ", " : "")
+ (ownerIdentifier != null ? "ownerIdentifier=" // + (ownerIdentifier != null ? "ownerIdentifier="
+ ownerIdentifier + ", " : "") // + ownerIdentifier + ", " : "")
+ (chosenType != null ? "chosenType=" + chosenType + ", " : "") // + (chosenType != null ? "chosenType=" + chosenType + ", " : "")
+ (selectedOrganization != null ? "selectedOrganization=" // + (selectedOrganization != null ? "selectedOrganization="
+ selectedOrganization + ", " : "") // + selectedOrganization + ", " : "")
+ "version=" // + "version="
+ version // + version
+ ", visible=" // + ", visible="
+ visible // + visible
+ ", " // + ", "
+ (organizationList != null ? "organizationList=" // + (organizationList != null ? "organizationList="
+ organizationList + ", " : "") // + organizationList + ", " : "")
+ (resourceRoot != null ? "resourceRoot=" + resourceRoot + ", " // + (resourceRoot != null ? "resourceRoot=" + resourceRoot + ", "
: "") // : "")
+ (metadataList != null ? "metadataList=" + metadataList + ", " // + (metadataList != null ? "metadataList=" + metadataList + ", "
: "") // : "")
+ (tags != null ? "tags=" + tags + ", " : "") // + (tags != null ? "tags=" + tags + ", " : "")
+ (tagsVocabulary != null ? "tagsVocabulary=" + tagsVocabulary // + (tagsVocabulary != null ? "tagsVocabulary=" + tagsVocabulary
+ ", " : "") // + ", " : "")
+ (customFields != null ? "customFields=" + customFields + ", " // + (customFields != null ? "customFields=" + customFields + ", "
: "") // : "")
+ (groups != null ? "groups=" + groups + ", " : "") // + (groups != null ? "groups=" + groups + ", " : "")
+ (groupsForceCreation != null ? "groupsForceCreation=" // + (groupsForceCreation != null ? "groupsForceCreation="
+ groupsForceCreation : "") + "]"; // + groupsForceCreation : "") + "]";
} // }
//
} //}