From 83157c24f9943e5628688ac326652b86b6d1474a Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 8 Nov 2019 16:00:58 -0500
Subject: [PATCH 01/11] #6339 change div to scrollPanel

---
 src/main/webapp/metadataFragment.xhtml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 3193a7f1c36..08448381bf4 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -156,13 +156,15 @@
                                                                 <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                 <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                             </p:selectOneMenu>
-                                                            <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                            <p:scrollPanel mode="native" styleClass="ui-inputfield form-control select-scroll-block"  rendered="#{dsf.datasetFieldType.allowMultiples}" >
+                                                                <h:panelGrid bodyrows="5">                                                            
                                                                 <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
                                                                                       layout="pageDirection">
                                                                     <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                                </p:selectManyCheckbox>
-                                                            </div>
+                                                                </p:selectManyCheckbox>                                                          
+                                                             </h:panelGrid>
+                                                            </p:scrollPanel>
                                                             <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
                                                                 <strong>#{dsf.validationMessage}</strong>
                                                             </div>

From 1adbeab908ddcfc9e638cf4628b95206e08529b7 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 15 Nov 2019 10:40:26 -0500
Subject: [PATCH 02/11] #6339 fix merge conflict

---
 src/main/webapp/metadataFragment.xhtml | 88 ++++++++++----------------
 1 file changed, 33 insertions(+), 55 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index d64c9490a72..f72b8f5284d 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -115,61 +115,39 @@
                                             <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{dsf.required or dsf.datasetFieldType.hasRequiredChildren}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
-                                        </label>
-                                        <!-- Primitive fields -->
-                                        <p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
-                                            <p:autoUpdate/>
-                                            <div class="form-group">
-                                                <ui:remove><!-- There is an issue with the dynamic +/- and the primefaces autoupdate where they are not working
-                                                    well together for the primitive fields, but are for the compound fields. So as a workaround for the primitive,
-                                                    we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used--></ui:remove>
-                                                <ui:repeat value="#{Collections:singletonList('')}" var="dummyVar">
-                                                    <div class="form-col-container col-sm-12">
-                                                        <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount">
-                                                            <div class="form-group dataset-field-values">
-                                                                <div class="form-col-container col-sm-9 edit-field">
-                                                                    <ui:include src="datasetFieldForEditFragment.xhtml">
-                                                                        <ui:param name="dsfv" value="#{dsfv}"/>
-                                                                        <ui:param name="dsfvIndex" value="#{valCount.index}"/>
-                                                                    </ui:include>
-                                                                </div>
-                                                                <!-- Add / Remove buttons -->
-                                                                <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                                    <p:commandLink title="#{bundle.add}"
-                                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                                   actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
-                                                                                   update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                                   oncomplete="javascript:bind_bsui_components();">
-                                                                        <span class="glyphicon glyphicon-plus no-text"/>
-                                                                    </p:commandLink>
-                                                                    <p:commandLink title="#{bundle.delete}"
-                                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                                   rendered="#{dsf.datasetFieldValues.size() > 1}"
-                                                                                   actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
-                                                                                   update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                                   oncomplete="javascript:bind_bsui_components();">
-                                                                        <span class="glyphicon glyphicon-minus no-text"/>
-                                                                    </p:commandLink>
-                                                                </div>
+                                        </h:outputLabel>
+                                        <div class="form-group">
+                                            <ui:remove><!-- There is an issue with the dynamic +/- and the primefaces autoupdate where they are not working
+                                                well together for the primitive fields, but are for the compound fields. So as a workaround for the primitive,
+                                                we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used--></ui:remove>
+                                            <ui:repeat value="#{Collections:singletonList('')}" var="dummyVar">
+                                                <div class="form-col-container col-sm-12">
+                                                    <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount">
+                                                        <div class="form-group dataset-field-values">
+                                                            <div class="form-col-container col-sm-9 edit-field">
+                                                                <ui:include src="datasetFieldForEditFragment.xhtml">
+                                                                    <ui:param name="dsfv" value="#{dsfv}"/>
+                                                                    <ui:param name="dsfvIndex" value="#{valCount.index}"/>
+                                                                    <ui:param name="required" value="#{dsf.required}"/>
+                                                                </ui:include>
                                                             </div>
-                                                        </ui:repeat>
-                                                        <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
-                                                            <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                             rendered="#{!dsf.datasetFieldType.allowMultiples}">
-                                                                <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                            </p:selectOneMenu>
-                                                            <p:scrollPanel mode="native" styleClass="ui-inputfield form-control select-scroll-block"  rendered="#{dsf.datasetFieldType.allowMultiples}" >
-                                                                <h:panelGrid bodyrows="5">                                                            
-                                                                <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                      layout="pageDirection">
-                                                                    <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
-                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                                </p:selectManyCheckbox>                                                          
-                                                             </h:panelGrid>
-                                                            </p:scrollPanel>
-                                                            <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
-                                                                <strong>#{dsf.validationMessage}</strong>
+                                                            <!-- Add / Remove buttons -->
+                                                            <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
+                                                                <p:commandLink title="#{bundle.add}"
+                                                                               styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                               actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
+                                                                               update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
+                                                                               oncomplete="javascript:bind_bsui_components();">
+                                                                    <span class="glyphicon glyphicon-plus no-text"/>
+                                                                </p:commandLink>
+                                                                <p:commandLink title="#{bundle.delete}"
+                                                                               styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                               rendered="#{dsf.datasetFieldValues.size() > 1}"
+                                                                               actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
+                                                                               update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
+                                                                               oncomplete="javascript:bind_bsui_components();">
+                                                                    <span class="glyphicon glyphicon-minus no-text"/>
+                                                                </p:commandLink>
                                                             </div>
                                                         </div>
                                                     </ui:repeat>
@@ -278,4 +256,4 @@
         </div>
         </p:fragment>
     </ui:fragment>
-</ui:composition>
+</ui:composition>
\ No newline at end of file

From 7d8ad279002fb62f91e6771c2aff57c36f234f43 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 18 Nov 2019 09:47:51 -0500
Subject: [PATCH 03/11] #6339 change to select many menu

---
 src/main/webapp/metadataFragment.xhtml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index f72b8f5284d..7bf80ae98f4 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -157,13 +157,13 @@
                                                             <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                             <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                         </p:selectOneMenu>
-                                                        <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                            <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" layout="pageDirection"
-                                                                                  id="unique2" required="#{dsf.required}">
-                                                                <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
-                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                            </p:selectManyCheckbox>
-                                                        </div>
+
+                                                        <p:selectManyMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" 
+                                                                          id="unique2" required="#{dsf.required}" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                            <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
+                                                            <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
+                                                        </p:selectManyMenu>
+
                                                         <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
                                                             <strong>#{dsf.validationMessage}</strong>
                                                         </div>

From 6a4a0aacfed29d00c9739b10259913666b13ab1f Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 20 Nov 2019 10:25:46 -0500
Subject: [PATCH 04/11] #6339 change to select checkbox menu control

---
 src/main/webapp/metadataFragment.xhtml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 7bf80ae98f4..2e7c87394d8 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -158,12 +158,13 @@
                                                             <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                         </p:selectOneMenu>
 
-                                                        <p:selectManyMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" 
-                                                                          id="unique2" required="#{dsf.required}" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                        
+                                                        <p:selectCheckboxMenu id="multiple" value="#{dsf.controlledVocabularyValues}"  multiple="true" converter="controlledVocabularyValueConverter"
+                                                                              filter="true" filterMatchMode="startsWith" panelStyle="width:250px">
                                                             <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
                                                             <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                        </p:selectManyMenu>
-
+                                                        </p:selectCheckboxMenu>
+                                                        
                                                         <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
                                                             <strong>#{dsf.validationMessage}</strong>
                                                         </div>

From 9c2c08aceb83345782e2d09f15d4dd8bc9054133 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 20 Nov 2019 14:22:18 -0500
Subject: [PATCH 05/11] Cleaned up styling of new selectCheckboxMenu component
 in metadataFragment [ref #6339]

---
 src/main/webapp/metadataFragment.xhtml | 31 +++++++++++++-------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 2e7c87394d8..78813d82fb9 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -152,21 +152,22 @@
                                                         </div>
                                                     </ui:repeat>
                                                     <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
-                                                        <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                         id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
-                                                            <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                            <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                        </p:selectOneMenu>
-
-                                                        
-                                                        <p:selectCheckboxMenu id="multiple" value="#{dsf.controlledVocabularyValues}"  multiple="true" converter="controlledVocabularyValueConverter"
-                                                                              filter="true" filterMatchMode="startsWith" panelStyle="width:250px">
-                                                            <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
-                                                            <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                        </p:selectCheckboxMenu>
-                                                        
-                                                        <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
-                                                            <strong>#{dsf.validationMessage}</strong>
+                                                        <div class="form-group dataset-field-values">
+                                                            <div class="form-col-container col-sm-9 edit-field">
+                                                                <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
+                                                                                 id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
+                                                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
+                                                                </p:selectOneMenu>
+                                                                <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" multiple="true" converter="controlledVocabularyValueConverter" styleClass="form-control"
+                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}"
+                                                                                      id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
+                                                                </p:selectCheckboxMenu>
+                                                                <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
+                                                                    <strong>#{dsf.validationMessage}</strong>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                     </ui:fragment>
                                                 </div>

From c7c2375497e372143a148ead1caa4730c2e2fc1c Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 21 Nov 2019 11:35:01 -0500
Subject: [PATCH 06/11] #6339 add conditional to "multiple"

---
 src/main/webapp/metadataFragment.xhtml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 86a481d5379..e9680878a22 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -150,21 +150,21 @@
                                                             </div>
                                                         </div>
                                                     </ui:repeat>
-                                                    <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
+                                                    <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">                                                    
                                                         <div class="form-group dataset-field-values">
                                                             <div class="form-col-container col-sm-9 edit-field">
                                                                 <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                                 id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples}">
+                                                                                 id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectOneMenu>
-                                                                <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" multiple="true" converter="controlledVocabularyValueConverter" styleClass="form-control"
-                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}"
+                                                                <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}"  converter="controlledVocabularyValueConverter" styleClass="form-control"
+                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}" multiple="#{!empty dsf.controlledVocabularyValues}"
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectCheckboxMenu>
-                                                                <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
-                                                                    <span class="ui-message-error-detail">#{dsf.validationMessage}</span>
+                                                                <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
+                                                                    <strong>#{dsf.validationMessage}</strong>
                                                                 </div>
                                                             </div>
                                                         </div>

From d1c062864fda6204be6c00a87ca5b3a10e2b6b8e Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 21 Nov 2019 14:10:14 -0500
Subject: [PATCH 07/11] Styled validation msg block for control vocab dropdown
 menus on metadataFragment [ref #6339]

---
 src/main/webapp/metadataFragment.xhtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index e9680878a22..b952a653c7b 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -158,13 +158,13 @@
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectOneMenu>
-                                                                <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}"  converter="controlledVocabularyValueConverter" styleClass="form-control"
+                                                                <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
                                                                                       filter="true" filterMatchMode="startsWith" label="#{bundle.select}" multiple="#{!empty dsf.controlledVocabularyValues}"
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectCheckboxMenu>
-                                                                <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
-                                                                    <strong>#{dsf.validationMessage}</strong>
+                                                                <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
+                                                                    <span class="ui-message-error-detail">#{dsf.validationMessage}</span>
                                                                 </div>
                                                             </div>
                                                         </div>

From c4c47f89dffc1a84583eaddde9ecc126235c984e Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 21 Nov 2019 16:30:41 -0500
Subject: [PATCH 08/11] #6339 Add Ajax updates to selections from select menu
 check box

---
 .../edu/harvard/iq/dataverse/DatasetPage.java |  7 +++--
 src/main/webapp/metadataFragment.xhtml        | 28 +++++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 22b38878b4a..a7566fe45f6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -4285,9 +4285,12 @@ public void handleSelection(final AjaxBehaviorEvent event) {
             selectedTags = selectedTags.clone();
         }
     }
-        
-
     
+    public void handleCVVSelection(final AjaxBehaviorEvent event) {
+        //Dummy method for AJAX update of items selected
+    }
+        
+   
     private void refreshTabFileTagsByName(){
         
         tabFileTagsByName= new ArrayList<>();
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index b952a653c7b..bdba432b185 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -158,9 +158,17 @@
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectOneMenu>
+                                                                <p:outputPanel id="selectedValsList" style="padding-top:.5em;">
+                                                                    <ui:repeat value="#{dsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty dsf.controlledVocabularyValues}">
+                                                                        <h:outputText value="#{cvv.localeStrValue}"  style="margin-right:.5em;display:inline-block;"/>
+                                                                    </ui:repeat>
+                                                                </p:outputPanel>
+                                       
                                                                 <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
-                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}" multiple="#{!empty dsf.controlledVocabularyValues}"
+                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}" 
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                                    <p:ajax event="toggleSelect" listener="#{DatasetPage.handleSelection}" update="selectedValsList" />
+                                                                    <p:ajax event="change" listener="#{DatasetPage.handleSelection}" update="selectedValsList" />
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectCheckboxMenu>
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
@@ -214,12 +222,20 @@
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
                                                                 </p:selectOneMenu>
-                                                                <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{subdsf.datasetFieldType.allowMultiples}">
-                                                                    <p:selectManyCheckbox value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                          layout="pageDirection">
+                                                                
+                                                                <p:outputPanel id="selectedValsListCompound" style="padding-top:.5em;">
+                                                                    <ui:repeat value="#{subdsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty subdsf.controlledVocabularyValues}">
+                                                                        <h:outputText value="#{cvv.localeStrValue}"  style="margin-right:.5em;display:inline-block;"/>
+                                                                    </ui:repeat>
+                                                                </p:outputPanel>
+
+                                                                    <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}"  >
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
-                                                                    </p:selectManyCheckbox>
-                                                                </div>
+                                                                        <p:ajax event="toggleSelect" listener="#{DatasetPage.handleCVVSelection}" update="selectedValsListCompound" />
+                                                                        <p:ajax event="change" listener="#{DatasetPage.handleCVVSelection}" update="selectedValsListCompound" />
+                                                                    </p:selectCheckboxMenu>
+
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">
                                                                     <span class="ui-message-error-detail">#{subdsf.validationMessage}</span>
                                                                 </div>

From 45b1716b340a5630d38be8ccd78dee3c0dc4991b Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 22 Nov 2019 10:29:44 -0500
Subject: [PATCH 09/11] #6339 remove selected vals list

---
 src/main/webapp/metadataFragment.xhtml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index bdba432b185..7ffe23fef4e 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -158,17 +158,18 @@
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectOneMenu>
+                                                                <!--
                                                                 <p:outputPanel id="selectedValsList" style="padding-top:.5em;">
                                                                     <ui:repeat value="#{dsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty dsf.controlledVocabularyValues}">
                                                                         <h:outputText value="#{cvv.localeStrValue}"  style="margin-right:.5em;display:inline-block;"/>
                                                                     </ui:repeat>
                                                                 </p:outputPanel>
-                                       
+                                                                -->
                                                                 <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
-                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}" 
+                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}"  multiple="#{!empty dsf.controlledVocabularyValues}"
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                    <p:ajax event="toggleSelect" listener="#{DatasetPage.handleSelection}" update="selectedValsList" />
-                                                                    <p:ajax event="change" listener="#{DatasetPage.handleSelection}" update="selectedValsList" />
+                                                                    <p:ajax event="toggleSelect" listener="#{DatasetPage.handleSelection}" update="@this" />
+                                                                    <p:ajax event="change" listener="#{DatasetPage.handleSelection}" update="@this" />
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectCheckboxMenu>
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
@@ -222,18 +223,18 @@
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
                                                                 </p:selectOneMenu>
-                                                                
+                                                                <!--
                                                                 <p:outputPanel id="selectedValsListCompound" style="padding-top:.5em;">
                                                                     <ui:repeat value="#{subdsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty subdsf.controlledVocabularyValues}">
                                                                         <h:outputText value="#{cvv.localeStrValue}"  style="margin-right:.5em;display:inline-block;"/>
                                                                     </ui:repeat>
                                                                 </p:outputPanel>
-
+-->
                                                                     <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}"  >
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="#{!empty subdsf.controlledVocabularyValues }"  >
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
-                                                                        <p:ajax event="toggleSelect" listener="#{DatasetPage.handleCVVSelection}" update="selectedValsListCompound" />
-                                                                        <p:ajax event="change" listener="#{DatasetPage.handleCVVSelection}" update="selectedValsListCompound" />
+                                                                        <p:ajax event="toggleSelect" listener="#{DatasetPage.handleCVVSelection}" update="@this" />
+                                                                        <p:ajax event="change" listener="#{DatasetPage.handleCVVSelection}" update="@this" />
                                                                     </p:selectCheckboxMenu>
 
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">

From 3844e7e09d188ef09497d59449f0aa0816158f3b Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 26 Nov 2019 16:52:03 -0500
Subject: [PATCH 10/11] #6399 remove AJAX event from selectcheckboxmenu

---
 src/main/webapp/metadataFragment.xhtml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 7ffe23fef4e..d8a1bb566ce 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -168,8 +168,6 @@
                                                                 <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
                                                                                       filter="true" filterMatchMode="startsWith" label="#{bundle.select}"  multiple="#{!empty dsf.controlledVocabularyValues}"
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                    <p:ajax event="toggleSelect" listener="#{DatasetPage.handleSelection}" update="@this" />
-                                                                    <p:ajax event="change" listener="#{DatasetPage.handleSelection}" update="@this" />
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectCheckboxMenu>
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
@@ -233,8 +231,6 @@
                                                                     <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
                                                                                           rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="#{!empty subdsf.controlledVocabularyValues }"  >
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
-                                                                        <p:ajax event="toggleSelect" listener="#{DatasetPage.handleCVVSelection}" update="@this" />
-                                                                        <p:ajax event="change" listener="#{DatasetPage.handleCVVSelection}" update="@this" />
                                                                     </p:selectCheckboxMenu>
 
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">

From 8897a238954e0a5b582e852350242f63bd3d6ffa Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 2 Dec 2019 14:21:13 -0500
Subject: [PATCH 11/11] #6339 show selected items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(forgoing “Select…” when empty.)
---
 src/main/webapp/metadataFragment.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index d8a1bb566ce..b59fc4512df 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -166,7 +166,7 @@
                                                                 </p:outputPanel>
                                                                 -->
                                                                 <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
-                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}"  multiple="#{!empty dsf.controlledVocabularyValues}"
+                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}"  multiple="true"
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectCheckboxMenu>
@@ -229,7 +229,7 @@
                                                                 </p:outputPanel>
 -->
                                                                     <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="#{!empty subdsf.controlledVocabularyValues }"  >
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="true"  >
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
                                                                     </p:selectCheckboxMenu>