Fix performance part 2

elastic · Jul 8, 2022 · ea7c941 · ea7c941
1 parent 795ef97
commit ea7c941
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 48 deletions.
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/legend_action.tsx b/src/plugins/chart_expressions/expression_xy/public/components/legend_action.tsx
@@ -47,27 +47,21 @@ export const getLegendAction = (
 
     const { table } = layer;
 
-    const data = [...series.splitAccessors].reduce<FilterEvent['data']['data']>(
-      (acc, [accessor, value]) => {
-        const rowIndex = table.rows.findIndex((row) => {
-          return row[accessor] === value;
-        });
-        if (rowIndex !== -1) {
-          return [
-            ...acc,
-            {
-              row: rowIndex,
-              column: table.columns.findIndex((column) => column.id === accessor),
-              value: table.rows[rowIndex][accessor],
-              table,
-            },
-          ];
-        }
+    const data: FilterEvent['data']['data'] = [];
 
-        return acc;
-      },
-      []
-    );
+    series.splitAccessors.forEach((value, accessor) => {
+      const rowIndex = table.rows.findIndex((row) => {
+        return row[accessor] === value;
+      });
+      if (rowIndex !== -1) {
+        data.push({
+          row: rowIndex,
+          column: table.columns.findIndex((column) => column.id === accessor),
+          value: table.rows[rowIndex][accessor],
+          table,
+        });
+      }
+    });
 
     if (data.length === 0) {
       return null;

diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
@@ -509,30 +509,22 @@ export function XYChart({
       },
     ];
 
-    let splitPoints: FilterEvent['data']['data'] = [];
+    const splitPoints: FilterEvent['data']['data'] = [];
 
     if (xySeries.seriesKeys.length > 1) {
-      splitPoints = [...xySeries.splitAccessors].reduce<FilterEvent['data']['data']>(
-        (acc, [accessor, value]) => {
-          const splitPointRowIndex = table.rows.findIndex((row) => {
-            return row[accessor] === value;
+      xySeries.splitAccessors.forEach((value, accessor) => {
+        const splitPointRowIndex = table.rows.findIndex((row) => {
+          return row[accessor] === value;
+        });
+        if (splitPointRowIndex !== -1) {
+          splitPoints.push({
+            row: splitPointRowIndex,
+            column: table.columns.findIndex((column) => column.id === accessor),
+            value: table.rows[splitPointRowIndex][accessor],
+            table,
           });
-          if (splitPointRowIndex !== -1) {
-            return [
-              ...acc,
-              {
-                row: splitPointRowIndex,
-                column: table.columns.findIndex((column) => column.id === accessor),
-                value: table.rows[splitPointRowIndex][accessor],
-                table,
-              },
-            ];
-          }
-
-          return acc;
-        },
-        []
-      );
+        }
+      });
     }
     const context: FilterEvent['data'] = {
       data: [...points, ...splitPoints],

diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts
@@ -61,23 +61,26 @@ export const getAllSeries = (
 
   const columnToLabelMap = columnToLabel ? JSON.parse(columnToLabel) : {};
 
-  return formattedDatatable.table.rows.reduce<string[]>((acc, row) => {
+  const allSeries: string[] = [];
+
+  formattedDatatable.table.rows.forEach((row) => {
     const splitName = getSplitName(splitAccessors, formattedDatatable, row, fieldFormats);
 
-    const allRowSeries = accessors.reduce<string[]>((names, accessor) => {
+    accessors.forEach((accessor) => {
       const yAccessor = getAccessorByDimension(accessor, formattedDatatable.table.columns);
       const yTitle = columnToLabelMap[yAccessor] ?? titles?.yTitles?.[yAccessor] ?? null;
       let name = yTitle;
       if (splitName) {
         name = accessors.length > 1 ? `${splitName} - ${yTitle}` : splitName;
       }
 
-      return names.includes(name) ? names : [...names, name];
-    }, []);
+      if (!allSeries.includes(name)) {
+        allSeries.push(name);
+      }
+    });
+  });
 
-    // need only uniq values
-    return [...new Set([...acc, ...allRowSeries])];
-  }, []);
+  return allSeries;
 };
 
 export function getColorAssignments(