Merge pull request #343 from jonathanp/fix-empty-object-error-msg

sophiebits · sophiebits · commit 2b72f2b53db2 · 2016-03-11T10:16:13.000-08:00
Differentiate between empty arrays and an empty objects in `DataView`
diff --git a/frontend/DataView/DataView.js b/frontend/DataView/DataView.js
@@ -41,7 +41,11 @@ class DataView extends React.Component {
     }
     var path = this.props.path;
     if (!names.length) {
-      return <span style={styles.empty}>Empty object</span>;
+      return (
+        <span style={styles.empty}>
+          {Array.isArray(data) ? 'Empty array' : 'Empty object'}
+        </span>
+      );
     }
 
     return (

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,11 @@ class DataView extends React.Component {`
`41`	`41`	`}`
`42`	`42`	`var path = this.props.path;`
`43`	`43`	`if (!names.length) {`
`44`		`- return <span style={styles.empty}>Empty object</span>;`
	`44`	`+ return (`
	`45`	`+ <span style={styles.empty}>`
	`46`	`+ {Array.isArray(data) ? 'Empty array' : 'Empty object'}`
	`47`	`+ </span>`
	`48`	`+ );`
`45`	`49`	`}`
`46`	`50`
`47`	`51`	`return (`