fix: pivot v2 charts created before GENERIC_CHART_AXES is enabled (#…

…23731)
apache · Apr 26, 2023 · 314987f · 314987f
1 parent e8121b1
commit 314987f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/buildQuery.ts b/superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/buildQuery.ts
@@ -42,7 +42,11 @@ export default function buildQuery(formData: PivotTableQueryFormData) {
  isPhysicalColumn(col) &&
  formData.time_grain_sqla &&
  hasGenericChartAxes &&
- formData?.temporal_columns_lookup?.[col]
+ /* 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)
  ) {
  return {
  timeGrain: formData.time_grain_sqla,

diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/types.ts b/superset-frontend/plugins/plugin-chart-pivot-table/src/types.ts
@@ -80,6 +80,8 @@ interface PivotTableCustomizeProps {
  filters?: ContextMenuFilters,
  ) => void;
  timeGrainSqla?: TimeGranularity;
+ time_grain_sqla?: TimeGranularity;
+ granularity_sqla?: string;
 }
 
 export type PivotTableQueryFormData = QueryFormData &

diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/test/plugin/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-pivot-table/test/plugin/buildQuery.test.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { TimeGranularity } from '@superset-ui/core';
+import * as supersetCoreModule from '@superset-ui/core';
 import buildQuery from '../../src/plugin/buildQuery';
 import { PivotTableQueryFormData } from '../../src/types';
 
@@ -55,4 +57,29 @@ describe('PivotTableChart buildQuery', () => {
  const [query] = queryContext.queries;
  expect(query.columns).toEqual(['col1', 'col2', 'row1', 'row2']);
  });
+
+ it('should work with old charts after GENERIC_CHART_AXES is enabled', () => {
+ Object.defineProperty(supersetCoreModule, 'hasGenericChartAxes', {
+ value: true,
+ });
+ const modifiedFormData = {
+ ...formData,
+ time_grain_sqla: TimeGranularity.MONTH,
+ granularity_sqla: 'col1',
+ };
+ const queryContext = buildQuery(modifiedFormData);
+ const [query] = queryContext.queries;
+ expect(query.columns).toEqual([
+ {
+ timeGrain: 'P1M',
+ columnType: 'BASE_AXIS',
+ sqlExpression: 'col1',
+ label: 'col1',
+ expressionType: 'SQL',
+ },
+ 'col2',
+ 'row1',
+ 'row2',
+ ]);
+ });
 });