You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2018/11/14 19:22:17 UTC
[incubator-superset] branch master updated: [bugfix] prevent
d3-format from raising (#6386)
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 4690563 [bugfix] prevent d3-format from raising (#6386)
4690563 is described below
commit 4690563d40b2cecd32b1309028d61ee3e87b8b9e
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Wed Nov 14 11:22:06 2018 -0800
[bugfix] prevent d3-format from raising (#6386)
Since https://github.com/apache/incubator-superset/pull/6287 and
effectively moving to a new version of d3, d3-format and d3-time-format
raises when receiving invalid input strings.
This code wraps the potential issues inside `try` blocks that will
effectively return an `ERROR` string as output to the formatting
function.
---
.../assets/spec/javascripts/modules/utils_spec.jsx | 4 +++-
superset/assets/src/modules/utils.js | 19 ++++++++++++++++---
superset/assets/src/visualizations/nvd3/NVD3Vis.js | 4 +++-
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/superset/assets/spec/javascripts/modules/utils_spec.jsx b/superset/assets/spec/javascripts/modules/utils_spec.jsx
index d1566c2..0faaf31 100644
--- a/superset/assets/spec/javascripts/modules/utils_spec.jsx
+++ b/superset/assets/spec/javascripts/modules/utils_spec.jsx
@@ -29,6 +29,7 @@ describe('utils', () => {
expect(d3format('.3s', 1234)).toBe('1.23k');
expect(d3format('.3s', 1237)).toBe('1.24k');
expect(d3format('', 1237)).toBe('1.24k');
+ expect(d3format('.2efd2.ef.2.e', 1237)).toBe('ERROR');
});
});
@@ -45,8 +46,9 @@ describe('utils', () => {
it('is a function', () => {
expect(typeof d3TimeFormatPreset).toBe('function');
});
- it('returns a working time formatter', () => {
+ it('returns a working formatter', () => {
expect(d3FormatPreset('smart_date')(0)).toBe('1970');
+ expect(d3FormatPreset('%%GIBBERISH')(0)).toBe('ERROR');
});
});
diff --git a/superset/assets/src/modules/utils.js b/superset/assets/src/modules/utils.js
index 1bd82e2..201d528 100644
--- a/superset/assets/src/modules/utils.js
+++ b/superset/assets/src/modules/utils.js
@@ -6,6 +6,7 @@ import { timeFormat as d3TimeFormat } from 'd3-time-format';
import { formatDate, UTC } from './dates';
const siFormatter = d3Format('.3s');
+const ERROR_STRING = 'ERROR';
export function defaultNumberFormatter(n) {
let si = siFormatter(n);
@@ -22,7 +23,13 @@ export function d3FormatPreset(format) {
return formatDate;
}
if (format) {
- return d3Format(format);
+ try {
+ return d3Format(format);
+ } catch (e) {
+ // eslint-disable-next-line no-console
+ console.warn(e);
+ return () => ERROR_STRING;
+ }
}
return defaultNumberFormatter;
}
@@ -45,12 +52,18 @@ export function d3format(format, number) {
format = format || '.3s';
// Formats a number and memoizes formatters to be reused
if (!(format in formatters)) {
- formatters[format] = d3Format(format);
+ try {
+ formatters[format] = d3Format(format);
+ } catch (e) {
+ // eslint-disable-next-line no-console
+ console.warn(e);
+ return ERROR_STRING;
+ }
}
try {
return formatters[format](number);
} catch (e) {
- return 'ERR';
+ return ERROR_STRING;
}
}
diff --git a/superset/assets/src/visualizations/nvd3/NVD3Vis.js b/superset/assets/src/visualizations/nvd3/NVD3Vis.js
index 12e8ca3..cdd938f 100644
--- a/superset/assets/src/visualizations/nvd3/NVD3Vis.js
+++ b/superset/assets/src/visualizations/nvd3/NVD3Vis.js
@@ -456,11 +456,13 @@ function nvd3Vis(element, props) {
chart.xScale(d3.scale.log());
}
- let xAxisFormatter = d3FormatPreset(xAxisFormat);
+ let xAxisFormatter;
if (isTimeSeries) {
xAxisFormatter = d3TimeFormatPreset(xAxisFormat);
// In tooltips, always use the verbose time format
chart.interactiveLayer.tooltip.headerFormatter(formatDateVerbose);
+ } else {
+ xAxisFormatter = d3FormatPreset(xAxisFormat);
}
if (chart.x2Axis && chart.x2Axis.tickFormat) {
chart.x2Axis.tickFormat(xAxisFormatter);