This is an automated email from the ASF dual-hosted git repository. michaelsmolina pushed a commit to branch 4.0 in repository https://gitbox.apache.org/repos/asf/superset.git
commit d046a328a2cf8403aa467d551db5bb9614140edb Author: Michael S. Molina <[email protected]> AuthorDate: Tue May 7 10:40:33 2024 -0300 fix: Small tweaks for Line and Area chart migrations (ECharts) (#28334) Co-authored-by: John Bodley <[email protected]> (cherry picked from commit b4ab36a6a54d68ba0ac1356d8caaee5d1ed0e91f) --- .../plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx | 6 ++++-- .../plugin-chart-echarts/src/Timeseries/transformProps.ts | 11 ++++++----- .../plugins/plugin-chart-echarts/src/Timeseries/types.ts | 2 -- superset/migrations/shared/migrate_viz/processors.py | 4 ++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx index 78a5736708..14ec5ac32d 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx @@ -25,6 +25,7 @@ import { getColumnLabel, getNumberFormatter, LegendState, + ensureIsArray, } from '@superset-ui/core'; import { ViewRootGroup } from 'echarts/types/src/util/types'; import GlobalModel from 'echarts/types/src/model/Global'; @@ -173,6 +174,7 @@ export default function EchartsTimeseries({ ...(eventParams.name ? [eventParams.name] : []), ...(labelMap[seriesName] ?? []), ]; + const groupBy = ensureIsArray(formData.groupby); if (data && xAxis.type === AxisType.Time) { drillToDetailFilters.push({ col: @@ -188,7 +190,7 @@ export default function EchartsTimeseries({ } [ ...(xAxis.type === AxisType.Category && data ? [xAxis.label] : []), - ...formData.groupby, + ...groupBy, ].forEach((dimension, i) => drillToDetailFilters.push({ col: dimension, @@ -197,7 +199,7 @@ export default function EchartsTimeseries({ formattedVal: String(values[i]), }), ); - formData.groupby.forEach((dimension, i) => { + groupBy.forEach((dimension, i) => { const val = labelMap[seriesName][i]; drillByFilters.push({ col: dimension, 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 8b4998ded0..e24351ffe7 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts @@ -184,10 +184,10 @@ export default function transformProps( zoomable, }: EchartsTimeseriesFormData = { ...DEFAULT_FORM_DATA, ...formData }; const refs: Refs = {}; - + const groupBy = ensureIsArray(groupby); const labelMap = Object.entries(label_map).reduce((acc, entry) => { if ( - entry[1].length > groupby.length && + entry[1].length > groupBy.length && Array.isArray(timeCompare) && timeCompare.includes(entry[1][0]) ) { @@ -219,7 +219,7 @@ export default function transformProps( getMetricLabel, ); - const isMultiSeries = groupby?.length || metrics?.length > 1; + const isMultiSeries = groupBy.length || metrics?.length > 1; const [rawSeries, sortedTotalValues, minPositiveValue] = extractSeries( rebasedData, @@ -537,7 +537,7 @@ export default function transformProps( // if there are no dimensions, key is a verbose name of a metric, // otherwise it is a comma separated string where the first part is metric name const formatterKey = - groupby.length === 0 ? inverted[key] : labelMap[key]?.[0]; + groupBy.length === 0 ? inverted[key] : labelMap[key]?.[0]; const content = formatForecastTooltipSeries({ ...value, seriesName: key, @@ -575,6 +575,7 @@ export default function transformProps( right: TIMESERIES_CONSTANTS.toolboxRight, feature: { dataZoom: { + ...(stack ? { yAxisIndex: false } : {}), // disable y-axis zoom for stacked charts title: { zoom: t('zoom area'), back: t('restore zoom'), @@ -603,7 +604,7 @@ export default function transformProps( echartOptions, emitCrossFilters, formData, - groupby, + groupby: groupBy, height, labelMap, selectedValues, diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts index dbecb483da..6ca9650db6 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts @@ -21,7 +21,6 @@ import { AnnotationLayer, AxisType, ContributionType, - QueryFormColumn, QueryFormData, QueryFormMetric, TimeFormatter, @@ -87,7 +86,6 @@ export type EchartsTimeseriesFormData = QueryFormData & { zoomable: boolean; richTooltip: boolean; xAxisLabelRotation: number; - groupby: QueryFormColumn[]; showValue: boolean; onlyTotal: boolean; showExtraControls: boolean; diff --git a/superset/migrations/shared/migrate_viz/processors.py b/superset/migrations/shared/migrate_viz/processors.py index 5fbd624aa8..a4669e9d09 100644 --- a/superset/migrations/shared/migrate_viz/processors.py +++ b/superset/migrations/shared/migrate_viz/processors.py @@ -128,6 +128,10 @@ class TimeseriesChart(MigrateViz): ): self.data["bottom_margin"] = 30 + left_margin = self.data.get("left_margin") + if self.data.get("y_axis_label") and (not left_margin or left_margin == "auto"): + self.data["left_margin"] = 30 + if (rolling_type := self.data.get("rolling_type")) and rolling_type != "None": self.data["rolling_type"] = rolling_type
