You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2022/10/12 14:18:49 UTC

[incubator-streampipes] branch STREAMPIPES-597 created (now 5738cbb01)

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

zehnder pushed a change to branch STREAMPIPES-597
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


      at 5738cbb01 [STREAMPIPES-597] Refactor adapter configuration component

This branch includes the following new commits:

     new c6882e4eb [STREAMPIPES-597] Add component for adapter configuration header
     new c30b1a44c [STREAMPIPES-597] Rename new adapter component to adapter configuration
     new 3b87e82f8 [STREAMPIPES-597] Add component to add and edit adapters
     new 5738cbb01 [STREAMPIPES-597] Refactor adapter configuration component

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-streampipes] 03/04: [STREAMPIPES-597] Add component to add and edit adapters

Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 3b87e82f82e8840f238f11597e6c8fb671cd299f
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Oct 12 15:00:49 2022 +0200

    [STREAMPIPES-597] Add component to add and edit adapters
---
 .../adapter-configuration-header.component.ts      |  8 ---
 .../adapter-configuration.component.html           |  3 +-
 .../adapter-configuration.component.ts             | 68 +++++++---------------
 .../edit-adapter/edit-adapter.component.html       |  1 +
 .../edit-adapter/edit-adapter.component.scss       |  0
 .../edit-adapter/edit-adapter.component.ts         | 15 +++++
 .../new-adapter/new-adapter.component.html         |  3 +
 .../new-adapter/new-adapter.component.scss         |  0
 .../new-adapter/new-adapter.component.ts           | 38 ++++++++++++
 ui/src/app/connect/connect.module.ts               | 30 +++++++---
 10 files changed, 102 insertions(+), 64 deletions(-)

diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
index 0c8643cd8..0b871b1b2 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
@@ -25,9 +25,6 @@ import { Component, Input } from '@angular/core';
 })
 export class AdapterConfigurationHeaderComponent {
 
-
-  // @Input() adapter: AdapterDescriptionUnion;
-
   /**
    * Used to display the type of the configured adapter
    */
@@ -41,9 +38,4 @@ export class AdapterConfigurationHeaderComponent {
   constructor() {
   }
 
-  // ngOnInit(): void {
-  //   this.adapterTypeName = this.adapter.name;
-  // this.isDataStreamDescription = this.connectService.isDataStreamDescription(this.adapter);
-  // }
-
 }
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
index d506e3c38..10bd13175 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
@@ -25,7 +25,8 @@
     </div>
     <div fxLayout="column" fxLayoutAlign="center stretch" *ngIf="adapter">
 
-        <sp-adapter-configuration-header [adapterTypeName]="adapterTypeName" [isDataStreamDescription]="isDataStreamDescription"></sp-adapter-configuration-header>
+        <sp-adapter-configuration-header [adapterTypeName]="adapterTypeName"
+                                         [isDataStreamDescription]="isDataStreamDescription"></sp-adapter-configuration-header>
 
         <mat-horizontal-stepper [linear]="true" #stepper color="accent" class="stepper">
             <mat-step *ngIf="!isGenericAdapter">
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
index 731fbe55e..65adc340f 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { MatStepper } from '@angular/material/stepper';
 import {
@@ -36,8 +36,6 @@ import { EventSchemaComponent } from './schema-editor/event-schema/event-schema.
 import { TransformationRuleService } from '../../services/transformation-rule.service';
 import { IconService } from '../../services/icon.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { SpBreadcrumbService } from '@streampipes/shared-ui';
-import { SpConnectRoutes } from '../../connect.routes';
 
 @Component({
   selector: 'sp-adapter-configuration',
@@ -46,8 +44,6 @@ import { SpConnectRoutes } from '../../connect.routes';
 })
 export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
 
-
-  adapterTypeName = '';
   isDataStreamDescription = true;
 
 
@@ -56,7 +52,11 @@ export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
 
   isGenericAdapter = false;
 
-  adapter: AdapterDescriptionUnion = undefined;
+  /**
+   * Used to display the type of the configured adapter
+   */
+  @Input() adapterTypeName = '';
+  @Input() adapter: AdapterDescriptionUnion;
 
   myStepper: MatStepper;
 
@@ -90,7 +90,21 @@ export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
     private route: ActivatedRoute,
     private dataMarketplaceService: AdapterService,
     private router: Router,
-    private breadcrumbService: SpBreadcrumbService) {
+  ) {
+  }
+
+  ngOnInit() {
+    this.parentForm = this._formBuilder.group({});
+
+    this.isDataStreamDescription = this.connectService.isDataStreamDescription(this.adapter);
+    this.isGenericAdapter = this.connectService.isGenericDescription(this.adapter);
+
+    this.formatConfigurationValid = false;
+
+    this.protocolConfigurationValid = false;
+
+    this.eventSchema = this.connectService.getEventSchema(this.adapter);
+
   }
 
   handleFileInput(files: any) {
@@ -105,46 +119,6 @@ export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
       );
   }
 
-  ngOnInit() {
-
-    // TODO what is this code doing?
-    this.dataMarketplaceService.getAdapterDescriptions().subscribe(adapters => {
-      const adapter = adapters.find(a => a.appId === this.route.snapshot.params.appId);
-      this.adapter = this.connectService.cloneAdapterDescription(adapter);
-      this.breadcrumbService.updateBreadcrumb(this.breadcrumbService
-        .makeRoute([SpConnectRoutes.BASE, SpConnectRoutes.CREATE], this.adapter.name));
-      this.adapter.name = '';
-      this.adapter.description = '';
-      this.parentForm = this._formBuilder.group({});
-
-      this.adapterTypeName = adapter.name;
-      this.isDataStreamDescription = this.connectService.isDataStreamDescription(adapter);
-
-
-      this.isGenericAdapter = this.connectService.isGenericDescription(this.adapter);
-
-      this.formatConfigurationValid = false;
-
-      this.protocolConfigurationValid = false;
-
-      this.eventSchema = this.connectService.getEventSchema(this.adapter);
-
-      // TODO I think I can remove this with the new edit mode
-      if (this.eventSchema.eventProperties.length > 0) {
-
-        // Timeout is needed for stepper to work correctly. Without the stepper is frozen when initializing with
-        // step 2. Can be removed when a better solution is found.
-        setTimeout(() => {
-          this.goForward();
-          this.goForward();
-        }, 1);
-
-        this.isEditable = false;
-        this.oldEventSchema = this.eventSchema;
-      }
-    });
-  }
-
   ngAfterViewInit() {
     this.viewInitialized = true;
     this.changeDetectorRef.detectChanges();
diff --git a/ui/src/app/connect/components/edit-adapter/edit-adapter.component.html b/ui/src/app/connect/components/edit-adapter/edit-adapter.component.html
new file mode 100644
index 000000000..ab4035697
--- /dev/null
+++ b/ui/src/app/connect/components/edit-adapter/edit-adapter.component.html
@@ -0,0 +1 @@
+<p>edit-adapter works!</p>
diff --git a/ui/src/app/connect/components/edit-adapter/edit-adapter.component.scss b/ui/src/app/connect/components/edit-adapter/edit-adapter.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/src/app/connect/components/edit-adapter/edit-adapter.component.ts b/ui/src/app/connect/components/edit-adapter/edit-adapter.component.ts
new file mode 100644
index 000000000..27da21f42
--- /dev/null
+++ b/ui/src/app/connect/components/edit-adapter/edit-adapter.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'sp-edit-adapter',
+  templateUrl: './edit-adapter.component.html',
+  styleUrls: ['./edit-adapter.component.scss']
+})
+export class EditAdapterComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.html b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
new file mode 100644
index 000000000..c448cc17a
--- /dev/null
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
@@ -0,0 +1,3 @@
+<sp-adapter-configuration *ngIf="show"
+                          [adapterTypeName]="adapterTypeName"
+                          [adapter]="adapter"></sp-adapter-configuration>
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.scss b/ui/src/app/connect/components/new-adapter/new-adapter.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
new file mode 100644
index 000000000..f5aa60a1c
--- /dev/null
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
@@ -0,0 +1,38 @@
+import { Component, OnInit } from '@angular/core';
+import { AdapterDescriptionUnion, AdapterService } from '@streampipes/platform-services';
+import { ActivatedRoute } from '@angular/router';
+import { ConnectService } from '../../services/connect.service';
+import { SpConnectRoutes } from '../../connect.routes';
+import { SpBreadcrumbService } from '@streampipes/shared-ui';
+
+@Component({
+  selector: 'sp-new-adapter',
+  templateUrl: './new-adapter.component.html',
+  styleUrls: ['./new-adapter.component.scss']
+})
+export class NewAdapterComponent implements OnInit {
+
+  show = false;
+  adapterTypeName = '';
+  adapter: AdapterDescriptionUnion = undefined;
+
+  constructor(private breadcrumbService: SpBreadcrumbService,
+              private connectService: ConnectService,
+              private dataMarketplaceService: AdapterService,
+              private route: ActivatedRoute) {
+  }
+
+  ngOnInit(): void {
+
+    this.dataMarketplaceService.getAdapterDescriptions().subscribe(adapters => {
+      const adapter = adapters.find(a => a.appId === this.route.snapshot.params.appId);
+      this.adapterTypeName = adapter.name;
+      this.adapter = this.connectService.cloneAdapterDescription(adapter);
+      this.breadcrumbService.updateBreadcrumb(this.breadcrumbService
+        .makeRoute([SpConnectRoutes.BASE, SpConnectRoutes.CREATE], this.adapter.name));
+      this.adapter.name = '';
+      this.adapter.description = '';
+      this.show = true;
+    });
+  }
+}
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index bf8410a18..ab1208f86 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -64,8 +64,12 @@ import {
 } from './dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
 import { EditEventPropertyComponent } from './dialog/edit-event-property/edit-event-property.component';
 import { PipelineElementRuntimeInfoComponent } from './components/runtime-info/pipeline-element-runtime-info.component';
-import { EventPropertyRowComponent } from './components/adapter-configuration/schema-editor/event-property-row/event-property-row.component';
-import { EventSchemaPreviewComponent } from './components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component';
+import {
+  EventPropertyRowComponent
+} from './components/adapter-configuration/schema-editor/event-property-row/event-property-row.component';
+import {
+  EventSchemaPreviewComponent
+} from './components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component';
 import { CoreUiModule } from '../core-ui/core-ui.module';
 import {
   EditCorrectionValueComponent
@@ -81,13 +85,17 @@ import {
 } from './components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component';
 import { ErrorMessageComponent } from './components/adapter-configuration/schema-editor/error-message/error-message.component';
 import { LoadingMessageComponent } from './components/adapter-configuration/schema-editor/loading-message/loading-message.component';
-import { SchemaEditorHeaderComponent } from './components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component';
+import {
+  SchemaEditorHeaderComponent
+} from './components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component';
 import {
   StartAdapterConfigurationComponent
 } from './components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component';
 import { DeleteAdapterDialogComponent } from './dialog/delete-adapter-dialog/delete-adapter-dialog.component';
 import { PlatformServicesModule } from '@streampipes/platform-services';
-import { FormatItemJsonComponent } from './components/adapter-configuration/format-configuration/format-item-json/format-item-json.component';
+import {
+  FormatItemJsonComponent
+} from './components/adapter-configuration/format-configuration/format-item-json/format-item-json.component';
 import { RouterModule } from '@angular/router';
 import { SharedUiModule } from '@streampipes/shared-ui';
 import { SpConnectFilterToolbarComponent } from './components/filter-toolbar/filter-toolbar.component';
@@ -104,7 +112,11 @@ import {
 import { SpAdapterTemplateDialogComponent } from './dialog/adapter-template/adapter-template-dialog.component';
 import { JsonPrettyPrintPipe } from './filter/json-pretty-print.pipe';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { AdapterConfigurationHeaderComponent } from './components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component';
+import {
+  AdapterConfigurationHeaderComponent
+} from './components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component';
+import { NewAdapterComponent } from './components/new-adapter/new-adapter.component';
+import { EditAdapterComponent } from './components/edit-adapter/edit-adapter.component';
 
 @NgModule({
   imports: [
@@ -139,11 +151,11 @@ import { AdapterConfigurationHeaderComponent } from './components/adapter-config
           },
           {
             path: 'create/:appId',
-            component: AdapterConfigurationComponent,
+            component: NewAdapterComponent,
           },
           {
             path: 'edit/:appId',
-            component: AdapterConfigurationComponent,
+            component: EditAdapterComponent,
           }]
       }]),
     SharedUiModule
@@ -190,7 +202,9 @@ import { AdapterConfigurationHeaderComponent } from './components/adapter-config
     FormatItemJsonComponent,
     SpConnectFilterToolbarComponent,
     SpAdapterOptionsPanelComponent,
-    AdapterConfigurationHeaderComponent
+    AdapterConfigurationHeaderComponent,
+    NewAdapterComponent,
+    EditAdapterComponent
   ],
   providers: [
     RestService,


[incubator-streampipes] 01/04: [STREAMPIPES-597] Add component for adapter configuration header

Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c6882e4eb070396781da0a568c39cdb76381ffa1
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Oct 12 13:56:04 2022 +0200

    [STREAMPIPES-597] Add component for adapter configuration header
---
 ui/cypress/tests/adapter/editAdapter.smoke.spec.ts |  59 ++++
 .../existing-adapters.component.html               | 312 ++++++++++++---------
 .../existing-adapters.component.ts                 |   8 +-
 .../adapter-configuration-header.component.html    |  31 ++
 .../adapter-configuration-header.component.scss    |  26 ++
 .../adapter-configuration-header.component.ts      |  49 ++++
 .../new-adapter/new-adapter.component.html         |  16 +-
 .../new-adapter/new-adapter.component.scss         |   8 -
 .../new-adapter/new-adapter.component.ts           |  54 ++--
 ui/src/app/connect/connect.module.ts               |  52 +++-
 ui/src/app/connect/connect.routes.ts               |   1 +
 .../connect/services/adapter-template.service.ts   |   1 -
 12 files changed, 413 insertions(+), 204 deletions(-)

diff --git a/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts b/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
new file mode 100644
index 000000000..3fe30bf65
--- /dev/null
+++ b/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
@@ -0,0 +1,59 @@
+/*
+ *  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 { ConnectUtils } from '../../support/utils/ConnectUtils';
+import { SpecificAdapterBuilder } from '../../support/builder/SpecificAdapterBuilder';
+
+describe('Test Edit Adapter', () => {
+  beforeEach('Setup Test', () => {
+    // To set up test add a stream adapter that can be configured
+    cy.initStreamPipesTest();
+    const adapterInput = SpecificAdapterBuilder
+      .create('Machine_Data_Simulator')
+      .setName('Machine Data Simulator Test')
+      .addInput('input', 'wait-time-ms', '1000')
+      .build();
+
+    ConnectUtils.testSpecificStreamAdapter(adapterInput);
+  });
+
+  it('Perform Test', () => {
+    // TODO check that edit button is deactivated while adapter is running
+
+    // TODO stop adapter
+
+    // TODO Click edit adapter
+
+    // TODO Change config 'wait-time-ms' to 2000
+
+    // TODO Save changes
+
+    // TODO Start adapter
+
+    // TODO Validate that events are coming
+
+  });
+
+  // Different cases
+  // TODO Specific adapter
+  // TODO Generic adapter
+  // TODO Set adapter
+  // TODO Stream adapter
+
+});
+
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index 102666f32..32828e728 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -17,141 +17,193 @@
   -->
 <sp-basic-view [showBackLink]="false" [padding]="true">
 
-    <div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row" class="pl-10">
-        <button mat-button
-                mat-raised-button
-                color="accent"
-                data-cy="connect-create-new-adapter-button"
-                (click)="createNewAdapter()">
-            <i class="material-icons">add</i>&nbsp;New adapter
-        </button>
-        <sp-connect-filter-toolbar
-                class="filter-bar-margin"
-                (filterChangedEmitter)="applyFilter($event)">
-        </sp-connect-filter-toolbar>
-        <div fxFlex fxLayout="row" fxLayoutAlign="end center">
-            <button mat-button mat-icon-button matTooltip="Refresh adapters" matTooltipPosition="below" color="accent"
-                    (click)="getAdaptersRunning()">
-                <i class="material-icons">
-                    refresh
-                </i>
-            </button>
-        </div>
+  <div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row" class="pl-10">
+    <button mat-button
+            mat-raised-button
+            color="accent"
+            data-cy="connect-create-new-adapter-button"
+            (click)="createNewAdapter()">
+      <i class="material-icons">add</i>&nbsp;New adapter
+    </button>
+    <sp-connect-filter-toolbar
+        class="filter-bar-margin"
+        (filterChangedEmitter)="applyFilter($event)">
+    </sp-connect-filter-toolbar>
+    <div fxFlex
+         fxLayout="row"
+         fxLayoutAlign="end center">
+      <button mat-button
+              mat-icon-button
+              matTooltip="Refresh adapters"
+              matTooltipPosition="below"
+              color="accent"
+              (click)="getAdaptersRunning()">
+        <i class="material-icons">
+          refresh
+        </i>
+      </button>
     </div>
-    <div fxFlex="100" fxLayout="column">
-        <sp-basic-header-title-component title="My adapters"></sp-basic-header-title-component>
-        <div fxFlex="100" fxLayout="row" fxLayoutAlign="center start">
-            <sp-basic-inner-panel [showTitle]="false" innerPadding="0" outerMargin="0" fxFlex="90" [hideToolbar]="true">
-                <div fxFlex="100" fxLayout="column" *ngIf="filteredAdapters.length > 0">
-                    <div fxFlex="100" fxLayout="column">
-                        <table fxFlex="100" mat-table [dataSource]="dataSource" style="width: 100%;" matSort>
-                            <ng-container matColumnDef="start">
-                                <th mat-header-cell *matHeaderCellDef> Start</th>
-                                <td mat-cell *matCellDef="let adapter">
-                                    <button color="accent" mat-button mat-icon-button matTooltip="Start adapter"
-                                            matTooltipPosition="above"
-                                            (click)="startAdapter(adapter)"
-                                            *ngIf="(connectService.isDataStreamDescription(adapter)) && !adapter.running">
-                                        <i class="material-icons">play_arrow</i>
-                                    </button>
-                                    <button color="accent" mat-button mat-icon-button matTooltip="Stop adapter"
-                                            matTooltipPosition="above"
-                                            (click)="stopAdapter(adapter)"
-                                            *ngIf="(connectService.isDataStreamDescription(adapter)) && adapter.running">
-                                        <i class="material-icons">stop</i>
-                                    </button>
-                                </td>
-                            </ng-container>
+  </div>
+  <div fxFlex="100" fxLayout="column">
+    <sp-basic-header-title-component title="My adapters"></sp-basic-header-title-component>
+    <div fxFlex="100" fxLayout="row" fxLayoutAlign="center start">
+      <sp-basic-inner-panel [showTitle]="false" innerPadding="0" outerMargin="0" fxFlex="90" [hideToolbar]="true">
+        <div fxFlex="100" fxLayout="column" *ngIf="filteredAdapters.length > 0">
+          <div fxFlex="100" fxLayout="column">
+            <table fxFlex="100" mat-table [dataSource]="dataSource" style="width: 100%;" matSort>
+              <ng-container matColumnDef="start">
+                <th mat-header-cell *matHeaderCellDef> Start</th>
+                <td mat-cell *matCellDef="let adapter">
+                  <button color="accent" mat-button mat-icon-button matTooltip="Start adapter"
+                          matTooltipPosition="above"
+                          (click)="startAdapter(adapter)"
+                          *ngIf="(connectService.isDataStreamDescription(adapter)) && !adapter.running">
+                    <i class="material-icons">play_arrow</i>
+                  </button>
+                  <button color="accent" mat-button mat-icon-button matTooltip="Stop adapter"
+                          matTooltipPosition="above"
+                          (click)="stopAdapter(adapter)"
+                          *ngIf="(connectService.isDataStreamDescription(adapter)) && adapter.running">
+                    <i class="material-icons">stop</i>
+                  </button>
+                </td>
+              </ng-container>
 
-                            <ng-container matColumnDef="name">
-                                <th mat-header-cell mat-sort-header *matHeaderCellDef> Name</th>
-                                <td mat-cell *matCellDef="let adapter">
-                                    <h4 style="margin-bottom:0px;">{{adapter.name}}</h4>
-                                    <h5>{{adapter.description != '' ? adapter.description : '-'}}</h5>
-                                </td>
-                            </ng-container>
-                            <ng-container matColumnDef="adapterBase">
-                                <th mat-header-cell *matHeaderCellDef> Adapter</th>
-                                <td mat-cell *matCellDef="let adapter">
-                                    <img *ngIf="getIconUrl(adapter) && !adapter.icon" [src]="getIconUrl(adapter)"
-                                         class="adapter-icon"/>
-                                    <img *ngIf="adapter.icon" [src]="adapter.icon" class="adapter-icon"/>
-                                </td>
-                            </ng-container>
-                            <ng-container matColumnDef="adapterType">
-                                <th mat-header-cell *matHeaderCellDef> Type</th>
-                                <td mat-cell *matCellDef="let adapter">
-                                    <div class="type-data" fxLayout="row" fxLayoutAlign="start start">
-                                        <div fxLayout="row" fxLayoutAlign="center center">
-                                            <mat-icon *ngIf="connectService.isDataSetDescription(adapter)"
-                                                      class="historic">
-                                                lens
-                                            </mat-icon>
-                                            <mat-icon *ngIf="connectService.isDataStreamDescription(adapter)"
-                                                      class="real-time">
-                                                lens
-                                            </mat-icon>
-                                            <div fxFlex="100" fxLayoutAlign="center center">
-                                                <span *ngIf="connectService.isDataSetDescription(adapter)">&nbsp;Data Set</span>
-                                                <span *ngIf="connectService.isDataStreamDescription(adapter)">&nbsp;Data Stream</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </td>
-                            </ng-container>
-                            <ng-container matColumnDef="lastModified">
-                                <th mat-header-cell *matHeaderCellDef> Created</th>
-                                <td mat-cell *matCellDef="let adapter">
-                                    <h5>{{adapter.createdAt | date:'dd.MM.yyyy HH:mm'}}</h5>
-                                </td>
-                            </ng-container>
+              <ng-container matColumnDef="name">
+                <th mat-header-cell
+                    mat-sort-header
+                    *matHeaderCellDef> Name</th>
+                <td mat-cell *matCellDef="let adapter">
+                  <h4 style="margin-bottom:0;">{{adapter.name}}</h4>
+                  <h5>{{adapter.description != '' ? adapter.description : '-'}}</h5>
+                </td>
+              </ng-container>
+              <ng-container matColumnDef="adapterBase">
+                <th mat-header-cell *matHeaderCellDef> Adapter</th>
+                <td mat-cell *matCellDef="let adapter">
+                  <img class="adapter-icon"
+                       *ngIf="getIconUrl(adapter) && !adapter.icon"
+                       [src]="getIconUrl(adapter)"
+                       [alt]="adapter.name"
+                       />
+                  <img class="adapter-icon"
+                       *ngIf="adapter.icon"
+                       [alt]="adapter.name"
+                       [src]="adapter.icon"/>
+                </td>
+              </ng-container>
+              <ng-container matColumnDef="adapterType">
+                <th mat-header-cell *matHeaderCellDef> Type</th>
+                <td mat-cell *matCellDef="let adapter">
+                  <div class="type-data" fxLayout="row" fxLayoutAlign="start start">
+                    <div fxLayout="row" fxLayoutAlign="center center">
+                      <mat-icon *ngIf="connectService.isDataSetDescription(adapter)"
+                                class="historic">
+                        lens
+                      </mat-icon>
+                      <mat-icon *ngIf="connectService.isDataStreamDescription(adapter)"
+                                class="real-time">
+                        lens
+                      </mat-icon>
+                      <div fxFlex="100" fxLayoutAlign="center center">
+                        <span *ngIf="connectService.isDataSetDescription(adapter)">&nbsp;Data Set</span>
+                        <span *ngIf="connectService.isDataStreamDescription(adapter)">&nbsp;Data Stream</span>
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </ng-container>
+              <ng-container matColumnDef="lastModified">
+                <th mat-header-cell *matHeaderCellDef> Created</th>
+                <td mat-cell *matCellDef="let adapter">
+                  <h5>{{adapter.createdAt | date:'dd.MM.yyyy HH:mm'}}</h5>
+                </td>
+              </ng-container>
 
-                            <ng-container matColumnDef="action">
-                                <th mat-header-cell *matHeaderCellDef> Action</th>
-                                <td mat-cell *matCellDef="let adapter">
-                                    <div fxLayout="row">
-                            <span fxFlex fxFlexOrder="1" fxLayout="row" fxLayoutAlign="center center">
-                    <button color="accent" mat-button mat-icon-button matTooltip="Show info"
-                            matTooltipPosition="above" (click)="openHelpDialog(adapter)"><i
-                            class="material-icons">help_outline</i>
-                    </button>
-                        </span>
-                                        <span fxFlex fxFlexOrder="2" fxLayout="row" fxLayoutAlign="center center"
-                                              *ngIf="isAdmin">
-                    <button color="accent" mat-button mat-icon-button matTooltip="Manage permissions"
-                            matTooltipPosition="above" (click)="showPermissionsDialog(adapter)"><i
-                            class="material-icons">share</i>
-                    </button>
-                </span>
-                                        <span fxFlex fxFlexOrder="3" fxLayout="row" fxLayoutAlign="center center">
-                    <button color="accent" mat-button mat-icon-button matTooltip="Delete adapter"
-                            data-cy="delete-adapter" matTooltipPosition="above" (click)="deleteAdapter(adapter)">
-                        <i class="material-icons">delete</i>
-                    </button>
-                </span>
-                                    </div>
-                                </td>
-                            </ng-container>
+              <ng-container matColumnDef="action">
+                <th mat-header-cell *matHeaderCellDef> Action</th>
+                <td mat-cell *matCellDef="let adapter">
+                  <div fxLayout="row">
+                    <span fxFlex
+                          fxFlexOrder="1"
+                          fxLayout="row"
+                          fxLayoutAlign="center center">
+                      <button color="accent"
+                              mat-button mat-icon-button
+                              matTooltip="Show info"
+                              matTooltipPosition="above"
+                              (click)="openHelpDialog(adapter)">
+                        <i class="material-icons">help_outline</i>
+                      </button>
+                    </span>
+                    <span fxFlex
+                          fxFlexOrder="2"
+                          fxLayout="row"
+                          fxLayoutAlign="center center"
+                          *ngIf="isAdmin">
+                      <button color="accent"
+                              mat-button
+                              mat-icon-button
+                              matTooltip="Manage permissions"
+                              matTooltipPosition="above"
+                              (click)="showPermissionsDialog(adapter)">
+                        <i class="material-icons">share</i>
+                      </button>
+                    </span>
+                    <span fxFlex
+                          fxFlexOrder="3"
+                          fxLayout="row"
+                          fxLayoutAlign="center center">
+                      <button color="accent"
+                              mat-button
+                              mat-icon-button
+                              matTooltip="Edit adapter"
+                              data-cy="edit-adapter"
+                              matTooltipPosition="above"
+                              [disabled]="adapter.running"
+                              (click)="editAdapter(adapter)">
+                          <i class="material-icons">edit</i>
+                      </button>
+                    </span>
+                    <span fxFlex
+                          fxFlexOrder="3"
+                          fxLayout="row"
+                          fxLayoutAlign="center center">
+                      <button color="accent"
+                              mat-button
+                              mat-icon-button
+                              matTooltip="Delete adapter"
+                              data-cy="delete-adapter"
+                              matTooltipPosition="above"
+                              (click)="deleteAdapter(adapter)">
+                          <i class="material-icons">delete</i>
+                      </button>
+                    </span>
+                  </div>
+                </td>
+              </ng-container>
 
-                            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-                            <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+              <tr mat-header-row
+                  *matHeaderRowDef="displayedColumns"></tr>
+              <tr mat-row
+                  *matRowDef="let row; columns: displayedColumns;"></tr>
 
-                        </table>
-                    </div>
-                    <div fxFlex="100" fxLayoutAlign="end end">
-                        <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]"
-                                       [pageSize]="20"
-                                       color="accent">
-                        </mat-paginator>
-                    </div>
-                </div>
-                <div fxFlex="100"
-                     fxLayout="column"
-                     fxLayoutAlign="center center"
-                     *ngIf="existingAdapters.length == 0">
-                    <h5>(no adapters available)</h5>
-                </div>
-            </sp-basic-inner-panel>
+            </table>
+          </div>
+          <div fxFlex="100" fxLayoutAlign="end end">
+            <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]"
+                           [pageSize]="20"
+                           color="accent">
+            </mat-paginator>
+          </div>
+        </div>
+        <div fxFlex="100"
+             fxLayout="column"
+             fxLayoutAlign="center center"
+             *ngIf="existingAdapters.length == 0">
+          <h5>(no adapters available)</h5>
         </div>
+      </sp-basic-inner-panel>
     </div>
+  </div>
 </sp-basic-view>
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
index ecee3dfa5..81de2540e 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
@@ -85,7 +85,7 @@ export class ExistingAdaptersComponent implements OnInit {
   }
 
   startAdapter(adapter: AdapterDescriptionUnion) {
-    this.dataMarketplaceService.startAdapter(adapter).subscribe(response => {
+    this.dataMarketplaceService.startAdapter(adapter).subscribe(_ => {
       this.getAdaptersRunning();
     }, error => {
       this.openAdapterStatusErrorDialog(error.error, 'Could not start adapter');
@@ -93,7 +93,7 @@ export class ExistingAdaptersComponent implements OnInit {
   }
 
   stopAdapter(adapter: AdapterDescriptionUnion) {
-    this.dataMarketplaceService.stopAdapter(adapter).subscribe(response => {
+    this.dataMarketplaceService.stopAdapter(adapter).subscribe(_ => {
       this.getAdaptersRunning();
     }, error => {
       this.openAdapterStatusErrorDialog(error.error, 'Could not stop adapter');
@@ -140,6 +140,10 @@ export class ExistingAdaptersComponent implements OnInit {
     });
   }
 
+  editAdapter(adapter: AdapterDescriptionUnion) {
+    this.router.navigate(['connect', 'edit', adapter.appId]);
+  }
+
   deleteAdapter(adapter: AdapterDescriptionUnion): void {
     const dialogRef: DialogRef<DeleteAdapterDialogComponent> = this.dialogService.open(DeleteAdapterDialogComponent, {
       panelType: PanelType.STANDARD_PANEL,
diff --git a/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.html b/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.html
new file mode 100644
index 000000000..63af09016
--- /dev/null
+++ b/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.html
@@ -0,0 +1,31 @@
+<!--
+  ~  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" fxFlex="100">
+  <div fxLayout="row" fxLayoutAlign="start center">
+    <mat-icon *ngIf="!isDataStreamDescription" class="historic">lens</mat-icon>
+    <mat-icon *ngIf="isDataStreamDescription" class="real-time">lens
+    </mat-icon>
+    <div fxLayoutAlign="start center">
+      <p *ngIf="!isDataStreamDescription">Data Set</p>
+      <p *ngIf="isDataStreamDescription">Data Stream</p>
+    </div>
+    <span fxFlex></span>
+  </div>
+  <h1 class="new-adapter-title">New Source: {{adapterTypeName}}</h1>
+</div>
diff --git a/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.scss b/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.scss
new file mode 100644
index 000000000..f77f08615
--- /dev/null
+++ b/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.scss
@@ -0,0 +1,26 @@
+/*!
+ *  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.
+ *
+ */
+
+.historic {
+    cursor: pointer;
+    color: #ffa23b;
+}
+.real-time {
+    cursor: pointer;
+    color: #FFEB3B;
+}
diff --git a/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.ts b/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.ts
new file mode 100644
index 000000000..0c8643cd8
--- /dev/null
+++ b/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.ts
@@ -0,0 +1,49 @@
+/*
+ *  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, Input } from '@angular/core';
+
+@Component({
+  selector: 'sp-adapter-configuration-header',
+  templateUrl: './adapter-configuration-header.component.html',
+  styleUrls: ['./adapter-configuration-header.component.scss']
+})
+export class AdapterConfigurationHeaderComponent {
+
+
+  // @Input() adapter: AdapterDescriptionUnion;
+
+  /**
+   * Used to display the type of the configured adapter
+   */
+  @Input() adapterTypeName = '';
+
+  /**
+   * Indicates whether the adapter is a data set or data stream adapter
+   */
+  @Input() isDataStreamDescription = true;
+
+  constructor() {
+  }
+
+  // ngOnInit(): void {
+  //   this.adapterTypeName = this.adapter.name;
+  // this.isDataStreamDescription = this.connectService.isDataStreamDescription(this.adapter);
+  // }
+
+}
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.html b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
index 9c1a1ae20..d506e3c38 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.html
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
@@ -24,20 +24,8 @@
         </button>
     </div>
     <div fxLayout="column" fxLayoutAlign="center stretch" *ngIf="adapter">
-        <div fxLayout="column" fxFlex="100">
-            <div fxLayout="row" fxLayoutAlign="start center">
-                <mat-icon *ngIf="isDataSetDescription" class="historic">lens</mat-icon>
-                <mat-icon *ngIf="isDataStreamDescription" class="real-time">lens
-                </mat-icon>
-                <div fxLayoutAlign="start center">
-                    <p *ngIf="isDataSetDescription">Data Set</p>
-                    <p *ngIf="isDataStreamDescription">Data Stream</p>
-                </div>
-                <span fxFlex></span>
-            </div>
-            <h1 *ngIf="!fromTemplate" class="new-adapter-title">New Source: {{adapter.templateTitle}}</h1>
-            <h1 *ngIf="fromTemplate" class="new-adapter-title">From Template: {{adapter.templateTitle}}</h1>
-        </div>
+
+        <sp-adapter-configuration-header [adapterTypeName]="adapterTypeName" [isDataStreamDescription]="isDataStreamDescription"></sp-adapter-configuration-header>
 
         <mat-horizontal-stepper [linear]="true" #stepper color="accent" class="stepper">
             <mat-step *ngIf="!isGenericAdapter">
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.scss b/ui/src/app/connect/components/new-adapter/new-adapter.component.scss
index 6eeed25e1..dd3608ea4 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.scss
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.scss
@@ -16,14 +16,6 @@
  *
  */
 
-.historic {
-    cursor: pointer;
-    color: #ffa23b;
-}
-.real-time {
-    cursor: pointer;
-    color: #FFEB3B;
-}
 
 .new-adapter-title {
     margin-top:5px;
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
index 2a0566e89..14a265d51 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { MatStepper } from '@angular/material/stepper';
 import {
@@ -26,8 +26,7 @@ import {
   GenericAdapterSetDescription,
   GenericAdapterStreamDescription,
   SpecificAdapterSetDescription,
-  SpecificAdapterStreamDescription,
-  TransformationRuleDescriptionUnion
+  SpecificAdapterStreamDescription
 } from '@streampipes/platform-services';
 import { ShepherdService } from '../../../services/tour/shepherd.service';
 import { ConnectService } from '../../services/connect.service';
@@ -47,16 +46,17 @@ import { SpConnectRoutes } from '../../connect.routes';
 })
 export class NewAdapterComponent implements OnInit, AfterViewInit {
 
+
+  adapterTypeName = '';
+  isDataStreamDescription = true;
+
+
   selectedUploadFile: File;
   fileName;
-  isGenericAdapter = false;
-  isDataSetDescription = false;
-  isDataStreamDescription = false;
 
-  dataLakeTimestampField: string;
+  isGenericAdapter = false;
 
-  @Input()
-  adapter: AdapterDescriptionUnion;
+  adapter: AdapterDescriptionUnion = undefined;
 
   myStepper: MatStepper;
 
@@ -66,12 +66,8 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
   eventSchema: EventSchema;
   oldEventSchema: EventSchema;
 
-
   hasInput: boolean[];
 
-  // indicates whether user uses a template or not
-  fromTemplate = false;
-
   // deactivates all edit functions when user starts a template
   isEditable = true;
 
@@ -79,12 +75,10 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
 
   completedStaticProperty: ConfigurationInfo;
 
-  isPreviewEnabled = false;
-
   parentForm: FormGroup;
-  genericAdapterSettingsFormValid = false;
   viewInitialized = false;
 
+
   constructor(
     private restService: RestService,
     private transformationRuleService: TransformationRuleService,
@@ -113,30 +107,29 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
 
   ngOnInit() {
 
+    // TODO what is this code doing?
     this.dataMarketplaceService.getAdapterDescriptions().subscribe(adapters => {
       const adapter = adapters.find(a => a.appId === this.route.snapshot.params.appId);
       this.adapter = this.connectService.cloneAdapterDescription(adapter);
-      this.breadcrumbService.updateBreadcrumb(this.breadcrumbService.makeRoute([SpConnectRoutes.BASE, SpConnectRoutes.CREATE], this.adapter.name));
-      (this.adapter as any).templateTitle = this.adapter.name;
+      this.breadcrumbService.updateBreadcrumb(this.breadcrumbService
+        .makeRoute([SpConnectRoutes.BASE, SpConnectRoutes.CREATE], this.adapter.name));
       this.adapter.name = '';
       this.adapter.description = '';
       this.parentForm = this._formBuilder.group({});
 
+      this.adapterTypeName = adapter.name;
+      this.isDataStreamDescription = this.connectService.isDataStreamDescription(adapter);
 
-      this.isGenericAdapter = this.connectService.isGenericDescription(this.adapter);
-      this.isDataSetDescription = this.connectService.isDataSetDescription(this.adapter);
-      this.isDataStreamDescription = this.connectService.isDataStreamDescription(this.adapter);
-      this.formatConfigurationValid = false;
 
+      this.isGenericAdapter = this.connectService.isGenericDescription(this.adapter);
 
-      // this.startAdapterFormGroup = this._formBuilder.group({
-      //     startAdapterFormCtrl: ['', Validators.required]
-      // });
+      this.formatConfigurationValid = false;
 
       this.protocolConfigurationValid = false;
 
       this.eventSchema = this.connectService.getEventSchema(this.adapter);
 
+      // TODO I think I can remove this with the new edit mode
       if (this.eventSchema.eventProperties.length > 0) {
 
         // Timeout is needed for stepper to work correctly. Without the stepper is frozen when initializing with
@@ -146,21 +139,14 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
           this.goForward();
         }, 1);
 
-        this.fromTemplate = true;
         this.isEditable = false;
         this.oldEventSchema = this.eventSchema;
       }
     });
-
-
-    // this.parentForm.statusChanges.subscribe((status) => {
-    //     this.genericadapterSettingsFormValid  = this.viewInitialized && this.parentForm.valid;
-    // });
   }
 
   ngAfterViewInit() {
     this.viewInitialized = true;
-    // this.genericAdapterSettingsFormValid  = this.viewInitialized && this.parentForm.valid;
     this.changeDetectorRef.detectChanges();
   }
 
@@ -223,9 +209,7 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
     this.transformationRuleService.setOldEventSchema(this.oldEventSchema);
 
     this.transformationRuleService.setNewEventSchema(this.eventSchema);
-    const transformationRules: TransformationRuleDescriptionUnion[] =
-      this.transformationRuleService.getTransformationRuleDescriptions();
-    this.adapter.rules = transformationRules;
+    this.adapter.rules = this.transformationRuleService.getTransformationRuleDescriptions();
   }
 
   goBack() {
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index 8d7bc1203..b79749e18 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -53,39 +53,58 @@ import { MatChipsModule } from '@angular/material/chips';
 import { MatSliderModule } from '@angular/material/slider';
 import { TreeModule } from '@circlon/angular-tree-component';
 import { XsService } from '../NS/xs.service';
-import { EditDataTypeComponent } from './dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component';
-import { EditTimestampPropertyComponent } from './dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component';
-import { EditUnitTransformationComponent } from './dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
+import {
+  EditDataTypeComponent
+} from './dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component';
+import {
+  EditTimestampPropertyComponent
+} from './dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component';
+import {
+  EditUnitTransformationComponent
+} from './dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
 import { EditEventPropertyComponent } from './dialog/edit-event-property/edit-event-property.component';
 import { PipelineElementRuntimeInfoComponent } from './components/runtime-info/pipeline-element-runtime-info.component';
 import { EventPropertyRowComponent } from './components/new-adapter/schema-editor/event-property-row/event-property-row.component';
 import { EventSchemaPreviewComponent } from './components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component';
 import { CoreUiModule } from '../core-ui/core-ui.module';
-// tslint:disable-next-line:max-line-length
-import { EditCorrectionValueComponent } from './dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component';
+import {
+  EditCorrectionValueComponent
+} from './dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component';
 import { ExistingAdaptersComponent } from './components/existing-adapters/existing-adapters.component';
-// tslint:disable-next-line:max-line-length
-import { SpecificAdapterConfigurationComponent } from './components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component';
+import {
+  SpecificAdapterConfigurationComponent
+} from './components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component';
 import { ConfigurationGroupComponent } from './components/configuration-group/configuration-group.component';
 import { FormatConfigurationComponent } from './components/new-adapter/format-configuration/format-configuration.component';
-import { GenericAdapterConfigurationComponent } from './components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component';
+import {
+  GenericAdapterConfigurationComponent
+} from './components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component';
 import { ErrorMessageComponent } from './components/new-adapter/schema-editor/error-message/error-message.component';
 import { LoadingMessageComponent } from './components/new-adapter/schema-editor/loading-message/loading-message.component';
 import { SchemaEditorHeaderComponent } from './components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component';
-import { StartAdapterConfigurationComponent } from './components/new-adapter/start-adapter-configuration/start-adapter-configuration.component';
+import {
+  StartAdapterConfigurationComponent
+} from './components/new-adapter/start-adapter-configuration/start-adapter-configuration.component';
 import { DeleteAdapterDialogComponent } from './dialog/delete-adapter-dialog/delete-adapter-dialog.component';
 import { PlatformServicesModule } from '@streampipes/platform-services';
 import { FormatItemJsonComponent } from './components/new-adapter/format-configuration/format-item-json/format-item-json.component';
 import { RouterModule } from '@angular/router';
 import { SharedUiModule } from '@streampipes/shared-ui';
 import { SpConnectFilterToolbarComponent } from './components/filter-toolbar/filter-toolbar.component';
-import { EditSchemaTransformationComponent } from './dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component';
-import { EditValueTransformationComponent } from './dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component';
+import {
+  EditSchemaTransformationComponent
+} from './dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component';
+import {
+  EditValueTransformationComponent
+} from './dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component';
 import { SpEpSettingsSectionComponent } from './dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component';
-import { SpAdapterOptionsPanelComponent } from './components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component';
+import {
+  SpAdapterOptionsPanelComponent
+} from './components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component';
 import { SpAdapterTemplateDialogComponent } from './dialog/adapter-template/adapter-template-dialog.component';
 import { JsonPrettyPrintPipe } from './filter/json-pretty-print.pipe';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { AdapterConfigurationHeaderComponent } from './components/new-adapter/adapter-configuration-header/adapter-configuration-header.component';
 
 @NgModule({
   imports: [
@@ -121,6 +140,10 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
           {
             path: 'create/:appId',
             component: NewAdapterComponent,
+          },
+          {
+            path: 'edit/:appId',
+            component: NewAdapterComponent,
           }]
       }]),
     SharedUiModule
@@ -166,7 +189,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
     StartAdapterConfigurationComponent,
     FormatItemJsonComponent,
     SpConnectFilterToolbarComponent,
-    SpAdapterOptionsPanelComponent
+    SpAdapterOptionsPanelComponent,
+    AdapterConfigurationHeaderComponent
   ],
   providers: [
     RestService,
@@ -179,7 +203,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
     TimestampPipe,
     XsService
   ],
-  schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
 export class ConnectModule {
 }
diff --git a/ui/src/app/connect/connect.routes.ts b/ui/src/app/connect/connect.routes.ts
index 9ddbb185a..95a2c8e7c 100644
--- a/ui/src/app/connect/connect.routes.ts
+++ b/ui/src/app/connect/connect.routes.ts
@@ -22,5 +22,6 @@ export class SpConnectRoutes {
 
   static BASE: SpBreadcrumbItem = {label: 'Connect', link: ['connect']};
   static CREATE: SpBreadcrumbItem = {label: 'New Adapter', link: ['connect', 'create']};
+  static EDIT: SpBreadcrumbItem = {label: 'Edit Adapter', link: ['connect', 'edit']};
 
 }
diff --git a/ui/src/app/connect/services/adapter-template.service.ts b/ui/src/app/connect/services/adapter-template.service.ts
index d7c0815c6..73c5e4748 100644
--- a/ui/src/app/connect/services/adapter-template.service.ts
+++ b/ui/src/app/connect/services/adapter-template.service.ts
@@ -19,7 +19,6 @@
 import { Injectable } from '@angular/core';
 import { SpAdapterTemplateDialogComponent } from '../dialog/adapter-template/adapter-template-dialog.component';
 import { DialogService, PanelType } from '@streampipes/shared-ui';
-import { AdapterDescriptionUnion } from '@streampipes/platform-services';
 import { StaticPropertyUnion } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
 
 @Injectable({providedIn: 'root'})


[incubator-streampipes] 04/04: [STREAMPIPES-597] Refactor adapter configuration component

Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 5738cbb01b9b678ed92d1c753bfbed22997dc8d2
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Oct 12 16:18:32 2022 +0200

    [STREAMPIPES-597] Refactor adapter configuration component
---
 .../support/utils/ConnectEventSchemaUtils.ts       |  2 +
 .../adapter-configuration.component.html           |  1 -
 .../adapter-configuration.component.ts             | 69 ++++------------------
 .../event-schema/event-schema.component.ts         |  9 ++-
 .../new-adapter/new-adapter.component.html         |  2 +-
 .../new-adapter/new-adapter.component.ts           |  7 ++-
 ui/src/app/connect/connect.module.ts               |  2 -
 ui/src/app/connect/services/icon.service.ts        | 40 -------------
 8 files changed, 23 insertions(+), 109 deletions(-)

diff --git a/ui/cypress/support/utils/ConnectEventSchemaUtils.ts b/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
index a9044a66f..ca507e182 100644
--- a/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
+++ b/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
@@ -90,6 +90,8 @@ export class ConnectEventSchemaUtils {
     // Click add a static value to event
     cy.dataCy('connect-add-static-property', { timeout: 10000 }).click();
 
+    cy.wait(100);
+
     // Edit new property
     cy.dataCy('edit-key_0', { timeout: 10000 }).click();
 
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
index 10bd13175..b77d052ac 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
@@ -62,7 +62,6 @@
             <mat-step>
                 <ng-template matStepLabel>Configure fields</ng-template>
                 <sp-event-schema #eschema fxLayout="column" fxFlex="100"
-                                 [(isEditable)]="isEditable"
                                  [adapterDescription]="adapter"
                                  [(eventSchema)]="eventSchema"
                                  [(oldEventSchema)]="oldEventSchema"
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
index 65adc340f..49e4e2ee9 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
@@ -16,12 +16,11 @@
  *
  */
 
-import { AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { MatStepper } from '@angular/material/stepper';
 import {
   AdapterDescriptionUnion,
-  AdapterService,
   EventSchema,
   GenericAdapterSetDescription,
   GenericAdapterStreamDescription,
@@ -31,26 +30,16 @@ import {
 import { ShepherdService } from '../../../services/tour/shepherd.service';
 import { ConnectService } from '../../services/connect.service';
 import { ConfigurationInfo } from '../../model/ConfigurationInfo';
-import { RestService } from '../../services/rest.service';
 import { EventSchemaComponent } from './schema-editor/event-schema/event-schema.component';
 import { TransformationRuleService } from '../../services/transformation-rule.service';
-import { IconService } from '../../services/icon.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'sp-adapter-configuration',
   templateUrl: './adapter-configuration.component.html',
   styleUrls: ['./adapter-configuration.component.scss']
 })
-export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
-
-  isDataStreamDescription = true;
-
-
-  selectedUploadFile: File;
-  fileName;
-
-  isGenericAdapter = false;
+export class AdapterConfigurationComponent implements OnInit {
 
   /**
    * Used to display the type of the configured adapter
@@ -58,37 +47,28 @@ export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
   @Input() adapterTypeName = '';
   @Input() adapter: AdapterDescriptionUnion;
 
-  myStepper: MatStepper;
+  /**
+   * Required to render the corresponding components
+   */
+  isDataStreamDescription = true;
+  isGenericAdapter = false;
 
-  protocolConfigurationValid: boolean;
-  formatConfigurationValid: boolean;
+
+  myStepper: MatStepper;
+  parentForm: FormGroup;
 
   eventSchema: EventSchema;
   oldEventSchema: EventSchema;
 
-  hasInput: boolean[];
-
-  // deactivates all edit functions when user starts a template
-  isEditable = true;
-
   private eventSchemaComponent: EventSchemaComponent;
 
   completedStaticProperty: ConfigurationInfo;
 
-  parentForm: FormGroup;
-  viewInitialized = false;
-
-
   constructor(
-    private restService: RestService,
     private transformationRuleService: TransformationRuleService,
     private shepherdService: ShepherdService,
     private connectService: ConnectService,
     private _formBuilder: FormBuilder,
-    private iconService: IconService,
-    private changeDetectorRef: ChangeDetectorRef,
-    private route: ActivatedRoute,
-    private dataMarketplaceService: AdapterService,
     private router: Router,
   ) {
   }
@@ -99,32 +79,10 @@ export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
     this.isDataStreamDescription = this.connectService.isDataStreamDescription(this.adapter);
     this.isGenericAdapter = this.connectService.isGenericDescription(this.adapter);
 
-    this.formatConfigurationValid = false;
-
-    this.protocolConfigurationValid = false;
-
     this.eventSchema = this.connectService.getEventSchema(this.adapter);
 
   }
 
-  handleFileInput(files: any) {
-    this.selectedUploadFile = files[0];
-    this.fileName = this.selectedUploadFile.name;
-
-    this.iconService.toBase64(this.selectedUploadFile)
-      .then(
-        data => {
-          this.adapter.icon = (data as string);
-        }
-      );
-  }
-
-  ngAfterViewInit() {
-    this.viewInitialized = true;
-    this.changeDetectorRef.detectChanges();
-  }
-
-
   removeSelection() {
     this.router.navigate(['connect', 'create']);
   }
@@ -141,10 +99,7 @@ export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
   }
 
   clickEventSchemaNextButtonButton() {
-    if (this.isEditable) {
-      this.setSchema();
-    }
-
+    this.setSchema();
 
     this.shepherdService.trigger('event-schema-next-button');
     this.goForward();
diff --git a/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts
index 30c340a68..c6b896a30 100644
--- a/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts
@@ -27,8 +27,7 @@ import {
   EventPropertyNested,
   EventPropertyPrimitive,
   EventSchema,
-  GuessSchema,
-  Notification
+  GuessSchema
 } from '@streampipes/platform-services';
 import { MatStepper } from '@angular/material/stepper';
 import { UserErrorMessage } from '../../../../../core-model/base/UserErrorMessage';
@@ -51,7 +50,7 @@ export class EventSchemaComponent implements OnChanges {
   }
 
   @Input() adapterDescription: AdapterDescription;
-  @Input() isEditable = true;
+  isEditable = true;
   @Input() oldEventSchema: EventSchema;
   @Input() eventSchema: EventSchema = new EventSchema();
 
@@ -94,7 +93,7 @@ export class EventSchemaComponent implements OnChanges {
     allowDrag: () => {
       return this.isEditable;
     },
-    allowDrop: (node, { parent, index }) => {
+    allowDrop: (node, { parent }) => {
       return parent.data.eventProperties !== undefined && parent.parent !== null;
     },
     displayField: 'runTimeName'
@@ -142,7 +141,7 @@ export class EventSchemaComponent implements OnChanges {
 
   }
 
-  private refreshTree(refreshPreview = true): void {
+  public refreshTree(refreshPreview = true): void {
     this.nodes = new Array<EventProperty>();
     this.nodes.push(this.eventSchema as unknown as EventProperty);
     this.validEventSchema = this.checkIfValid(this.eventSchema);
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.html b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
index c448cc17a..82c8e94cf 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.html
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
@@ -1,3 +1,3 @@
-<sp-adapter-configuration *ngIf="show"
+<sp-adapter-configuration *ngIf="initialized"
                           [adapterTypeName]="adapterTypeName"
                           [adapter]="adapter"></sp-adapter-configuration>
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
index f5aa60a1c..f5e599f3f 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
@@ -12,7 +12,7 @@ import { SpBreadcrumbService } from '@streampipes/shared-ui';
 })
 export class NewAdapterComponent implements OnInit {
 
-  show = false;
+  initialized = false;
   adapterTypeName = '';
   adapter: AdapterDescriptionUnion = undefined;
 
@@ -28,11 +28,12 @@ export class NewAdapterComponent implements OnInit {
       const adapter = adapters.find(a => a.appId === this.route.snapshot.params.appId);
       this.adapterTypeName = adapter.name;
       this.adapter = this.connectService.cloneAdapterDescription(adapter);
+
       this.breadcrumbService.updateBreadcrumb(this.breadcrumbService
-        .makeRoute([SpConnectRoutes.BASE, SpConnectRoutes.CREATE], this.adapter.name));
+        .makeRoute([SpConnectRoutes.BASE, SpConnectRoutes.CREATE], this.adapterTypeName));
       this.adapter.name = '';
       this.adapter.description = '';
-      this.show = true;
+      this.initialized = true;
     });
   }
 }
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index ab1208f86..dd898403e 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -41,7 +41,6 @@ import { AdapterDescriptionComponent } from './components/data-marketplace/adapt
 import { DataMarketplaceComponent } from './components/data-marketplace/data-marketplace.component';
 import { FormatItemComponent } from './components/adapter-configuration/format-configuration/format-item/format-item.component';
 import { FormatListComponent } from './components/adapter-configuration/format-configuration/format-list/format-list.component';
-import { IconService } from './services/icon.service';
 import { UnitProviderService } from './services/unit-provider.service';
 
 
@@ -212,7 +211,6 @@ import { EditAdapterComponent } from './components/edit-adapter/edit-adapter.com
     DataTypesService,
     TransformationRuleService,
     StaticPropertyUtilService,
-    IconService,
     UnitProviderService,
     TimestampPipe,
     XsService
diff --git a/ui/src/app/connect/services/icon.service.ts b/ui/src/app/connect/services/icon.service.ts
deleted file mode 100644
index f3a4416e9..000000000
--- a/ui/src/app/connect/services/icon.service.ts
+++ /dev/null
@@ -1,40 +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 { Injectable } from '@angular/core';
-
-@Injectable()
-export class IconService {
-
-  constructor(
-  ) {}
-
-     getBase64(file: File) {
-        return new Promise((resolve, reject) => {
-            const reader = new FileReader();
-            reader.readAsDataURL(file);
-            reader.onload = () => resolve(reader.result);
-            reader.onerror = error => reject(error);
-        });
-    }
-
-  toBase64(file: File) {
-      return this.getBase64(file);
-  }
-
-}


[incubator-streampipes] 02/04: [STREAMPIPES-597] Rename new adapter component to adapter configuration

Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c30b1a44c1e21a950d61dbd9a4579e9cb1959410
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Oct 12 14:05:55 2022 +0200

    [STREAMPIPES-597] Rename new adapter component to adapter configuration
---
 .../adapter-configuration-header.component.html    |  0
 .../adapter-configuration-header.component.scss    |  0
 .../adapter-configuration-header.component.ts      |  0
 .../adapter-configuration.component.html}          |  0
 .../adapter-configuration.component.scss}          |  0
 .../adapter-configuration.component.ts}            |  8 ++---
 .../adapter-template-configuration.directive.ts}   | 34 +++++++++----------
 .../format-configuration.component.html            |  0
 .../format-configuration.component.scss            |  0
 .../format-configuration.component.ts              |  0
 .../format-item-json.component.html                |  0
 .../format-item-json.component.scss                |  0
 .../format-item-json/format-item-json.component.ts |  0
 .../format-item/format-item.component.html         |  0
 .../format-item/format-item.component.scss         |  0
 .../format-item/format-item.component.ts           |  0
 .../format-list/format-list.component.html         |  0
 .../format-list/format-list.component.scss         |  0
 .../format-list/format-list.component.ts           |  0
 .../generic-adapter-configuration.component.html   |  0
 .../generic-adapter-configuration.component.scss   |  0
 .../generic-adapter-configuration.component.ts     |  8 ++---
 .../error-message/error-message.component.html     |  0
 .../error-message/error-message.component.scss     |  0
 .../error-message/error-message.component.ts       |  0
 .../event-property-row.component.html              |  0
 .../event-property-row.component.scss              |  0
 .../event-property-row.component.ts                |  0
 .../event-schema-preview.component.html            |  0
 .../event-schema-preview.component.scss            |  0
 .../event-schema-preview.component.ts              |  0
 .../event-schema/event-schema.component.html       |  0
 .../event-schema/event-schema.component.scss       |  0
 .../event-schema/event-schema.component.ts         |  0
 .../loading-message/loading-message.component.html |  0
 .../loading-message/loading-message.component.scss |  0
 .../loading-message/loading-message.component.ts   |  0
 .../schema-editor-header.component.html            |  0
 .../schema-editor-header.component.scss            |  0
 .../schema-editor-header.component.ts              |  0
 .../specific-adapter-configuration.component.html  |  0
 .../specific-adapter-configuration.component.scss  |  0
 .../specific-adapter-configuration.component.ts    |  8 ++---
 .../adapter-options-panel.component.html           |  0
 .../adapter-options-panel.component.scss           |  0
 .../adapter-options-panel.component.ts             |  0
 .../start-adapter-configuration.component.html     |  0
 .../start-adapter-configuration.component.scss     |  0
 .../start-adapter-configuration.component.ts       |  0
 ui/src/app/connect/connect.module.ts               | 38 +++++++++++-----------
 50 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.html b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.html
rename to ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.html
diff --git a/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.scss b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.scss
rename to ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/adapter-configuration-header/adapter-configuration-header.component.ts
rename to ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.html b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/new-adapter.component.html
rename to ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.scss b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/new-adapter.component.scss
rename to ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
similarity index 97%
rename from ui/src/app/connect/components/new-adapter/new-adapter.component.ts
rename to ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
index 14a265d51..731fbe55e 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
@@ -40,11 +40,11 @@ import { SpBreadcrumbService } from '@streampipes/shared-ui';
 import { SpConnectRoutes } from '../../connect.routes';
 
 @Component({
-  selector: 'sp-new-adapter',
-  templateUrl: './new-adapter.component.html',
-  styleUrls: ['./new-adapter.component.scss']
+  selector: 'sp-adapter-configuration',
+  templateUrl: './adapter-configuration.component.html',
+  styleUrls: ['./adapter-configuration.component.scss']
 })
-export class NewAdapterComponent implements OnInit, AfterViewInit {
+export class AdapterConfigurationComponent implements OnInit, AfterViewInit {
 
 
   adapterTypeName = '';
diff --git a/ui/src/app/connect/components/new-adapter/adapter-configuration.directive.ts b/ui/src/app/connect/components/adapter-configuration/directives/adapter-template-configuration.directive.ts
similarity index 67%
rename from ui/src/app/connect/components/new-adapter/adapter-configuration.directive.ts
rename to ui/src/app/connect/components/adapter-configuration/directives/adapter-template-configuration.directive.ts
index b5ba39701..e708f8a39 100644
--- a/ui/src/app/connect/components/new-adapter/adapter-configuration.directive.ts
+++ b/ui/src/app/connect/components/adapter-configuration/directives/adapter-template-configuration.directive.ts
@@ -1,34 +1,30 @@
 /*
- * 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
+ *  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
+ *     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.
+ *  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 { Directive, EventEmitter, Input, Output } from '@angular/core';
 import { MatStepper } from '@angular/material/stepper';
-import {
-  AdapterDescriptionUnion,
-  PipelineElementTemplate,
-  PipelineElementTemplateService
-} from '@streampipes/platform-services';
+import { AdapterDescriptionUnion, PipelineElementTemplate, PipelineElementTemplateService } from '@streampipes/platform-services';
 import { FormBuilder } from '@angular/forms';
-import { AdapterTemplateService } from '../../services/adapter-template.service';
+import { AdapterTemplateService } from '../../../services/adapter-template.service';
 import { DialogService } from '@streampipes/shared-ui';
 
 @Directive()
-export abstract class AdapterConfigurationDirective {
+export abstract class AdapterTemplateConfigurationDirective {
 
   /**
    * Adapter description the selected format is added to
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.html
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.html
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.scss b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.scss
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.ts
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.html b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-item-json/format-item-json.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.html
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-item-json/format-item-json.component.html
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.scss b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-item-json/format-item-json.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.scss
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-item-json/format-item-json.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.ts b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-item-json/format-item-json.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.ts
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-item-json/format-item-json.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.html b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-item/format-item.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.html
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-item/format-item.component.html
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.scss b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-item/format-item.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.scss
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-item/format-item.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.ts b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-item/format-item.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.ts
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-item/format-item.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.html b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-list/format-list.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.html
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-list/format-list.component.html
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.scss b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-list/format-list.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.scss
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-list/format-list.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.ts b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-list/format-list.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.ts
rename to ui/src/app/connect/components/adapter-configuration/format-configuration/format-list/format-list.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.html
rename to ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.html
diff --git a/ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.scss b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.scss
rename to ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
similarity index 91%
rename from ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.ts
rename to ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
index 80b93017e..5a8b80fe9 100644
--- a/ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
@@ -24,7 +24,7 @@ import {
   PipelineElementTemplateService
 } from '@streampipes/platform-services';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { AdapterConfigurationDirective } from '../adapter-configuration.directive';
+import { AdapterTemplateConfigurationDirective } from '../directives/adapter-template-configuration.directive';
 import { AdapterTemplateService } from '../../../services/adapter-template.service';
 import { DialogService } from '@streampipes/shared-ui';
 
@@ -33,7 +33,7 @@ import { DialogService } from '@streampipes/shared-ui';
   templateUrl: './generic-adapter-configuration.component.html',
   styleUrls: ['./generic-adapter-configuration.component.scss']
 })
-export class GenericAdapterConfigurationComponent extends AdapterConfigurationDirective implements OnInit {
+export class GenericAdapterConfigurationComponent extends AdapterTemplateConfigurationDirective implements OnInit {
 
   genericAdapterSettingsFormValid: boolean;
 
@@ -57,7 +57,7 @@ export class GenericAdapterConfigurationComponent extends AdapterConfigurationDi
 
     // initialize form for validation
     this.genericAdapterForm = this._formBuilder.group({});
-    this.genericAdapterForm.statusChanges.subscribe((status) => {
+    this.genericAdapterForm.statusChanges.subscribe((_) => {
       this.genericAdapterSettingsFormValid = this.genericAdapterForm.valid;
     });
   }
@@ -65,7 +65,7 @@ export class GenericAdapterConfigurationComponent extends AdapterConfigurationDi
   openTemplateDialog(): void {
     const dialogRef = this.adapterTemplateService.getDialog(this.protocolDescription.config, this.protocolDescription.appId);
 
-    dialogRef.afterClosed().subscribe(refresh => {
+    dialogRef.afterClosed().subscribe(_ => {
       this.loadPipelineElementTemplates();
     });
   }
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.html b/ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.html
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.html
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.scss b/ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.scss
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.ts b/ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.ts
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-property-row/event-property-row.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-property-row/event-property-row.component.html
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-property-row/event-property-row.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-property-row/event-property-row.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-property-row/event-property-row.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-property-row/event-property-row.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.html b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.html
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component.html
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.scss b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.scss
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.ts b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.ts
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.html b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.html
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.html
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.scss b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.scss
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.ts b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.ts
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.html b/ui/src/app/connect/components/adapter-configuration/schema-editor/loading-message/loading-message.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.html
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/loading-message/loading-message.component.html
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.scss b/ui/src/app/connect/components/adapter-configuration/schema-editor/loading-message/loading-message.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.scss
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/loading-message/loading-message.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.ts b/ui/src/app/connect/components/adapter-configuration/schema-editor/loading-message/loading-message.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.ts
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/loading-message/loading-message.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html b/ui/src/app/connect/components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component.html
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.scss b/ui/src/app/connect/components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.scss
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.ts b/ui/src/app/connect/components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.ts
rename to ui/src/app/connect/components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.html
rename to ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.html
diff --git a/ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.scss b/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.scss
rename to ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.ts
similarity index 91%
rename from ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.ts
rename to ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.ts
index 2ef6de8a0..879bf5030 100644
--- a/ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.ts
@@ -21,14 +21,14 @@ import { AdapterDescription, PipelineElementTemplateService } from '@streampipes
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { DialogService } from '@streampipes/shared-ui';
 import { AdapterTemplateService } from '../../../services/adapter-template.service';
-import { AdapterConfigurationDirective } from '../adapter-configuration.directive';
+import { AdapterTemplateConfigurationDirective } from '../directives/adapter-template-configuration.directive';
 
 @Component({
   selector: 'sp-specific-adapter-configuration',
   templateUrl: './specific-adapter-configuration.component.html',
   styleUrls: ['./specific-adapter-configuration.component.scss']
 })
-export class SpecificAdapterConfigurationComponent extends AdapterConfigurationDirective implements OnInit {
+export class SpecificAdapterConfigurationComponent extends AdapterTemplateConfigurationDirective implements OnInit {
 
   specificAdapterSettingsFormValid: boolean;
 
@@ -47,7 +47,7 @@ export class SpecificAdapterConfigurationComponent extends AdapterConfigurationD
     this.cachedAdapterDescription = {...this.adapterDescription};
     // initialize form for validation
     this.specificAdapterForm = this._formBuilder.group({});
-    this.specificAdapterForm.statusChanges.subscribe((status) => {
+    this.specificAdapterForm.statusChanges.subscribe((_) => {
       this.specificAdapterSettingsFormValid = this.specificAdapterForm.valid;
     });
 
@@ -60,7 +60,7 @@ export class SpecificAdapterConfigurationComponent extends AdapterConfigurationD
   openTemplateDialog(): void {
     const dialogRef = this.adapterTemplateService.getDialog(this.adapterDescription.config, this.adapterDescription.appId);
 
-    dialogRef.afterClosed().subscribe(refresh => {
+    dialogRef.afterClosed().subscribe(_ => {
       this.loadPipelineElementTemplates();
     });
   }
diff --git a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
rename to ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
diff --git a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss
rename to ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.ts b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.ts
rename to ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.ts
diff --git a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.html
rename to ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
diff --git a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.scss b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.scss
rename to ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.scss
diff --git a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
similarity index 100%
rename from ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.ts
rename to ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index b79749e18..bf8410a18 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -24,8 +24,8 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatGridListModule } from '@angular/material/grid-list';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 
-import { NewAdapterComponent } from './components/new-adapter/new-adapter.component';
-import { EventSchemaComponent } from './components/new-adapter/schema-editor/event-schema/event-schema.component';
+import { AdapterConfigurationComponent } from './components/adapter-configuration/adapter-configuration.component';
+import { EventSchemaComponent } from './components/adapter-configuration/schema-editor/event-schema/event-schema.component';
 
 import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
 
@@ -39,8 +39,8 @@ import { TransformationRuleService } from './services/transformation-rule.servic
 import { ConnectService } from './services/connect.service';
 import { AdapterDescriptionComponent } from './components/data-marketplace/adapter-description/adapter-description.component';
 import { DataMarketplaceComponent } from './components/data-marketplace/data-marketplace.component';
-import { FormatItemComponent } from './components/new-adapter/format-configuration/format-item/format-item.component';
-import { FormatListComponent } from './components/new-adapter/format-configuration/format-list/format-list.component';
+import { FormatItemComponent } from './components/adapter-configuration/format-configuration/format-item/format-item.component';
+import { FormatListComponent } from './components/adapter-configuration/format-configuration/format-list/format-list.component';
 import { IconService } from './services/icon.service';
 import { UnitProviderService } from './services/unit-provider.service';
 
@@ -64,8 +64,8 @@ import {
 } from './dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
 import { EditEventPropertyComponent } from './dialog/edit-event-property/edit-event-property.component';
 import { PipelineElementRuntimeInfoComponent } from './components/runtime-info/pipeline-element-runtime-info.component';
-import { EventPropertyRowComponent } from './components/new-adapter/schema-editor/event-property-row/event-property-row.component';
-import { EventSchemaPreviewComponent } from './components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component';
+import { EventPropertyRowComponent } from './components/adapter-configuration/schema-editor/event-property-row/event-property-row.component';
+import { EventSchemaPreviewComponent } from './components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component';
 import { CoreUiModule } from '../core-ui/core-ui.module';
 import {
   EditCorrectionValueComponent
@@ -73,21 +73,21 @@ import {
 import { ExistingAdaptersComponent } from './components/existing-adapters/existing-adapters.component';
 import {
   SpecificAdapterConfigurationComponent
-} from './components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component';
+} from './components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component';
 import { ConfigurationGroupComponent } from './components/configuration-group/configuration-group.component';
-import { FormatConfigurationComponent } from './components/new-adapter/format-configuration/format-configuration.component';
+import { FormatConfigurationComponent } from './components/adapter-configuration/format-configuration/format-configuration.component';
 import {
   GenericAdapterConfigurationComponent
-} from './components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component';
-import { ErrorMessageComponent } from './components/new-adapter/schema-editor/error-message/error-message.component';
-import { LoadingMessageComponent } from './components/new-adapter/schema-editor/loading-message/loading-message.component';
-import { SchemaEditorHeaderComponent } from './components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component';
+} from './components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component';
+import { ErrorMessageComponent } from './components/adapter-configuration/schema-editor/error-message/error-message.component';
+import { LoadingMessageComponent } from './components/adapter-configuration/schema-editor/loading-message/loading-message.component';
+import { SchemaEditorHeaderComponent } from './components/adapter-configuration/schema-editor/schema-editor-header/schema-editor-header.component';
 import {
   StartAdapterConfigurationComponent
-} from './components/new-adapter/start-adapter-configuration/start-adapter-configuration.component';
+} from './components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component';
 import { DeleteAdapterDialogComponent } from './dialog/delete-adapter-dialog/delete-adapter-dialog.component';
 import { PlatformServicesModule } from '@streampipes/platform-services';
-import { FormatItemJsonComponent } from './components/new-adapter/format-configuration/format-item-json/format-item-json.component';
+import { FormatItemJsonComponent } from './components/adapter-configuration/format-configuration/format-item-json/format-item-json.component';
 import { RouterModule } from '@angular/router';
 import { SharedUiModule } from '@streampipes/shared-ui';
 import { SpConnectFilterToolbarComponent } from './components/filter-toolbar/filter-toolbar.component';
@@ -100,11 +100,11 @@ import {
 import { SpEpSettingsSectionComponent } from './dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component';
 import {
   SpAdapterOptionsPanelComponent
-} from './components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component';
+} from './components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component';
 import { SpAdapterTemplateDialogComponent } from './dialog/adapter-template/adapter-template-dialog.component';
 import { JsonPrettyPrintPipe } from './filter/json-pretty-print.pipe';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { AdapterConfigurationHeaderComponent } from './components/new-adapter/adapter-configuration-header/adapter-configuration-header.component';
+import { AdapterConfigurationHeaderComponent } from './components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component';
 
 @NgModule({
   imports: [
@@ -139,11 +139,11 @@ import { AdapterConfigurationHeaderComponent } from './components/new-adapter/ad
           },
           {
             path: 'create/:appId',
-            component: NewAdapterComponent,
+            component: AdapterConfigurationComponent,
           },
           {
             path: 'edit/:appId',
-            component: NewAdapterComponent,
+            component: AdapterConfigurationComponent,
           }]
       }]),
     SharedUiModule
@@ -173,7 +173,7 @@ import { AdapterConfigurationHeaderComponent } from './components/new-adapter/ad
     FormatItemComponent,
     FormatListComponent,
     JsonPrettyPrintPipe,
-    NewAdapterComponent,
+    AdapterConfigurationComponent,
     SpAdapterTemplateDialogComponent,
     PipelineElementRuntimeInfoComponent,
     TimestampPipe,