Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Small tweaks for Line and Area chart migrations (ECharts) #28334

Merged
merged 3 commits into from
May 7, 2024
Merged

fix: Small tweaks for Line and Area chart migrations (ECharts) #28334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99a61bb
fix: Small tweaks for Line and Area chart migrations
michael-s-molina May 3, 2024
fac71f3
Fixes contextmenu
michael-s-molina May 3, 2024
a1a1ac9
Update superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/…
john-bodley May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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:
Expand All @@ -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,
Expand All @@ -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,
Expand Down
11 changes: 6 additions & 5 deletions superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
) {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -538,7 +538,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,
Expand Down Expand Up @@ -576,6 +576,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'),
Expand Down Expand Up @@ -604,7 +605,7 @@ export default function transformProps(
echartOptions,
emitCrossFilters,
formData,
groupby,
groupby: groupBy,
height,
labelMap,
selectedValues,
Expand Down
2 changes: 0 additions & 2 deletions superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
AnnotationLayer,
AxisType,
ContributionType,
QueryFormColumn,
QueryFormData,
QueryFormMetric,
TimeFormatter,
Expand Down Expand Up @@ -87,7 +86,6 @@ export type EchartsTimeseriesFormData = QueryFormData & {
zoomable: boolean;
richTooltip: boolean;
xAxisLabelRotation: number;
groupby: QueryFormColumn[];
showValue: boolean;
onlyTotal: boolean;
showExtraControls: boolean;
Expand Down
4 changes: 4 additions & 0 deletions superset/migrations/shared/migrate_viz/processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ def _pre_action(self) -> None:
):
self.data["bottom_margin"] = 30

left_margin = self.data.get("left_margin")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this just ensuring consistency with other EChart implementations?

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

Expand Down
Loading