[hotfix] fixing issues around new time_table viz (#3599)

apache · Oct 4, 2017 · 1fb8716 · 1fb8716
1 parent ed21244
commit 1fb8716
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/superset/assets/javascripts/explore/components/ControlHeader.jsx b/superset/assets/javascripts/explore/components/ControlHeader.jsx
@@ -5,7 +5,7 @@ import InfoTooltipWithTrigger from '../../components/InfoTooltipWithTrigger';
 import { t } from '../../locales';
 
 const propTypes = {
-  label: PropTypes.string.isRequired,
+  label: PropTypes.string,
   description: PropTypes.string,
   validationErrors: PropTypes.array,
   renderTrigger: PropTypes.bool,
@@ -52,6 +52,9 @@ export default class ControlHeader extends React.Component {
     return null;
   }
   render() {
+    if (!this.props.label) {
+      return null;
+    }
     const labelClass = (this.props.validationErrors.length > 0) ? 'text-danger' : '';
     return (
       <div

diff --git a/superset/assets/javascripts/explore/components/controls/CollectionControl.jsx b/superset/assets/javascripts/explore/components/controls/CollectionControl.jsx
@@ -24,7 +24,7 @@ const propTypes = {
   ]),
   isFloat: PropTypes.bool,
   isInt: PropTypes.bool,
-  control: PropTypes.func,
+  controlName: PropTypes.string.isRequired,
 };
 
 const defaultProps = {
@@ -64,7 +64,7 @@ export default class CollectionControl extends React.Component {
     if (this.props.value.length === 0) {
       return <div className="text-muted">{this.props.placeholder}</div>;
     }
-    const control = controlMap[this.props.control];
+    const Control = controlMap[this.props.controlName];
     return (
       <SortableListGroup
         useDragHandle
@@ -81,7 +81,7 @@ export default class CollectionControl extends React.Component {
               <SortableDragger />
             </div>
             <div className="pull-left">
-              <control
+              <Control
                 {...o}
                 onChange={this.onChange.bind(this, i)}
               />

diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -1443,7 +1443,7 @@ export const controls = {
     type: 'CollectionControl',
     label: t('Time Series Columns'),
     validators: [v.nonEmpty],
-    control: 'TimeSeriesColumnControl',
+    controlName: 'TimeSeriesColumnControl',
   },
 
 };

diff --git a/superset/assets/package.json b/superset/assets/package.json
@@ -85,7 +85,7 @@
     "react-syntax-highlighter": "^5.7.0",
     "react-virtualized": "^9.3.0",
     "react-virtualized-select": "^2.4.0",
-    "reactable": "^0.14.0",
+    "reactable": "^0.14.1",
     "redux": "^3.5.2",
     "redux-localstorage": "^0.4.1",
     "redux-thunk": "^2.1.0",

diff --git a/superset/assets/visualizations/time_table.jsx b/superset/assets/visualizations/time_table.jsx
@@ -23,8 +23,8 @@ function FormattedNumber({ num, format }) {
   return <span>{num}</span>;
 }
 FormattedNumber.propTypes = {
-  num: propTypes.number.isRequired,
-  format: propTypes.string.isRequired,
+  num: propTypes.number,
+  format: propTypes.string,
 };
 
 function viz(slice, payload) {