You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2023/12/15 16:18:33 UTC
(superset) branch 3.0 updated (cefca2f000 -> 9b21c93c47)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a change to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
from cefca2f000 chore: Adds 3.0.3 data to CHANGELOG.md
new c99c6301c7 fix: bump pyarrow constraints (CVE-2023-47248) (#26187)
new c878e2e102 chore: improve CSP add base uri restriction (#26251)
new 5f92c2f0dc fix: Stacked charts with numerical columns (#26264)
new 91e970537b fix(plugin-chart-echarts): use scale for truncating x-axis (#26269)
new 9b21c93c47 fix: Cannot expand initially hidden SQL Lab tab (#26279)
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
requirements/base.txt | 3 +-
setup.py | 2 +-
.../src/MixedTimeseries/controlPanel.tsx | 9 +-
.../src/MixedTimeseries/transformProps.ts | 54 ++++++----
.../src/MixedTimeseries/types.ts | 1 +
.../src/Timeseries/transformProps.ts | 10 +-
.../plugin-chart-echarts/src/utils/controls.ts | 1 -
.../plugin-chart-echarts/src/utils/series.ts | 47 +++++++--
.../plugin-chart-echarts/test/utils/series.test.ts | 112 ++++++++++++++++++---
.../src/SqlLab/components/SqlEditor/index.jsx | 6 +-
superset/config.py | 2 +
11 files changed, 197 insertions(+), 50 deletions(-)
(superset) 01/05: fix: bump pyarrow constraints (CVE-2023-47248) (#26187)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit c99c6301c7ba616cbb54dd235d71b97a781df627
Author: cwegener <cw...@users.noreply.github.com>
AuthorDate: Mon Dec 11 16:27:53 2023 +0000
fix: bump pyarrow constraints (CVE-2023-47248) (#26187)
(cherry picked from commit 2ac28927a326fee6431b5e01f7930e650c636c17)
---
requirements/base.txt | 3 ++-
setup.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/requirements/base.txt b/requirements/base.txt
index 1d2d568efc..e4cb6eb58f 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -211,7 +211,7 @@ prison==0.2.1
# via flask-appbuilder
prompt-toolkit==3.0.38
# via click-repl
-pyarrow==12.0.0
+pyarrow==14.0.1
# via apache-superset
pycparser==2.20
# via cffi
@@ -310,6 +310,7 @@ werkzeug==2.3.3
# via
# apache-superset
# flask
+ # flask-appbuilder
# flask-jwt-extended
# flask-login
wrapt==1.12.1
diff --git a/setup.py b/setup.py
index 612ba88922..89cd3f51f6 100644
--- a/setup.py
+++ b/setup.py
@@ -109,7 +109,7 @@ setup(
"python-dateutil",
"python-dotenv",
"python-geohash",
- "pyarrow>=12.0.0, <13",
+ "pyarrow>=14.0.1, <15",
"pyyaml>=6.0.0, <7.0.0",
"PyJWT>=2.4.0, <3.0",
"redis>=4.5.4, <5.0",
(superset) 05/05: fix: Cannot expand initially hidden SQL Lab tab (#26279)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 9b21c93c47f880331eaa1c61dd73ad249b67730d
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Thu Dec 14 16:48:07 2023 -0300
fix: Cannot expand initially hidden SQL Lab tab (#26279)
---
superset-frontend/src/SqlLab/components/SqlEditor/index.jsx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx b/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx
index cda252f1e3..ec9731b1bb 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx
@@ -87,7 +87,7 @@ import {
} from 'src/utils/localStorageHelpers';
import { EmptyStateBig } from 'src/components/EmptyState';
import getBootstrapData from 'src/utils/getBootstrapData';
-import { isEmpty } from 'lodash';
+import { isBoolean, isEmpty } from 'lodash';
import TemplateParamsEditor from '../TemplateParamsEditor';
import SouthPane from '../SouthPane';
import SaveQuery from '../SaveQuery';
@@ -228,7 +228,9 @@ const SqlEditor = ({
if (unsavedQueryEditor.id === queryEditor.id) {
dbId = unsavedQueryEditor.dbId || dbId;
latestQueryId = unsavedQueryEditor.latestQueryId || latestQueryId;
- hideLeftBar = unsavedQueryEditor.hideLeftBar || hideLeftBar;
+ hideLeftBar = isBoolean(unsavedQueryEditor.hideLeftBar)
+ ? unsavedQueryEditor.hideLeftBar
+ : hideLeftBar;
}
return {
database: databases[dbId],
(superset) 02/05: chore: improve CSP add base uri restriction (#26251)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit c878e2e102a39fec9fd70558e96e2d3dfbfb0bf7
Author: Daniel Vaz Gaspar <da...@gmail.com>
AuthorDate: Wed Dec 13 11:45:14 2023 +0000
chore: improve CSP add base uri restriction (#26251)
(cherry picked from commit 578a899152719415c65c24055f4378b838ded435)
---
superset/config.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/superset/config.py b/superset/config.py
index 164ea1a5be..d62136a000 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -1409,6 +1409,7 @@ TALISMAN_ENABLED = utils.cast_to_boolean(os.environ.get("TALISMAN_ENABLED", True
# If you want Talisman, how do you want it configured??
TALISMAN_CONFIG = {
"content_security_policy": {
+ "base-uri": ["'self'"],
"default-src": ["'self'"],
"img-src": ["'self'", "blob:", "data:"],
"worker-src": ["'self'", "blob:"],
@@ -1431,6 +1432,7 @@ TALISMAN_CONFIG = {
# React requires `eval` to work correctly in dev mode
TALISMAN_DEV_CONFIG = {
"content_security_policy": {
+ "base-uri": ["'self'"],
"default-src": ["'self'"],
"img-src": ["'self'", "blob:", "data:"],
"worker-src": ["'self'", "blob:"],
(superset) 03/05: fix: Stacked charts with numerical columns (#26264)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 5f92c2f0dc2302c6e6a8e3703cc9fd4608f4ab03
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Wed Dec 13 17:10:51 2023 -0300
fix: Stacked charts with numerical columns (#26264)
(cherry picked from commit 429e2a33c3ac5a4b035e0cb113bc6e1e63a39e4c)
---
.../src/MixedTimeseries/transformProps.ts | 2 +-
.../plugin-chart-echarts/src/Timeseries/transformProps.ts | 2 +-
.../plugins/plugin-chart-echarts/src/utils/series.ts | 7 +++++--
.../plugins/plugin-chart-echarts/test/utils/series.test.ts | 11 +++++++----
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
index 00466c607a..8e5a230fcf 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -221,7 +221,7 @@ export default function transformProps(
const dataTypes = getColtypesMapping(queriesData[0]);
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];
- const xAxisType = getAxisType(xAxisDataType);
+ const xAxisType = getAxisType(stack, xAxisDataType);
const series: SeriesOption[] = [];
const formatter = contributionMode
? getNumberFormatter(',.0%')
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
index e81f13b784..02abd23c1a 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -245,7 +245,7 @@ export default function transformProps(
const isAreaExpand = stack === StackControlsValue.Expand;
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];
- const xAxisType = getAxisType(xAxisDataType);
+ const xAxisType = getAxisType(stack, xAxisDataType);
const series: SeriesOption[] = [];
const forcePercentFormatter = Boolean(contributionMode || isAreaExpand);
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
index aa353f66d1..69c0ccbe1b 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
@@ -508,11 +508,14 @@ export function sanitizeHtml(text: string): string {
return format.encodeHTML(text);
}
-export function getAxisType(dataType?: GenericDataType): AxisType {
+export function getAxisType(
+ stack: StackType,
+ dataType?: GenericDataType,
+): AxisType {
if (dataType === GenericDataType.TEMPORAL) {
return AxisType.time;
}
- if (dataType === GenericDataType.NUMERIC) {
+ if (dataType === GenericDataType.NUMERIC && !stack) {
return AxisType.value;
}
return AxisType.category;
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
index b445dceabb..b309bf6f3c 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
@@ -875,10 +875,13 @@ test('calculateLowerLogTick', () => {
});
test('getAxisType', () => {
- expect(getAxisType(GenericDataType.TEMPORAL)).toEqual(AxisType.time);
- expect(getAxisType(GenericDataType.NUMERIC)).toEqual(AxisType.value);
- expect(getAxisType(GenericDataType.BOOLEAN)).toEqual(AxisType.category);
- expect(getAxisType(GenericDataType.STRING)).toEqual(AxisType.category);
+ expect(getAxisType(false, GenericDataType.TEMPORAL)).toEqual(AxisType.time);
+ expect(getAxisType(false, GenericDataType.NUMERIC)).toEqual(AxisType.value);
+ expect(getAxisType(true, GenericDataType.NUMERIC)).toEqual(AxisType.category);
+ expect(getAxisType(false, GenericDataType.BOOLEAN)).toEqual(
+ AxisType.category,
+ );
+ expect(getAxisType(false, GenericDataType.STRING)).toEqual(AxisType.category);
});
test('getMinAndMaxFromBounds returns empty object when not truncating', () => {
(superset) 04/05: fix(plugin-chart-echarts): use scale for truncating x-axis (#26269)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 91e970537b57a9a6155612c4574bcdb16d4b8a9b
Author: Ville Brofeldt <33...@users.noreply.github.com>
AuthorDate: Thu Dec 14 10:13:39 2023 -0800
fix(plugin-chart-echarts): use scale for truncating x-axis (#26269)
---
.../src/MixedTimeseries/controlPanel.tsx | 9 +-
.../src/MixedTimeseries/transformProps.ts | 52 +++++++----
.../src/MixedTimeseries/types.ts | 1 +
.../src/Timeseries/transformProps.ts | 8 +-
.../plugin-chart-echarts/src/utils/controls.ts | 1 -
.../plugin-chart-echarts/src/utils/series.ts | 40 ++++++--
.../plugin-chart-echarts/test/utils/series.test.ts | 101 +++++++++++++++++++--
7 files changed, 174 insertions(+), 38 deletions(-)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
index ec2443bb60..8161b32167 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
@@ -32,7 +32,12 @@ import {
import { DEFAULT_FORM_DATA } from './types';
import { EchartsTimeseriesSeriesType } from '../Timeseries/types';
-import { legendSection, richTooltipSection } from '../controls';
+import {
+ legendSection,
+ richTooltipSection,
+ truncateXAxis,
+ xAxisBounds,
+} from '../controls';
const {
area,
@@ -350,6 +355,8 @@ const config: ControlPanelConfig = {
},
},
],
+ [truncateXAxis],
+ [xAxisBounds],
[
{
name: 'truncateYAxis',
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
index 8e5a230fcf..763bbd1f95 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -20,32 +20,32 @@
import { invert } from 'lodash';
import {
AnnotationLayer,
+ buildCustomFormatters,
CategoricalColorNamespace,
+ CurrencyFormatter,
+ ensureIsArray,
GenericDataType,
+ getCustomFormatter,
getNumberFormatter,
+ getXAxisLabel,
+ isDefined,
isEventAnnotationLayer,
isFormulaAnnotationLayer,
isIntervalAnnotationLayer,
+ isPhysicalColumn,
isTimeseriesAnnotationLayer,
QueryFormData,
+ QueryFormMetric,
TimeseriesChartDataResponseResult,
TimeseriesDataRecord,
- getXAxisLabel,
- isPhysicalColumn,
- isDefined,
- ensureIsArray,
- buildCustomFormatters,
ValueFormatter,
- QueryFormMetric,
- getCustomFormatter,
- CurrencyFormatter,
} from '@superset-ui/core';
import { getOriginalSeries } from '@superset-ui/chart-controls';
import { EChartsCoreOption, SeriesOption } from 'echarts';
import {
DEFAULT_FORM_DATA,
- EchartsMixedTimeseriesFormData,
EchartsMixedTimeseriesChartTransformedProps,
+ EchartsMixedTimeseriesFormData,
EchartsMixedTimeseriesProps,
} from './types';
import {
@@ -55,14 +55,15 @@ import {
} from '../types';
import { parseAxisBound } from '../utils/controls';
import {
- getOverMaxHiddenFormatter,
dedupSeries,
+ extractDataTotalValues,
extractSeries,
+ extractShowValueIndexes,
getAxisType,
getColtypesMapping,
getLegendProps,
- extractDataTotalValues,
- extractShowValueIndexes,
+ getMinAndMaxFromBounds,
+ getOverMaxHiddenFormatter,
} from '../utils/series';
import {
extractAnnotationLabels,
@@ -86,7 +87,7 @@ import {
transformSeries,
transformTimeseriesAnnotation,
} from '../Timeseries/transformers';
-import { TIMESERIES_CONSTANTS, TIMEGRAIN_TO_TIMESTAMP } from '../constants';
+import { TIMEGRAIN_TO_TIMESTAMP, TIMESERIES_CONSTANTS } from '../constants';
import { getDefaultTooltip } from '../utils/tooltip';
import { getYAxisFormatter } from '../utils/getYAxisFormatter';
@@ -164,6 +165,7 @@ export default function transformProps(
showValueB,
stack,
stackB,
+ truncateXAxis,
truncateYAxis,
tooltipTimeFormat,
yAxisFormat,
@@ -179,6 +181,7 @@ export default function transformProps(
zoomable,
richTooltip,
tooltipSortByMetric,
+ xAxisBounds,
xAxisLabelRotation,
groupby,
groupbyB,
@@ -343,7 +346,8 @@ export default function transformProps(
});
// yAxisBounds need to be parsed to replace incompatible values with undefined
- let [min, max] = (yAxisBounds || []).map(parseAxisBound);
+ const [xAxisMin, xAxisMax] = (xAxisBounds || []).map(parseAxisBound);
+ let [yAxisMin, yAxisMax] = (yAxisBounds || []).map(parseAxisBound);
let [minSecondary, maxSecondary] = (yAxisBoundsSecondary || []).map(
parseAxisBound,
);
@@ -384,7 +388,7 @@ export default function transformProps(
formatter:
seriesType === EchartsTimeseriesSeriesType.Bar
? getOverMaxHiddenFormatter({
- max,
+ max: yAxisMax,
formatter: seriesFormatter,
})
: seriesFormatter,
@@ -445,8 +449,8 @@ export default function transformProps(
// default to 0-100% range when doing row-level contribution chart
if (contributionMode === 'row' && stack) {
- if (min === undefined) min = 0;
- if (max === undefined) max = 1;
+ if (yAxisMin === undefined) yAxisMin = 0;
+ if (yAxisMax === undefined) yAxisMax = 1;
if (minSecondary === undefined) minSecondary = 0;
if (maxSecondary === undefined) maxSecondary = 1;
}
@@ -497,13 +501,23 @@ export default function transformProps(
xAxisType === 'time' && timeGrainSqla
? TIMEGRAIN_TO_TIMESTAMP[timeGrainSqla]
: 0,
+ ...getMinAndMaxFromBounds(
+ xAxisType,
+ truncateXAxis,
+ xAxisMin,
+ xAxisMax,
+ seriesType === EchartsTimeseriesSeriesType.Bar ||
+ seriesTypeB === EchartsTimeseriesSeriesType.Bar
+ ? EchartsTimeseriesSeriesType.Bar
+ : undefined,
+ ),
},
yAxis: [
{
...defaultYAxis,
type: logAxis ? 'log' : 'value',
- min,
- max,
+ min: yAxisMin,
+ max: yAxisMax,
minorTick: { show: true },
minorSplitLine: { show: minorSplitLine },
axisLabel: {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
index 30969ae367..2e9ba641aa 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
@@ -104,6 +104,7 @@ export const DEFAULT_FORM_DATA: EchartsMixedTimeseriesFormData = {
yAxisFormatSecondary: TIMESERIES_DEFAULTS.yAxisFormat,
yAxisTitleSecondary: DEFAULT_TITLE_FORM_DATA.yAxisTitle,
tooltipTimeFormat: TIMESERIES_DEFAULTS.tooltipTimeFormat,
+ xAxisBounds: TIMESERIES_DEFAULTS.xAxisBounds,
xAxisTimeFormat: TIMESERIES_DEFAULTS.xAxisTimeFormat,
area: TIMESERIES_DEFAULTS.area,
areaB: TIMESERIES_DEFAULTS.area,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
index 02abd23c1a..cc89ff30c7 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -458,7 +458,13 @@ export default function transformProps(
xAxisType === AxisType.time && timeGrainSqla
? TIMEGRAIN_TO_TIMESTAMP[timeGrainSqla]
: 0,
- ...getMinAndMaxFromBounds(xAxisType, truncateXAxis, xAxisMin, xAxisMax),
+ ...getMinAndMaxFromBounds(
+ xAxisType,
+ truncateXAxis,
+ xAxisMin,
+ xAxisMax,
+ seriesType,
+ ),
};
let yAxis: any = {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/controls.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/controls.ts
index e5ba4c95d1..8ec2b3d13f 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/controls.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/controls.ts
@@ -19,7 +19,6 @@
import { validateNumber } from '@superset-ui/core';
-// eslint-disable-next-line import/prefer-default-export
export function parseAxisBound(
bound?: string | number | null,
): number | undefined {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
index 69c0ccbe1b..a294fa44c3 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
@@ -41,7 +41,12 @@ import {
StackControlsValue,
TIMESERIES_CONSTANTS,
} from '../constants';
-import { LegendOrientation, LegendType, StackType } from '../types';
+import {
+ EchartsTimeseriesSeriesType,
+ LegendOrientation,
+ LegendType,
+ StackType,
+} from '../types';
import { defaultLegendPadding } from '../defaults';
function isDefined<T>(value: T | undefined | null): boolean {
@@ -547,16 +552,35 @@ export function calculateLowerLogTick(minPositiveValue: number) {
return Math.pow(10, logBase10);
}
+type BoundsType = {
+ min?: number | 'dataMin';
+ max?: number | 'dataMax';
+ scale?: true;
+};
+
export function getMinAndMaxFromBounds(
axisType: AxisType,
truncateAxis: boolean,
min?: number,
max?: number,
-): { min: number | 'dataMin'; max: number | 'dataMax' } | {} {
- return truncateAxis && axisType === AxisType.value
- ? {
- min: min === undefined ? 'dataMin' : min,
- max: max === undefined ? 'dataMax' : max,
- }
- : {};
+ seriesType?: EchartsTimeseriesSeriesType,
+): BoundsType | {} {
+ if (axisType === AxisType.value && truncateAxis) {
+ const ret: BoundsType = {};
+ if (seriesType === EchartsTimeseriesSeriesType.Bar) {
+ ret.scale = true;
+ }
+ if (min !== undefined) {
+ ret.min = min;
+ } else if (seriesType !== EchartsTimeseriesSeriesType.Bar) {
+ ret.min = 'dataMin';
+ }
+ if (max !== undefined) {
+ ret.max = max;
+ } else if (seriesType !== EchartsTimeseriesSeriesType.Bar) {
+ ret.max = 'dataMax';
+ }
+ return ret;
+ }
+ return {};
}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
index b309bf6f3c..8e55b125b8 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
@@ -41,7 +41,11 @@ import {
sortAndFilterSeries,
sortRows,
} from '../../src/utils/series';
-import { LegendOrientation, LegendType } from '../../src/types';
+import {
+ EchartsTimeseriesSeriesType,
+ LegendOrientation,
+ LegendType,
+} from '../../src/types';
import { defaultLegendPadding } from '../../src/defaults';
import { NULL_STRING } from '../../src/constants';
@@ -885,28 +889,109 @@ test('getAxisType', () => {
});
test('getMinAndMaxFromBounds returns empty object when not truncating', () => {
- expect(getMinAndMaxFromBounds(AxisType.value, false, 10, 100)).toEqual({});
+ expect(
+ getMinAndMaxFromBounds(
+ AxisType.value,
+ false,
+ 10,
+ 100,
+ EchartsTimeseriesSeriesType.Bar,
+ ),
+ ).toEqual({});
+});
+
+test('getMinAndMaxFromBounds returns empty object for categorical axis', () => {
+ expect(
+ getMinAndMaxFromBounds(
+ AxisType.category,
+ false,
+ 10,
+ 100,
+ EchartsTimeseriesSeriesType.Bar,
+ ),
+ ).toEqual({});
+});
+
+test('getMinAndMaxFromBounds returns empty object for time axis', () => {
+ expect(
+ getMinAndMaxFromBounds(
+ AxisType.time,
+ false,
+ 10,
+ 100,
+ EchartsTimeseriesSeriesType.Bar,
+ ),
+ ).toEqual({});
});
-test('getMinAndMaxFromBounds returns automatic bounds when truncating', () => {
+test('getMinAndMaxFromBounds returns dataMin/dataMax for non-bar charts', () => {
expect(
- getMinAndMaxFromBounds(AxisType.value, true, undefined, undefined),
+ getMinAndMaxFromBounds(
+ AxisType.value,
+ true,
+ undefined,
+ undefined,
+ EchartsTimeseriesSeriesType.Line,
+ ),
).toEqual({
min: 'dataMin',
max: 'dataMax',
});
});
-test('getMinAndMaxFromBounds returns automatic upper bound when truncating', () => {
- expect(getMinAndMaxFromBounds(AxisType.value, true, 10, undefined)).toEqual({
+test('getMinAndMaxFromBounds returns bound without scale for non-bar charts', () => {
+ expect(
+ getMinAndMaxFromBounds(
+ AxisType.value,
+ true,
+ 10,
+ undefined,
+ EchartsTimeseriesSeriesType.Line,
+ ),
+ ).toEqual({
min: 10,
max: 'dataMax',
});
});
+test('getMinAndMaxFromBounds returns scale when truncating without bounds', () => {
+ expect(
+ getMinAndMaxFromBounds(
+ AxisType.value,
+ true,
+ undefined,
+ undefined,
+ EchartsTimeseriesSeriesType.Bar,
+ ),
+ ).toEqual({ scale: true });
+});
+
+test('getMinAndMaxFromBounds returns automatic upper bound when truncating', () => {
+ expect(
+ getMinAndMaxFromBounds(
+ AxisType.value,
+ true,
+ 10,
+ undefined,
+ EchartsTimeseriesSeriesType.Bar,
+ ),
+ ).toEqual({
+ min: 10,
+ scale: true,
+ });
+});
+
test('getMinAndMaxFromBounds returns automatic lower bound when truncating', () => {
- expect(getMinAndMaxFromBounds(AxisType.value, true, undefined, 100)).toEqual({
- min: 'dataMin',
+ expect(
+ getMinAndMaxFromBounds(
+ AxisType.value,
+ true,
+ undefined,
+ 100,
+ EchartsTimeseriesSeriesType.Bar,
+ ),
+ ).toEqual({
max: 100,
+ scale: true,
});
});