fix(download) (#337)

* fix(download) * fix(link): Link -> a outside react * fix(router): Regex match files * style(eslint fix)
uc-cdis · Aug 9, 2018 · e071ecf · e071ecf
1 parent de46a00
commit e071ecf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 39 deletions.
diff --git a/src/CoreMetadata/CoreMetadataHeader.jsx b/src/CoreMetadata/CoreMetadataHeader.jsx
@@ -45,19 +45,20 @@ class CoreMetadataHeader extends Component {
 
   render() {
     if (this.props.metadata) {
-    // display the download button if the user can download this file
+      // display the download button if the user can download this file
       const { user, projectAvail } = this.props;
       const projectId = this.props.metadata.project_id;
       const canDownload = canUserDownload(user, projectAvail, projectId);
       let downloadButton = null;
       if (canDownload) {
+        const downloadLink = `/user/data/download/${this.props.metadata.object_id}?expires_in=10&redirect`;
+
         downloadButton = (
-          <button
-            onClick={this.props.onDownloadFile}
-            className='button-primary-orange'
-          >
-            {DOWNLOAD_BTN_CAPTION}
-          </button>);
+          <a href={downloadLink}>
+            <button className='button-primary-orange'>
+              {DOWNLOAD_BTN_CAPTION}
+            </button>
+          </a>);
       }
 
       const properties = `${this.props.metadata.data_format} | ${fileSizeTransform(this.props.metadata.file_size)} | ${this.props.metadata.object_id} | ${this.dateTransform(this.props.metadata.updated_datetime)}`;
@@ -89,7 +90,6 @@ class CoreMetadataHeader extends Component {
 CoreMetadataHeader.propTypes = {
   metadata: PropTypes.object,
   error: PropTypes.string,
-  onDownloadFile: PropTypes.func.isRequired,
   user: PropTypes.object.isRequired,
   projectAvail: PropTypes.object.isRequired,
 };

diff --git a/src/CoreMetadata/reduxer.js b/src/CoreMetadata/reduxer.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import CoreMetadataHeader from './CoreMetadataHeader';
 import FileTypePicture from '../components/FileTypePicture';
 import CoreMetadataTable from './CoreMetadataTable';
-import { coreMetadataPath, userapiPath } from '../localconf';
+import { coreMetadataPath } from '../localconf';
 import { fetchWithCreds } from '../actions';
 
 export const fetchCoreMetadata = objectId =>
@@ -28,33 +28,6 @@ export const fetchCoreMetadata = objectId =>
       })
       .then(msg => dispatch(msg));
 
-const downloadFile = id => (dispatch) => {
-  const path = `${userapiPath}data/download/${id}?expires_in=10&redirect`;
-  const method = 'GET';
-  return fetchWithCreds({
-    path,
-    method,
-  })
-    .then(({ status, data }) => {
-      switch (status) {
-      case 200:
-        return {
-          type: 'DOWNLOAD_FILE',
-          file: data,
-        };
-      default:
-        return {
-          type: 'DOWNLOAD_FILE_ERROR',
-          error: data.error,
-        };
-      }
-    })
-    .then((msg) => {
-      dispatch(msg);
-      window.location.href = path; // redirect to download
-    });
-};
-
 export const ReduxCoreMetadataHeader = (() => {
   const mapStateToProps = state => ({
     metadata: state.coreMetadata.metadata,
@@ -64,7 +37,6 @@ export const ReduxCoreMetadataHeader = (() => {
   });
 
   const mapDispatchToProps = dispatch => ({
-    onDownloadFile: id => dispatch(downloadFile(id)),
   });
 
   return connect(mapStateToProps, mapDispatchToProps)(CoreMetadataHeader);

diff --git a/src/index.jsx b/src/index.jsx
@@ -166,11 +166,11 @@ async function init() {
                     />
                     <Route
                       exact
-                      path='/files/:object_id'
+                      path='/files/*'
                       component={
                         props => (<ProtectedContent
                           filter={() =>
-                            store.dispatch(fetchCoreMetadata(props.match.params.object_id))
+                            store.dispatch(fetchCoreMetadata(props.match.params[0]))
                           }
                           component={CoreMetadataPage}
                           {...props}