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

refactor: preparation for time section migration (#21766)

Browse Source
This commit is contained in:
Yongjie Zhao
2022-10-12 08:38:30 +08:00
committed by GitHub
parent bd3166b603
commit 8f61e3c5d9
43 changed files with 416 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,7 @@ import {
AdhocColumn,
buildQueryContext,
ensureIsArray,
FeatureFlag,
isFeatureEnabled,
hasGenericChartAxes,
isPhysicalColumn,
QueryFormColumn,
QueryFormOrderBy,
@@ -42,7 +41,7 @@ export default function buildQuery(formData: PivotTableQueryFormData) {
if (
isPhysicalColumn(col) &&
formData.time_grain_sqla &&
isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES) &&
hasGenericChartAxes &&
formData?.datetime_columns_lookup?.[col]
) {
return {
@@ -66,7 +65,7 @@ export default function buildQuery(formData: PivotTableQueryFormData) {
}
return [
{
...(isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES)
...(hasGenericChartAxes
? omit(baseQueryObject, ['extras.time_grain_sqla'])
: baseQueryObject),
orderby: orderBy,

9
superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.tsx
View File

@@ -19,9 +19,8 @@
import React from 'react';
import {
ensureIsArray,
FeatureFlag,
hasGenericChartAxes,
isAdhocColumn,
isFeatureEnabled,
isPhysicalColumn,
QueryFormMetric,
smartDateFormatter,
@@ -68,7 +67,7 @@ const config: ControlPanelConfig = {
},
],
[
isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES)
hasGenericChartAxes
? {
name: 'time_grain_sqla',
config: {
@@ -98,9 +97,7 @@ const config: ControlPanelConfig = {
},
}
: null,
isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES)
? 'datetime_columns_lookup'
: null,
hasGenericChartAxes ? 'datetime_columns_lookup' : null,
],
[
{