Merge branch 'development' into dev-eromano-bundle

demo-shell-ng2/app/components/activiti/activiti-demo.component.html

@@ -92,10 +92,17 @@
             <div class="page-content">
                 <div class="mdl-grid">
                     <div class="mdl-cell mdl-cell--4-col task-column mdl-shadow--2dp">
-                        <analytics-report-list (reportClick)="onReportClick($event)"></analytics-report-list>
+                        <analytics-report-list
+                                (reportClick)="onReportClick($event)"
+                                #analyticsreportlist >
+                        </analytics-report-list>
                     </div>
                     <div class="mdl-cell mdl-cell--8-col task-column mdl-shadow--2dp">
-                        <activiti-analytics [appId]="appId" *ngIf="report" [reportId]="report.id"></activiti-analytics>
+                        <activiti-analytics *ngIf="report"
+                                            [appId]="appId"
+                                            [reportId]="report.id"
+                                            (editReport)="onEditReport($event)">
+                        </activiti-analytics>
                     </div>
                 </div>
             </div>

demo-shell-ng2/app/components/activiti/activiti-demo.component.ts

@@ -30,6 +30,7 @@ import {
     ActivitiStartProcessInstance,
     ProcessInstance
 } from 'ng2-activiti-processlist';
+import { AnalyticsReportListComponent } from 'ng2-activiti-analytics';
 import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs/Rx';
 import {
@@ -75,6 +76,9 @@ export class ActivitiDemoComponent implements AfterViewInit {
     @ViewChild(ActivitiStartProcessInstance)
     activitiStartProcess: ActivitiStartProcessInstance;
 
+    @ViewChild(AnalyticsReportListComponent)
+    analyticsreportlist: AnalyticsReportListComponent;
+
     @Input()
     appId: number;
 
@@ -183,6 +187,10 @@ export class ActivitiDemoComponent implements AfterViewInit {
         this.currentProcessInstanceId = processInstanceId;
     }
 
+    onEditReport(name: string) {
+        this.analyticsreportlist.reload();
+    }
+
     navigateStartProcess() {
         this.currentProcessInstanceId = currentProcessIdNew;
     }
@@ -225,11 +233,11 @@ export class ActivitiDemoComponent implements AfterViewInit {
     }
 
     loadStencilScriptsInPageFromActiviti() {
-        this.apiService.getInstance().activiti.scriptFileApi.getControllers().then(function (response) {
+        this.apiService.getInstance().activiti.scriptFileApi.getControllers().then(response => {
             if (response) {
                 let s = document.createElement('script');
                 s.type = 'text/javascript';
-                s.src = response;
+                s.text = response;
                 this.elementRef.nativeElement.appendChild(s);
             }
         });

demo-shell-ng2/package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "clean": "npm install rimraf && npm run clean-build  && rimraf dist node_modules typings dist",
     "start": "webpack-dev-server --inline --progress --port 3000",
+    "start:dist": "wsrv -s dist/ -p 3000 -a 0.0.0.0",
     "clean-build": "rimraf 'app/{,**/}**.js' 'app/{,**/}**.js.map' 'app/{,**/}**.d.ts'",
     "test": "karma start",
     "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail",
@@ -124,7 +125,12 @@
     "typescript": "2.0.3",
     "webpack": "^1.13.0",
     "webpack-dev-server": "^1.14.1",
-    "webpack-merge": "^0.14.0"
+    "webpack-merge": "^0.14.0",
+    "source-map-loader": "^0.1.5",
+    "script-loader": "^0.7.0",
+    "copy-webpack-plugin": "^4.0.1",
+    "glob": "^7.1.1",
+    "wsrv": "^0.1.6"
   },
   "license-check-config": {
     "src": [