From 6e195d7000686f8950f5f4c01eacf7e14c89f655 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 6 Jul 2022 13:54:42 -0400
Subject: [PATCH 1/7] #8832 fix error message render

---
 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 9d381f54dd5..1aa800f2bcb 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -331,7 +331,7 @@
                            </div>
                        </div>
                        <p:fragment id="toaValidation">
-                           <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}">
+                           <div  class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{datasetPage == true and DatasetPage.dataset.editVersion.hasRestrictedFile 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>

From 7d9c12e52a96084185a047692e904509e1a77a35 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 7 Jul 2022 10:25:16 -0400
Subject: [PATCH 2/7] #8832 fix TOA validator

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

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 251f3865104..92d3d55731c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -422,6 +422,14 @@ public Boolean isHasRestrictedFiles(){
         }
     }
     
+    public boolean getHasRestrictedFiles(){
+        return isHasRestrictedFiles(); //HasValidTermsOfAccess
+    }
+    
+    public void setHasRestrictedFiles(boolean value){
+        //dummy for ui
+    }
+    
     public boolean getHasValidTermsOfAccess(){
         return isHasValidTermsOfAccess(); //HasValidTermsOfAccess
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
index 19beaf75349..83d739bc124 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
@@ -173,8 +173,6 @@ public void edit(TemplatePage.EditMode editMode) {
     }
 
     public String save(String redirectPage) {
-
-        //SEK - removed dead code 1/6/2015
         
         boolean create = false;
         Command<Void> cmd;
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 1aa800f2bcb..bf35fa2b78f 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -351,6 +351,7 @@
                         <p:autoUpdate/>
                         <o:inputHidden id="termsofAccessHiddenLT" value="#{termsOfUseAndAccess.termsOfAccess}" />
                         <o:inputHidden id="fileAccessRequestHiddenLT" value="#{termsOfUseAndAccess.fileAccessRequest}" />
+                        <o:inputHidden rendered="#{datasetPage == true}" id="hasRestrictedFilesLT" value="#{DatasetPage.hasRestrictedFiles}" />
                     </p:fragment>
 
                    </ui:fragment>
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index b08c06e1568..d823e3984e8 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -44,6 +44,7 @@
             <ui:param name="publishDataset" value="#{DatasetPage.publishDatasetPopup()}"/>
             <ui:param name="releaseDraft" value="#{DatasetPage.releaseDraftPopup()}"/>
             <ui:param name="releaseBoth" value="#{DatasetPage.publishBothPopup()}"/>
+            <ui:param name="hasRestrictedFile" value="#{DatasetPage.isHasRestrictedFiles()}"/>
             <ui:define name="meta_header">
                 <ui:fragment rendered="#{!DatasetPage.anonymizedAccess}">
                     <meta name="description" content="#{DatasetPage.description}"/>
@@ -1867,16 +1868,19 @@
                     
                     function testTOADatasetPage() {
                         var termsofAccessHidden, fileAccessRequestHidden;
+                        var hasRestricted;
                         try{
                             termsofAccessHidden = document.getElementById("datasetForm:tabView:termsofAccessHiddenLT").value;
                             fileAccessRequestHidden  = document.getElementById("datasetForm:tabView:fileAccessRequestHiddenLT").value;  
                         }
                         catch (error){
+                            alert("notdatasetform");
                             //terms not present so save...
                             PF('blockDatasetForm').show();
                             datasetSaveCommand();                        
                         }  
-                        if (fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
+                        hasRestricted = document.getElementById("datasetForm:tabView:hasRestrictedFilesLT").value;
+                        if (hasRestricted === 'true' && fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
                            //Not compliant show error keep page open...
                         } else {
                             PF('blockDatasetForm').show();

From b0a25d1edbd5489175560d8173bd4c2e42eaddbf Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 21 Jul 2022 14:54:33 -0400
Subject: [PATCH 3/7] #8832 simplify getting hasRestrictedFiles

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

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 92d3d55731c..251f3865104 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -422,14 +422,6 @@ public Boolean isHasRestrictedFiles(){
         }
     }
     
-    public boolean getHasRestrictedFiles(){
-        return isHasRestrictedFiles(); //HasValidTermsOfAccess
-    }
-    
-    public void setHasRestrictedFiles(boolean value){
-        //dummy for ui
-    }
-    
     public boolean getHasValidTermsOfAccess(){
         return isHasValidTermsOfAccess(); //HasValidTermsOfAccess
     }
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index bf35fa2b78f..7119bd2f979 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -351,8 +351,7 @@
                         <p:autoUpdate/>
                         <o:inputHidden id="termsofAccessHiddenLT" value="#{termsOfUseAndAccess.termsOfAccess}" />
                         <o:inputHidden id="fileAccessRequestHiddenLT" value="#{termsOfUseAndAccess.fileAccessRequest}" />
-                        <o:inputHidden rendered="#{datasetPage == true}" id="hasRestrictedFilesLT" value="#{DatasetPage.hasRestrictedFiles}" />
-                    </p:fragment>
+                     </p:fragment>
 
                    </ui:fragment>
 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index d823e3984e8..513841e505f 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -1868,19 +1868,16 @@
                     
                     function testTOADatasetPage() {
                         var termsofAccessHidden, fileAccessRequestHidden;
-                        var hasRestricted;
                         try{
                             termsofAccessHidden = document.getElementById("datasetForm:tabView:termsofAccessHiddenLT").value;
                             fileAccessRequestHidden  = document.getElementById("datasetForm:tabView:fileAccessRequestHiddenLT").value;  
                         }
                         catch (error){
-                            alert("notdatasetform");
                             //terms not present so save...
                             PF('blockDatasetForm').show();
                             datasetSaveCommand();                        
-                        }  
-                        hasRestricted = document.getElementById("datasetForm:tabView:hasRestrictedFilesLT").value;
-                        if (hasRestricted === 'true' && fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
+                        }                         
+                        if ('#{DatasetPage.isHasRestrictedFiles()}' === 'true' && fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
                            //Not compliant show error keep page open...
                         } else {
                             PF('blockDatasetForm').show();

From 494045e201c4e2ff9f7b51a8eeacd87fef106a8e Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 21 Jul 2022 15:16:38 -0400
Subject: [PATCH 4/7] #8832 fix message panel update

---
 src/main/webapp/dataset.xhtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 513841e505f..acf2e5fe614 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -924,7 +924,8 @@
                     <div class="button-block" jsf:rendered="#{!empty DatasetPage.editMode}">
                         <p:commandButton id="saveBottomTerms" styleClass="btn btn-default" rendered="#{DatasetPage.editMode == 'LICENSE'}"
                                          value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" 
-                                         onclick="testTOADatasetPage();"                                         
+                                         onclick="testTOADatasetPage();" 
+                                         update=":datasetForm,:messagePanel"
                                          oncomplete="$(document).scrollTop(0);"/>
                         <p:commandButton id="saveBottom" styleClass="btn btn-default" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" rendered="#{DatasetPage.editMode == 'CREATE' or DatasetPage.editMode == 'METADATA'}"
                                          onclick="PF('blockDatasetForm').show();"

From aaa8bf428aac805b60b3f04295db7ed5ac2b1c43 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 21 Jul 2022 15:55:06 -0400
Subject: [PATCH 5/7] #8832 remove unused uiparam

---
 src/main/webapp/dataset.xhtml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index acf2e5fe614..bbc29e4edfe 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -44,7 +44,6 @@
             <ui:param name="publishDataset" value="#{DatasetPage.publishDatasetPopup()}"/>
             <ui:param name="releaseDraft" value="#{DatasetPage.releaseDraftPopup()}"/>
             <ui:param name="releaseBoth" value="#{DatasetPage.publishBothPopup()}"/>
-            <ui:param name="hasRestrictedFile" value="#{DatasetPage.isHasRestrictedFiles()}"/>
             <ui:define name="meta_header">
                 <ui:fragment rendered="#{!DatasetPage.anonymizedAccess}">
                     <meta name="description" content="#{DatasetPage.description}"/>

From d3b0d1cb18417822a9043d041394b33d58c189f5 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 22 Jul 2022 09:32:59 -0400
Subject: [PATCH 6/7] #8832 only show terms of access if restricted files
 present

---
 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 7119bd2f979..7e9ca52410b 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -264,7 +264,7 @@
                                </div>
                            </ui:fragment>
                        </div>
-                       <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
+                       <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess and DatasetPage.restrictedFileCount > 0}">
                            <label for="datasetForm:tabView:metadata_TermsAccessText" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"

From 80743589d7240e6e2635d3ddc80e864b6e5a385a Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 25 Jul 2022 16:48:26 -0400
Subject: [PATCH 7/7] #8832 suppress toa if no restricted files

---
 src/main/webapp/dataset-license-terms.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 7e9ca52410b..38f1f38e7d6 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -236,7 +236,7 @@
                 </p:fragment>
             </div>
         </div>
-       <div class="panel panel-default" jsf:rendered="#{!empty editMode or empty editMode and (!empty termsOfUseAndAccess.termsOfAccess
+       <div class="panel panel-default" jsf:rendered="#{!empty editMode or empty editMode and ((!empty termsOfUseAndAccess.termsOfAccess and DatasetPage.restrictedFileCount > 0) 
                                                         or !empty termsOfUseAndAccess.dataAccessPlace 
                                         or !empty termsOfUseAndAccess.originalArchive or !empty termsOfUseAndAccess.availabilityStatus 
                                         or !empty termsOfUseAndAccess.contactForAccess or !empty termsOfUseAndAccess.sizeOfCollection 
@@ -248,7 +248,7 @@
            <div id="panelCollapseTOA" jsf:class="#{!datasetPage.hasValidTermsOfAccess ? 'collapse' : ''}">
                <div class="panel-body">
                    <ui:fragment rendered="#{empty editMode}">
-                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
+                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and DatasetPage.restrictedFileCount > 0}">
                            <label for="datasetForm:tabView:metadata_RestrictedFiles" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"