QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-20 00:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Reordering echart props to fix confidence interval in Mixed Charts (#30716)

Browse Source 
Co-authored-by: Vedant Prajapati <40185967+vedantprajapati@users.noreply.github.com>
This commit is contained in:
geotab-data-platform
2025-01-28 14:51:52 -05:00
committed by GitHub
parent 23d9f46d30
commit f4efce3475
4 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
superset-frontend/plugins/plugin-chart-echarts/src/utils/forecast.ts
View File

@@ -17,7 +17,7 @@
* under the License.
*/
import { DataRecord, DTTM_ALIAS, ValueFormatter } from '@superset-ui/core';
import type { OptionName } from 'echarts/types/src/util/types';
import type { OptionName, SeriesOption } from 'echarts/types/src/util/types';
import type { TooltipMarker } from 'echarts/types/src/util/format';
import {
ForecastSeriesContext,
@@ -149,3 +149,34 @@ export function rebaseForecastDatum(
return newRow;
});
}
// For Confidence Bands, forecast series on mixed charts require the series sent in the following sortOrder:
export function reorderForecastSeries(row: SeriesOption[]): SeriesOption[] {
const sortOrder = {
[ForecastSeriesEnum.ForecastLower]: 1,
[ForecastSeriesEnum.ForecastUpper]: 2,
[ForecastSeriesEnum.ForecastTrend]: 3,
[ForecastSeriesEnum.Observation]: 4,
};
// Check if any item needs reordering
if (
!row.some(
item =>
item.id &&
sortOrder.hasOwnProperty(extractForecastSeriesContext(item.id).type),
)
) {
return row;
}
return row.sort((a, b) => {
const aOrder =
sortOrder[extractForecastSeriesContext(a.id ?? '').type] ??
Number.MAX_SAFE_INTEGER;
const bOrder =
sortOrder[extractForecastSeriesContext(b.id ?? '').type] ??
Number.MAX_SAFE_INTEGER;
return aOrder - bOrder;
});
}