Simplify

apache · Feb 8, 2022 · 6b0f3c7 · 6b0f3c7
1 parent 754c334
commit 6b0f3c7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 29 deletions.
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -175,27 +175,26 @@ export default function transformProps(
       stack,
       yAxisIndex,
       filterState,
+      seriesKey: entry.name,
     });
     if (transformedSeries) series.push(transformedSeries);
   });
 
   rawSeriesB.forEach(entry => {
-    const transformedSeries = transformSeries(
-      entry,
-      colorScale,
-      {
-        area: areaB,
-        markerEnabled: markerEnabledB,
-        markerSize: markerSizeB,
-        areaOpacity: opacityB,
-        seriesType: seriesTypeB,
-        showValue: showValueB,
-        stack: stackB,
-        yAxisIndex: yAxisIndexB,
-        filterState,
-      },
-      rawSeriesA,
-    );
+    const transformedSeries = transformSeries(entry, colorScale, {
+      area: areaB,
+      markerEnabled: markerEnabledB,
+      markerSize: markerSizeB,
+      areaOpacity: opacityB,
+      seriesType: seriesTypeB,
+      showValue: showValueB,
+      stack: stackB,
+      yAxisIndex: yAxisIndexB,
+      filterState,
+      seriesKey: primarySeries.has(entry.name as string)
+        ? `${entry.name} (1)`
+        : entry.name,
+    });
     if (transformedSeries) series.push(transformedSeries);
   });
 

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
@@ -83,8 +83,8 @@ export function transformSeries(
     showValueIndexes?: number[];
     thresholdValues?: number[];
     richTooltip?: boolean;
+    seriesKey?: OptionName;
   },
-  additionalSeriesGroup?: SeriesOption[],
 ): SeriesOption | undefined {
   const { name } = series;
   const {
@@ -104,6 +104,7 @@ export function transformSeries(
     showValueIndexes = [],
     thresholdValues = [],
     richTooltip,
+    seriesKey,
   } = opts;
   const contexts = seriesContexts[name || ''] || [];
   const hasForecast =
@@ -148,20 +149,9 @@ export function transformSeries(
   } else {
     plotType = seriesType === 'bar' ? 'bar' : 'line';
   }
-  // checking if the same metric name is available in the previous query
-  const metricExists = !!(additionalSeriesGroup || []).find(
-    (serie: SeriesOption) => {
-      const otherForecastedSeries = extractForecastSeriesContext(
-        serie.name || '',
-      );
-      return otherForecastedSeries.name === forecastSeries.name;
-    },
-  );
   // forcing the colorScale to return a different color for same metrics across different queries
   const itemStyle = {
-    color: colorScale(
-      metricExists ? `${forecastSeries.name} (1)` : forecastSeries.name,
-    ),
+    color: colorScale(seriesKey || forecastSeries.name),
     opacity,
   };
   let emphasis = {};