Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ordering subfields while displaying dataset version differences #10969

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Ordering subfields while displaying dataset version differences #10969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f851163
Ordering subfields while displaying dataset version differences
luddaniel Oct 25, 2024
b3147a0
adding release note
luddaniel Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/release-notes/10969-order-subfields-version-difference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Bug Fix:
In order to facilitate the comparison between the draft version and the published version of a dataset, a sort on subfields has been added (#10969)
14 changes: 12 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ public DatasetVersionDifference(DatasetVersion newVersion, DatasetVersion origin
getReplacedFiles();
initDatasetFilesDifferencesList();

//Sort within blocks by datasetfieldtype dispaly order then....
//sort via metadatablock order - citation first...
//Sort within blocks by datasetfieldtype display order
for (List<DatasetField[]> blockList : detailDataByBlock) {
Collections.sort(blockList, (DatasetField[] l1, DatasetField[] l2) -> {
DatasetField dsfa = l1[0]; //(DatasetField[]) l1.get(0);
Expand All @@ -163,6 +162,17 @@ public DatasetVersionDifference(DatasetVersion newVersion, DatasetVersion origin
return Integer.valueOf(a).compareTo(b);
});
}
//Sort existing compoundValues by datasetfieldtype display order
for (List<DatasetField[]> blockList : detailDataByBlock) {
for (DatasetField[] dfarr : blockList) {
for (DatasetField df : dfarr) {
for (DatasetFieldCompoundValue dfcv : df.getDatasetFieldCompoundValues()) {
Collections.sort(dfcv.getChildDatasetFields(), DatasetField.DisplayOrder);
}
}
}
}
//Sort via metadatablock order
Collections.sort(detailDataByBlock, (List l1, List l2) -> {
DatasetField dsfa[] = (DatasetField[]) l1.get(0);
DatasetField dsfb[] = (DatasetField[]) l2.get(0);
Expand Down
Loading