LineChart cleanup

1 files changed, 10 insertions, 42 deletions

diff --git a/src/client/views/nodes/DataVizBox/components/LineChart.tsx b/src/client/views/nodes/DataVizBox/components/LineChart.tsx
index d2e67e678..2b2a5326a 100644
--- a/src/client/views/nodes/DataVizBox/components/LineChart.tsx
+++ b/src/client/views/nodes/DataVizBox/components/LineChart.tsx
@@ -88,10 +88,6 @@ export class LineChart extends React.Component<LineChartProps> {
             ({ dataSet, w, h }) => {
                 if (dataSet) {
                     this.drawChart([dataSet], this.rangeVals, w, h);
-                    // redraw annotations when the chart data has changed, or the local or inherited selection has changed
-                    this.clearAnnotations();
-                    this._currSelected && this.drawAnnotations(Number(this._currSelected.x), Number(this._currSelected.y), true);
-                    this.incomingSelected?.forEach((pair: any) => this.drawAnnotations(Number(pair[this.props.axes[0]]), Number(pair[this.props.axes[1]])));
                 }
             },
             { fireImmediately: true }
@@ -103,7 +99,7 @@ export class LineChart extends React.Component<LineChartProps> {
                 // could be blue colored to make it look like anchor
                 // this.drawAnnotations()
                 // loop through annotations and draw them
-                annotations.forEach(a => this.drawAnnotations(Number(a.x), Number(a.y)));
+                // annotations.forEach(a => this.drawAnnotations(Number(a.x), Number(a.y)));
                 // this.drawAnnotations(annotations.x, annotations.y);
             },
             { fireImmediately: true }
@@ -115,49 +111,21 @@ export class LineChart extends React.Component<LineChartProps> {
             }),
             ({ selected, incomingSelected }) => {
                 // redraw annotations when the chart data has changed, or the local or inherited selection has changed
-                this.clearAnnotations();
-                selected && this.drawAnnotations(Number(selected.x), Number(selected.y), true);
-                incomingSelected?.forEach((pair: any) => this.drawAnnotations(Number(pair[this.props.axes[0]]), Number(pair[this.props.axes[1]])));
+                if (selected){
+                    const elements = document.querySelectorAll('.datapoint');
+                    for (let i = 0; i < elements.length; i++) {
+                        const element = elements[i];
+                        const x = element.getAttribute('data-x');
+                        const y = element.getAttribute('data-y');
+                        if (Number(x) === Number(selected.x) && Number(y) === Number(selected.y)) element.classList.add('selected');
+                    }
+                }
             },
             { fireImmediately: true }
         );
         if (!this.props.layoutDoc.dataViz_lineChart) this.props.layoutDoc.dataViz_lineChart = '';
     };
 
-    // anything that doesn't need to be recalculated should just be stored as drawCharts (i.e. computed values) and drawChart is gonna iterate over these observables and generate svgs based on that
-
-    clearAnnotations = () => {
-        const elements = document.querySelectorAll('.datapoint');
-        for (let i = 0; i < elements.length; i++) {
-            const element = elements[i];
-            element.classList.remove('brushed');
-            element.classList.remove('selected');
-        }
-    };
-    // gets called whenever the "data_annotations" fields gets updated
-    drawAnnotations = (dataX: number, dataY: number, selected?: boolean) => {
-        // TODO: nda - can optimize this by having some sort of mapping of the x and y values to the individual circle elements
-        // loop through all html elements with class .circle-d1 and find the one that has "data-x" and "data-y" attributes that match the dataX and dataY
-        // if it exists, then highlight it
-        // if it doesn't exist, then remove the highlight
-        const elements = document.querySelectorAll('.datapoint');
-        for (let i = 0; i < elements.length; i++) {
-            const element = elements[i];
-            const x = element.getAttribute('data-x');
-            const y = element.getAttribute('data-y');
-            if (x === dataX.toString() && y === dataY.toString()) {
-                element.classList.add(selected ? 'selected' : 'brushed');
-            }
-            // TODO: nda - this remove highlight code should go where we remove the links
-            // } else {
-            // }
-        }
-    };
-
-    removeAnnotations(dataX: number, dataY: number) {
-        // loop through and remove any annotations that no longer exist
-    }
-
     @action
     restoreView = (data: Doc) => {
         const coords = Cast(data.config_dataVizSelection, listSpec('number'), null);