From e043bf16f5c04f7a672e5b8f39c77ae1bdebd508 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:32:16 +0200
Subject: [PATCH 01/10] restored suppressing dataverse field with
 getDatasetCount rather than findAll

---
 .../edu/harvard/iq/dataverse/DatasetPage.java   |  8 ++++++++
 .../iq/dataverse/DataverseConverter.java        | 17 ++++++++++++++++-
 src/main/webapp/dataset.xhtml                   |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index b41e8d4ac35..da1345123b3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -105,6 +105,8 @@
 import jakarta.persistence.OptimisticLockException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.Duration;
 import org.primefaces.event.FileUploadEvent;
 import org.primefaces.model.file.UploadedFile;
 
@@ -332,6 +334,7 @@ public enum DisplayMode {
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     private Dataverse selectedHostDataverse;
+    private boolean hasDataversesToChoose;
 
     public Dataverse getSelectedHostDataverse() {
         return selectedHostDataverse;
@@ -1781,6 +1784,11 @@ public void setDataverseTemplates(List<Template> dataverseTemplates) {
         this.dataverseTemplates = dataverseTemplates;
     }
 
+    public boolean isHasDataversesToChoose() {
+        this.hasDataversesToChoose = dataverseService.getDataverseCount() > 1;
+        return this.hasDataversesToChoose;
+    }
+
     public Template getDefaultTemplate() {
         return defaultTemplate;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
index 2b40894a595..58e89b0a867 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
@@ -13,19 +13,34 @@
 import jakarta.faces.convert.Converter;
 import jakarta.faces.convert.FacesConverter;
 
+import java.util.logging.Logger;
+
 /**
  *
  * @author skraffmiller
  */
 @FacesConverter("dataverseConverter")
 public class DataverseConverter implements Converter {
+    private static final Logger logger = Logger.getLogger(DatasetPage.class.getCanonicalName());
+
     
     //@EJB
     DataverseServiceBean dataverseService = CDI.current().select(DataverseServiceBean.class).get();
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
-        return dataverseService.find(new Long(submittedValue));
+        if (submittedValue == null || !submittedValue.matches("[0-9]+")) {
+            logger.fine("Submitted value is not a host dataverse number but: " + submittedValue);
+            return CDI.current().select(DatasetPage.class).get().getSelectedHostDataverse();
+        }
+        else {
+            try {
+                return dataverseService.find(Long.parseLong(submittedValue));
+            } catch (NumberFormatException e) {
+                logger.warning("Submitted value is out of range for a Long: " + submittedValue);
+                return CDI.current().select(DatasetPage.class).get().getSelectedHostDataverse();
+            }
+        }
         //return dataverseService.findByAlias(submittedValue);
     }
 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 7729b6da442..0b16e63ac94 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -777,7 +777,7 @@
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
-                        <div class="form-group">
+                        <div class="form-group" jsf:rendered="#{DatasetPage.hasDataversesToChoose and DatasetPage.editMode == 'CREATE'}">
                             <label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'selectHostDataverse_input' : 'select_HostDataverse_Static'}" class="col-md-3 control-label">
                                 #{bundle.hostDataverse}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"

From 32dd076502783eea77a31b0302b240aaecc48949 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:49:01 +0200
Subject: [PATCH 02/10] copilot review

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

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
index 58e89b0a867..ad847626879 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
@@ -21,7 +21,7 @@
  */
 @FacesConverter("dataverseConverter")
 public class DataverseConverter implements Converter {
-    private static final Logger logger = Logger.getLogger(DatasetPage.class.getCanonicalName());
+    private static final Logger logger = Logger.getLogger(DataverseConverter.class.getCanonicalName());
 
     
     //@EJB

From 84149b3ce9d52f4116525688137f0e90cc8d60ac Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:19:59 +0200
Subject: [PATCH 03/10] cash hasDataversesToChoose

---
 src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index da1345123b3..4a03cc322d8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -334,7 +334,7 @@ public enum DisplayMode {
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     private Dataverse selectedHostDataverse;
-    private boolean hasDataversesToChoose;
+    private Boolean hasDataversesToChoose;
 
     public Dataverse getSelectedHostDataverse() {
         return selectedHostDataverse;
@@ -1785,7 +1785,10 @@ public void setDataverseTemplates(List<Template> dataverseTemplates) {
     }
 
     public boolean isHasDataversesToChoose() {
-        this.hasDataversesToChoose = dataverseService.getDataverseCount() > 1;
+        // TODO we actually need to look for dataverses where a user has permission to add a dataset
+        if (this.hasDataversesToChoose == null) {
+            this.hasDataversesToChoose = dataverseService.getDataverseCount() > 1;
+        }
         return this.hasDataversesToChoose;
     }
 

From db03fffbd33577b9634dddcfaa9b971f15742936 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:22:04 +0200
Subject: [PATCH 04/10] unised imports

---
 src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 4a03cc322d8..0ecde12b09a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -105,8 +105,6 @@
 import jakarta.persistence.OptimisticLockException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
 import org.primefaces.event.FileUploadEvent;
 import org.primefaces.model.file.UploadedFile;
 

From d641b7165b875d8f14926f4301b06dc528cbb43f Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Tue, 7 Oct 2025 14:26:49 +0200
Subject: [PATCH 05/10] release note

---
 .../11865-restored-suppress-dataverse-field              | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/release-notes/11865-restored-suppress-dataverse-field

diff --git a/doc/release-notes/11865-restored-suppress-dataverse-field b/doc/release-notes/11865-restored-suppress-dataverse-field
new file mode 100644
index 00000000000..7d35cf8ba63
--- /dev/null
+++ b/doc/release-notes/11865-restored-suppress-dataverse-field
@@ -0,0 +1,9 @@
+### Restored suppression of the host dataverse field
+
+When creating/editing a dataset, the _host dataverse_ field is not shown when there is no other dataverse than the root dataverse.
+
+This was introduced in 6.7 with PR #11301 and reverted in 6.7.1 with PR #11700.
+A performance penalty was observed in instances with a large number of dataverses.
+The worst performance degradation is remedied by reusing a query that returns the total number of dataverses.
+
+The number be more than a user is authorized to add datasets to so a user might still see the field even if there is no dataverse to select.
\ No newline at end of file

From 34cf465ad006b393766ceac58de4ac748a151633 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Thu, 9 Oct 2025 13:58:19 +0200
Subject: [PATCH 06/10] hasDataversesToChoose with existing logic of permission
 service

---
 .../edu/harvard/iq/dataverse/DatasetPage.java | 15 +++-
 .../iq/dataverse/DataverseServiceBean.java    | 10 +++
 .../iq/dataverse/PermissionServiceBean.java   | 84 +++++++++++--------
 3 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 0ecde12b09a..7394984c443 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1,5 +1,8 @@
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.globus.Permissions;
 import edu.harvard.iq.dataverse.provenance.ProvPopupFragmentBean;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
@@ -1783,9 +1786,17 @@ public void setDataverseTemplates(List<Template> dataverseTemplates) {
     }
 
     public boolean isHasDataversesToChoose() {
-        // TODO we actually need to look for dataverses where a user has permission to add a dataset
+
         if (this.hasDataversesToChoose == null) {
-            this.hasDataversesToChoose = dataverseService.getDataverseCount() > 1;
+            var user = this.session.getUser();
+            if (!user.isAuthenticated()) {
+                this.hasDataversesToChoose = false;
+            } else {
+                var req = dvRequestService.getDataverseRequest();
+                var permissionBit = 1 << Permission.AddDataset.ordinal();
+                var authenticatedUser = (AuthenticatedUser) user;
+                this.hasDataversesToChoose = permissionService.hasMultiplePermittedCollections(req, authenticatedUser, permissionBit);
+            }
         }
         return this.hasDataversesToChoose;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index c14711060af..45ac4c27cf9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -1276,6 +1276,16 @@ public long getDataverseCount() {
         return em.createNamedQuery("Dataverse.countAll", Long.class).getSingleResult();
     }
 
+    public boolean getHasRolesOnMultipleDataverses(String assignee) {
+        return em.createQuery("SELECT dv "
+                              + "FROM roleassignment ra "
+                              + "JOIN dataverse      dv "
+                              + "  ON dv.id = ra.definitionpoint_id "
+                              + "WHERE ra.assigneeidentifier = '@user001' OR ra.assigneeidentifier = ':authenticated-users' limit 2", Dataverse.class)
+                   .setParameter("assignee", assignee)
+                   .getResultList().size() > 1;
+    }
+
     /**
      * Returns the total number of published datasets within a Dataverse collection. The number includes harvested and
      * linked datasets. Datasets in subcollections are also counted.
diff --git a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
index e00e303356e..a2d69c546a9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
@@ -928,45 +928,59 @@ public List<Dataverse> findPermittedCollections(DataverseRequest request, Authen
 
     public List<Dataverse> findPermittedCollections(DataverseRequest request, AuthenticatedUser user, int permissionBit) {
         if (user != null) {
-            // IP Group - Only check IP if a User is calling for themself
-            String ipRangeSQL = "FALSE";
-            if (request != null
-                    && request.getAuthenticatedUser() != null
-                    && !request.getAuthenticatedUser().isSuperuser()
-                    && request.getSourceAddress() != null
-                    && request.getAuthenticatedUser().getUserIdentifier().equalsIgnoreCase(user.getUserIdentifier())) {
-                IpAddress ip = request.getSourceAddress();
-                if (ip instanceof IPv4Address) {
-                    IPv4Address ipv4 = (IPv4Address) ip;
-                    ipRangeSQL = ipv4.toBigInteger() + " BETWEEN ipv4range.bottomaslong AND ipv4range.topaslong";
-                } else if (ip instanceof IPv6Address) {
-                    IPv6Address ipv6 = (IPv6Address) ip;
-                    long[] vals = ipv6.toLongArray();
-                    if (vals.length == 4) {
-                        ipRangeSQL = """
-                                (@0 BETWEEN ipv6range.bottoma AND ipv6range.topa
-                                AND @1 BETWEEN ipv6range.bottomb AND ipv6range.topb
-                                AND @2 BETWEEN ipv6range.bottomc AND ipv6range.topc
-                                AND @3 BETWEEN ipv6range.bottomd AND ipv6range.topd)
-                                """;
-                        for (int i = 0; i < vals.length; i++) {
-                            ipRangeSQL = ipRangeSQL.replace("@" + i, String.valueOf(vals[i]));
-                        }
+            var sqlCode = getSqlCode(request, user, permissionBit);
+            return em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
+        }
+        return null;
+    }
+
+    public boolean hasMultiplePermittedCollections(DataverseRequest request, AuthenticatedUser user, int permissionBit) {
+        if (user != null) {
+            var sqlCode = getSqlCode(request, user, permissionBit) + " LIMIT 2";
+            var resultList = em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
+            return resultList.size() > 1;
+        }
+        return false;
+    }
+
+    private String getSqlCode(DataverseRequest request, AuthenticatedUser user, int permissionBit) {
+        // IP Group - Only check IP if a User is calling for themself
+        String ipRangeSQL = "FALSE";
+        if (request != null
+            && request.getAuthenticatedUser() != null
+            && !request.getAuthenticatedUser().isSuperuser()
+            && request.getSourceAddress() != null
+            && request.getAuthenticatedUser().getUserIdentifier().equalsIgnoreCase(user.getUserIdentifier())) {
+            IpAddress ip = request.getSourceAddress();
+            if (ip instanceof IPv4Address) {
+                IPv4Address ipv4 = (IPv4Address) ip;
+                ipRangeSQL = ipv4.toBigInteger() + " BETWEEN ipv4range.bottomaslong AND ipv4range.topaslong";
+            } else if (ip instanceof IPv6Address) {
+                IPv6Address ipv6 = (IPv6Address) ip;
+                long[] vals = ipv6.toLongArray();
+                if (vals.length == 4) {
+                    ipRangeSQL = """
+                            (@0 BETWEEN ipv6range.bottoma AND ipv6range.topa
+                            AND @1 BETWEEN ipv6range.bottomb AND ipv6range.topb
+                            AND @2 BETWEEN ipv6range.bottomc AND ipv6range.topc
+                            AND @3 BETWEEN ipv6range.bottomd AND ipv6range.topd)
+                            """;
+                    for (int i = 0; i < vals.length; i++) {
+                        ipRangeSQL = ipRangeSQL.replace("@" + i, String.valueOf(vals[i]));
                     }
                 }
             }
-            String sqlCode;
-            if (user.isSuperuser()) {
-                sqlCode = LIST_ALL_DATAVERSES_SUPERUSER_HAS_PERMISSION;
-            } else {
-                sqlCode = LIST_ALL_DATAVERSES_USER_HAS_PERMISSION
-                        .replace("@USERID", String.valueOf(user.getId()))
-                        .replace("@PERMISSIONBIT", String.valueOf(permissionBit))
-                        .replace("@IPRANGESQL", ipRangeSQL);
-            }
-            return em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
         }
-        return null;
+        String sqlCode;
+        if (user.isSuperuser()) {
+            sqlCode = LIST_ALL_DATAVERSES_SUPERUSER_HAS_PERMISSION;
+        } else {
+            sqlCode = LIST_ALL_DATAVERSES_USER_HAS_PERMISSION
+                    .replace("@USERID", String.valueOf(user.getId()))
+                    .replace("@PERMISSIONBIT", String.valueOf(permissionBit))
+                    .replace("@IPRANGESQL", ipRangeSQL);
+        }
+        return sqlCode;
     }
 
     /**

From 44e8647d2c28fb59d08eb31a24bcbdbedffc9064 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 13 Oct 2025 15:51:31 +0200
Subject: [PATCH 07/10] review issues

---
 .../11865-restored-suppress-dataverse-field            |  2 +-
 .../edu/harvard/iq/dataverse/DataverseServiceBean.java | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/doc/release-notes/11865-restored-suppress-dataverse-field b/doc/release-notes/11865-restored-suppress-dataverse-field
index 7d35cf8ba63..56309705533 100644
--- a/doc/release-notes/11865-restored-suppress-dataverse-field
+++ b/doc/release-notes/11865-restored-suppress-dataverse-field
@@ -1,6 +1,6 @@
 ### Restored suppression of the host dataverse field
 
-When creating/editing a dataset, the _host dataverse_ field is not shown when there is no other dataverse than the root dataverse.
+When creating/editing a dataset, the _host dataverse_ field is not shown when the user can only add datasets to one collection.
 
 This was introduced in 6.7 with PR #11301 and reverted in 6.7.1 with PR #11700.
 A performance penalty was observed in instances with a large number of dataverses.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 45ac4c27cf9..c14711060af 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -1276,16 +1276,6 @@ public long getDataverseCount() {
         return em.createNamedQuery("Dataverse.countAll", Long.class).getSingleResult();
     }
 
-    public boolean getHasRolesOnMultipleDataverses(String assignee) {
-        return em.createQuery("SELECT dv "
-                              + "FROM roleassignment ra "
-                              + "JOIN dataverse      dv "
-                              + "  ON dv.id = ra.definitionpoint_id "
-                              + "WHERE ra.assigneeidentifier = '@user001' OR ra.assigneeidentifier = ':authenticated-users' limit 2", Dataverse.class)
-                   .setParameter("assignee", assignee)
-                   .getResultList().size() > 1;
-    }
-
     /**
      * Returns the total number of published datasets within a Dataverse collection. The number includes harvested and
      * linked datasets. Datasets in subcollections are also counted.

From 2e841e7a7d16df3ea5e184dfd9c14a766818f33e Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 20 Oct 2025 09:22:29 +0200
Subject: [PATCH 08/10] fixed outdated release notes

---
 .../11865-restored-suppress-dataverse-field              | 9 ---------
 doc/release-notes/11865-suppress-host-dataverse-field.md | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 doc/release-notes/11865-restored-suppress-dataverse-field
 create mode 100644 doc/release-notes/11865-suppress-host-dataverse-field.md

diff --git a/doc/release-notes/11865-restored-suppress-dataverse-field b/doc/release-notes/11865-restored-suppress-dataverse-field
deleted file mode 100644
index 56309705533..00000000000
--- a/doc/release-notes/11865-restored-suppress-dataverse-field
+++ /dev/null
@@ -1,9 +0,0 @@
-### Restored suppression of the host dataverse field
-
-When creating/editing a dataset, the _host dataverse_ field is not shown when the user can only add datasets to one collection.
-
-This was introduced in 6.7 with PR #11301 and reverted in 6.7.1 with PR #11700.
-A performance penalty was observed in instances with a large number of dataverses.
-The worst performance degradation is remedied by reusing a query that returns the total number of dataverses.
-
-The number be more than a user is authorized to add datasets to so a user might still see the field even if there is no dataverse to select.
\ No newline at end of file
diff --git a/doc/release-notes/11865-suppress-host-dataverse-field.md b/doc/release-notes/11865-suppress-host-dataverse-field.md
new file mode 100644
index 00000000000..482516cbf97
--- /dev/null
+++ b/doc/release-notes/11865-suppress-host-dataverse-field.md
@@ -0,0 +1,9 @@
+### Suppression of the Host Dataverse field
+
+When creating a dataset, the _host dataverse_ field is not shown when the user can only add datasets to one collection.
+
+This was introduced in 6.7 with PR #11301 and reverted in 6.7.1 with PR #11700.
+A performance penalty was observed in instances with a large number of dataverses.
+The performance degradation is remedied by reusing the query for the API command [allowedCollections] but return at most two rows.
+
+allowedCollections: https://guides.dataverse.org/en/latest/api/native-api.html#list-dataverse-collections-a-user-can-act-on-based-on-their-permissions
\ No newline at end of file

From 1687097416ff0d5758cdb27f06fa91d1e8fcbd2d Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 20 Oct 2025 15:47:30 +0200
Subject: [PATCH 09/10] (re)extracted methods to solve merge conflict

---
 .../iq/dataverse/PermissionServiceBean.java   | 158 +++++++++---------
 1 file changed, 76 insertions(+), 82 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
index d492991bb62..402a1b06e3c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
@@ -953,96 +953,90 @@ public List<Dataverse> findPermittedCollections(DataverseRequest request, Authen
     
     public List<Dataverse> findPermittedCollections(DataverseRequest request, AuthenticatedUser user, int permissionBit, String searchTerm) {
         if (user != null) {
-            // IP Group - Only check IP if a User is calling for themself
-            String ipRangeSQL = "FALSE";
-            if (request != null
-                    && request.getAuthenticatedUser() != null
-                    && !request.getAuthenticatedUser().isSuperuser()
-                    && request.getSourceAddress() != null
-                    && request.getAuthenticatedUser().getUserIdentifier().equalsIgnoreCase(user.getUserIdentifier())) {
-                IpAddress ip = request.getSourceAddress();
-                if (ip instanceof IPv4Address) {
-                    IPv4Address ipv4 = (IPv4Address) ip;
-                    ipRangeSQL = ipv4.toBigInteger() + " BETWEEN ipv4range.bottomaslong AND ipv4range.topaslong";
-                } else if (ip instanceof IPv6Address) {
-                    IPv6Address ipv6 = (IPv6Address) ip;
-                    long[] vals = ipv6.toLongArray();
-                    if (vals.length == 4) {
-                        ipRangeSQL = """
-                                (@0 BETWEEN ipv6range.bottoma AND ipv6range.topa
-                                AND @1 BETWEEN ipv6range.bottomb AND ipv6range.topb
-                                AND @2 BETWEEN ipv6range.bottomc AND ipv6range.topc
-                                AND @3 BETWEEN ipv6range.bottomd AND ipv6range.topd)
-                                """;
-                        for (int i = 0; i < vals.length; i++) {
-                            ipRangeSQL = ipRangeSQL.replace("@" + i, String.valueOf(vals[i]));
-                        }
-                    }
-                }
+            var sqlCode = getBaseQueryForAllPermittedDataverses(request, user, permissionBit);
+            if (searchTerm == null || searchTerm.isEmpty()) {
+                return em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
+            } else if (user.isSuperuser()) {
+                Query query = em.createNativeQuery(sqlCode.concat(WHERE).concat(SEARCH_PARAMS), Dataverse.class);
+                setSearchParamValues(searchTerm, query);
+                return query.getResultList();
             }
-            String sqlCode;
-            if (user.isSuperuser()) {
-                sqlCode = LIST_ALL_DATAVERSES_SUPERUSER_HAS_PERMISSION;
-
-                if (searchTerm == null || searchTerm.isEmpty()) {
-                    return em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
-                } else {
-                    sqlCode = LIST_ALL_DATAVERSES_SUPERUSER_HAS_PERMISSION.concat(WHERE).concat(SEARCH_PARAMS);
+            else {
+                Query query = em.createNativeQuery(sqlCode.concat(AND).concat(SEARCH_PARAMS), Dataverse.class);
+                setSearchParamValues(searchTerm, query);
+                return query.getResultList();
+            }
+        }
+        return null;
+    }
 
-                    String pattern = searchTerm.toLowerCase();
-                    String pattern1 = pattern + "%";
-                    String pattern2 = "% " + pattern + "%";
+    public boolean hasMultiplePermittedCollections(DataverseRequest request, AuthenticatedUser user, int permissionBit) {
+        if (user != null) {
+            var sqlCode = getBaseQueryForAllPermittedDataverses(request, user, permissionBit) + " LIMIT 2";
+            var resultList = em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
+            return resultList.size() > 1;
+        }
+        return false;
+    }
 
-                    // Adjust the queries for very short, 1 
-                    if (pattern.length() == 1) {
-                        pattern1 = pattern;
-                        pattern2 = pattern + " %";
-                    }
-                    Query query = em.createNativeQuery(sqlCode, Dataverse.class);
-                    query.setParameter(1, "%dataverse");
-                    query.setParameter(2, pattern1);
-                    query.setParameter(3, pattern2);
-                    query.setParameter(4, "%dataverse");
-                    query.setParameter(5, pattern1);
-                    query.setParameter(6, pattern2);
-                    return query.getResultList();
+    private String getBaseQueryForAllPermittedDataverses(DataverseRequest request, AuthenticatedUser user, int permissionBit) {
+        if (user.isSuperuser()) {
+            return LIST_ALL_DATAVERSES_SUPERUSER_HAS_PERMISSION;
+        } else {
+            return LIST_ALL_DATAVERSES_USER_HAS_PERMISSION
+                .replace("@USERID", String.valueOf(user.getId()))
+                .replace("@PERMISSIONBIT", String.valueOf(permissionBit))
+                .replace("@IPRANGESQL", getIpRange(request, user));
+        }
+    }
 
-                }
-            } else {
-                if (searchTerm == null || searchTerm.isEmpty()) {
-                    sqlCode = LIST_ALL_DATAVERSES_USER_HAS_PERMISSION
-                            .replace("@USERID", String.valueOf(user.getId()))
-                            .replace("@PERMISSIONBIT", String.valueOf(permissionBit))
-                            .replace("@IPRANGESQL", ipRangeSQL);
-                    return em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
-                } else {
-                    String pattern = searchTerm.toLowerCase();
-                    String pattern1 = pattern + "%";
-                    String pattern2 = "% " + pattern + "%";
-
-                    // Adjust the queries for very short, 1 
-                    if (pattern.length() == 1) {
-                        pattern1 = pattern;
-                        pattern2 = pattern + " %";
+    private String getIpRange(DataverseRequest request, AuthenticatedUser user) {
+        // IP Group - Only check IP if a User is calling for themself
+        String ipRangeSQL = "FALSE";
+        if (request != null
+            && request.getAuthenticatedUser() != null
+            && !request.getAuthenticatedUser().isSuperuser()
+            && request.getSourceAddress() != null
+            && request.getAuthenticatedUser().getUserIdentifier().equalsIgnoreCase(user.getUserIdentifier())) {
+            IpAddress ip = request.getSourceAddress();
+            if (ip instanceof IPv4Address) {
+                IPv4Address ipv4 = (IPv4Address) ip;
+                ipRangeSQL = ipv4.toBigInteger() + " BETWEEN ipv4range.bottomaslong AND ipv4range.topaslong";
+            } else if (ip instanceof IPv6Address) {
+                IPv6Address ipv6 = (IPv6Address) ip;
+                long[] vals = ipv6.toLongArray();
+                if (vals.length == 4) {
+                    ipRangeSQL = """
+                            (@0 BETWEEN ipv6range.bottoma AND ipv6range.topa
+                            AND @1 BETWEEN ipv6range.bottomb AND ipv6range.topb
+                            AND @2 BETWEEN ipv6range.bottomc AND ipv6range.topc
+                            AND @3 BETWEEN ipv6range.bottomd AND ipv6range.topd)
+                            """;
+                    for (int i = 0; i < vals.length; i++) {
+                        ipRangeSQL = ipRangeSQL.replace("@" + i, String.valueOf(vals[i]));
                     }
-
-                    sqlCode = LIST_ALL_DATAVERSES_USER_HAS_PERMISSION.concat(AND).concat(SEARCH_PARAMS)
-                            .replace("@USERID", String.valueOf(user.getId()))
-                            .replace("@PERMISSIONBIT", String.valueOf(permissionBit))
-                            .replace("@IPRANGESQL", ipRangeSQL);
-                    
-                    Query query = em.createNativeQuery(sqlCode, Dataverse.class);
-                    query.setParameter(1, "%dataverse");
-                    query.setParameter(2, pattern1);
-                    query.setParameter(3, pattern2);
-                    query.setParameter(4, "%dataverse");
-                    query.setParameter(5, pattern1);
-                    query.setParameter(6, pattern2);
-                    return query.getResultList();
                 }
             }
         }
-        return null;
+        return ipRangeSQL;
+    }
+
+    private void setSearchParamValues(String searchTerm, Query query) {
+        String pattern = searchTerm.toLowerCase();
+        String pattern1 = pattern + "%";
+        String pattern2 = "% " + pattern + "%";
+
+        // Adjust the queries for very short, 1
+        if (pattern.length() == 1) {
+            pattern1 = pattern;
+            pattern2 = pattern + " %";
+        }
+        query.setParameter(1, "%dataverse");
+        query.setParameter(2, pattern1);
+        query.setParameter(3, pattern2);
+        query.setParameter(4, "%dataverse");
+        query.setParameter(5, pattern1);
+        query.setParameter(6, pattern2);
     }
 
     /**

From 737659031a78dde963405404eebaf5f576ad624e Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Tue, 21 Oct 2025 10:27:02 +0200
Subject: [PATCH 10/10] overlooked review details

---
 doc/release-notes/11865-suppress-host-dataverse-field.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/doc/release-notes/11865-suppress-host-dataverse-field.md b/doc/release-notes/11865-suppress-host-dataverse-field.md
index 482516cbf97..0160831885d 100644
--- a/doc/release-notes/11865-suppress-host-dataverse-field.md
+++ b/doc/release-notes/11865-suppress-host-dataverse-field.md
@@ -1,9 +1,3 @@
 ### Suppression of the Host Dataverse field
 
-When creating a dataset, the _host dataverse_ field is not shown when the user can only add datasets to one collection.
-
-This was introduced in 6.7 with PR #11301 and reverted in 6.7.1 with PR #11700.
-A performance penalty was observed in instances with a large number of dataverses.
-The performance degradation is remedied by reusing the query for the API command [allowedCollections] but return at most two rows.
-
-allowedCollections: https://guides.dataverse.org/en/latest/api/native-api.html#list-dataverse-collections-a-user-can-act-on-based-on-their-permissions
\ No newline at end of file
+When creating a dataset, the _host dataverse_ field is not shown when the user can only add datasets to one collection.
\ No newline at end of file