iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Adds legacy time support for Waterfall chart (#26136)

This commit is contained in:
Michael S. Molina 2023-12-01 10:04:53 -03:00 committed by GitHub
parent 4f00404805
commit f405ba033e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/buildQuery.ts
View File

@ -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 => [
{

8
superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx
View File

@ -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'],

2
superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/index.ts
View File

@ -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,

6
superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
View File

@ -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({