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

refactor: Removes the deprecated GENERIC_CHART_AXES feature flag (#26372)

Browse Source
This commit is contained in:
Michael S. Molina
2024-01-31 09:45:57 -05:00
committed by GitHub
parent d8f7e2ce5e
commit 8a2f7d378a
99 changed files with 363 additions and 1115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import {
AdhocColumn,
buildQueryContext,
ensureIsArray,
hasGenericChartAxes,
isPhysicalColumn,
QueryFormColumn,
QueryFormOrderBy,
@@ -42,10 +41,6 @@ export default function buildQuery(formData: PivotTableQueryFormData) {
if (
isPhysicalColumn(col) &&
time_grain_sqla &&
hasGenericChartAxes &&
/* Charts created before `GENERIC_CHART_AXES` is enabled have a different
* form data, with `granularity_sqla` set instead.
*/
(formData?.temporal_columns_lookup?.[col] ||
formData.granularity_sqla === col)
) {

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

@@ -19,7 +19,6 @@
import React from 'react';
import {
ensureIsArray,
hasGenericChartAxes,
isAdhocColumn,
isPhysicalColumn,
QueryFormMetric,
@@ -30,7 +29,6 @@ import {
import {
ControlPanelConfig,
D3_TIME_FORMAT_OPTIONS,
sections,
sharedControls,
Dataset,
getStandardizedControls,
@@ -39,7 +37,6 @@ import { MetricsLayoutEnum } from '../types';
const config: ControlPanelConfig = {
controlPanelSections: [
{ ...sections.genericTime, expanded: false },
{
label: t('Query'),
expanded: true,
@@ -65,37 +62,35 @@ const config: ControlPanelConfig = {
},
],
[
hasGenericChartAxes
? {
name: 'time_grain_sqla',
config: {
...sharedControls.time_grain_sqla,
visibility: ({ controls }) => {
const dttmLookup = Object.fromEntries(
ensureIsArray(controls?.groupbyColumns?.options).map(
option => [option.column_name, option.is_dttm],
),
);
{
name: 'time_grain_sqla',
config: {
...sharedControls.time_grain_sqla,
visibility: ({ controls }) => {
const dttmLookup = Object.fromEntries(
ensureIsArray(controls?.groupbyColumns?.options).map(
option => [option.column_name, option.is_dttm],
),
);
return [
...ensureIsArray(controls?.groupbyColumns.value),
...ensureIsArray(controls?.groupbyRows.value),
]
.map(selection => {
if (isAdhocColumn(selection)) {
return true;
}
if (isPhysicalColumn(selection)) {
return !!dttmLookup[selection];
}
return false;
})
.some(Boolean);
},
},
}
: null,
hasGenericChartAxes ? 'temporal_columns_lookup' : null,
return [
...ensureIsArray(controls?.groupbyColumns.value),
...ensureIsArray(controls?.groupbyRows.value),
]
.map(selection => {
if (isAdhocColumn(selection)) {
return true;
}
if (isPhysicalColumn(selection)) {
return !!dttmLookup[selection];
}
return false;
})
.some(Boolean);
},
},
},
'temporal_columns_lookup',
],
[
{