Fixing display condition of CVOC Conf of keyword in template edition outside of inrae collections

Author: luddaniel

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

@@ -377,26 +377,27 @@ public void setShowIngestSuccess(boolean showIngestSuccess) {
     }
 
     public boolean isDatasetFieldEnabled(Long datasetFieldTypeId){
-
-        if(datasetFieldTypeId != null) {
-            Dataverse dv = dataset.getOwner();
-            DatasetFieldType datasetFieldType = fieldService.find(datasetFieldTypeId);
-
-            // Keyword External Vocabulary Support is enabled only under inrae collections
-            if(dv != null && "keyword".equals(datasetFieldType.getName())) {
-                if("inrae".equals(dv.getAlias())) {
+        // Always available except keyword field
+        if (datasetFieldTypeId == null) {
+            return true;
+        }
+        DatasetFieldType dft = fieldService.find(datasetFieldTypeId);
+        if(dft == null || !"keyword".equals(dft.getName())) {
+            return true;
+        }
+        // Keyword field is available only under inrae collections
+        Dataverse dv = dataset.getOwner();
+        if (dv != null) {
+            if ("inrae".equals(dv.getAlias())) {
+                return true;
+            }
+            for (Dataverse owner : dv.getOwners()) {
+                if ("inrae".equals(owner.getAlias())) {
                     return true;
                 }
-                for (Dataverse owner : dv.getOwners()) {
-                    if("inrae".equals(owner.getAlias())) {
-                        return true;
-                    }
-                }
-                return false;
             }
         }
-        // Otherwise, enable by default
-        return true;
+        return false;
     }
 
     // TODO: Consider renaming "configureTools" to "fileConfigureTools".

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

@@ -38,6 +38,9 @@ public class TemplatePage implements java.io.Serializable {
 
     @EJB
     EjbDataverseEngine commandEngine;
+
+    @EJB
+    DatasetFieldServiceBean fieldService;
 
     @EJB
     DataverseFieldTypeInputLevelServiceBean dataverseFieldTypeInputLevelService; 
@@ -259,4 +262,27 @@ public String getInstructionsLabelFor(String fieldType) {
         return (fieldInstructions!=null && !fieldInstructions.isBlank()) ? fieldInstructions : BundleUtil.getStringFromBundle("template.instructions.empty.label");
     }
 
+    public boolean isDatasetFieldEnabled(Long datasetFieldTypeId) {
+        // Always available except keyword field
+        if (datasetFieldTypeId == null) {
+            return true;
+        }
+        DatasetFieldType dft = fieldService.find(datasetFieldTypeId);
+        if(dft == null || !"keyword".equals(dft.getName())) {
+            return true;
+        }
+        // Keyword field is available only under inrae collections
+        Dataverse dv = dataverseService.find(ownerId);
+        if (dv != null) {
+            if ("inrae".equals(dv.getAlias())) {
+                return true;
+            }
+            for (Dataverse owner : dv.getOwners()) {
+                if ("inrae".equals(owner.getAlias())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }

src/main/webapp/metadataFragment.xhtml

@@ -73,7 +73,7 @@
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                         </th>
-                                        <c:set var="cvocOnDsf" value="#{DatasetPage.isDatasetFieldEnabled(dsf.datasetFieldType.id) and cvocConf.containsKey(dsf.datasetFieldType.id)}"/>
+                                        <c:set var="cvocOnDsf" value="#{cvocConf.containsKey(dsf.datasetFieldType.id) and ((datasetPage and DatasetPage.isDatasetFieldEnabled(dsf.datasetFieldType.id)) or (templatePage and TemplatePage.isDatasetFieldEnabled(dsf.datasetFieldType.id)))}"/>
                                         <td jsf:rendered="#{!anonymized or !settingsWrapper.shouldBeAnonymized(dsf)}">
                                             <!-- Primitive datasetFields -->
                                             <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
@@ -277,7 +277,7 @@
                                                             <ui:include src="datasetFieldForEditFragment.xhtml">
                                                                 <ui:param name="dsfv" value="#{dsfv}"/>
                                                                 <ui:param name="dsfvIndex" value="#{valCount.index}"/>
-                                                                <ui:param name="cvoc" value="#{cvocConf.containsKey(dsf.datasetFieldType.id) and DatasetPage.isDatasetFieldEnabled(dsf.datasetFieldType.id) ? cvocConf.get(dsf.datasetFieldType.id): null}"/>
+                                                                <ui:param name="cvoc" value="#{cvocConf.containsKey(dsf.datasetFieldType.id) and ((datasetPage and DatasetPage.isDatasetFieldEnabled(dsf.datasetFieldType.id)) or (templatePage and TemplatePage.isDatasetFieldEnabled(dsf.datasetFieldType.id))) ? cvocConf.get(dsf.datasetFieldType.id): null}"/>
                                                             </ui:include>
                                                         </div>
                                                         <!-- Add / Remove buttons -->
@@ -377,7 +377,7 @@
                                                                 <ui:include src="datasetFieldForEditFragment.xhtml">
                                                                     <ui:param name="dsfv" value="#{subdsf.singleValue}"/>
                                                                     <ui:param name="dsfvIndex" value="0"/>
-                                                                    <ui:param name="cvoc" value="#{cvocConf.containsKey(dsf.datasetFieldType.id) and DatasetPage.isDatasetFieldEnabled(dsf.datasetFieldType.id) ? cvocConf.get(dsf.datasetFieldType.id): cvocConf.containsKey(dsfv.datasetField.datasetFieldType.id) and DatasetPage.isDatasetFieldEnabled(sfv.datasetField.datasetFieldType.id) ? cvocConf.get(dsfv.datasetField.datasetFieldType.id): null}"/>
+                                                                    <ui:param name="cvoc" value="#{cvocConf.containsKey(dsf.datasetFieldType.id) and ((datasetPage and DatasetPage.isDatasetFieldEnabled(dsf.datasetFieldType.id)) or (templatePage and TemplatePage.isDatasetFieldEnabled(dsf.datasetFieldType.id))) ? cvocConf.get(dsf.datasetFieldType.id): cvocConf.containsKey(dsfv.datasetField.datasetFieldType.id) and ((datasetPage and DatasetPage.isDatasetFieldEnabled(dsfv.datasetField.datasetFieldType.id)) or (templatePage and TemplatePage.isDatasetFieldEnabled(dsfv.datasetField.datasetFieldType.id))) ? cvocConf.get(dsfv.datasetField.datasetFieldType.id): null}"/>
                                                                 </ui:include>
                                                             </ui:fragment>
                                                             <!-- MOVED SELECT ONE TO dataFieldForEdit -->