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

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


The following commit(s) were added to refs/heads/STREAMPIPES-145 by this push:
     new e9ffdac  [STREAMPIPES-177] Migrate pipeline details view from 
AngularJS to Angular
e9ffdac is described below

commit e9ffdac0ed886698a63adfe90f2f208748bbb725
Author: Dominik Riemer <[email protected]>
AuthorDate: Mon Jul 27 23:45:53 2020 +0200

    [STREAMPIPES-177] Migrate pipeline details view from AngularJS to Angular
---
 .../model/message/PipelineStatusMessage.java       |   3 +
 .../manager/execution/http/GraphSubmitter.java     |   2 +-
 .../rest/impl/PipelineWithUserResource.java        |   2 +-
 ui/deployment/app.module.mst                       |   2 -
 ui/deployment/appng5.module.mst                    |  12 ++
 ui/deployment/state.config.mst                     |   3 +-
 ui/src/app/core-model/gen/streampipes-model.ts     |  31 ++++-
 ui/src/app/editor-v2/editor.module.ts              |   8 +-
 .../actions/pipeline-actions.component.html        |  71 ++++++++++
 .../actions/pipeline-actions.component.ts          |  63 +++++++--
 .../actions/pipeline-actions.controller.ts         |  60 ---------
 .../components/actions/pipeline-actions.tmpl.html  |  82 ------------
 .../components/edit/quickedit.component.html       |  58 +++++++++
 .../components/edit/quickedit.component.ts         | 145 +++++++++++++++++++--
 .../components/edit/quickedit.tmpl.html            |  52 --------
 ...l.html => pipeline-elements-row.component.html} |  19 ++-
 .../elements/pipeline-elements-row.component.ts    |  54 ++++++--
 .../elements/pipeline-elements-row.controller.ts   |  53 --------
 ....tmpl.html => pipeline-elements.component.html} |  12 +-
 .../elements/pipeline-elements.component.ts        |  29 +++--
 ...w.tmpl.html => pipeline-preview.component.html} |   8 +-
 .../pipeline-preview.component.scss}               |   6 -
 .../preview/pipeline-preview.component.ts          |  71 +++++++---
 .../preview/pipeline-preview.controller.ts         |  62 ---------
 ...us.tmpl.html => pipeline-status.component.html} |  28 ++--
 .../components/status/pipeline-status.component.ts |  45 +++++--
 .../status/pipeline-status.controller.ts           |  43 ------
 .../pipeline-details.component.html                |  60 +++++++++
 ...ntroller.ts => pipeline-details.component.scss} |  16 ---
 .../pipeline-details/pipeline-details.component.ts |  63 +++++++++
 .../pipeline-details.controller.ts                 |  59 ---------
 ui/src/app/pipeline-details/pipeline-details.html  |  59 ---------
 .../pipeline-details/pipeline-details.module.ts    |  82 +++++++++---
 ui/src/app/pipelines/pipelines.component.html      |   6 +-
 ui/src/app/pipelines/pipelines.module.ts           |  13 --
 .../services/pipeline-operations.service.ts        |  10 +-
 .../app/platform-services/apis/pipeline.service.ts |  15 ++-
 37 files changed, 744 insertions(+), 663 deletions(-)

diff --git 
a/streampipes-model/src/main/java/org/apache/streampipes/model/message/PipelineStatusMessage.java
 
b/streampipes-model/src/main/java/org/apache/streampipes/model/message/PipelineStatusMessage.java
index b41405c..22f24b0 100644
--- 
a/streampipes-model/src/main/java/org/apache/streampipes/model/message/PipelineStatusMessage.java
+++ 
b/streampipes-model/src/main/java/org/apache/streampipes/model/message/PipelineStatusMessage.java
@@ -18,6 +18,9 @@
 
 package org.apache.streampipes.model.message;
 
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
+@TsModel
 public class PipelineStatusMessage {
 
        private String pipelineId;
diff --git 
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/GraphSubmitter.java
 
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/GraphSubmitter.java
index c6572e8..1899ee1 100644
--- 
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/GraphSubmitter.java
+++ 
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/GraphSubmitter.java
@@ -65,7 +65,7 @@ public class GraphSubmitter {
     } else {
       LOG.info("Could not start pipeline, initializing rollback...");
       rollbackInvokedPipelineElements(status);
-      status.setTitle("Could not start pipeline" + pipelineName + ".");
+      status.setTitle("Could not start pipeline " + pipelineName + ".");
     }
     return status;
   }
diff --git 
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java
 
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java
index 41ad641..1df1824 100644
--- 
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java
+++ 
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java
@@ -118,7 +118,7 @@ public class PipelineWithUserResource extends 
AbstractRestInterface implements I
     @GET
     @Path("/{pipelineId}")
     @Produces(MediaType.APPLICATION_JSON)
-    @GsonWithIds
+    @JacksonSerialized
     @Override
     public Response getElement(@PathParam("username") String username, 
@PathParam("pipelineId") String pipelineId) {
         return ok(getPipelineStorage().getPipeline(pipelineId));
diff --git a/ui/deployment/app.module.mst b/ui/deployment/app.module.mst
index ce11ee8..80e44b0 100644
--- a/ui/deployment/app.module.mst
+++ b/ui/deployment/app.module.mst
@@ -31,7 +31,6 @@ import spCore from './core/core.module';
 import spLayout from './layout/layout.module';
 import spLogin from './login/login.module';
 import spAppLinks from './applinks/applinks.module';
-import spPipelineDetails from './pipeline-details/pipeline-details.module';
 import { SpButtonDirective } from "./core/button/button.directive";
 import mdThemingProviderConfig from "./core/md-theming-provider.config";
 import rootScopeDelegate from "./core/root-scope-delegate.decorator";
@@ -51,7 +50,6 @@ export const Ng1AppModule = angular
         spLayout,
         spLogin,
         spAppLinks,
-        spPipelineDetails,
         'ui.router',
         'ui.router.upgrade',
         'ngAnimate',
diff --git a/ui/deployment/appng5.module.mst b/ui/deployment/appng5.module.mst
index 844f6b0..2943252 100644
--- a/ui/deployment/appng5.module.mst
+++ b/ui/deployment/appng5.module.mst
@@ -34,6 +34,7 @@ import { AuthStatusService } from 
'./services/auth-status.service';
 import { HomeModule } from './home/home.module';
 import { InfoModule } from './info/info.module';
 import { AppAssetMonitoringModule } from 
"./app-asset-monitoring/app-asset-monitoring.module";
+import { PipelineDetailsModule } from 
'./pipeline-details/pipeline-details.module';
 import { AppTransportMonitoringModule } from 
"./app-transport-monitoring/app-transport-monitoring.module";
 import { NotificationCountService } from 
"./services/notification-count-service";
 
@@ -68,6 +69,7 @@ import { NotificationModule } from 
'./notifications/notifications.module';
         AppTransportMonitoringModule,
         AppContainerModule,
         NotificationModule,
+        PipelineDetailsModule,
         {{#modulesActive}}
         {{#ng5}}
         {{{ng5_moduleName}}},
@@ -76,6 +78,16 @@ import { NotificationModule } from 
'./notifications/notifications.module';
     ],
     providers: [
         AuthStatusService,
+        {
+          provide: '$stateParams',
+          useFactory: ($injector: any) => $injector.get('$stateParams'),
+          deps: ['$injector']
+        },
+        {
+          provide: '$state',
+          useFactory: ($injector: any) => $injector.get('$state'),
+          deps: ['$injector']
+        },
         NotificationCountService,
         {provide: Logger, useClass: ConsoleLogService}
     ]
diff --git a/ui/deployment/state.config.mst b/ui/deployment/state.config.mst
index cbd9462..8191d85 100644
--- a/ui/deployment/state.config.mst
+++ b/ui/deployment/state.config.mst
@@ -27,6 +27,7 @@ import { InfoComponent } from '../info/info.component';
 import { AppContainerComponent } from 
'../app-container/app-container.component';
 import { StandaloneDashboardComponent } from 
"../dashboard/components/standalone/standalone-dashboard.component";
 import { NotificationsComponent } from 
"../notifications/notifications.component";
+import { PipelineDetailsComponent } from 
'../pipeline-details/pipeline-details.component';
 
 export default function stateConfig($stateProvider, $urlRouterProvider) {
 
@@ -64,7 +65,7 @@ export default function stateConfig($stateProvider, 
$urlRouterProvider) {
             params: {pipeline: null},
             views: {
                 'spMain@streampipes': {
-                    template: 
require('../pipeline-details/pipeline-details.html')
+                    component: PipelineDetailsComponent
                 }
             }
         })
diff --git a/ui/src/app/core-model/gen/streampipes-model.ts 
b/ui/src/app/core-model/gen/streampipes-model.ts
index 700257c..414b0d7 100644
--- a/ui/src/app/core-model/gen/streampipes-model.ts
+++ b/ui/src/app/core-model/gen/streampipes-model.ts
@@ -19,7 +19,7 @@
 /* tslint:disable */
 /* eslint-disable */
 // @ts-nocheck
-// Generated using typescript-generator version 2.24.612 on 2020-07-25 
11:23:04.
+// Generated using typescript-generator version 2.24.612 on 2020-07-27 
12:58:03.
 
 export class AbstractStreamPipesEntity {
     "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | 
"org.apache.streampipes.model.connect.adapter.AdapterDescription" | 
"org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | 
"org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | 
"org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | 
"org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | 
"org.apache.streampipes.model.connect.adapter.G [...]
@@ -1563,9 +1563,9 @@ export class GenericAdapterSetDescription extends 
AdapterSetDescription implemen
         }
         const instance = target || new GenericAdapterSetDescription();
         super.fromData(data, instance);
-        instance.protocolDescription = 
ProtocolDescription.fromData(data.protocolDescription);
-        instance.formatDescription = 
FormatDescription.fromData(data.formatDescription);
         instance.eventSchema = EventSchema.fromData(data.eventSchema);
+        instance.formatDescription = 
FormatDescription.fromData(data.formatDescription);
+        instance.protocolDescription = 
ProtocolDescription.fromData(data.protocolDescription);
         return instance;
     }
 }
@@ -1582,9 +1582,9 @@ export class GenericAdapterStreamDescription extends 
AdapterStreamDescription im
         }
         const instance = target || new GenericAdapterStreamDescription();
         super.fromData(data, instance);
-        instance.protocolDescription = 
ProtocolDescription.fromData(data.protocolDescription);
-        instance.formatDescription = 
FormatDescription.fromData(data.formatDescription);
         instance.eventSchema = EventSchema.fromData(data.eventSchema);
+        instance.formatDescription = 
FormatDescription.fromData(data.formatDescription);
+        instance.protocolDescription = 
ProtocolDescription.fromData(data.protocolDescription);
         return instance;
     }
 }
@@ -2108,6 +2108,25 @@ export class PipelineOperationStatus {
     }
 }
 
+export class PipelineStatusMessage {
+    message: string;
+    messageType: string;
+    pipelineId: string;
+    timestamp: number;
+
+    static fromData(data: PipelineStatusMessage, target?: 
PipelineStatusMessage): PipelineStatusMessage {
+        if (!data) {
+            return data;
+        }
+        const instance = target || new PipelineStatusMessage();
+        instance.pipelineId = data.pipelineId;
+        instance.timestamp = data.timestamp;
+        instance.messageType = data.messageType;
+        instance.message = data.message;
+        return instance;
+    }
+}
+
 export class Precision extends EventPropertyQualityDefinition {
     "@class": "org.apache.streampipes.model.quality.Precision";
     quantityValue: number;
@@ -2440,8 +2459,8 @@ export class SpDataSet extends SpDataStream {
         instance.supportedGrounding = 
EventGrounding.fromData(data.supportedGrounding);
         instance.datasetInvocationId = data.datasetInvocationId;
         instance.correspondingPipeline = data.correspondingPipeline;
-        instance.actualTopicName = data.actualTopicName;
         instance.brokerHostname = data.brokerHostname;
+        instance.actualTopicName = data.actualTopicName;
         return instance;
     }
 }
diff --git a/ui/src/app/editor-v2/editor.module.ts 
b/ui/src/app/editor-v2/editor.module.ts
index 75b7242..a005f27 100644
--- a/ui/src/app/editor-v2/editor.module.ts
+++ b/ui/src/app/editor-v2/editor.module.ts
@@ -131,9 +131,11 @@ import {UserDefinedOutputStrategyComponent} from 
"./components/output-strategy/u
         },
         SafeCss
     ],
-    exports: [
-        EditorComponent
-    ],
+  exports: [
+    EditorComponent,
+    PipelineComponent,
+    PipelineElementComponent
+  ],
     entryComponents: [
         EditorComponent
     ]
diff --git 
a/ui/src/app/pipeline-details/components/actions/pipeline-actions.component.html
 
b/ui/src/app/pipeline-details/components/actions/pipeline-actions.component.html
new file mode 100644
index 0000000..52070b2
--- /dev/null
+++ 
b/ui/src/app/pipeline-details/components/actions/pipeline-actions.component.html
@@ -0,0 +1,71 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<div>
+    <div class="assembly-options-preview sp-blue-bg">
+        <div fxLayout="row" fxLayoutAlign="start center">
+            <h4>Actions</h4>
+        </div>
+    </div>
+    <div class="sp-blue-border">
+        <div fxFlex="100" fxLayoutAlign="center center" fxLayout="row" 
style="padding:10px">
+            <div fxFlex="30">
+                <button mat-button mat-raised-button color="primary"
+                        matTooltip="Start Pipeline" matTooltipPosition="above"
+                        (click)="startPipeline()"
+                           [disabled]="starting" *ngIf="!pipeline.running">
+                    <mat-icon>play_arrow</mat-icon>
+                    <span>&nbsp;Start</span>
+                </button>
+                <button mat-button mat-raised-button color="primary"
+                        matTooltip="Stop Pipeline" matTooltipPosition="above"
+                        (click)="stopPipeline()"
+                           [disabled]="stopping" *ngIf="pipeline.running">
+                    <mat-icon>stop</mat-icon>
+                    <span>&nbsp;Stop</span>
+                </button>
+            </div>
+            <div fxFlex="30">
+                <button mat-button mat-raised-button color="primary"
+                        matTooltip="Modify Pipeline" matTooltipPosition="above"
+                        
(click)="pipelineOperationsService.modifyPipeline(pipeline._id)">
+                    <mat-icon>mode_edit</mat-icon>
+                    <span>&nbsp;Modify</span>
+                </button>
+            </div>
+            <div fxFlex="30">
+                <button mat-button mat-raised-button color="primary"
+                        matTooltip="Delete Pipeline" matTooltipPosition="above"
+                        
(click)="pipelineOperationsService.showDeleteDialog(pipeline, 
reloadPipelineEmitter, this.switchToPipelineView)">
+                    <mat-icon>delete</mat-icon>
+                    <span>&nbsp;Delete</span>
+                </button>
+            </div>
+<!--            <div flex="30">-->
+<!--            <md-button 
ng-click="ctrl.PipelineOperationsService.showLogs(ctrl.pipeline._id)" 
class="md-button">-->
+<!--                <md-icon-->
+<!--                        md-svg-icon="action:ic_info_24px"-->
+<!--                        aria-label="Logs" class="md-accent"></md-icon>-->
+<!--                &nbsp;Logs-->
+<!--                <md-tooltip md-direction="top">-->
+<!--                    Show Logs-->
+<!--                </md-tooltip>-->
+<!--            </md-button>-->
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/actions/pipeline-actions.component.ts 
b/ui/src/app/pipeline-details/components/actions/pipeline-actions.component.ts
index c2b2826..eff9fe6 100644
--- 
a/ui/src/app/pipeline-details/components/actions/pipeline-actions.component.ts
+++ 
b/ui/src/app/pipeline-details/components/actions/pipeline-actions.component.ts
@@ -16,16 +16,53 @@
  *
  */
 
-import {PipelineActionsController} from "./pipeline-actions.controller";
-
-declare const require: any;
-
-export let PipelineActionsComponent = {
-    template: require('./pipeline-actions.tmpl.html'),
-    bindings: {
-        pipeline: "=",
-        loadPipeline: "&"
-    },
-    controller: PipelineActionsController,
-    controllerAs: 'ctrl'
-};
+import {Component, EventEmitter, Inject, Input, OnInit, Output} from 
"@angular/core";
+import {PipelineOperationsService} from 
"../../../pipelines/services/pipeline-operations.service";
+import {Pipeline} from "../../../core-model/gen/streampipes-model";
+
+@Component({
+    selector: 'pipeline-actions',
+    templateUrl: './pipeline-actions.component.html',
+})
+export class PipelineActionsComponent implements OnInit {
+
+    starting: boolean = false;
+    stopping: boolean = false;
+
+    @Input()
+    pipeline: Pipeline;
+
+    @Output()
+    reloadPipelineEmitter: EventEmitter<boolean> = new EventEmitter<boolean>();
+
+    constructor(public pipelineOperationsService: PipelineOperationsService,
+                @Inject('$state') private $state) {
+        this.$state = $state;
+    }
+
+    ngOnInit() {
+        this.toggleRunningOperation = this.toggleRunningOperation.bind(this);
+        this.switchToPipelineView = this.switchToPipelineView.bind(this);
+    }
+
+    toggleRunningOperation(currentOperation) {
+        if (currentOperation === 'starting') {
+            this.starting = !(this.starting);
+        } else {
+            this.stopping = !(this.stopping);
+        }
+    }
+
+    switchToPipelineView() {
+        this.$state.go("streampipes.pipelines");
+    }
+
+    startPipeline() {
+        this.pipelineOperationsService.startPipeline(this.pipeline._id, 
this.toggleRunningOperation, this.reloadPipelineEmitter)
+    }
+
+    stopPipeline() {
+        this.pipelineOperationsService.stopPipeline(this.pipeline._id, 
this.toggleRunningOperation, this.reloadPipelineEmitter)
+    }
+
+}
diff --git 
a/ui/src/app/pipeline-details/components/actions/pipeline-actions.controller.ts 
b/ui/src/app/pipeline-details/components/actions/pipeline-actions.controller.ts
deleted file mode 100644
index a5174a2..0000000
--- 
a/ui/src/app/pipeline-details/components/actions/pipeline-actions.controller.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export class PipelineActionsController {
-
-    PipelineOperationsService: any;
-    starting: any;
-    stopping: any;
-    pipeline: any;
-    $state: any;
-    loadPipeline: any;
-
-    constructor(PipelineOperationsService, $state) {
-        this.PipelineOperationsService = PipelineOperationsService;
-        this.starting = false;
-        this.stopping = false;
-        this.$state = $state;
-    }
-
-    $onInit() {
-        this.toggleRunningOperation = this.toggleRunningOperation.bind(this);
-        this.reload = this.reload.bind(this);
-        this.switchToPipelineView = this.switchToPipelineView.bind(this);
-    }
-
-    toggleRunningOperation(currentOperation) {
-        if (currentOperation === 'starting') {
-            this.starting = !(this.starting);
-        } else {
-            this.stopping = !(this.stopping);
-        }
-    }
-
-    reload() {
-        this.loadPipeline();
-    }
-
-    switchToPipelineView() {
-        this.$state.go("streampipes.pipelines");
-    }
-
-}
-
-PipelineActionsController.$inject = ['PipelineOperationsService', '$state'];
diff --git 
a/ui/src/app/pipeline-details/components/actions/pipeline-actions.tmpl.html 
b/ui/src/app/pipeline-details/components/actions/pipeline-actions.tmpl.html
deleted file mode 100644
index 24271ea..0000000
--- a/ui/src/app/pipeline-details/components/actions/pipeline-actions.tmpl.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<div>
-    <div class="assembly-options-preview sp-blue-bg">
-        <div layout="row" layout-align="start center">
-            <h4>Actions</h4>
-        </div>
-    </div>
-    <div class="sp-blue-border">
-        <div flex="100" layout-align="center center" layout="row" 
style="padding:10px">
-            <div flex="30">
-                <md-button 
ng-click="ctrl.PipelineOperationsService.startPipeline(ctrl.pipeline._id, 
ctrl.toggleRunningOperation, ctrl.reload)" class="md-button"
-                           ng-disabled="ctrl.starting" 
ng-if="!ctrl.pipeline.running">
-                    <md-icon md-svg-icon="av:ic_play_arrow_24px" 
aria-label="Start"
-                             class="md-accent"></md-icon>
-                    &nbsp;Start
-                    <md-tooltip md-direction="top">
-                        Start Pipeline
-                    </md-tooltip>
-                </md-button>
-                <md-button 
ng-click="ctrl.PipelineOperationsService.stopPipeline(ctrl.pipeline._id, 
ctrl.toggleRunningOperation, ctrl.reload)" class="md-button"
-                           ng-disabled="ctrl.stopping" 
ng-if="ctrl.pipeline.running">
-                    <md-icon md-svg-icon="av:ic_stop_24px" aria-label="Stop" 
class="md-accent"></md-icon>
-                    &nbsp;Stop
-                    <md-tooltip md-direction="top">
-                        Stop Pipeline
-                    </md-tooltip>
-                </md-button>
-            </div>
-            <div flex="30">
-                <md-button 
ng-click="ctrl.PipelineOperationsService.modifyPipeline(ctrl.pipeline._id)" 
class="md-button">
-                    <md-icon
-                            md-svg-icon="editor:ic_mode_edit_24px" 
aria-label="Modify"
-                            class="md-accent">
-                    </md-icon>
-                    &nbsp;Modify
-                    <md-tooltip md-direction="top">
-                        Modify Pipeline
-                    </md-tooltip>
-                </md-button>
-            </div>
-            <div flex="30">
-                <md-button 
ng-click="ctrl.PipelineOperationsService.showDeleteDialog(ctrl.pipeline, 
ctrl.switchToPipelineView)" class="md-button">
-                    <md-icon
-                            md-svg-icon="action:ic_delete_24px"
-                            aria-label="Delete" class="md-accent"></md-icon>
-                    &nbsp;Delete
-                    <md-tooltip md-direction="top">
-                        Delete Pipeline
-                    </md-tooltip>
-                </md-button>
-            </div>
-<!--            <div flex="30">-->
-<!--            <md-button 
ng-click="ctrl.PipelineOperationsService.showLogs(ctrl.pipeline._id)" 
class="md-button">-->
-<!--                <md-icon-->
-<!--                        md-svg-icon="action:ic_info_24px"-->
-<!--                        aria-label="Logs" class="md-accent"></md-icon>-->
-<!--                &nbsp;Logs-->
-<!--                <md-tooltip md-direction="top">-->
-<!--                    Show Logs-->
-<!--                </md-tooltip>-->
-<!--            </md-button>-->
-        </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/edit/quickedit.component.html 
b/ui/src/app/pipeline-details/components/edit/quickedit.component.html
new file mode 100644
index 0000000..01d1677
--- /dev/null
+++ b/ui/src/app/pipeline-details/components/edit/quickedit.component.html
@@ -0,0 +1,58 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<div>
+    <div class="assembly-options-preview sp-blue-bg">
+        <div fxLayout="row" fxLayoutAlign="start center">
+            <h4>Edit configuration</h4>
+            <span fxFlex></span>
+            <button color="primary" mat-button mat-raised-button 
matTooltip="Save Pipeline" matTooltipPosition="above"
+                    style="display:flex;align-items:center;" 
class="settings-bar-icon-button"
+                    [disabled]="(!formValid || pipelineUpdating)"
+                    (click)="updatePipeline()">
+                <mat-icon>save</mat-icon>
+                <span>&nbsp;Update pipeline</span>
+            </button>
+        </div>
+    </div>
+    <div class="sp-blue-border">
+        <div *ngIf="selectedElement">
+            <div fxLayout="column" style="padding:5px;padding-left:10px;">
+                <pipeline-elements-row [pipeline]="pipeline"
+                                       
[element]="selectedElement"></pipeline-elements-row>
+
+                <div fxFlex="100" fxLayout="column"
+                     *ngIf="isInvocable">
+                        <form [formGroup]="parentForm" fxFlex="100">
+                            <app-static-property *ngFor="let config of 
_selectedElement.staticProperties"
+                                                 [staticProperty]="config"
+                                                 [displayRecommended]="true"
+                                                 
[staticProperties]="_selectedElement.staticProperties"
+                                                 [eventSchemas]="eventSchemas"
+                                                 [parentForm]="parentForm"
+                                                 
[fieldName]="config.internalName">
+                            </app-static-property>
+                        </form>
+                </div>
+            </div>
+        </div>
+        <div fxLayout="column" fxLayoutAlign="center center" 
*ngIf="!selectedElement">
+            (select an element in the preview window to modify it)
+        </div>
+    </div>
+</div>
diff --git a/ui/src/app/pipeline-details/components/edit/quickedit.component.ts 
b/ui/src/app/pipeline-details/components/edit/quickedit.component.ts
index 89047ed..394c805 100644
--- a/ui/src/app/pipeline-details/components/edit/quickedit.component.ts
+++ b/ui/src/app/pipeline-details/components/edit/quickedit.component.ts
@@ -16,16 +16,135 @@
  *
  */
 
-import {QuickEditController} from "./quickedit.controller";
-
-declare const require: any;
-
-export let QuickEditComponent = {
-    template: require('./quickedit.tmpl.html'),
-    bindings: {
-        pipeline: "<",
-        selectedElement: "<"
-    },
-    controller: QuickEditController,
-    controllerAs: 'ctrl'
-};
+import {
+    AfterViewInit,
+    ChangeDetectorRef,
+    Component,
+    EventEmitter,
+    Input,
+    OnInit,
+    Output
+} from "@angular/core";
+import {PipelineService} from 
"../../../platform-services/apis/pipeline.service";
+import {
+    DataProcessorInvocation,
+    DataSinkInvocation,
+    EventSchema,
+    Pipeline
+} from "../../../core-model/gen/streampipes-model";
+import {PipelineElementUnion} from "../../../editor-v2/model/editor.model";
+import {FormBuilder, FormGroup} from "@angular/forms";
+
+@Component({
+    selector: 'quick-edit',
+    templateUrl: './quickedit.component.html',
+})
+export class QuickEditComponent implements OnInit, AfterViewInit{
+
+    @Input()
+    pipeline: Pipeline;
+
+    @Output()
+    reloadPipelineEmitter: EventEmitter<void> = new EventEmitter<void>();
+
+    _selectedElement: PipelineElementUnion;
+
+    eventSchemas: EventSchema[];
+
+    parentForm: FormGroup;
+    formValid: boolean;
+    viewInitialized: boolean = false;
+
+    isInvocable: boolean = false;
+    isDataProcessor: boolean = false;
+
+    pipelineUpdating: boolean = false;
+
+    constructor(private pipelineService: PipelineService,
+                private fb: FormBuilder,
+                private changeDetectorRef: ChangeDetectorRef) {
+
+    }
+
+    ngOnInit() {
+        this.parentForm = this.fb.group({
+        });
+
+        this.parentForm.statusChanges.subscribe((status)=>{
+            this.formValid = this.viewInitialized && this.parentForm.valid;
+        })
+    }
+
+    ngAfterViewInit(): void {
+        this.viewInitialized = true;
+        this.formValid = this.viewInitialized && this.parentForm.valid;
+        this.changeDetectorRef.detectChanges();
+    }
+
+    updatePipeline() {
+        this.pipelineUpdating = true;
+        this.updatePipelineElement();
+        this.pipelineService.updatePipeline(this.pipeline).subscribe(data => {
+            this.reloadPipelineEmitter.emit();
+            this.pipelineUpdating = false;
+        });
+    }
+
+    updatePipelineElement() {
+        if (this._selectedElement instanceof DataProcessorInvocation) {
+            this.updateDataProcessor();
+        } else if (this._selectedElement instanceof DataSinkInvocation) {
+            this.updateDataSink();
+        }
+    }
+
+    updateDataProcessor() {
+        let dataProcessors: DataProcessorInvocation[] = [];
+        this.pipeline.sepas.forEach(p => {
+           if (p.dom === this._selectedElement.dom) {
+               dataProcessors.push(this._selectedElement as 
DataProcessorInvocation);
+           } else {
+                dataProcessors.push(p);
+           }
+        });
+        this.pipeline.sepas = dataProcessors;
+    }
+
+    updateDataSink() {
+        let dataSinks: DataSinkInvocation[] = [];
+        this.pipeline.actions.forEach(p => {
+            if (p.dom === this._selectedElement.dom) {
+                dataSinks.push(this._selectedElement as DataSinkInvocation);
+            } else {
+                dataSinks.push(p);
+            }
+        });
+        this.pipeline.actions = dataSinks;
+    }
+
+    get selectedElement() {
+        return this._selectedElement;
+    }
+
+    @Input()
+    set selectedElement(selectedElement: PipelineElementUnion) {
+        if (this._selectedElement) {
+            this.updatePipelineElement();
+        }
+        this._selectedElement = selectedElement;
+        this.eventSchemas = [];
+        if (this._selectedElement instanceof DataProcessorInvocation || 
this._selectedElement instanceof DataSinkInvocation) {
+            (this._selectedElement as any).inputStreams.forEach(is => {
+                this.eventSchemas = this.eventSchemas.concat(is.eventSchema);
+            });
+        }
+        this.updateTypeInfo();
+    }
+
+    updateTypeInfo() {
+        this.isDataProcessor = this._selectedElement instanceof 
DataProcessorInvocation;
+        this.isInvocable = this._selectedElement instanceof 
DataProcessorInvocation ||
+            this._selectedElement instanceof DataSinkInvocation;
+    }
+}
+
diff --git a/ui/src/app/pipeline-details/components/edit/quickedit.tmpl.html 
b/ui/src/app/pipeline-details/components/edit/quickedit.tmpl.html
deleted file mode 100644
index 27fbcd5..0000000
--- a/ui/src/app/pipeline-details/components/edit/quickedit.tmpl.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<div>
-    <div class="assembly-options-preview sp-blue-bg">
-        <div layout="row" layout-align="start center">
-            <h4>Edit configuration</h4>
-            <span flex></span>
-            <md-button
-                       class="md-icon-button" ng-click="ctrl.updatePipeline()" 
type="submit">
-                <md-tooltip md-direction="top">
-                    Update Pipeline
-                </md-tooltip>
-                <i class="material-icons">save</i>
-            </md-button>
-        </div>
-    </div>
-    <div class="sp-blue-border">
-        <div ng-if="ctrl.selectedElement != ''">
-            <div layout="column" style="padding:5px;padding-left:10px;">
-                <pipeline-elements-row pipeline="ctrl.pipeline"
-                                       
element="ctrl.selectedElement"></pipeline-elements-row>
-
-                <div flex="100" layout="column" class="customize-item-main 
sp-blue-border-nopadding"
-                     ng-repeat="staticProperty in 
ctrl.selectedElement.staticProperties">
-                    <div class="md-padding">
-                        <customize-dialog 
selected-element="ctrl.selectedElement"
-                                          
static-property="staticProperty"></customize-dialog>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div layout="column" layout-align="center center" 
ng-if="ctrl.selectedElement == ''">
-            (select an element in the preview window to modify it)
-        </div>
-    </div>
-</div>
diff --git 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.tmpl.html
 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.component.html
similarity index 51%
rename from 
ui/src/app/pipeline-details/components/elements/pipeline-elements-row.tmpl.html
rename to 
ui/src/app/pipeline-details/components/elements/pipeline-elements-row.component.html
index 82be556..5afd0e5 100644
--- 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.tmpl.html
+++ 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.component.html
@@ -16,19 +16,16 @@
   ~
   -->
 
-<div flex="100" layout="column">
-    <div layout="row" flex="100">
-        <div flex="30" layout="row" style="margin-bottom:10px;">
-            <img ng-src="{{ctrl.element.iconUrl}}" class="md-card-image 
draggable-icon {{ctrl.getElementType(ctrl.pipeline, ctrl.element)}}"
-                 alt="{{ctrl.element.name}}"
-                 ng-show="(ctrl.element.iconUrl != null && 
ctrl.element.iconUrl != 'http://localhost:8080/img')"/>
-        <span class="draggable-icon {{ctrl.getElementType(ctrl.pipeline, 
ctrl.element)}}"
-              ng-show="(ctrl.element.iconUrl == null || ctrl.element.iconUrl 
== 
'http://localhost:8080/img')">{{ctrl.elementTextIcon(ctrl.element.name)}}</span>
+<div fxFlex="100" fxLayout="column">
+    <div fxLayout="row" fxFlex="100">
+        <div fxFlex="30" fxLayout="row" style="margin-bottom:10px;">
+            <span class="draggable-icon {{elementType}}">
+                <pipeline-element [preview]="true" 
[pipelineElement]="_element"></pipeline-element>
             </span>
         </div>
-        <div flex="70" layout="column" layout-align="center left">
-            <b>{{ctrl.element.name}}</b>
-            {{ctrl.element.description}}
+        <div fxFlex="70" fxLayout="column" fxLayoutAlign="center left">
+            <b>{{element.name}}</b>
+            {{element.description}}
         </div>
     </div>
 </div>
diff --git 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.component.ts
 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.component.ts
index 45abf0c..7c2c9da 100644
--- 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.component.ts
+++ 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.component.ts
@@ -16,16 +16,44 @@
  *
  */
 
-import {PipelineElementsRowController} from 
"./pipeline-elements-row.controller";
-
-declare const require: any;
-
-export let PipelineElementsRowComponent = {
-    template: require('./pipeline-elements-row.tmpl.html'),
-    bindings: {
-        element: "<",
-        pipeline: "<"
-    },
-    controller: PipelineElementsRowController,
-    controllerAs: 'ctrl'
-};
+import {Component, Input, OnInit} from "@angular/core";
+import {PipelineElementUnion} from "../../../editor-v2/model/editor.model";
+import {Pipeline} from "../../../core-model/gen/streampipes-model";
+import {PipelineElementTypeUtils} from "../../../editor-v2/utils/editor.utils";
+
+@Component({
+    selector: 'pipeline-elements-row',
+    templateUrl: './pipeline-elements-row.component.html',
+})
+export class PipelineElementsRowComponent implements OnInit {
+
+    elementType: string;
+
+    @Input()
+    pipeline: Pipeline;
+
+    _element: PipelineElementUnion;
+
+    constructor() {
+
+    }
+
+    ngOnInit() {
+        this.updateType();
+    }
+
+    get element() {
+        return this._element;
+    }
+
+    @Input()
+    set element(element: PipelineElementUnion) {
+        this._element = element;
+        this.updateType();
+    }
+
+    updateType() {
+        this.elementType = 
PipelineElementTypeUtils.toCssShortHand(PipelineElementTypeUtils.fromType(this._element));
+    }
+
+}
diff --git 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.controller.ts
 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.controller.ts
deleted file mode 100644
index 442964b..0000000
--- 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements-row.controller.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import * as angular from 'angular';
-
-export class PipelineElementsRowController {
-
-    ElementIconText: any;
-    element: any;
-
-    constructor(ElementIconText) {
-        this.ElementIconText = ElementIconText;
-    }
-
-    elementTextIcon() {
-        return this.ElementIconText.getElementIconText(this.element.name);
-    }
-
-    getElementType(pipeline, element) {
-        var elementType = "action";
-
-        angular.forEach(pipeline.streams, el => {
-            if (element.DOM == el.DOM) {
-                elementType = "stream";
-            }
-        });
-
-        angular.forEach(pipeline.sepas, el => {
-            if (element.DOM == el.DOM) {
-                elementType = "sepa";
-            }
-        });
-
-        return elementType;
-    }
-}
-
-PipelineElementsRowController.$inject = ['ElementIconText'];
diff --git 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements.tmpl.html 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements.component.html
similarity index 73%
rename from 
ui/src/app/pipeline-details/components/elements/pipeline-elements.tmpl.html
rename to 
ui/src/app/pipeline-details/components/elements/pipeline-elements.component.html
index 5caa0c8..4af2449 100644
--- 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements.tmpl.html
+++ 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements.component.html
@@ -18,21 +18,21 @@
 
 <div>
     <div class="assembly-options-preview sp-blue-bg">
-        <div layout="row" layout-align="start center">
+        <div fxLayout="row" fxLayoutAlign="start center">
             <h4>Element Details</h4>
         </div>
     </div>
     <div class="sp-blue-border" style="max-height: 800px;overflow:auto;">
-        <div ng-if="ctrl.selectedElement != ''">
-            <div layout="column" style="padding:5px;padding-left:10px;">
-                <pipeline-elements-row pipeline="ctrl.pipeline" 
element="ctrl.selectedElement"></pipeline-elements-row>
+        <div *ngIf="selectedElement">
+            <div fxLayout="column" style="padding:5px;padding-left:10px;">
+                <pipeline-elements-row [pipeline]="pipeline" 
[element]="selectedElement"></pipeline-elements-row>
 
-                <md-divider/>
+                <mat-divider></mat-divider>
                 <div style="margin-bottom:15px;"></div>
 
             </div>
         </div>
-        <div layout="column" layout-align="center center" 
ng-if="ctrl.selectedElement == ''">
+        <div fxLayout="column" fxLayoutAlign="center center" 
*ngIf="!selectedElement">
             (select an element in the preview window to see details)
         </div>
     </div>
diff --git 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements.component.ts
 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements.component.ts
index dc911a7..025dbaf 100644
--- 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements.component.ts
+++ 
b/ui/src/app/pipeline-details/components/elements/pipeline-elements.component.ts
@@ -16,16 +16,23 @@
  *
  */
 
-import {PipelineElementsController} from "./pipeline-elements.controller";
+import {Component, Input} from "@angular/core";
+import {PipelineElementUnion} from "../../../editor-v2/model/editor.model";
+import {Pipeline} from "../../../core-model/gen/streampipes-model";
 
-declare const require: any;
+@Component({
+  selector: 'pipeline-elements',
+  templateUrl: './pipeline-elements.component.html',
+})
+export class PipelineElementsComponent {
 
-export let PipelineElementsComponent = {
-    template: require('./pipeline-elements.tmpl.html'),
-    bindings: {
-        pipeline: "<",
-        selectedElement: "<"
-    },
-    controller: PipelineElementsController,
-    controllerAs: 'ctrl'
-};
+  @Input()
+  pipeline: Pipeline;
+
+  @Input()
+  selectedElement: PipelineElementUnion
+
+  constructor() {
+
+  }
+}
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/preview/pipeline-preview.tmpl.html 
b/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.html
similarity index 78%
rename from 
ui/src/app/pipeline-details/components/preview/pipeline-preview.tmpl.html
rename to 
ui/src/app/pipeline-details/components/preview/pipeline-preview.component.html
index 58333fc..9121650 100644
--- a/ui/src/app/pipeline-details/components/preview/pipeline-preview.tmpl.html
+++ 
b/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.html
@@ -17,14 +17,14 @@
   -->
 
 <div class="assembly-options-preview sp-blue-bg">
-    <div layout="row" layout-align="start center">
-        <h4>Preview: {{ctrl.name}}</h4>
+    <div fxLayout="row" fxLayoutAlign="start center">
+        <h4>Preview: {{pipeline.name}}</h4>
     </div>
 </div>
 <div class="outer-assembly-preview">
     <div class="canvas-preview-inner">
-        <div id="{{ctrl.jspcanvas}}" class="canvas-preview">
-            <pipeline raw-pipeline-model="ctrl.rawPipelineModel" 
preview="true"></pipeline>
+        <div id="{{jspcanvas}}" class="canvas-preview">
+            <pipeline [canvasId]="jspcanvas" 
[rawPipelineModel]="rawPipelineModel" [preview]="true"></pipeline>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements.controller.ts
 
b/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.scss
similarity index 91%
rename from 
ui/src/app/pipeline-details/components/elements/pipeline-elements.controller.ts
rename to 
ui/src/app/pipeline-details/components/preview/pipeline-preview.component.scss
index e584a54..58ba04b 100644
--- 
a/ui/src/app/pipeline-details/components/elements/pipeline-elements.controller.ts
+++ 
b/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.scss
@@ -16,9 +16,3 @@
  *
  */
 
-export class PipelineElementsController  {
-
-    constructor() {
-
-    }
-}
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.ts 
b/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.ts
index 5bc8866..6c3c5c6 100644
--- 
a/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.ts
+++ 
b/ui/src/app/pipeline-details/components/preview/pipeline-preview.component.ts
@@ -16,18 +16,59 @@
  *
  */
 
-import {PipelinePreviewController} from "./pipeline-preview.controller";
-
-declare const require: any;
-
-export let PipelinePreviewComponent = {
-    template: require('./pipeline-preview.tmpl.html'),
-    bindings: {
-        pipeline: "<",
-        name: "@",
-        selectedElement: "=",
-        jspcanvas: "@"
-    },
-    controller: PipelinePreviewController,
-    controllerAs: 'ctrl'
-};
+import {Component, EventEmitter, Input, OnInit, Output} from "@angular/core";
+import {Pipeline} from "../../../core-model/gen/streampipes-model";
+import {PipelineElementConfig, PipelineElementUnion} from 
"../../../editor-v2/model/editor.model";
+import {PipelinePositioningService} from 
"../../../editor-v2/services/pipeline-positioning.service";
+import {JsplumbService} from "../../../editor-v2/services/jsplumb.service";
+import {JsplumbBridge} from 
"../../../editor-v2/services/jsplumb-bridge.service";
+import {ObjectProvider} from 
"../../../editor-v2/services/object-provider.service";
+
+@Component({
+    selector: 'pipeline-preview',
+    templateUrl: './pipeline-preview.component.html',
+    styleUrls: ['./pipeline-preview.component.scss']
+})
+export class PipelinePreviewComponent implements OnInit {
+
+    @Input()
+    jspcanvas: string;
+
+    rawPipelineModel: PipelineElementConfig[];
+
+    @Input()
+    pipeline: Pipeline;
+
+    @Output()
+    selectedElementEmitter: EventEmitter<PipelineElementUnion> = new 
EventEmitter<PipelineElementUnion>();
+
+    constructor(private PipelinePositioningService: PipelinePositioningService,
+                private JsplumbService: JsplumbService,
+                private JsplumbBridge: JsplumbBridge,
+                private ObjectProvider: ObjectProvider) {
+        this.PipelinePositioningService = PipelinePositioningService;
+        this.ObjectProvider = ObjectProvider;
+    }
+
+    ngOnInit() {
+        setTimeout(() => {
+            var elid = "#" + this.jspcanvas;
+            this.rawPipelineModel = 
this.JsplumbService.makeRawPipeline(this.pipeline, true);
+            setTimeout(() => {
+                
this.PipelinePositioningService.displayPipeline(this.rawPipelineModel, elid, 
true, true);
+                var existingEndpointIds = [];
+                setTimeout(() => {
+                    this.JsplumbBridge.selectEndpoints().each(endpoint => {
+                        if (existingEndpointIds.indexOf(endpoint.element.id) 
=== -1) {
+                            $(endpoint.element).click(() => {
+                                let payload = 
this.ObjectProvider.findElement(endpoint.element.id, 
this.rawPipelineModel).payload;
+                                this.selectedElementEmitter.emit(payload);
+                            });
+                            existingEndpointIds.push(endpoint.element.id);
+                        }
+                    });
+                });
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/preview/pipeline-preview.controller.ts 
b/ui/src/app/pipeline-details/components/preview/pipeline-preview.controller.ts
deleted file mode 100644
index caba1c4..0000000
--- 
a/ui/src/app/pipeline-details/components/preview/pipeline-preview.controller.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export class PipelinePreviewController {
-
-    PipelinePositioningService: any;
-    JsplumbService: any;
-    $timeout: any;
-    ObjectProvider: any;
-    JsplumbBridge: any;
-    jspcanvas: any;
-    rawPipelineModel: any;
-    pipeline: any;
-    selectedElement: any;
-
-    constructor(PipelinePositioningService, JsplumbService, $timeout, 
ObjectProvider, JsplumbBridge) {
-        this.PipelinePositioningService = PipelinePositioningService;
-        this.JsplumbService = JsplumbService;
-        this.$timeout = $timeout;
-        this.ObjectProvider = ObjectProvider;
-        this.JsplumbBridge = JsplumbBridge;
-    }
-
-    $onInit() {
-        this.$timeout(() => {
-            var elid = "#" + this.jspcanvas;
-            this.rawPipelineModel = 
this.JsplumbService.makeRawPipeline(this.pipeline, true);
-            this.$timeout(() => {
-                
this.PipelinePositioningService.displayPipeline(this.rawPipelineModel, elid, 
true, true);
-                var existingEndpointIds = [];
-                this.$timeout(() => {
-                    this.JsplumbBridge.selectEndpoints().each(endpoint => {
-                        if (existingEndpointIds.indexOf(endpoint.element.id) 
=== -1) {
-                            $(endpoint.element).click(() => {
-                                var payload = 
this.ObjectProvider.findElement(endpoint.element.id, 
this.rawPipelineModel).payload;
-                                this.selectedElement = payload;
-                            });
-                            existingEndpointIds.push(endpoint.element.id);
-                        }
-                    });
-                });
-            });
-        });
-    }
-}
-
-PipelinePreviewController.$inject = ['PipelinePositioningService', 
'JsplumbService', '$timeout', 'ObjectProvider', 'JsplumbBridge'];
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/status/pipeline-status.tmpl.html 
b/ui/src/app/pipeline-details/components/status/pipeline-status.component.html
similarity index 51%
rename from 
ui/src/app/pipeline-details/components/status/pipeline-status.tmpl.html
rename to 
ui/src/app/pipeline-details/components/status/pipeline-status.component.html
index 0418298..5083595 100644
--- a/ui/src/app/pipeline-details/components/status/pipeline-status.tmpl.html
+++ 
b/ui/src/app/pipeline-details/components/status/pipeline-status.component.html
@@ -17,28 +17,28 @@
   -->
 
 <div class="assembly-options-preview sp-blue-bg">
-    <div layout="row" layout-align="start center">
+    <div fxLayout="row" fxLayoutAlign="start center">
         <h4>Pipeline Status</h4>
     </div>
 </div>
 <div class="sp-blue-border">
-    <div layout="column" style="min-height:100px; 
padding:5px;padding-left:15px;" ng-if="ctrl.pipelineStatus.length > 0">
-        <div layout="row" flex="100">
-            <div flex="20"><h5><b>Date</b></h5></div>
-            <div flex="20"><h5><b>Status</b></h5></div>
-            <div flex="60"><h5><b>Description</b></h5></div>
-            <div flex="60"><h5><b>Details</b></h5></div>
+    <div fxLayout="column" style="min-height:100px; 
padding:5px;padding-left:15px;" *ngIf="pipelineStatus.length > 0">
+        <div fxLayout="row" fxFlex="100">
+            <div fxFlex="20"><h5><b>Date</b></h5></div>
+            <div fxFlex="20"><h5><b>Status</b></h5></div>
+            <div fxFlex="60"><h5><b>Description</b></h5></div>
+            <div fxFlex="60"><h5><b>Details</b></h5></div>
         </div>
-        <div flex="100" layout="column" ng-repeat="status in 
ctrl.pipelineStatus | orderBy: 'timestamp':true">
-            <div flex="100" layout="row">
-                <div flex="20"><h5>{{status.timestamp | date:'dd.MM.yyyy 
HH:mm'}}</h5></div>
-                <div flex="20"><h5>{{status.messageType}}</h5></div>
-                <div flex="60"><h5>{{status.message}}</h5></div>
-                <div flex="60"><h5>-</h5></div>
+        <div fxFlex="100" fxLayout="column" *ngFor="let status of 
pipelineStatus">
+            <div fxFlex="100" fxLayout="row">
+                <div fxFlex="20"><h5>{{status.timestamp | date:'dd.MM.yyyy 
HH:mm'}}</h5></div>
+                <div fxFlex="20"><h5>{{status.messageType}}</h5></div>
+                <div fxFlex="60"><h5>{{status.message}}</h5></div>
+                <div fxFlex="60"><h5>-</h5></div>
             </div>
         </div>
     </div>
-    <div layout="column" layout-align="center center" style="min-height:100px; 
padding:5px;padding-left:15px;" ng-if="ctrl.pipelineStatus.length==0">
+    <div fxLayout="column"fxLayoutAlign="center center" 
style="min-height:100px; padding:5px;padding-left:15px;" 
*ngIf="pipelineStatus.length==0">
         (no status information available)
     </div>
 </div>
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/status/pipeline-status.component.ts 
b/ui/src/app/pipeline-details/components/status/pipeline-status.component.ts
index 566313f..b73001f 100644
--- a/ui/src/app/pipeline-details/components/status/pipeline-status.component.ts
+++ b/ui/src/app/pipeline-details/components/status/pipeline-status.component.ts
@@ -16,15 +16,36 @@
  *
  */
 
-import {PipelineStatusController} from "./pipeline-status.controller";
-
-declare const require: any;
-
-export let PipelineStatusComponent = {
-    template: require('./pipeline-status.tmpl.html'),
-    bindings: {
-        pipeline: "<",
-    },
-    controller: PipelineStatusController,
-    controllerAs: 'ctrl'
-};
+import {Component, Input, OnInit} from "@angular/core";
+import {PipelineService} from 
"../../../platform-services/apis/pipeline.service";
+import {Pipeline, PipelineStatusMessage} from 
"../../../core-model/gen/streampipes-model";
+
+@Component({
+    selector: 'pipeline-status',
+    templateUrl: './pipeline-status.component.html',
+})
+export class PipelineStatusComponent implements OnInit {
+
+    pipelineStatus: PipelineStatusMessage[];
+
+    @Input()
+    pipeline: Pipeline;
+
+    constructor(private pipelineService: PipelineService) {
+        this.pipelineStatus = [];
+    }
+
+    ngOnInit() {
+        this.getPipelineStatus();
+    }
+
+    getPipelineStatus() {
+        this.pipelineService.getPipelineStatusById(this.pipeline._id)
+            .subscribe(msg => {
+                this.pipelineStatus = msg.sort((a, b) => {
+                    return a.timestamp - b.timestamp;
+                });
+            });
+    }
+
+}
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/status/pipeline-status.controller.ts 
b/ui/src/app/pipeline-details/components/status/pipeline-status.controller.ts
deleted file mode 100644
index bbe9448..0000000
--- 
a/ui/src/app/pipeline-details/components/status/pipeline-status.controller.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export class PipelineStatusController {
-
-    pipelineStatus: any;
-    RestApi: any;
-    pipeline: any;
-
-    constructor(RestApi) {
-        this.pipelineStatus = [];
-        this.RestApi = RestApi;
-    }
-
-    $onInit() {
-        this.getPipelineStatus();
-    }
-
-    getPipelineStatus() {
-        this.RestApi.getPipelineStatusById(this.pipeline._id)
-            .then(msg => {
-                this.pipelineStatus = msg.data;
-            });
-    }
-
-}
-
-PipelineStatusController.$inject = ['RestApi'];
\ No newline at end of file
diff --git a/ui/src/app/pipeline-details/pipeline-details.component.html 
b/ui/src/app/pipeline-details/pipeline-details.component.html
new file mode 100644
index 0000000..dbd2d97
--- /dev/null
+++ b/ui/src/app/pipeline-details/pipeline-details.component.html
@@ -0,0 +1,60 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<div fxLayout="column" class="page-container">
+    <div fxLayout="row" class="border" 
style="padding:0px;background-color:#f6f6f6;">
+        <div fxFlex="100" style="line-height:24px;border-bottom:1px solid 
#ccc">
+            <div fxFlex="100" fxLayout="row">
+                <mat-tab-group [selectedIndex]="selectedIndex" 
(selectedIndexChange)="setSelectedIndex($event)">
+                    <mat-tab label="Overview"></mat-tab>
+                    <mat-tab label="Statistics"></mat-tab>
+                    <mat-tab label="Errors"></mat-tab>
+                    <mat-tab label="Quick Edit" [disabled]="pipelineAvailable 
&& pipeline.running"></mat-tab>
+                </mat-tab-group>
+            </div>
+        </div>
+    </div>
+
+    <div fxFlex fxLayout="row" fxLayoutAlign="start top" 
*ngIf="pipelineAvailable && selectedIndex == 0">
+        <div fxFlex="60" class="md-padding">
+            <div fxFlex fxLayout="column">
+                <pipeline-preview [jspcanvas]="'assembly-preview'" 
[pipeline]="pipeline" (selectedElementEmitter)="selectElement($event)"
+                                  
style="margin-bottom:15px;"></pipeline-preview>
+                <pipeline-elements [pipeline]="pipeline"
+                                   
[selectedElement]="selectedElement"></pipeline-elements>
+
+            </div>
+        </div>
+        <div fxFlex="40" class="md-padding">
+            <div fxFlex fxLayout="column">
+                <pipeline-actions (reloadPipelineEmitter)="loadPipeline()" 
[pipeline]="pipeline"
+                                  
style="margin-bottom:15px;"></pipeline-actions>
+                <pipeline-status [pipeline]="pipeline"></pipeline-status>
+            </div>
+        </div>
+    </div>
+    <div fxFlex fxLayout="row" fxLayoutAlign="start top" 
*ngIf="pipelineAvailable && selectedIndex == 3">
+        <div fxFlex="100" class="md-padding">
+            <div fxFlex fxLayout="column">
+                <pipeline-preview [jspcanvas]="'assembly-quickedit'" 
[pipeline]="pipeline" (selectedElementEmitter)="selectElement($event)"
+                                  
style="margin-bottom:15px;"></pipeline-preview>
+                <quick-edit [pipeline]="pipeline" 
[selectedElement]="selectedElement" 
(reloadPipelineEmitter)="loadPipeline()"></quick-edit>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git 
a/ui/src/app/pipeline-details/components/edit/quickedit.controller.ts 
b/ui/src/app/pipeline-details/pipeline-details.component.scss
similarity index 73%
rename from ui/src/app/pipeline-details/components/edit/quickedit.controller.ts
rename to ui/src/app/pipeline-details/pipeline-details.component.scss
index 2bbc374..58ba04b 100644
--- a/ui/src/app/pipeline-details/components/edit/quickedit.controller.ts
+++ b/ui/src/app/pipeline-details/pipeline-details.component.scss
@@ -16,19 +16,3 @@
  *
  */
 
-import {RestApi} from "../../../services/rest-api.service";
-
-export class QuickEditController {
-
-    pipeline: any;
-
-    constructor(private restApi: RestApi) {
-
-    }
-
-    updatePipeline() {
-        this.restApi.updatePipeline(this.pipeline);
-    }
-}
-
-QuickEditController.$inject = ['RestApi'];
diff --git a/ui/src/app/pipeline-details/pipeline-details.component.ts 
b/ui/src/app/pipeline-details/pipeline-details.component.ts
new file mode 100644
index 0000000..fd6ec58
--- /dev/null
+++ b/ui/src/app/pipeline-details/pipeline-details.component.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import {Component, Inject, OnInit} from "@angular/core";
+import {PipelineService} from "../platform-services/apis/pipeline.service";
+import {Pipeline} from "../core-model/gen/streampipes-model";
+import {PipelineElementUnion} from "../editor-v2/model/editor.model";
+
+@Component({
+    selector: 'pipeline-details',
+    templateUrl: './pipeline-details.component.html',
+    styleUrls: ['./pipeline-details.component.scss']
+})
+export class PipelineDetailsComponent implements OnInit {
+
+    currentPipeline: string;
+    pipeline: Pipeline;
+    pipelineAvailable: boolean = false;
+
+    selectedIndex: number = 0;
+    selectedElement: PipelineElementUnion;
+
+    constructor(@Inject('$stateParams') private $stateParams,
+                private pipelineService: PipelineService) {
+        this.currentPipeline = $stateParams.pipeline;
+    }
+
+    ngOnInit() {
+        this.loadPipeline();
+    }
+
+    setSelectedIndex(index: number) {
+        this.selectedIndex = index;
+    }
+
+    loadPipeline() {
+        this.pipelineService.getPipelineById(this.currentPipeline)
+            .subscribe(pipeline => {
+                this.pipeline = pipeline;
+                this.pipelineAvailable = true;
+            });
+    }
+
+    selectElement(element: PipelineElementUnion) {
+        this.selectedElement = element;
+    }
+
+}
diff --git a/ui/src/app/pipeline-details/pipeline-details.controller.ts 
b/ui/src/app/pipeline-details/pipeline-details.controller.ts
deleted file mode 100644
index a6c9421..0000000
--- a/ui/src/app/pipeline-details/pipeline-details.controller.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export class PipelineDetailsCtrl {
-
-    RestApi: any;
-    $stateParams: any;
-    currentPipeline: any;
-    pipeline: any;
-    selectedTab: any;
-    selectedElement: any;
-
-    constructor(RestApi, $stateParams) {
-        this.RestApi = RestApi;
-        this.$stateParams = $stateParams;
-
-        this.currentPipeline = $stateParams.pipeline;
-        this.pipeline = {};
-
-        this.selectedTab = "overview";
-        this.selectedElement = "";
-
-    }
-
-    $onInit() {
-        this.loadPipeline();
-    }
-
-    setSelectedTab(tabTitle) {
-        this.selectedTab = tabTitle;
-    }
-
-
-    loadPipeline() {
-        this.RestApi.getPipelineById(this.currentPipeline)
-            .then(pipeline => {
-                this.pipeline = pipeline.data;
-            });
-    }
-
-}
-
-PipelineDetailsCtrl.$inject = ['RestApi', '$stateParams'];
diff --git a/ui/src/app/pipeline-details/pipeline-details.html 
b/ui/src/app/pipeline-details/pipeline-details.html
deleted file mode 100644
index 93c9b68..0000000
--- a/ui/src/app/pipeline-details/pipeline-details.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<div flex class="page-container page-container-padding"  
ng-controller="PipelineDetailsCtrl as ctrl">
-    <div flex="100" layout="row" style="padding:0px;background-color:#f6f6f6">
-        <div layout-fill>
-            <md-tabs md-dynamic-height md-border-bottom>
-                <md-tab label="Overview" 
md-on-select="ctrl.setSelectedTab('overview')"></md-tab>
-                <md-tab label="Statistics" 
md-on-select="ctrl.setSelectedTab('statistics')"></md-tab>
-                <md-tab label="Errors" 
md-on-select="ctrl.setSelectedTab('errors')"></md-tab>
-                <md-tab label="QuickEdit" 
md-on-select="ctrl.setSelectedTab('quick-edit')"
-                        ng-disabled="ctrl.pipeline.running"></md-tab>
-            </md-tabs>
-        </div>
-    </div>
-
-    <div flex layout="row" layout-align="start top" ng-if="ctrl.selectedTab == 
'overview'">
-        <div flex="60" class="md-padding">
-            <div flex layout="column">
-                <pipeline-preview jspcanvas="assembly-preview" 
pipeline="ctrl.pipeline" name="{{ctrl.pipeline.name}}" 
selected-element="ctrl.selectedElement"
-                                  ng-if="ctrl.pipeline.name!=undefined" 
style="margin-bottom:15px;"></pipeline-preview>
-                <pipeline-elements pipeline="ctrl.pipeline"
-                                   
selected-element="ctrl.selectedElement"></pipeline-elements>
-
-            </div>
-        </div>
-        <div flex="40" class="md-padding">
-            <div flex layout="column">
-                <pipeline-actions load-pipeline="ctrl.loadPipeline()" 
pipeline="ctrl.pipeline" ng-if="ctrl.pipeline.name != undefined"
-                                  
style="margin-bottom:15px;"></pipeline-actions>
-                <pipeline-status pipeline="ctrl.pipeline" 
ng-if="ctrl.pipeline.name != undefined"></pipeline-status>
-            </div>
-        </div>
-    </div>
-    <div flex layout="row" layout-align="start top" ng-if="ctrl.selectedTab == 
'quick-edit'">
-        <div flex="100" class="md-padding">
-            <div flex layout="column">
-                <pipeline-preview jspcanvas="assembly-quickedit" 
pipeline="ctrl.pipeline" name="{{ctrl.pipeline.name}}" 
selected-element="ctrl.selectedElement"
-                                  ng-if="ctrl.pipeline.name!=undefined" 
style="margin-bottom:15px;"></pipeline-preview>
-                <quick-edit pipeline="ctrl.pipeline" 
selected-element="ctrl.selectedElement" ng-if="ctrl.pipeline.name != 
undefined"></quick-edit>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ui/src/app/pipeline-details/pipeline-details.module.ts 
b/ui/src/app/pipeline-details/pipeline-details.module.ts
index 9d56279..842622a 100644
--- a/ui/src/app/pipeline-details/pipeline-details.module.ts
+++ b/ui/src/app/pipeline-details/pipeline-details.module.ts
@@ -16,27 +16,69 @@
  *
  */
 
-import * as angular from 'angular';
+import {NgModule} from "@angular/core";
+import {FlexLayoutModule} from "@angular/flex-layout";
+import {FormsModule, ReactiveFormsModule} from "@angular/forms";
+import {MatTabsModule} from "@angular/material/tabs";
+import {MatButtonModule} from "@angular/material/button";
+import {CustomMaterialModule} from "../CustomMaterial/custom-material.module";
+import {CommonModule} from "@angular/common";
+import {MatProgressSpinnerModule} from "@angular/material/progress-spinner";
+import {PipelineDetailsComponent} from "./pipeline-details.component";
+import {PipelinePreviewComponent} from 
"./components/preview/pipeline-preview.component";
+import {EditorModule} from "../editor-v2/editor.module";
+import {PipelineActionsComponent} from 
"./components/actions/pipeline-actions.component";
+import {PipelineStatusComponent} from 
"./components/status/pipeline-status.component";
+import {PipelineElementsComponent} from 
"./components/elements/pipeline-elements.component";
+import {PipelineElementsRowComponent} from 
"./components/elements/pipeline-elements-row.component";
+import {QuickEditComponent} from "./components/edit/quickedit.component";
+import {ConnectModule} from "../connect/connect.module";
 
-import spServices from '../services/services.module';
+// export default angular.module('sp.pipelineDetails', [spServices])
+//     .controller('PipelineDetailsCtrl', PipelineDetailsCtrl)
+//     .component('pipelineStatus', PipelineStatusComponent)
+//     .component('pipelinePreview', PipelinePreviewComponent)
+//     .component('pipelineElements', PipelineElementsComponent)
+//     .component('pipelineElementsRow', PipelineElementsRowComponent)
+//     .component('pipelineActions', PipelineActionsComponent)
+//     .component('quickEdit', QuickEditComponent)
+//     //.component('customizeDialog', CustomizeDialogComponent)
+//     .name;
 
-import {PipelinePreviewComponent} from 
'./components/preview/pipeline-preview.component';
-import {PipelineStatusComponent} from 
'./components/status/pipeline-status.component';
-import {PipelineElementsComponent} from 
'./components/elements/pipeline-elements.component'
-import {PipelineElementsRowComponent} from 
'./components/elements/pipeline-elements-row.component';
-import {PipelineActionsComponent} from 
'./components/actions/pipeline-actions.component';
-//import {CustomizeDialogComponent} from 
'../editor/components/customize/customize-dialog.component';
-import {QuickEditComponent} from './components/edit/quickedit.component';
+@NgModule({
+  imports: [
+    FlexLayoutModule,
+    FormsModule,
+    MatTabsModule,
+    MatButtonModule,
+    CustomMaterialModule,
+    CommonModule,
+    MatProgressSpinnerModule,
+    EditorModule,
+    ConnectModule,
+    FormsModule,
+    ReactiveFormsModule
+  ],
+  declarations: [
+    PipelineActionsComponent,
+    PipelineElementsComponent,
+    PipelineElementsRowComponent,
+    PipelineDetailsComponent,
+    PipelineStatusComponent,
+    PipelinePreviewComponent,
+    QuickEditComponent
+  ],
+  providers: [],
+  exports: [
+    PipelineDetailsComponent
+  ],
+  entryComponents: [
+    PipelineDetailsComponent
+  ]
+})
+export class PipelineDetailsModule {
 
-import {PipelineDetailsCtrl} from './pipeline-details.controller';
+  constructor() {
+  }
 
-export default angular.module('sp.pipelineDetails', [spServices])
-    .controller('PipelineDetailsCtrl', PipelineDetailsCtrl)
-    .component('pipelineStatus', PipelineStatusComponent)
-    .component('pipelinePreview', PipelinePreviewComponent)
-    .component('pipelineElements', PipelineElementsComponent)
-    .component('pipelineElementsRow', PipelineElementsRowComponent)
-    .component('pipelineActions', PipelineActionsComponent)
-    .component('quickEdit', QuickEditComponent)
-    //.component('customizeDialog', CustomizeDialogComponent)
-    .name;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/ui/src/app/pipelines/pipelines.component.html 
b/ui/src/app/pipelines/pipelines.component.html
index 9fa7300..ed57aec 100644
--- a/ui/src/app/pipelines/pipelines.component.html
+++ b/ui/src/app/pipelines/pipelines.component.html
@@ -59,8 +59,7 @@
         </div>
         <div class="sp-blue-border">
             <pipeline-overview [activeCategoryId]="activeCategoryId" 
[pipelines]="pipelines"
-                              (refreshPipelinesEmitter)="refreshPipelines()"
-                              *ngIf="pipelines.length > 0"></pipeline-overview>
+                              
(refreshPipelinesEmitter)="refreshPipelines()"></pipeline-overview>
         </div>
         <div style="margin-top:20px;margin-bottom:20px;"></div>
         <div class="assemblyOptions sp-blue-bg">
@@ -68,8 +67,7 @@
         </div>
         <div class="sp-blue-border">
             <pipeline-overview [activeCategoryId]="activeCategoryId" 
[pipelines]="systemPipelines"
-                              (refreshPipelinesEmitter)="refreshPipelines()"
-                              *ngIf="pipelines.length > 0"></pipeline-overview>
+                              
(refreshPipelinesEmitter)="refreshPipelines()"></pipeline-overview>
         </div>
     </div>
 </div>
diff --git a/ui/src/app/pipelines/pipelines.module.ts 
b/ui/src/app/pipelines/pipelines.module.ts
index 9a63ef8..636fa7b 100644
--- a/ui/src/app/pipelines/pipelines.module.ts
+++ b/ui/src/app/pipelines/pipelines.module.ts
@@ -38,14 +38,6 @@ import {PipelineCategoriesDialogComponent} from 
"./dialog/pipeline-categories/pi
 import {FormsModule} from "@angular/forms";
 import {PipelineInCategoryPipe} from "./pipeline-category.filter";
 
-// export default angular.module('sp.pipeline', [spServices, ngFileUpload, 
'ngSanitize', 'datatables'])
-//     .controller('PipelineCtrl', PipelineCtrl)
-//     .component('pipelineDetails', PipelineDetailsComponent)
-//     .filter('pipelineCategoryFilter', PipelineCategoryFilter)
-//     .filter('categoryAlreadyInPipelineFilter', 
CategoryAlreadyInPipelineFilter)
-//     .service('PipelineOperationsService', PipelineOperationsService)
-//     .name;
-
 @NgModule({
   imports: [
     FlexLayoutModule,
@@ -68,11 +60,6 @@ import {PipelineInCategoryPipe} from 
"./pipeline-category.filter";
     CategoryAlreadyInPipelinePipe,
   ],
   providers: [
-    {
-      provide: '$state',
-      useFactory: ($injector: any) => $injector.get('$state'),
-      deps: ['$injector']
-    },
     PipelineOperationsService,
     CategoryAlreadyInPipelinePipe,
     PipelineInCategoryPipe
diff --git a/ui/src/app/pipelines/services/pipeline-operations.service.ts 
b/ui/src/app/pipelines/services/pipeline-operations.service.ts
index 321d16e..cd8b2c4 100644
--- a/ui/src/app/pipelines/services/pipeline-operations.service.ts
+++ b/ui/src/app/pipelines/services/pipeline-operations.service.ts
@@ -48,6 +48,7 @@ export class PipelineOperationsService {
     toggleRunningOperation('starting');
     this.PipelineService.startPipeline(pipelineId).subscribe(msg => {
       refreshPipelinesEmitter.emit(true);
+      toggleRunningOperation('starting');
       if (this.ShepherdService.isTourActive()) {
         this.ShepherdService.trigger("pipeline-started");
       }
@@ -61,13 +62,14 @@ export class PipelineOperationsService {
     toggleRunningOperation('stopping');
     this.PipelineService.stopPipeline(pipelineId).subscribe(msg => {
       refreshPipelinesEmitter.emit(true);
+      toggleRunningOperation('stopping');
       this.showDialog(msg);
     }, error => {
       this.showDialog({title: "Network Error", success: false, pipelineId: 
undefined, pipelineName: undefined, elementStatus: []})
     });
   };
 
-  showDeleteDialog(pipeline: Pipeline, refreshPipelinesEmitter: 
EventEmitter<boolean>) {
+  showDeleteDialog(pipeline: Pipeline, refreshPipelinesEmitter: 
EventEmitter<boolean>, switchToPipelineView?: any) {
     let dialogRef: DialogRef<DeletePipelineDialogComponent> = 
this.DialogService.open(DeletePipelineDialogComponent, {
       panelType: PanelType.STANDARD_PANEL,
       title: "Delete Pipeline",
@@ -79,7 +81,11 @@ export class PipelineOperationsService {
 
     dialogRef.afterClosed().subscribe(data => {
       if (data) {
-        refreshPipelinesEmitter.emit(true);
+        if (!switchToPipelineView) {
+          refreshPipelinesEmitter.emit(true);
+        } else {
+          switchToPipelineView();
+        }
       }
     })
   };
diff --git a/ui/src/app/platform-services/apis/pipeline.service.ts 
b/ui/src/app/platform-services/apis/pipeline.service.ts
index 39ce559..7335496 100644
--- a/ui/src/app/platform-services/apis/pipeline.service.ts
+++ b/ui/src/app/platform-services/apis/pipeline.service.ts
@@ -23,8 +23,8 @@ import {Observable} from "rxjs";
 import {
   Message,
   Pipeline,
-  PipelineCategory,
-  PipelineOperationStatus
+  PipelineCategory, PipelineElementStatus,
+  PipelineOperationStatus, PipelineStatusMessage
 } from "../../core-model/gen/streampipes-model";
 import {map} from "rxjs/operators";
 
@@ -66,10 +66,6 @@ export class PipelineService {
         .pipe(map(response => Pipeline.fromData(response as Pipeline)));
   }
 
-  getPipelineStatusById(pipelineId) {
-    return this.http.get(this.platformServicesCommons.authUserBasePath() + 
"/pipelines/" + pipelineId + "/status");
-  }
-
   storePipeline(pipeline: Pipeline): Observable<Message> {
     return this.http.post(this.platformServicesCommons.authUserBasePath() + 
"/pipelines", pipeline)
         .pipe(map(response => {
@@ -101,4 +97,11 @@ export class PipelineService {
     }))
   };
 
+  getPipelineStatusById(pipelineId): Observable<PipelineStatusMessage[]> {
+    return this.http.get(this.platformServicesCommons.authUserBasePath() + 
"/pipelines/" + pipelineId + "/status")
+        .pipe(map(response => {
+          return (response as any[]).map(r => 
PipelineStatusMessage.fromData(r));
+        }));
+  }
+
 }
\ No newline at end of file

Reply via email to