feat: generate consistent QueryObject whether GenericAxis is enabled or disabled (#21519)

superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts

@@ -18,12 +18,13 @@
  */
 import {
   buildQueryContext,
-  DTTM_ALIAS,
   ensureIsArray,
   normalizeOrderBy,
   PostProcessingPivot,
   QueryFormData,
   QueryObject,
+  getXAxis,
+  isXAxisSet,
 } from '@superset-ui/core';
 import {
   pivotOperator,
@@ -41,11 +42,8 @@ import {
 } from '../utils/formDataSuffix';
 
 export default function buildQuery(formData: QueryFormData) {
-  const { x_axis: index } = formData;
-  const is_timeseries = index === DTTM_ALIAS || !index;
   const baseFormData = {
     ...formData,
-    is_timeseries,
   };
 
   const formData1 = removeFormDataSuffix(baseFormData, '_b');
@@ -55,9 +53,12 @@ export default function buildQuery(formData: QueryFormData) {
     buildQueryContext(fd, baseQueryObject => {
       const queryObject = {
         ...baseQueryObject,
-        columns: [...ensureIsArray(index), ...ensureIsArray(fd.groupby)],
+        columns: [
+          ...(isXAxisSet(formData) ? ensureIsArray(getXAxis(formData)) : []),
+          ...ensureIsArray(fd.groupby),
+        ],
         series_columns: fd.groupby,
-        is_timeseries,
+        ...(isXAxisSet(formData) ? {} : { is_timeseries: true }),
       };
 
       const pivotOperatorInRuntime: PostProcessingPivot = isTimeComparison(
@@ -68,8 +69,6 @@ export default function buildQuery(formData: QueryFormData) {
         : pivotOperator(fd, {
             ...queryObject,
             columns: fd.groupby,
-            index,
-            is_timeseries,
           });
 
       const tmpQueryObject = {
@@ -83,7 +82,6 @@ export default function buildQuery(formData: QueryFormData) {
           renameOperator(fd, {
             ...queryObject,
             columns: fd.groupby,
-            is_timeseries,
           }),
           flattenOperator(fd, queryObject),
         ],