revert #11301 (manually) due to perf issue #11698

pdurbin · pdurbin · commit 48bad3885758 · 2025-07-30T11:43:47.000-04:00
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -331,7 +331,6 @@ public enum DisplayMode {
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     private Dataverse selectedHostDataverse;
-    private boolean hasDataversesToChoose;
 
     public Dataverse getSelectedHostDataverse() {
         return selectedHostDataverse;
@@ -1773,11 +1772,6 @@ public void setDataverseTemplates(List<Template> dataverseTemplates) {
         this.dataverseTemplates = dataverseTemplates;
     }
 
-    public boolean isHasDataversesToChoose() {
-        this.hasDataversesToChoose = dataverseService.findAll().size() > 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
@@ -13,30 +13,19 @@
 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) {
-        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 {
-            return dataverseService.find(Long.valueOf(submittedValue));
-        }
-        //return dataverseService.findByAlias(submittedValue);
+        return dataverseService.findByAlias(submittedValue);
     }
 
     @Override
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -753,7 +753,7 @@
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
-                        <div class="form-group" jsf:rendered="#{DatasetPage.hasDataversesToChoose and DatasetPage.editMode == 'CREATE'}">
+                        <div class="form-group">
                             <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"
