Merge pull request #11390 from IQSS/11376-add-version-note-to-diff-summary

11376 add version note to diff summary

Author: ofahimIQSS

src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java

@@ -1782,11 +1782,13 @@ public JsonObjectBuilder compareVersionsAsJson() {
         JsonObjectBuilder jobVersion = new NullSafeJsonBuilder();
         jobVersion.add("versionNumber", originalVersion.getFriendlyVersionNumber());
         jobVersion.add("versionState", originalVersion.getVersionState().name());
+        jobVersion.add("versionNote", originalVersion.getVersionNote());
         jobVersion.add("lastUpdatedDate", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(originalVersion.getLastUpdateTime()));
         job.add("oldVersion", jobVersion);
         jobVersion = new NullSafeJsonBuilder();
         jobVersion.add("versionNumber", newVersion.getFriendlyVersionNumber());
         jobVersion.add("versionState", newVersion.getVersionState().name());
+        jobVersion.add("versionNote", newVersion.getVersionNote());
         jobVersion.add("lastUpdatedDate", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(newVersion.getLastUpdateTime()));
         job.add("newVersion", jobVersion);
 

src/main/java/edu/harvard/iq/dataverse/api/Datasets.java

@@ -3009,7 +3009,7 @@ public Response getCompareVersionsSummary(@Context ContainerRequestContext crc,
                     } else {
                         versionBuilder.add("summary", dvdiff.getSummaryDifferenceAsJson());
                     }
-
+                    versionBuilder.add("versionNote", dv.getVersionNote());
                     versionBuilder.add("contributors", datasetversionService.getContributorsNames(dv));
                     versionBuilder.add("publishedOn", !dv.isDraft() ? dv.getPublicationDateAsString() : "");
                     differenceSummaries.add(versionBuilder);

src/main/java/propertyFiles/Bundle.properties

@@ -2169,6 +2169,7 @@ file.viewDiffDialog.dialog.warning=Please select two versions to view the differ
 file.viewDiffDialog.notAvailable=N/A
 file.viewDiffDialog.version=Version
 file.viewDiffDialog.lastUpdated=Last Updated
+file.viewDiffDialog.versionNote=Version Note
 file.viewDiffDialog.fileID=File ID
 file.viewDiffDialog.fileName=Name
 file.viewDiffDialog.fileType=Type

src/main/webapp/dataset.xhtml

@@ -1440,11 +1440,13 @@
                             </div>
                             <div class="pull-left">
                                 #{bundle['file.viewDiffDialog.version']}: #{DatasetPage.datasetVersionDifference.originalVersion.semanticVersion}<br/>
-                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.originalVersion.localeLastUpdateTime}
+                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.originalVersion.localeLastUpdateTime}<br/>
+                                <p:fragment rendered="#{versionNoteEnabled}">#{bundle['file.viewDiffDialog.versionNote']}: #{DatasetPage.datasetVersionDifference.originalVersion.versionNote}</p:fragment>
                             </div>
                             <div class="pull-left">
                                 #{bundle['file.viewDiffDialog.version']}: #{DatasetPage.datasetVersionDifference.newVersion.semanticVersion}<br/>
-                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.newVersion.localeLastUpdateTime}
+                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.newVersion.localeLastUpdateTime}<br/>
+                                <p:fragment rendered="#{versionNoteEnabled}">#{bundle['file.viewDiffDialog.versionNote']}: #{DatasetPage.datasetVersionDifference.newVersion.versionNote}</p:fragment>
                             </div>
                         </div>
                         <ui:fragment rendered="#{!empty(DatasetPage.datasetVersionDifference.detailDataByBlock)}">