refactor(charts-web): refactor to remove duplicate aggregate method call

Author: rahmanunver

packages/pluggableWidgets/area-chart-web/src/AreaChart.tsx

@@ -37,25 +37,23 @@ export const AreaChart = memo(function AreaChart(props: AreaChartContainerProps)
         const lineColorExpression = line.dataSet === "static" ? line.staticLineColor : line.dynamicLineColor;
         const markerColorExpression = line.dataSet === "static" ? line.staticMarkerColor : line.dynamicMarkerColor;
         const fillColorExpression = line.dataSet === "static" ? line.staticFillColor : line.dynamicFillColor;
-        const pts =
-            line.aggregationType === "none" ? dataPoints : aggregateDataPoints(line.aggregationType, dataPoints);
 
         return {
             type: "scatter",
             fill: "tonexty",
             fillcolor: fillColorExpression
-                ? getExpressionValue<string>(fillColorExpression, pts.dataSourceItems)
+                ? getExpressionValue<string>(fillColorExpression, dataPoints.dataSourceItems)
                 : undefined,
             mode: line.lineStyle === "line" ? "lines" : "lines+markers",
             line: {
                 shape: line.interpolation,
                 color: lineColorExpression
-                    ? getExpressionValue<string>(lineColorExpression, pts.dataSourceItems)
+                    ? getExpressionValue<string>(lineColorExpression, dataPoints.dataSourceItems)
                     : undefined
             },
             marker: {
                 color: markerColorExpression
-                    ? getExpressionValue<string>(markerColorExpression, pts.dataSourceItems)
+                    ? getExpressionValue<string>(markerColorExpression, dataPoints.dataSourceItems)
                     : undefined
             }
         };

packages/pluggableWidgets/bar-chart-web/src/BarChart.tsx

@@ -46,16 +46,13 @@ export const BarChart = memo(function BarChart(props: BarChartContainerProps): R
         useCallback((dataSeries, dataPoints, { getExpressionValue }) => {
             const barColorExpression =
                 dataSeries.dataSet === "static" ? dataSeries.staticBarColor : dataSeries.dynamicBarColor;
-            const pts =
-                dataSeries.aggregationType === "none"
-                    ? dataPoints
-                    : aggregateDataPoints(dataSeries.aggregationType, dataPoints);
+
             return {
                 type: "bar",
                 orientation: "h",
                 marker: {
                     color: barColorExpression
-                        ? getExpressionValue<string>(barColorExpression, pts.dataSourceItems)
+                        ? getExpressionValue<string>(barColorExpression, dataPoints.dataSourceItems)
                         : undefined
                 }
             };

packages/pluggableWidgets/bubble-chart-web/src/BubbleChart.tsx

@@ -70,16 +70,13 @@ export const BubbleChart = memo(
                 );
                 const markerColorExpression =
                     line.dataSet === "static" ? line.staticMarkerColor : line.dynamicMarkerColor;
-                const pts =
-                    line.aggregationType === "none"
-                        ? dataPoints
-                        : aggregateDataPoints(line.aggregationType, dataPoints);
+
                 return {
                     type: "scatter",
                     mode: "markers",
                     marker: {
                         color: markerColorExpression
-                            ? getExpressionValue<string>(markerColorExpression, pts.dataSourceItems)
+                            ? getExpressionValue<string>(markerColorExpression, dataPoints.dataSourceItems)
                             : undefined,
                         symbol: ["circle"],
                         size,

packages/pluggableWidgets/column-chart-web/src/ColumnChart.tsx

@@ -46,14 +46,10 @@ export const ColumnChart = memo(function ColumnChart(props: ColumnChartContainer
         useCallback((dataSeries, dataPoints, { getExpressionValue }) => {
             const columnColorExpression =
                 dataSeries.dataSet === "static" ? dataSeries.staticBarColor : dataSeries.dynamicBarColor;
-            const pts =
-                dataSeries.aggregationType === "none"
-                    ? dataPoints
-                    : aggregateDataPoints(dataSeries.aggregationType, dataPoints);
             return {
                 marker: {
                     color: columnColorExpression
-                        ? getExpressionValue<string>(columnColorExpression, pts.dataSourceItems)
+                        ? getExpressionValue<string>(columnColorExpression, dataPoints.dataSourceItems)
                         : undefined
                 }
             };

packages/pluggableWidgets/line-chart-web/src/LineChart.tsx

@@ -35,22 +35,19 @@ export const LineChart = memo(
                 const lineColorExpression = line.dataSet === "static" ? line.staticLineColor : line.dynamicLineColor;
                 const markerColorExpression =
                     line.dataSet === "static" ? line.staticMarkerColor : line.dynamicMarkerColor;
-                const pts =
-                    line.aggregationType === "none"
-                        ? dataPoints
-                        : aggregateDataPoints(line.aggregationType, dataPoints);
+
                 return {
                     type: "scatter",
                     mode: line.lineStyle === "line" ? "lines" : "lines+markers",
                     line: {
                         shape: line.interpolation,
                         color: lineColorExpression
-                            ? getExpressionValue<string>(lineColorExpression, pts.dataSourceItems)
+                            ? getExpressionValue<string>(lineColorExpression, dataPoints.dataSourceItems)
                             : undefined
                     },
                     marker: {
                         color: markerColorExpression
-                            ? getExpressionValue<string>(markerColorExpression, pts.dataSourceItems)
+                            ? getExpressionValue<string>(markerColorExpression, dataPoints.dataSourceItems)
                             : undefined
                     }
                 };

packages/pluggableWidgets/time-series-chart-web/src/TimeSeries.tsx

@@ -57,11 +57,7 @@ export const TimeSeries = memo(
     function TimeSeries(props: TimeSeriesContainerProps): ReactElement | null {
         const chartLines = usePlotChartDataSeries(
             props.lines,
-            useCallback((line, dataPoints) => {
-                const pts =
-                    line.aggregationType === "none"
-                        ? dataPoints
-                        : aggregateDataPoints(line.aggregationType, dataPoints);
+            useCallback(line => {
                 return {
                     mode: line.lineStyle === "line" ? "lines" : "lines+markers",
                     fill: line.enableFillArea ? "tonexty" : "none",

packages/shared/charts/src/utils/aggregations.ts

@@ -1,4 +1,3 @@
-// packages/shared/charts/src/utils/aggregations.ts
 import { Datum } from "plotly.js-dist-min";
 import { PlotChartDataPoints } from "../hooks/usePlotChartDataSeries";