7469 request access feedback

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

@@ -4909,7 +4909,10 @@ public boolean isFileAccessRequestMultiButtonRequired(){
            // return false;
         }
         for (FileMetadata fmd : workingVersion.getFileMetadatas()){
-            if (!this.fileDownloadHelper.canDownloadFile(fmd)){
+            //Change here so that if all restricted files have pending requests there's no Request Button
+            if ((!this.fileDownloadHelper.canDownloadFile(fmd) && (fmd.getDataFile().getFileAccessRequesters() == null 
+                    || ( fmd.getDataFile().getFileAccessRequesters() != null
+                 &&   !fmd.getDataFile().getFileAccessRequesters().contains((AuthenticatedUser)session.getUser()))))){
                 return true;
             }
         }

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

@@ -11,14 +11,14 @@
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+import edu.harvard.iq.dataverse.util.JsfHelper;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -322,7 +322,6 @@ public void requestAccessIndirect() {
 
 
      private boolean processRequestAccess(DataFile file, Boolean sendNotification) {
-
          if (fileDownloadService.requestAccess(file.getId())) {
              // update the local file object so that the page properly updates
              if(file.getFileAccessRequesters() == null){
@@ -332,9 +331,11 @@ private boolean processRequestAccess(DataFile file, Boolean sendNotification) {
              // create notification if necessary
              if (sendNotification) {
                  fileDownloadService.sendRequestFileAccessNotification(file, (AuthenticatedUser) session.getUser());
-             }
+             }           
+             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.accessRequested.success"));
              return true;
          }
+         JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("file.accessRequested.alreadyRequested", Arrays.asList(file.getDisplayName())));
          return false;
      } 
 

src/main/java/propertyFiles/Bundle.properties

@@ -1722,6 +1722,8 @@ file.requestAccess=Request Access
 file.requestAccess.dialog.msg=You need to <a href="/loginpage.xhtml{0}" target="{2}" title="Log into your Dataverse Account">Log In</a> to request access.
 file.requestAccess.dialog.msg.signup=You need to <a href="{1}" target="{2}" title="Sign Up for a Dataverse Account">Sign Up</a> or <a href="/loginpage.xhtml{0}" target="{2}" title="Log into your Dataverse Account">Log In</a> to request access.
 file.accessRequested=Access Requested
+file.accessRequested.success=Your request for access has been submitted. You will receive an email message and notification in the app when access is granted or rejected.
+file.accessRequested.alreadyRequested=Access already available or requested for file: {0}
 file.ingestInProgress=Ingest in progress...
 file.dataFilesTab.metadata.header=Metadata
 file.dataFilesTab.metadata.addBtn=Add + Edit Metadata

src/main/webapp/file-download-button-fragment.xhtml

@@ -28,7 +28,7 @@
                        rendered="#{fileDownloadHelper.session.user.authenticated}">
             <p:commandLink styleClass="btn-request #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'italic'  : ''}"
                         actionListener="#{fileDownloadHelper.handleCommandLinkClick(fileMetadata)}"
-                        update="@([id$=requestAccessConsolidated]), @([id$=requestPanel])"
+                        update="@([id$=requestAccessConsolidated]), @([id$=requestPanel]),  @([id$=filesTable]), @([id$=messagePanel])"
                         id="requestAccessConsolidated"
                         disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
                 #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}

src/main/webapp/file-request-access-popup-fragment.xhtml

@@ -44,7 +44,7 @@
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" 
                            action="#{fileDownloadHelper.requestAccessIndirect()}"    
-                           update="@([id$=requestAccessConsolidated]), @([id$=requestPanel])" oncomplete="PF('requestAccessPopup').hide();">
+                           update="@([id$=requestAccessConsolidated]), @([id$=requestPanel]), @([id$=messagePanel]) @([id$=filesTable])" oncomplete="PF('requestAccessPopup').hide();">
             </p:commandButton>
             <button class="btn btn-link" onclick="PF('requestAccessPopup').hide();PF('blockDatasetForm').hide();" type="button">
                 #{bundle.cancel}

src/main/webapp/filesFragment.xhtml

@@ -448,7 +448,7 @@
                 <p:commandLink rendered="#{DatasetPage.fileAccessRequestMultiButtonRequired}"
                                styleClass="btn btn-default btn-request"                                   
                                action="#{DatasetPage.requestAccessMultipleFiles()}"
-                               update="@form" oncomplete="bind_bsui_components();"
+                               update="@form, @([id$=messagePanel])" oncomplete="bind_bsui_components();"
                                disabled="#{DatasetPage.locked}">
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
                 </p:commandLink>
@@ -476,12 +476,18 @@
                        data-content="#{DatasetPage.ingestMessage} #{fileMetadata.dataFile.ingestReportMessage}"/>
                 </span>
             </div>
+            <div class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
+                <!-- Access Requested -->
+                <span class="glyphicon glyphicon-info-sign"/>
+                <span> #{bundle['file.accessRequested']}&#160;</span>
+            </div>
+
             <!-- END: FILE LEVEL MSGs -->
 
             <div class="btn-group" role="group" aria-label="#{bundle['file.actionsBlock']}" jsf:rendered="#{showAccessFileButtonGroup}">
                 <!-- Access File - Download, Explore, Compute -->
                 <div class="btn-group" jsf:rendered="#{showAccessFileButtonGroup}">
-
+                    
                     <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
                                                     fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
                     <ui:fragment rendered="#{DatasetPage.isShowPreviewButton(fileMetadata.dataFile.id) and fileDownloadHelper.canDownloadFile(fileMetadata)}">