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.
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
#### Enhancements

View File

@ -14,7 +14,7 @@
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>metadata-profile-form-builder-widget</artifactId>
<packaging>jar</packaging>
<version>2.1.0</version>
<version>2.1.1-SNAPSHOT</version>
<name>Metadata Profile Form Builder</name>
<description>
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"
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">
@ -62,7 +62,7 @@
</small>
</b:Legend>
<!-- Alert blocks for info/errors -->
Alert blocks for info/errors
<b:AlertBlock type="INFO" close="false" animation="true"
visible="false" ui:field="infoBlock" styleName="{style.block-alert-style}"></b:AlertBlock>
@ -104,7 +104,7 @@
</b:Controls>
</b:ControlGroup>
<!-- TAGS Panel -->
TAGS Panel
<m:TagsPanel ui:field="tagsPanel"></m:TagsPanel>
<b:ControlGroup>
@ -294,13 +294,13 @@
</b:Controls>
</b:ControlGroup>
<!-- Alert block on continue -->
Alert block on continue
<b:AlertBlock animation="true" visible="false"
ui:field="alertNoResources"
text="Please note that the item you are going to publish will not have resources.">
</b:AlertBlock>
<!-- Alert block on continue -->
Alert block on continue
<b:AlertBlock type="INFO" close="false" animation="true"
visible="false" ui:field="onContinueAlertBlock">
</b:AlertBlock>
@ -359,11 +359,11 @@
<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"
visible="false" width="100%"></g:VerticalPanel>
<!-- Custom fields can be dinamically added -->
Custom fields can be dinamically added
<b:ControlGroup ui:field="customFields">
<b:ControlLabel>Custom Field(s):</b:ControlLabel>
</b:ControlGroup>
@ -383,7 +383,7 @@
</b:Controls>
</b:ControlGroup>
<!-- Alert block on create -->
Alert block on create
<b:AlertBlock type="INFO" close="false" animation="true"
visible="false" ui:field="onCreateAlertBlock" styleName="{style.block-alert-style}">
</b:AlertBlock>
@ -407,4 +407,4 @@
</b:Fieldset>
</b:Form>
</g:HTMLPanel>
</ui:UiBinder>
</ui:UiBinder> -->

View File

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