Making insert and remove static methods in PlotlyService

Author: andrefarzat

src/app/plotly/plot/plot.component.ts

@@ -106,7 +106,7 @@ export class PlotComponent implements OnInit, OnChanges, OnDestroy, DoCheck {
 
         const figure = this.createFigure();
         this.purge.emit(figure);
-        this.plotly.remove(this.plotlyInstance);
+        PlotlyService.remove(this.plotlyInstance);
     }
 
     ngOnChanges(changes: SimpleChanges) {

src/app/plotly/plotly.service.ts

@@ -32,8 +32,23 @@ export class PlotlyService {
         }
     }
 
+    public static insert(instance: Plotly.PlotlyHTMLElement) {
+        const index = PlotlyService.instances.indexOf(instance);
+        if (index === -1) {
+            PlotlyService.instances.push(instance);
+        }
+        return instance;
+    }
+
+    public static remove(div: Plotly.PlotlyHTMLElement) {
+        const index = PlotlyService.instances.indexOf(div);
+        if (index >= 0) {
+            PlotlyService.instances.splice(index, 1);
+        }
+    }
+
     public newPlot(div: HTMLDivElement, data: Plotly.Data[], layout?: Partial<Plotly.Layout>, config?: Partial<Plotly.Config>) {
-        return this.plotly.newPlot(div, data, layout, config).then(this.insert.bind(this));
+        return this.plotly.newPlot(div, data, layout, config).then(instance => PlotlyService.insert(instance));
     }
 
     public plot(div: Plotly.PlotlyHTMLElement, data: Plotly.Data[], layout?: Partial<Plotly.Layout>, config?: Partial<Plotly.Config>) {
@@ -61,19 +76,4 @@ export class PlotlyService {
         return undefined;
     }
 
-    public insert(instance: Plotly.PlotlyHTMLElement) {
-        const index = PlotlyService.instances.indexOf(instance);
-        if (index === -1) {
-            PlotlyService.instances.push(instance);
-        }
-        return instance;
-    }
-
-    public remove(div: Plotly.PlotlyHTMLElement) {
-        const index = PlotlyService.instances.indexOf(div);
-        if (index >= 0) {
-            PlotlyService.instances.splice(index, 1);
-        }
-    }
-
 }