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

2026-04-24 10:35:01 +00:00 · 2024-01-31 09:45:57 -05:00
parent d8f7e2ce5e
commit 8a2f7d378a
99 changed files with 363 additions and 1115 deletions
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
@@ -255,7 +255,6 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {

 const config: ControlPanelConfig = {
  controlPanelSections: [
-    sections.genericTime,
    sections.echartsTimeSeriesQueryWithXAxisSort,
    sections.advancedAnalyticsControls,
    sections.annotationsAndLayersControls,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/index.ts
@@ -16,12 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import {
-  AnnotationType,
-  Behavior,
-  hasGenericChartAxes,
-  t,
-} from '@superset-ui/core';
+import { AnnotationType, Behavior, t } from '@superset-ui/core';
 import {
  EchartsTimeseriesChartProps,
  EchartsTimeseriesFormData,
@@ -62,11 +57,9 @@ export default class EchartsTimeseriesBarChartPlugin extends EchartsChartPlugin<
        ],
        category: t('Evolution'),
        credits: ['https://echarts.apache.org'],
-        description: hasGenericChartAxes
-          ? t('Bar Charts are used to show metrics as a series of bars.')
-          : t(
-              'Time-series Bar Charts are used to show the changes in a metric over time as a series of bars.',
-            ),
+        description: t(
+          'Bar Charts are used to show metrics as a series of bars.',
+        ),
        exampleGallery: [
          { url: example1 },
          { url: example2 },
@@ -78,7 +71,7 @@ export default class EchartsTimeseriesBarChartPlugin extends EchartsChartPlugin<
          AnnotationType.Interval,
          AnnotationType.Timeseries,
        ],
-        name: hasGenericChartAxes ? t('Bar Chart') : t('Time-series Bar Chart'),
+        name: t('Bar Chart'),
        tags: [
          t('ECharts'),
          t('Predictive'),
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
@@ -59,7 +59,6 @@ const {
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
  controlPanelSections: [
-    sections.genericTime,
    sections.echartsTimeSeriesQueryWithXAxisSort,
    sections.advancedAnalyticsControls,
    sections.annotationsAndLayersControls,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/index.ts
@@ -16,12 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import {
-  AnnotationType,
-  Behavior,
-  hasGenericChartAxes,
-  t,
-} from '@superset-ui/core';
+import { AnnotationType, Behavior, t } from '@superset-ui/core';
 import {
  EchartsTimeseriesChartProps,
  EchartsTimeseriesFormData,
@@ -61,13 +56,9 @@ export default class EchartsTimeseriesLineChartPlugin extends EchartsChartPlugin
        ],
        category: t('Evolution'),
        credits: ['https://echarts.apache.org'],
-        description: hasGenericChartAxes
-          ? t(
-              'Line chart is used to visualize measurements taken over a given category. Line chart is a type of chart which displays information as a series of data points connected by straight line segments. It is a basic type of chart common in many fields.',
-            )
-          : t(
-              'Time-series line chart is used to visualize repeated measurements taken over regular time intervals. Line chart is a type of chart which displays information as a series of data points connected by straight line segments. It is a basic type of chart common in many fields.',
-            ),
+        description: t(
+          'Line chart is used to visualize measurements taken over a given category. Line chart is a type of chart which displays information as a series of data points connected by straight line segments. It is a basic type of chart common in many fields.',
+        ),
        exampleGallery: [{ url: example1 }, { url: example2 }],
        supportedAnnotationTypes: [
          AnnotationType.Event,
@@ -75,9 +66,7 @@ export default class EchartsTimeseriesLineChartPlugin extends EchartsChartPlugin
          AnnotationType.Interval,
          AnnotationType.Timeseries,
        ],
-        name: hasGenericChartAxes
-          ? t('Line Chart')
-          : t('Time-series Line Chart'),
+        name: t('Line Chart'),
        tags: [
          t('ECharts'),
          t('Predictive'),
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
@@ -55,7 +55,6 @@ const {
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
  controlPanelSections: [
-    sections.genericTime,
    sections.echartsTimeSeriesQueryWithXAxisSort,
    sections.advancedAnalyticsControls,
    sections.annotationsAndLayersControls,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts
@@ -16,12 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import {
-  AnnotationType,
-  Behavior,
-  hasGenericChartAxes,
-  t,
-} from '@superset-ui/core';
+import { AnnotationType, Behavior, t } from '@superset-ui/core';
 import {
  EchartsTimeseriesChartProps,
  EchartsTimeseriesFormData,
@@ -60,13 +55,9 @@ export default class EchartsTimeseriesScatterChartPlugin extends EchartsChartPlu
        ],
        category: t('Evolution'),
        credits: ['https://echarts.apache.org'],
-        description: hasGenericChartAxes
-          ? t(
-              'Scatter Plot has the horizontal axis in linear units, and the points are connected in order. It shows a statistical relationship between two variables.',
-            )
-          : t(
-              'Time-series Scatter Plot has time on the horizontal axis in linear units, and the points are connected in order. It shows a statistical relationship between two variables.',
-            ),
+        description: t(
+          'Scatter Plot has the horizontal axis in linear units, and the points are connected in order. It shows a statistical relationship between two variables.',
+        ),
        exampleGallery: [{ url: example1 }],
        supportedAnnotationTypes: [
          AnnotationType.Event,
@@ -74,9 +65,7 @@ export default class EchartsTimeseriesScatterChartPlugin extends EchartsChartPlu
          AnnotationType.Interval,
          AnnotationType.Timeseries,
        ],
-        name: hasGenericChartAxes
-          ? t('Scatter Plot')
-          : t('Time-series Scatter Plot'),
+        name: t('Scatter Plot'),
        tags: [
          t('ECharts'),
          t('Predictive'),
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
@@ -55,7 +55,6 @@ const {
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
  controlPanelSections: [
-    sections.genericTime,
    sections.echartsTimeSeriesQueryWithXAxisSort,
    sections.advancedAnalyticsControls,
    sections.annotationsAndLayersControls,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts
@@ -16,12 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import {
-  AnnotationType,
-  Behavior,
-  hasGenericChartAxes,
-  t,
-} from '@superset-ui/core';
+import { AnnotationType, Behavior, t } from '@superset-ui/core';
 import {
  EchartsTimeseriesChartProps,
  EchartsTimeseriesFormData,
@@ -60,13 +55,9 @@ export default class EchartsTimeseriesSmoothLineChartPlugin extends EchartsChart
        ],
        category: t('Evolution'),
        credits: ['https://echarts.apache.org'],
-        description: hasGenericChartAxes
-          ? t(
-              'Smooth-line is a variation of the line chart. Without angles and hard edges, Smooth-line sometimes looks smarter and more professional.',
-            )
-          : t(
-              'Time-series Smooth-line is a variation of the line chart. Without angles and hard edges, Smooth-line sometimes looks smarter and more professional.',
-            ),
+        description: t(
+          'Smooth-line is a variation of the line chart. Without angles and hard edges, Smooth-line sometimes looks smarter and more professional.',
+        ),
        exampleGallery: [{ url: example1 }],
        supportedAnnotationTypes: [
          AnnotationType.Event,
@@ -74,9 +65,7 @@ export default class EchartsTimeseriesSmoothLineChartPlugin extends EchartsChart
          AnnotationType.Interval,
          AnnotationType.Timeseries,
        ],
-        name: hasGenericChartAxes
-          ? t('Smooth Line')
-          : t('Time-series Smooth Line'),
+        name: t('Smooth Line'),
        tags: [
          t('ECharts'),
          t('Predictive'),