Merge branch 'fix-key-value-health-bar' into develop

the-deep · Jan 30, 2019 · 088224f · 088224f
2 parents 2676d82 + fd57fd0
commit 088224f
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/src/components/leftpanel/TabularPreview/TabularSheetPreview/Field/index.js b/src/components/leftpanel/TabularPreview/TabularSheetPreview/Field/index.js
@@ -32,7 +32,9 @@ const healthColorScheme = [
     '#f44336',
     '#dddddd',
 ];
-const identity = x => x;
+
+const valueSelector = x => x.value;
+const keySelector = x => x.key;
 
 export default class Field extends React.PureComponent {
     static propTypes = propTypes;
@@ -44,7 +46,21 @@ export default class Field extends React.PureComponent {
         const invalidCount = data.filter(x => x.invalid).length;
         const emptyCount = data.filter(x => x.empty).length;
         const totalCount = data.length;
-        return [totalCount - emptyCount - invalidCount, invalidCount, emptyCount];
+
+        return [
+            {
+                key: 'valid',
+                value: totalCount - emptyCount - invalidCount,
+            },
+            {
+                key: 'invalid',
+                value: invalidCount,
+            },
+            {
+                key: 'empty',
+                value: emptyCount,
+            },
+        ];
     });
 
 
@@ -116,8 +132,8 @@ export default class Field extends React.PureComponent {
                 <HealthBar
                     className={styles.healthBar}
                     data={healthStatusData}
-                    valueSelector={identity}
-                    keySelector={identity}
+                    valueSelector={valueSelector}
+                    keySelector={keySelector}
                     colorScheme={healthColorScheme}
                     enlargeOnHover={false}
                     hideLabel

diff --git a/src/components/leftpanel/TabularPreview/TabularSheetPreview/index.js b/src/components/leftpanel/TabularPreview/TabularSheetPreview/index.js
@@ -8,7 +8,7 @@ const propTypes = {
     className: PropTypes.string,
     sheet: PropTypes.shape({
         fields: PropTypes.array,
-        data: PropTypes.array,
+        data: PropTypes.object,
         options: PropTypes.object,
     }),
     onClick: PropTypes.func.isRequired,

diff --git a/src/components/other/TabularBook/TabularSheet/Header/index.js b/src/components/other/TabularBook/TabularSheet/Header/index.js
@@ -49,8 +49,8 @@ const healthColorScheme = [
     '#dddddd',
 ];
 
-const healthBarValueSelector = x => x;
-const healthBarKeySelector = (x, i) => `${x}-${i}`;
+const healthBarValueSelector = x => x.value;
+const healthBarKeySelector = x => x.key;
 
 export default class Header extends React.PureComponent {
     static propTypes = {
@@ -139,7 +139,6 @@ export default class Header extends React.PureComponent {
                 <HealthBar
                     data={statusData}
                     valueSelector={healthBarValueSelector}
-                    labelSelector={undefined}
                     keySelector={healthBarKeySelector}
                     className={styles.healthBar}
                     hideLabel

diff --git a/src/components/other/TabularBook/index.js b/src/components/other/TabularBook/index.js
@@ -66,7 +66,20 @@ const transformSheet = (sheet) => {
             const emptyCount = value.filter(x => x.empty).length;
             const totalCount = value.length;
             return {
-                healthBar: [totalCount - emptyCount - invalidCount, invalidCount, emptyCount],
+                healthBar: [
+                    {
+                        key: 'valid',
+                        value: totalCount - emptyCount - invalidCount,
+                    },
+                    {
+                        key: 'invalid',
+                        value: invalidCount,
+                    },
+                    {
+                        key: 'empty',
+                        value: emptyCount,
+                    },
+                ],
             };
         },
     );

diff --git a/src/components/viz/DataSeries/index.js b/src/components/viz/DataSeries/index.js
@@ -113,7 +113,7 @@ export default class DataSeries extends React.PureComponent {
             [GRAPH.geo]: {
                 component: GeoViz,
                 rendererParams: () => {
-                    const { value: { geodata } } = this.props;
+                    const { value: { geodata = {} } } = this.props;
                     const { regions } = geodata;
 
                     return {