[incubator-streampipes] branch dev updated: STREAMPIPES-53: Use PlotlyViaWindowModule

[ri...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new 9ccaba7  STREAMPIPES-53: Use PlotlyViaWindowModule
9ccaba7 is described below

commit 9ccaba78d0d85824bf794dab2441a15ab2912751
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Feb 17 17:00:18 2020 +0100

    STREAMPIPES-53: Use PlotlyViaWindowModule
---
 ui/angular.json                      | 4 +++-
 ui/package.json                      | 1 +
 ui/src/app/core-ui/core-ui.module.ts | 4 ++--
 ui/src/index.html                    | 2 --
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/angular.json b/ui/angular.json
index aff1003..f3182a7 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -23,7 +23,9 @@
             "styles": [
               "src/scss/main.scss"
             ],
-            "scripts": []
+            "scripts": [
+              "node_modules/plotly.js/dist/plotly.min.js"
+            ]
           },
           "configurations": {
             "production": {
diff --git a/ui/package.json b/ui/package.json
index 66cd0aa..4fed6ca 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -86,6 +86,7 @@
     "ng2-dragula": "^1.5.0",
     "ngmap": "1.18.0",
     "ngx-color-picker": "^9.0.0",
+    "plotly.js": "^1.52.2",
     "prismjs": "^1.16.0",
     "rxjs": "^6.3.3",
     "rxjs-compat": "^6.3.3",
diff --git a/ui/src/app/core-ui/core-ui.module.ts b/ui/src/app/core-ui/core-ui.module.ts
index 9c4f049..33438df 100644
--- a/ui/src/app/core-ui/core-ui.module.ts
+++ b/ui/src/app/core-ui/core-ui.module.ts
@@ -31,7 +31,7 @@ import {TableComponent} from './table/table.component';
 import {LineChartComponent} from './linechart/lineChart.component';
 
 //import * as PlotlyJS from 'plotly.js/dist/plotly.js';
-import { PlotlyViaCDNModule } from 'angular-plotly.js';
+import { PlotlyViaWindowModule } from 'angular-plotly.js';
 //PlotlyViaCDNModule.plotlyjs = PlotlyJS;
 
 @NgModule({
@@ -46,7 +46,7 @@ import { PlotlyViaCDNModule } from 'angular-plotly.js';
         MatProgressSpinnerModule,
         MatDatepickerModule,
         MatNativeDateModule,
-        PlotlyViaCDNModule,
+        PlotlyViaWindowModule,
     ],
     declarations: [
         TableComponent,
diff --git a/ui/src/index.html b/ui/src/index.html
index 24a0cf6..289a024 100644
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -70,8 +70,6 @@
     <meta name="msapplication-wide310x150logo" content="assets/img/favicon/mstile-310x150.png?v=2"/>
     <meta name="msapplication-square310x310logo" content="assets/img/favicon/mstile-310x310.png?v=2"/>
 
-    <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
-
     <script type="text/javascript">
         var domain = "";
         var standardUrl = window.location.protocol + "//" + window.location.host + "/semantic-epa-backend/api/";