From 05e17159309aaed7f15e2fd1d291bb3faa1bc478 Mon Sep 17 00:00:00 2001 From: qqmyers Date: Thu, 9 Jan 2025 16:48:18 -0500 Subject: [PATCH 1/6] fix file version table/show when replaced --- src/main/java/edu/harvard/iq/dataverse/FilePage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java index 5717da38f29..3df3b095472 100644 --- 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 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 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); } From b5ba730f6be07cdc98aecfc9731ca20fe47c25b7 Mon Sep 17 00:00:00 2001 From: qqmyers Date: Thu, 9 Jan 2025 16:51:34 -0500 Subject: [PATCH 2/6] release note --- doc/release-notes/ 11142-more detailed file differences.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/release-notes/ 11142-more detailed file differences.md diff --git a/doc/release-notes/ 11142-more detailed file differences.md b/doc/release-notes/ 11142-more detailed file differences.md new file mode 100644 index 00000000000..3e98402fe15 --- /dev/null +++ b/doc/release-notes/ 11142-more detailed file differences.md @@ -0,0 +1 @@ +The file page version table now shows whether a file has been replaced. \ No newline at end of file From 24adc357804ff79b87f8fa770322dce489fef56a Mon Sep 17 00:00:00 2001 From: qqmyers Date: Thu, 9 Jan 2025 17:10:00 -0500 Subject: [PATCH 3/6] fix prov bug, update release note --- doc/release-notes/ 11142-more detailed file differences.md | 2 +- .../edu/harvard/iq/dataverse/DatasetVersionDifference.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/ 11142-more detailed file differences.md b/doc/release-notes/ 11142-more detailed file differences.md index 3e98402fe15..058064c1190 100644 --- a/doc/release-notes/ 11142-more detailed file differences.md +++ b/doc/release-notes/ 11142-more detailed file differences.md @@ -1 +1 @@ -The file page version table now shows whether a file has been replaced. \ No newline at end of file +The file page version table now shows more detail, e.g. when there are metadata changes or whether a file has been replaced. \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java index c5d6c31386c..741b6ff15a1 100644 --- 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> 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()) { From de7d763e75653d641a09dc61b100f6f03cbe6049 Mon Sep 17 00:00:00 2001 From: qqmyers Date: Thu, 9 Jan 2025 17:28:47 -0500 Subject: [PATCH 4/6] note prov bug --- doc/release-notes/ 11142-more detailed file differences.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/release-notes/ 11142-more detailed file differences.md b/doc/release-notes/ 11142-more detailed file differences.md index 058064c1190..82726b4f327 100644 --- a/doc/release-notes/ 11142-more detailed file differences.md +++ b/doc/release-notes/ 11142-more detailed file differences.md @@ -1 +1,2 @@ -The file page version table now shows more detail, e.g. when there are metadata changes or whether a file has been replaced. \ No newline at end of file +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. \ No newline at end of file From 21edee8b258b0e9e3e3cf70409097fe33388c3a8 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 24 Jan 2025 14:35:09 -0500 Subject: [PATCH 5/6] Update and rename 11142-more detailed file differences.md to 11142-more-detailed-file-differences.md --- ...e differences.md => 11142-more-detailed-file-differences.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename doc/release-notes/{ 11142-more detailed file differences.md => 11142-more-detailed-file-differences.md} (91%) diff --git a/doc/release-notes/ 11142-more detailed file differences.md b/doc/release-notes/11142-more-detailed-file-differences.md similarity index 91% rename from doc/release-notes/ 11142-more detailed file differences.md rename to doc/release-notes/11142-more-detailed-file-differences.md index 82726b4f327..205d341713a 100644 --- a/doc/release-notes/ 11142-more detailed file differences.md +++ b/doc/release-notes/11142-more-detailed-file-differences.md @@ -1,2 +1,2 @@ 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. \ No newline at end of file +A bug that causes adding free-form provenance to a file to fail has been fixed. From 5b9804d06b81affa292ae587e517fc1abbfc4a9c Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 24 Jan 2025 14:36:12 -0500 Subject: [PATCH 6/6] add issue and PR numbers #11145 --- doc/release-notes/11142-more-detailed-file-differences.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release-notes/11142-more-detailed-file-differences.md b/doc/release-notes/11142-more-detailed-file-differences.md index 205d341713a..d7425b8d2fa 100644 --- a/doc/release-notes/11142-more-detailed-file-differences.md +++ b/doc/release-notes/11142-more-detailed-file-differences.md @@ -1,2 +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.