ENCD-5768-download-btn-appearing-unneededly

Author: zoldello

src/encoded/static/components/filegallery.js

@@ -56,6 +56,9 @@ const inclusionStatuses = [
     'replaced',
 ];
 
+/** Get data set */
+const getDataFiles = (items) => _((items && items.length > 0) ? items : []).uniq((file) => file['@id']);
+
 /**
  * Compile the usable experiment analysis objects into a form for rendering a dropdown of pipeline
  * labs. Export for Jest test.
@@ -257,7 +260,7 @@ export class FileTable extends React.Component {
 
         const nonAnalysisObjectPrefix = 'Other';
 
-        let datasetFiles = _((items && items.length > 0) ? items : []).uniq((file) => file['@id']);
+        let datasetFiles = getDataFiles(items);
         if (datasetFiles.length > 0) {
             const unfilteredCount = datasetFiles.length;
 
@@ -1433,8 +1436,8 @@ class FilterControls extends React.Component {
     }
 
     render() {
-        const { filterOptions, selectedFilterValue, browsers, currentBrowser, browserChangeHandler, visualizeHandler, context, inclusionOn } = this.props;
-        const contextFiles = (context.files || []).filter((file) => (inclusionOn ? file : inclusionStatuses.indexOf(file.status) === -1));
+        const { filterOptions, selectedFilterValue, browsers, currentBrowser, browserChangeHandler, visualizeHandler, items } = this.props;
+        const datasetFiles = getDataFiles(items);
 
         const visualizerControls = (filterOptions.length > 0 || browsers.length > 0) ?
             (
@@ -1445,7 +1448,7 @@ class FilterControls extends React.Component {
                         </div>
                     : null}
                     <VisualizationControls browsers={browsers} currentBrowser={currentBrowser} browserChangeHandler={browserChangeHandler} visualizeHandler={visualizeHandler} visualizeDisabled={!(browsers.length > 0)} />
-                    {contextFiles.length > 0 ?
+                    {datasetFiles.length > 0 ?
                         <div className="file-gallery-controls__divider">
                             |
                         </div> :
@@ -1455,7 +1458,7 @@ class FilterControls extends React.Component {
             )
         : null;
 
-        const downloadBtn = contextFiles.length > 0 ?
+        const downloadBtn = datasetFiles.length > 0 ?
             <div className="file-gallery-controls__download">
                 <button className="btn btn-info" type="button" onClick={() => this.setDownloadModalVisibility(true)}>Download All</button>
                 {
@@ -1499,6 +1502,8 @@ FilterControls.propTypes = {
     visualizeHandler: PropTypes.func.isRequired,
     /** include-deprecated check box checked status */
     inclusionOn: PropTypes.bool,
+    /** Array of files to appear in the table */
+    items: PropTypes.array,
 };
 
 FilterControls.defaultProps = {
@@ -1507,6 +1512,7 @@ FilterControls.defaultProps = {
     currentBrowser: '',
     filters: [],
     inclusionOn: false,
+    items: [],
 };
 
 FilterControls.contextTypes = {
@@ -3362,6 +3368,7 @@ class FileGalleryRendererComponent extends React.Component {
                 browserChangeHandler={this.handleBrowserChange}
                 visualizeHandler={this.handleVisualize}
                 context={context}
+                items={includedFiles}
             />
         );