From e8d2bf2edb875d1e695f08c230c421f7518cde9d Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 24 Apr 2020 15:04:52 -0400
Subject: [PATCH 1/6] #6741 restrict Add Data in header

---
 src/main/webapp/dataverse_header.xhtml | 55 +++++++++++++++++++-------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 991c0d1d92b..06f1060a47c 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -10,6 +10,14 @@
                 xmlns:of="http://omnifaces.org/functions"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
     <o:resourceInclude path="/CustomizationFilesServlet?customFileType=header" rendered="#{!widgetWrapper.widgetView}"/>
+    <o:importFunctions type="edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers" />
+    <ui:param name="authUserSession" value ="#{dataverseSession.user.authenticated}"/>
+    <ui:param name="showAddDataverseLink" value="#{(dataverseSession.user.authenticated and permissionsWrapper.canIssueCreateDataverseCommand(dataverseServiceBean.findRootDataverse())) 
+                                                   or (!dataverseSession.user.authenticated and permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('CreateDataverseCommand')) }"/>
+    <ui:param name="showAddDatasetLink" value="#{(dataverseSession.user.authenticated and permissionsWrapper.canIssueCreateDatasetCommand(dataverseServiceBean.findRootDataverse()))
+                                                 or (!dataverseSession.user.authenticated and permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('AbstractCreateDatasetCommand')) }"/>
+    <ui:param name="showAddDataGroup" value="#{showAddDataverseLink or  showAddDatasetLink}"/>
+  
     <div id="dataverse-header-block">
         <!-- Navbar Panel -->
         <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}">
@@ -31,21 +39,35 @@
                 </div>
                 <div class="collapse navbar-collapse" id="topNavBar">
                     <ul class="nav navbar-nav navbar-right">
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
-                            <ul class="dropdown-menu">
-                                <li>
-                                    <h:outputLink value="/dataverse.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
-                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
-                                    </h:outputLink>
-                                </li>
-                                <li>
-                                    <h:outputLink value="/dataset.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
-                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
-                                    </h:outputLink>
+                        <ui:fragment rendered="#{showAddDataGroup}">
+                        <ui:fragment rendered="#{!authUserSession}">
+                            <li>
+                                <a href="#" onClick="PF('addData_popup').show()">#{bundle['dataverse.results.btn.addData']} </a>
+                            </li> 
+                        </ui:fragment>
+
+                            <ui:fragment rendered="#{authUserSession}">
+                                <li class="dropdown">
+                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
+                                    <ul class="dropdown-menu">
+                                        <ui:fragment rendered="#{showAddDataverseLink}">
+                                            <li>
+                                                <h:outputLink value="/dataverse.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
+                                                    <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
+                                                </h:outputLink>
+                                            </li>
+                                        </ui:fragment>
+                                        <ui:fragment rendered="#{showAddDatasetLink}">
+                                            <li>
+                                                <h:outputLink value="/dataset.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
+                                                    <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
+                                                </h:outputLink>
+                                            </li>
+                                        </ui:fragment>
+                                    </ul>
                                 </li>
-                            </ul>
-                        </li>
+                            </ui:fragment>
+                        </ui:fragment>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle.search} <b class="caret"></b></a>
                             <ul class="dropdown-menu navbar-search">
@@ -189,6 +211,11 @@
                 </div>
             </div>
         </noscript>
+        <script>
+function a () {
+var contact = prompt("Add the contact.");
+}
+</script>
         <!-- Status Alert -->
         <o:form class="form-inline">
             <div id="status-alert" class="bg-warning" jsf:rendered="#{!empty settingsWrapper.get(':StatusMessageText') and !empty settingsWrapper.get(':StatusMessageHeader') and !dataverseSession.isStatusDismissed()}">

From a460b80a319b7c21ced6ca56840f89ed978d5db6 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 24 Apr 2020 15:27:35 -0400
Subject: [PATCH 2/6] #6741 remove unused script

---
 src/main/webapp/dataverse_header.xhtml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 06f1060a47c..38b29ded8df 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -211,11 +211,6 @@
                 </div>
             </div>
         </noscript>
-        <script>
-function a () {
-var contact = prompt("Add the contact.");
-}
-</script>
         <!-- Status Alert -->
         <o:form class="form-inline">
             <div id="status-alert" class="bg-warning" jsf:rendered="#{!empty settingsWrapper.get(':StatusMessageText') and !empty settingsWrapper.get(':StatusMessageHeader') and !dataverseSession.isStatusDismissed()}">

From 7b9c999c3449f71d9e3e67d9310ea3c5bd12a035 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 27 Apr 2020 11:05:44 -0400
Subject: [PATCH 3/6] #6741 address CR suggestions

---
 src/main/webapp/addDataFormFragment.xhtml     | 19 ++++++++
 src/main/webapp/dataverse_header.xhtml        | 45 +++++++------------
 src/main/webapp/dataverse_template.xhtml      |  1 +
 src/main/webapp/search-include-fragment.xhtml | 12 +----
 4 files changed, 38 insertions(+), 39 deletions(-)
 create mode 100644 src/main/webapp/addDataFormFragment.xhtml

diff --git a/src/main/webapp/addDataFormFragment.xhtml b/src/main/webapp/addDataFormFragment.xhtml
new file mode 100644
index 00000000000..69987ab78c9
--- /dev/null
+++ b/src/main/webapp/addDataFormFragment.xhtml
@@ -0,0 +1,19 @@
+<ui:composition xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:p="http://primefaces.org/ui"
+    xmlns:jsf="http://xmlns.jcp.org/jsf">
+    <!-- Add Data Form - not logged in... -->
+    <p:dialog id="addDataGuest" header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
+        <p class="help-block">
+            <h:outputText value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false"></h:outputText>
+        </p>
+        <div class="button-block">
+            <ui:fragment rendered="#{dataverseHeaderFragment.signupAllowed}">
+                <a class="btn btn-default" href="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}" title="#{bundle['dataverse.results.dialog.addDataGuest.signup.title']}">#{bundle['signup']}</a>
+            </ui:fragment>
+            <a class="btn btn-default" href="/loginpage.xhtml#{navigationWrapper.redirectPage}" title="#{bundle['dataverse.results.dialog.addDataGuest.login.title']}">#{bundle['login']}</a>
+        </div>
+    </p:dialog>
+</ui:composition>
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 38b29ded8df..fe3e3a5ab1e 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -39,35 +39,24 @@
                 </div>
                 <div class="collapse navbar-collapse" id="topNavBar">
                     <ul class="nav navbar-nav navbar-right">
-                        <ui:fragment rendered="#{showAddDataGroup}">
-                        <ui:fragment rendered="#{!authUserSession}">
-                            <li>
-                                <a href="#" onClick="PF('addData_popup').show()">#{bundle['dataverse.results.btn.addData']} </a>
-                            </li> 
-                        </ui:fragment>
-
-                            <ui:fragment rendered="#{authUserSession}">
-                                <li class="dropdown">
-                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
-                                    <ul class="dropdown-menu">
-                                        <ui:fragment rendered="#{showAddDataverseLink}">
-                                            <li>
-                                                <h:outputLink value="/dataverse.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
-                                                    <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
-                                                </h:outputLink>
-                                            </li>
-                                        </ui:fragment>
-                                        <ui:fragment rendered="#{showAddDatasetLink}">
-                                            <li>
-                                                <h:outputLink value="/dataset.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
-                                                    <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
-                                                </h:outputLink>
-                                            </li>
-                                        </ui:fragment>
-                                    </ul>
+                        <li jsf:rendered="#{showAddDataGroup and !authUserSession}">
+                            <a href="#" onClick="PF('addData_popup').show()">#{bundle['dataverse.results.btn.addData']} </a>
+                        </li> 
+                        <li class="dropdown" jsf:rendered="#{showAddDataGroup and authUserSession}">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
+                            <ul class="dropdown-menu">
+                                <li jsf:rendered="#{showAddDataverseLink and authUserSession}">
+                                    <h:outputLink value="/dataverse.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
+                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
+                                    </h:outputLink>
                                 </li>
-                            </ui:fragment>
-                        </ui:fragment>
+                                <li jsf:rendered="#{showAddDatasetLink and authUserSession}">
+                                    <h:outputLink value="/dataset.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
+                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
+                                    </h:outputLink>
+                                </li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle.search} <b class="caret"></b></a>
                             <ul class="dropdown-menu navbar-search">
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index 09e13119d21..42aac1f5da5 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -79,6 +79,7 @@
             </f:facet>
         </p:ajaxStatus>
         <ui:include src="contactFormFragment.xhtml"></ui:include>
+        <ui:include src="addDataFormFragment.xhtml"></ui:include>
         <script defer="defer" src="#{resource['bs/js/bootstrap.min.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['js/ie-compat.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['js/dv_rebind_bootstrap_ui.js']}?version=#{systemConfig.getVersion()}"></script>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 0770ac36c83..890b88c3804 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -657,15 +657,5 @@
                          actionListener="#{SearchIncludeFragment.setDisplayCardValues()}" />
     </h:form>
 
-    <p:dialog id="addDataGuest" header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
-        <p class="help-block">
-            <h:outputText value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false"></h:outputText>
-        </p>
-        <div class="button-block">
-            <ui:fragment rendered="#{dataverseHeaderFragment.signupAllowed}">
-                <a class="btn btn-default" href="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}" title="#{bundle['dataverse.results.dialog.addDataGuest.signup.title']}">#{bundle['signup']}</a>
-            </ui:fragment>
-            <a class="btn btn-default" href="/loginpage.xhtml#{navigationWrapper.redirectPage}" title="#{bundle['dataverse.results.dialog.addDataGuest.login.title']}">#{bundle['login']}</a>
-        </div>
-    </p:dialog>
+
 </ui:composition>

From bb287377d90a57a61bd0675f4d5323aa7b0bc767 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 27 Apr 2020 15:39:14 -0400
Subject: [PATCH 4/6] #6741 Change add data button logic to AuthUser only

---
 src/main/webapp/dataverse_header.xhtml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index fe3e3a5ab1e..22abe13eca6 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -12,12 +12,10 @@
     <o:resourceInclude path="/CustomizationFilesServlet?customFileType=header" rendered="#{!widgetWrapper.widgetView}"/>
     <o:importFunctions type="edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers" />
     <ui:param name="authUserSession" value ="#{dataverseSession.user.authenticated}"/>
-    <ui:param name="showAddDataverseLink" value="#{(dataverseSession.user.authenticated and permissionsWrapper.canIssueCreateDataverseCommand(dataverseServiceBean.findRootDataverse())) 
-                                                   or (!dataverseSession.user.authenticated and permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('CreateDataverseCommand')) }"/>
-    <ui:param name="showAddDatasetLink" value="#{(dataverseSession.user.authenticated and permissionsWrapper.canIssueCreateDatasetCommand(dataverseServiceBean.findRootDataverse()))
-                                                 or (!dataverseSession.user.authenticated and permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('AbstractCreateDatasetCommand')) }"/>
-    <ui:param name="showAddDataGroup" value="#{showAddDataverseLink or  showAddDatasetLink}"/>
-  
+    <ui:param name="showAddDataverseLink" value="#{permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('CreateDataverseCommand') }"/>
+    <ui:param name="showAddDatasetLink" value="#{permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('AbstractCreateDatasetCommand') }"/>
+    <ui:param name="showAddDataGroup" value="#{showAddDataverseLink or showAddDatasetLink}"/>
+
     <div id="dataverse-header-block">
         <!-- Navbar Panel -->
         <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}">

From 674a240c9e39f32182350ee84588dcf0874b3117 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 28 Apr 2020 14:01:56 -0400
Subject: [PATCH 5/6] #6741 redirect to login page from Add Data in header

-if the user is not logged in when pressing button
---
 src/main/webapp/dataverse_header.xhtml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 22abe13eca6..16f3da717cb 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -11,7 +11,6 @@
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
     <o:resourceInclude path="/CustomizationFilesServlet?customFileType=header" rendered="#{!widgetWrapper.widgetView}"/>
     <o:importFunctions type="edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers" />
-    <ui:param name="authUserSession" value ="#{dataverseSession.user.authenticated}"/>
     <ui:param name="showAddDataverseLink" value="#{permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('CreateDataverseCommand') }"/>
     <ui:param name="showAddDatasetLink" value="#{permissionServiceBean.userOn(AuthenticatedUsers:get(),dataverseServiceBean.findRootDataverse()).canIssueCommand('AbstractCreateDatasetCommand') }"/>
     <ui:param name="showAddDataGroup" value="#{showAddDataverseLink or showAddDatasetLink}"/>
@@ -37,18 +36,15 @@
                 </div>
                 <div class="collapse navbar-collapse" id="topNavBar">
                     <ul class="nav navbar-nav navbar-right">
-                        <li jsf:rendered="#{showAddDataGroup and !authUserSession}">
-                            <a href="#" onClick="PF('addData_popup').show()">#{bundle['dataverse.results.btn.addData']} </a>
-                        </li> 
-                        <li class="dropdown" jsf:rendered="#{showAddDataGroup and authUserSession}">
+                        <li class="dropdown" jsf:rendered="#{showAddDataGroup}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
                             <ul class="dropdown-menu">
-                                <li jsf:rendered="#{showAddDataverseLink and authUserSession}">
+                                <li jsf:rendered="#{showAddDataverseLink}">
                                     <h:outputLink value="/dataverse.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
                                         <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
                                     </h:outputLink>
                                 </li>
-                                <li jsf:rendered="#{showAddDatasetLink and authUserSession}">
+                                <li jsf:rendered="#{showAddDatasetLink}">
                                     <h:outputLink value="/dataset.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
                                         <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
                                     </h:outputLink>

From ff4806046ba0c27d6e0f6ab56349937ffc630221 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 28 Apr 2020 15:27:37 -0400
Subject: [PATCH 6/6] #6741 move popup include back to search inc frag

---
 src/main/webapp/dataverse_template.xhtml      | 1 -
 src/main/webapp/search-include-fragment.xhtml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index 42aac1f5da5..09e13119d21 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -79,7 +79,6 @@
             </f:facet>
         </p:ajaxStatus>
         <ui:include src="contactFormFragment.xhtml"></ui:include>
-        <ui:include src="addDataFormFragment.xhtml"></ui:include>
         <script defer="defer" src="#{resource['bs/js/bootstrap.min.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['js/ie-compat.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['js/dv_rebind_bootstrap_ui.js']}?version=#{systemConfig.getVersion()}"></script>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 890b88c3804..45ae157a8fc 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -657,5 +657,6 @@
                          actionListener="#{SearchIncludeFragment.setDisplayCardValues()}" />
     </h:form>
 
+    <ui:include src="addDataFormFragment.xhtml"></ui:include>
 
 </ui:composition>