diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts index 1fb065c32b5b..c42e8b8db57a 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts @@ -24,6 +24,7 @@ import { } from '@superset-ui/core'; import { EchartsTimeseriesProps } from './types'; import { ForecastSeriesEnum } from '../types'; +import { parseYAxisBound } from '../utils/controls'; import { extractTimeseriesSeries } from '../utils/series'; import { extractForecastSeriesContext, @@ -113,10 +114,8 @@ export default function transformProps(chartProps: ChartProps): EchartsTimeserie }); }); - // yAxisBounds sometimes starts returning NaNs, which messes up the u-axis - let [min, max] = (yAxisBounds || []) - .map(Number) - .map((val: number) => (Number.isNaN(val) ? undefined : val)); + // yAxisBounds need to be parsed to replace incompatible values with undefined + let [min, max] = (yAxisBounds || []).map(parseYAxisBound); // default to 0-100% range when doing row-level contribution chart if (contributionMode === 'row' && stack) { diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/utils/controls.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/utils/controls.ts new file mode 100644 index 000000000000..1c4f310be280 --- /dev/null +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/utils/controls.ts @@ -0,0 +1,25 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// eslint-disable-next-line import/prefer-default-export +export function parseYAxisBound(bound?: string | number | null): number | undefined { + if (bound === undefined || bound === null || Number.isNaN(Number(bound))) { + return undefined; + } + return Number(bound); +} diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/test/utils/controls.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/test/utils/controls.test.ts new file mode 100644 index 000000000000..60ced5773934 --- /dev/null +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/test/utils/controls.test.ts @@ -0,0 +1,37 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { parseYAxisBound } from '../../src/utils/controls'; + +describe('parseYAxisBound', () => { + it('should return undefined for invalid values', () => { + expect(parseYAxisBound(null)).toBeUndefined(); + expect(parseYAxisBound(undefined)).toBeUndefined(); + expect(parseYAxisBound(NaN)).toBeUndefined(); + expect(parseYAxisBound('abc')).toBeUndefined(); + }); + + it('should return numeric value for valid values', () => { + expect(parseYAxisBound(0)).toEqual(0); + expect(parseYAxisBound('0')).toEqual(0); + expect(parseYAxisBound(1)).toEqual(1); + expect(parseYAxisBound('1')).toEqual(1); + expect(parseYAxisBound(10.1)).toEqual(10.1); + expect(parseYAxisBound('10.1')).toEqual(10.1); + }); +});