Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
54e115c
squashed cherrypick
jo-pol Aug 31, 2026
62c1a4c
conflict mistakes, new classes since v6.10
jo-pol Aug 31, 2026
04bebb1
some broken unit tests
jo-pol Sep 1, 2026
da9da23
typo
jo-pol Sep 1, 2026
c36d6e8
random order comparison
jo-pol Sep 1, 2026
12458d8
not intended change broke a test
jo-pol Sep 3, 2026
7526cc7
renamed flyway script, added release note
jo-pol Sep 3, 2026
08fc985
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Sep 4, 2026
673074b
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Sep 15, 2026
c5be82a
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Oct 6, 2026
ebac855
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Oct 13, 2026
4904e8b
low hanging review fruit
jo-pol Oct 19, 2026
d6230d9
rename: prefix default for termsOfUseOrLicense
jo-pol Oct 19, 2026
9fd8cdd
further review cleanup
jo-pol Oct 19, 2026
8f9aa1e
oneToOne -> many
jo-pol Oct 19, 2026
591b45d
missed type, further review
jo-pol Oct 20, 2026
6c70e4e
missed default prefix
jo-pol Oct 20, 2026
d6a2474
typo
jo-pol Oct 20, 2026
55cd08f
missed default prefix
jo-pol Oct 20, 2026
f307ff6
fixed manual execution of sql script
jo-pol Oct 22, 2026
44ea3d7
fixed some runtime errors
jo-pol Oct 22, 2026
4f0d803
missed defaukt prefixes don't jet fix saving terms
jo-pol Oct 22, 2026
48ffbcf
broken test required partial revert of 9fd8cddd
jo-pol Oct 26, 2026
66409fa
typo
jo-pol Oct 26, 2026
bbbb1c3
Revert "cleanup"
jo-pol Oct 26, 2026
40dd811
restored validation
jo-pol Oct 26, 2026
1fec211
inconsistencies: UseAndAccess and still missing default prefeixes
jo-pol Oct 27, 2026
9c8d965
inconsistencies: UseAndAccess and still missing default prefeixes
jo-pol Oct 27, 2026
9cb9db2
lowhanging fruit of review
jo-pol Nov 3, 2026
510a0a7
fix validation
jo-pol Nov 9, 2026
ab6c558
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Nov 9, 2026
331b4f5
another TermsofUseAndAccess
jo-pol Nov 9, 2026
71ab438
documentation with TermsofUseAndAccess
jo-pol Nov 9, 2026
3dbbcfe
fix integration test as advised by copilot
jo-pol Nov 9, 2026
6dd85bd
fix for reintroduced issue #12590
jo-pol Nov 9, 2026
277c33d
limited early pid generation
jo-pol Nov 10, 2026
931927e
merge w/ develop
qqmyers Nov 11, 2026
019f84b
minor edits
qqmyers Nov 11, 2026
a7bdf90
minor edits
qqmyers Nov 11, 2026
8ac62fb
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Nov 12, 2026
c579771
fix resolved conflicts
jo-pol Nov 12, 2026
9c85b5c
inline simple method with single use
jo-pol Nov 12, 2026
72bfeb1
Merge remote-tracking branch 'DANS-Jo/split-terms-table' into split-t…
qqmyers Nov 12, 2026
5b228d3
work-around for 5.8.0.3 flyway script use of termsofuseandaccess_id c…
qqmyers Nov 12, 2026
ff15582
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Nov 12, 2026
16867f0
Merge remote-tracking branch 'DANS-Jo/split-terms-table' into split-t…
qqmyers Nov 12, 2026
dc18e0f
make sure baseline 1 runs
qqmyers Nov 12, 2026
4b2ed86
make sure baseline 1 runs
qqmyers Nov 12, 2026
e075576
Merge remote-tracking branch 'DANS-Jo/split-terms-table' into split-t…
qqmyers Nov 13, 2026
99d8129
set baseline in config
qqmyers Nov 13, 2026
b29cc03
two more scripts reference termsofuseandaccess
qqmyers Nov 13, 2026
18dce01
another script references termsofuseandaccess
qqmyers Nov 13, 2026
3380d2a
add missing sql to classes, copy unique changes <=6.3.0.1 to 6.12.1.1…
qqmyers Nov 13, 2026
3ea9710
remove grants to dvnuser
qqmyers Nov 13, 2026
ae9dc53
add CC0 license (the default)
qqmyers Nov 13, 2026
8afc495
CC0 sortorder = 1
qqmyers Nov 13, 2026
43174dd
debug
jo-pol Nov 16, 2026
037f630
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
qqmyers Nov 16, 2026
a14bd16
use default license when allowed in semantic api
qqmyers Nov 16, 2026
66a3b95
fix test now that license validation is being done
qqmyers Nov 16, 2026
2555e42
Merge remote-tracking branch 'DANS-Jo/split-terms-table' into split-t…
qqmyers Nov 16, 2026
54a49f7
reverted rename in response
jo-pol Nov 17, 2026
729bd55
more rename problems in response
jo-pol Nov 17, 2026
0f64dad
copilot comment
jo-pol Nov 17, 2026
6b4292c
Revert "copilot comment"
jo-pol Nov 17, 2026
41c0498
copilot comment
jo-pol Nov 17, 2026
6b72b96
defaultTermsOfUseOrLicense in template json
jo-pol Nov 17, 2026
619bd62
termOfAccess mistake
jo-pol Nov 17, 2026
9da3f31
termsOfAccess mistake
jo-pol Nov 17, 2026
7782cc6
retrying copilots breaking validation suggestion for testSemanticMeta…
jo-pol Nov 18, 2026
9e41b41
Revert "retrying copilots breaking validation suggestion for testSema…
jo-pol Nov 19, 2026
4597409
disabled additional validation
jo-pol Nov 19, 2026
49b2199
Merge remote-tracking branch 'IQSS/develop' into split-terms-table
jo-pol Nov 19, 2026
de18359
conditionally ignore harvest tests
jo-pol Nov 19, 2026
6206efa
conditionally ignore also tests
jo-pol Nov 19, 2026
95a48e2
Merge remote-tracking branch 'DANS-Jo/split-terms-table' into split-t…
qqmyers Nov 20, 2026
6afdeab
restore validation
qqmyers Nov 20, 2026
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
1 change: 1 addition & 0 deletions doc/release-notes/12659-split-TermsOfUseAndAccess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
To prepare for file-specific licenses/terms the table `TermsOfUseAndAccess` is split into two separate tables: `TermsOfUseOrLicense` and `TermsOfAccess`. Existing functionality is preserved.
6 changes: 6 additions & 0 deletions doc/sphinx-guides/source/api/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ This API changelog is experimental and we would love feedback on its usefulness.
:local:
:depth: 1

v6.13
-----

- API endpoints returning a ``Template`` object now return the fields ``defaultTermsOfUseOrLicense`` and ``termsOfAccess`` instead of the ``termsOfUseAndAccess`` field. The default applies to files without an explicit license or terms of use. Assigning a license or terms of use to a file is not yet implemented.


v6.12
-----

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ To delete metadata for a Dataset, send a json-ld representation of the fields to
export VERSION='1.0'
export SERVER_URL=https://demo.dataverse.org

Example: Delete the TermsOfUseAndAccess 'restrictions' value 'No restrictions' for the latest version using the DATASET PID
Example: Delete the TermsOfUseOrLicense 'restrictions' value 'No restrictions' for the latest version using the DATASET PID

curl -X PUT -H X-Dataverse-key:$API_TOKEN -H 'Content-Type: application/ld+json' -d '{"https://dataverse.org/schema/core#restrictions":"No restrictions"}' "$SERVER_URL/api/datasets/:persistentId/metadata/delete?persistentId=$DATASET_PID"

Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx-guides/source/installation/advanced.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ Once a standardized version of you Custom Terms are registered as a license, an

::

UPDATE termsofuseandaccess
UPDATE termsofuseorlicense
SET license_id = (SELECT license.id FROM license WHERE license.name = '<Your License Name>'), termsofuse=null, confidentialitydeclaration=null, t.specialpermissions=null, t.restrictions=null, citationrequirements=null, depositorrequirements=null, conditions=null, disclaimer=null
WHERE termsofuseandaccess.termsofuse LIKE '%<Unique phrase in your Terms of Use>%';
WHERE termsofuseorlicense.termsofuse LIKE '%<Unique phrase in your Terms of Use>%';

Optional Components
-------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/installation/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,7 @@ Example::
license.cc0_1.0.description=Creative Commons CC0 1.0 Universal Public Domain Dedication.
license.cc0_1.0.name=CC0 1.0

You have a lot of control over which licenses and terms are available. You can remove licenses and add new ones. You can decide which license is the default. You can remove "Custom Dataset Terms" as a option. You can remove all licenses and make "Custom Dataset Terms" the only option.
You have a lot of control over which licenses and terms are available. You can remove licenses and add new ones. You can decide which license is the default. You can remove "Custom Dataset Terms" as an option. You can remove all licenses and make "Custom Dataset Terms" the only option.

Before making changes, you are encouraged to read the :ref:`license-terms` section of the User Guide about why CC0 is the default and what the "Custom Dataset Terms" option allows.

Expand Down
22 changes: 16 additions & 6 deletions src/main/java/edu/harvard/iq/dataverse/Dataset.java
Original file line number Diff line number Diff line change
Expand Up @@ -373,16 +373,26 @@ private DatasetVersion createNewDatasetVersion(Template template, FileMetadata f
}
}

if (latestVersion.getTermsOfUseAndAccess()!= null){
TermsOfUseAndAccess terms = latestVersion.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
if (latestVersion.getTermsOfAccess() != null){
TermsOfAccess terms = latestVersion.getTermsOfAccess().copyTermsOfAccess();
terms.setDatasetVersion(dsv);
dsv.setTermsOfUseAndAccess(terms);
dsv.setTermsOfAccess(terms);
} else {
TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
TermsOfAccess terms = new TermsOfAccess();
terms.setDatasetVersion(dsv);
terms.setLicense(null);
terms.setFileAccessRequest(true);
dsv.setTermsOfUseAndAccess(terms);
dsv.setTermsOfAccess(terms);
}

if (latestVersion.getDefaultTermsOfUseOrLicense() != null){
TermsOfUseOrLicense terms = latestVersion.getDefaultTermsOfUseOrLicense().copyTermsOfUseOrLicense();
terms.setDatasetVersion(dsv);
dsv.setDefaultTermsOfUseOrLicense(terms);
} else {
TermsOfUseOrLicense terms = new TermsOfUseOrLicense();
terms.setDatasetVersion(dsv);
terms.setLicense(null);
dsv.setDefaultTermsOfUseOrLicense(terms);
}
}

Expand Down
94 changes: 59 additions & 35 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
import edu.harvard.iq.dataverse.util.JsfHelper;
import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
import static edu.harvard.iq.dataverse.util.StringUtil.isEmpty;
import static java.lang.Integer.*;

import edu.harvard.iq.dataverse.util.StringUtil;
import edu.harvard.iq.dataverse.util.SystemConfig;
Expand Down Expand Up @@ -105,7 +106,6 @@
import jakarta.faces.view.ViewScoped;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.json.Json;
import jakarta.json.JsonObject;
import jakarta.json.JsonObjectBuilder;
import jakarta.persistence.OptimisticLockException;
Expand Down Expand Up @@ -474,7 +474,7 @@ public Boolean isHasValidTermsOfAccess() {
hasValidTermsOfAccess = true;
return hasValidTermsOfAccess;
} else {
hasValidTermsOfAccess = TermsOfUseAndAccessValidator.isTOUAValid(dataset.getLatestVersion().getTermsOfUseAndAccess(), null);
hasValidTermsOfAccess = TermsOfAccessValidator.isTOUAValid(dataset.getLatestVersion().getTermsOfAccess(), null);
return hasValidTermsOfAccess;
}
}
Expand Down Expand Up @@ -1969,9 +1969,9 @@ public void handleChangeButton() {
/*
Issue 8646: necessary for the access popup which is shared by the dataset page and the file page
*/
setFileAccessRequest(workingVersion.getTermsOfUseAndAccess().isFileAccessRequest());
setTermsOfAccess(workingVersion.getTermsOfUseAndAccess().getTermsOfAccess());
setFileAccessRequest(workingVersion.getTermsOfAccess().isFileAccessRequest());
setTermsOfAccess(workingVersion.getTermsOfAccess().getTermsOfAccess());

resetVersionUI();
}

Expand Down Expand Up @@ -2256,13 +2256,6 @@ private String init(boolean initFull) {
} else if (!permissionService.on(dataset.getOwner()).has(Permission.AddDataset)) {
return permissionsWrapper.notAuthorized();
}
//Wait until the create command before actually getting an identifier, except if we're using directUpload
//Need to assign an identifier prior to calls to requestDirectUploadUrl if direct upload is used.
if ( isEmpty(dataset.getIdentifier()) && systemConfig.directUploadEnabled(dataset) ) {
CommandContext ctxt = commandEngine.getContext();
PidProvider pidProvider = ctxt.dvObjects().getEffectivePidGenerator(dataset);
pidProvider.generatePid(dataset);
}
dataverseTemplates.addAll(dataverseService.find(ownerId).getTemplates());
if (!dataverseService.find(ownerId).isTemplateRoot()) {
for (Template templateTest: dataverseService.find(ownerId).getParentTemplates()){
Expand All @@ -2275,27 +2268,26 @@ private String init(boolean initFull) {

defaultTemplate = dataverseService.find(ownerId).getDefaultTemplate();
if (defaultTemplate != null) {
selectedTemplate = defaultTemplate;
for (Template testT : dataverseTemplates) {
if (defaultTemplate.getId().equals(testT.getId())) {
selectedTemplate = testT;
}
}
selectedTemplate = getLastLoadedTemplate(defaultTemplate);
//Initalize with the default if there is one
dataset.setTemplate(selectedTemplate);
}

generatePidEarlyIfNeeded(); // note that this requires the template to be set first.

if(selectedTemplate != null) {
workingVersion = dataset.getOrCreateEditVersion(selectedTemplate, null);
updateDatasetFieldInputLevels();
} else {
workingVersion = dataset.getCreateVersion(licenseServiceBean.getDefault());
updateDatasetFieldInputLevels();
}

updateDatasetFieldInputLevels();

if (isHasPublicStore()){
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.label.fileAccess"),
BundleUtil.getStringFromBundle("dataset.message.publicInstall"));
}
setFileAccessRequest(workingVersion.getTermsOfUseAndAccess().isFileAccessRequest());
setTermsOfAccess(workingVersion.getTermsOfUseAndAccess().getTermsOfAccess());
setFileAccessRequest(workingVersion.getTermsOfAccess().isFileAccessRequest());
setTermsOfAccess(workingVersion.getTermsOfAccess().getTermsOfAccess());
resetVersionUI();

// FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Add New Dataset", " - Enter metadata to create the dataset's citation. You can add more metadata about this dataset after it's created."));
Expand Down Expand Up @@ -2371,7 +2363,39 @@ private String init(boolean initFull) {
}
return null;
}


private void generatePidEarlyIfNeeded() {
// The create command will generate the identifier, but we need it earlier if
// - requestDirectUploadUrl might get called (s3 storage needs the identifier to generate a direct upload URL)
// - a template is used with custom terms of use (the dataset globalId is used in generating a licenseUrl that is used in headers)

var directUploadEnabled = systemConfig.directUploadEnabled(dataset);

var template = dataset.getTemplate();
var hasTermsOfUse = template != null && (template.getDefaultTermsOfUseOrLicense().getLicense() == null);

if (isEmpty(dataset.getIdentifier()) && (directUploadEnabled || hasTermsOfUse)) {
CommandContext ctxt = commandEngine.getContext();
PidProvider pidProvider = ctxt.dvObjects().getEffectivePidGenerator(dataset);
pidProvider.generatePid(dataset);
}
}

private Template getLastLoadedTemplate(Template template) {
// Two object references may come from different loads.
// For example, one is detached and the other is managed,
// or a UI component expects the selected object to come from its options list.
if(template == null) {
return null;
}
for (Template testT : dataverseTemplates) {
if (template.getId().equals(testT.getId())) {
template = testT;
}
}
return template;
}

public void viewActionInitBreadcrumbs(){
if(!isAnonymizedAccess()){
dataverseHeaderFragment.initBreadcrumbs(dataset);
Expand Down Expand Up @@ -2718,11 +2742,11 @@ private void refreshSelectedFiles(List<FileMetadata> filesToRefresh){
if (readOnly) {
dataset = datasetService.find(dataset.getId());
}
String termsOfAccess = workingVersion.getTermsOfUseAndAccess().getTermsOfAccess();
boolean requestAccess = workingVersion.getTermsOfUseAndAccess().isFileAccessRequest();
String termsOfAccess = workingVersion.getTermsOfAccess().getTermsOfAccess();
boolean requestAccess = workingVersion.getTermsOfAccess().isFileAccessRequest();
workingVersion = dataset.getOrCreateEditVersion();
workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(requestAccess);
workingVersion.getTermsOfAccess().setTermsOfAccess(termsOfAccess);
workingVersion.getTermsOfAccess().setFileAccessRequest(requestAccess);
List <FileMetadata> newSelectedFiles = new ArrayList<>();
for (FileMetadata fmd : filesToRefresh){
for (FileMetadata fmdn: workingVersion.getFileMetadatas()){
Expand Down Expand Up @@ -2792,7 +2816,7 @@ public void edit(EditMode editMode) {
//FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset Metadata", " - Add more metadata about your dataset to help others easily find it."));
} else if (editMode.equals(EditMode.LICENSE)){
if(!isHasValidTermsOfAccess()){
workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(true);
workingVersion.getTermsOfAccess().setFileAccessRequest(true);
}
JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editTerms.label"), BundleUtil.getStringFromBundle("dataset.message.editTerms.message"));
//FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset License and Terms", " - Update your dataset's license and terms of use."));
Expand Down Expand Up @@ -3808,8 +3832,8 @@ private void restrictFiles(List<FileMetadata> filesToRestrict, boolean restricte
}

if (restricted) { // get values from access popup
workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(fileAccessRequest);
workingVersion.getTermsOfAccess().setTermsOfAccess(termsOfAccess);
workingVersion.getTermsOfAccess().setFileAccessRequest(fileAccessRequest);
}


Expand Down Expand Up @@ -3990,16 +4014,16 @@ public void setEnteredFileAccessRequest(Boolean fileAccessRequest) {


public String saveWithTermsOfUse() {
workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(enteredTermsOfAccess);
workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(enteredFileAccessRequest);
workingVersion.getTermsOfAccess().setTermsOfAccess(enteredTermsOfAccess);
workingVersion.getTermsOfAccess().setFileAccessRequest(enteredFileAccessRequest);
return save();
}

public void validateDeaccessionReason(FacesContext context, UIComponent toValidate, Object value) {

UIInput reasonRadio = (UIInput) toValidate.getAttributes().get("reasonRadio");
Object reasonRadioValue = reasonRadio.getValue();
Integer radioVal = new Integer(reasonRadioValue.toString());
Integer radioVal = parseInt(reasonRadioValue.toString());

if (radioVal == 7 && (value == null || value.toString().isEmpty())) {
((UIInput) toValidate).setValid(false);
Expand Down Expand Up @@ -5549,7 +5573,7 @@ public boolean isFileAccessRequestMultiButtonRequired(){
if (workingVersion == null) {
return false;
}
if (!workingVersion.getTermsOfUseAndAccess().isFileAccessRequest()){
if (!workingVersion.getTermsOfAccess().isFileAccessRequest()){
// return false;
}
for (FileMetadata fmd : workingVersion.getFileMetadatas()){
Expand Down
Loading
Loading