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

fix(Mixed Timeseries Chart): Custom Metric Label (#17649) 

* fix(Mixed Timeseries Chart): Custom Metric Label

* Fixed Formatting

* Fixed Type mismatch from queryFormData

* Reverted type change and used extracted datasource

* Type fix for mapping
This commit is contained in:
Yahya Kayani 2021-12-14 11:41:04 +05:00 committed by GitHub
parent fceabf6bc5
commit 89d0d38ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
View File

@ -33,6 +33,7 @@ import {
DEFAULT_FORM_DATA, DEFAULT_FORM_DATA,
EchartsMixedTimeseriesFormData, EchartsMixedTimeseriesFormData,
EchartsMixedTimeseriesChartTransformedProps, EchartsMixedTimeseriesChartTransformedProps,
EchartsMixedTimeseriesProps,
} from './types'; } from './types';
import { ForecastSeriesEnum } from '../types'; import { ForecastSeriesEnum } from '../types';
import { parseYAxisBound } from '../utils/controls'; import { parseYAxisBound } from '../utils/controls';
@ -63,14 +64,22 @@ import {
import { TIMESERIES_CONSTANTS } from '../constants'; import { TIMESERIES_CONSTANTS } from '../constants';
export default function transformProps( export default function transformProps(
chartProps: EchartsMixedTimeseriesFormData, chartProps: EchartsMixedTimeseriesProps,
): EchartsMixedTimeseriesChartTransformedProps { ): EchartsMixedTimeseriesChartTransformedProps {
const { width, height, formData, queriesData, hooks, filterState } = const {
chartProps; width,
height,
formData,
queriesData,
hooks,
filterState,
datasource,
} = chartProps;
const { annotation_data: annotationData_ } = queriesData[0]; const { annotation_data: annotationData_ } = queriesData[0];
const annotationData = annotationData_ || {}; const annotationData = annotationData_ || {};
const data1: TimeseriesDataRecord[] = queriesData[0].data || []; const { verboseMap = {} } = datasource;
const data2: TimeseriesDataRecord[] = queriesData[1].data || []; const data1 = (queriesData[0].data || []) as TimeseriesDataRecord[];
const data2 = (queriesData[1].data || []) as TimeseriesDataRecord[];
const { const {
area, area,
@ -121,10 +130,12 @@ export default function transformProps(
}: EchartsMixedTimeseriesFormData = { ...DEFAULT_FORM_DATA, ...formData }; }: EchartsMixedTimeseriesFormData = { ...DEFAULT_FORM_DATA, ...formData };
const colorScale = CategoricalColorNamespace.getScale(colorScheme as string); const colorScale = CategoricalColorNamespace.getScale(colorScheme as string);
const rawSeriesA = extractTimeseriesSeries(rebaseTimeseriesDatum(data1), { const rebasedDataA = rebaseTimeseriesDatum(data1, verboseMap);
const rawSeriesA = extractTimeseriesSeries(rebasedDataA, {
fillNeighborValue: stack ? 0 : undefined, fillNeighborValue: stack ? 0 : undefined,
}); });
const rawSeriesB = extractTimeseriesSeries(rebaseTimeseriesDatum(data2), { const rebasedDataB = rebaseTimeseriesDatum(data2, verboseMap);
const rawSeriesB = extractTimeseriesSeries(rebasedDataB, {
fillNeighborValue: stackB ? 0 : undefined, fillNeighborValue: stackB ? 0 : undefined,
}); });