refactor: preparation for time section migration (#21766)

superset-frontend/plugins/plugin-chart-table/src/buildQuery.ts

@@ -20,9 +20,8 @@ import {
   AdhocColumn,
   buildQueryContext,
   ensureIsArray,
-  FeatureFlag,
   getMetricLabel,
-  isFeatureEnabled,
+  hasGenericChartAxes,
   isPhysicalColumn,
   QueryMode,
   QueryObject,
@@ -104,7 +103,7 @@ const buildQuery: BuildQuery<TableChartFormData> = (
         if (
           isPhysicalColumn(col) &&
           formData.time_grain_sqla &&
-          isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES) &&
+          hasGenericChartAxes &&
           formData?.datetime_columns_lookup?.[col]
         ) {
           return {

superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx

@@ -23,6 +23,7 @@ import {
   ensureIsArray,
   FeatureFlag,
   GenericDataType,
+  hasGenericChartAxes,
   isAdhocColumn,
   isFeatureEnabled,
   isPhysicalColumn,
@@ -189,7 +190,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [
-          isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES) && isAggMode
+          hasGenericChartAxes && isAggMode
             ? {
                 name: 'time_grain_sqla',
                 config: {
@@ -217,9 +218,7 @@ const config: ControlPanelConfig = {
                 },
               }
             : null,
-          isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES) && isAggMode
-            ? 'datetime_columns_lookup'
-            : null,
+          hasGenericChartAxes && isAggMode ? 'datetime_columns_lookup' : null,
         ],
         [
           {