From c5208e51ae1739f11fa6210ed91d1f629063c63b Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 15 Apr 2022 14:39:02 -0400
Subject: [PATCH 1/7] #7565 cleanup additional pages

---
 src/main/webapp/dataset-license-terms.xhtml |  8 ++--
 src/main/webapp/dataverse.xhtml             | 18 +++------
 src/main/webapp/dataverseuser.xhtml         |  9 ++---
 src/main/webapp/editFilesFragment.xhtml     | 41 ++++++++++-----------
 4 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 0874f6939d9..7430efff63c 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -11,7 +11,7 @@
         jsf:rendered="#{dataverseSession.user.authenticated and empty editMode and !widgetWrapper.widgetView
                         and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)}">
        <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}" 
-                      update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" disabled="#{DatasetPage.lockedFromEdits}">
+                      update="@form,:messagePanel" disabled="#{DatasetPage.lockedFromEdits}">
            <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
            <span class="glyphicon glyphicon-briefcase"/> #{bundle['file.dataFilesTab.terms.editTermsBtn']}
        </p:commandLink>
@@ -50,7 +50,7 @@
                                        <c:if test="#{settingsWrapper.customLicenseAllowed}">
                                            <f:selectItem itemLabel="#{bundle['license.custom']}" itemValue="#{null}"/>
                                        </c:if>
-                                       <p:ajax update="touFragment" oncomplete="javascript:bind_bsui_components();" />
+                                       <p:ajax update="touFragment" />
                                    </p:selectOneMenu>
                                </ui:fragment>
                                <ui:fragment rendered="#{!empty termsOfUseAndAccess.license}">
@@ -491,7 +491,7 @@
                                            <p:commandButton styleClass="btn btn-default pull-right"
                                                           value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
                                                           action="#{DatasetPage.viewSelectedGuestbook(DatasetPage.dataset.guestbook)}"
-                                                          update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
+                                                          update=":datasetForm" oncomplete="PF('viewGuestbook').show();"/>
                                        </div>
                                    </div>
                                </ui:fragment>
@@ -530,7 +530,7 @@
                                            <p:commandButton styleClass="btn btn-default pull-right"
                                                           value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
                                                           action="#{DatasetPage.viewSelectedGuestbook(guestbook)}"
-                                                          update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
+                                                          update=":datasetForm" oncomplete="PF('viewGuestbook').show();"/>
                                        </p:column>
                                    </p:dataTable>
                                </ui:fragment>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index e7bfb49cd96..572bcf40300 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -97,8 +97,7 @@
                                                      style="display:none"
                                                      process="@this :dataverseForm:selectHostDataverse"
                                                      update=":dataverseForm,:breadCrumbPanel"
-                                                     action="#{DataversePage.updateOwnerDataverse()}"
-                                                     oncomplete="bind_bsui_components();">
+                                                     action="#{DataversePage.updateOwnerDataverse()}">
                                     </p:commandButton>
                                 </div>
                             </div>
@@ -221,15 +220,13 @@
                                                         <!-- Add / Remove buttons -->
                                                         <div class="col-xs-3 form-col-container field-add-delete">
                                                             <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.add}"
-                                                                             actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}"
-                                                                             oncomplete="javascript:bind_bsui_components();">
+                                                                             actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}">
                                                                 <f:param name="SKIP_VALIDATION" value="true"/>
                                                                 <h:outputText styleClass="glyphicon glyphicon-plus no-text"/>
                                                             </p:commandLink>
                                                             <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.delete}"
                                                                              rendered="#{DataversePage.dataverse.dataverseContacts.size() > 1}"
-                                                                             actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}"
-                                                                             oncomplete="javascript:bind_bsui_components();">
+                                                                             actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}">
                                                                 <f:param name="SKIP_VALIDATION" value="true"/>
                                                                 <h:outputText styleClass="glyphicon glyphicon-minus no-text"/>
                                                             </p:commandLink>
@@ -323,16 +320,14 @@
                                                                    update="@widgetVar(optionBlock)"
                                                                    process="@this"
                                                                    rendered="#{!mdb.showDatasetFieldTypes and (mdb.selected or mdb.required) and !DataversePage.openMetadataBlock and !DataversePage.inheritMetadataBlockFromParent}"
-                                                                   actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}"
-                                                                   oncomplete="javascript:bind_bsui_components();">
+                                                                   actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}">
                                                          <h:outputText value="#{bundle['dataverse.field.set.tip']}" />
                                                      </p:commandLink>
                                                      <p:commandLink id="viewDSFT" style="margin-left:1em;"
                                                                     update="@widgetVar(optionBlock)"
                                                                     process="@this"
                                                                     rendered="#{!mdb.showDatasetFieldTypes and (!mdb.selected or DataversePage.inheritMetadataBlockFromParent)   and !DataversePage.openMetadataBlock}"
-                                                                    actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}"
-                                                                    oncomplete="javascript:bind_bsui_components();">
+                                                                    actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}">
                                                          <h:outputText value="#{bundle['dataverse.field.set.view']}" />
                                                      </p:commandLink>
                                                 </label>
@@ -374,7 +369,6 @@
                                                 <p:commandLink id="hideDSFT" styleClass="btn btn-default" 
                                                                process="@this @widgetVar(optionBlock)"
                                                                update="@widgetVar(optionBlock)" actionListener="#{DataversePage.hideDatasetFieldTypes(mdb.id)}" 
-                                                               oncomplete="javascript:bind_bsui_components();"
                                                                rendered="#{mdb.showDatasetFieldTypes}">
                                                     <h:outputText value="#{bundle.done}" />
                                                 </p:commandLink>
@@ -532,7 +526,7 @@
                                                     </li>
                                                     <li class="divider" role="presentation"></li>
                                                     <li>
-                                                        <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update=":dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
+                                                        <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update=":dataverseForm,:searchResults,:messagePanel">
                                                             <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
                                                         </p:commandLink>
                                                     </li>
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index cb922a0164d..f02acf6ce25 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -54,7 +54,7 @@
                     </p:panel>
 
                     <p:tabView id="dataRelatedToMeView" activeIndex="#{DataverseUserPage.activeIndex}" dynamic="true" rendered="#{empty DataverseUserPage.editMode}">
-                        <p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" oncomplete="javascript:bind_bsui_components();" />
+                        <p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all"  />
                         <p:tab id="myData" title="#{bundle['user.dataRelatedToMe']}">
                             <ui:include src="mydata_fragment.xhtml"></ui:include>
                         </p:tab>
@@ -369,8 +369,7 @@
                                         </div>
                                         <div class="notification-item-cell">
                                             <p:commandLink title="#{bundle.removeNotification}" styleClass="bootstrap-button-tooltip"
-                                                           action="#{DataverseUserPage.remove(item.id)}" update="@form"
-                                                           oncomplete="bind_bsui_components();">
+                                                           action="#{DataverseUserPage.remove(item.id)}" update="@form">
                                                 <span class="glyphicon glyphicon-remove"></span>
                                             </p:commandLink>
                                         </div>
@@ -394,13 +393,13 @@
                                         <ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
                                             <li>
                                                 <p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
-                                                               actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="javascript:bind_bsui_components();">
+                                                               actionListener="#{DataverseUserPage.edit}" update="@form">
                                                     <h:outputText value="#{bundle['account.info']}" />
                                                 </p:commandLink>
                                             </li>
                                             <li>
                                                 <p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}" 
-                                                               actionListener="#{DataverseUserPage.changePassword}" update="@form" oncomplete="javascript:bind_bsui_components();">
+                                                               actionListener="#{DataverseUserPage.changePassword}" update="@form">
                                                     <h:outputText value="#{bundle.passwd}" />
                                                 </p:commandLink>
                                             </li>
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 883949d0441..3d694e996ee 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -148,7 +148,7 @@
                                   process="filesTable" 
                                   update=":datasetForm:filesTable, @([id$=filesButtons])"
                                   label="#{bundle['file.selectToAddBtn']}"
-                                  oncomplete="javascript:bind_bsui_components();uploadFinished(PF('fileUploadWidget'));"
+                                  oncomplete="uploadFinished(PF('fileUploadWidget'));"
                                   onstart="javascript:uploadWidgetDropRemoveMsg();uploadStarted();"
                                   onerror="javascript:uploadFailure();"
                                   sizeLimit="#{EditDatafilesPage.getMaxFileUploadSizeInBytes()}"
@@ -298,9 +298,9 @@
                     
                     <p:commandButton id="updateEditDataFilesButtonsForUpload" action="#{EditDatafilesPage.uploadFinished()}" update="datasetForm:editDataFilesButtons" rendered="#{showFileButtonUpdate}" style="display:none"/>
                     <p:commandButton id="updateEditDataFilesButtonsForDelete" action="#{EditDatafilesPage.deleteFilesCompleted()}" update="datasetForm:editDataFilesButtons" rendered="#{showFileButtonUpdate}" style="display:none"/>
-                    <p:commandButton id="AllUploadsFinished" action="#{EditDatafilesPage.uploadFinished()}" update="@([id$=filesButtons]),datasetForm:contentOfHttpPanel,datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:bind_bsui_components();javascript:uploadWidgetDropMsg();" style="display:none"/> 
+                    <p:commandButton id="AllUploadsFinished" action="#{EditDatafilesPage.uploadFinished()}" update="@([id$=filesButtons]),datasetForm:contentOfHttpPanel,datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:uploadWidgetDropMsg();" style="display:none"/> 
                     <p:commandButton id="dropBoxUploadFinished" action="#{EditDatafilesPage.uploadFinished()}" update="@([id$=filesButtons]),datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:dropBoxUploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" style="display:none"/>
-                    <p:commandButton id="allDeletesFinished" action="#{EditDatafilesPage.deleteFilesCompleted()}" update="@([id$=filesButtons]),datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:bind_bsui_components();javascript:uploadWidgetDropMsg();" style="display:none"/> 
+                    <p:commandButton id="allDeletesFinished" action="#{EditDatafilesPage.deleteFilesCompleted()}" update="@([id$=filesButtons]),datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:uploadWidgetDropMsg();" style="display:none"/> 
                     <!-- ????? TODO: How scalable are all these hidden update buttons ????? -->
                     <!-- ????? 
                     datasetForm:fileUpload,
@@ -443,7 +443,7 @@
                                             <li>
                                                 <p:commandLink  onclick="if (!testFilesSelected2()) return false;"
                                                                 update="@([id$=editFileAccessPopup])" 
-                                                                oncomplete="PF('editFileAccessPopup').show();bind_bsui_components();">                                                               
+                                                                oncomplete="PF('editFileAccessPopup').show();">                                                               
                                                     <h:outputText value="#{bundle['file.restrict']}"/>
                                                     <f:setPropertyActionListener target="#{EditDatafilesPage.termsOfAccess}" value="#{version.termsOfUseAndAccess.termsOfAccess}" />
                                                     <f:setPropertyActionListener target="#{EditDatafilesPage.fileAccessRequest}" value="#{version.termsOfUseAndAccess.fileAccessRequest}" />                        
@@ -453,7 +453,7 @@
                                                 <p:commandLink  onclick="if (!testFilesSelected2()) return false;"
                                                                 actionListener="#{EditDatafilesPage.restrictFiles(false)}"
                                                                 update="filesTable,:messagePanel" 
-                                                                oncomplete="javascript:toggle_dropdown();javascript:bind_bsui_components();" >
+                                                                oncomplete="javascript:toggle_dropdown();" >
                                                     <h:outputText value="#{bundle['file.unrestrict']}"/>
                                                 </p:commandLink>
                                             </li>
@@ -461,7 +461,7 @@
                                                 <p:commandLink id="fileCategoriesButton2"
                                                                actionListener="#{EditDatafilesPage.refreshTagsPopUp(fileMetadata)}"
                                                                update=":datasetForm:editFileTagsPopup"
-                                                               oncomplete="PF('editFileTagsPopup').show();bind_bsui_components();">
+                                                               oncomplete="PF('editFileTagsPopup').show();">
                                                     #{bundle['file.tags']} 
                                                 </p:commandLink>    
                                             </li>     
@@ -488,7 +488,7 @@
                                             <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                                                 <p:commandLink id="fileProvenanceButton"
                                                                update=":datasetForm:editProvenancePopup"
-                                                               oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
+                                                               oncomplete="PF('editProvenancePopup').show();">
                                                     <f:actionListener binding="#{provPopupFragmentBean.updatePopupStateAndDataset(fileMetadata, EditDatafilesPage.dataset)}"/>
                                                     #{bundle['file.provenance']} 
                                                 </p:commandLink>    
@@ -512,7 +512,7 @@
                                             <p:commandLink id="fileCategoriesButton"
                                                            actionListener="#{EditDatafilesPage.refreshTagsPopUp(fileMetadata)}"
                                                            update=":datasetForm:editFileTagsPopup"
-                                                           oncomplete="PF('editFileTagsPopup').show();bind_bsui_components();">
+                                                           oncomplete="PF('editFileTagsPopup').show();">
                                                 #{bundle['file.tags']} 
                                             </p:commandLink>
                                         </li>        
@@ -563,7 +563,7 @@
     <!-- END: Static Tab Layout -->
     <p:remoteCommand  name="returnToDatasetPage" partialSubmit="true" async="true" update="" action="#{EditDatafilesPage.returnToDatasetOnly()}"  />
     <p:remoteCommand  name="requestDirectUploadUrls" partialSubmit="true" async="true" update="@none" action="#{EditDatafilesPage.requestDirectUploadUrls()}" onerror="javascript:uploadFailure();" />
-    <p:remoteCommand  name="handleExternalUpload" partialSubmit="true" async="true"  update="@none" action="#{EditDatafilesPage.handleExternalUpload()}" oncomplete="javascript:bind_bsui_components();directUploadFinished();" onerror="javascript:uploadFailure();" />
+    <p:remoteCommand  name="handleExternalUpload" partialSubmit="true" async="true"  update="@none" action="#{EditDatafilesPage.handleExternalUpload()}" oncomplete="directUploadFinished();" onerror="javascript:uploadFailure();" />
     <!-- TODO: a message panel informing the unauthorized, or unauthenticated user that they don't have permission - should it be here? L.A. 4.2 -->
 
     <!-- Popups -->
@@ -603,9 +603,9 @@
             <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
         </ui:fragment>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('editDeleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();bind_bsui_components();"
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('editDeleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();"
                              update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}"/>
-            <button class="btn btn-link" onclick="PF('editDeleteFileConfirmation').hide();bind_bsui_components();" type="button">                              
+            <button class="btn btn-link" onclick="PF('editDeleteFileConfirmation').hide();" type="button">                              
                 #{bundle.cancel}
             </button>
         </div>
@@ -643,8 +643,7 @@
             <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" 
                              onclick="PF('editFileAccessPopup').hide()" 
                              action="#{EditDatafilesPage.restrictFiles(true)}"
-                             update="filesTable,:messagePanel"
-                             oncomplete="javascript:bind_bsui_components();" />
+                             update="filesTable,:messagePanel"/>
             <button class="btn btn-link" onclick="PF('editFileAccessPopup').hide()" type="button">                              
                 #{bundle.cancel}
             </button>               
@@ -828,8 +827,8 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="fileAdvancedOptionsSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileAdvancedOptions').hide();javascript:bind_bsui_components();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAdvancedOptions()}"/>
-            <p:commandButton styleClass="btn btn-link" id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();" oncomplete="javascript:bind_bsui_components();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>
+            <p:commandButton styleClass="btn btn-default" id="fileAdvancedOptionsSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileAdvancedOptions').hide();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAdvancedOptions()}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();"  actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>
         </div>
     </p:dialog>
     <!-- end of "advanced options" dialogue -->
@@ -849,8 +848,8 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="fileSetThumbnailSaveBtn" value="#{bundle.saveChanges}" oncomplete="PF('fileSetThumbnail').hide();javascript:bind_bsui_components();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAsDesignatedThumbnail()}"/>
-            <p:commandButton styleClass="btn btn-link" id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();" oncomplete="javascript:bind_bsui_components();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
+            <p:commandButton styleClass="btn btn-default" id="fileSetThumbnailSaveBtn" value="#{bundle.saveChanges}" oncomplete="PF('fileSetThumbnail').hide();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAsDesignatedThumbnail()}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();"  actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
         </div>
     </p:dialog>
     <p:dialog id="fileThumbnailConfirm" styleClass="smallPopUp" header="#{bundle['file.setThumbnail.header']}" widgetVar="fileThumbnailConfirm" modal="true">
@@ -860,8 +859,8 @@
             </p>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="fileThumbnailConfirmCntBtn" value="#{bundle.continue}" oncomplete="PF('fileThumbnailConfirm').hide();javascript:bind_bsui_components();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead()}"/>
-            <button class="btn btn-link" onclick="PF('fileThumbnailConfirm').hide();PF('blockFileForm').hide();bind_bsui_components();" type="button">                              
+            <p:commandButton styleClass="btn btn-default" id="fileThumbnailConfirmCntBtn" value="#{bundle.continue}" oncomplete="PF('fileThumbnailConfirm').hide();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead()}"/>
+            <button class="btn btn-link" onclick="PF('fileThumbnailConfirm').hide();PF('blockFileForm').hide();" type="button">                              
                 #{bundle.cancel}
             </button>
         </div>
@@ -947,8 +946,8 @@
             </div> -->
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="editFileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('editFileTagsPopup').hide();javascript:bind_bsui_components();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.saveFileTagsAndCategories()}"/>
-            <p:commandButton styleClass="btn btn-link" id="editFileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('editFileTagsPopup').hide();PF('blockFileForm').hide();" oncomplete="javascript:bind_bsui_components();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForTagsPopup()}"/>
+            <p:commandButton styleClass="btn btn-default" id="editFileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('editFileTagsPopup').hide();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.saveFileTagsAndCategories()}"/>
+            <p:commandButton styleClass="btn btn-link" id="editFileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('editFileTagsPopup').hide();PF('blockFileForm').hide();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForTagsPopup()}"/>
         </div>
     </p:dialog>     
     <!-- Simple Popup For Select Files-->

From 9d06b451a5c325c8903010ff733393f3f9cd49c8 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 15 Apr 2022 15:29:29 -0400
Subject: [PATCH 2/7] #7565 more cleanup

---
 src/main/webapp/editdatafiles.xhtml             | 4 ++--
 src/main/webapp/file-edit-button-fragment.xhtml | 4 ++--
 src/main/webapp/file.xhtml                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index aa4eb5f228c..4be14f2c682 100644
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -75,9 +75,9 @@
                                     <p:commandButton id="savebutton" class="btn btn-default" value="#{bundle.saveChanges}"
                                                      update=":datasetForm,:messagePanel"
                                                      onclick="PF('blockFileForm').show();"
-                                                     oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
+                                                     oncomplete="$(document).scrollTop(0);"
                                                      action="#{EditDatafilesPage.save}"/>
-                                    <p:commandButton styleClass="btn btn-link" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="bind_bsui_components();"/>
+                                    <p:commandButton styleClass="btn btn-link" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form"/>
                                 </div>
                                 <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment())}">
                                     <button id="doneFilesButtonnop" class="btn btn-default" value="#{bundle.done}" onclick="cancelDatasetEdit();return false;">#{bundle.done}</button>
diff --git a/src/main/webapp/file-edit-button-fragment.xhtml b/src/main/webapp/file-edit-button-fragment.xhtml
index fd7d116e63d..4975bc22636 100644
--- a/src/main/webapp/file-edit-button-fragment.xhtml
+++ b/src/main/webapp/file-edit-button-fragment.xhtml
@@ -49,7 +49,7 @@
                 <p:commandLink  onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
                                             return false;" 
                                 update="@([id$=accessPopup])"            
-                                oncomplete="PF('accessPopup').show();bind_bsui_components();">
+                                oncomplete="PF('accessPopup').show();">
                     <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
                     <f:setPropertyActionListener target="#{bean.termsOfAccess}" value="#{datasetVersion.termsOfUseAndAccess.termsOfAccess}" />
                     <f:setPropertyActionListener target="#{bean.fileAccessRequest}" value="#{datasetVersion.termsOfUseAndAccess.fileAccessRequest}" />                     
@@ -110,7 +110,7 @@
         <li>
             <p:commandLink
                 update="@([id$=editProvenancePopup])"
-                oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
+                oncomplete="PF('editProvenancePopup').show();">
                 <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
                 #{bundle['file.provenance']} 
             </p:commandLink>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index f5232623822..106e6b2387c 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -327,7 +327,7 @@
                     <!-- END Top Button/Citation Blocks -->
                     <div id="contentTabs">
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{FilePage.selectedTabIndex}">
-                            <p:ajax event="tabChange" listener="#{FilePage.tabChanged}" oncomplete="bind_bsui_components();" update="@this" />
+                            <p:ajax event="tabChange" listener="#{FilePage.tabChanged}" update="@this" />
                             <p:tab id="accessTab" class="padding-none" title="#{bundle['file.dataFilesTab.dataAccess']}"
                                    rendered="#{settingsWrapper.rsyncDownload and FilePage.fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload
                                         and !FilePage.fileMetadata.getDataFile().getOwner().getStorageIdentifier().startsWith('s3://') }">

From 81e92b99b1e2a8f0c6644a698567cc1fbb8bdf78 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 20 Apr 2022 10:38:37 -0400
Subject: [PATCH 3/7] #7565 more pages

---
 src/main/webapp/filesFragment.xhtml  | 20 ++++++++++----------
 src/main/webapp/guestbook.xhtml      |  8 ++++----
 src/main/webapp/harvestclients.xhtml | 24 ++++++++++++------------
 src/main/webapp/harvestsets.xhtml    | 16 ++++++++--------
 src/main/webapp/manage-groups.xhtml  |  4 ++--
 5 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 9dcd1fa2064..deba02f4815 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -32,13 +32,13 @@
                     <f:selectItem itemLabel="#{bundle['file.display.tree']}" itemValue="Tree" />
 
                     <!-- AJAX UPDATES TO TOGGLE p:dataTable widgetVar="filesTable" AND p:tree widgetVar="filesTree" COMPONENTS BELOW -->
-                    <p:ajax update=":datasetForm" process="@this" oncomplete="bind_bsui_components();"/> 
+                    <p:ajax update=":datasetForm" process="@this"/> 
                 </p:selectOneButton>
             </div>
         </div>
     </div>
 
-    <p:remoteCommand name="rebindCommand" process="@this" update="filesTable" oncomplete="javascript:bind_bsui_components();"/>
+    <p:remoteCommand name="rebindCommand" process="@this" update="filesTable"/>
 
     <!-- Files Table -->
     <!-- TABLESTYLE + WIDTH:AUTO FIX COL WIDTH OVERFLOW HIDDEN, MIN-WIDTH 100% ADDED FOR TABLE CONTENT LESS THAN 100% https://stackoverflow.com/a/38582318 -->
@@ -105,10 +105,10 @@
                             <f:passThroughAttribute name="aria-labelledby" value="searchLabel"/>
                         </p:inputText>
                         <p:watermark for="searchFiles" value="#{bundle['file.search.placeholder']}"/>
-                        <p:remoteCommand name="submitsearch" action="#{DatasetPage.updateFileSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" oncomplete="bind_bsui_components();" partialSubmit="true"/>
+                        <p:remoteCommand name="submitsearch" action="#{DatasetPage.updateFileSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true"/>
 
                         <span class="input-group-btn">
-                            <p:commandLink title="#{bundle['dataverse.search.btn.find']}" styleClass="btn btn-default bootstrap-button-tooltip" action="#{DatasetPage.updateFileSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" oncomplete="bind_bsui_components();" partialSubmit="true">
+                            <p:commandLink title="#{bundle['dataverse.search.btn.find']}" styleClass="btn btn-default bootstrap-button-tooltip" action="#{DatasetPage.updateFileSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true">
                                 <span class="glyphicon glyphicon-search no-text"/>
                             </p:commandLink>
                         </span>
@@ -324,14 +324,14 @@
                         </h:outputFormat>
                         <ui:fragment rendered="#{DatasetPage.selectedFiles.size() lt DatasetPage.workingVersion.fileMetadatas.size()}">
                             &#160;
-                            <p:commandLink action="#{DatasetPage.selectAllFiles}" update="@form" oncomplete="bind_bsui_components();">
+                            <p:commandLink action="#{DatasetPage.selectAllFiles}" update="@form">
                                 <h:outputFormat value="#{bundle['file.selectAllFiles']}">
                                     <f:param value="#{DatasetPage.fileMetadatasSearch.size()}"/>
                                 </h:outputFormat>
                             </p:commandLink>
                         </ui:fragment>
                         &#160;
-                        <p:commandLink value="#{bundle['file.clearSelection']}" action="#{DatasetPage.clearSelection}" update="@form" oncomplete="bind_bsui_components();"/>
+                        <p:commandLink value="#{bundle['file.clearSelection']}" action="#{DatasetPage.clearSelection}" update="@form"/>
                     </p>
                 </div>
             </div>
@@ -412,7 +412,7 @@
                                    disabled="#{false and DatasetPage.lockedFromDownload}"
                                    onclick="if (!testFilesSelected()) return false;" 
                                    action="#{DatasetPage.startDownloadSelectedOriginal()}"
-                                   update="@form" oncomplete="bind_bsui_components();showPopup();">
+                                   update="@form" oncomplete="showPopup();">
                         <f:setPropertyActionListener target="#{DatasetPage.fileMetadataForAction}" value="#{null}"/>
                         <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
                     </p:commandLink>
@@ -428,7 +428,7 @@
                         <li >
                             <p:commandLink
                                            disabled="#{false and DatasetPage.lockedFromDownload}"
-                                           update="@form" oncomplete="bind_bsui_components();showPopup();"
+                                           update="@form" oncomplete="showPopup();"
                                            onclick="if (!testFilesSelected()) return false;" 
                                            actionListener="#{DatasetPage.startDownloadSelectedOriginal()}">
                                 <f:setPropertyActionListener target="#{DatasetPage.fileMetadataForAction}" value="#{null}"/>
@@ -438,7 +438,7 @@
                         <li> 
                             <p:commandLink
                                            disabled="#{false and DatasetPage.lockedFromDownload}"
-                                           update="@form" oncomplete="bind_bsui_components();showPopup();"
+                                           update="@form" oncomplete="showPopup();"
                                            onclick="if (!testFilesSelected()) return false;" 
                                            actionListener="#{DatasetPage.startDownloadSelectedArchival()}">
                             <f:setPropertyActionListener target="#{DatasetPage.fileMetadataForAction}" value="#{null}"/>
@@ -451,7 +451,7 @@
                 <p:commandLink rendered="#{DatasetPage.fileAccessRequestMultiButtonRequired}"
                                styleClass="btn btn-default btn-request"                                   
                                action="#{DatasetPage.requestAccessMultipleFiles()}"
-                               update="@form, @([id$=messagePanel])" oncomplete="bind_bsui_components();"
+                               update="@form, @([id$=messagePanel])"
                                disabled="#{DatasetPage.locked}">
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
                 </p:commandLink>
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 76af9e02ab4..3528ff5f032 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -153,13 +153,13 @@
                                                             <div class="col-sm-4 field-add-delete">
                                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip nolabel-field-btn" 
                                                                                title="#{bundle.add}">
-                                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.addCustomQuestionValue(cq, resCount.index + 1)}" />
+                                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.addCustomQuestionValue(cq, resCount.index + 1)}" />
                                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                                     <span class="glyphicon glyphicon-plus no-text"/>
                                                                 </p:commandLink>
                                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip nolabel-field-btn" 
                                                                                title="#{bundle.delete}" rendered="#{cq.customQuestionValues.size() > 1}">
-                                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.removeCustomQuestionValue(cq, resCount.index)}" />
+                                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.removeCustomQuestionValue(cq, resCount.index)}" />
                                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                                     <span class="glyphicon glyphicon-minus no-text"/>
                                                                 </p:commandLink>
@@ -176,13 +176,13 @@
                                             <div class="col-sm-3 field-add-delete">
                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip compound-field-btn"
                                                                title="#{bundle.add}">
-                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.addCustomQuestion(valCount.index + 1 )}" />
+                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.addCustomQuestion(valCount.index + 1 )}" />
                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                     <span class="glyphicon glyphicon-plus no-text"/>
                                                 </p:commandLink>
                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip compound-field-btn" rendered="#{GuestbookPage.guestbook.customQuestions.size() > 1}"
                                                                title="#{bundle.delete}">
-                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.removeCustomQuestion(valCount.index)}" />
+                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.removeCustomQuestion(valCount.index)}" />
                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                     <span class="glyphicon glyphicon-minus no-text"/>
                                                 </p:commandLink>
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 4ff5dbbdbf1..5c7b3482ed3 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -31,7 +31,7 @@
                                 <p:commandLink type="button" id="addClientEmpty" styleClass="btn btn-default margin-bottom"
                                                actionListener="#{harvestingClientsPage.initNewClient}"
                                                update=":harvestingClientsForm:newHarvestingClientDialog"
-                                               oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();">
+                                               oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');">
                                     <span class="glyphicon glyphicon-plus"/> #{bundle['harvestclients.btn.add']}
                                 </p:commandLink>
                             </div>
@@ -88,7 +88,7 @@
                                         <p:commandLink style="margin-left:1em;" id="addClient" styleClass="btn btn-default"
                                                         actionListener="#{harvestingClientsPage.initNewClient}"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();">
+                                                        oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');">
                                              <span class="glyphicon glyphicon-plus"/> #{bundle['harvestclients.btn.add']}
                                          </p:commandLink>
                                     </div>
@@ -125,7 +125,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{harvestClient.harvestingNow or harvestClient.deleteInProgress}"
                                                    action="#{harvestingClientsPage.editClient(harvestClient)}"
-                                                   oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();"
+                                                   oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');"
                                                    update=":harvestingClientsForm,:harvestingClientsForm:newHarvestingClientDialog"
                                                    title="#{bundle['harvestclients.tab.header.action.btn.edit']}">
                                         <span class="glyphicon glyphicon-pencil no-text"></span>
@@ -133,7 +133,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{harvestClient.harvestingNow or harvestClient.deleteInProgress}"
                                                    action="#{harvestingClientsPage.setClientForDelete(harvestClient)}"
-                                                   oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
+                                                   oncomplete="PF('deleteConfirmation').show();"
                                                    update=":harvestingClientsForm, :messagePanel,:harvestingClientsForm:clientsTable, :harvestingClientsForm:deleteConfirmation, :harvestingClientsForm:newHarvestingClientDialog"
                                                    title="#{bundle['harvestclients.tab.header.action.btn.delete']}">
                                         <span class="glyphicon glyphicon-trash no-text"></span>
@@ -283,7 +283,7 @@
                                         <p:commandLink rendered="#{!harvestingClientsPage.initialSettingsValidated}"
                                                         id="validateInitialSettingsBtn"
                                                         styleClass="btn btn-default"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         action="#{harvestingClientsPage.validateInitialSettings()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
@@ -365,14 +365,14 @@
                                         <p:commandLink id="createStepTwoPrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.backToStepOne()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
                                         <p:commandLink id="createStepTwoNext"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.goToStepThree()}">
                                             <f:param name="DO_VALIDATION" value="true"/>
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
@@ -459,14 +459,14 @@
                                         <p:commandLink id="createStepThreePrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.backToStepTwo()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
                                         <p:commandLink id="createStepThreeNext"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.goToStepFour()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
@@ -535,7 +535,7 @@
                                         <p:commandLink id="createStepFourPrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.backToStepThree()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
@@ -545,7 +545,7 @@
                                                        value="#{bundle['harvestclients.newClientDialog.btn.create']}"
                                                        update="newHarvestingClientDialogContent :messagePanel :harvestingClientsForm clientsTable emptyClientsTable"
                                                        actionListener="#{harvestingClientsPage.createClient}"
-                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();bind_bsui_components();">
+                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();">
                                             <f:param name="DO_VALIDATION" value="true"/>
                                         </p:commandLink>
                                         <p:commandLink styleClass="btn btn-default"
@@ -553,7 +553,7 @@
                                                        value="#{bundle['harvestclients.viewEditDialog.btn.save']}"
                                                        update="newHarvestingClientDialogContent :messagePanel :harvestingClientsForm clientsTable emptyClientsTable"
                                                        actionListener="#{harvestingClientsPage.saveClient}"
-                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();bind_bsui_components();">
+                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();">
                                             <f:param name="DO_VALIDATION" value="true"/>
                                         </p:commandLink>
                                         <button class="btn btn-link" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated}" onclick="PF('newHarvestingClientForm').hide()" type="button">
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index 908512f6b63..2ddcac76575 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -57,7 +57,7 @@
                                 <p:commandLink id="addSetEmpty" styleClass="btn btn-default margin-bottom"
                                                actionListener="#{harvestingSetsPage.initNewSet}"
                                                update=":harvestingSetsForm:newOAISetDialog"
-                                               oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();">
+                                               oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');">
                                     <span class="glyphicon glyphicon-plus"/> #{bundle['harvestserver.btn.add']}
                                 </p:commandLink>
                             </div>
@@ -111,7 +111,7 @@
                                         <p:commandLink id="addSet" styleClass="btn btn-default"
                                                        actionListener="#{harvestingSetsPage.initNewSet}"
                                                        update=":harvestingSetsForm:newOAISetDialog"
-                                                       oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();">
+                                                       oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');">
                                             <span class="glyphicon glyphicon-plus"/> #{bundle['harvestserver.btn.add']}
                                         </p:commandLink>
                                     </div>
@@ -157,7 +157,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{oaiSet.updateInProgress or oaiSet.deleteInProgress}"
                                                    action="#{harvestingSetsPage.editSet(oaiSet)}"
-                                                   oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();"
+                                                   oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');"
                                                    update=":harvestingSetsForm:newOAISetDialog"
                                                    title="#{bundle['harvestserver.tab.header.action.btn.edit']}">
                                         <span class="glyphicon glyphicon-pencil no-text"></span>
@@ -165,7 +165,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{oaiSet.defaultSet or oaiSet.updateInProgress or oaiSet.deleteInProgress}"
                                                    action="#{harvestingSetsPage.setSelectedSet(oaiSet)}"
-                                                   oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
+                                                   oncomplete="PF('deleteConfirmation').show();"
                                                    update=":harvestingSetsForm,:harvestingSetsForm:deleteConfirmation,:harvestingSetsForm:newOAISetDialog"
                                                    title="#{bundle['harvestserver.tab.header.action.btn.delete']}">
                                         <span class="glyphicon glyphicon-trash no-text"></span>
@@ -244,7 +244,7 @@
                                     <div class="col-sm-8 col-sm-offset-3 button-block">
                                         <p:commandLink id="validateSetQueryBtn"
                                                          styleClass="btn btn-default"
-                                                         oncomplete="PF('newOAISetForm').show();bind_bsui_components();"
+                                                         oncomplete="PF('newOAISetForm').show();"
                                                          update=":harvestingSetsForm:newOAISetDialog"
                                                          action="#{harvestingSetsPage.validateSetQuery()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
@@ -296,7 +296,7 @@
                                             <p:commandLink id="backToQuery"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingSetsForm:newOAISetDialog"
-                                                        oncomplete="PF('newOAISetForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newOAISetForm').show();"
                                                         action="#{harvestingSetsPage.backToQuery()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                             </p:commandLink>
@@ -305,7 +305,7 @@
                                                            value="#{bundle['harvestserver.newSetDialog.btn.create']}"
                                                            update="newOAISetDialogContent :messagePanel :harvestingSetsForm setsTable emptySetsTable"
                                                            actionListener="#{harvestingSetsPage.createSet}"
-                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();bind_bsui_components();">
+                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();">
                                                 <f:param name="DO_VALIDATION" value="true"/>
                                             </p:commandLink>
                                             <p:commandLink styleClass="btn btn-default"
@@ -313,7 +313,7 @@
                                                            value="#{bundle['harvestserver.viewEditDialog.btn.save']}"
                                                            update="newOAISetDialogContent :messagePanel :harvestingSetsForm setsTable emptySetsTable"
                                                            actionListener="#{harvestingSetsPage.saveSet}"
-                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();bind_bsui_components();"/>
+                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();"/>
                                             <button class="btn btn-link" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" onclick="PF('newOAISetForm').hide()" type="button">
                                                 #{bundle.cancel}
                                             </button>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index 5bb42917b58..6a505e34358 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -24,7 +24,7 @@
                         <div class="pull-right">
                             <p:commandLink id="createGroup" styleClass="btn btn-default"
                                            actionListener="#{manageGroupsPage.initExplicitGroupDialog}"
-                                           update="explicitGroupNewDialog" oncomplete="PF('explicitGroupForm').show();handleResizeDialog('explicitGroupNewDialog');bind_bsui_components();">
+                                           update="explicitGroupNewDialog" oncomplete="PF('explicitGroupForm').show();handleResizeDialog('explicitGroupNewDialog');">
                                 <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.manageGroups.createBtn']}
                             </p:commandLink>
                         </div>
@@ -70,7 +70,7 @@
                                     <div class="btn-group" role="group">
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGroupsPage.viewSelectedGroup(explicitGroup)}"
-                                                       oncomplete="PF('viewGroup').show();bind_bsui_components();"
+                                                       oncomplete="PF('viewGroup').show();"
                                                        update=":manageGroupsForm"
                                                        title="#{bundle['dataverse.manageGroups.tab.action.btn.edit']}">
                                             <span class="glyphicon glyphicon-edit"></span>

From eeac1a418c4a827ae22cf5a302f3935891a2995a Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 20 Apr 2022 11:07:35 -0400
Subject: [PATCH 4/7] #7565 still more

---
 src/main/webapp/manage-guestbooks.xhtml        | 10 ++++------
 src/main/webapp/manage-templates.xhtml         | 13 +++++--------
 src/main/webapp/metadataFragment.xhtml         | 12 ++++--------
 src/main/webapp/permissions-manage-files.xhtml | 12 +++++-------
 src/main/webapp/permissions-manage.xhtml       |  4 ++--
 .../webapp/provenance-popups-fragment.xhtml    |  8 +++++---
 src/main/webapp/themeAndWidgetsFragment.xhtml  | 18 +++++++++---------
 7 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 95abf4c901c..7b567a09f46 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -103,18 +103,16 @@
                                                    value="#{bundle['dataset.manageGuestbooks.tab.action.btn.enable']}"
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and !guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.enableGuestbook(guestbook)}"
-                                                   update="@form,:messagePanel"
-                                                   oncomplete="bind_bsui_components();"/>
+                                                   update="@form,:messagePanel"/>
                                     <p:commandLink styleClass="btn btn-default"
                                                    value="#{bundle['dataset.manageGuestbooks.tab.action.btn.disable']}"
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.disableGuestbook(guestbook)}"
-                                                   update="@form,:messagePanel"
-                                                   oncomplete="bind_bsui_components();"/>
+                                                   update="@form,:messagePanel"/>
                                     <div class="btn-group" role="group">
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGuestbooksPage.viewSelectedGuestbook(guestbook)}"
-                                                       oncomplete="PF('viewGuestbook').show();bind_bsui_components();"
+                                                       oncomplete="PF('viewGuestbook').show();"
                                                        update=":manageGuestbooksForm"
                                                        title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view']}">
                                             <span class="glyphicon glyphicon-eye-open no-text"></span>
@@ -137,7 +135,7 @@
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGuestbooksPage.setSelectedGuestbook(guestbook)}"
                                                        rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and guestbook.deletable}"
-                                                       oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
+                                                       oncomplete="PF('deleteConfirmation').show();"
                                                        title="#{bundle['dataset.manageGuestbooks.tab.action.btn.delete']}">
                                             <span class="glyphicon glyphicon-trash no-text"></span>
                                         </p:commandLink>
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index 26501a09ed7..48a96a3a324 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -87,29 +87,26 @@
                                                value="#{bundle['dataset.manageTemplates.tab.action.btn.makeDefault']}"
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate != template}"
                                                actionListener="#{manageTemplatesPage.makeDefault(template)}"
-                                               update="@form,:messagePanel"
-                                               oncomplete="bind_bsui_components();"/>
+                                               update="@form,:messagePanel"/>
                                 <p:commandLink styleClass="btn btn-default"
                                                value="#{bundle['dataset.manageTemplates.tab.action.btn.default']}"
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate == template}"
                                                actionListener="#{manageTemplatesPage.unselectDefault(template)}"
-                                               update="@form,:messagePanel"
-                                               oncomplete="bind_bsui_components();">
+                                               update="@form,:messagePanel">
                                     <span class="glyphicon glyphicon-eye-open"></span>
                                 </p:commandLink>
                                 <div class="btn-group" role="group">
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.view']}"
                                                    action="#{manageTemplatesPage.viewSelectedTemplate(template)}"
-                                                   oncomplete="PF('viewTemplate').show();bind_bsui_components();"
+                                                   oncomplete="PF('viewTemplate').show();"
                                                    update=":manageTemplatesForm">
                                         <span class="glyphicon glyphicon-eye-open"></span>
                                     </p:commandLink>
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.copy']}"
                                                    action="#{manageTemplatesPage.cloneTemplate(template)}"
-                                                   update="@form"
-                                                   oncomplete="bind_bsui_components();">
+                                                   update="@form">
                                         <span class="glyphicon glyphicon-duplicate"></span>
                                     </p:commandLink>
                                     <div class="btn-group" jsf:rendered="#{manageTemplatesPage.dataverse.id eq template.dataverse.id}">
@@ -134,7 +131,7 @@
                                                    update="@form,:messagePanel"
                                                    action="#{manageTemplatesPage.setSelectedTemplate(template)}"
                                                    rendered="#{manageTemplatesPage.dataverse.id eq template.dataverse.id}"
-                                                   oncomplete="PF('deleteConfirmation').show();bind_bsui_components();">
+                                                   oncomplete="PF('deleteConfirmation').show();">
                                         <span class="glyphicon glyphicon-trash"></span>
                                     </p:commandLink>
                                 </div>
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 31739c8fb8a..ef3d6016735 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -228,16 +228,14 @@
                                                             <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();">
+                                                                           update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}">
                                                                 <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();">
+                                                                           update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}">
                                                                 <span class="glyphicon glyphicon-minus no-text"/>
                                                             </p:commandLink>
                                                         </div>
@@ -349,16 +347,14 @@
                                                     <p:commandLink title="#{bundle.add}"
                                                                    styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
                                                                    actionListener="#{dsf.addDatasetFieldCompoundValue(valCount.index + 1)}"   
-                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
-                                                                   oncomplete="javascript:bind_bsui_components();">
+                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}">
                                                         <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.datasetFieldCompoundValues.size() > 1}"
                                                                    actionListener="#{dsf.removeDatasetFieldCompoundValue(valCount.index)}"
-                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
-                                                                   oncomplete="javascript:bind_bsui_components();">
+                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}">
                                                         <span class="glyphicon glyphicon-minus no-text"/>
                                                     </p:commandLink>
                                                 </div>
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index 49e930bc2ef..122ee2b616f 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -45,7 +45,7 @@
                                             <p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
                                                            actionListener="#{manageFilePermissionsPage.initAssignDialog}"
                                                            update="assignDialog, filesFragment, usersGroups"
-                                                           oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');bind_bsui_components();">
+                                                           oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');">
                                                 <span class="glyphicon glyphicon-user"/> #{bundle['dataverse.permissionsFiles.usersOrGroups.assignBtn']}
                                             </p:commandLink>
                                         </div>
@@ -87,16 +87,14 @@
                                                                            actionListener="#{manageFilePermissionsPage.grantAccessToAllRequests(access.key)}"
                                                                            update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}                                                                       
                                                                            :#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
-                                                                           :#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])"
-                                                                           oncomplete="bind_bsui_components();">
+                                                                           :#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])">
                                                                 <span class="glyphicon glyphicon-ok"/> #{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}
                                                             </p:commandLink>
                                                             <p:commandLink styleClass="btn btn-default"
                                                                            actionListener="#{manageFilePermissionsPage.rejectAccessToAllRequests(access.key)}"
                                                                            update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}                                                                       
                                                                            :#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
-                                                                           :#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])"
-                                                                           oncomplete="bind_bsui_components();">
+                                                                           :#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])">
                                                                 <span class="glyphicon glyphicon-ban-circle"/> #{bundle['dataverse.permissionsFiles.assignDialog.rejectBtn']}
                                                             </p:commandLink>
                                                         </div>
@@ -120,7 +118,7 @@
                                                         <p:commandLink id="viewUserGroups" styleClass="btn btn-default"
                                                                        actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByRoleAssignee(ra.key, ra.value)}"
                                                                        update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
-                                                                       oncomplete="PF('viewRemoveWidget').show(); bind_bsui_components();">
+                                                                       oncomplete="PF('viewRemoveWidget').show();">
                                                             <h:outputText value="#{ra.value.size()} #{ra.value.size() eq 1 ?  bundle['dataverse.permissionsFiles.usersOrGroups.file'] : bundle['dataverse.permissionsFiles.usersOrGroups.files']}"/>
                                                         </p:commandLink>
                                                     </p:column>
@@ -203,7 +201,7 @@
                                                 <p:commandLink styleClass="btn btn-default" rendered="#{!fileEntry.key.deleted}"
                                                                actionListener="#{manageFilePermissionsPage.initAssignDialogByFile(fileEntry.key)}"
                                                                update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}, :#{p:resolveClientId('rolesPermissionsForm:filesFragment', view)}, :#{p:resolveClientId('rolesPermissionsForm:usersGroups', view)}"
-                                                               oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');bind_bsui_components();"><span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissionsFiles.files.assignBtn']}</p:commandLink>
+                                                               oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');"><span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissionsFiles.files.assignBtn']}</p:commandLink>
                                             </p:column>
                                         </p:dataTable>
                                     </p:fragment>    
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index c0a7508be04..b328e4abc81 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -105,7 +105,7 @@
                                         <p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
                                                        actionListener="#{managePermissionsPage.initAssigneeDialog}"
                                                        update="userGroupDialog"
-                                                       oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');bind_bsui_components();">
+                                                       oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');">
                                             <span class="glyphicon glyphicon-user"/> #{bundle['dataverse.permissions.usersOrGroups.assignBtn']}
                                         </p:commandLink>
                                     </div>
@@ -163,7 +163,7 @@
                                                        rendered="#{managePermissionsPage.dvObject.instanceofDataverse and permissionsWrapper.canManagePermissions(managePermissionsPage.dvObject)
                                                                     and dataverseSession.user.superuser}"
                                                        actionListener="#{managePermissionsPage.createNewRole}"
-                                                       oncomplete="PF('roleForm').show();handleResizeDialog('rolesPermissionsDialog');bind_bsui_components();"
+                                                       oncomplete="PF('roleForm').show();handleResizeDialog('rolesPermissionsDialog');"
                                                        update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}">
                                             <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissions.roles.add']}
                                         </p:commandLink>
diff --git a/src/main/webapp/provenance-popups-fragment.xhtml b/src/main/webapp/provenance-popups-fragment.xhtml
index adf5076d13a..da644d60f6a 100644
--- a/src/main/webapp/provenance-popups-fragment.xhtml
+++ b/src/main/webapp/provenance-popups-fragment.xhtml
@@ -51,7 +51,6 @@
                                           label="#{bundle['file.editProvenanceDialog.selectToAddBtn']}"
                                           onstart="javascript:uploadStarted();"
                                           onerror="javascript:uploadFailure();"
-                                          oncomplete="bind_bsui_components();"
                                           fileLimit="1" 
                                           invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"/>
                         </ui:fragment>
@@ -167,8 +166,11 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="confirmProvenancePopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('confirmProvenancePopup').hide();javascript:bind_bsui_components();" action="#{provPopupFragmentBean.stagePopupChanges(saveInPopup == 'true')}" update=":messagePanel"/>
-            <button type="button" jsf:id="confirmProvenancePopupCancelButton" class="btn btn-link" onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();" oncomplete="javascript:bind_bsui_components();">
+            <p:commandButton styleClass="btn btn-default" id="confirmProvenancePopupSaveButton" 
+                             value="#{bundle.saveChanges}" oncomplete="PF('confirmProvenancePopup').hide();" 
+                             action="#{provPopupFragmentBean.stagePopupChanges(saveInPopup == 'true')}" update=":messagePanel"/>
+            <button type="button" jsf:id="confirmProvenancePopupCancelButton" class="btn btn-link" 
+                    onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();">
                 #{bundle.cancel}
             </button>
         </div>
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index eddf2dbb892..b87f8af3637 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -25,7 +25,7 @@
                                         <h:selectBooleanCheckbox id="themeRoot" tabindex="7" styleClass="metadata-blocks-default" 
                                                                  rendered="#{themeWidgetFragment.editDv.owner != null}"
                                                                  value="#{themeWidgetFragment.inheritCustomization}" >
-                                            <p:ajax update="@widgetVar(content)" oncomplete="javascript:bind_bsui_components();" listener="#{themeWidgetFragment.checkboxListener()}"/>
+                                            <p:ajax update="@widgetVar(content)" listener="#{themeWidgetFragment.checkboxListener()}"/>
                                         </h:selectBooleanCheckbox>
                                         <h:outputFormat value="#{bundle['dataverse.theme.inheritCustomization.checkbox']}">
                                             <f:param value="#{themeWidgetFragment.editDv.themeRootDataverseName}"/>
@@ -48,13 +48,13 @@
                                             <img jsf:rendered="#{themeWidgetFragment.uploadExists()}" class="logoPreview" src="/logos/temp/#{themeWidgetFragment.tempDirName}/#{themeWidgetFragment.editDv.dataverseTheme.logo}" alt="#{of:format1(bundle['alt.logo'], themeWidgetFragment.editDv.name)}"/>
                                             <img jsf:rendered="#{not themeWidgetFragment.uploadExists()}" class="logoPreview" src="/logos/#{themeWidgetFragment.editDv.id}/#{themeWidgetFragment.editDv.dataverseTheme.logo}" alt="#{of:format1(bundle['alt.logo'], themeWidgetFragment.editDv.name)}"/>
                                         </p>
-                                        <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogo()}" oncomplete="bind_bsui_components();"/>
+                                        <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogo()}"/>
                                     </p:column>                              
-                                    <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
+                                    <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
                                                   listener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.upload']}"/>
                                 </p:panelGrid>
                                 <p:panelGrid rendered="#{empty themeWidgetFragment.editDv.dataverseTheme.logo}" columns="2" styleClass="noBorders">
-                                    <p:fileUpload id="uploadlogo" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
+                                    <p:fileUpload id="uploadlogo" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
                                                   listener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}"/>
                                 </p:panelGrid>
                                 <ui:fragment rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logo}">
@@ -68,7 +68,7 @@
                                             <p:selectOneRadio id="logoFormat" value="#{themeWidgetFragment.editDv.dataverseTheme.logoFormat}">
                                                 <f:selectItem itemLabel="#{bundle['dataverse.theme.logo.format.selectTab.square']}" itemValue="SQUARE"/>
                                                 <f:selectItem itemLabel="#{bundle['dataverse.theme.logo.format.selectTab.rectangle']}" itemValue="RECTANGLE"/>
-                                                <p:ajax update="@widgetVar(content)" oncomplete="bind_bsui_components();" />
+                                                <p:ajax update="@widgetVar(content)"/>
                                             </p:selectOneRadio>
                                             <p:message for="logoFormat" display="text"/>
                                         </div>
@@ -194,13 +194,13 @@
                                                 <img jsf:rendered="#{themeWidgetFragment.uploadExistsFooter()}" class="logoPreview" src="/logos/temp/#{themeWidgetFragment.tempDirName}/#{themeWidgetFragment.editDv.dataverseTheme.logoFooter}" alt="#{themeWidgetFragment.editDv.name}"/>
                                                 <img jsf:rendered="#{not themeWidgetFragment.uploadExistsFooter()}" class="logoPreview" src="/logos/#{themeWidgetFragment.editDv.id}/#{themeWidgetFragment.editDv.dataverseTheme.logoFooter}" alt="#{themeWidgetFragment.editDv.name}"/>
                                             </p>
-                                            <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogoFooter()}" oncomplete="bind_bsui_components();"/>
+                                            <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogoFooter()}"/>
                                         </p:column>
-                                        <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogoFooter" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
+                                        <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogoFooter" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
                                                       listener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.upload']}"/>
                                     </p:panelGrid>
                                     <p:panelGrid rendered="#{empty themeWidgetFragment.editDv.dataverseTheme.logoFooter}" columns="2" styleClass="noBorders">
-                                        <p:fileUpload id="uploadlogoFooter" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
+                                        <p:fileUpload id="uploadlogoFooter" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
                                                       listener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}"/>
                                     </p:panelGrid>
                                     <ui:fragment rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logoFooter}">
@@ -237,7 +237,7 @@
                     </ui:fragment>
                 </p:fragment>
                 <div class="button-block">
-                    <p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}" oncomplete="bind_bsui_components();"/>
+                    <p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}"/>
                     <p:commandButton id="themeCancel" class="btn btn-link" value="#{bundle.cancel}" action="#{themeWidgetFragment.cancel()}" immediate="true"/>
                 </div>
             </p:tab>

From a2796c9fd0bb1b19ef1c247f4d1c455f7af49f42 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 20 Apr 2022 12:53:37 -0400
Subject: [PATCH 5/7] #7565 cleanup merge

---
 src/main/webapp/dataset-license-terms.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 99db5ba7cff..afacdb2539a 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -11,7 +11,7 @@
          jsf:rendered="#{dataverseSession.user.authenticated and empty editMode and !widgetWrapper.widgetView
                          and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)}">
         <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}" 
-                       update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" disabled="#{DatasetPage.lockedFromEdits}">
+                       update="@form,:messagePanel" disabled="#{DatasetPage.lockedFromEdits}">
             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
             <span class="glyphicon glyphicon-briefcase"/> #{bundle['file.dataFilesTab.terms.editTermsBtn']}
         </p:commandLink>

From 4a4e66e70bc683e4120d032bc6377659a57b7a0b Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 21 Apr 2022 15:14:59 -0400
Subject: [PATCH 6/7] #7565 fix create/edit templates

---
 .../edu/harvard/iq/dataverse/TemplatePage.java     |  1 +
 .../iq/dataverse/TermsOfUseAndAccessValidator.java |  8 +++++++-
 src/main/webapp/dataset-license-terms.xhtml        | 14 +++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
index b04136bb5a1..331ecbf24f8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
@@ -129,6 +129,7 @@ public String init() {
 
             if (template.getTermsOfUseAndAccess() != null) {
                 TermsOfUseAndAccess terms = template.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
+                terms.setTemplate(template);
                 template.setTermsOfUseAndAccess(terms);
             }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
index ee094d772e2..3ae1533f263 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
@@ -28,7 +28,13 @@ public boolean isValid(TermsOfUseAndAccess value, ConstraintValidatorContext con
     }
     
     public static boolean isTOUAValid(TermsOfUseAndAccess value, ConstraintValidatorContext context){
-        //If there are no restricted files then terms are valid 
+        
+        //if part of a template it is valid
+        if (value.getTemplate() != null){
+            return true;
+        }
+        
+         //If there are no restricted files then terms are valid 
         if (!value.getDatasetVersion().isHasRestrictedFile()) {
             return true;
         }
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index afacdb2539a..9d381f54dd5 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -296,7 +296,7 @@
                         <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}"> 
                             <p:fragment id="termsOfAccessHelp">
                                 <ui:remove>
-                                <ui:fragment rendered="#{!DatasetPage.dataset.editVersion.hasRestrictedFile or !DatasetPage.dataset.editVersion.termsOfUseAndAccess.fileAccessRequest}">    
+                                <ui:fragment rendered="#{datasetPage == true and (!DatasetPage.dataset.editVersion.hasRestrictedFile or !DatasetPage.dataset.editVersion.termsOfUseAndAccess.fileAccessRequest)}">    
                                     <p class="help-block">
                                        
                                         <h:outputText value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description']}"/>
@@ -325,13 +325,13 @@
                            </label>
                            <div class="col-sm-9">
                                 <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" 
-                                                        value="#{termsOfUseAndAccess.fileAccessRequest}" disabled="#{!DatasetPage.isHasRestrictedFiles()}">
-                                   <p:ajax event="change" update="datasetForm:saveTop,datasetForm:saveBottom,termsOfAccessHelp" />
+                                                        value="#{termsOfUseAndAccess.fileAccessRequest}" disabled="#{datasetPage == true and !DatasetPage.isHasRestrictedFiles()}">
+                                   <p:ajax event="change" update="termsOfAccessHelp" />
                                </p:selectBooleanCheckbox>                                                          
                            </div>
                        </div>
                        <p:fragment id="toaValidation">
-                           <div  class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{empty termsOfUseAndAccess.termsOfAccess  and !termsOfUseAndAccess.fileAccessRequest}">
+                           <div  class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{datasetPage == true and empty termsOfUseAndAccess.termsOfAccess  and !termsOfUseAndAccess.fileAccessRequest}">
                                <span class="ui-message-error-detail">#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.warning.outofcompliance']}</span>          
                            </div>
                        </p:fragment>
@@ -342,9 +342,9 @@
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
-                                <p:inputTextarea  id="metadata_TermsAccess" value="#{termsOfUseAndAccess.termsOfAccess}" rows="5" styleClass="form-control" disabled="#{!DatasetPage.isHasRestrictedFiles()}" >
-                                <p:ajax event="keyup" update="datasetForm:saveTop,datasetForm:saveBottom" />
-                               </p:inputTextarea>
+                                <p:inputTextarea  id="metadata_TermsAccess" value="#{termsOfUseAndAccess.termsOfAccess}" 
+                                                  rows="5" styleClass="form-control" disabled="#{datasetPage == true and !DatasetPage.isHasRestrictedFiles()}" />
+
                            </div>
                        </div>
                     <p:fragment>

From 512c8d91a37507f1fccc16d815ab5d7c999712e4 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 21 Apr 2022 16:02:29 -0400
Subject: [PATCH 7/7] #7565 fix messang/bundle

---
 src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java    | 2 +-
 .../harvard/iq/dataverse/TermsOfUseAndAccessValidator.java    | 4 ++--
 src/main/java/propertyFiles/Bundle.properties                 | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
index 73b4723de53..faa91b87e12 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -1686,7 +1686,7 @@ public Set<ConstraintViolation> validate() {
             Set<ConstraintViolation<TermsOfUseAndAccess>> constraintViolations = validator.validate(toua);
             if (constraintViolations.size() > 0) {
                 ConstraintViolation<TermsOfUseAndAccess> violation = constraintViolations.iterator().next();
-                String message = BundleUtil.getStringFromBundle("toua.invalid");
+                String message = BundleUtil.getStringFromBundle("dataset.message.toua.invalid");
                 logger.info(message);
                 this.termsOfUseAndAccess.setValidationMessage(message);
                 returnSet.add(violation);
diff --git a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
index 3ae1533f263..2cf78db0f03 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
@@ -45,10 +45,10 @@ public static boolean isTOUAValid(TermsOfUseAndAccess value, ConstraintValidator
         if (!valid) {
             try {
                 if (context != null) {
-                    context.buildConstraintViolationWithTemplate(BundleUtil.getStringFromBundle("toua.invalid")).addConstraintViolation();
+                    context.buildConstraintViolationWithTemplate(BundleUtil.getStringFromBundle("dataset.message.toua.invalid")).addConstraintViolation();
                 }
 
-               value.setValidationMessage(BundleUtil.getStringFromBundle("toua.invalid"));
+               value.setValidationMessage(BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
             } catch (NullPointerException e) {
                 return false;
             }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 31a58ae65b1..89f3760909b 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1475,6 +1475,7 @@ dataset.message.editMetadata.label=Edit Dataset Metadata
 dataset.message.editMetadata.message=Add more metadata about this dataset to help others easily find it.
 dataset.message.editMetadata.duplicateFilenames=Duplicate filenames: {0}
 dataset.message.editMetadata.invalid.TOUA.message=Datasets with restricted files are required to have Request Access enabled or Terms of Access to help people access the data. Please edit the dataset to confirm Request Access or provide Terms of Access to be in compliance with the policy.
+dataset.message.toua.invalid=You must enable request access or add terms of access in datasets with restricted files.
 
 dataset.message.editTerms.label=Edit Dataset Terms
 dataset.message.editTerms.message=Add the terms of use for this dataset to explain how to access and use your data.