-
Notifications
You must be signed in to change notification settings - Fork 493
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.
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
Support for configurable list of licenses #7920
Conversation
* First db table and api. * Final changes for prototype. * Add integration tests. * Fix indentation. * Add prototype of newest changes. * Add URI and URL objects, and new endpoints. * Add Apache icons. * Change tokens to licenses. * Change URIException to IllegalStateException.
Merged back develop
DD-421 wrong location header
DD-424 post wrong json
DD-425 missing error messages
This reverts commit 0cf7359.
…license-info-to-publish-dataset-dialog
DD-422 posting same license error
…lish-dataset-dialog DD-446 add license info to publish dataset dialog
…multi-license QA fixes
|
@qqmyers Thanks, Jim. I think that added note on deploying would be helpful. |
|
@qqmyers OK, seems like 7 is still an issue so I suppose pr not updated yet? for 8, I had refreshed page, navigated away and back, and restarted payara. Will retest but I had tried all that. As for the export related stuff, 9, 11-14, I've asked Julian to take a look at your comments seeing as he is more up to speed on Design and Export. I am a bit confused by your ending comment on 10, unless you'd meant to make it 14. 10 is the popup text next to cc0 and you addressed it earlier. |
Yeah - the raw text of my previous comment says 14 but the rendering changes that to 10. I made some edits above. |
DANS-KNAW#145 is the one to watch for 7 |
Hi all.
|
…-license ~final QA updates
Seeing as this passes all functional tests and the only remaining issue is a very small but important doc change, we'll merge this and address the doc issue separately to move things along. thanks @janvanmansum for all the work! |
This PR is currently an implementation of the "Consensus Proposal" from this document: https://docs.google.com/document/d/10htygglMdlABYWqtcZpqd8sHOwIe6sLL_UJtTv8NEKw/edit . Key parts of this document are replicated in the fields below.
What this PR does / why we need it:
Current State:
Dataverse allows only either CC0 or Custom Terms to be specified for a Dataset. There is broad interest in supporting additional licenses in a managed, machine readable way.
Consensus Proposal:
As part of its efforts, DANS has worked with IQSS and GDCC to define an update to support multiple licenses that it will implement and contribute to the Dataverse community.
Summary:
The proposed work will make it possible for site administrators to configure their Dataverse installation with additional/alternate pre-defined license choices. Admins will also be able to decide whether custom licenses can be created (i.e. by adding entries for some of the existing entries on the Terms tab), whether there is a default license and, if so, which license it is. Users will be able to select from a list of configured licenses prior to publishing a Dataset version or enter custom terms (if custom licenses are allowed). The chosen license will also be more visible to both Dataset creators and those browsing or downloading from a Dataset– i.e. on the dataset page, in the publish dialog.
Which issue(s) this PR closes:
Closes #7440
Special notes for your reviewer:
The design of this feature has been changed since #7440 was described. For an up-to-date description of the feature as it has been implemented, see below test scenario and "Additional Documentation".
Suggestions on how to test this:
Build the .war file from this branch.
Install Dataverse release v5.5
Deploy the .war file you built in step 1:
/usr/local/payara5/glassfish/bin/asadmin deploy --force --name dataverse /path/to/your-dataverse.war
Create a couple of license configuration JSON files, for example:
cc-by.json
:cc-by-sa.json
:Add the licenses to Dataverse:
curl -X POST -H 'Content-Type: application/json' \ http://localhost:8080/api/admin/licenses --data-binary @cc-by-sa.json
Create a new dataset in Dataverse and navigate to the Terms tab. Click "Edit Terms Requirements". You should now have a drop-down to select from:
Turn off "Custom Terms" as follows:
Go back to the Terms tab and notice that the Custom Terms item is gone.
Select a license, save the dataset. The license is displayed in the desciption of the dataset:
Click Publish Dataset. The selected terms are displayed in the publish confirmation dialog:
Click Continue.
Further tests:
:AllowCustomTerms
on again. When selecting the "Custom Terms" item the "Dataset Terms" block is extended with the fields "Custom Terms" ... "Disclaimer".active
tofalse
. It will no longer be available when editing datasets, but existing dataset(versions) are not affected.Does this PR introduce a user interface change? If mockups are available, please link/include them here:
See test scenarios in previous section.
Is there a release notes update needed for this change?:
No
Additional documentation:
See item "Manage Available Standard License Terms" in
doc/sphinx-guides/source/api/native-api.rst
.