Merge branch 'develop' into 11634-api-get-available-file-categories

Author: sekmiller

doc/release-notes/11534-link-permissions.md

@@ -0,0 +1,3 @@
+Linking or unlinking a dataset or dataverse now requires the new "Link Dataset/Dataverse" permission.
+Previously, this action was covered by the "Publish Dataset/Dataverse" permission.
+Linking and publishing permissions can now be granted separately, allowing for more fine-grained access control.

doc/release-notes/11629-CSLFix.md

@@ -0,0 +1 @@
+The styled citations available through the "View Styled Citations" menu were including extra characters, e.g. 'doi:' in the URL form of the PIDs in the citation. This is now fixed.

doc/sphinx-guides/source/admin/dataverses-datasets.rst

@@ -118,7 +118,7 @@ Moves a dataset whose id is passed to a Dataverse collection whose alias is pass
 Link a Dataset
 ^^^^^^^^^^^^^^
 
-Creates a link between a dataset and a Dataverse collection (see the :ref:`dataset-linking` section of the User Guide for more information). ::
+Creates a link between a dataset and a Dataverse collection (see the :ref:`dataset-linking` section of the User Guide for more information). Accessible to users with Link Dataset permission on the Dataverse collection. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X PUT http://$SERVER/api/datasets/$linked-dataset-id/link/$linking-dataverse-alias
 
@@ -155,7 +155,7 @@ It returns a list in the following format (new format as of v6.4):
 Unlink a Dataset
 ^^^^^^^^^^^^^^^^
 
-Removes a link between a dataset and a Dataverse collection. Accessible to users with Publish Dataset permissions. ::
+Removes a link between a dataset and a Dataverse collection. Accessible to users with Link Dataset permission on the Dataverse collection. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/datasets/$linked-dataset-id/deleteLink/$linking-dataverse-alias
 

doc/sphinx-guides/source/developers/making-releases.rst

@@ -37,7 +37,7 @@ Some of the steps in this document are well-served by having their own dedicated
 There are a variety of reasons why a step might deserve its own dedicated issue:
 
 - The step can be done by a team member other than the person doing the release.
-- Stakeholders might be interested in the status of a step (e.g. has the released been deployed to the demo site).
+- Stakeholders might be interested in the status of a step (e.g. has the release been deployed to the demo site).
 
 Steps don't get their own dedicated issue if it would be confusing to have multiple people involved. Too many cooks in the kitchen, as they say. Also, some steps are so small the overhead of an issue isn't worth it.
 
@@ -81,10 +81,11 @@ Developers express the need for an addition to release notes by creating a "rele
 The task at or near release time is to collect these snippets into a single file.
 
 - Find the issue in GitHub that tracks the work of creating release notes for the upcoming release.
-- Create a branch, add a .md file for the release (ex. 5.10.1 Release Notes) in ``/doc/release-notes`` and write the release notes, making sure to pull content from the release note snippets mentioned above. Snippets may not include any issue number or pull request number in the text so be sure copy the number from the filename of the snippet into the final release note.
+- Create a branch, add a .md file for the release (ex. 5.10.1 Release Notes) in ``/doc/release-notes`` and write the release notes, making sure to pull content from the release note snippets mentioned above. Snippets may not include any issue number or pull request number in the text so be sure to copy the number from the filename of the snippet into the final release note.
 - Delete (``git rm``) the release note snippets as the content is added to the main release notes file.
 - Include instructions describing the steps required to upgrade the application from the previous version. These must be customized for release numbers and special circumstances such as changes to metadata blocks and infrastructure.
-- Take the release notes .md through the regular Code Review and QA process. That is, make a pull request. Here's an example: https://github.com/IQSS/dataverse/pull/10866
+- Make a pull request. Here's an example: https://github.com/IQSS/dataverse/pull/11613
+- Note that we won't merge the release notes until after we have confirmed that the upgrade instructions are valid by performing a couple upgrades.
 
 Deploy Release Candidate to Internal
 ------------------------------------
@@ -93,6 +94,8 @@ Deploy Release Candidate to Internal
 
 To upgrade internal, go to /doc/release-notes, open the release-notes.md file for the current release and perform all the steps under "Upgrade Instructions".
 
+Note that we haven't bumped the version yet so you won't be able to follow the steps exactly.
+
 Deploy Release Candidate to Demo
 --------------------------------
 
@@ -115,7 +118,14 @@ This will build the war file, and then automatically deploy it on dataverse-inte
 
 You can scp the war file to the demo server or download it from https://jenkins.dataverse.org/job/IQSS_Dataverse_Internal/ws/target/
 
-ssh into the demo server and follow the upgrade instructions in the release notes.
+ssh into the demo server and follow the upgrade instructions in the release notes. Again, note that we haven't bumped the version yet.
+
+Merge Release Notes (Once Ready)
+--------------------------------
+
+If the upgrade instructions are perfect, simply merge the release notes.
+
+If the upgrade instructions aren't quite right, work with the authors of the release notes until they are good enough, and then merge.
 
 Prepare Release Branch
 ----------------------
@@ -147,9 +157,9 @@ Return to the parent pom and make the following change, which is necessary for p
 
 (Before you make this change the value should be ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}``. Later on, after cutting a release, we'll change it back to that value.)
 
-For a regular release, make the changes above in the release branch you created, but hold off for a moment on making a pull requests because Jenkins will fail because it will be testing the previous release.
+For a regular release, make the changes above in the release branch you created, but hold off for a moment on making a pull request because Jenkins will fail because it will be testing the previous release.
 
-In the dataverse-ansible repo make bump the version in `jenkins.yml <https://github.com/gdcc/dataverse-ansible/blob/develop/tests/group_vars/jenkins.yml>`_ and make a pull request such as https://github.com/gdcc/dataverse-ansible/pull/386. Wait for it to be merged. Note that bumping on the Jenkins side like this will mean that all pull requests will show failures in Jenkins until they are updated to the version we are releasing.
+In the dataverse-ansible repo bump the version in `jenkins.yml <https://github.com/gdcc/dataverse-ansible/blob/develop/tests/group_vars/jenkins.yml>`_ and make a pull request such as https://github.com/gdcc/dataverse-ansible/pull/386. Wait for it to be merged. Note that bumping on the Jenkins side like this will mean that all pull requests will show failures in Jenkins until they are updated to the version we are releasing.
 
 Once dataverse-ansible has been merged, return to the branch you created above ("10852-bump-to-6.4" or whatever) and make a pull request. Ensure that all tests are passing and then put the PR through the normal review and QA process.
 
@@ -311,7 +321,7 @@ Create a new branch (any name is fine but ``prepare-next-iteration`` is suggeste
 
 - modules/dataverse-parent/pom.xml -> ``<profiles>`` -> profile "ct" -> ``<properties>`` -> Set ``<base.image.version>`` to ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}``
 
-Create a pull request and put it through code review, like usual. Give it a milestone of the next release, the one **after** the one we're working on. Once the pull request has been approved, merge it. It should the the first PR merged of the next release.
+Create a pull request and put it through code review, like usual. Give it a milestone of the next release, the one **after** the one we're working on. Once the pull request has been approved, merge it. It should be the first PR merged of the next release.
 
 For more background, see :ref:`base-image-supported-tags`. For an example, see https://github.com/IQSS/dataverse/pull/10896
 

doc/sphinx-guides/source/user/dataverse-management.rst

@@ -215,7 +215,7 @@ Dataset linking allows a Dataverse collection owner to "link" their Dataverse co
 
 For example, researchers working on a collaborative study across institutions can each link their own individual institutional Dataverse collections to the one collaborative dataset, making it easier for interested parties from each institution to find the study.
 
-In order to link a dataset, you will need your account to have the "Publish Dataset" permission on the Dataverse collection that is doing the linking. If you created the Dataverse collection then you should have this permission already, but if not then you will need to ask the admin of that Dataverse collection to assign that permission to your account. You do not need any special permissions on the dataset being linked.
+In order to link a dataset, you will need your account to have the "Link Dataset" permission on the Dataverse collection that is doing the linking. If you created the Dataverse collection then you should have this permission already, but if not then you will need to ask the admin of that Dataverse collection to assign that permission to your account. You do not need any special permissions on the dataset being linked.
 
 To link a dataset to your Dataverse collection, you must navigate to that dataset and click the white "Link" button in the upper-right corner of the dataset page. This will open up a window where you can type in the name of the Dataverse collection that you would like to link the dataset to. Select your Dataverse collection and click the save button. This will establish the link, and the dataset will now appear under your Dataverse collection.
 

scripts/api/data/role-curator.json

@@ -1,13 +1,14 @@
 {
     "alias":"curator",
     "name":"Curator",
-    "description":"For datasets, a person who can edit License + Terms, edit Permissions, and publish datasets.",
+    "description":"For datasets, a person who can edit License + Terms, edit Permissions, and publish and link datasets.",
     "permissions":[
         "ViewUnpublishedDataset",
         "EditDataset",
         "DownloadFile",
         "DeleteDatasetDraft",
         "PublishDataset",
+        "LinkDataset",
         "ManageDatasetPermissions",
         "ManageFilePermissions",
         "AddDataverse",

src/main/java/edu/harvard/iq/dataverse/DataCitation.java

@@ -749,7 +749,7 @@ public JsonObject getCSLJsonFormat() {
         if (seriesTitles != null) {
             itemBuilder.containerTitle(formatString(seriesTitles.get(0), true));
         }
-        itemBuilder.version(version).DOI(persistentId.asString());
+        itemBuilder.version(version).DOI(persistentId.asRawIdentifier());
         if (keywords != null) {
             itemBuilder
                     .categories(keywords.stream().map(keyword -> formatString(keyword, true)).toArray(String[]::new));

src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java

@@ -512,7 +512,7 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
 
         for (Dataverse res : results) {
             if (!remove.contains(res)) {
-                if (this.permissionService.requestOn(req, res).has(Permission.PublishDataset)) {
+                if (this.permissionService.requestOn(req, res).has(Permission.LinkDataset)) {
                     dataverseList.add(res);
                 }
             }
@@ -525,7 +525,7 @@ public List<Dataverse> filterDataversesForUnLinking(String query, DataverseReque
         List<Dataverse> dataverseList = new ArrayList<>();
         if (alreadyLinkeddv_ids != null && !alreadyLinkeddv_ids.isEmpty()) {
             alreadyLinkeddv_ids.stream().map((testDVId) -> this.find(testDVId)).forEachOrdered((dataverse) -> {
-                if (this.permissionService.requestOn(req, dataverse).has(Permission.PublishDataset)) {
+                if (this.permissionService.requestOn(req, dataverse).has(Permission.LinkDataset)) {
                     dataverseList.add(dataverse);
                 }
             });

src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java

@@ -48,7 +48,9 @@ public enum Permission implements java.io.Serializable {
     ManageDatasetPermissions(BundleUtil.getStringFromBundle("permission.managePermissionsDataset"), true, Dataset.class),
     ManageFilePermissions(BundleUtil.getStringFromBundle("permission.managePermissionsDataFile"), true, DataFile.class),
     PublishDataverse(BundleUtil.getStringFromBundle("permission.publishDataverse"), true, Dataverse.class),
+    LinkDataverse(BundleUtil.getStringFromBundle("permission.linkDataverse"), true, Dataverse.class),
     PublishDataset(BundleUtil.getStringFromBundle("permission.publishDataset"), true, Dataset.class, Dataverse.class),
+    LinkDataset(BundleUtil.getStringFromBundle("permission.linkDataset"), true, Dataset.class, Dataverse.class),
     // Delete
     DeleteDataverse(BundleUtil.getStringFromBundle("permission.deleteDataverse"), true, Dataverse.class),
     DeleteDatasetDraft(BundleUtil.getStringFromBundle("permission.deleteDataset"), true, Dataset.class);

src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetLinkingDataverseCommand.java

@@ -23,14 +23,14 @@
  * @author sarahferry
  */
 
-@RequiredPermissions( Permission.PublishDataset )
+@RequiredPermissions( Permission.LinkDataset )
 public class DeleteDatasetLinkingDataverseCommand extends AbstractCommand<Dataset>{
     private final DatasetLinkingDataverse doomed;
     private final Dataset editedDs;
     private final boolean index;
 
     public DeleteDatasetLinkingDataverseCommand(DataverseRequest aRequest, Dataset editedDs , DatasetLinkingDataverse doomed, boolean index) {
-        super(aRequest, editedDs);
+        super(aRequest, doomed.getLinkingDataverse());
         this.editedDs = editedDs;
         this.doomed = doomed;
         this.index = index;