Merge pull request #4837 from hashicorp/b-ui-d3-race-condition

UI: Guard against the line chart element already being destroyed
hashicorp · Nov 7, 2018 · 31e21ae · 31e21ae
2 parents e869d1f + 5aef27c
commit 31e21ae
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ui/app/components/line-chart.js b/ui/app/components/line-chart.js
@@ -325,9 +325,11 @@ export default Component.extend(WindowResizable, {
   },
 
   mountD3Elements() {
-    d3.select(this.element.querySelector('.x-axis')).call(this.get('xAxis'));
-    d3.select(this.element.querySelector('.y-axis')).call(this.get('yAxis'));
-    d3.select(this.element.querySelector('.y-gridlines')).call(this.get('yGridlines'));
+    if (!this.get('isDestroyed') && !this.get('isDestroying')) {
+      d3.select(this.element.querySelector('.x-axis')).call(this.get('xAxis'));
+      d3.select(this.element.querySelector('.y-axis')).call(this.get('yAxis'));
+      d3.select(this.element.querySelector('.y-gridlines')).call(this.get('yGridlines'));
+    }
   },
 
   windowResizeHandler() {