Merge branch 'develop' into 12030-unable-to-delete-dataverse-with-metrics

Author: stevenwinship

doc/release-notes/6.9-release-notes.md

@@ -95,6 +95,7 @@ See [the guides](https://guides.dataverse.org/en/6.9/developers/workflows.html#c
 - In prior versions of Dataverse, publishing a dataset via the superuser-only update-current-version option would not set the current curation status (if enabled/used) to none/empty and, in v6.7, would not maintain the curation status history. These issues are now resolved and the update-current-version option works the same as normal publication of a new version with regard to curation status. See #11783 and #11784.
 - This release fixes problems with guestbook questions being displayed at download when files are selected from the dataset files table when guestbook-at-request is enabled and not displaying when they should when access is requested from the file page. See #11800, #11808, and #11835.
 - The optional Croissant exporter has been updated to 0.1.6 to prevent variable names, variable descriptions, and variable types from being exposed for restricted files. See https://github.com/gdcc/exporter-croissant/pull/20 and #11752.
+- Manage Gustbooks page was optimized to load much faster for collections with large numbers of downloads recorded. 
 
 ## API Updates
 

doc/sphinx-guides/source/conf.py

@@ -70,7 +70,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '6.8'
+version = '6.9'
 # The full version, including alpha/beta/rc tags.
 release = version
 

doc/sphinx-guides/source/versions.rst

@@ -8,6 +8,7 @@ This list provides a way to refer to the documentation for previous and future v
 
 - pre-release `HTML (not final!) <http://preview.guides.gdcc.io/en/develop/>`__ and `PDF (experimental!) <http://preview.guides.gdcc.io/_/downloads/en/develop/pdf/>`__ built from the :doc:`develop </developers/version-control>` branch :doc:`(how to contribute!) </contributor/documentation>`
 - |version|
+- `6.8 </en/6.8/>`__
 - `6.7.1 </en/6.7.1/>`__
 - `6.7 </en/6.7/>`__
 - `6.6 </en/6.6/>`__

modules/dataverse-parent/pom.xml

@@ -132,7 +132,7 @@
 
     <properties>
         <!-- This is a special Maven property name, do not change! -->
-        <revision>6.8</revision>
+        <revision>6.9</revision>
 
         <target.java.version>17</target.java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -32,7 +32,9 @@
         @Index(columnList = "datafile_id"),
         @Index(columnList = "datasetversion_id"),
         @Index(columnList = "authenticateduser_id"),
-        @Index(columnList = "dataset_id")
+        @Index(columnList = "dataset_id"),
+        @Index(columnList = "dataset_id, guestbook_id", name="INDEX_GUESTBOOKRESPONSE_dataset_id_guestbook_id"),
+        @Index(columnList = "dataset_id, eventtype", name="INDEX_GUESTBOOKRESPONSE_dataset_id_eventtype")
 })
 
 @NamedQueries(

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

@@ -488,17 +488,25 @@ public Long findCount30Days(Long dataverseId) {
         return (Long) query.getSingleResult();
     }
 
-    public Long findCountAll() {
-        return findCountAll(null);
-    }
-
     public Long findCountAll(Long dataverseId) {
-        String queryString;
-        if (dataverseId != null) {
-            queryString = "select count(o.id) from GuestbookResponse  o,  DvObject v where o.dataset_id = v.id and v.owner_id = " + dataverseId + " ";
-        } else {
-            queryString = "select count(o.id) from GuestbookResponse  o ";
+      
+        if (dataverseId == null) {
+            return null;
         }
+        
+        // Note that this method used to support NULL dataverseId, 
+        // in which case it counted ALL the guestbookresponse rows
+        // for the entire instance: 
+        // queryString = "select count(o.id) from GuestbookResponse  o ";
+        // I removed this code (it was not being used, thankfully) since
+        // the query can be insanely expensive on a large production table. 
+        // That's why we use a stored procedure to "estimate" its size, in 
+        // the dedicated getTotalDownloadCount() method further below, for 
+        // example, when we need to show the total number of downloads on 
+        // the homepage. (L.A.)
+        
+        String queryString = "select count(o.id) from GuestbookResponse  o, DvObject v, Dataset d where o.dataset_id = v.id and v.id = d.id and v.owner_id = " + dataverseId + " ";
+            
 
         Query query = em.createNativeQuery(queryString);
         return (Long) query.getSingleResult();

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

@@ -586,7 +586,7 @@ public void setRenderFileMessages(boolean renderFileMessages) {
 
     public String getSignedUrlForRAHistoryCsv() {
         //Including /v1 is required for the signature to validate
-        String apiPath = "/api/v1/datasets/" + dataset.getId() + "/files/permissions/history";
+        String apiPath = "/api/v1/datasets/" + dataset.getId() + "/files/assignments/history";
 
         try {
             // Get the application URL from the system config

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

@@ -701,10 +701,10 @@ public String getSignedUrlForRAHistoryCsv() {
         //Including /v1 in these urls is required for the signature to validate
         if (dvObject instanceof Dataverse dv) {
             // For Dataverses, use the dataverses API endpoint with the alias
-            apiPath = "/api/v1/dataverses/" + dv.getAlias() + "/permissions/history";
+            apiPath = "/api/v1/dataverses/" + dv.getAlias() + "/assignments/history";
         } else if (dvObject instanceof Dataset) {
             // For Datasets, use the datasets API endpoint with the ID
-            apiPath = "/api/v1/datasets/" + dvObject.getId() + "/permissions/history";
+            apiPath = "/api/v1/datasets/" + dvObject.getId() + "/assignments/history";
         } else {
             // For other types (like DataFile), return null or a default path
             return null;

src/main/resources/db/migration/V6.8.0.4.sql

@@ -0,0 +1,2 @@
+CREATE INDEX IF NOT EXISTS  INDEX_GUESTBOOKRESPONSE_dataset_id_guestbook_id ON GUESTBOOKRESPONSE (dataset_id, guestbook_id);
+CREATE INDEX IF NOT EXISTS  INDEX_GUESTBOOKRESPONSE_dataset_id_eventtype ON GUESTBOOKRESPONSE (dataset_id, eventtype);

src/main/webapp/permissions-manage-files.xhtml

@@ -221,7 +221,7 @@
                     </div>
                     <!-- Role Assignment History Panel -->
                     <o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
-                    <div class="panel panel-default" rendered="#{FeatureFlags.ROLE_ASSIGNMENT_HISTORY.enabled()}">
+                    <div class="panel panel-default" jsf:rendered="#{FeatureFlags.ROLE_ASSIGNMENT_HISTORY.enabled()}">
                       <div data-toggle="collapse" data-target="#panelCollapseHistory" class="panel-heading text-info">
                         #{bundle['dataverse.permissions.history']} <span class="glyphicon glyphicon-chevron-down" /> <span class="text-muted small pull-right">#{bundle['dataverse.permissions.history.description']}</span>
                       </div>