refactor(xy): cleaup loops (#2538)

elastic · Oct 16, 2024 · 1b39f63 · 1b39f63
1 parent 76fd0bb
commit 1b39f63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/packages/charts/src/chart_types/xy_chart/utils/fill_series.ts b/packages/charts/src/chart_types/xy_chart/utils/fill_series.ts
@@ -24,10 +24,7 @@ export function fillSeries(
 
     const noFillRequired = isXFillNotRequired(spec, groupScaleType, isStacked);
     if (data.length === xValues.size || noFillRequired) {
-      return {
-        ...series,
-        data,
-      };
+      return series;
     }
     const filledData: typeof data = [];
     const missingValues = new Set(xValues);

diff --git a/packages/charts/src/chart_types/xy_chart/utils/series.ts b/packages/charts/src/chart_types/xy_chart/utils/series.ts
@@ -118,6 +118,7 @@ export function splitSeriesDataByAccessors(
   isBanded = false,
   stackMode?: StackMode,
   groupBySpec?: SmallMultiplesGroupBy,
+  deselectedDataSeries: SeriesIdentifier[] = [],
 ): {
   dataSeries: Map<SeriesKey, DataSeries>;
   xValues: Array<string | number>;
@@ -210,7 +211,7 @@ export function splitSeriesDataByAccessors(
           spec,
           insertOrder: insertOrder + dataSeries.size,
           sortOrder: 0,
-          isFiltered: false,
+          isFiltered: deselectedDataSeries.some(({ key: deselectedKey }) => seriesKey === deselectedKey),
         });
       }
 
@@ -368,7 +369,7 @@ export function getDataSeriesFromSpecs(
   smHValues: Set<string | number>;
   fallbackScale?: XScaleType;
 } {
-  let globalDataSeries: DataSeries[] = [];
+  const globalDataSeries: DataSeries[] = [];
   const mutatedXValueSums = new Map<string | number, number>();
 
   // the unique set of values along the x axis
@@ -399,25 +400,18 @@ export function getDataSeriesFromSpecs(
       isBanded,
       specGroup?.stackMode,
       groupBySpec,
+      deselectedDataSeries,
     );
 
     insertOrder += dataSeries.size;
 
-    // filter deselected DataSeries
-    let filteredDataSeries: DataSeries[] = [...dataSeries.values()];
-    if (deselectedDataSeries.length > 0) {
-      filteredDataSeries = filteredDataSeries.map((series) => ({
-        ...series,
-        isFiltered: deselectedDataSeries.some(({ key: deselectedKey }) => series.key === deselectedKey),
-      }));
+    for (const [, ds] of dataSeries) {
+      globalDataSeries.push(ds);
     }
 
-    globalDataSeries = [...globalDataSeries, ...filteredDataSeries];
-
     // check the nature of the x values. If all of them are numbers
     // we can use a continuous scale, if not we should use an ordinal scale.
     // The xValue is already casted to be a valid number or a string
-    // eslint-disable-next-line no-restricted-syntax
     for (const xValue of xValues) {
       if (isNumberArray && typeof xValue !== 'number') {
         isNumberArray = false;