Merge branch 'develop' into 12258-publish-submit-contains-files

Author: stevenwinship

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

@@ -59,25 +59,9 @@ public boolean isValid(DatasetField value, ConstraintValidatorContext context) {
         }
 
         // if value is not primitive or not empty
-        // For controlled vocabulary fields, check that actual CV values are selected,
-        // not just that datasetFieldValues contains something (which might be an invalid N/A placeholder)
-        // See https://github.com/IQSS/dataverse/issues/11900
-        if (!dsfType.isPrimitive()) {
+        if (!dsfType.isPrimitive() || !StringUtils.isBlank(value.getValue())) {
             return true;
         }
-        
-        if (dsfType.isControlledVocabulary()) {
-            // For CV fields, check if there are actual controlled vocabulary values selected
-            if (value.getControlledVocabularyValues() != null && !value.getControlledVocabularyValues().isEmpty()) {
-                return true;
-            }
-            // If no CV values, fall through to required field check below
-        } else {
-            // For non-CV primitive fields, check if value is not blank
-            if (!StringUtils.isBlank(value.getValue())) {
-                return true;
-            }
-        }
 
         if (value.isRequired()) { 
             String errorMessage = null;

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

@@ -4039,8 +4039,8 @@ public String save() {
             dataset.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
         }
         // Validate
-        workingVersion.validate(); // add validation messages to dataset fields
-        if (!workingVersion.isValid()) {
+        Set<ConstraintViolation> constraintViolations = workingVersion.validate();
+        if (!constraintViolations.isEmpty()) {
             FacesContext.getCurrentInstance().validationFailed();
             return "";
         }

src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java

@@ -110,14 +110,10 @@ protected void validateOrDie(DatasetVersion dsv, Boolean lenient) throws Command
         Set<ConstraintViolation> constraintViolations = dsv.validate();
         if (!constraintViolations.isEmpty()) {
             if (lenient) {
-                // populate invalid primitive fields with N/A
-                // Note: controlled vocabulary fields should NOT get N/A values in datasetfieldvalue,
-                // as this creates an inconsistent state where the CV field appears valid but is empty.
-                // See https://github.com/IQSS/dataverse/issues/11900
+                // populate invalid fields with N/A
                 constraintViolations.stream()
                     .filter(cv -> cv.getRootBean() instanceof DatasetField)
                     .map(cv -> ((DatasetField) cv.getRootBean()))
-                    .filter(f -> !f.getDatasetFieldType().isControlledVocabulary())
                     .forEach(f -> f.setSingleValue(DatasetField.NA_VALUE));
 
             } else {