From 0ba0814ba4b3b21c006b10a7bf752f32ae31fd0a Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Tue, 4 Mar 2025 12:38:44 +0100
Subject: [PATCH 1/9] fix blocking page

---
 .../java/edu/harvard/iq/dataverse/DataverseConverter.java | 8 +++++++-
 1 file changed, 7 insertions(+), 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 d802117043b..a9e9dac2305 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
@@ -26,7 +26,13 @@ public class DataverseConverter implements Converter {
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
-        return dataverseService.find(new Long(submittedValue));
+        if (submittedValue == null || submittedValue.isEmpty()) {
+            return "";
+        }
+        if (submittedValue.matches(".*[^0-9].*")) {
+            return submittedValue;
+        }
+        return dataverseService.find(Long.valueOf(submittedValue));
         //return dataverseService.findByAlias(submittedValue);
     }
 

From e2a6757676f832b8940ead352ddd9b8bd8f05068 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Thu, 6 Mar 2025 13:33:33 +0100
Subject: [PATCH 2/9] using zero as default search argument

---
 .../edu/harvard/iq/dataverse/DataverseConverter.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
index a9e9dac2305..3cc4276e6a3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
@@ -26,13 +26,9 @@ public class DataverseConverter implements Converter {
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
-        if (submittedValue == null || submittedValue.isEmpty()) {
-            return "";
-        }
-        if (submittedValue.matches(".*[^0-9].*")) {
-            return submittedValue;
-        }
-        return dataverseService.find(Long.valueOf(submittedValue));
+        var pk = (submittedValue == null || submittedValue.isEmpty() || submittedValue.matches(".*[^0-9].*"))
+        ? 0 : Long.valueOf(submittedValue);
+        return dataverseService.find(pk);
         //return dataverseService.findByAlias(submittedValue);
     }
 

From 56177bac4a3e3cd233c7f1fc7f4ab9088ac5db43 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 17 Mar 2025 14:02:16 +0100
Subject: [PATCH 3/9] hide host dataverse when none available to choose

---
 src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 7 ++++++-
 src/main/webapp/dataset.xhtml                           | 2 +-
 2 files changed, 7 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 411b55bf64b..59efd4e7cdf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -141,7 +141,6 @@
 import jakarta.faces.event.AjaxBehaviorEvent;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.commons.lang3.mutable.MutableBoolean;
@@ -334,6 +333,7 @@ public enum DisplayMode {
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     private Dataverse selectedHostDataverse;
+    private boolean hasDataversesToChoose;
 
     public Dataverse getSelectedHostDataverse() {
         return selectedHostDataverse;
@@ -1766,6 +1766,11 @@ 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/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 51a5e265538..cc680011baa 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -730,7 +730,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 1ebe7f2576faae2e108a7b602996a356a27e7cee Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Thu, 3 Apr 2025 12:09:26 +0200
Subject: [PATCH 4/9] release note

---
 doc/release-notes/11301blocked-deposit-page.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/release-notes/11301blocked-deposit-page.md

diff --git a/doc/release-notes/11301blocked-deposit-page.md b/doc/release-notes/11301blocked-deposit-page.md
new file mode 100644
index 00000000000..5a8acb31621
--- /dev/null
+++ b/doc/release-notes/11301blocked-deposit-page.md
@@ -0,0 +1,5 @@
+### Reduced chance of losing metadata on Edit Dataset Metadata page
+
+The remedy for the problem consists of two parts:
+* Do not show the _host dataverse_ field when there is nothing to choose. This mimics the behaviour for templates.
+* When you accidentally start typing in the _host dataverse_ field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception is remedied by looking for the root dataverse.
\ No newline at end of file

From 34cef440aa454cb98fa63f2f88d50b038f6c1a38 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 14 Apr 2025 09:38:23 +0200
Subject: [PATCH 5/9] zero is not always root

---
 doc/release-notes/11301blocked-deposit-page.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/11301blocked-deposit-page.md b/doc/release-notes/11301blocked-deposit-page.md
index 5a8acb31621..70f4d032c25 100644
--- a/doc/release-notes/11301blocked-deposit-page.md
+++ b/doc/release-notes/11301blocked-deposit-page.md
@@ -2,4 +2,4 @@
 
 The remedy for the problem consists of two parts:
 * Do not show the _host dataverse_ field when there is nothing to choose. This mimics the behaviour for templates.
-* When you accidentally start typing in the _host dataverse_ field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception is remedied by looking for the root dataverse.
\ No newline at end of file
+* When you accidentally start typing in the _host dataverse_ field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception is remedied by looking for a dataverse with ID zero.
\ No newline at end of file

From e587510892cd527c17bd4096d3b49810cf042acf Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 2 Jun 2025 16:03:37 +0200
Subject: [PATCH 6/9] change request and simplified test

---
 .../edu/harvard/iq/dataverse/DataverseConverter.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
index 3cc4276e6a3..eea98a6143d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
@@ -26,9 +26,12 @@ public class DataverseConverter implements Converter {
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
-        var pk = (submittedValue == null || submittedValue.isEmpty() || submittedValue.matches(".*[^0-9].*"))
-        ? 0 : Long.valueOf(submittedValue);
-        return dataverseService.find(pk);
+        if (submittedValue == null || !submittedValue.matches("[0-9]+")) {
+            return dataverseService.findRootDataverse();
+        }
+        else {
+            return dataverseService.find(Long.valueOf(submittedValue));
+        }
         //return dataverseService.findByAlias(submittedValue);
     }
 

From ed92750df62c2970889bde30465aba454b9e8028 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Tue, 3 Jun 2025 14:01:03 +0200
Subject: [PATCH 7/9] changes release note according to applied change request

---
 ...301blocked-deposit-page.md => 11301-blocked-deposit-page.md} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename doc/release-notes/{11301blocked-deposit-page.md => 11301-blocked-deposit-page.md} (84%)

diff --git a/doc/release-notes/11301blocked-deposit-page.md b/doc/release-notes/11301-blocked-deposit-page.md
similarity index 84%
rename from doc/release-notes/11301blocked-deposit-page.md
rename to doc/release-notes/11301-blocked-deposit-page.md
index 70f4d032c25..8f5221fc578 100644
--- a/doc/release-notes/11301blocked-deposit-page.md
+++ b/doc/release-notes/11301-blocked-deposit-page.md
@@ -2,4 +2,4 @@
 
 The remedy for the problem consists of two parts:
 * Do not show the _host dataverse_ field when there is nothing to choose. This mimics the behaviour for templates.
-* When you accidentally start typing in the _host dataverse_ field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception is remedied by looking for a dataverse with ID zero.
\ No newline at end of file
+* When you accidentally start typing in the _host dataverse_ field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception (caused by an invalid argument) is remedied by looking for the root dataverse.
\ No newline at end of file

From 69b854dea7bafda8104790e253458bb793a24cfd Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Thu, 5 Jun 2025 14:25:23 +0200
Subject: [PATCH 8/9] keep initial dataverse on invalid input

---
 .../java/edu/harvard/iq/dataverse/DataverseConverter.java   | 6 +++++-
 1 file changed, 5 insertions(+), 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 eea98a6143d..dc6e1d306f2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
@@ -13,12 +13,15 @@
 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
@@ -27,7 +30,8 @@ public class DataverseConverter implements Converter {
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
         if (submittedValue == null || !submittedValue.matches("[0-9]+")) {
-            return dataverseService.findRootDataverse();
+            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));

From a9ca7bb7895b1a3a2a8ed80671e59c0aa3d6c1fc Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Thu, 5 Jun 2025 15:44:57 +0200
Subject: [PATCH 9/9] release not change according to code

---
 doc/release-notes/11301-blocked-deposit-page.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/11301-blocked-deposit-page.md b/doc/release-notes/11301-blocked-deposit-page.md
index 8f5221fc578..98af00ea0a7 100644
--- a/doc/release-notes/11301-blocked-deposit-page.md
+++ b/doc/release-notes/11301-blocked-deposit-page.md
@@ -2,4 +2,4 @@
 
 The remedy for the problem consists of two parts:
 * Do not show the _host dataverse_ field when there is nothing to choose. This mimics the behaviour for templates.
-* When you accidentally start typing in the _host dataverse_ field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception (caused by an invalid argument) is remedied by looking for the root dataverse.
\ No newline at end of file
+* When you accidentally start typing in the _host dataverse_ field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception (caused by an invalid argument) is remedied returning the currently selected value.
\ No newline at end of file