Merge branch 'master' into fix/css-refactor-4

src/CoreMetadata/CoreMetadataHeader.jsx

@@ -44,6 +44,8 @@ class CoreMetadataHeader extends Component {
   dateTransform = date => `Updated on ${date.substr(0, 10)}`;
 
   render() {
+
+  if (this.props.metadata) {
     // display the download button if the user can download this file
     const { user, projectAvail } = this.props;
     const projectId = this.props.metadata.project_id;
@@ -74,13 +76,30 @@ class CoreMetadataHeader extends Component {
       </div>
     );
   }
+
+  // if there is no core metadata to display
+  else {
+    return (
+      <p className="body-typo">
+        Error: {this.props.error}
+      </p>
+    );
+  }
+
+  }
 }
 
 CoreMetadataHeader.propTypes = {
-  metadata: PropTypes.object.isRequired,
+  metadata: PropTypes.object,
+  error: PropTypes.string,
   onDownloadFile: PropTypes.func.isRequired,
   user: PropTypes.object.isRequired,
   projectAvail: PropTypes.object.isRequired,
 };
 
+CoreMetadataHeader.defaultProps = {
+  metadata: null,
+  error: null,
+};
+
 export default CoreMetadataHeader;

src/CoreMetadata/CoreMetadataTable.jsx

@@ -22,13 +22,15 @@ function fieldInTable(fieldName) {
 }
 
 class CoreMetadataTable extends Component {
-  dataTransform = metadata => Object.keys(metadata)
-    .sort() // alphabetical order
-    .filter(key => fieldInTable(key))
-    .map(key => [
-      <TitleCell>{firstCharToUppercase(key)}</TitleCell>,
-      metadata[key],
-    ]);
+  dataTransform = metadata => metadata ?
+    Object.keys(metadata)
+      .sort() // alphabetical order
+      .filter(key => fieldInTable(key))
+      .map(key => [
+        <TitleCell>{firstCharToUppercase(key)}</TitleCell>,
+        metadata[key],
+      ])
+    : [];
 
   render() {
     return (
@@ -42,7 +44,11 @@ class CoreMetadataTable extends Component {
 }
 
 CoreMetadataTable.propTypes = {
-  metadata: PropTypes.object.isRequired,
+  metadata: PropTypes.object,
+};
+
+CoreMetadataTable.defaultProps = {
+  metadata: null,
 };
 
 export default CoreMetadataTable;

src/CoreMetadata/reduxer.js

@@ -22,7 +22,7 @@ export const fetchCoreMetadata = objectId =>
         default:
           return {
             type: 'CORE_METADATA_ERROR',
-            error: data.error,
+            error: data,
           };
         }
       })
@@ -58,6 +58,7 @@ const downloadFile = id => (dispatch) => {
 export const ReduxCoreMetadataHeader = (() => {
   const mapStateToProps = state => ({
     metadata: state.coreMetadata.metadata,
+    error: state.coreMetadata.error,
     user: state.user,
     projectAvail: state.submission.projectAvail,
   });
@@ -71,7 +72,7 @@ export const ReduxCoreMetadataHeader = (() => {
 
 export const ReduxFileTypePicture = (() => {
   const mapStateToProps = state => ({
-    data_format: state.coreMetadata.metadata.data_format,
+    metadata: state.coreMetadata.metadata,
   });
 
   const mapDispatchToProps = dispatch => ({

src/components/FileTypePicture.jsx

@@ -25,7 +25,8 @@ function dataFormatToFileType(dictIcons, dataFormat) {
 
 class FileTypePicture extends Component {
   render() {
-    const fileType = dataFormatToFileType(this.props.dictIcons, this.props.data_format);
+    const dataFormat = this.props.metadata ? this.props.metadata.data_format : 'file'
+    const fileType = dataFormatToFileType(this.props.dictIcons, dataFormat);
     if (!fileType) return null;
     const content = (
       <WhiteContainer>
@@ -43,8 +44,12 @@ class FileTypePicture extends Component {
 }
 
 FileTypePicture.propTypes = {
-  data_format: PropTypes.string.isRequired,
+  metadata: PropTypes.object,
   dictIcons: PropTypes.object.isRequired,
 };
 
+FileTypePicture.defaultProps = {
+  metadata: null,
+};
+
 export default FileTypePicture;