Skip to content

Commit

Permalink
Updated metadata labels in dataset version differences popup, added t…
Browse files Browse the repository at this point in the history 
…o bundle [ref #5210, #6685]
  • Loading branch information
@mheppler
mheppler committed Jan 20, 2021
1 parent 23e8f5c commit c7f7782
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 59 deletions.
64 changes: 11 additions & 53 deletions src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
View file
Expand Up @@ -36,7 +36,6 @@ public final class DatasetVersionDifference {
private List<String[]> changedTermsAccess = new ArrayList<>();
private List<Object[]> summaryDataForNote = new ArrayList<>();
private List<Object[]> blockDataForNote = new ArrayList<>();
String noFileDifferencesFoundLabel = "";

private VariableMetadataUtil variableMetadataUtil;

Expand Down Expand Up @@ -104,7 +103,6 @@ public DatasetVersionDifference(DatasetVersion newVersion, DatasetVersion origin
addToSummary(null, dsfn);
}
}


// TODO: ?
// It looks like we are going through the filemetadatas in both versions,
Expand Down Expand Up @@ -493,7 +491,6 @@ private void addToSummary(DatasetField dsfo, DatasetField dsfn) {
}

private void updateBlockSummary(DatasetField dsf, int added, int deleted, int changed) {

boolean addedToAll = false;
for (Object[] blockList : blockDataForNote) {
DatasetField dsft = (DatasetField) blockList[0];
Expand All @@ -512,7 +509,6 @@ private void updateBlockSummary(DatasetField dsf, int added, int deleted, int ch
newArray[3] = changed;
blockDataForNote.add(newArray);
}

}

private void addToNoteSummary(DatasetField dsfo, int added, int deleted, int changed) {
Expand Down Expand Up @@ -552,8 +548,6 @@ private boolean compareVarGroup(FileMetadata fmdo, FileMetadata fmdn) {
}
}



private boolean compareFileMetadatas(FileMetadata fmdo, FileMetadata fmdn) {

if (!StringUtils.equals(fmdo.getDescription(), fmdn.getDescription())) {
Expand Down Expand Up @@ -786,7 +780,6 @@ private void initDatasetFilesDifferencesList() {
datasetFilesDiffList = new ArrayList<>();
datasetFilesReplacementList = new ArrayList <>();


// Study Files themselves are version-less;
// In other words, 2 different versions can have different sets of
// study files, but the files themselves don't have versions.
Expand All @@ -798,13 +791,6 @@ private void initDatasetFilesDifferencesList() {
// same study file, the file metadatas ARE version-specific, so some of
// the fields there (filename, etc.) may be different. If this is the
// case, we want to display these differences as well.

if (originalVersion.getFileMetadatas().isEmpty() && newVersion.getFileMetadatas().isEmpty()) {
noFileDifferencesFoundLabel = "No data files in either version of the study";
return;
}



int i = 0;
int j = 0;
Expand All @@ -825,7 +811,6 @@ private void initDatasetFilesDifferencesList() {

if (!replacedFiles.isEmpty()) {


replacedFiles.stream().map((replacedPair) -> {
FileMetadata replacedFile = replacedPair[0];
FileMetadata newFile = replacedPair[1];
Expand All @@ -851,7 +836,6 @@ private void initDatasetFilesDifferencesList() {

}


Collections.sort(fileMetadatasOriginal, (FileMetadata l1, FileMetadata l2) -> {
FileMetadata fm3 = l1; //(DatasetField[]) l1.get(0);
FileMetadata fm4 = l2;
Expand All @@ -871,7 +855,6 @@ private void initDatasetFilesDifferencesList() {
// added file. Since we are only doing this for the purposes of generating
// version differences, this should be OK.
// -- L.A. Aug. 2014


Collections.sort(fileMetadatasNew, (FileMetadata l1, FileMetadata l2) -> {
FileMetadata fm3 = l1; //(DatasetField[]) l1.get(0);
Expand Down Expand Up @@ -964,14 +947,6 @@ private void initDatasetFilesDifferencesList() {

j++;
}





if (datasetFilesDiffList.isEmpty()) {
noFileDifferencesFoundLabel = "These study versions have identical sets of data files";
}
}

private boolean fileMetadataIsDifferent(FileMetadata fm1, FileMetadata fm2) {
Expand Down Expand Up @@ -1080,10 +1055,9 @@ private boolean fileMetadataIsDifferent(FileMetadata fm1, FileMetadata fm2) {
return true;
}

//File restrictions

value1 = fm1.isRestricted() ? "Restricted" : "Not Restricted";
value2 = fm2.isRestricted() ? "Restricted" : "Not Restricted";
// File restrictions
value1 = fm1.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public");
value2 = fm2.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public");

return !value1.equals(value2);
}
Expand All @@ -1109,7 +1083,7 @@ private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, File
}

fdi.setFileProvFree1(fm1.getProvFreeForm());
fdi.setFileRest1(fm1.isRestricted() ? "Restricted" : "Not Restricted");
fdi.setFileRest1(fm1.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public"));
fdi.setFile2Empty(true);

} else if (fm1 == null) {
Expand All @@ -1125,7 +1099,7 @@ private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, File
fdi.setFileCat2(fm2.getCategoriesByName().toString());
}
fdi.setFileProvFree2(fm2.getProvFreeForm());
fdi.setFileRest2(fm2.isRestricted() ? "Restricted" : "Not Restricted");
fdi.setFileRest2(fm2.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public"));
} else {
// Both are non-null metadata objects.
// We simply go through the 5 metadata fields, if any are
Expand Down Expand Up @@ -1206,11 +1180,9 @@ private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, File
}

// file restricted:
value1 = fm1.isRestricted() ? "Restricted" : "Not Restricted";
value2 = fm2.isRestricted() ? "Restricted" : "Not Restricted";
if (!value1.equals(value2)) {
fdi.setFileRest1(value1);
fdi.setFileRest2(value2);
if (fm1.isRestricted() != fm2.isRestricted() ) {
fdi.setFileRest1(fm1.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public"));
fdi.setFileRest2(fm2.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public"));
}
}
return fdi;
Expand Down Expand Up @@ -1314,7 +1286,7 @@ public String getEditSummaryForLog() {
}

if (item.fileRest1 != null || item.fileRest2 != null) {
itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.restricted") + ": ";
itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.fileAccess") + ": ";
itemDiff += item.fileRest1 != null ? item.fileRest1 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable");
itemDiff += " : ";
itemDiff += item.fileRest2 != null ? item.fileRest2 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable") + " ";
Expand Down Expand Up @@ -1356,7 +1328,7 @@ public String getEditSummaryForLog() {
itemDiff += item.fdi.fileProvFree1 != null ? item.fdi.fileProvFree1 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable");
itemDiff += " : ";
itemDiff += item.fdi.fileProvFree2 != null ? item.fdi.fileProvFree2 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable") + " ";
itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.restricted") + ": ";
itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.fileAccess") + ": ";
itemDiff += item.fdi.fileRest1 != null ? item.fdi.fileRest1 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable");
itemDiff += " : ";
itemDiff += item.fdi.fileRest2 != null ? item.fdi.fileRest2 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable") + " ";
Expand All @@ -1377,12 +1349,11 @@ public String getEditSummaryForLog() {
retVal +=termsOfUseDiff;
}


return retVal;
}


public class DifferenceSummaryGroup{
public class DifferenceSummaryGroup {

private String displayName;
private String type;
Expand Down Expand Up @@ -1411,8 +1382,6 @@ public List<DifferenceSummaryItem> getDifferenceSummaryItems() {
public void setDifferenceSummaryItems(List<DifferenceSummaryItem> differenceSummaryItems) {
this.differenceSummaryItems = differenceSummaryItems;
}


}

public class DifferenceSummaryItem {
Expand Down Expand Up @@ -1470,9 +1439,6 @@ public boolean isMultiple() {
public void setMultiple(boolean multiple) {
this.multiple = multiple;
}



}

public class datasetReplaceFileItem {
Expand Down Expand Up @@ -1733,7 +1699,6 @@ public String getFileChecksumValue() {
public void setFileChecksumValue(String fileChecksumValue) {
this.fileChecksumValue = fileChecksumValue;
}

}

public List<datasetFileDifferenceItem> getDatasetFilesDiffList() {
Expand All @@ -1744,11 +1709,4 @@ public void setDatasetFilesDiffList(List<datasetFileDifferenceItem> datasetFiles
this.datasetFilesDiffList = datasetFilesDiffList;
}

public String getNoFileDifferencesFoundLabel() {
return noFileDifferencesFoundLabel;
}

public void setNoFileDifferencesFoundLabel(String noFileDifferencesFoundLabel) {
this.noFileDifferencesFoundLabel = noFileDifferencesFoundLabel;
}
}
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/UserNotification.java
View file
Expand Up @@ -27,7 +27,7 @@

public class UserNotification implements Serializable {
public enum Type {
ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, SUBMITTEDDS, RETURNEDDS, PUBLISHEDDS, REQUESTFILEACCESS, GRANTFILEACCESS, REJECTFILEACCESS, FILESYSTEMIMPORT, CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS, PUBLISHFAILED_PIDREG
ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, MAPLAYERUPDATED, MAPLAYERDELETEFAILED, SUBMITTEDDS, RETURNEDDS, PUBLISHEDDS, REQUESTFILEACCESS, GRANTFILEACCESS, REJECTFILEACCESS, FILESYSTEMIMPORT, CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS, PUBLISHFAILED_PIDREG
};

private static final long serialVersionUID = 1L;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/propertyFiles/Bundle.properties
View file
Expand Up @@ -8,6 +8,7 @@ datasets=Datasets
newDataset=New Dataset
files=Files
file=File
public=Public
restricted=Restricted
restrictedaccess=Restricted Access
find=Find
Expand Down Expand Up @@ -1432,7 +1433,7 @@ dataset.versionDifferences.field=Field
dataset.versionDifferences.changed=Changed
dataset.versionDifferences.from=From
dataset.versionDifferences.to=To
file.viewDiffDialog.restricted=Restricted
file.viewDiffDialog.fileAccess=Access
dataset.host.tip=Changing the host dataverse will clear any fields you may have entered data into.
dataset.template.tip=Changing the template will clear any fields you may have entered data into.
dataset.noTemplate.label=None
Expand Down
8 changes: 4 additions & 4 deletions src/main/webapp/dataset.xhtml
View file
Expand Up @@ -1163,7 +1163,7 @@
<h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileDiff.fileCat1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileCat1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileDiff.fileDesc1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileDesc1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileDiff.fileProvFree1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileProvFree1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileDiff.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileDiff.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest1 != null}"/>
</p:column>
<p:column styleClass="versionDetails" rendered="#{fileDiff.file1Empty}">
&#160;
Expand All @@ -1175,7 +1175,7 @@
<h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileDiff.fileCat2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileCat2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileDiff.fileDesc2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileDesc2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileDiff.fileProvFree2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileProvFree2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileDiff.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileDiff.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest2 != null}"/>
</p:column>
<p:column styleClass="versionDetails" rendered="#{fileDiff.file2Empty}">
&#160;
Expand All @@ -1195,7 +1195,7 @@
<h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileReplace.fdi.fileCat1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileCat1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileReplace.fdi.fileDesc1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileDesc1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileReplace.fdi.fileProvFree1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileProvFree1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileReplace.fdi.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest1 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileReplace.fdi.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest1 != null}"/>
</p:column>
<p:column styleClass="versionDetails" rendered="#{fileReplace.fdi.file1Empty}">
&#160;
Expand All @@ -1209,7 +1209,7 @@
<h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileReplace.fdi.fileCat2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileCat2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileReplace.fdi.fileDesc2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileDesc2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileReplace.fdi.fileProvFree2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileProvFree2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileReplace.fdi.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest2 != null}"/>
<h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileReplace.fdi.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest2 != null}"/>
</p:column>
<p:column styleClass="versionDetails" rendered="#{fileReplace.fdi.file2Empty}">
&#160;
Expand Down

0 comments on commit c7f7782

Please sign in to comment.