This is an automated email from the ASF dual-hosted git repository. sophieyou pushed a commit to branch mixed-chart-tooltip-query-control in repository https://gitbox.apache.org/repos/asf/superset.git
commit 7a1f4183fb41491f100859bfef535256c615861b Author: yousoph <[email protected]> AuthorDate: Wed Jul 30 00:03:09 2025 +0000 fix: use camelCase showQueryIdentifiers instead of snake_case The form control uses snake_case but gets converted to camelCase when passed to transform function --- .../src/MixedTimeseries/transformProps.ts | 17 ++++++++--------- .../plugin-chart-echarts/src/MixedTimeseries/types.ts | 4 ++-- 2 files changed, 10 insertions(+), 11 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 30f8604c3c..1324547af4 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts @@ -212,7 +212,7 @@ export default function transformProps( sortSeriesAscendingB, timeGrainSqla, percentageThreshold, - show_query_identifiers = false, + showQueryIdentifiers = false, metrics = [], metricsB = [], }: EchartsMixedTimeseriesFormData = { ...DEFAULT_FORM_DATA, ...formData }; @@ -244,8 +244,7 @@ export default function transformProps( const MetricDisplayNameB = getMetricDisplayName(metricsB[0], verboseMap); // Debug logging - console.log('DEBUG: show_query_identifiers =', show_query_identifiers); - console.log('DEBUG: formData contains:', Object.keys(formData)); + console.log('DEBUG: showQueryIdentifiers =', showQueryIdentifiers); const [rawSeriesA, sortedTotalValuesA] = extractSeries(rebasedDataA, { fillNeighborValue: stack ? 0 : undefined, @@ -404,18 +403,18 @@ export default function transformProps( if (groupby.length > 0) { // When we have groupby, format as "metric, dimension" - const metricPart = show_query_identifiers + const metricPart = showQueryIdentifiers ? `${MetricDisplayNameA} (Query A)` : MetricDisplayNameA; displayName = `${metricPart}, ${entryName}`; } else { // When no groupby, format as just the entry name with optional query identifier - displayName = show_query_identifiers + displayName = showQueryIdentifiers ? `${entryName} (Query A)` : entryName; } - console.log(`DEBUG Query A: entryName="${entryName}", displayName="${displayName}", show_query_identifiers=${show_query_identifiers}`); + console.log(`DEBUG Query A: entryName="${entryName}", displayName="${displayName}", showQueryIdentifiers=${showQueryIdentifiers}`); const seriesFormatter = getFormatter( customFormatters, @@ -473,18 +472,18 @@ export default function transformProps( if (groupbyB.length > 0) { // When we have groupby, format as "metric, dimension" - const metricPart = show_query_identifiers + const metricPart = showQueryIdentifiers ? `${MetricDisplayNameB} (Query B)` : MetricDisplayNameB; displayName = `${metricPart}, ${entryName}`; } else { // When no groupby, format as just the entry name with optional query identifier - displayName = show_query_identifiers + displayName = showQueryIdentifiers ? `${entryName} (Query B)` : entryName; } - console.log(`DEBUG Query B: entryName="${entryName}", displayName="${displayName}", show_query_identifiers=${show_query_identifiers}`); + console.log(`DEBUG Query B: entryName="${entryName}", displayName="${displayName}", showQueryIdentifiers=${showQueryIdentifiers}`); const seriesFormatter = getFormatter( customFormattersSecondary, 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 9c5ad1b636..d73a1c2c07 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts @@ -60,7 +60,7 @@ export type EchartsMixedTimeseriesFormData = QueryFormData & { tooltipTimeFormat?: string; zoomable: boolean; richTooltip: boolean; - show_query_identifiers?: boolean; + showQueryIdentifiers?: boolean; xAxisLabelRotation: number; xAxisLabelInterval?: number | string; colorScheme?: string; @@ -134,7 +134,7 @@ export const DEFAULT_FORM_DATA: EchartsMixedTimeseriesFormData = { groupbyB: [], zoomable: TIMESERIES_DEFAULTS.zoomable, richTooltip: TIMESERIES_DEFAULTS.richTooltip, - show_query_identifiers: false, + showQueryIdentifiers: false, xAxisLabelRotation: TIMESERIES_DEFAULTS.xAxisLabelRotation, xAxisLabelInterval: TIMESERIES_DEFAULTS.xAxisLabelInterval, ...DEFAULT_TITLE_FORM_DATA,
