From 7e7a502ec1c87d5b99cbbf6487154ea466d9f53d Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 9 Mar 2021 12:13:31 -0500
Subject: [PATCH 01/44] download differentially private statistics #7400

This is just a stub for now with many FIXMEs.
---
 .../iq/dataverse/AuxiliaryFileServiceBean.java |  8 ++++++++
 .../iq/dataverse/FileDownloadServiceBean.java  |  8 ++++++++
 .../webapp/file-download-button-fragment.xhtml | 18 ++++++++++++++++++
 .../edu/harvard/iq/dataverse/api/AccessIT.java | 10 ++++++++--
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
index 4f97c146e7b..0275ac4db5f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -8,6 +8,7 @@
 import java.io.InputStream;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
+import java.util.List;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
@@ -15,6 +16,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+import javax.persistence.TypedQuery;
 import org.apache.tika.Tika;
 
 /**
@@ -114,4 +116,10 @@ public AuxiliaryFile lookupAuxiliaryFile(DataFile dataFile, String formatTag, St
         }
     }
 
+    public List<AuxiliaryFile> findAuxiliaryFiles(DataFile dataFile) {
+        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId", AuxiliaryFile.class);
+        query.setParameter("dataFileId", dataFile.getId());
+        return query.getResultList();
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
index 4b0272d4a36..6f7d62924ac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
@@ -280,6 +280,14 @@ private void redirectToBatchDownloadAPI(String multiFileString, Boolean download
         redirectToBatchDownloadAPI(multiFileString, true, downloadOriginal);
     }
 
+    public void redirectToAuxFileDownloadAPI(Long fileId, String formatTag, String formatVersion) {
+        String fileDownloadUrl = "/api/access/datafile/" + fileId + "/metadata/" + formatTag + "/" + formatVersion;
+        try {
+            FacesContext.getCurrentInstance().getExternalContext().redirect(fileDownloadUrl);
+        } catch (IOException ex) {
+            logger.info("Failed to issue a redirect to aux file download url (" + fileDownloadUrl + "): " + ex);
+        }
+    }
     
     /**
      * Launch an "explore" tool which is a type of ExternalTool such as
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 85fe60863b4..82ca8b608a4 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -219,6 +219,24 @@
     </ui:fragment>
     <!-- END: Request Access Options -->
     
+    <!-- Auxiliary Files -->
+    <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
+        <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
+        <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
+        <ul class="dropdown-menu">
+            <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}}">
+                <li>
+                    <!--FIXME: Don't hard code "dpJSON" and "v1". See FIXME below.-->
+                    <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, 'dpJSON', 'v1')}">
+                        <!--FIXME: Why does auxFile show up as a String when we try auxFile.formatTag?-->
+                        <h:outputText value="#{auxFile}"/>
+                    </p:commandLink>
+                </li>
+            </ui:repeat>
+        </ul>
+    </li>
+    <!-- END: Auxiliary Files -->
+
     <!-- Explore Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools}">
         <!--exploreTools is set as a ui:param by the file and dataset pages-->
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
index 4fb1271c8c9..80db1502c07 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
@@ -103,6 +103,11 @@ public static void setUp() throws InterruptedException {
         Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
         createDatasetResponse.prettyPrint();
         datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // TODO: Get this working.
+        Response allowAccessRequests = UtilIT.allowAccessRequests(datasetId.toString(), true, apiToken);
+        allowAccessRequests.prettyPrint();
+        allowAccessRequests.then().assertThat().statusCode(200);
         
         basicFileName = "004.txt";
         String basicPathToFile = "scripts/search/data/replace_test/" + basicFileName;
@@ -179,13 +184,14 @@ public void testSaveAuxiliaryFileWithVersion() throws IOException {
         Response response = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .multiPart("file", new File(pathToFile), mimeType)
-                .post("/api/access/datafile/" + tabFile1Id + "/metadata/dpJSON/v1");
+                // In the DP use case, the file is restricted.
+                .post("/api/access/datafile/" + tabFile3IdRestricted + "/metadata/dpJSON/v1");
         response.prettyPrint();
         assertEquals(200, response.getStatusCode());
         System.out.println("Downloading Aux file that was just added");
         response = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .get("/api/access/datafile/" + tabFile1Id + "/metadata/dpJSON/v1");
+                .get("/api/access/datafile/" + tabFile3IdRestricted + "/metadata/dpJSON/v1");
         
         String dataStr = response.prettyPrint();
         assertEquals(dataStr,"a\n");

From 2e89bde5ece06f402f2ba25a9e22ff1b48cfa180 Mon Sep 17 00:00:00 2001
From: Danny Brooke <danny_brooke@harvard.edu>
Date: Thu, 4 Mar 2021 19:44:11 -0500
Subject: [PATCH 02/44] initial docs for DP metadata access

---
 .../source/user/dataset-management.rst        | 21 +++++++++++++++++++
 .../source/user/find-use-data.rst             | 13 ++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/doc/sphinx-guides/source/user/dataset-management.rst b/doc/sphinx-guides/source/user/dataset-management.rst
index 1d5f1344c6c..8b9ef3d691c 100755
--- a/doc/sphinx-guides/source/user/dataset-management.rst
+++ b/doc/sphinx-guides/source/user/dataset-management.rst
@@ -179,6 +179,8 @@ Additional download options available for tabular data (found in the same drop-d
 - Data File Citation (currently in either RIS, EndNote XML, or BibTeX format); 
 - All of the above, as a zipped bundle. 
 
+Differentially Private (DP) Metadata can also be accessed for restricted tabular files if the data depositor has created a DP Metadata Release. See :ref:`dp-release-create` for more information.
+
 Astronomy (FITS)
 ----------------
 
@@ -210,6 +212,8 @@ Restricted Files
 
 When you restrict a file it cannot be downloaded unless permission has been granted.
 
+Differentially Private (DP) Metadata can be accessed for restricted tabular files if the data depositor has created a DP Metadata Release. See :ref:`dp-release-create` for more information.
+
 See also :ref:`terms-of-access` and :ref:`permissions`.
 
 Edit Files
@@ -302,6 +306,23 @@ If you restrict any files in your dataset, you will be prompted by a pop-up to e
 
 See also :ref:`restricted-files`.
 
+.. _dp-release-create:
+
+Creating and Depositing Differentially Private Metadata (Experimental)
+----------------------------------------------------------------------
+
+Through an integration with tools from the OpenDP Project (opendp.io), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
+
+If this integration has been enabled in your Dataverse installation, you can follow these steps to create a DP Metadata Release and make it available to researchers, while still keeping the files themselves restricted and able to be accessed after a successful access request.
+
+- Deposit a tabular file and let the ingest process complete
+- Restrict the File
+- In the kebab next to the file on the dataset page, or from the "Edit Files" dropdown on the file page, click "OpenDP Tool"
+- Go through the process to create a DP Metadata Release in the OpenDP tool, and at the end of the process deposit the DP Metadata Release back to the Dataverse installation
+- Publish the Dataset
+
+Once the dataset is published, users will be able to request access using the normal process, but will also have the option to download DP Statistics in order to get more information about the file. 
+
 Guestbook
 ---------
 
diff --git a/doc/sphinx-guides/source/user/find-use-data.rst b/doc/sphinx-guides/source/user/find-use-data.rst
index 97b7694b9f2..95939bc65ee 100755
--- a/doc/sphinx-guides/source/user/find-use-data.rst
+++ b/doc/sphinx-guides/source/user/find-use-data.rst
@@ -153,6 +153,19 @@ Explore Data
 
 Some file types and datasets offer data exploration options if external tools have been installed. The tools are described in the :doc:`/admin/external-tools` section of the Admin Guide.
 
+Exploratory Data Analysis Using Differentially Private Metadata (Experimental)
+------------------------------------------------------------------------------
+
+Through an integration with tools from the OpenDP Project (opendp.io), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file in a Dataverse installation, and then determine whether or not access to file contains useful information and make an informed decision about whether or not to request access to the original files themselves.
+
+If the data depositor has made available DP metadata for one or more files in their dataset, these access options will appear on the access dropdown on both the Dataset Page and the File Page. These access options will be available even if a file is restricted. Three types of DP metadata will be available:
+
+- .PDF
+- .XML
+- .JSON
+  
+For more information about how data depositors can enable access using the OpenDP tool, visit the :doc:`/user/dataset-management` section of the User Guide.
+
 .. |image-file-tree-view| image:: ./img/file-tree-view.png
    :class: img-responsive
 .. |image-file-search-facets| image:: ./img/file-search-facets.png

From d8e4b0a26fb0aab8456141dc2a4c6375ed1544c4 Mon Sep 17 00:00:00 2001
From: Danny Brooke <danny_brooke@harvard.edu>
Date: Fri, 5 Mar 2021 14:54:00 -0500
Subject: [PATCH 03/44] update to match text from depositing data

---
 doc/sphinx-guides/source/user/find-use-data.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/user/find-use-data.rst b/doc/sphinx-guides/source/user/find-use-data.rst
index 95939bc65ee..95485b3c66a 100755
--- a/doc/sphinx-guides/source/user/find-use-data.rst
+++ b/doc/sphinx-guides/source/user/find-use-data.rst
@@ -156,7 +156,7 @@ Some file types and datasets offer data exploration options if external tools ha
 Exploratory Data Analysis Using Differentially Private Metadata (Experimental)
 ------------------------------------------------------------------------------
 
-Through an integration with tools from the OpenDP Project (opendp.io), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file in a Dataverse installation, and then determine whether or not access to file contains useful information and make an informed decision about whether or not to request access to the original files themselves.
+Through an integration with tools from the OpenDP Project (opendp.io), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
 
 If the data depositor has made available DP metadata for one or more files in their dataset, these access options will appear on the access dropdown on both the Dataset Page and the File Page. These access options will be available even if a file is restricted. Three types of DP metadata will be available:
 

From 53b4201f8e24d2c3d83659fd4c36dae74da39144 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 9 Mar 2021 15:56:08 -0500
Subject: [PATCH 04/44] Moved aux file download link to clean up float issue
 [ref #7400]

---
 .../file-download-button-fragment.xhtml       | 136 +++++++++---------
 1 file changed, 70 insertions(+), 66 deletions(-)

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 82ca8b608a4..4df213a436b 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -11,9 +11,55 @@
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
 
+    <!-- Request Access Options -->
+    <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
+                             and fileMetadata.dataFile.owner.fileAccessRequest}">
+        <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+        
+       <style type="text/css">
+            div[id$="requestPanel"].iq-dropdown-list-item {display:list-item !important;}
+            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}
+            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:focus,
+            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}
+            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active,
+            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:focus,
+            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}
+            
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;white-space:nowrap}
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled,
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{background-color:transparent;color:#777;}
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled{cursor:not-allowed;}
+            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{pointer-events:none;}
+        </style>
+    
+        <p:outputPanel id="requestPanel" styleClass="iq-dropdown-list-item #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}"
+                       rendered="#{fileDownloadHelper.session.user.authenticated}">
+            <p:commandLink styleClass="btn-request"
+                        actionListener="#{fileDownloadHelper.handleCommandLinkClick(fileMetadata)}"
+                        update="@([id$=requestAccessConsolidated]), @([id$=requestPanel])"
+                        id="requestAccessConsolidated"
+                        disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
+                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+            </p:commandLink>
+        </p:outputPanel>
+    
+        <li jsf:rendered="#{!fileDownloadHelper.session.user.authenticated}">
+            <p:commandLink styleClass="btn-request" 
+                        process="@this"
+                        onclick="PF('accessSignUpLogIn_popup').show()">
+                #{bundle['file.requestAccess']}
+            </p:commandLink>
+        </li>
+    </ui:fragment>
+    <!-- END: Request Access Options -->
+    
     <!-- Download Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata)}">
         <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+        <!-- NON-TABULAR + PACKAGE DOWNLOAD OPTIONS -->
         <li jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                     and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
@@ -59,7 +105,7 @@
                 #{bundle.download}
             </p:commandLink>
         </li>
-        <!-- SUBMENU LINK -->
+        <!-- TABULAR DOWNLOAD OPTIONS -->
         <ui:fragment rendered="#{fileMetadata.dataFile.tabularData}">
             <ui:remove>
             <li>
@@ -168,75 +214,33 @@
                 </ul>
             </li>
         </ui:fragment>
-        <!-- END: SUBMENU LINK -->
+        <!-- END: TABULAR DOWNLOAD OPTIONS -->
+        
+        <!-- AUX FILES DOWNLOAD OPTIONS -->
+        <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
+            <li class="dropdown-submenu pull-left">
+                <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
+                <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
+                <ul class="dropdown-menu">
+                    <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}}">
+                        <li>
+                            <!--FIXME: Don't hard code "dpJSON" and "v1". See FIXME below.-->
+                            <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, 'dpJSON', 'v1')}">
+                                <!--FIXME: Why does auxFile show up as a String when we try auxFile.formatTag?-->
+                                <h:outputText value="#{auxFile}"/>
+                            </p:commandLink>
+                        </li>
+                    </ui:repeat>
+                </ul>
+            </li>
+        </ui:fragment>
+        <!-- END: AUX FILES  DOWNLOAD OPTIONS -->
+        
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
-    <!-- Download Options -->
-    
-    <!-- Request Access Options -->
-    <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
-                             and fileMetadata.dataFile.owner.fileAccessRequest}">
-        <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
-        
-       <style type="text/css">
-            div[id$="requestPanel"].iq-dropdown-list-item {display:list-item !important;}
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active,
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}
-            
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;white-space:nowrap}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled,
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{background-color:transparent;color:#777;}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled{cursor:not-allowed;}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{pointer-events:none;}
-        </style>
+    <!-- END: Download Options -->
     
-        <p:outputPanel id="requestPanel" styleClass="iq-dropdown-list-item #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}"
-                       rendered="#{fileDownloadHelper.session.user.authenticated}">
-            <p:commandLink styleClass="btn-request"
-                        actionListener="#{fileDownloadHelper.handleCommandLinkClick(fileMetadata)}"
-                        update="@([id$=requestAccessConsolidated]), @([id$=requestPanel])"
-                        id="requestAccessConsolidated"
-                        disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
-            </p:commandLink>
-        </p:outputPanel>
-    
-        <li jsf:rendered="#{!fileDownloadHelper.session.user.authenticated}">
-            <p:commandLink styleClass="btn-request" 
-                        process="@this"
-                        onclick="PF('accessSignUpLogIn_popup').show()">
-                #{bundle['file.requestAccess']}
-            </p:commandLink>
-        </li>
-    </ui:fragment>
-    <!-- END: Request Access Options -->
-    
-    <!-- Auxiliary Files -->
-    <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
-        <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
-        <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
-        <ul class="dropdown-menu">
-            <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}}">
-                <li>
-                    <!--FIXME: Don't hard code "dpJSON" and "v1". See FIXME below.-->
-                    <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, 'dpJSON', 'v1')}">
-                        <!--FIXME: Why does auxFile show up as a String when we try auxFile.formatTag?-->
-                        <h:outputText value="#{auxFile}"/>
-                    </p:commandLink>
-                </li>
-            </ui:repeat>
-        </ul>
-    </li>
-    <!-- END: Auxiliary Files -->
-
     <!-- Explore Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools}">
         <!--exploreTools is set as a ui:param by the file and dataset pages-->

From 5c8085d9cacd32205b93f8216968a204e5a75102 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 10 Mar 2021 10:06:35 -0500
Subject: [PATCH 05/44] Moved aux file download link out of canDownload render
 logic [ref #7400]

---
 .../file-download-button-fragment.xhtml       | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 4df213a436b..ab8a8613293 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -216,31 +216,34 @@
         </ui:fragment>
         <!-- END: TABULAR DOWNLOAD OPTIONS -->
         
-        <!-- AUX FILES DOWNLOAD OPTIONS -->
-        <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
-            <li class="dropdown-submenu pull-left">
-                <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
-                <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
-                <ul class="dropdown-menu">
-                    <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}}">
-                        <li>
-                            <!--FIXME: Don't hard code "dpJSON" and "v1". See FIXME below.-->
-                            <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, 'dpJSON', 'v1')}">
-                                <!--FIXME: Why does auxFile show up as a String when we try auxFile.formatTag?-->
-                                <h:outputText value="#{auxFile}"/>
-                            </p:commandLink>
-                        </li>
-                    </ui:repeat>
-                </ul>
-            </li>
-        </ui:fragment>
-        <!-- END: AUX FILES  DOWNLOAD OPTIONS -->
-        
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
     <!-- END: Download Options -->
     
+    <!-- AUX FILES DOWNLOAD OPTIONS -->
+    <ui:fragment rendered="#{true or not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
+        <li class="dropdown-submenu pull-left">
+            <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
+            <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
+            <ul class="dropdown-menu">
+                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}}">
+                    <li>
+                        <!--FIXME: Don't hard code "dpJSON" and "v1". See FIXME below.-->
+                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, 'dpJSON', 'v1')}">
+                            <!--FIXME: Why does auxFile show up as a String when we try auxFile.formatTag?-->
+                            <h:outputText value="#{auxFile}"/>
+                        </p:commandLink>
+                    </li>
+                </ui:repeat>
+            </ul>
+        </li>
+        
+        <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
+        <li role="presentation" class="clearfix"></li>
+    </ui:fragment>
+    <!-- END: AUX FILES  DOWNLOAD OPTIONS -->
+    
     <!-- Explore Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools}">
         <!--exploreTools is set as a ui:param by the file and dataset pages-->

From 767f2ebca92c3c3b11d7996ad06a1bbabf4ce956 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 10 Mar 2021 10:32:17 -0500
Subject: [PATCH 06/44] Removed aux file download link debug code and typo [ref
 #7400]

---
 src/main/webapp/file-download-button-fragment.xhtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index ab8a8613293..14073ce35c7 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -222,12 +222,12 @@
     <!-- END: Download Options -->
     
     <!-- AUX FILES DOWNLOAD OPTIONS -->
-    <ui:fragment rendered="#{true or not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
+    <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
         <li class="dropdown-submenu pull-left">
             <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
             <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
             <ul class="dropdown-menu">
-                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}}">
+                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
                     <li>
                         <!--FIXME: Don't hard code "dpJSON" and "v1". See FIXME below.-->
                         <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, 'dpJSON', 'v1')}">
@@ -242,7 +242,7 @@
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
-    <!-- END: AUX FILES  DOWNLOAD OPTIONS -->
+    <!-- END: AUX FILES DOWNLOAD OPTIONS -->
     
     <!-- Explore Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools}">

From 3c0140b3fa7fca039fdf7aa8cf5dfca18c021865 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 10 Mar 2021 14:24:28 -0500
Subject: [PATCH 07/44] formatTag and formatVersion are working now #7400

Not sure why they didn't work before but they work now.
---
 src/main/webapp/file-download-button-fragment.xhtml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 14073ce35c7..9bf812249d4 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -229,10 +229,9 @@
             <ul class="dropdown-menu">
                 <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
                     <li>
-                        <!--FIXME: Don't hard code "dpJSON" and "v1". See FIXME below.-->
-                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, 'dpJSON', 'v1')}">
-                            <!--FIXME: Why does auxFile show up as a String when we try auxFile.formatTag?-->
-                            <h:outputText value="#{auxFile}"/>
+                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
+                            <h:outputText value="#{auxFile.formatTag}"/>
+                            <h:outputText value=" (#{auxFile.formatVersion})"/>
                         </p:commandLink>
                     </li>
                 </ui:repeat>

From 0127d5cd4d840bef074968d78166df15c891d851 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 10 Mar 2021 16:37:16 -0500
Subject: [PATCH 08/44] Render logic changes to file access btn and dropdown
 options [ref #7400]

---
 src/main/webapp/dataset.xhtml                 |  3 +-
 .../file-download-button-fragment.xhtml       | 85 ++++++++-----------
 src/main/webapp/file.xhtml                    |  3 +-
 src/main/webapp/resources/css/structure.css   | 17 ++++
 4 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 4f23d4c7b44..4de5e5ad5b2 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -36,8 +36,9 @@
                                                                    or (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset()))}"/>
             <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
                                                     fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
+            <!-- NOTE removed fileAccessRequest logic in order to always display the file access btn -->
             <ui:param name="showAccessFileButtonGroup" value="#{fileDownloadHelper.canDownloadFile(fileMetadata)
-                                                                or (!fileDownloadHelper.canDownloadFile(fileMetadata) and DatasetPage.dataset.fileAccessRequest)
+                                                                or (!fileDownloadHelper.canDownloadFile(fileMetadata))
                                                                 and (!DatasetPage.workingVersion.deaccessioned
                                                                 or (DatasetPage.workingVersion.deaccessioned and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)))}"/>
             <ui:param name="publishDataset" value="#{DatasetPage.publishDatasetPopup()}"/>
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 9bf812249d4..9057be56fe5 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -10,31 +10,13 @@
     xmlns:cc="http://java.sun.com/jsf/composite"
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+    
+    <!-- Download Options -->
+    <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
 
     <!-- Request Access Options -->
     <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
                              and fileMetadata.dataFile.owner.fileAccessRequest}">
-        <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
-        
-       <style type="text/css">
-            div[id$="requestPanel"].iq-dropdown-list-item {display:list-item !important;}
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active,
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}
-            
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;white-space:nowrap}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled,
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{background-color:transparent;color:#777;}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled{cursor:not-allowed;}
-            div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{pointer-events:none;}
-        </style>
-    
         <p:outputPanel id="requestPanel" styleClass="iq-dropdown-list-item #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}"
                        rendered="#{fileDownloadHelper.session.user.authenticated}">
             <p:commandLink styleClass="btn-request"
@@ -54,11 +36,14 @@
             </p:commandLink>
         </li>
     </ui:fragment>
+    <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
+                             and !fileMetadata.dataFile.owner.fileAccessRequest}">
+        <li class="disabled"><a href="#"><em>Users may not request access to files.</em></a></li>
+    </ui:fragment>
     <!-- END: Request Access Options -->
     
-    <!-- Download Options -->
+    <!-- CAN DOWNLOAD ACCESS Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata)}">
-        <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
         <!-- NON-TABULAR + PACKAGE DOWNLOAD OPTIONS -->
         <li jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
@@ -193,55 +178,59 @@
                     #{bundle['file.downloadBtn.format.var']}
                 </p:commandLink>
             </li>
-            <li class="dropdown-submenu pull-left">
-                <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
-                <ul class="dropdown-menu">
-                    <li>
-                        <h:commandLink styleClass="btn-download" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
-                        </h:commandLink>
-                    </li>
-                    <li>
-                        <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
-                        </h:commandLink>
-                    </li>
-                    <li>
-                        <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
-                        </h:commandLink>
-                    </li>
-                </ul>
-            </li>
         </ui:fragment>
         <!-- END: TABULAR DOWNLOAD OPTIONS -->
-        
+    </ui:fragment>
+    <!-- END: CAN DOWNLOAD ACCESS Options -->
+    
+    <!-- CITATION FILES DOWNLOAD OPTIONS -->
+    <ui:fragment rendered="#{true}">
+        <li class="dropdown-submenu pull-left">
+            <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
+            <ul class="dropdown-menu">
+                <li>
+                    <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
+                        <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
+                    </h:commandLink>
+                </li>
+                <li>
+                    <h:commandLink styleClass="btn-download" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
+                        <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
+                    </h:commandLink>
+                </li>
+                <li>
+                    <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
+                        <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
+                    </h:commandLink>
+                </li>
+            </ul>
+        </li>
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
-    <!-- END: Download Options -->
+    <!-- CITATION FILES DOWNLOAD OPTIONS -->
     
     <!-- AUX FILES DOWNLOAD OPTIONS -->
     <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
         <li class="dropdown-submenu pull-left">
             <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
+            <!--FIXME: Should be ui:repeat to display multiple types of aux files from multiple types of tools-->
             <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
             <ul class="dropdown-menu">
                 <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
                     <li>
                         <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
-                            <h:outputText value="#{auxFile.formatTag}"/>
-                            <h:outputText value=" (#{auxFile.formatVersion})"/>
+                            <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
                         </p:commandLink>
                     </li>
                 </ui:repeat>
             </ul>
         </li>
-        
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
     <!-- END: AUX FILES DOWNLOAD OPTIONS -->
+    <!-- END: Download Options -->
     
     <!-- Explore Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools}">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 34717bfae3b..999213f6b0b 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -18,8 +18,9 @@
             <ui:param name="pageTitle" value="#{FilePage.fileMetadata.dataFile.displayName} - #{FilePage.file.owner.owner.displayName}"/>
             <ui:param name="dataverse" value="#{FilePage.file.owner.owner}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
+            <!-- NOTE removed fileAccessRequest logic in order to always display the file access btn -->
             <ui:param name="showAccessFileButtonGroup" value="#{fileDownloadHelper.canDownloadFile(FilePage.fileMetadata)
-                                                                  or (!fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) and FilePage.fileMetadata.dataFile.owner.fileAccessRequest)
+                                                                  or (!fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))
                                                                   and (!FilePage.fileMetadata.datasetVersion.deaccessioned
                                                                         or (FilePage.fileMetadata.datasetVersion.deaccessioned and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)))}"/>
             <ui:define name="meta_header">
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index a8867e72ce6..5e2832c397f 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -735,6 +735,23 @@ div[id$="filesTable"] thead[id$="filesTable_head"] th.ui-selection-column .ui-ch
     word-break: break-word;
 }
 
+/* REQUEST ACCESS DOWNLOAD OPTION LINK */
+div[id$="requestPanel"].iq-dropdown-list-item {display:list-item !important;}
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:focus,
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active,
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:focus,
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;white-space:nowrap}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled,
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{background-color:transparent;color:#777;}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled{cursor:not-allowed;}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{pointer-events:none;}
+
 /* PAGINATION */
 div[id$="filesTable"] .ui-paginator {
     font-weight: normal;

From fc9381a715fadca734143105822ca30fdc09fbbf Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 17 Mar 2021 14:26:27 -0400
Subject: [PATCH 09/44] Added file access status to dropdown, tooltips to
 icons, other aux file option ui clean up [ref #7400, #7469]

---
 src/main/java/propertyFiles/Bundle.properties |   4 +-
 .../file-download-button-fragment.xhtml       | 116 ++++++++++--------
 src/main/webapp/file-info-fragment.xhtml      |   4 +-
 src/main/webapp/file.xhtml                    |   4 +-
 src/main/webapp/resources/css/structure.css   |   1 +
 src/main/webapp/search-include-fragment.xhtml |   4 +-
 6 files changed, 74 insertions(+), 59 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 8352e66c92d..a2515f29a67 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1600,8 +1600,8 @@ file.ingestFailed.header=Upload Completed with Errors
 file.ingestFailed.message=Tabular data ingest failed.
 file.downloadBtn.format.all=All File Formats + Information
 file.downloadBtn.format.tab=Tab-Delimited
-file.downloadBtn.format.original=Original File Format ({0})
-file.downloadBtn.format.rdata=RData Format
+file.downloadBtn.format.original={0} (Original File Format)
+file.downloadBtn.format.rdata=RData
 file.downloadBtn.format.var=Variable Metadata
 file.downloadBtn.format.citation=Data File Citation
 file.more.information.link=Link to more file information for 
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 9057be56fe5..8c28bc880dd 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -11,10 +11,17 @@
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
     
-    <!-- Download Options -->
-    <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+    <!-- Access Status -->
+    <li class="dropdown-header">File Access <span class="glyphicon glyphicon-file"/></li>
+    <li><span class="dropdown-item-text">
+            <span class="#{!fileMetadata.restricted ?
+                           'glyphicon glyphicon-globe text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'glyphicon glyphicon-lock text-danger' : 'icon-unlock text-success')}"/>
+            <h:outputText 
+                value=" #{!fileMetadata.restricted ? 'Public' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'Restricted' : 'Restricted with Access Granted')}" 
+                styleClass="#{!fileMetadata.restricted ? 'text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'text-danger' : 'text-success')}"/>
+        </span></li>
 
-    <!-- Request Access Options -->
+    <!-- Request Access Options REMOVED bundle['file.accessRequested'] -->
     <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
                              and fileMetadata.dataFile.owner.fileAccessRequest}">
         <p:outputPanel id="requestPanel" styleClass="iq-dropdown-list-item #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}"
@@ -24,10 +31,9 @@
                         update="@([id$=requestAccessConsolidated]), @([id$=requestPanel])"
                         id="requestAccessConsolidated"
                         disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'Request sent 1 day ago'  : bundle['file.requestAccess']}
             </p:commandLink>
         </p:outputPanel>
-    
         <li jsf:rendered="#{!fileDownloadHelper.session.user.authenticated}">
             <p:commandLink styleClass="btn-request" 
                         process="@this"
@@ -38,13 +44,15 @@
     </ui:fragment>
     <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
                              and !fileMetadata.dataFile.owner.fileAccessRequest}">
-        <li class="disabled"><a href="#"><em>Users may not request access to files.</em></a></li>
+        <li><span class="dropdown-item-text">#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}</span></li>
     </ui:fragment>
     <!-- END: Request Access Options -->
     
     <!-- CAN DOWNLOAD ACCESS Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata)}">
-        <!-- NON-TABULAR + PACKAGE DOWNLOAD OPTIONS -->
+        <!-- Download Options -->
+        <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+        <!-- NON-TABULAR + PACKAGE DOWNLOAD OPTIONS ... TO-DO REMOVED bundle.download -->
         <li jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                     and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
@@ -55,7 +63,7 @@
                 <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
                 <!-- package data file: -->
                 <!-- no guest book/terms of use/etc. - straight package popup -->
-                #{bundle.download}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
                                     and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
@@ -67,7 +75,7 @@
                 <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
                 <!-- package data file: -->
                 <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-                #{bundle.download}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                       and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
@@ -77,7 +85,7 @@
                          actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
                 <!-- non-tabular data file: -->
                 <!-- no guest book/terms of use/etc. - straight to the download API url: -->
-                #{bundle.download}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
                                       and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
@@ -87,7 +95,7 @@
                          action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
                          update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
                 <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-                #{bundle.download}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
         </li>
         <!-- TABULAR DOWNLOAD OPTIONS -->
@@ -162,56 +170,62 @@
                     </p:commandLink>
                 </li>
             </ui:fragment>
-            <li>
-                <p:commandLink styleClass="btn-download" rendered="#{!downloadPopupRequired}"
-                               process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
-                               actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'var')}">
-                    #{bundle['file.downloadBtn.format.var']}
-                </p:commandLink>
-                <p:commandLink styleClass="btn-download" rendered="#{downloadPopupRequired}"
-                               process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'var' )}"
-                               update="@widgetVar(downloadPopup)"
-                               oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                    #{bundle['file.downloadBtn.format.var']}
-                </p:commandLink>
-            </li>
         </ui:fragment>
         <!-- END: TABULAR DOWNLOAD OPTIONS -->
     </ui:fragment>
     <!-- END: CAN DOWNLOAD ACCESS Options -->
     
-    <!-- CITATION FILES DOWNLOAD OPTIONS -->
-    <ui:fragment rendered="#{true}">
-        <li class="dropdown-submenu pull-left">
-            <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
-            <ul class="dropdown-menu">
-                <li>
-                    <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
-                        <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
-                    </h:commandLink>
-                </li>
-                <li>
-                    <h:commandLink styleClass="btn-download" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
-                        <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
-                    </h:commandLink>
-                </li>
-                <li>
-                    <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
-                        <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
-                    </h:commandLink>
-                </li>
-            </ul>
+    <!-- Download Metadata -->
+    <li class="dropdown-header">Download Metadata <span class="glyphicon glyphicon-download-alt"/></li>
+    
+    <ui:fragment rendered="#{fileMetadata.dataFile.tabularData}">
+        <li>
+            <p:commandLink styleClass="btn-download" rendered="#{!downloadPopupRequired}"
+                           process="@this"
+                           disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                           actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'var')}">
+                #{bundle['file.downloadBtn.format.var']}
+            </p:commandLink>
+            <p:commandLink styleClass="btn-download" rendered="#{downloadPopupRequired}"
+                           process="@this"
+                           disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                           action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'var' )}"
+                           update="@widgetVar(downloadPopup)"
+                           oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                #{bundle['file.downloadBtn.format.var']}
+            </p:commandLink>
         </li>
-        <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
-        <li role="presentation" class="clearfix"></li>
     </ui:fragment>
+    
     <!-- CITATION FILES DOWNLOAD OPTIONS -->
+    <li class="dropdown-submenu pull-left">
+        <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
+        <ul class="dropdown-menu">
+            <li>
+                <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
+                    <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
+                </h:commandLink>
+            </li>
+            <li>
+                <h:commandLink styleClass="btn-download" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
+                    <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
+                </h:commandLink>
+            </li>
+            <li>
+                <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
+                    <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
+                </h:commandLink>
+            </li>
+        </ul>
+    </li>
+    <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
+    <li role="presentation" class="clearfix"></li>
+    <!-- END: CITATION FILES DOWNLOAD OPTIONS -->
     
     <!-- AUX FILES DOWNLOAD OPTIONS -->
     <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
+        <!-- Download Auxiliary Files -->
+        <li class="dropdown-header">Download Auxiliary Files <span class="glyphicon glyphicon-download-alt"/></li>
         <li class="dropdown-submenu pull-left">
             <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
             <!--FIXME: Should be ui:repeat to display multiple types of aux files from multiple types of tools-->
@@ -229,8 +243,8 @@
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
+    <!-- END: Download Auxiliary Files -->
     <!-- END: AUX FILES DOWNLOAD OPTIONS -->
-    <!-- END: Download Options -->
     
     <!-- Explore Options -->
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools}">
diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 9a2add76147..4985eba905d 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -35,10 +35,10 @@
                     <p:graphicImage value="/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=true" alt="#{fileMetadata.label}"/>
                 </span>
                 <!-- Restricted File Icon -->
-                <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="File Access: Restricted" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="glyphicon glyphicon-lock text-danger"/>
                 </div>
-                <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="File Access: Restricted with Access Granted" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="icon-unlock text-success"/>
                 </div>
             </div>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 999213f6b0b..949b7a15096 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -62,8 +62,8 @@
 
                                     <div id="title-label-block" class="margin-top-half">
                                         <!-- Restricted File Icon -->
-                                        <span class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
-                                        <span class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
+                                        <span class="glyphicon glyphicon-lock text-danger" title="File Access: Restricted" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
+                                        <span class="icon-unlock text-success" title="File Access: Restricted" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
                                         <!-- DATASET Publication Status -->
                                         <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 5e2832c397f..d60dea35c18 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -894,6 +894,7 @@ span.ui-autocomplete input.ui-autocomplete-input {width:100%;}
 
 /* Overwrite Bootstrap */
 .btn, .input-group-btn {white-space: normal !important;}
+.dropdown-item-text {display: block;padding: 3px 20px;color: #212529;}
 
 @media print {
     a[href]:after {
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 0167a53ca48..f70b321cea4 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -581,8 +581,8 @@
                             <span class="glyphicon glyphicon-new-window text-muted pull-right" title="#{bundle.harvested}" jsf:rendered="#{result.harvested}"/>
                             <span class="icon-file text-muted pull-right" title="#{bundle.file}"/>
 
-                            <span class="text-danger glyphicon glyphicon-lock" title="#{bundle.restricted}" jsf:rendered="#{result.entity.restricted and !permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
-                            <span class="text-success icon-unlock" title="#{bundle.restrictedaccess}" jsf:rendered="#{result.entity.restricted and permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
+                            <span class="text-danger glyphicon glyphicon-lock" data-toggle="tooltip" title="#{bundle.restricted}" jsf:rendered="#{result.entity.restricted and !permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
+                            <span class="text-success icon-unlock" data-toggle="tooltip" title="#{bundle.restrictedaccess}" jsf:rendered="#{result.entity.restricted and permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
                             <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
                                 <h:outputText value="#{result.name}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet == null}"/>
                                 <h:outputText value="#{result.nameHighlightSnippet}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>

From 9b7a15dddac6a740872831d1d96c3d69ebfc2795 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 18 Mar 2021 11:47:46 -0400
Subject: [PATCH 10/44] Fixed render logic on Variable Metadata option under
 File Access btn [ref #7400]

---
 src/main/webapp/file-download-button-fragment.xhtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 8c28bc880dd..0e42c3a8d00 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -26,12 +26,12 @@
                              and fileMetadata.dataFile.owner.fileAccessRequest}">
         <p:outputPanel id="requestPanel" styleClass="iq-dropdown-list-item #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}"
                        rendered="#{fileDownloadHelper.session.user.authenticated}">
-            <p:commandLink styleClass="btn-request"
+            <p:commandLink styleClass="btn-request #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'italic'  : ''}"
                         actionListener="#{fileDownloadHelper.handleCommandLinkClick(fileMetadata)}"
                         update="@([id$=requestAccessConsolidated]), @([id$=requestPanel])"
                         id="requestAccessConsolidated"
                         disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'Request sent 1 day ago'  : bundle['file.requestAccess']}
+                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'Access request sent 1 day ago'  : bundle['file.requestAccess']}
             </p:commandLink>
         </p:outputPanel>
         <li jsf:rendered="#{!fileDownloadHelper.session.user.authenticated}">
@@ -178,7 +178,7 @@
     <!-- Download Metadata -->
     <li class="dropdown-header">Download Metadata <span class="glyphicon glyphicon-download-alt"/></li>
     
-    <ui:fragment rendered="#{fileMetadata.dataFile.tabularData}">
+    <ui:fragment rendered="#{fileMetadata.dataFile.tabularData and fileDownloadHelper.canDownloadFile(fileMetadata)}">
         <li>
             <p:commandLink styleClass="btn-download" rendered="#{!downloadPopupRequired}"
                            process="@this"

From a04b7830fbc48c45b6d67c16f4c330ce027951eb Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 23 Mar 2021 17:06:29 -0400
Subject: [PATCH 11/44] refactor tests #7400

---
 .../harvard/iq/dataverse/api/AccessIT.java    |  27 ++---
 .../iq/dataverse/api/AuxiliaryFilesIT.java    | 105 ++++++++++++++++++
 .../edu/harvard/iq/dataverse/api/UtilIT.java  |  17 ++-
 3 files changed, 133 insertions(+), 16 deletions(-)
 create mode 100644 src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
index 80db1502c07..8374455e952 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
@@ -181,22 +181,19 @@ public void testSaveAuxiliaryFileWithVersion() throws IOException {
         System.out.println("Add aux file with update");
         String mimeType = null;
         String pathToFile = "scripts/search/data/tabular/1char";
-        Response response = given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .multiPart("file", new File(pathToFile), mimeType)
-                // In the DP use case, the file is restricted.
-                .post("/api/access/datafile/" + tabFile3IdRestricted + "/metadata/dpJSON/v1");
-        response.prettyPrint();
-        assertEquals(200, response.getStatusCode());
+        String formatTag = "dpJSON";
+        String formatVersion = "v1";
+
+        Response uploadResponse = UtilIT.uploadAuxFile(tabFile3IdRestricted.longValue(), pathToFile, formatTag, formatVersion, mimeType, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
         System.out.println("Downloading Aux file that was just added");
-        response = given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .get("/api/access/datafile/" + tabFile3IdRestricted + "/metadata/dpJSON/v1");
-        
-        String dataStr = response.prettyPrint();
-        assertEquals(dataStr,"a\n");
-        assertEquals(200, response.getStatusCode());       
-      }
+        Response downloadResponse = UtilIT.downloadAuxFile(tabFile3IdRestricted.longValue(), formatTag, formatVersion, apiToken);
+        downloadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String dataStr = downloadResponse.prettyPrint();
+        assertEquals(dataStr, "a\n");
+    }
     
     //This test does a lot of testing of non-original downloads as well
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
new file mode 100644
index 00000000000..b057b0bed54
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -0,0 +1,105 @@
+package edu.harvard.iq.dataverse.api;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.response.Response;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import static javax.ws.rs.core.Response.Status.CREATED;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertTrue;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class AuxiliaryFilesIT {
+
+    @BeforeClass
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testUploadAuxFiles() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Path pathToDataFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species\n"
+                + "Marshall,40,dog\n"
+                + "Tiger,17,cat\n"
+                + "Panther,21,cat\n";
+        java.nio.file.Files.write(pathToDataFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToDataFile.toString(), apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        Long fileId = JsonPath.from(uploadFile.body().asString()).getLong("data.files[0].dataFile.id");
+
+        assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToDataFile, UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response restrictFile = UtilIT.restrictFile(fileId.toString(), true, apiToken);
+        restrictFile.prettyPrint();
+        restrictFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        // JSON aux file
+        Path pathToAuxFileJson = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.json");
+        String contentOfJson = "{}";
+        java.nio.file.Files.write(pathToAuxFileJson, contentOfJson.getBytes());
+        String formatTagJson = "tagForJson";
+        String formatVersionJson = "0.1";
+        String mimeTypeJson = "application/json";
+        Response uploadAuxFileJson = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, apiToken);
+        uploadAuxFileJson.prettyPrint();
+        uploadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());
+
+        // XML aux file
+        Path pathToAuxFileXml = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.xml");
+        String contentOfXml = "<foo></foo>";
+        java.nio.file.Files.write(pathToAuxFileXml, contentOfXml.getBytes());
+        String formatTagXml = "tagForXml";
+        String formatVersionXml = "0.1";
+        String mimeTypeXml = "application/xml";
+        Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, apiToken);
+        uploadAuxFileXml.prettyPrint();
+        uploadAuxFileXml.then().assertThat().statusCode(OK.getStatusCode());
+
+        // PDF aux file
+        Path pathToAuxFilePdf = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.pdf");
+        String contentOfPdf = "";
+        java.nio.file.Files.write(pathToAuxFilePdf, contentOfPdf.getBytes());
+        String formatTagPdf = "tagForPdf";
+        String formatVersionPdf = "0.1";
+        String mimeTypePdf = "application/xml";
+        Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, apiToken);
+        uploadAuxFilePdf.prettyPrint();
+        uploadAuxFilePdf.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Test download of one of the aux files.
+        Response downloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiToken);
+        downloadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());
+
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index f3ff8f8fae4..66d6b7ee0fe 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -642,7 +642,22 @@ static Response uploadFileViaNative(String datasetId, String pathToFile, String
         }
         return requestSpecification.post("/api/datasets/" + datasetId + "/add");
     }
-    
+
+    static Response uploadAuxFile(Long fileId, String pathToFile, String formatTag, String formatVersion, String mimeType, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .multiPart("file", new File(pathToFile), mimeType)
+                .post("/api/access/datafile/" + fileId + "/metadata/" + formatTag + "/" + formatVersion);
+        return response;
+    }
+
+    static Response downloadAuxFile(Long fileId, String formatTag, String formatVersion, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/datafile/" + fileId + "/metadata/" + formatTag + "/" + formatVersion);
+        return response;
+    }
+
     static Response getCrawlableFileAccess(String datasetId, String folderName, String apiToken) {
         RequestSpecification requestSpecification = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken);

From 006a9ba5054a455331cbffa03cae4add56ddec76 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 25 Mar 2021 11:54:40 -0400
Subject: [PATCH 12/44] move English to bundle #7400

---
 src/main/java/propertyFiles/Bundle.properties |  9 ++++++++
 .../file-download-button-fragment.xhtml       | 22 +++++++++----------
 src/main/webapp/file-info-fragment.xhtml      |  4 ++--
 src/main/webapp/file.xhtml                    |  4 ++--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index a2515f29a67..d44cbfb1745 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1565,6 +1565,8 @@ file.metaData.checksum.copy=Click to copy
 file.metaData.dataFile.dataTab.unf=UNF
 file.metaData.dataFile.dataTab.variables=Variables
 file.metaData.dataFile.dataTab.observations=Observations
+file.metaData.access.restricted=File Access: Restricted
+file.metaData.access.granted=File Access: Restricted with Access Granted
 file.addDescription=Add file description...
 file.tags=Tags
 file.editTags=Edit Tags
@@ -1604,6 +1606,9 @@ file.downloadBtn.format.original={0} (Original File Format)
 file.downloadBtn.format.rdata=RData
 file.downloadBtn.format.var=Variable Metadata
 file.downloadBtn.format.citation=Data File Citation
+file.downloadBtn.restricted=Restricted
+file.downloadBtn.restricted.with.access.granted=Restricted with Access Granted
+file.download.filetype.unknown=Original File Format
 file.more.information.link=Link to more file information for 
 file.requestAccess=Request Access
 file.requestAccess.dialog.msg=You need to <a href="/loginpage.xhtml{0}" target="{2}" title="Log into your Dataverse Account">Log In</a> to request access to this file.
@@ -1785,6 +1790,10 @@ file.results.btn.sort.option.size=Size
 file.results.btn.sort.option.type=Type
 file.compute.fileAccessDenied=This file is restricted and you may not compute on it because you have not been granted access.
 file.configure.Button=Configure
+
+file.auxfiles.download.header=Download Auxiliary Files
+file.auxfiles.types.differentiallyPrivateStatistics=Differentially Private Statistics
+
 # dataset-widgets.xhtml
 dataset.widgets.title=Dataset Thumbnail + Widgets
 dataset.widgets.notPublished.why.header=Why Use Widgets?
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 0e42c3a8d00..3366d6a89cf 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -17,11 +17,10 @@
             <span class="#{!fileMetadata.restricted ?
                            'glyphicon glyphicon-globe text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'glyphicon glyphicon-lock text-danger' : 'icon-unlock text-success')}"/>
             <h:outputText 
-                value=" #{!fileMetadata.restricted ? 'Public' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'Restricted' : 'Restricted with Access Granted')}" 
+                value=" #{!fileMetadata.restricted ? 'Public' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? bundle['file.downloadBtn.restricted'] : bundle['file.downloadBtn.restricted.with.access.granted'])}"
                 styleClass="#{!fileMetadata.restricted ? 'text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'text-danger' : 'text-success')}"/>
         </span></li>
 
-    <!-- Request Access Options REMOVED bundle['file.accessRequested'] -->
     <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
                              and fileMetadata.dataFile.owner.fileAccessRequest}">
         <p:outputPanel id="requestPanel" styleClass="iq-dropdown-list-item #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}"
@@ -31,7 +30,7 @@
                         update="@([id$=requestAccessConsolidated]), @([id$=requestPanel])"
                         id="requestAccessConsolidated"
                         disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'Access request sent 1 day ago'  : bundle['file.requestAccess']}
+                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
             </p:commandLink>
         </p:outputPanel>
         <li jsf:rendered="#{!fileDownloadHelper.session.user.authenticated}">
@@ -52,7 +51,7 @@
     <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata)}">
         <!-- Download Options -->
         <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
-        <!-- NON-TABULAR + PACKAGE DOWNLOAD OPTIONS ... TO-DO REMOVED bundle.download -->
+        <!-- NON-TABULAR + PACKAGE DOWNLOAD OPTIONS -->
         <li jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                     and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
@@ -63,7 +62,7 @@
                 <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
                 <!-- package data file: -->
                 <!-- no guest book/terms of use/etc. - straight package popup -->
-                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
                                     and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
@@ -75,7 +74,7 @@
                 <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
                 <!-- package data file: -->
                 <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                       and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
@@ -85,7 +84,7 @@
                          actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
                 <!-- non-tabular data file: -->
                 <!-- no guest book/terms of use/etc. - straight to the download API url: -->
-                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
             <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
                                       and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
@@ -95,7 +94,7 @@
                          action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
                          update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
                 <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? 'Original File Format' : fileMetadata.dataFile.friendlyType}
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
             </p:commandLink>
         </li>
         <!-- TABULAR DOWNLOAD OPTIONS -->
@@ -225,11 +224,10 @@
     <!-- AUX FILES DOWNLOAD OPTIONS -->
     <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
         <!-- Download Auxiliary Files -->
-        <li class="dropdown-header">Download Auxiliary Files <span class="glyphicon glyphicon-download-alt"/></li>
+        <li class="dropdown-header">#{bundle['file.auxfiles.download.header']} <span class="glyphicon glyphicon-download-alt"/></li>
         <li class="dropdown-submenu pull-left">
-            <!--FIXME: Move "Differentially Private Statistics" to bundle and should it be "Auxiliary Files" sometimes? When?-->
-            <!--FIXME: Should be ui:repeat to display multiple types of aux files from multiple types of tools-->
-            <a tabindex="-1" href="javascript:void(0);">Differentially Private Statistics</a>
+            <!--FIXME: Should this always be "Differentially Private Statistics" or sometimes "Auxiliary Files"? When?-->
+            <a tabindex="-1" href="javascript:void(0);">#{bundle['file.auxfiles.types.differentiallyPrivateStatistics']}</a>
             <ul class="dropdown-menu">
                 <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
                     <li>
diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 4985eba905d..370716f37cc 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -35,10 +35,10 @@
                     <p:graphicImage value="/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=true" alt="#{fileMetadata.label}"/>
                 </span>
                 <!-- Restricted File Icon -->
-                <div class="file-icon-restricted-block" title="File Access: Restricted" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.access.restricted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="glyphicon glyphicon-lock text-danger"/>
                 </div>
-                <div class="file-icon-restricted-block" title="File Access: Restricted with Access Granted" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.access.granted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="icon-unlock text-success"/>
                 </div>
             </div>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 949b7a15096..f98b5c1fac9 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -62,8 +62,8 @@
 
                                     <div id="title-label-block" class="margin-top-half">
                                         <!-- Restricted File Icon -->
-                                        <span class="glyphicon glyphicon-lock text-danger" title="File Access: Restricted" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
-                                        <span class="icon-unlock text-success" title="File Access: Restricted" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
+                                        <span class="glyphicon glyphicon-lock text-danger" title="#{bundle['file.metaData.access.restricted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
+                                        <span class="icon-unlock text-success" title="#{bundle['file.metaData.access.granted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
                                         <!-- DATASET Publication Status -->
                                         <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>

From cc0090433703bff7860e25544a61a37842d675a3 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 26 Mar 2021 13:53:50 -0400
Subject: [PATCH 13/44] put aux files starting with tag "dp" under DP Stats
 #7400

All other aux files go under "other".
---
 .../dataverse/AuxiliaryFileServiceBean.java   | 14 ++++++++++++++
 src/main/java/propertyFiles/Bundle.properties |  1 +
 .../file-download-button-fragment.xhtml       | 19 ++++++++++++++++---
 .../iq/dataverse/api/AuxiliaryFilesIT.java    | 17 ++++++++++++++---
 4 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
index 0275ac4db5f..ed56433b824 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -122,4 +122,18 @@ public List<AuxiliaryFile> findAuxiliaryFiles(DataFile dataFile) {
         return query.getResultList();
     }
 
+    public List<AuxiliaryFile> findAuxiliaryFilesStartingWith(DataFile dataFile, String tagPrefix) {
+        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.formatTag like CONCAT(:tagPrefix,'%')", AuxiliaryFile.class);
+        query.setParameter("dataFileId", dataFile.getId());
+        query.setParameter("tagPrefix", tagPrefix);
+        return query.getResultList();
+    }
+
+    public List<AuxiliaryFile> findAuxiliaryFilesNotStartingWith(DataFile dataFile, String tagPrefix) {
+        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.formatTag not like CONCAT(:tagPrefix,'%')", AuxiliaryFile.class);
+        query.setParameter("dataFileId", dataFile.getId());
+        query.setParameter("tagPrefix", tagPrefix);
+        return query.getResultList();
+    }
+
 }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index d44cbfb1745..1ff13aca3fe 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1793,6 +1793,7 @@ file.configure.Button=Configure
 
 file.auxfiles.download.header=Download Auxiliary Files
 file.auxfiles.types.differentiallyPrivateStatistics=Differentially Private Statistics
+file.auxfiles.types.other=Other Auxiliary Files
 
 # dataset-widgets.xhtml
 dataset.widgets.title=Dataset Thumbnail + Widgets
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 3366d6a89cf..41ed1745eff 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -225,11 +225,24 @@
     <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
         <!-- Download Auxiliary Files -->
         <li class="dropdown-header">#{bundle['file.auxfiles.download.header']} <span class="glyphicon glyphicon-download-alt"/></li>
-        <li class="dropdown-submenu pull-left">
-            <!--FIXME: Should this always be "Differentially Private Statistics" or sometimes "Auxiliary Files"? When?-->
+        <!--Differentially Private Statistics-->
+        <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFilesStartingWith(fileMetadata.dataFile, 'dp')}">
             <a tabindex="-1" href="javascript:void(0);">#{bundle['file.auxfiles.types.differentiallyPrivateStatistics']}</a>
             <ul class="dropdown-menu">
-                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
+                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFilesStartingWith(fileMetadata.dataFile, 'dp')}">
+                    <li>
+                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
+                            <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
+                        </p:commandLink>
+                    </li>
+                </ui:repeat>
+            </ul>
+        </li>
+        <!--Other aux files (not Differentially Private Statistics)-->
+        <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFilesNotStartingWith(fileMetadata.dataFile, 'dp')}">
+            <a tabindex="-1" href="javascript:void(0);">#{bundle['file.auxfiles.types.other']}</a>
+            <ul class="dropdown-menu">
+                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFilesNotStartingWith(fileMetadata.dataFile, 'dp')}">
                     <li>
                         <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
                             <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
index b057b0bed54..a65e0af2ac6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -68,7 +68,7 @@ public void testUploadAuxFiles() throws IOException {
         Path pathToAuxFileJson = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.json");
         String contentOfJson = "{}";
         java.nio.file.Files.write(pathToAuxFileJson, contentOfJson.getBytes());
-        String formatTagJson = "tagForJson";
+        String formatTagJson = "dpJson";
         String formatVersionJson = "0.1";
         String mimeTypeJson = "application/json";
         Response uploadAuxFileJson = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, apiToken);
@@ -79,7 +79,7 @@ public void testUploadAuxFiles() throws IOException {
         Path pathToAuxFileXml = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.xml");
         String contentOfXml = "<foo></foo>";
         java.nio.file.Files.write(pathToAuxFileXml, contentOfXml.getBytes());
-        String formatTagXml = "tagForXml";
+        String formatTagXml = "dpXml";
         String formatVersionXml = "0.1";
         String mimeTypeXml = "application/xml";
         Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, apiToken);
@@ -90,13 +90,24 @@ public void testUploadAuxFiles() throws IOException {
         Path pathToAuxFilePdf = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.pdf");
         String contentOfPdf = "";
         java.nio.file.Files.write(pathToAuxFilePdf, contentOfPdf.getBytes());
-        String formatTagPdf = "tagForPdf";
+        String formatTagPdf = "dpPdf";
         String formatVersionPdf = "0.1";
         String mimeTypePdf = "application/xml";
         Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, apiToken);
         uploadAuxFilePdf.prettyPrint();
         uploadAuxFilePdf.then().assertThat().statusCode(OK.getStatusCode());
 
+        // Non-DP file file
+        Path pathToAuxFileMd = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "README.md");
+        String contentOfMd = "This is my README.";
+        java.nio.file.Files.write(pathToAuxFileMd, contentOfMd.getBytes());
+        String formatTagMd = "README";
+        String formatVersionDp = "0.1";
+        String mimeTypeMd = "application/xml";
+        Response uploadAuxFileMd = UtilIT.uploadAuxFile(fileId, pathToAuxFileMd.toString(), formatTagMd, formatVersionDp, mimeTypeMd, apiToken);
+        uploadAuxFileMd.prettyPrint();
+        uploadAuxFileMd.then().assertThat().statusCode(OK.getStatusCode());
+
         // Test download of one of the aux files.
         Response downloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiToken);
         downloadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());

From 5a045be7b3197f8fc44796d9a1e6d4f4d3e2a4ce Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 26 Mar 2021 13:58:13 -0400
Subject: [PATCH 14/44] new domain: opendp.org #7400

---
 doc/sphinx-guides/source/user/dataset-management.rst | 2 +-
 doc/sphinx-guides/source/user/find-use-data.rst      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/sphinx-guides/source/user/dataset-management.rst b/doc/sphinx-guides/source/user/dataset-management.rst
index 8b9ef3d691c..db7c813b8c2 100755
--- a/doc/sphinx-guides/source/user/dataset-management.rst
+++ b/doc/sphinx-guides/source/user/dataset-management.rst
@@ -311,7 +311,7 @@ See also :ref:`restricted-files`.
 Creating and Depositing Differentially Private Metadata (Experimental)
 ----------------------------------------------------------------------
 
-Through an integration with tools from the OpenDP Project (opendp.io), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
+Through an integration with tools from the OpenDP Project (opendp.org), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
 
 If this integration has been enabled in your Dataverse installation, you can follow these steps to create a DP Metadata Release and make it available to researchers, while still keeping the files themselves restricted and able to be accessed after a successful access request.
 
diff --git a/doc/sphinx-guides/source/user/find-use-data.rst b/doc/sphinx-guides/source/user/find-use-data.rst
index 95485b3c66a..42e1a2b23d4 100755
--- a/doc/sphinx-guides/source/user/find-use-data.rst
+++ b/doc/sphinx-guides/source/user/find-use-data.rst
@@ -156,7 +156,7 @@ Some file types and datasets offer data exploration options if external tools ha
 Exploratory Data Analysis Using Differentially Private Metadata (Experimental)
 ------------------------------------------------------------------------------
 
-Through an integration with tools from the OpenDP Project (opendp.io), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
+Through an integration with tools from the OpenDP Project (opendp.org), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
 
 If the data depositor has made available DP metadata for one or more files in their dataset, these access options will appear on the access dropdown on both the Dataset Page and the File Page. These access options will be available even if a file is restricted. Three types of DP metadata will be available:
 

From 22f1d2de2e949dd2190e768d83f718077034998d Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 26 Mar 2021 14:05:06 -0400
Subject: [PATCH 15/44] Add "dp" rule to guides #7400

---
 doc/sphinx-guides/source/developers/aux-file-support.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 260c4493590..1b88d41442a 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -1,7 +1,7 @@
 Auxiliary File Support
 ======================
 
-Auxiliary file support is experimental. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (OpenDP.io). In future versions, this approach may become more broadly used and supported. 
+Auxiliary file support is experimental. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (opendp.org). In future versions, this approach may become more broadly used and supported. 
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------
@@ -34,3 +34,5 @@ formatTag and formatVersion (if applicable) associated with the auxiliary file:
   export FORMAT_VERSION='v1'
 
   curl "$SERVER_URL/api/access/datafile/$FILE_ID/$FORMAT_TAG/$FORMAT_VERSION"
+
+It is also possible to download the auxiliary file from the web interface. Auxiliary files that have a tag beginning with "dp" appear under "Differentially Private Statistics". The rest appear under "Other Auxiliary Files".

From 439fcb706eb501cd5d32751b0166e8ce34de32f6 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 26 Mar 2021 14:08:11 -0400
Subject: [PATCH 16/44] add release note #7400

---
 doc/release-notes/7400-opendp-download.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/release-notes/7400-opendp-download.md

diff --git a/doc/release-notes/7400-opendp-download.md b/doc/release-notes/7400-opendp-download.md
new file mode 100644
index 00000000000..7fc252b22b5
--- /dev/null
+++ b/doc/release-notes/7400-opendp-download.md
@@ -0,0 +1,6 @@
+Auxiliary Files can now be downloaded from the web interface. In addition, related changes were made, including the following:
+
+- New tooltip over the lock indicating if you have been granted access to a restricted file or not.
+- When downloading individual files, you will see "Restricted with Access Granted" or just "Restricted" (followed by "Users may not request access to files.") as appropriate.
+- When downloading individual files, instead of "Download" you should expect to see the file type such as "JPEG Image" or "Original File Format" if the type is unknown.
+- If the tag for an aux file starts with "dp" it will be displayed under "Differentially Private Statistics" under file level download. The rest appear under "Other Auxiliary Files".

From 01741b33010edb62254fe5f7c8f5aeee0dd9e578 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 1 Apr 2021 15:55:21 -0400
Subject: [PATCH 17/44] pass isPublic boolean in tests #7400

---
 .../edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java    | 8 ++++----
 src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
index a65e0af2ac6..fa4299000e5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -71,7 +71,7 @@ public void testUploadAuxFiles() throws IOException {
         String formatTagJson = "dpJson";
         String formatVersionJson = "0.1";
         String mimeTypeJson = "application/json";
-        Response uploadAuxFileJson = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, apiToken);
+        Response uploadAuxFileJson = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, true, apiToken);
         uploadAuxFileJson.prettyPrint();
         uploadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());
 
@@ -82,7 +82,7 @@ public void testUploadAuxFiles() throws IOException {
         String formatTagXml = "dpXml";
         String formatVersionXml = "0.1";
         String mimeTypeXml = "application/xml";
-        Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, apiToken);
+        Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, true, apiToken);
         uploadAuxFileXml.prettyPrint();
         uploadAuxFileXml.then().assertThat().statusCode(OK.getStatusCode());
 
@@ -93,7 +93,7 @@ public void testUploadAuxFiles() throws IOException {
         String formatTagPdf = "dpPdf";
         String formatVersionPdf = "0.1";
         String mimeTypePdf = "application/xml";
-        Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, apiToken);
+        Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, true, apiToken);
         uploadAuxFilePdf.prettyPrint();
         uploadAuxFilePdf.then().assertThat().statusCode(OK.getStatusCode());
 
@@ -104,7 +104,7 @@ public void testUploadAuxFiles() throws IOException {
         String formatTagMd = "README";
         String formatVersionDp = "0.1";
         String mimeTypeMd = "application/xml";
-        Response uploadAuxFileMd = UtilIT.uploadAuxFile(fileId, pathToAuxFileMd.toString(), formatTagMd, formatVersionDp, mimeTypeMd, apiToken);
+        Response uploadAuxFileMd = UtilIT.uploadAuxFile(fileId, pathToAuxFileMd.toString(), formatTagMd, formatVersionDp, mimeTypeMd, true, apiToken);
         uploadAuxFileMd.prettyPrint();
         uploadAuxFileMd.then().assertThat().statusCode(OK.getStatusCode());
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 766ebf782ce..d4334e3e864 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -643,10 +643,11 @@ static Response uploadFileViaNative(String datasetId, String pathToFile, String
         return requestSpecification.post("/api/datasets/" + datasetId + "/add");
     }
 
-    static Response uploadAuxFile(Long fileId, String pathToFile, String formatTag, String formatVersion, String mimeType, String apiToken) {
+    static Response uploadAuxFile(Long fileId, String pathToFile, String formatTag, String formatVersion, String mimeType, boolean isPublic, String apiToken) {
         Response response = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .multiPart("file", new File(pathToFile), mimeType)
+                .multiPart("isPublic", isPublic)
                 .post("/api/access/datafile/" + fileId + "/metadata/" + formatTag + "/" + formatVersion);
         return response;
     }

From d368a851ab34cf8d2dc4b5615db60e5c95e97052 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 5 Apr 2021 15:23:06 -0400
Subject: [PATCH 18/44] add type for aux files #7400

---
 .../source/developers/aux-file-support.rst    |  5 +-
 .../harvard/iq/dataverse/AuxiliaryFile.java   | 50 ++++++++++++++++++-
 .../dataverse/AuxiliaryFileServiceBean.java   | 27 +++++++---
 .../edu/harvard/iq/dataverse/api/Access.java  | 20 +++++++-
 .../iq/dataverse/util/json/JsonPrinter.java   |  1 +
 src/main/java/propertyFiles/Bundle.properties |  5 +-
 .../V5.4.0.1__7400-opendp-download.sql        |  3 ++
 .../file-download-button-fragment.xhtml       | 40 ++++++---------
 .../harvard/iq/dataverse/api/AccessIT.java    |  2 +-
 .../iq/dataverse/api/AuxiliaryFilesIT.java    | 38 +++++++++++---
 .../edu/harvard/iq/dataverse/api/UtilIT.java  | 12 +++--
 11 files changed, 147 insertions(+), 56 deletions(-)
 create mode 100644 src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 1b88d41442a..6589089bd72 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -5,7 +5,7 @@ Auxiliary file support is experimental. Auxiliary files in the Dataverse Softwar
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------
-To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are two form parameters. "Origin" specifies the application/entity that created the auxiliary file, an "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file, else, access authorization is based on the access rules as defined for the DataFile itself.
+To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, an "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter can be "DP" (for Differentially Private Statistics) or "OTHER" and the latter will be selected for you if don't specify a type.
 
 .. code-block:: bash
 
@@ -14,9 +14,10 @@ To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and
   export FILE_ID='12345'
   export FORMAT_TAG='dpJson'
   export FORMAT_VERSION='v1'
+  export TYPE='DP'
   export SERVER_URL=https://demo.dataverse.org
  
-  curl -H X-Dataverse-key:$API_TOKEN -X POST -F "file=@$FILENAME" -F 'origin=myApp' -F 'isPublic=true' "$SERVER_URL/api/access/datafile/$FILE_ID/metadata/$FORMAT_TAG/$FORMAT_VERSION"
+  curl -H X-Dataverse-key:$API_TOKEN -X POST -F "file=@$FILENAME" -F 'origin=myApp' -F 'isPublic=true' -F "type=$TYPE" "$SERVER_URL/api/access/datafile/$FILE_ID/metadata/$FORMAT_TAG/$FORMAT_VERSION"
 
 You should expect a 200 ("OK") response and JSON with information about your newly uploaded auxiliary file.
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
index 957a7cc93bf..340dc018cae 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
@@ -1,8 +1,12 @@
 
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.Serializable;
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -44,6 +48,29 @@ public class AuxiliaryFile implements Serializable {
     
     private String checksum;
 
+    /**
+     * A way of grouping similar auxiliary files together. The type could be
+     * "DP" for "Differentially Private Statistics", for example.
+     */
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private Type type;
+
+    public enum Type {
+        // Differentially Private Statistics
+        DP,
+        // Future Type 1
+        //
+        // Future Type 2
+        //
+        // Catch-all for any not enumerated above
+        OTHER;
+
+        public String toStringFriendly() {
+            return BundleUtil.getStringFromBundle("file.auxfiles.types." + this.name());
+        }
+    }
+
     public Long getId() {
         return id;
     }
@@ -115,6 +142,25 @@ public String getChecksum() {
     public void setChecksum(String checksum) {
         this.checksum = checksum;
     }
-    
-    
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    /**
+     * @return "Differentially Private Statistics" (or the equivalent in French,
+     * etc.) rather than "DP" or null if this.type is null.
+     */
+    public String getTypeFriendly() {
+        if (this.type == null) {
+            return null;
+        } else {
+            return this.type.toStringFriendly();
+        }
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
index ed56433b824..3f34e29d33c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -56,9 +56,11 @@ public AuxiliaryFile save(AuxiliaryFile auxiliaryFile) {
      * @param formatVersion - to distinguish between multiple versions of a file
      * @param origin - name of the tool/system that created the file
      * @param isPublic boolean - is this file available to any user?
+     * @param type how to group the files such as under "Differentially Private
+     * Statistics". Must not be null.
      * @return success boolean - returns whether the save was successful
      */
-    public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile dataFile, String formatTag, String formatVersion, String origin, boolean isPublic) {
+    public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile dataFile, String formatTag, String formatVersion, String origin, boolean isPublic, AuxiliaryFile.Type type) {
     
         StorageIO<DataFile> storageIO =null;
         AuxiliaryFile auxFile = new AuxiliaryFile();
@@ -83,6 +85,7 @@ public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile
             auxFile.setFormatVersion(formatVersion);
             auxFile.setOrigin(origin);
             auxFile.setIsPublic(isPublic);
+            auxFile.setType(type);
             auxFile.setDataFile(dataFile);         
             auxFile.setFileSize(storageIO.getAuxObjectSize(auxExtension));
             auxFile = save(auxFile);
@@ -122,18 +125,26 @@ public List<AuxiliaryFile> findAuxiliaryFiles(DataFile dataFile) {
         return query.getResultList();
     }
 
-    public List<AuxiliaryFile> findAuxiliaryFilesStartingWith(DataFile dataFile, String tagPrefix) {
-        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.formatTag like CONCAT(:tagPrefix,'%')", AuxiliaryFile.class);
-        query.setParameter("dataFileId", dataFile.getId());
-        query.setParameter("tagPrefix", tagPrefix);
+    public List<String> findAuxiliaryFileTypes(DataFile dataFile) {
+        Query query = em.createNativeQuery("select distinct type from auxiliaryfile where datafile_id = ?1");
+        query.setParameter(1, dataFile.getId());
         return query.getResultList();
     }
 
-    public List<AuxiliaryFile> findAuxiliaryFilesNotStartingWith(DataFile dataFile, String tagPrefix) {
-        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.formatTag not like CONCAT(:tagPrefix,'%')", AuxiliaryFile.class);
+    public List<AuxiliaryFile> findAuxiliaryFilesByType(DataFile dataFile, String typeString) {
+        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type", AuxiliaryFile.class);
         query.setParameter("dataFileId", dataFile.getId());
-        query.setParameter("tagPrefix", tagPrefix);
+        query.setParameter("type", typeString);
         return query.getResultList();
     }
 
+    public String getFriendlyNameForType(String typeIn) {
+        try {
+            AuxiliaryFile.Type type = AuxiliaryFile.Type.valueOf(typeIn);
+            return type.toStringFriendly();
+        } catch (NullPointerException | IllegalArgumentException ex) {
+            return null;
+        }
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Access.java b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
index 2cd7e0dd122..d12d0d7a900 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Access.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
@@ -116,6 +116,9 @@
 import javax.ws.rs.core.StreamingOutput;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
 import java.net.URISyntaxException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.json.JsonObjectBuilder;
 import javax.ws.rs.RedirectionException;
 import javax.ws.rs.core.MediaType;
 import static javax.ws.rs.core.Response.Status.FORBIDDEN;
@@ -1153,6 +1156,7 @@ private String getWebappImageResource(String imageName) {
      * @param formatVersion
      * @param origin
      * @param isPublic
+     * @param type
      * @param fileInputStream
      * @param contentDispositionHeader
      * @param formDataBodyPart
@@ -1167,6 +1171,7 @@ public Response saveAuxiliaryFileWithVersion(@PathParam("fileId") Long fileId,
             @PathParam("formatVersion") String formatVersion,
             @FormDataParam("origin") String origin,
             @FormDataParam("isPublic") boolean isPublic,
+            @FormDataParam("type") String type,
             @FormDataParam("file") InputStream fileInputStream
           
     ) {
@@ -1189,9 +1194,20 @@ public Response saveAuxiliaryFileWithVersion(@PathParam("fileId") Long fileId,
         if (!dataFile.isTabularData()) {
             return error(BAD_REQUEST, "Not a tabular DataFile (db id=" + fileId + ")");
         }
-         
 
-        AuxiliaryFile saved = auxiliaryFileService.processAuxiliaryFile(fileInputStream, dataFile, formatTag, formatVersion, origin, isPublic);
+        // Initialize as the default type, OTHER.
+        AuxiliaryFile.Type typeFinal = AuxiliaryFile.Type.OTHER;
+        try {
+            typeFinal = AuxiliaryFile.Type.valueOf(type);
+        } catch (NullPointerException ex) {
+            // No type given. Set it to OTHER.
+            typeFinal = AuxiliaryFile.Type.OTHER;
+        } catch (IllegalArgumentException ex) {
+            // Invalid type (not in the enum). Tell the user the valid types.
+            return error(BAD_REQUEST, "Invalid type. Must be one of: " + Stream.of(AuxiliaryFile.Type.values()).map(String::valueOf).collect(Collectors.joining(", ")));
+        }
+
+        AuxiliaryFile saved = auxiliaryFileService.processAuxiliaryFile(fileInputStream, dataFile, formatTag, formatVersion, origin, isPublic, typeFinal);
       
         if (saved!=null) {
             return ok(json(saved));
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index 96cb9c84dab..09eac89741c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -562,6 +562,7 @@ public static JsonObjectBuilder json(AuxiliaryFile auxFile) {
                 .add("formatVersion", auxFile.getFormatVersion()) // "label" is the filename
                 .add("origin", auxFile.getOrigin()) 
                 .add("isPublic", auxFile.getIsPublic())
+                .add("type", auxFile.getTypeFriendly())
                 .add("fileSize", auxFile.getFileSize())
                 .add("checksum", auxFile.getChecksum())
                 .add("dataFile", JsonPrinter.json(auxFile.getDataFile()));
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index b1a3cb1b12e..672470a7304 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1809,8 +1809,9 @@ file.compute.fileAccessDenied=This file is restricted and you may not compute on
 file.configure.Button=Configure
 
 file.auxfiles.download.header=Download Auxiliary Files
-file.auxfiles.types.differentiallyPrivateStatistics=Differentially Private Statistics
-file.auxfiles.types.other=Other Auxiliary Files
+# These types correspond to the AuxiliaryFile.Type enum.
+file.auxfiles.types.DP=Differentially Private Statistics
+file.auxfiles.types.OTHER=Other Auxiliary Files
 
 # dataset-widgets.xhtml
 dataset.widgets.title=Dataset Thumbnail + Widgets
diff --git a/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql b/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql
new file mode 100644
index 00000000000..190dff17052
--- /dev/null
+++ b/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql
@@ -0,0 +1,3 @@
+ALTER TABLE auxiliaryfile ADD COLUMN IF NOT EXISTS type character varying(255);
+UPDATE auxiliaryfile SET type = 'OTHER' WHERE type IS NULL;
+ALTER TABLE auxiliaryfile ALTER COLUMN type SET NOT NULL;
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 41ed1745eff..8c464e96fd7 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -225,32 +225,20 @@
     <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
         <!-- Download Auxiliary Files -->
         <li class="dropdown-header">#{bundle['file.auxfiles.download.header']} <span class="glyphicon glyphicon-download-alt"/></li>
-        <!--Differentially Private Statistics-->
-        <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFilesStartingWith(fileMetadata.dataFile, 'dp')}">
-            <a tabindex="-1" href="javascript:void(0);">#{bundle['file.auxfiles.types.differentiallyPrivateStatistics']}</a>
-            <ul class="dropdown-menu">
-                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFilesStartingWith(fileMetadata.dataFile, 'dp')}">
-                    <li>
-                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
-                            <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
-                        </p:commandLink>
-                    </li>
-                </ui:repeat>
-            </ul>
-        </li>
-        <!--Other aux files (not Differentially Private Statistics)-->
-        <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFilesNotStartingWith(fileMetadata.dataFile, 'dp')}">
-            <a tabindex="-1" href="javascript:void(0);">#{bundle['file.auxfiles.types.other']}</a>
-            <ul class="dropdown-menu">
-                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFilesNotStartingWith(fileMetadata.dataFile, 'dp')}">
-                    <li>
-                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
-                            <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
-                        </p:commandLink>
-                    </li>
-                </ui:repeat>
-            </ul>
-        </li>
+        <ui:repeat var="auxFileType" value="#{auxiliaryFileServiceBean.findAuxiliaryFileTypes(fileMetadata.dataFile)}">
+            <li class="dropdown-submenu pull-left">
+                <a tabindex="-1" href="javascript:void(0);">#{auxiliaryFileServiceBean.getFriendlyNameForType(auxFileType)}</a>
+                <ul class="dropdown-menu">
+                    <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFilesByType(fileMetadata.dataFile, auxFileType)}">
+                        <li>
+                            <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
+                                <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
+                            </p:commandLink>
+                        </li>
+                    </ui:repeat>
+                </ul>
+            </li>
+        </ui:repeat>
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
index 8374455e952..aee2500568c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
@@ -184,7 +184,7 @@ public void testSaveAuxiliaryFileWithVersion() throws IOException {
         String formatTag = "dpJSON";
         String formatVersion = "v1";
 
-        Response uploadResponse = UtilIT.uploadAuxFile(tabFile3IdRestricted.longValue(), pathToFile, formatTag, formatVersion, mimeType, apiToken);
+        Response uploadResponse = UtilIT.uploadAuxFile(tabFile3IdRestricted.longValue(), pathToFile, formatTag, formatVersion, mimeType, true, null, apiToken);
         uploadResponse.prettyPrint();
         uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
index fa4299000e5..c19c66b98ee 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -7,9 +7,11 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 import static javax.ws.rs.core.Response.Status.CREATED;
 import static javax.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
+import org.hamcrest.Matchers;
 import static org.junit.Assert.assertTrue;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -64,6 +66,8 @@ public void testUploadAuxFiles() throws IOException {
         restrictFile.prettyPrint();
         restrictFile.then().assertThat().statusCode(OK.getStatusCode());
 
+        String dpType = "DP";
+
         // JSON aux file
         Path pathToAuxFileJson = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.json");
         String contentOfJson = "{}";
@@ -71,9 +75,11 @@ public void testUploadAuxFiles() throws IOException {
         String formatTagJson = "dpJson";
         String formatVersionJson = "0.1";
         String mimeTypeJson = "application/json";
-        Response uploadAuxFileJson = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, true, apiToken);
+        Response uploadAuxFileJson = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, true, dpType, apiToken);
         uploadAuxFileJson.prettyPrint();
-        uploadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());
+        uploadAuxFileJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("Differentially Private Statistics"));
 
         // XML aux file
         Path pathToAuxFileXml = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.xml");
@@ -82,7 +88,7 @@ public void testUploadAuxFiles() throws IOException {
         String formatTagXml = "dpXml";
         String formatVersionXml = "0.1";
         String mimeTypeXml = "application/xml";
-        Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, true, apiToken);
+        Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, true, dpType, apiToken);
         uploadAuxFileXml.prettyPrint();
         uploadAuxFileXml.then().assertThat().statusCode(OK.getStatusCode());
 
@@ -93,20 +99,36 @@ public void testUploadAuxFiles() throws IOException {
         String formatTagPdf = "dpPdf";
         String formatVersionPdf = "0.1";
         String mimeTypePdf = "application/xml";
-        Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, true, apiToken);
+        Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, true, dpType, apiToken);
         uploadAuxFilePdf.prettyPrint();
         uploadAuxFilePdf.then().assertThat().statusCode(OK.getStatusCode());
 
-        // Non-DP file file
+        // Non-DP file file, no type specified
         Path pathToAuxFileMd = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "README.md");
         String contentOfMd = "This is my README.";
         java.nio.file.Files.write(pathToAuxFileMd, contentOfMd.getBytes());
         String formatTagMd = "README";
-        String formatVersionDp = "0.1";
+        String formatVersionMd = "0.1";
         String mimeTypeMd = "application/xml";
-        Response uploadAuxFileMd = UtilIT.uploadAuxFile(fileId, pathToAuxFileMd.toString(), formatTagMd, formatVersionDp, mimeTypeMd, true, apiToken);
+        Response uploadAuxFileMd = UtilIT.uploadAuxFile(fileId, pathToAuxFileMd.toString(), formatTagMd, formatVersionMd, mimeTypeMd, true, null, apiToken);
         uploadAuxFileMd.prettyPrint();
-        uploadAuxFileMd.then().assertThat().statusCode(OK.getStatusCode());
+        uploadAuxFileMd.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("Other Auxiliary Files"));
+
+        // Invalid type
+        Path pathToAuxFileTxt = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "foo.txt");
+        String contentOfTxt = "Just testing an invalid type.";
+        java.nio.file.Files.write(pathToAuxFileTxt, contentOfTxt.getBytes());
+        String formatTagTxt = "justTesting";
+        String formatVersionTxt = "0.1";
+        String mimeTypeTxt = "text/plain";
+        String typeTxt = "JUNK";
+        Response uploadAuxFileTxt = UtilIT.uploadAuxFile(fileId, pathToAuxFileTxt.toString(), formatTagTxt, formatVersionTxt, mimeTypeTxt, true, typeTxt, apiToken);
+        uploadAuxFileTxt.prettyPrint();
+        uploadAuxFileTxt.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", Matchers.startsWith("Invalid type"));
 
         // Test download of one of the aux files.
         Response downloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiToken);
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index d4334e3e864..1fd5166661c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -643,13 +643,15 @@ static Response uploadFileViaNative(String datasetId, String pathToFile, String
         return requestSpecification.post("/api/datasets/" + datasetId + "/add");
     }
 
-    static Response uploadAuxFile(Long fileId, String pathToFile, String formatTag, String formatVersion, String mimeType, boolean isPublic, String apiToken) {
-        Response response = given()
+    static Response uploadAuxFile(Long fileId, String pathToFile, String formatTag, String formatVersion, String mimeType, boolean isPublic, String type, String apiToken) {
+        RequestSpecification requestSpecification = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .multiPart("file", new File(pathToFile), mimeType)
-                .multiPart("isPublic", isPublic)
-                .post("/api/access/datafile/" + fileId + "/metadata/" + formatTag + "/" + formatVersion);
-        return response;
+                .multiPart("isPublic", isPublic);
+        if (type != null) {
+            requestSpecification.multiPart("type", type);
+        }
+        return requestSpecification.post("/api/access/datafile/" + fileId + "/metadata/" + formatTag + "/" + formatVersion);
     }
 
     static Response downloadAuxFile(Long fileId, String formatTag, String formatVersion, String apiToken) {

From 5c67f95add6c9223fd3261c0ca8f71799b3e6cf5 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 6 Apr 2021 14:19:34 -0400
Subject: [PATCH 19/44] add file extension to aux files on download #7400

---
 .../dataverse/api/DownloadInstanceWriter.java | 16 +++-
 .../iq/dataverse/util/json/JsonPrinter.java   |  1 +
 .../iq/dataverse/api/AuxiliaryFilesIT.java    | 75 +++++++++++++++++--
 3 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
index 39bcbabbc99..2807e003fa7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
@@ -42,6 +42,9 @@
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.RedirectionException;
 import javax.ws.rs.ServiceUnavailableException;
+import org.apache.tika.mime.MimeType;
+import org.apache.tika.mime.MimeTypeException;
+import org.apache.tika.mime.MimeTypes;
 
 /**
  *
@@ -238,7 +241,18 @@ public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
                     }
                     long auxFileSize = di.getAuxiliaryFile().getFileSize();
                     InputStreamIO auxStreamIO = new InputStreamIO(storageIO.getAuxFileAsInputStream(auxTag), auxFileSize);
-                    auxStreamIO.setFileName(storageIO.getFileName() + "." + auxTag);
+                    String fileExtension = "";
+                    String contentType = di.getAuxiliaryFile().getContentType();
+                    if (contentType != null) {
+                        MimeTypes allTypes = MimeTypes.getDefaultMimeTypes();
+                        MimeType mimeType = null;
+                        try {
+                            mimeType = allTypes.forName(contentType);
+                            fileExtension = mimeType.getExtension();
+                        } catch (MimeTypeException ex) {
+                        }
+                    }
+                    auxStreamIO.setFileName(storageIO.getFileName() + "." + auxTag + fileExtension);
                     auxStreamIO.setMimeType(di.getAuxiliaryFile().getContentType());
                     storageIO = auxStreamIO;
                     
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index 1b81de195f2..b04533d3f77 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -565,6 +565,7 @@ public static JsonObjectBuilder json(AuxiliaryFile auxFile) {
                 .add("origin", auxFile.getOrigin()) 
                 .add("isPublic", auxFile.getIsPublic())
                 .add("type", auxFile.getTypeFriendly())
+                .add("contentType", auxFile.getContentType())
                 .add("fileSize", auxFile.getFileSize())
                 .add("checksum", auxFile.getChecksum())
                 .add("dataFile", JsonPrinter.json(auxFile.getDataFile()));
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
index c19c66b98ee..05ff3e0e328 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -12,6 +12,7 @@
 import static javax.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
 import org.hamcrest.Matchers;
+import org.junit.Assert;
 import static org.junit.Assert.assertTrue;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -79,7 +80,9 @@ public void testUploadAuxFiles() throws IOException {
         uploadAuxFileJson.prettyPrint();
         uploadAuxFileJson.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.type", equalTo("Differentially Private Statistics"));
+                .body("data.type", equalTo("Differentially Private Statistics"))
+                // FIXME: application/json would be better
+                .body("data.contentType", equalTo("text/plain"));
 
         // XML aux file
         Path pathToAuxFileXml = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.xml");
@@ -90,18 +93,57 @@ public void testUploadAuxFiles() throws IOException {
         String mimeTypeXml = "application/xml";
         Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, true, dpType, apiToken);
         uploadAuxFileXml.prettyPrint();
-        uploadAuxFileXml.then().assertThat().statusCode(OK.getStatusCode());
+        uploadAuxFileXml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // FIXME: application/xml would be better
+                .body("data.contentType", equalTo("text/plain"));
 
         // PDF aux file
         Path pathToAuxFilePdf = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.pdf");
-        String contentOfPdf = "";
+        // PDF content from https://stackoverflow.com/questions/17279712/what-is-the-smallest-possible-valid-pdf/32142316#32142316
+        String contentOfPdf = "%PDF-1.2 \n"
+                + "9 0 obj\n"
+                + "<<\n"
+                + ">>\n"
+                + "stream\n"
+                + "BT/ 9 Tf(Test)' ET\n"
+                + "endstream\n"
+                + "endobj\n"
+                + "4 0 obj\n"
+                + "<<\n"
+                + "/Type /Page\n"
+                + "/Parent 5 0 R\n"
+                + "/Contents 9 0 R\n"
+                + ">>\n"
+                + "endobj\n"
+                + "5 0 obj\n"
+                + "<<\n"
+                + "/Kids [4 0 R ]\n"
+                + "/Count 1\n"
+                + "/Type /Pages\n"
+                + "/MediaBox [ 0 0 99 9 ]\n"
+                + ">>\n"
+                + "endobj\n"
+                + "3 0 obj\n"
+                + "<<\n"
+                + "/Pages 5 0 R\n"
+                + "/Type /Catalog\n"
+                + ">>\n"
+                + "endobj\n"
+                + "trailer\n"
+                + "<<\n"
+                + "/Root 3 0 R\n"
+                + ">>\n"
+                + "%%EOF";
         java.nio.file.Files.write(pathToAuxFilePdf, contentOfPdf.getBytes());
         String formatTagPdf = "dpPdf";
         String formatVersionPdf = "0.1";
-        String mimeTypePdf = "application/xml";
+        String mimeTypePdf = "application/pdf";
         Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, true, dpType, apiToken);
         uploadAuxFilePdf.prettyPrint();
-        uploadAuxFilePdf.then().assertThat().statusCode(OK.getStatusCode());
+        uploadAuxFilePdf.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.contentType", equalTo(mimeTypePdf));
 
         // Non-DP file file, no type specified
         Path pathToAuxFileMd = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "README.md");
@@ -114,7 +156,8 @@ public void testUploadAuxFiles() throws IOException {
         uploadAuxFileMd.prettyPrint();
         uploadAuxFileMd.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.type", equalTo("Other Auxiliary Files"));
+                .body("data.type", equalTo("Other Auxiliary Files"))
+                .body("data.contentType", equalTo("text/plain"));
 
         // Invalid type
         Path pathToAuxFileTxt = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "foo.txt");
@@ -130,9 +173,27 @@ public void testUploadAuxFiles() throws IOException {
                 .statusCode(BAD_REQUEST.getStatusCode())
                 .body("message", Matchers.startsWith("Invalid type"));
 
-        // Test download of one of the aux files.
+        // Download JSON aux file.
         Response downloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiToken);
         downloadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());
+        // FIXME: This should be ".json" instead of ".txt"
+        Assert.assertEquals("attachment; filename=\"data.tab.dpJson_0.1.txt\"", downloadAuxFileJson.header("Content-disposition"));
+
+        // Download XML aux file.
+        Response downloadAuxFileXml = UtilIT.downloadAuxFile(fileId, formatTagXml, formatVersionXml, apiToken);
+        downloadAuxFileXml.then().assertThat().statusCode(OK.getStatusCode());
+        // FIXME: This should be ".xml" instead of ".txt"
+        Assert.assertEquals("attachment; filename=\"data.tab.dpXml_0.1.txt\"", downloadAuxFileXml.header("Content-disposition"));
+
+        // Download PDF aux file.
+        Response downloadAuxFilePdf = UtilIT.downloadAuxFile(fileId, formatTagPdf, formatVersionPdf, apiToken);
+        downloadAuxFilePdf.then().assertThat().statusCode(OK.getStatusCode());
+        Assert.assertEquals("attachment; filename=\"data.tab.dpPdf_0.1.pdf\"", downloadAuxFilePdf.header("Content-disposition"));
+
+        // Download Markdown aux file.
+        Response downloadAuxFileMd = UtilIT.downloadAuxFile(fileId, formatTagMd, formatVersionMd, apiToken);
+        downloadAuxFileMd.then().assertThat().statusCode(OK.getStatusCode());
+        Assert.assertEquals("attachment; filename=\"data.tab.README_0.1.txt\"", downloadAuxFileMd.header("Content-disposition"));
 
     }
 }

From e419194316eb6a77f337920507cc223bf0e8a4f8 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 6 Apr 2021 14:26:50 -0400
Subject: [PATCH 20/44] update release note to reflect recent changes #7400

---
 doc/release-notes/7400-opendp-download.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes/7400-opendp-download.md b/doc/release-notes/7400-opendp-download.md
index 7fc252b22b5..f6b79f4c28f 100644
--- a/doc/release-notes/7400-opendp-download.md
+++ b/doc/release-notes/7400-opendp-download.md
@@ -1,6 +1,10 @@
-Auxiliary Files can now be downloaded from the web interface. In addition, related changes were made, including the following:
+Auxiliary Files can now be downloaded from the web interface.
+
+- Aux files uploaded as type=DP appear under "Differentially Private Statistics" under file level download. The rest (type=OTHER) appear under "Other Auxiliary Files".
+
+In addition, related changes were made, including the following:
 
 - New tooltip over the lock indicating if you have been granted access to a restricted file or not.
 - When downloading individual files, you will see "Restricted with Access Granted" or just "Restricted" (followed by "Users may not request access to files.") as appropriate.
 - When downloading individual files, instead of "Download" you should expect to see the file type such as "JPEG Image" or "Original File Format" if the type is unknown.
-- If the tag for an aux file starts with "dp" it will be displayed under "Differentially Private Statistics" under file level download. The rest appear under "Other Auxiliary Files".
+- Downloaded aux files now have a file extension if it can be determined.

From 92af221c7fb6ac49255e53752f3d12252b3a6fab Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 6 Apr 2021 16:16:27 -0400
Subject: [PATCH 21/44] add AuxiliaryFilesIT to test suite script #7400

---
 conf/docker-aio/run-test-suite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/docker-aio/run-test-suite.sh b/conf/docker-aio/run-test-suite.sh
index 47a4c3b9576..bf0683fdbd4 100755
--- a/conf/docker-aio/run-test-suite.sh
+++ b/conf/docker-aio/run-test-suite.sh
@@ -8,4 +8,4 @@ fi
 
 # Please note the "dataverse.test.baseurl" is set to run for "all-in-one" Docker environment.
 # TODO: Rather than hard-coding the list of "IT" classes here, add a profile to pom.xml.
-source maven/maven.sh && mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT,DuplicateFilesIT,DownloadFilesIT,LinkIT,DeleteUsersIT,DeactivateUsersIT -Ddataverse.test.baseurl=$dvurl
+source maven/maven.sh && mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT,DuplicateFilesIT,DownloadFilesIT,LinkIT,DeleteUsersIT,DeactivateUsersIT,AuxiliaryFilesIT -Ddataverse.test.baseurl=$dvurl

From a1e852a7c018ba03208e6e3cfb2216000ce62df4 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 7 Apr 2021 11:23:51 -0400
Subject: [PATCH 22/44] prevent anon download of aux files in draft #7400

---
 .../source/developers/aux-file-support.rst    |  2 +-
 .../edu/harvard/iq/dataverse/api/Access.java  |  8 +++-
 .../iq/dataverse/api/AuxiliaryFilesIT.java    | 39 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 6589089bd72..efa59aa04a4 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -5,7 +5,7 @@ Auxiliary file support is experimental. Auxiliary files in the Dataverse Softwar
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------
-To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, an "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter can be "DP" (for Differentially Private Statistics) or "OTHER" and the latter will be selected for you if don't specify a type.
+To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter can be "DP" (for Differentially Private Statistics) or "OTHER" and the latter will be selected for you if don't specify a type.
 
 .. code-block:: bash
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Access.java b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
index d12d0d7a900..c0507c05275 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Access.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
@@ -587,7 +587,13 @@ public DownloadInstance tabularDatafileMetadataAux(@PathParam("fileId") String f
             }
             
             if (auxFile.getIsPublic()) {
-                publiclyAvailable = true;
+                // Require at least one published version for isPublic to be true.
+                for (FileMetadata fm : df.getFileMetadatas()) {
+                    if (fm.getDatasetVersion().isPublished()) {
+                        publiclyAvailable = true;
+                        break;
+                    }
+                }
             }
             downloadInstance = new DownloadInstance(dInfo);
             downloadInstance.setAuxiliaryFile(auxFile);
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
index 05ff3e0e328..72321e31309 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -9,6 +9,7 @@
 import java.nio.file.Paths;
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 import static javax.ws.rs.core.Response.Status.CREATED;
+import static javax.ws.rs.core.Response.Status.FORBIDDEN;
 import static javax.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
 import org.hamcrest.Matchers;
@@ -145,7 +146,7 @@ public void testUploadAuxFiles() throws IOException {
                 .statusCode(OK.getStatusCode())
                 .body("data.contentType", equalTo(mimeTypePdf));
 
-        // Non-DP file file, no type specified
+        // Non-DP aux file, no type specified
         Path pathToAuxFileMd = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "README.md");
         String contentOfMd = "This is my README.";
         java.nio.file.Files.write(pathToAuxFileMd, contentOfMd.getBytes());
@@ -173,6 +174,20 @@ public void testUploadAuxFiles() throws IOException {
                 .statusCode(BAD_REQUEST.getStatusCode())
                 .body("message", Matchers.startsWith("Invalid type"));
 
+        // rst aux file with public=false
+        Path pathToAuxFileRst = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "nonpublic.rst");
+        String contentOfRst = "Nonpublic stuff in here..";
+        java.nio.file.Files.write(pathToAuxFileRst, contentOfRst.getBytes());
+        String formatTagRst = "nonPublic";
+        String formatVersionRst = "0.1";
+        String mimeTypeRst = "text/plain";
+        Response uploadAuxFileRst = UtilIT.uploadAuxFile(fileId, pathToAuxFileRst.toString(), formatTagRst, formatVersionRst, mimeTypeRst, false, null, apiToken);
+        uploadAuxFileRst.prettyPrint();
+        uploadAuxFileRst.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("Other Auxiliary Files"))
+                .body("data.contentType", equalTo("text/plain"));
+
         // Download JSON aux file.
         Response downloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiToken);
         downloadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());
@@ -195,5 +210,27 @@ public void testUploadAuxFiles() throws IOException {
         downloadAuxFileMd.then().assertThat().statusCode(OK.getStatusCode());
         Assert.assertEquals("attachment; filename=\"data.tab.README_0.1.txt\"", downloadAuxFileMd.header("Content-disposition"));
 
+        Response createUserNoPrivs = UtilIT.createRandomUser();
+        createUserNoPrivs.then().assertThat().statusCode(OK.getStatusCode());
+        String apiTokenNoPrivs = UtilIT.getApiTokenFromResponse(createUserNoPrivs);
+
+        // This fails because the dataset hasn't been published.
+        Response failToDownloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiTokenNoPrivs);
+        failToDownloadAuxFileJson.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        Response failToDownloadAuxFileRstBeforePublish = UtilIT.downloadAuxFile(fileId, formatTagRst, formatVersionRst, apiTokenNoPrivs);
+        failToDownloadAuxFileRstBeforePublish.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        // isPublic=false so publishing the dataset doesn't let a "no privs" account download the file.
+        Response failToDownloadAuxFileRstAfterPublish = UtilIT.downloadAuxFile(fileId, formatTagRst, formatVersionRst, apiTokenNoPrivs);
+        failToDownloadAuxFileRstAfterPublish.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        Response creatorCanDownloadNonPublicAuxFile = UtilIT.downloadAuxFile(fileId, formatTagRst, formatVersionRst, apiToken);
+        creatorCanDownloadNonPublicAuxFile.then().assertThat().statusCode(OK.getStatusCode());
+
     }
 }

From 3b2ea4f1b45763fe1cb8905fcbf31078137a3675 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 12 Apr 2021 10:55:53 -0400
Subject: [PATCH 23/44] add missing "metadata" from aux file download path
 #7400

---
 doc/sphinx-guides/source/developers/aux-file-support.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index efa59aa04a4..3dffa6fec32 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -34,6 +34,6 @@ formatTag and formatVersion (if applicable) associated with the auxiliary file:
   export FORMAT_TAG='dpJson'
   export FORMAT_VERSION='v1'
 
-  curl "$SERVER_URL/api/access/datafile/$FILE_ID/$FORMAT_TAG/$FORMAT_VERSION"
+  curl "$SERVER_URL/api/access/datafile/$FILE_ID/metadata/$FORMAT_TAG/$FORMAT_VERSION"
 
 It is also possible to download the auxiliary file from the web interface. Auxiliary files that have a tag beginning with "dp" appear under "Differentially Private Statistics". The rest appear under "Other Auxiliary Files".

From 9e5f39089ea1824fabdd7a1deb9cdd7f76c18e51 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 13 Apr 2021 17:07:42 -0400
Subject: [PATCH 24/44] base "other" type/grouping on absence from bundle #7400

Any type can be added but only DP is in the bundle as therefore given a
"friendly" label in a grouping in the UI.
---
 .../source/developers/aux-file-support.rst    |  4 +-
 .../source/developers/aux-file-support.rstnew | 39 ++++++++++++
 .../harvard/iq/dataverse/AuxiliaryFile.java   | 37 +++---------
 .../dataverse/AuxiliaryFileServiceBean.java   | 55 +++++++++++++----
 .../edu/harvard/iq/dataverse/api/Access.java  | 14 +----
 .../iq/dataverse/util/json/JsonPrinter.java   |  2 +-
 src/main/java/propertyFiles/Bundle.properties |  3 +-
 .../V5.4.0.1__7400-opendp-download.sql        |  2 -
 .../file-download-button-fragment.xhtml       | 16 ++++-
 .../AuxiliaryFileServiceBeanTest.java         | 59 +++++++++++++++++++
 .../iq/dataverse/api/AuxiliaryFilesIT.java    | 42 +++++++++----
 11 files changed, 199 insertions(+), 74 deletions(-)
 create mode 100644 doc/sphinx-guides/source/developers/aux-file-support.rstnew
 create mode 100644 src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 3dffa6fec32..6f334ea8d2a 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -5,7 +5,7 @@ Auxiliary file support is experimental. Auxiliary files in the Dataverse Softwar
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------
-To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter can be "DP" (for Differentially Private Statistics) or "OTHER" and the latter will be selected for you if don't specify a type.
+To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter is used to group similar auxiliary files in the UI under "Differentially Private Statistics" if you use a type of "DP". All other auxiliary files appear under "Other Auxiliary Files".
 
 .. code-block:: bash
 
@@ -35,5 +35,3 @@ formatTag and formatVersion (if applicable) associated with the auxiliary file:
   export FORMAT_VERSION='v1'
 
   curl "$SERVER_URL/api/access/datafile/$FILE_ID/metadata/$FORMAT_TAG/$FORMAT_VERSION"
-
-It is also possible to download the auxiliary file from the web interface. Auxiliary files that have a tag beginning with "dp" appear under "Differentially Private Statistics". The rest appear under "Other Auxiliary Files".
diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rstnew b/doc/sphinx-guides/source/developers/aux-file-support.rstnew
new file mode 100644
index 00000000000..6ca5d9327f8
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rstnew
@@ -0,0 +1,39 @@
+Auxiliary File Support
+======================
+
+Auxiliary file support is experimental. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (opendp.org). In future versions, this approach may become more broadly used and supported. 
+
+Adding an Auxiliary File to a Datafile
+--------------------------------------
+To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter can be "DP" (for Differentially Private Statistics), "OTHER" (this will be selected for you if don't specify a type), or a type of your own choosing (which will be displayed along side "OTHER" auxiliary files until a friendly name is added to a properties file).
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export FILENAME='auxfile.txt'
+  export FILE_ID='12345'
+  export FORMAT_TAG='dpJson'
+  export FORMAT_VERSION='v1'
+  export TYPE='DP'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  curl -H X-Dataverse-key:$API_TOKEN -X POST -F "file=@$FILENAME" -F 'origin=myApp' -F 'isPublic=true' -F "type=$TYPE" "$SERVER_URL/api/access/datafile/$FILE_ID/metadata/$FORMAT_TAG/$FORMAT_VERSION"
+
+You should expect a 200 ("OK") response and JSON with information about your newly uploaded auxiliary file.
+
+Downloading an Auxiliary File that belongs to a Datafile 
+--------------------------------------------------------
+To download an auxiliary file, use the primary key of the datafile, and the
+formatTag and formatVersion (if applicable) associated with the auxiliary file:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID='12345'
+  export FORMAT_TAG='dpJson'
+  export FORMAT_VERSION='v1'
+
+  curl "$SERVER_URL/api/access/datafile/$FILE_ID/$FORMAT_TAG/$FORMAT_VERSION"
+
+It is also possible to download the auxiliary file from the web interface. Auxiliary files that have type=DP appear under "Differentially Private Statistics". The rest appear under "Other Auxiliary Files".
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
index 340dc018cae..626d0318ac4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
@@ -3,10 +3,7 @@
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.Serializable;
-import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -52,24 +49,7 @@ public class AuxiliaryFile implements Serializable {
      * A way of grouping similar auxiliary files together. The type could be
      * "DP" for "Differentially Private Statistics", for example.
      */
-    @Column(nullable = false)
-    @Enumerated(EnumType.STRING)
-    private Type type;
-
-    public enum Type {
-        // Differentially Private Statistics
-        DP,
-        // Future Type 1
-        //
-        // Future Type 2
-        //
-        // Catch-all for any not enumerated above
-        OTHER;
-
-        public String toStringFriendly() {
-            return BundleUtil.getStringFromBundle("file.auxfiles.types." + this.name());
-        }
-    }
+    private String type;
 
     public Long getId() {
         return id;
@@ -143,23 +123,20 @@ public void setChecksum(String checksum) {
         this.checksum = checksum;
     }
 
-    public Type getType() {
+    public String getType() {
         return type;
     }
 
-    public void setType(Type type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-    /**
-     * @return "Differentially Private Statistics" (or the equivalent in French,
-     * etc.) rather than "DP" or null if this.type is null.
-     */
     public String getTypeFriendly() {
-        if (this.type == null) {
-            return null;
+        String friendlyName = BundleUtil.getStringFromBundle("file.auxfiles.types." + type);
+        if (friendlyName != null) {
+            return friendlyName;
         } else {
-            return this.type.toStringFriendly();
+            return null;
         }
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
index 3f34e29d33c..82800c5fd57 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -8,6 +8,7 @@
 import java.io.InputStream;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
@@ -30,7 +31,7 @@ public class AuxiliaryFileServiceBean implements java.io.Serializable {
    private static final Logger logger = Logger.getLogger(AuxiliaryFileServiceBean.class.getCanonicalName());
 
     @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
+    protected EntityManager em;
     
     @EJB
     private SystemConfig systemConfig;
@@ -56,11 +57,11 @@ public AuxiliaryFile save(AuxiliaryFile auxiliaryFile) {
      * @param formatVersion - to distinguish between multiple versions of a file
      * @param origin - name of the tool/system that created the file
      * @param isPublic boolean - is this file available to any user?
-     * @param type how to group the files such as under "Differentially Private
-     * Statistics". Must not be null.
+     * @param type how to group the files such as "DP" for "Differentially
+     * Private Statistics".
      * @return success boolean - returns whether the save was successful
      */
-    public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile dataFile, String formatTag, String formatVersion, String origin, boolean isPublic, AuxiliaryFile.Type type) {
+    public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile dataFile, String formatTag, String formatVersion, String origin, boolean isPublic, String type) {
     
         StorageIO<DataFile> storageIO =null;
         AuxiliaryFile auxFile = new AuxiliaryFile();
@@ -125,6 +126,30 @@ public List<AuxiliaryFile> findAuxiliaryFiles(DataFile dataFile) {
         return query.getResultList();
     }
 
+    /**
+     * @param inBundle If true, only return types that are in the bundle. If
+     * false, only return types that are not in the bundle.
+     */
+    public List<String> findAuxiliaryFileTypes(DataFile dataFile, boolean inBundle) {
+        List<String> allTypes = findAuxiliaryFileTypes(dataFile);
+        List<String> typesInBundle = new ArrayList<>();
+        List<String> typeNotInBundle = new ArrayList<>();
+        for (String type : allTypes) {
+            // Check if type is in the bundle.
+            String friendlyType = getFriendlyNameForType(type);
+            if (friendlyType != null) {
+                typesInBundle.add(type);
+            } else {
+                typeNotInBundle.add(type);
+            }
+        }
+        if (inBundle) {
+            return typesInBundle;
+        } else {
+            return typeNotInBundle;
+        }
+    }
+
     public List<String> findAuxiliaryFileTypes(DataFile dataFile) {
         Query query = em.createNativeQuery("select distinct type from auxiliaryfile where datafile_id = ?1");
         query.setParameter(1, dataFile.getId());
@@ -138,13 +163,23 @@ public List<AuxiliaryFile> findAuxiliaryFilesByType(DataFile dataFile, String ty
         return query.getResultList();
     }
 
-    public String getFriendlyNameForType(String typeIn) {
-        try {
-            AuxiliaryFile.Type type = AuxiliaryFile.Type.valueOf(typeIn);
-            return type.toStringFriendly();
-        } catch (NullPointerException | IllegalArgumentException ex) {
-            return null;
+    public List<AuxiliaryFile> findOtherAuxiliaryFiles(DataFile dataFile) {
+        List<AuxiliaryFile> otherAuxFiles = new ArrayList<>();
+        List<String> otherTypes = findAuxiliaryFileTypes(dataFile, false);
+        for (String typeString : otherTypes) {
+            TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type", AuxiliaryFile.class);
+            query.setParameter("dataFileId", dataFile.getId());
+            query.setParameter("type", typeString);
+            List<AuxiliaryFile> auxFiles = query.getResultList();
+            otherAuxFiles.addAll(auxFiles);
         }
+        return otherAuxFiles;
+    }
+
+    public String getFriendlyNameForType(String type) {
+        AuxiliaryFile auxFile = new AuxiliaryFile();
+        auxFile.setType(type);
+        return auxFile.getTypeFriendly();
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Access.java b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
index c0507c05275..afed333d2b0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Access.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
@@ -1201,19 +1201,7 @@ public Response saveAuxiliaryFileWithVersion(@PathParam("fileId") Long fileId,
             return error(BAD_REQUEST, "Not a tabular DataFile (db id=" + fileId + ")");
         }
 
-        // Initialize as the default type, OTHER.
-        AuxiliaryFile.Type typeFinal = AuxiliaryFile.Type.OTHER;
-        try {
-            typeFinal = AuxiliaryFile.Type.valueOf(type);
-        } catch (NullPointerException ex) {
-            // No type given. Set it to OTHER.
-            typeFinal = AuxiliaryFile.Type.OTHER;
-        } catch (IllegalArgumentException ex) {
-            // Invalid type (not in the enum). Tell the user the valid types.
-            return error(BAD_REQUEST, "Invalid type. Must be one of: " + Stream.of(AuxiliaryFile.Type.values()).map(String::valueOf).collect(Collectors.joining(", ")));
-        }
-
-        AuxiliaryFile saved = auxiliaryFileService.processAuxiliaryFile(fileInputStream, dataFile, formatTag, formatVersion, origin, isPublic, typeFinal);
+        AuxiliaryFile saved = auxiliaryFileService.processAuxiliaryFile(fileInputStream, dataFile, formatTag, formatVersion, origin, isPublic, type);
       
         if (saved!=null) {
             return ok(json(saved));
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index b04533d3f77..4302d932f3c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -564,7 +564,7 @@ public static JsonObjectBuilder json(AuxiliaryFile auxFile) {
                 .add("formatVersion", auxFile.getFormatVersion()) // "label" is the filename
                 .add("origin", auxFile.getOrigin()) 
                 .add("isPublic", auxFile.getIsPublic())
-                .add("type", auxFile.getTypeFriendly())
+                .add("type", auxFile.getType())
                 .add("contentType", auxFile.getContentType())
                 .add("fileSize", auxFile.getFileSize())
                 .add("checksum", auxFile.getChecksum())
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index c431ce2308b..ac782156903 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1814,7 +1814,8 @@ file.configure.Button=Configure
 file.auxfiles.download.header=Download Auxiliary Files
 # These types correspond to the AuxiliaryFile.Type enum.
 file.auxfiles.types.DP=Differentially Private Statistics
-file.auxfiles.types.OTHER=Other Auxiliary Files
+# Add more types here
+file.auxfiles.unspecifiedTypes=Other Auxiliary Files
 
 # dataset-widgets.xhtml
 dataset.widgets.title=Dataset Thumbnail + Widgets
diff --git a/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql b/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql
index 190dff17052..de1a18b1e01 100644
--- a/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql
+++ b/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql
@@ -1,3 +1 @@
 ALTER TABLE auxiliaryfile ADD COLUMN IF NOT EXISTS type character varying(255);
-UPDATE auxiliaryfile SET type = 'OTHER' WHERE type IS NULL;
-ALTER TABLE auxiliaryfile ALTER COLUMN type SET NOT NULL;
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 8c464e96fd7..adc8cafc658 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -225,7 +225,8 @@
     <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
         <!-- Download Auxiliary Files -->
         <li class="dropdown-header">#{bundle['file.auxfiles.download.header']} <span class="glyphicon glyphicon-download-alt"/></li>
-        <ui:repeat var="auxFileType" value="#{auxiliaryFileServiceBean.findAuxiliaryFileTypes(fileMetadata.dataFile)}">
+        <!-- Aux Files in Bundle (DP, etc.)-->
+        <ui:repeat var="auxFileType" value="#{auxiliaryFileServiceBean.findAuxiliaryFileTypes(fileMetadata.dataFile, true)}">
             <li class="dropdown-submenu pull-left">
                 <a tabindex="-1" href="javascript:void(0);">#{auxiliaryFileServiceBean.getFriendlyNameForType(auxFileType)}</a>
                 <ul class="dropdown-menu">
@@ -239,6 +240,19 @@
                 </ul>
             </li>
         </ui:repeat>
+        <!--Other Aux Files (not in bundle)-->
+        <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findOtherAuxiliaryFiles(fileMetadata.dataFile)}">
+            <a tabindex="-1" href="javascript:void(0);">#{bundle['file.auxfiles.unspecifiedTypes']}</a>
+            <ul class="dropdown-menu">
+                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findOtherAuxiliaryFiles(fileMetadata.dataFile)}">
+                    <li>
+                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
+                            <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
+                        </p:commandLink>
+                    </li>
+                </ui:repeat>
+            </ul>
+        </li>
         <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
         <li role="presentation" class="clearfix"></li>
     </ui:fragment>
diff --git a/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java
new file mode 100644
index 00000000000..a691e851dfc
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java
@@ -0,0 +1,59 @@
+package edu.harvard.iq.dataverse;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentMatchers;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class AuxiliaryFileServiceBeanTest {
+
+    EntityManager em;
+    AuxiliaryFileServiceBean svc;
+    Query query;
+    List<String> types;
+    DataFile dataFile;
+
+    @Before
+    public void setup() {
+        svc = new AuxiliaryFileServiceBean();
+        svc.em = mock(EntityManager.class);
+        query = mock(Query.class);
+        types = Arrays.asList("DP", "GEOSPATIAL", "NEXT_BIG_THING", "FUTURE_FUN");
+        dataFile = new DataFile();
+        dataFile.setId(42l);
+    }
+
+    @Test
+    public void testFindAuxiliaryFileTypesInBundleFalse() {
+        System.out.println("testFindAuxiliaryFileTypesInBundleFalse");
+        boolean inBundle = false;
+        when(this.svc.em.createNativeQuery(ArgumentMatchers.anyString())).thenReturn(query);
+        when(query.getResultList()).thenReturn(types);
+        List<String> result = svc.findAuxiliaryFileTypes(dataFile, inBundle);
+        // None of these are in the bundle.
+        List<String> expected = Arrays.asList("GEOSPATIAL", "NEXT_BIG_THING", "FUTURE_FUN");
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void testFindAuxiliaryFileTypesInBundleTrue() {
+        System.out.println("testFindAuxiliaryFileTypesInBundleTrue");
+        boolean inBundle = true;
+        when(this.svc.em.createNativeQuery(ArgumentMatchers.anyString())).thenReturn(query);
+        when(query.getResultList()).thenReturn(types);
+        List<String> result = svc.findAuxiliaryFileTypes(dataFile, inBundle);
+        // DP is in the bundle.
+        List<String> expected = Arrays.asList("DP");
+        assertEquals(expected, result);
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
index 72321e31309..59cb3db1153 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -7,12 +7,10 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 import static javax.ws.rs.core.Response.Status.CREATED;
 import static javax.ws.rs.core.Response.Status.FORBIDDEN;
 import static javax.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.hamcrest.Matchers;
 import org.junit.Assert;
 import static org.junit.Assert.assertTrue;
 import org.junit.BeforeClass;
@@ -81,7 +79,7 @@ public void testUploadAuxFiles() throws IOException {
         uploadAuxFileJson.prettyPrint();
         uploadAuxFileJson.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.type", equalTo("Differentially Private Statistics"))
+                .body("data.type", equalTo("DP"))
                 // FIXME: application/json would be better
                 .body("data.contentType", equalTo("text/plain"));
 
@@ -96,6 +94,7 @@ public void testUploadAuxFiles() throws IOException {
         uploadAuxFileXml.prettyPrint();
         uploadAuxFileXml.then().assertThat()
                 .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("DP"))
                 // FIXME: application/xml would be better
                 .body("data.contentType", equalTo("text/plain"));
 
@@ -144,6 +143,7 @@ public void testUploadAuxFiles() throws IOException {
         uploadAuxFilePdf.prettyPrint();
         uploadAuxFilePdf.then().assertThat()
                 .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("DP"))
                 .body("data.contentType", equalTo(mimeTypePdf));
 
         // Non-DP aux file, no type specified
@@ -157,26 +157,42 @@ public void testUploadAuxFiles() throws IOException {
         uploadAuxFileMd.prettyPrint();
         uploadAuxFileMd.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.type", equalTo("Other Auxiliary Files"))
+                .body("data.type", equalTo(null))
                 .body("data.contentType", equalTo("text/plain"));
 
-        // Invalid type
-        Path pathToAuxFileTxt = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "foo.txt");
-        String contentOfTxt = "Just testing an invalid type.";
+        // Unknown type
+        Path pathToAuxFileTxt = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "nbt.txt");
+        String contentOfTxt = "It's gonna be huge.";
         java.nio.file.Files.write(pathToAuxFileTxt, contentOfTxt.getBytes());
-        String formatTagTxt = "justTesting";
+        String formatTagTxt = "gonnaBeHuge";
         String formatVersionTxt = "0.1";
         String mimeTypeTxt = "text/plain";
-        String typeTxt = "JUNK";
+        String typeTxt = "NEXT_BIG_THING";
         Response uploadAuxFileTxt = UtilIT.uploadAuxFile(fileId, pathToAuxFileTxt.toString(), formatTagTxt, formatVersionTxt, mimeTypeTxt, true, typeTxt, apiToken);
         uploadAuxFileTxt.prettyPrint();
         uploadAuxFileTxt.then().assertThat()
-                .statusCode(BAD_REQUEST.getStatusCode())
-                .body("message", Matchers.startsWith("Invalid type"));
+                .statusCode(OK.getStatusCode())
+                //                .body("data.type", equalTo("Other Auxiliary Files"));
+                .body("data.type", equalTo("NEXT_BIG_THING"));
+
+        // Another Unknown type
+        Path pathToAuxFileTxt2 = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "future.txt");
+        String contentOfTxt2 = "The future's so bright I have to wear shades.";
+        java.nio.file.Files.write(pathToAuxFileTxt2, contentOfTxt2.getBytes());
+        String formatTagTxt2 = "soBright";
+        String formatVersionTxt2 = "0.1";
+        String mimeTypeTxt2 = "text/plain";
+        String typeTxt2 = "FUTURE_FUN";
+        Response uploadAuxFileTxt2 = UtilIT.uploadAuxFile(fileId, pathToAuxFileTxt2.toString(), formatTagTxt2, formatVersionTxt2, mimeTypeTxt2, true, typeTxt2, apiToken);
+        uploadAuxFileTxt2.prettyPrint();
+        uploadAuxFileTxt2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                //                .body("data.type", equalTo("Other Auxiliary Files"));
+                .body("data.type", equalTo("FUTURE_FUN"));
 
         // rst aux file with public=false
         Path pathToAuxFileRst = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "nonpublic.rst");
-        String contentOfRst = "Nonpublic stuff in here..";
+        String contentOfRst = "Nonpublic stuff in here.";
         java.nio.file.Files.write(pathToAuxFileRst, contentOfRst.getBytes());
         String formatTagRst = "nonPublic";
         String formatVersionRst = "0.1";
@@ -185,7 +201,7 @@ public void testUploadAuxFiles() throws IOException {
         uploadAuxFileRst.prettyPrint();
         uploadAuxFileRst.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.type", equalTo("Other Auxiliary Files"))
+                .body("data.type", equalTo(null))
                 .body("data.contentType", equalTo("text/plain"));
 
         // Download JSON aux file.

From 9115380ae2e60199e42dd9cb2d5a6cb124715d4a Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 14 Apr 2021 15:49:05 -0400
Subject: [PATCH 25/44] add type=null aux files to "other" list #7400

---
 .../edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
index 82800c5fd57..7e522bdad27 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -173,9 +173,16 @@ public List<AuxiliaryFile> findOtherAuxiliaryFiles(DataFile dataFile) {
             List<AuxiliaryFile> auxFiles = query.getResultList();
             otherAuxFiles.addAll(auxFiles);
         }
+        otherAuxFiles.addAll(findAuxiliaryFilesWithoutType(dataFile));
         return otherAuxFiles;
     }
 
+    public List<AuxiliaryFile> findAuxiliaryFilesWithoutType(DataFile dataFile) {
+        Query query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type is null", AuxiliaryFile.class);
+        query.setParameter("dataFileId", dataFile.getId());
+        return query.getResultList();
+    }
+
     public String getFriendlyNameForType(String type) {
         AuxiliaryFile auxFile = new AuxiliaryFile();
         auxFile.setType(type);

From 3441758c991c60581f00f11accf9371c3807e865 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 14 Apr 2021 16:45:01 -0400
Subject: [PATCH 26/44] move SQL to named queries #7400

---
 .../harvard/iq/dataverse/AuxiliaryFile.java   | 19 +++++++++++++++++++
 .../dataverse/AuxiliaryFileServiceBean.java   | 12 ++++++------
 .../AuxiliaryFileServiceBeanTest.java         |  4 ++--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
index 626d0318ac4..e3195b963f0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
@@ -9,6 +9,10 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedNativeQueries;
+import javax.persistence.NamedNativeQuery;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 
 /**
  *
@@ -16,6 +20,21 @@
  * Represents a generic file that is associated with a dataFile.
  * This is a data representation of a physical file in StorageIO
  */
+@NamedQueries({
+    @NamedQuery(name = "AuxiliaryFile.lookupAuxiliaryFile",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.formatTag = :formatTag and o.formatVersion = :formatVersion"),
+    @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFiles",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId"),
+    @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesByType",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type"),
+    @NamedQuery(name = "AuxiliaryFile.findOtherAuxiliaryFiles",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type"),
+    @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesWithoutType",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type is null"),})
+@NamedNativeQueries({
+    @NamedNativeQuery(name = "AuxiliaryFile.findAuxiliaryFileTypes",
+            query = "select distinct type from auxiliaryfile where datafile_id = ?1")
+})
 @Entity
 public class AuxiliaryFile implements Serializable {
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
index 7e522bdad27..edcff5e5952 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -107,7 +107,7 @@ public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile
     
     public AuxiliaryFile lookupAuxiliaryFile(DataFile dataFile, String formatTag, String formatVersion) {
         
-        Query query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.formatTag = :formatTag and o.formatVersion = :formatVersion");
+        Query query = em.createNamedQuery("AuxiliaryFile.lookupAuxiliaryFile");
                 
         query.setParameter("dataFileId", dataFile.getId());
         query.setParameter("formatTag", formatTag);
@@ -121,7 +121,7 @@ public AuxiliaryFile lookupAuxiliaryFile(DataFile dataFile, String formatTag, St
     }
 
     public List<AuxiliaryFile> findAuxiliaryFiles(DataFile dataFile) {
-        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId", AuxiliaryFile.class);
+        TypedQuery query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFiles", AuxiliaryFile.class);
         query.setParameter("dataFileId", dataFile.getId());
         return query.getResultList();
     }
@@ -151,13 +151,13 @@ public List<String> findAuxiliaryFileTypes(DataFile dataFile, boolean inBundle)
     }
 
     public List<String> findAuxiliaryFileTypes(DataFile dataFile) {
-        Query query = em.createNativeQuery("select distinct type from auxiliaryfile where datafile_id = ?1");
+        Query query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFileTypes");
         query.setParameter(1, dataFile.getId());
         return query.getResultList();
     }
 
     public List<AuxiliaryFile> findAuxiliaryFilesByType(DataFile dataFile, String typeString) {
-        TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type", AuxiliaryFile.class);
+        TypedQuery query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFilesByType", AuxiliaryFile.class);
         query.setParameter("dataFileId", dataFile.getId());
         query.setParameter("type", typeString);
         return query.getResultList();
@@ -167,7 +167,7 @@ public List<AuxiliaryFile> findOtherAuxiliaryFiles(DataFile dataFile) {
         List<AuxiliaryFile> otherAuxFiles = new ArrayList<>();
         List<String> otherTypes = findAuxiliaryFileTypes(dataFile, false);
         for (String typeString : otherTypes) {
-            TypedQuery query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type", AuxiliaryFile.class);
+            TypedQuery query = em.createNamedQuery("AuxiliaryFile.findOtherAuxiliaryFiles", AuxiliaryFile.class);
             query.setParameter("dataFileId", dataFile.getId());
             query.setParameter("type", typeString);
             List<AuxiliaryFile> auxFiles = query.getResultList();
@@ -178,7 +178,7 @@ public List<AuxiliaryFile> findOtherAuxiliaryFiles(DataFile dataFile) {
     }
 
     public List<AuxiliaryFile> findAuxiliaryFilesWithoutType(DataFile dataFile) {
-        Query query = em.createQuery("select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type is null", AuxiliaryFile.class);
+        Query query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFilesWithoutType", AuxiliaryFile.class);
         query.setParameter("dataFileId", dataFile.getId());
         return query.getResultList();
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java
index a691e851dfc..55c1dfb9b20 100644
--- a/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java
@@ -36,7 +36,7 @@ public void setup() {
     public void testFindAuxiliaryFileTypesInBundleFalse() {
         System.out.println("testFindAuxiliaryFileTypesInBundleFalse");
         boolean inBundle = false;
-        when(this.svc.em.createNativeQuery(ArgumentMatchers.anyString())).thenReturn(query);
+        when(this.svc.em.createNamedQuery(ArgumentMatchers.anyString())).thenReturn(query);
         when(query.getResultList()).thenReturn(types);
         List<String> result = svc.findAuxiliaryFileTypes(dataFile, inBundle);
         // None of these are in the bundle.
@@ -48,7 +48,7 @@ public void testFindAuxiliaryFileTypesInBundleFalse() {
     public void testFindAuxiliaryFileTypesInBundleTrue() {
         System.out.println("testFindAuxiliaryFileTypesInBundleTrue");
         boolean inBundle = true;
-        when(this.svc.em.createNativeQuery(ArgumentMatchers.anyString())).thenReturn(query);
+        when(this.svc.em.createNamedQuery(ArgumentMatchers.anyString())).thenReturn(query);
         when(query.getResultList()).thenReturn(types);
         List<String> result = svc.findAuxiliaryFileTypes(dataFile, inBundle);
         // DP is in the bundle.

From f55b3686200963b592d7b6deb520eaa5881530ed Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 12:03:58 -0400
Subject: [PATCH 27/44] switch from "every version" check to "is file
 published" #7400

---
 .../java/edu/harvard/iq/dataverse/api/Access.java   | 13 ++++---------
 .../harvard/iq/dataverse/api/AuxiliaryFilesIT.java  |  4 ++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Access.java b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
index afed333d2b0..af0186b341f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Access.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
@@ -585,15 +585,10 @@ public DownloadInstance tabularDatafileMetadataAux(@PathParam("fileId") String f
             if (auxFile == null) {
                 throw new NotFoundException("Auxiliary metadata format "+formatTag+" is not available for datafile "+fileId);
             }
-            
-            if (auxFile.getIsPublic()) {
-                // Require at least one published version for isPublic to be true.
-                for (FileMetadata fm : df.getFileMetadatas()) {
-                    if (fm.getDatasetVersion().isPublished()) {
-                        publiclyAvailable = true;
-                        break;
-                    }
-                }
+
+            // Don't consider aux file public unless data file is published.
+            if (auxFile.getIsPublic() && df.getPublicationDate() != null) {
+                publiclyAvailable = true;
             }
             downloadInstance = new DownloadInstance(dInfo);
             downloadInstance.setAuxiliaryFile(auxFile);
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
index 59cb3db1153..4cc688c8758 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -248,5 +248,9 @@ public void testUploadAuxFiles() throws IOException {
         Response creatorCanDownloadNonPublicAuxFile = UtilIT.downloadAuxFile(fileId, formatTagRst, formatVersionRst, apiToken);
         creatorCanDownloadNonPublicAuxFile.then().assertThat().statusCode(OK.getStatusCode());
 
+        // This succeeds now that the dataset has been published.
+        Response failToDownloadAuxFileJsonPostPublish = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiTokenNoPrivs);
+        failToDownloadAuxFileJsonPostPublish.then().assertThat().statusCode(OK.getStatusCode());
+
     }
 }

From 9b852de13a48c373fcfcc7d84cf1b727422d75c9 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 14:39:14 -0400
Subject: [PATCH 28/44] refactor getFileExtension into own method #7400

---
 .../dataverse/api/DownloadInstanceWriter.java | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
index 2807e003fa7..46dc0512575 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
@@ -6,6 +6,7 @@
 
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.AuxiliaryFile;
 import java.lang.reflect.Type;
 import java.lang.annotation.Annotation;
 import java.io.InputStream; 
@@ -241,17 +242,7 @@ public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
                     }
                     long auxFileSize = di.getAuxiliaryFile().getFileSize();
                     InputStreamIO auxStreamIO = new InputStreamIO(storageIO.getAuxFileAsInputStream(auxTag), auxFileSize);
-                    String fileExtension = "";
-                    String contentType = di.getAuxiliaryFile().getContentType();
-                    if (contentType != null) {
-                        MimeTypes allTypes = MimeTypes.getDefaultMimeTypes();
-                        MimeType mimeType = null;
-                        try {
-                            mimeType = allTypes.forName(contentType);
-                            fileExtension = mimeType.getExtension();
-                        } catch (MimeTypeException ex) {
-                        }
-                    }
+                    String fileExtension = getFileExtension(di.getAuxiliaryFile());
                     auxStreamIO.setFileName(storageIO.getFileName() + "." + auxTag + fileExtension);
                     auxStreamIO.setMimeType(di.getAuxiliaryFile().getContentType());
                     storageIO = auxStreamIO;
@@ -402,7 +393,24 @@ public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
         throw new NotFoundException();
 
     }
-    
+
+    private String getFileExtension(AuxiliaryFile auxFile) {
+        String fileExtension = "";
+        if (auxFile == null) {
+            return fileExtension;
+        }
+        String contentType = auxFile.getContentType();
+        if (contentType != null) {
+            MimeTypes allTypes = MimeTypes.getDefaultMimeTypes();
+            try {
+                MimeType mimeType = allTypes.forName(contentType);
+                fileExtension = mimeType.getExtension();
+            } catch (MimeTypeException ex) {
+            }
+        }
+        return fileExtension;
+    }
+
     private boolean isThumbnailDownload(DownloadInstance downloadInstance) {
         if (downloadInstance == null) return false; 
         

From 6f8ddc9331e5c98660ebbcbe338fccaf1855011b Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 15:01:24 -0400
Subject: [PATCH 29/44] make "File Access: " its own entry in bundle #7400

---
 src/main/java/propertyFiles/Bundle.properties | 4 ++--
 src/main/webapp/file-info-fragment.xhtml      | 4 ++--
 src/main/webapp/file.xhtml                    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index ac782156903..ad7742a9e90 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -11,6 +11,7 @@ file=File
 public=Public
 restricted=Restricted
 restrictedaccess=Restricted Access
+restrictedWithAccessGranted=Restricted with Access Granted
 find=Find
 search=Search
 language=Language
@@ -1585,8 +1586,7 @@ file.metaData.checksum.copy=Click to copy
 file.metaData.dataFile.dataTab.unf=UNF
 file.metaData.dataFile.dataTab.variables=Variables
 file.metaData.dataFile.dataTab.observations=Observations
-file.metaData.access.restricted=File Access: Restricted
-file.metaData.access.granted=File Access: Restricted with Access Granted
+file.metaData.fileAccess=File Access: 
 file.addDescription=Add file description...
 file.tags=Tags
 file.editTags=Edit Tags
diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 370716f37cc..3595a7183a3 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -35,10 +35,10 @@
                     <p:graphicImage value="/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=true" alt="#{fileMetadata.label}"/>
                 </span>
                 <!-- Restricted File Icon -->
-                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.access.restricted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="glyphicon glyphicon-lock text-danger"/>
                 </div>
-                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.access.granted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restrictedWithAccessGranted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="icon-unlock text-success"/>
                 </div>
             </div>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 1a91583cf68..ff8cb9324d4 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -62,8 +62,8 @@
 
                                     <div id="title-label-block" class="margin-top-half">
                                         <!-- Restricted File Icon -->
-                                        <span class="glyphicon glyphicon-lock text-danger" title="#{bundle['file.metaData.access.restricted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
-                                        <span class="icon-unlock text-success" title="#{bundle['file.metaData.access.granted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
+                                        <span class="glyphicon glyphicon-lock text-danger" title="#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
+                                        <span class="icon-unlock text-success" title="#{bundle['restrictedWithAccessGranted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
                                         <!-- DATASET Publication Status -->
                                         <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>

From 7903a8f5d2aea848d52468bc65c60dcbb7565088 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 15:17:06 -0400
Subject: [PATCH 30/44] remove contradictory render logic #7400

It was saying "canDownloadFile=true OR canDownloadFile=false" which is
always true, so we simply remove it.
---
 src/main/webapp/dataset.xhtml | 7 +++----
 src/main/webapp/file.xhtml    | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 891bc047eff..f53950d2ecf 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -38,10 +38,9 @@
             <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
                                                     fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
             <!-- NOTE removed fileAccessRequest logic in order to always display the file access btn -->
-            <ui:param name="showAccessFileButtonGroup" value="#{fileDownloadHelper.canDownloadFile(fileMetadata)
-                                                                or (!fileDownloadHelper.canDownloadFile(fileMetadata))
-                                                                and (!DatasetPage.workingVersion.deaccessioned
-                                                                or (DatasetPage.workingVersion.deaccessioned and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)))}"/>
+            <ui:param name="showAccessFileButtonGroup" value="#{!DatasetPage.workingVersion.deaccessioned
+                                                                or (DatasetPage.workingVersion.deaccessioned
+                                                                and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset))}"/>
             <ui:param name="publishDataset" value="#{DatasetPage.publishDatasetPopup()}"/>
             <ui:param name="releaseDraft" value="#{DatasetPage.releaseDraftPopup()}"/>
             <ui:param name="releaseBoth" value="#{DatasetPage.publishBothPopup()}"/>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index ff8cb9324d4..0f462eab0d0 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -19,10 +19,9 @@
             <ui:param name="dataverse" value="#{FilePage.file.owner.owner}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
             <!-- NOTE removed fileAccessRequest logic in order to always display the file access btn -->
-            <ui:param name="showAccessFileButtonGroup" value="#{fileDownloadHelper.canDownloadFile(FilePage.fileMetadata)
-                                                                  or (!fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))
-                                                                  and (!FilePage.fileMetadata.datasetVersion.deaccessioned
-                                                                        or (FilePage.fileMetadata.datasetVersion.deaccessioned and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)))}"/>
+            <ui:param name="showAccessFileButtonGroup" value="#{!FilePage.fileMetadata.datasetVersion.deaccessioned
+                                                                or (FilePage.fileMetadata.datasetVersion.deaccessioned
+                                                                and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset))}"/>
             <ui:define name="meta_header">
             <meta name="description" content="#{FilePage.fileMetadata.description}"/>
             </ui:define>

From 98fdaefd8c41557e87b86e0a8bcf892c0754287f Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 15:56:45 -0400
Subject: [PATCH 31/44] prevent constant "missing bundle key" messages in
 server.log #7400

---
 src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
index e3195b963f0..5dc8d0ff007 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
@@ -3,6 +3,7 @@
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.Serializable;
+import java.util.MissingResourceException;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -151,10 +152,9 @@ public void setType(String type) {
     }
 
     public String getTypeFriendly() {
-        String friendlyName = BundleUtil.getStringFromBundle("file.auxfiles.types." + type);
-        if (friendlyName != null) {
-            return friendlyName;
-        } else {
+        try {
+            return BundleUtil.getStringFromPropertyFile("file.auxfiles.types." + type, "Bundle");
+        } catch (MissingResourceException ex) {
             return null;
         }
     }

From 81628864cbdbc2affbd6fc4a657df93779bee839 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 16:04:48 -0400
Subject: [PATCH 32/44] remove TODO, allowAccessRequests is working #7400

---
 src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
index aee2500568c..1945804c897 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
@@ -104,7 +104,6 @@ public static void setUp() throws InterruptedException {
         createDatasetResponse.prettyPrint();
         datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
 
-        // TODO: Get this working.
         Response allowAccessRequests = UtilIT.allowAccessRequests(datasetId.toString(), true, apiToken);
         allowAccessRequests.prettyPrint();
         allowAccessRequests.then().assertThat().statusCode(200);

From 20b4382011463e3a3d06533e57982f6ab83e50f5 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 16:09:45 -0400
Subject: [PATCH 33/44] remove reference to type=OTHER (legacy concept) in
 release note #7400

---
 doc/release-notes/7400-opendp-download.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/7400-opendp-download.md b/doc/release-notes/7400-opendp-download.md
index f6b79f4c28f..10cd7b71a54 100644
--- a/doc/release-notes/7400-opendp-download.md
+++ b/doc/release-notes/7400-opendp-download.md
@@ -1,6 +1,6 @@
 Auxiliary Files can now be downloaded from the web interface.
 
-- Aux files uploaded as type=DP appear under "Differentially Private Statistics" under file level download. The rest (type=OTHER) appear under "Other Auxiliary Files".
+- Aux files uploaded as type=DP appear under "Differentially Private Statistics" under file level download. The rest appear under "Other Auxiliary Files".
 
 In addition, related changes were made, including the following:
 

From 5dc723420db2ae8a96cc252f55751daa8893aa81 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 16:12:22 -0400
Subject: [PATCH 34/44] reword "type" on aux file page #7400

---
 doc/sphinx-guides/source/developers/aux-file-support.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 6f334ea8d2a..251c082c2d7 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -5,7 +5,7 @@ Auxiliary file support is experimental. Auxiliary files in the Dataverse Softwar
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------
-To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter is used to group similar auxiliary files in the UI under "Differentially Private Statistics" if you use a type of "DP". All other auxiliary files appear under "Other Auxiliary Files".
+To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter is used to group similar auxiliary files in the UI. Currently, for type "DP", they are appear under "Differentially Private Statistics", while all other auxiliary files appear under "Other Auxiliary Files".
 
 .. code-block:: bash
 

From 51cffe8b1f17551a56b05807ca0bc3821d683386 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 16:13:12 -0400
Subject: [PATCH 35/44] remove cruft (tmp file that got committed) #7400

---
 .../source/developers/aux-file-support.rstnew | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 doc/sphinx-guides/source/developers/aux-file-support.rstnew

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rstnew b/doc/sphinx-guides/source/developers/aux-file-support.rstnew
deleted file mode 100644
index 6ca5d9327f8..00000000000
--- a/doc/sphinx-guides/source/developers/aux-file-support.rstnew
+++ /dev/null
@@ -1,39 +0,0 @@
-Auxiliary File Support
-======================
-
-Auxiliary file support is experimental. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (opendp.org). In future versions, this approach may become more broadly used and supported. 
-
-Adding an Auxiliary File to a Datafile
---------------------------------------
-To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter can be "DP" (for Differentially Private Statistics), "OTHER" (this will be selected for you if don't specify a type), or a type of your own choosing (which will be displayed along side "OTHER" auxiliary files until a friendly name is added to a properties file).
-
-.. code-block:: bash
-
-  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export FILENAME='auxfile.txt'
-  export FILE_ID='12345'
-  export FORMAT_TAG='dpJson'
-  export FORMAT_VERSION='v1'
-  export TYPE='DP'
-  export SERVER_URL=https://demo.dataverse.org
- 
-  curl -H X-Dataverse-key:$API_TOKEN -X POST -F "file=@$FILENAME" -F 'origin=myApp' -F 'isPublic=true' -F "type=$TYPE" "$SERVER_URL/api/access/datafile/$FILE_ID/metadata/$FORMAT_TAG/$FORMAT_VERSION"
-
-You should expect a 200 ("OK") response and JSON with information about your newly uploaded auxiliary file.
-
-Downloading an Auxiliary File that belongs to a Datafile 
---------------------------------------------------------
-To download an auxiliary file, use the primary key of the datafile, and the
-formatTag and formatVersion (if applicable) associated with the auxiliary file:
-
-.. code-block:: bash
-
-  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export SERVER_URL=https://demo.dataverse.org
-  export FILE_ID='12345'
-  export FORMAT_TAG='dpJson'
-  export FORMAT_VERSION='v1'
-
-  curl "$SERVER_URL/api/access/datafile/$FILE_ID/$FORMAT_TAG/$FORMAT_VERSION"
-
-It is also possible to download the auxiliary file from the web interface. Auxiliary files that have type=DP appear under "Differentially Private Statistics". The rest appear under "Other Auxiliary Files".

From b132580b829646bdd09481f6268e75b98c990162 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 16:25:17 -0400
Subject: [PATCH 36/44] remove duplicate query and refactor #7400

---
 src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java       | 2 --
 .../java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
index 5dc8d0ff007..8404a9fd8f5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
@@ -28,8 +28,6 @@
             query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId"),
     @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesByType",
             query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type"),
-    @NamedQuery(name = "AuxiliaryFile.findOtherAuxiliaryFiles",
-            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type"),
     @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesWithoutType",
             query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type is null"),})
 @NamedNativeQueries({
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
index edcff5e5952..0643c3622d4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -167,7 +167,7 @@ public List<AuxiliaryFile> findOtherAuxiliaryFiles(DataFile dataFile) {
         List<AuxiliaryFile> otherAuxFiles = new ArrayList<>();
         List<String> otherTypes = findAuxiliaryFileTypes(dataFile, false);
         for (String typeString : otherTypes) {
-            TypedQuery query = em.createNamedQuery("AuxiliaryFile.findOtherAuxiliaryFiles", AuxiliaryFile.class);
+            TypedQuery query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFilesByType", AuxiliaryFile.class);
             query.setParameter("dataFileId", dataFile.getId());
             query.setParameter("type", typeString);
             List<AuxiliaryFile> auxFiles = query.getResultList();

From 46d1bd40ceaf7b31da5427ff90191289071868ed Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 15 Apr 2021 16:28:49 -0400
Subject: [PATCH 37/44] rename SQL script (5.4.1 is out) #7400

---
 ...400-opendp-download.sql => V5.4.1.1__7400-opendp-download.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/resources/db/migration/{V5.4.0.1__7400-opendp-download.sql => V5.4.1.1__7400-opendp-download.sql} (100%)

diff --git a/src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql b/src/main/resources/db/migration/V5.4.1.1__7400-opendp-download.sql
similarity index 100%
rename from src/main/resources/db/migration/V5.4.0.1__7400-opendp-download.sql
rename to src/main/resources/db/migration/V5.4.1.1__7400-opendp-download.sql

From 20654cd705ad815a2255b1262f60d6c1ed548ea2 Mon Sep 17 00:00:00 2001
From: Gustavo Durand <scolapasta+github@gmail.com>
Date: Thu, 15 Apr 2021 16:56:54 -0400
Subject: [PATCH 38/44] minor tweak to wording

---
 doc/sphinx-guides/source/developers/aux-file-support.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 251c082c2d7..732dabebc2d 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -5,7 +5,7 @@ Auxiliary file support is experimental. Auxiliary files in the Dataverse Softwar
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------
-To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter is used to group similar auxiliary files in the UI. Currently, for type "DP", they are appear under "Differentially Private Statistics", while all other auxiliary files appear under "Other Auxiliary Files".
+To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter is used to group similar auxiliary files in the UI. Currently, auxiliary files with type "DP" appear under "Differentially Private Statistics", while all other auxiliary files appear under "Other Auxiliary Files".
 
 .. code-block:: bash
 

From d277aa1a8c652a33d077974162dca99138722f06 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 16 Apr 2021 11:20:03 -0400
Subject: [PATCH 39/44] standardize on "Restricted with Access Granted" #7400

---
 src/main/java/propertyFiles/Bundle.properties | 3 +--
 src/main/webapp/file-info-fragment.xhtml      | 2 +-
 src/main/webapp/file.xhtml                    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index ad7742a9e90..c4a8ae64cc1 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -10,8 +10,7 @@ files=Files
 file=File
 public=Public
 restricted=Restricted
-restrictedaccess=Restricted Access
-restrictedWithAccessGranted=Restricted with Access Granted
+restrictedaccess=Restricted with Access Granted
 find=Find
 search=Search
 language=Language
diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 3595a7183a3..542b9a37e6f 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -38,7 +38,7 @@
                 <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="glyphicon glyphicon-lock text-danger"/>
                 </div>
-                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restrictedWithAccessGranted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restrictedaccess']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="icon-unlock text-success"/>
                 </div>
             </div>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 0f462eab0d0..0e4931e7086 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -62,7 +62,7 @@
                                     <div id="title-label-block" class="margin-top-half">
                                         <!-- Restricted File Icon -->
                                         <span class="glyphicon glyphicon-lock text-danger" title="#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
-                                        <span class="icon-unlock text-success" title="#{bundle['restrictedWithAccessGranted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
+                                        <span class="icon-unlock text-success" title="#{bundle['restrictedaccess']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
                                         <!-- DATASET Publication Status -->
                                         <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>

From dab2d8bef798f70ed995b8e5ea4e2082cc81888d Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 16 Apr 2021 11:28:09 -0400
Subject: [PATCH 40/44] make it clear that API might change #7400

---
 doc/sphinx-guides/source/developers/aux-file-support.rst | 2 +-
 src/main/java/edu/harvard/iq/dataverse/api/Access.java   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 732dabebc2d..21d39766695 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -1,7 +1,7 @@
 Auxiliary File Support
 ======================
 
-Auxiliary file support is experimental. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (opendp.org). In future versions, this approach may become more broadly used and supported. 
+Auxiliary file support is experimental. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (opendp.org). In future versions, this approach may become more broadly used and supported and APIs may change or be replaced.
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Access.java b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
index 68d50019d0c..51dbfa6fb58 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Access.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
@@ -544,6 +544,8 @@ public String dataVariableMetadataDDI(@PathParam("varId") Long varId, @QueryPara
     /*
      * GET method for retrieving various auxiliary files associated with 
      * a tabular datafile.
+     *
+     * TODO: Consider removing "metadata" from the path.
      */
     
     @Path("datafile/{fileId}/metadata/{formatTag}/{formatVersion}")
@@ -1167,6 +1169,8 @@ private String getWebappImageResource(String imageName) {
      * @param contentDispositionHeader
      * @param formDataBodyPart
      * @return 
+     *
+     * TODO: Consider removing "metadata" from the path.
      */
     @Path("datafile/{fileId}/metadata/{formatTag}/{formatVersion}")
     @POST

From ed0b037aadc830a3008d215d4ce97425d9669ed0 Mon Sep 17 00:00:00 2001
From: Gustavo Durand <scolapasta+github@gmail.com>
Date: Fri, 16 Apr 2021 12:36:14 -0400
Subject: [PATCH 41/44] Minor text tweaking

---
 doc/sphinx-guides/source/developers/aux-file-support.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
index 21d39766695..20b08bb9456 100644
--- a/doc/sphinx-guides/source/developers/aux-file-support.rst
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -1,7 +1,7 @@
 Auxiliary File Support
 ======================
 
-Auxiliary file support is experimental. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (opendp.org). In future versions, this approach may become more broadly used and supported and APIs may change or be replaced.
+Auxiliary file support is experimental and as such, related APIs may be added, changed or removed without standard backward compatibility. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the OpenDP project (opendp.org). In future versions, this approach will likely become more broadly used and supported.
 
 Adding an Auxiliary File to a Datafile
 --------------------------------------

From e1d5541fdc964535d10eeb88ddaae7efc3244587 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 16 Apr 2021 13:32:04 -0400
Subject: [PATCH 42/44] switch SQL query from LIKE to = #7400

---
 src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
index 8404a9fd8f5..cbc29217c7f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
@@ -27,7 +27,7 @@
     @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFiles",
             query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId"),
     @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesByType",
-            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type like :type"),
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type = :type"),
     @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesWithoutType",
             query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type is null"),})
 @NamedNativeQueries({

From e913a2396f9eb6b4ae5c4d322e0381261c774691 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 16 Apr 2021 13:39:27 -0400
Subject: [PATCH 43/44] remove duplicate bundle entries #7400

---
 src/main/java/propertyFiles/Bundle.properties       | 2 --
 src/main/webapp/file-download-button-fragment.xhtml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index c4a8ae64cc1..6b8ab6edcad 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1625,8 +1625,6 @@ file.downloadBtn.format.original={0} (Original File Format)
 file.downloadBtn.format.rdata=RData
 file.downloadBtn.format.var=Variable Metadata
 file.downloadBtn.format.citation=Data File Citation
-file.downloadBtn.restricted=Restricted
-file.downloadBtn.restricted.with.access.granted=Restricted with Access Granted
 file.download.filetype.unknown=Original File Format
 file.more.information.link=Link to more file information for 
 file.requestAccess=Request Access
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index adc8cafc658..ac8f7c28c40 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -17,7 +17,7 @@
             <span class="#{!fileMetadata.restricted ?
                            'glyphicon glyphicon-globe text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'glyphicon glyphicon-lock text-danger' : 'icon-unlock text-success')}"/>
             <h:outputText 
-                value=" #{!fileMetadata.restricted ? 'Public' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? bundle['file.downloadBtn.restricted'] : bundle['file.downloadBtn.restricted.with.access.granted'])}"
+                value=" #{!fileMetadata.restricted ? 'Public' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? bundle['restricted'] : bundle['restrictedaccess'])}"
                 styleClass="#{!fileMetadata.restricted ? 'text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'text-danger' : 'text-success')}"/>
         </span></li>
 

From cf7b6d100ba456c6efc2facfd5686ea8e2af5528 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 22 Apr 2021 14:25:09 -0400
Subject: [PATCH 44/44] add note that aux file APIs can be blocked #7400

---
 doc/release-notes/7400-opendp-download.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes/7400-opendp-download.md b/doc/release-notes/7400-opendp-download.md
index 10cd7b71a54..64e33250e1a 100644
--- a/doc/release-notes/7400-opendp-download.md
+++ b/doc/release-notes/7400-opendp-download.md
@@ -8,3 +8,5 @@ In addition, related changes were made, including the following:
 - When downloading individual files, you will see "Restricted with Access Granted" or just "Restricted" (followed by "Users may not request access to files.") as appropriate.
 - When downloading individual files, instead of "Download" you should expect to see the file type such as "JPEG Image" or "Original File Format" if the type is unknown.
 - Downloaded aux files now have a file extension if it can be determined.
+
+Please note that the auxiliary files feature is experimental and if you don't need it, its API endpoints can be blocked.