Merge pull request #55 from FAIRDataTeam/release/1.6.0

Release 1.6.0
FAIRDataTeam · Jul 7, 2020 · b04daf0 · b04daf0
2 parents 4bcdc03 + 939e97a
commit b04daf0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.6.0]
+
+### Changed
+
+- Verified compatibility with FAIR Data Point 1.6.0
+
 ## [1.5.0]
 
 ### Added
@@ -104,10 +110,11 @@ Initial version based on reproducing functionality of deprecated [FAIRifier](htt
 - About dialog with basic information about the extension and its compatibility
 - Report a bug link to create a GitHub issue easily
 
-[Unreleased]: /../../compare/v1.5.0...develop
+[Unreleased]: /../../compare/v1.6.0...develop
 [1.0.0]: /../../tree/v1.0.0
 [1.1.0]: /../../tree/v1.1.0
 [1.2.0]: /../../tree/v1.2.0
 [1.3.0]: /../../tree/v1.3.0
 [1.4.0]: /../../tree/v1.4.0
 [1.5.0]: /../../tree/v1.5.0
+[1.6.0]: /../../tree/v1.5.0
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>solutions.fairdata.openrefine</groupId>
     <artifactId>metadata</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
     <packaging>jar</packaging>
 
     <name>OpenRefine - FAIR Metadata extension</name>

diff --git a/src/main/java/solutions/fairdata/openrefine/metadata/dto/dashboard/DashboardItemDTO.java b/src/main/java/solutions/fairdata/openrefine/metadata/dto/dashboard/DashboardItemDTO.java
@@ -22,6 +22,7 @@
  */
 package solutions.fairdata.openrefine.metadata.dto.dashboard;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -33,10 +34,12 @@
 @AllArgsConstructor
 @Getter
 @Setter
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DashboardItemDTO {
     protected String identifier;
     protected String uri;
     protected String title;
+    protected String state = "PUBLISHED";
     protected List<DashboardItemDTO> children;
     protected MembershipDTO membership;
 }
diff --git a/src/main/resources/module/scripts/dialogs/about-dialog.html b/src/main/resources/module/scripts/dialogs/about-dialog.html
@@ -24,6 +24,7 @@
             <dt data-i18n="about-dialog/fdp-versions"></dt>
             <dd>
                 <ul class="versions">
+                    <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.6.0" target="_blank">1.6</a></li>
                     <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.5.0" target="_blank">1.5</a></li>
                     <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.4.0" target="_blank">1.4</a></li>
                     <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.3.0" target="_blank">1.3</a></li>

diff --git a/src/main/resources/module/scripts/dialogs/post-fdp-dialog.js b/src/main/resources/module/scripts/dialogs/post-fdp-dialog.js
@@ -493,12 +493,15 @@ class PostFdpDialog {
     showMetadataSelect(select, metadatas, toSelect) {
         metadatas.forEach((metadata) => {
             const isNew = this.newlyCreatedIRIs.has(metadata.uri);
+            const title = metadata.title +
+                (metadata.state === "DRAFT" ? " (draft)" : "") +
+                (isNew ? " [new]" : "");
             select.append(
                 $("<option>")
                     .addClass("from-fdp")
                     .addClass(isNew ? "new" : "original")
                     .attr("value", metadata.uri)
-                    .text(isNew ? `${metadata.title} [new]` : metadata.title)
+                    .text(title)
             );
         });
         if (metadatas.has(toSelect)) {