;
}
const Control = controlMap[this.props.controlName];
-
- // Creating an object to pass the selected props to the children
- const passthroughPropsObj = {};
- this.props.passthroughProps.forEach((k) => {
- passthroughPropsObj[k] = this.props[k];
- });
-
return (
diff --git a/superset/assets/src/explore/components/controls/TimeSeriesColumnControl.jsx b/superset/assets/src/explore/components/controls/TimeSeriesColumnControl.jsx
index dd8b88a60d..24ec40102d 100644
--- a/superset/assets/src/explore/components/controls/TimeSeriesColumnControl.jsx
+++ b/superset/assets/src/explore/components/controls/TimeSeriesColumnControl.jsx
@@ -22,7 +22,6 @@ import {
Row, Col, FormControl, OverlayTrigger, Popover,
} from 'react-bootstrap';
import Select from 'react-select';
-import { t } from '@superset-ui/translation';
import InfoTooltipWithTrigger from '../../../components/InfoTooltipWithTrigger';
import BoundsControl from './BoundsControl';
@@ -103,9 +102,9 @@ export default class TimeSeriesColumnControl extends React.Component {
{this.formRow(
- t('Label'),
- t('The column header label'),
- 'row-label',
+ 'Label',
+ 'The column header label',
+ 'time-lag',
,
)}
{this.formRow(
- t('Tooltip'),
- t('Column header tooltip'),
+ 'Tooltip',
+ 'Column header tooltip',
'col-tooltip',
,
)}
{this.formRow(
- t('Type'),
- t('Type of comparison, value difference or percentage'),
+ 'Type',
+ 'Type of comparison, value difference or percentage',
'col-type',
{this.state.colType === 'spark' && this.formRow(
- t('Width'),
- t('Width of the sparkline'),
+ 'Width',
+ 'Width of the sparkline',
'spark-width',
,
)}
{this.state.colType === 'spark' && this.formRow(
- t('Height'),
- t('Height of the sparkline'),
+ 'Height',
+ 'Height of the sparkline',
'spark-width',
,
)}
{['time', 'avg'].indexOf(this.state.colType) >= 0 && this.formRow(
- t('Time Lag'),
- t('Number of periods to compare against'),
+ 'Time Lag',
+ 'Number of periods to compare against',
'time-lag',
,
)}
{['spark'].indexOf(this.state.colType) >= 0 && this.formRow(
- t('Time Ratio'),
- t('Number of periods to ratio against'),
+ 'Time Ratio',
+ 'Number of periods to ratio against',
'time-ratio',
,
)}
{this.state.colType === 'time' && this.formRow(
- t('Type'),
- t('Type of comparison, value difference or percentage'),
+ 'Type',
+ 'Type of comparison, value difference or percentage',
'comp-type',
,
)}
{this.state.colType === 'spark' && this.formRow(
- t('Show Y-axis'),
- t(
- 'Show Y-axis on the sparkline. Will display the manually set min/max if set or min/max values in the data otherwise.',
+ 'Show Y-axis',
+ (
+ 'Show Y-axis on the sparkline. Will display the manually set min/max if set or min/max values in the data otherwise.'
),
'show-y-axis-bounds',
,
)}
{this.state.colType === 'spark' && this.formRow(
- t('Y-axis bounds'),
- t(
- 'Manually set min/max values for the y-axis.',
+ 'Y-axis bounds',
+ (
+ 'Manually set min/max values for the y-axis.'
),
'y-axis-bounds',
,
)}
{this.state.colType !== 'spark' && this.formRow(
- t('Color bounds'),
- t(
+ 'Color bounds',
+ (
`Number bounds used for color encoding from red to blue.
Reverse the numbers for blue to red. To get pure red or blue,
- you can enter either only min or max.`,
+ you can enter either only min or max.`
),
'bounds',
,
)}
{this.formRow(
- t('Number format'),
- t('Optional d3 number format string'),
+ 'Number format',
+ 'Optional d3 number format string',
'd3-format',
,
)}
{this.state.colType === 'spark' && this.formRow(
- t('Date format'),
- t('Optional d3 date format string'),
+ 'Date format',
+ 'Optional d3 date format string',
'date-format',
({ datasource }),
},
diff --git a/superset/assets/src/utils/getClientErrorObject.js b/superset/assets/src/utils/getClientErrorObject.js
index ac5d327d3c..8af1e54ce9 100644
--- a/superset/assets/src/utils/getClientErrorObject.js
+++ b/superset/assets/src/utils/getClientErrorObject.js
@@ -50,9 +50,6 @@ export default function getClientErrorObject(response) {
resolve({ ...response, error: errorText });
});
});
- } else if (typeof (response) === 'object' && Object.keys(response).length === 0) {
- // Weird empty object that can get converted to string
- resolve({ ...response, error: String(response) });
} else {
// fall back to Response.statusText or generic error of we cannot read the response
resolve({ ...response, error: response.statusText || t('An error occurred') });