Merge pull request #11145 from GlobalDataverseCommunityConsortium/IQS…

…S/11142-replace_in_file_differences IQSS/11142 show replace in file differences
IQSS · Feb 3, 2025 · eb98e21 · eb98e21
2 parents b0528fe + 5b9804d
commit eb98e21
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/doc/release-notes/11142-more-detailed-file-differences.md b/doc/release-notes/11142-more-detailed-file-differences.md
@@ -0,0 +1,3 @@
+The file page version table now shows more detail, e.g. when there are metadata changes or whether a file has been replaced. 
+A bug that causes adding free-form provenance to a file to fail has been fixed.
+See also #11142 and #11145.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
@@ -373,9 +373,9 @@ public static Map<String,List<String>> compareFileMetadatas(FileMetadata fmdo, F
                     List.of(fmdo.getLabel(), fmdn.getLabel()));
         }
 
-        if (!StringUtils.equals(fmdo.getProvFreeForm(), fmdn.getProvFreeForm())) {
+        if (!StringUtils.equals(StringUtil.nullToEmpty(fmdo.getProvFreeForm()), StringUtil.nullToEmpty(fmdn.getProvFreeForm()))) {
             fileMetadataChanged.put("ProvFreeForm",
-                    List.of(fmdo.getProvFreeForm(), fmdn.getProvFreeForm()));
+                    List.of(StringUtil.nullToEmpty(fmdo.getProvFreeForm()), StringUtil.nullToEmpty(fmdn.getProvFreeForm())));
         }
 
         if (fmdo.isRestricted() != fmdn.isRestricted()) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
@@ -708,7 +708,7 @@ private List<FileMetadata> loadFileMetadataTabList() {
                     FileMetadata fmd = datafileService.findFileMetadataByDatasetVersionIdAndDataFileId(versionLoop.getId(), df.getId());
                     if (fmd != null) {
                         fmd.setContributorNames(datasetVersionService.getContributorsNames(versionLoop));
-                        FileVersionDifference fvd = new FileVersionDifference(fmd, getPreviousFileMetadata(fmd));
+                        FileVersionDifference fvd = new FileVersionDifference(fmd, getPreviousFileMetadata(fmd), true);
                         fmd.setFileVersionDifference(fvd);
                         retList.add(fmd);
                         foundFmd = true;
@@ -720,7 +720,7 @@ private List<FileMetadata> loadFileMetadataTabList() {
                     FileMetadata dummy = new FileMetadata();
                     dummy.setDatasetVersion(versionLoop);
                     dummy.setDataFile(null);
-                    FileVersionDifference fvd = new FileVersionDifference(dummy, getPreviousFileMetadata(versionLoop));
+                    FileVersionDifference fvd = new FileVersionDifference(dummy, getPreviousFileMetadata(versionLoop), true);
                     dummy.setFileVersionDifference(fvd);
                     retList.add(dummy);
                 }