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

fix: Dashboard time grain in Pivot Table (#24665)

Browse Source
This commit is contained in:
Michael S. Molina
2023-07-13 11:33:16 -03:00
committed by GitHub
parent a156816064
commit 6e59f11f4c
2 changed files with 97 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/buildQuery.ts
View File

@@ -30,7 +30,10 @@ import {
import { PivotTableQueryFormData } from '../types';
export default function buildQuery(formData: PivotTableQueryFormData) {
const { groupbyColumns = [], groupbyRows = [] } = formData;
const { groupbyColumns = [], groupbyRows = [], extra_form_data } = formData;
const time_grain_sqla =
extra_form_data?.time_grain_sqla || formData.time_grain_sqla;
// TODO: add deduping of AdhocColumns
const columns = Array.from(
new Set([
@@ -40,7 +43,7 @@ export default function buildQuery(formData: PivotTableQueryFormData) {
).map(col => {
if (
isPhysicalColumn(col) &&
formData.time_grain_sqla &&
time_grain_sqla &&
hasGenericChartAxes &&
/* Charts created before `GENERIC_CHART_AXES` is enabled have a different
* form data, with `granularity_sqla` set instead.
@@ -49,7 +52,7 @@ export default function buildQuery(formData: PivotTableQueryFormData) {
formData.granularity_sqla === col)
) {
return {
timeGrain: formData.time_grain_sqla,
timeGrain: time_grain_sqla,
columnType: 'BASE_AXIS',
sqlExpression: col,
label: col,