Fix test

apache · Apr 24, 2023 · 84227ec · 84227ec
1 parent 5e6d713
commit 84227ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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
@@ -45,7 +45,8 @@ export default function buildQuery(formData: PivotTableQueryFormData) {
       /* 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)
+      (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/test/plugin/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-pivot-table/test/plugin/buildQuery.test.ts
@@ -18,9 +18,9 @@
  */
 
 import { TimeGranularity } from '@superset-ui/core';
+import * as supersetCoreModule from '@superset-ui/core';
 import buildQuery from '../../src/plugin/buildQuery';
 import { PivotTableQueryFormData } from '../../src/types';
-import * as buildQueryModule from '../../src/plugin/buildQuery';
 
 describe('PivotTableChart buildQuery', () => {
   const formData: PivotTableQueryFormData = {
@@ -59,7 +59,7 @@ describe('PivotTableChart buildQuery', () => {
   });
 
   it('should work with old charts after GENERIC_CHART_AXES is enabled', () => {
-    Object.defineProperty(buildQueryModule, 'hasGenericChartAxes', {
+    Object.defineProperty(supersetCoreModule, 'hasGenericChartAxes', {
       value: true,
     });
     const modifiedFormData = {