From 8dffc46bbdc9e8782efcdb82c8c974411ca39385 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 13 Jul 2018 10:44:30 -0400
Subject: [PATCH] #4610 Dual Mode Fix Renders and add Rsync capability

---
 .../iq/dataverse/EditDatafilesPage.java       | 107 +++++++++++++-
 .../harvard/iq/dataverse/SettingsWrapper.java |  14 ++
 src/main/webapp/dataset.xhtml                 |  15 +-
 src/main/webapp/editFilesFragment.xhtml       | 133 +++++++++++++-----
 src/main/webapp/editdatafiles.xhtml           |  54 +++----
 src/main/webapp/filesFragment.xhtml           |   6 +-
 6 files changed, 257 insertions(+), 72 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
index 39811a95526..9bc2d4b11d6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -9,10 +9,13 @@
 import edu.harvard.iq.dataverse.datasetutility.FileReplaceException;
 import edu.harvard.iq.dataverse.datasetutility.FileReplacePageHelper;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleUtil;
+import edu.harvard.iq.dataverse.datacapturemodule.ScriptRequestResponse;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataFileCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.RequestRsyncScriptCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetThumbnailCommand;
 import edu.harvard.iq.dataverse.ingest.IngestRequest;
@@ -65,6 +68,8 @@
 import java.util.logging.Level;
 import javax.faces.event.AjaxBehaviorEvent;
 import javax.faces.event.FacesEvent;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.primefaces.context.RequestContext;
 
@@ -114,7 +119,8 @@ public enum FileEditMode {
     @Inject PermissionsWrapper permissionsWrapper;
     @Inject FileDownloadHelper fileDownloadHelper;
     @Inject ProvPopupFragmentBean provPopupFragmentBean;
-
+    @Inject
+    SettingsWrapper settingsWrapper;
     private final DateFormat displayDateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM);
 
     private Dataset dataset = new Dataset();
@@ -531,7 +537,7 @@ public String init() {
             logger.fine("The page is called with " + selectedFileIdsList.size() + " file ids.");
 
             populateFileMetadatas();
-
+            setUpRsync();
             // and if no filemetadatas can be found for the specified file ids 
             // and version id - same deal, send them to the "not found" page. 
             // (at least for now; ideally, we probably want to show them a page 
@@ -832,7 +838,10 @@ private String getBundleString(String msgName){
        return ResourceBundle.getBundle("Bundle").getString(msgName);
     }
     
-    
+    public void deleteFilesCompleted(){
+        
+    }
+        
     public void deleteFiles() {
         logger.info("entering bulk file delete (EditDataFilesPage)");
         if (isFileReplaceOperation()){
@@ -986,18 +995,23 @@ public void deleteFiles() {
                     if (markedForDelete.getDataFile().getStorageIdentifier().equals(dfn.getStorageIdentifier())) {
                         nfIt.remove();
                     }
-                }                
+                }
                 
             }
         }
 
      
         if (fileNames != null) {
+            if(newFiles.isEmpty()){
+                fileMetadatas = new ArrayList<>();
+            }
             String successMessage = getBundleString("file.deleted.success");
             logger.fine(successMessage);
             successMessage = successMessage.replace("{0}", fileNames);
             JsfHelper.addFlashMessage(successMessage);
+
         }
+        
     }
 
     public String saveWithTermsOfUse() {
@@ -1672,12 +1686,95 @@ public void uploadStarted() {
         // uploadStarted() is triggered by PrimeFaces <p:upload onStart=... when an upload is 
         // started. It will be called *once*, even if it is a multiple file upload 
         // (either through drag-and-drop or select menu). 
-       
         logger.fine("upload started");
         
         uploadInProgress = true;        
     }
     
+    
+    private Boolean hasRsyncScript = false;
+    public Boolean isHasRsyncScript() {
+        return hasRsyncScript;
+    }
+
+    public void setHasRsyncScript(Boolean hasRsyncScript) {
+        this.hasRsyncScript = hasRsyncScript;
+    }
+    
+    private  void setUpRsync() {
+        if (DataCaptureModuleUtil.rsyncSupportEnabled(settingsWrapper.getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
+            try {
+                ScriptRequestResponse scriptRequestResponse = commandEngine.submit(new RequestRsyncScriptCommand(dvRequestService.getDataverseRequest(), dataset));
+                logger.fine("script: " + scriptRequestResponse.getScript());
+                if (scriptRequestResponse.getScript() != null && !scriptRequestResponse.getScript().isEmpty()) {
+                    setRsyncScript(scriptRequestResponse.getScript());
+                    rsyncScriptFilename = "upload-" + workingVersion.getDataset().getIdentifier() + ".bash";
+                    setHasRsyncScript(true);
+                } else {
+                    setHasRsyncScript(false);
+                }
+            } catch (RuntimeException ex) {
+                logger.warning("Problem getting rsync script: " + ex.getLocalizedMessage());
+            } catch (CommandException cex) {
+                logger.warning("Problem getting rsync script (Command Exception): " + cex.getLocalizedMessage());
+            }
+        }
+    }
+    
+    public void downloadRsyncScript() {
+
+        String bibFormatDowload = new BibtexCitation(workingVersion).toString();
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
+        response.setContentType("application/download");
+
+        String contentDispositionString;
+
+        contentDispositionString = "attachment;filename=" + rsyncScriptFilename;
+        response.setHeader("Content-Disposition", contentDispositionString);
+
+        try {
+            ServletOutputStream out = response.getOutputStream();
+            out.write(getRsyncScript().getBytes());
+            out.flush();
+            ctx.responseComplete();
+        } catch (IOException e) {
+            String error = "Problem getting bytes from rsync script: " + e;
+            logger.warning(error);
+            return; 
+        }
+        
+        // If the script has been successfully downloaded, lock the dataset:
+        String lockInfoMessage = "script downloaded";
+        DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.DcmUpload, session.getUser() != null ? ((AuthenticatedUser)session.getUser()).getId() : null, lockInfoMessage);
+        if (lock != null) {
+            dataset.addLock(lock);
+        } else {
+            logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
+        }
+        
+    }
+    
+        /**
+     * The contents of the script.
+     */
+    private String rsyncScript = "";
+
+    public String getRsyncScript() {
+        return rsyncScript;
+    }
+
+    public void setRsyncScript(String rsyncScript) {
+        this.rsyncScript = rsyncScript;
+    }
+
+    private String rsyncScriptFilename;
+
+    public String getRsyncScriptFilename() {
+        return rsyncScriptFilename;
+    }
+
+    
     public void uploadFinished() {
         // This method is triggered from the page, by the <p:upload ... onComplete=...
         // attribute. 
diff --git a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
index 8469fb7126e..7ea5585098f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
@@ -162,6 +162,20 @@ public String getSupportTeamName() {
     public boolean isRootDataverseThemeDisabled() {
         return isTrueForKey(Key.DisableRootDataverseTheme, false);
     }
+    
+    public String getDropBoxKey() {
+
+        String configuredDropBoxKey = System.getProperty("dataverse.dropbox.key");
+        if (configuredDropBoxKey != null) {
+            return configuredDropBoxKey;
+        }
+        return "";
+    }
+    
+    public Boolean isHasDropBoxKey() {
+
+        return !getDropBoxKey().isEmpty();
+    }
 
 }
 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 21728abc10c..c101ab6fcec 100755
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -198,13 +198,13 @@
                                         <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu pull-right text-left" role="menu">
-                                        <ui:fragment rendered="#{!settingsWrapper.rsyncUpload}">
+                                        <!-- show upload files button to support dual mode -->
                                         <li>                                           
                                             <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD">
                                                 <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
                                             </h:outputLink>
                                         </li>
-                                        </ui:fragment>
+                                        
                                         <li>
                                             <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:post_edit_metadata()">
                                                 <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
@@ -560,8 +560,10 @@
                             </script>
                         </p:fragment>
 
-                        <ui:fragment id="uploadFilesOnCreateTab" rendered="#{!DatasetPage.workingVersion.deaccessioned and
+                        <ui:fragment id="uploadFilesOnCreateTab" rendered="#{!DatasetPage.workingVersion.deaccessioned and                          
                                                                              (DatasetPage.editMode == 'CREATE')}">
+                            <ui:remove>
+                                 <!-- Removing this because it is now included in editFilesFragment with render logic therein -->
                             <div jsf:rendered="#{settingsWrapper.rsyncUpload}" data-widget="content" class="ui-tabs ui-widget ui-widget-content ui-corner-all ui-hidden-container ui-tabs-top" id="datasetForm:tabView">
                                 <!-- Create-Upload Disabled // Static Tab Layout -->
                                 <ul role="tablist" class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
@@ -576,15 +578,16 @@
                                 </div>
                                 <!-- END: Create-Upload Disabled // Static Tab Layout -->
                             </div>
-                            
-                            <ui:fragment rendered="#{!settingsWrapper.rsyncUpload}">
+                            </ui:remove>
+
                                 <ui:include src="editFilesFragment.xhtml">
                                     <ui:param name="datasetPage" value="true"/>
                                     <ui:param name="dataverse" value="#{DatasetPage.dataset.owner}"/>
                                     <ui:param name="dataset" value="#{DatasetPage.dataset}"/>
                                     <ui:param name="version" value="#{DatasetPage.workingVersion}"/>
+                                    <ui:param name="createDataset" value="true"/>
                                 </ui:include>
-                            </ui:fragment>
+
                         </ui:fragment>
 
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{DatasetPage.selectedTabIndex}"
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 8276e524f11..0689335eedd 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -111,7 +111,8 @@
                         }
                         function uploadFinished(fileupload) {
                             if (fileupload.files.length === 0) {
-                                $('button[id$="AllUploadsFinished"]').trigger('click');
+                              //  $('button[id$="AllUploadsFinished"]').trigger('click');
+                                $('button[id$="updateEditDataFilesButtonsForUpload"]').trigger('click');
                                 //stop observer when we're done
                                 if(observer !=null) {
                                   observer.disconnect();
@@ -212,9 +213,9 @@
                                   disabled="#{!(datasetPage || EditDatafilesPage.showFileUploadComponent())}"
                                   fileUploadListener="#{EditDatafilesPage.handleFileUpload}" 
                                   process="filesTable" 
-                                  update=""
+                                  update="@form, :datasetForm, @([id$=filesButtons])"
                                   label="#{bundle['file.selectToAddBtn']}"
-                                  oncomplete="javascript:dataset_fileupload_rebind();uploadFinished(PF('fileUploadWidget'));"
+                                  oncomplete="javascript:dataset_fileupload_rebind();uploadFinished(PF('fileUploadWidget'));uploadFinished();"
                                   onstart="javascript:uploadWidgetDropRemoveMsg();uploadStarted();"
                                   onerror="javascript:uploadFailure();"
                                   sizeLimit="#{EditDatafilesPage.getMaxFileUploadSizeInBytes()}"
@@ -227,10 +228,9 @@
                         </div>
                     </div>
                     
-                    
+                    <ui:fragment rendered="#{settingsWrapper.isHasDropBoxKey()}">
                     <div class="panel panel-default">
                         
-                        <!-- TODO: Need proper Dropbox render logic -->
                         <!-- TODO: New help text needed for these panels, replace placeholder text here and add final msg text to bundle -->
                         
                         <div class="panel-heading" role="tab" id="headingTwo">
@@ -261,39 +261,104 @@
                             </div>
                         </div>
                     </div>
+                    </ui:fragment>
                     
-                    
-                    <div jsf:id="rsyncPanel" class="panel panel-default">
-                        
-                        <!-- TODO: Need proper rsync render logic -->
-                        <!-- TODO: New help text needed for these panels, replace placeholder text here and add final msg text to bundle -->
-                        
-                        <div class="panel-heading" role="tab" id="headingThree">
-                          <h4 class="panel-title">
-                            <a class="collapsed" role="button" data-toggle="collapse" data-parent="#fileUploadFragment" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
-                              Upload with rsync+ssh via Data Capture Module (DCM)
-                            </a>
-                          </h4>
-                        </div>
-                        <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
-                          <div class="panel-body">
-                            <p jsf:rendered="#{empty EditDatafilesPage.fileMetadatas}" class="help-block">
-                                Help message proving value and info about rsync to the user.
+                    <ui:fragment rendered="#{settingsWrapper.rsyncUpload}"> 
+                        <div jsf:id="rsyncPanel" class="panel panel-default">
+                                <div class="panel-heading" role="tab" id="headingThree">
+                                    <h4 class="panel-title">
+                                        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#fileUploadFragment" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+                                            Upload with rsync+ssh via Data Capture Module (DCM)
+                                        </a>
+                                    </h4>
+                                </div>
+                            <ui:fragment rendered="#{!createDataset}"> 
+                                <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
+                                    <div class="panel-body">
+                                        <p jsf:rendered="#{empty EditDatafilesPage.fileMetadatas}" class="help-block">
+                                            Help message proving value and info about rsync to the user.
+                                        </p>
+                                        <p jsf:rendered="#{!empty EditDatafilesPage.fileMetadatas}" class="help-block">
+                                            <span class="text-danger">Warning message about how this option is not available because of uploaded files to this dataset.</span>
+                                        </p>
+                                    </div>
+                                </div>
+                                                        <!-- RSYNC UPLOAD POPUP -->
+                       
+                        <ui:fragment rendered="#{!empty EditDatafilesPage.fileMetadatas}">
+                            <p class="help-block">
+                                <span class="glyphicon glyphicon-warning-sign text-danger"></span>
+                                <h:outputText class="text-danger" value=" #{bundle['file.rsyncUpload.filesExist']}" escape="false"/>
                             </p>
-                            <p jsf:rendered="#{!empty EditDatafilesPage.fileMetadatas}" class="help-block">
-                                <span class="text-danger">Warning message about how this option is not available because of uploaded files to this dataset.</span>
+                        </ui:fragment>
+                            <ui:fragment rendered="#{!EditDatafilesPage.isHasRsyncScript() and empty EditDatafilesPage.fileMetadatas}">
+                            <p class="help-block">
+                                <span class="glyphicon glyphicon-warning-sign text-danger"></span>
+                                <h:outputText class="text-danger" value=" #{bundle['file.rsyncUpload.noScriptAvailable']}" escape="false"/>
                             </p>
-                          </div>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{EditDatafilesPage.isHasRsyncScript() and empty EditDatafilesPage.fileMetadatas}">
+                            <p class="help-block">
+                                <span class="glyphicon glyphicon-info-sign"></span>
+                                <h:outputFormat value=" #{bundle['file.rsyncUpload.info']}" escape="false">
+                                    <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                    <f:param value="#{systemConfig.guidesVersion}"/>
+                                </h:outputFormat>
+                            </p>
+                            <ol>
+                                <li>
+                                    <h:outputText value="#{bundle['file.rsyncUpload.step1']}" escape="false"/>
+                                </li>
+                                <li>
+                                    <h:outputText value="#{bundle['file.rsyncUpload.step2']} &#158; " escape="false"/>
+                                    <h:commandLink id="rsyncDL" actionListener="#{EditDatafilesPage.downloadRsyncScript()}" styleClass="btn btn-default btn-xs">
+                                        <span class="glyphicon glyphicon-download-alt"/> <h:outputText value=" #{bundle['file.rsyncUpload.step2.downloadScriptButton']}"/>
+                                    </h:commandLink>
+                                </li>
+                                <li>
+                                    <h:outputFormat value="#{bundle['file.rsyncUpload.step3']}" escape="false">
+                                        <f:param value="#{EditDatafilesPage.rsyncScriptFilename}"/>
+                                    </h:outputFormat>
+                                </li>
+                                <li>
+                                    <h:outputText value="#{bundle['file.rsyncUpload.step4']}" escape="false"/>
+                                </li>
+                            </ol>
+                        </ui:fragment>
+                        <ui:remove>
+                        <div class="button-block">
+                            <p:commandButton action="#{DatasetPage.finishRsyncScriptAction()}" value="#{bundle.close}" update=":datasetForm,:messagePanel" onclick="PF('rsyncUpload_popup').hide();"/>
                         </div>
-                    </div>                    
+                            </ui:remove>
+                        <!-- END RSYNC UPLOAD POPUP -->
+
+                                
+                            </ui:fragment>
+                            <ui:fragment rendered="#{createDataset}">
+
+                                <div  data-widget="content" class="ui-tabs ui-widget ui-widget-content ui-corner-all ui-hidden-container ui-tabs-top" id="datasetForm:tabView">
+                                    <!-- Create-Upload Disabled // Static Tab Layout -->
+                                    <div class="ui-tabs-panels">
+                                        <div aria-hidden="false" role="tabpanel" class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="datasetForm:tabView:dataFilesTab">
+                                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['file.createUploadDisabled']}</p>                                    
+                                        </div>
+                                    </div>
+                                    <!-- END: Create-Upload Disabled // Static Tab Layout -->
+                                </div>
+                            </ui:fragment> 
+                        </div>  
+
+                    </ui:fragment>
                     
                     
                     <p:message for="fileUpload" id="uploadMessage" display="text" />
                     
                     <p:commandButton id="uploadStarted" action="#{EditDatafilesPage.uploadStarted()}" update="" style="display:none"/>
-                    <p:commandButton id="AllUploadsFinished" action="#{EditDatafilesPage.uploadFinished()}" update="datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:uploadWidgetDropMsg();" style="display:none"/> 
+                    <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="@form,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="datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:dropBoxUploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" style="display:none"/>
-                    
+                    <p:commandButton id="allDeletesFinished" action="#{EditDatafilesPage.deleteFilesCompleted()}" update="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,
@@ -312,7 +377,7 @@
                     <!-- TODO: ADDED filesCounts id to commandButtons above in Line 291-292, is there a better way to do this other than listing out 5-6 elements to update? -->
                 
 
-                <!-- Files Table -->
+                <!-- Files Table -->                       
                 <p:dataTable id="filesTable" 
                              value="#{EditDatafilesPage.fileMetadatas}"
                              rendered="#{!empty EditDatafilesPage.fileMetadatas and (datasetPage or (dataverseSession.user.authenticated and permissionsWrapper.canIssueUpdateDatasetCommand(EditDatafilesPage.dataset)))}"
@@ -536,7 +601,7 @@
         <div class="button-block">
             <p:commandButton value="#{bundle['file.delete']}" onclick="PF('fileTypeDifferentPopup').hide()" 
                              action="#{EditDatafilesPage.deleteFiles()}"
-                             update=":#{p:component('filesTable')},:messagePanel,:#{p:component('fileUpload')},uploadMessage"/>
+                             update="@([id$=filesTable]), @([id$=filesButtons]), :#{p:component('filesTable')},:messagePanel,:#{p:component('fileUpload')},uploadMessage"/>
             <p:commandButton value="#{bundle.continue}" onclick="PF('fileTypeDifferentPopup').hide()" type="button" />
         </div>
     </p:dialog>
@@ -547,8 +612,8 @@
             <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
         </ui:fragment>
         <div class="button-block">
-            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);"
-                             update=":#{p:component('filesTable')},:messagePanel,:#{p:component('fileUpload')},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}" />
+            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();"
+                             update="@([id$=filesTable]),@([id$=filesButtons]),:#{p:component('filesTable')},:messagePanel,:#{p:component('fileUpload')},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}" />
             <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
         </div>
     </p:dialog>
@@ -891,6 +956,10 @@
                 $('button[id$="compareVersions"]').trigger('click');
             }
         }
+        function deleteFinished() {
+            $('button[id$="updateEditDataFilesButtonsForDelete"]').trigger('click');
+            $('button[id$="allDeletesFinished"]').trigger('click');
+        }
         function checkFilesSelected() {
             var count = PF('filesTable').getSelectedRowsCount();
             if (count > 0) {
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index 7911080cdf3..6238ca5a091 100755
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -20,6 +20,7 @@
             <ui:param name="dataverse" value="#{EditDatafilesPage.dataset.owner}"/>
             <ui:param name="dataset" value="#{EditDatafilesPage.dataset}"/>
             <ui:param name="version" value="#{EditDatafilesPage.workingVersion}"/>
+            <ui:param name="fileMetadatas" value="#{EditDatafilesPage.fileMetadatas}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
             <ui:define name="body">
                 <f:metadata>
@@ -44,7 +45,7 @@
                             <label class="col-sm-2 control-label">
                                 <span>#{bundle['file.replace.original']}</span>
                             </label>
-                            <div id="filesTable" class="col-sm-10">
+                            <div id="filesTableDiv" class="col-sm-10">
                                 <div style="" class="pull-left col-file-thumb">
                                     <div class="thumbnail-block text-center">  
                                     <span class="icon-#{dataFileServiceBean.getFileClass(fileToReplace.fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{!EditDatafilesPage.isThumbnailAvailable(fileToReplace.fileMetadata)}"/>
@@ -95,36 +96,37 @@
 
                     <div id="contentTabs">
 
-                        <ui:include src="editFilesFragment.xhtml"/>
-
+                    <ui:include src="editFilesFragment.xhtml">
+                        <ui:param name="createDataset" value="false"/>
+                        <ui:param name="showFileButtonUpdate" value="true"/>
+                        </ui:include>
                     </div>
 
                     <!-- Create/Save Dataset Button Panel -->
-                    <div  class="button-block">
-                        <p:outputPanel id="filesButtons">
-                            files buttons edit datafiles
-                        <div jsf:rendered="#{!empty EditDatafilesPage.fileMetadatas}">
-                            <p:commandButton tabindex="1000" id="save" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockFileForm').show();" />
-                            <p:commandButton tabindex="1000" id="cancel" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
-                            </p:commandButton>
-                            <p:commandButton value="Direct" id="datasetSave"
-                                             style="display:none"
-                                             update=":datasetForm,:messagePanel"
-                                             oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
-                                             action="#{EditDatafilesPage.save}" />
-                        </div>
+                    <p:fragment autoUpdate="true" id="editDataFilesButtons">
+                        <div  class="button-block">
+                            <p:outputPanel id="filesButtons" >
+                                <div jsf:rendered="#{!empty EditDatafilesPage.fileMetadatas}">
+                                    <p:commandButton tabindex="1000" id="save" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockFileForm').show();" />
+                                    <p:commandButton tabindex="1000" id="cancel" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
+                                    </p:commandButton>
+                                    <p:commandButton value="Direct" id="datasetSave"
+                                                     style="display:none"
+                                                     update=":datasetForm,:messagePanel"
+                                                     oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
+                                                     action="#{EditDatafilesPage.save}" />
+                                </div>
+
+                                <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas}">
 
-                        <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas}">
-                            
-                            <!-- TODO: New Done button replaces Save Changes + Cancel btns when the page is empty/no file/nothing to save -->
-                            <!-- TODO: Investigate + fix Delete Files > Done bug? -->
-                            
-                            <p:commandButton tabindex="1000" id="done" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
-                            </p:commandButton>
-                            
+                                    <p:commandButton tabindex="1000" id="doneFilesButton" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
+                                    </p:commandButton>
+
+                                </div>
+                            </p:outputPanel> 
                         </div>
-                       </p:outputPanel> 
-                    </div>
+                    </p:fragment>
+
                     <!-- END: Create/Save Dataset Button Panel -->
 
                 </h:form>
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index b19ba58fd23..5f734eeff4c 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -90,18 +90,17 @@
                     <!-- Files Count -->
                     <h:outputFormat value="#{bundle['file.count']}" styleClass="highlightBold">
                         <f:param value="#{DatasetPage.fileMetadatasSearch.size()}"/>
-                        count
                     </h:outputFormat>
                 </div>
 
                 <div  class="col-xs-10">
                     <p:outputPanel id="filesButtons">
-                        files fragment
                     <!-- 4.2.1: replaced permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset) with DatasetPage.canUpdateDataset() -->
                     <div jsf:id="uploadComputeBlock" class="button-block tab-header pull-right text-right"
                          jsf:rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE')
                                          and (DatasetPage.canUpdateDataset()
                                          or (!(empty DatasetPage.workingVersion.fileMetadatas) and DatasetPage.workingVersion.fileMetadatas.size() > 1))}">
+                        <ui:remove> 
                         <p:commandLink type="button" styleClass="btn btn-default btn-access  #{DatasetPage.workingVersion.fileMetadatas.size() > 0 or DatasetPage.lockedFromEdits ? 'disabled' : ''}" title="#{bundle['file.uploadFiles']}" onclick="PF('rsyncUpload_popup').show()"
                                         rendered="#{DatasetPage.sessionUserAuthenticated 
                                                     and DatasetPage.canUpdateDataset()
@@ -109,11 +108,12 @@
                             <!-- RSYNC UPLOAD FILES BUTTON -->
                             <span class="glyphicon glyphicon-plus"/> <h:outputText value="#{bundle['file.uploadFiles']}"/>
                         </p:commandLink>
+                            </ui:remove>
                         <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD"
                                       type="button" styleClass="btn btn-default btn-access #{DatasetPage.lockedFromEdits ? 'ui-state-disabled' : ''}"
                                       disabled="#{DatasetPage.lockedFromEdits}" rendered="#{DatasetPage.sessionUserAuthenticated 
                                                                                     and DatasetPage.canUpdateDataset()
-                                                                                    and !widgetWrapper.widgetView and !settingsWrapper.rsyncUpload}">
+                                                                                    and !widgetWrapper.widgetView }">
                             <!-- UPLOAD FILES BUTTON -->
                             <span class="glyphicon #{DatasetPage.lockedFromEdits ? 'glyphicon-ban-circle' : 'glyphicon-plus'}"/> <h:outputText id="uploadFile-s-Link" value="#{bundle['file.uploadFiles']}"/>
                         </h:outputLink>