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/01 13:05:05 UTC
(superset) branch master updated: feat: Adds legacy time support for Waterfall chart (#26136)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new f405ba033e feat: Adds legacy time support for Waterfall chart (#26136)
f405ba033e is described below
commit f405ba033e04e2694f869738163d33e1d3991297
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Fri Dec 1 10:04:53 2023 -0300
feat: Adds legacy time support for Waterfall chart (#26136)
---
.../plugins/plugin-chart-echarts/src/Waterfall/buildQuery.ts | 7 +++----
.../plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx | 8 +++++---
.../plugins/plugin-chart-echarts/src/Waterfall/index.ts | 2 +-
.../plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts | 6 +++++-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/buildQuery.ts
index e47effb3c2..deb3571938 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/buildQuery.ts
@@ -19,15 +19,14 @@
import {
buildQueryContext,
ensureIsArray,
- getXAxisColumn,
- isXAxisSet,
QueryFormData,
} from '@superset-ui/core';
export default function buildQuery(formData: QueryFormData) {
+ const { x_axis, granularity_sqla, groupby } = formData;
const columns = [
- ...(isXAxisSet(formData) ? ensureIsArray(getXAxisColumn(formData)) : []),
- ...ensureIsArray(formData.groupby),
+ ...ensureIsArray(x_axis || granularity_sqla),
+ ...ensureIsArray(groupby),
];
return buildQueryContext(formData, baseQueryObject => [
{
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx
index 7a71dd4fcb..d07e5175e6 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx
@@ -17,25 +17,27 @@
* under the License.
*/
import React from 'react';
-import { t } from '@superset-ui/core';
+import { hasGenericChartAxes, t } from '@superset-ui/core';
import {
ControlPanelConfig,
ControlSubSectionHeader,
D3_TIME_FORMAT_DOCS,
DEFAULT_TIME_FORMAT,
formatSelectOptions,
+ sections,
sharedControls,
} from '@superset-ui/chart-controls';
import { showValueControl } from '../controls';
const config: ControlPanelConfig = {
controlPanelSections: [
+ sections.genericTime,
{
label: t('Query'),
expanded: true,
controlSetRows: [
- ['x_axis'],
- ['time_grain_sqla'],
+ [hasGenericChartAxes ? 'x_axis' : null],
+ [hasGenericChartAxes ? 'time_grain_sqla' : null],
['groupby'],
['metric'],
['adhoc_filters'],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/index.ts
index c0d7a11067..b8c66fabb1 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/index.ts
@@ -61,7 +61,7 @@ export default class EchartsWaterfallChartPlugin extends ChartPlugin<
{ url: example3 },
],
name: t('Waterfall Chart'),
- tags: [t('Categorical'), t('Comparison'), t('ECharts')],
+ tags: [t('Categorical'), t('Comparison'), t('ECharts'), t('Popular')],
thumbnail,
}),
transformProps,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
index 7b5faed1b2..84fbbf6cb9 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
@@ -185,6 +185,7 @@ export default function transformProps(
const { setDataMask = () => {}, onContextMenu, onLegendStateChanged } = hooks;
const {
currencyFormat,
+ granularitySqla = '',
groupby,
increaseColor,
decreaseColor,
@@ -213,7 +214,10 @@ export default function transformProps(
const breakdownName = isAdhocColumn(breakdownColumn)
? breakdownColumn.label!
: breakdownColumn;
- const xAxisName = isAdhocColumn(xAxis) ? xAxis.label! : xAxis;
+ const xAxisColumn = xAxis || granularitySqla;
+ const xAxisName = isAdhocColumn(xAxisColumn)
+ ? xAxisColumn.label!
+ : xAxisColumn;
const metricLabel = getMetricLabel(metric);
const transformedData = transformer({