You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/09 08:04:18 UTC

[incubator-streampipes] 02/04: [STREAMPIPES-558] Reorganize Connect module structure

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

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

commit ea77f0ce5089fa0fe3335404eafcbf9296ac14e8
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri Jul 8 23:08:51 2022 +0200

    [STREAMPIPES-558] Reorganize Connect module structure
---
 .../format-configuration.component.html            |  0
 .../format-configuration.component.scss            |  0
 .../format-configuration.component.ts              |  2 +-
 .../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           |  2 +-
 .../format-list/format-list.component.html         |  0
 .../format-list/format-list.component.scss         |  0
 .../format-list/format-list.component.ts           |  2 +-
 .../generic-adapter-configuration.component.html   |  0
 .../generic-adapter-configuration.component.scss   |  0
 .../generic-adapter-configuration.component.ts     |  0
 .../new-adapter/new-adapter.component.ts           |  2 +-
 .../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                |  2 +-
 .../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         |  6 ++---
 .../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              |  2 +-
 .../specific-adapter-configuration.component.html  |  0
 .../specific-adapter-configuration.component.scss  |  0
 .../specific-adapter-configuration.component.ts    |  0
 .../start-adapter-configuration.component.html     |  0
 .../start-adapter-configuration.component.scss     |  0
 .../start-adapter-configuration.component.ts       |  8 +++----
 ui/src/app/connect/connect.module.ts               | 26 +++++++++++-----------
 41 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.html b/ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/format-configuration/format-configuration.component.html
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.html
diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.scss b/ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/format-configuration/format-configuration.component.scss
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.scss
diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts b/ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.ts
similarity index 98%
rename from ui/src/app/connect/components/format-configuration/format-configuration.component.ts
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.ts
index 87a8c7c17..b1296510b 100644
--- a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
+++ b/ui/src/app/connect/components/new-adapter/format-configuration/format-configuration.component.ts
@@ -24,7 +24,7 @@ import {
   GenericAdapterStreamDescription
 } from '@streampipes/platform-services';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { RestService } from '../../services/rest.service';
+import { RestService } from '../../../services/rest.service';
 import { MatStepper } from '@angular/material/stepper';
 
 @Component({
diff --git a/ui/src/app/connect/components/format-item-json/format-item-json.component.html b/ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.html
similarity index 100%
rename from ui/src/app/connect/components/format-item-json/format-item-json.component.html
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.html
diff --git a/ui/src/app/connect/components/format-item-json/format-item-json.component.scss b/ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.scss
similarity index 100%
rename from ui/src/app/connect/components/format-item-json/format-item-json.component.scss
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.scss
diff --git a/ui/src/app/connect/components/format-item-json/format-item-json.component.ts b/ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.ts
similarity index 100%
rename from ui/src/app/connect/components/format-item-json/format-item-json.component.ts
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-item-json/format-item-json.component.ts
diff --git a/ui/src/app/connect/components/format-item/format-item.component.html b/ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.html
similarity index 100%
rename from ui/src/app/connect/components/format-item/format-item.component.html
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.html
diff --git a/ui/src/app/connect/components/format-item/format-item.component.scss b/ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.scss
similarity index 100%
rename from ui/src/app/connect/components/format-item/format-item.component.scss
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.scss
diff --git a/ui/src/app/connect/components/format-item/format-item.component.ts b/ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.ts
similarity index 95%
rename from ui/src/app/connect/components/format-item/format-item.component.ts
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.ts
index 6d7db6059..77f2662a1 100644
--- a/ui/src/app/connect/components/format-item/format-item.component.ts
+++ b/ui/src/app/connect/components/new-adapter/format-configuration/format-item/format-item.component.ts
@@ -17,7 +17,7 @@
  */
 
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ShepherdService } from '../../../services/tour/shepherd.service';
+import { ShepherdService } from '../../../../../services/tour/shepherd.service';
 import { FormatDescription } from '@streampipes/platform-services';
 
 @Component({
diff --git a/ui/src/app/connect/components/format-list/format-list.component.html b/ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.html
similarity index 100%
rename from ui/src/app/connect/components/format-list/format-list.component.html
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.html
diff --git a/ui/src/app/connect/components/format-list/format-list.component.scss b/ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.scss
similarity index 100%
rename from ui/src/app/connect/components/format-list/format-list.component.scss
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.scss
diff --git a/ui/src/app/connect/components/format-list/format-list.component.ts b/ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.ts
similarity index 97%
rename from ui/src/app/connect/components/format-list/format-list.component.ts
rename to ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.ts
index bcc1afd68..65d18a4b7 100644
--- a/ui/src/app/connect/components/format-list/format-list.component.ts
+++ b/ui/src/app/connect/components/new-adapter/format-configuration/format-list/format-list.component.ts
@@ -18,7 +18,7 @@
 
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormatDescription } from '@streampipes/platform-services';
-import { RestService } from '../../services/rest.service';
+import { RestService } from '../../../../services/rest.service';
 
 @Component({
     selector: 'sp-format-list',
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.html b/ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.html
rename to ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.html
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.scss b/ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.scss
rename to ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.scss
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts b/ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.ts
similarity index 100%
rename from ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
rename to ui/src/app/connect/components/new-adapter/generic-adapter-configuration/generic-adapter-configuration.component.ts
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 cfdb080ff..dc8a1d8cc 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
@@ -41,7 +41,7 @@ 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 { 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';
diff --git a/ui/src/app/connect/components/schema-editor/error-message/error-message.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.html
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/error-message/error-message.component.html
rename to ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.html
diff --git a/ui/src/app/connect/components/schema-editor/error-message/error-message.component.scss b/ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.scss
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/error-message/error-message.component.scss
rename to ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.scss
diff --git a/ui/src/app/connect/components/schema-editor/error-message/error-message.component.ts b/ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.ts
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/error-message/error-message.component.ts
rename to ui/src/app/connect/components/new-adapter/schema-editor/error-message/error-message.component.ts
diff --git a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.html
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
diff --git a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.scss b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.scss
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss
diff --git a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.ts b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts
similarity index 98%
rename from ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.ts
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts
index 4186a367e..514d79e81 100644
--- a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.ts
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts
@@ -28,7 +28,7 @@ import {
     EventPropertyUnion,
     EventSchema
 } from '@streampipes/platform-services';
-import { EditEventPropertyComponent } from '../../../dialog/edit-event-property/edit-event-property.component';
+import { EditEventPropertyComponent } from '../../../../dialog/edit-event-property/edit-event-property.component';
 
 @Component({
   selector: 'event-property-row',
diff --git a/ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.html
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.html
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.html
diff --git a/ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.scss b/ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.scss
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.scss
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.scss
diff --git a/ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.ts b/ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.ts
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.ts
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component.ts
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.html
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.html
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.html
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.scss b/ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.scss
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.scss
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.scss
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts b/ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.ts
similarity index 97%
rename from ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
rename to ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.ts
index 8cf453f9e..9a1c89cee 100644
--- a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/event-schema/event-schema.component.ts
@@ -17,10 +17,10 @@
  */
 
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core';
-import { RestService } from '../../../services/rest.service';
+import { RestService } from '../../../../services/rest.service';
 import { ITreeOptions, TreeComponent } from '@circlon/angular-tree-component';
 import { UUID } from 'angular2-uuid';
-import { DataTypesService } from '../../../services/data-type.service';
+import { DataTypesService } from '../../../../services/data-type.service';
 import {
   AdapterDescription,
   EventProperty,
@@ -31,7 +31,7 @@ import {
   Notification
 } from '@streampipes/platform-services';
 import { MatStepper } from '@angular/material/stepper';
-import { UserErrorMessage } from '../../../../core-model/base/UserErrorMessage';
+import { UserErrorMessage } from '../../../../../core-model/base/UserErrorMessage';
 
 @Component({
   selector: 'sp-event-schema',
diff --git a/ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.html
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.html
rename to ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.html
diff --git a/ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.scss b/ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.scss
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.scss
rename to ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.scss
diff --git a/ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.ts b/ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.ts
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.ts
rename to ui/src/app/connect/components/new-adapter/schema-editor/loading-message/loading-message.component.ts
diff --git a/ui/src/app/connect/components/schema-editor/schema-editor-header/schema-editor-header.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/schema-editor-header/schema-editor-header.component.html
rename to ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html
diff --git a/ui/src/app/connect/components/schema-editor/schema-editor-header/schema-editor-header.component.scss b/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.scss
similarity index 100%
rename from ui/src/app/connect/components/schema-editor/schema-editor-header/schema-editor-header.component.scss
rename to ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.scss
diff --git a/ui/src/app/connect/components/schema-editor/schema-editor-header/schema-editor-header.component.ts b/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.ts
similarity index 96%
rename from ui/src/app/connect/components/schema-editor/schema-editor-header/schema-editor-header.component.ts
rename to ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.ts
index 1b757bacb..b4011383b 100644
--- a/ui/src/app/connect/components/schema-editor/schema-editor-header/schema-editor-header.component.ts
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.ts
@@ -17,7 +17,7 @@
  */
 
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { UserErrorMessage } from '../../../../core-model/base/UserErrorMessage';
+import { UserErrorMessage } from '../../../../../core-model/base/UserErrorMessage';
 
 @Component({
   selector: 'sp-schema-editor-header',
diff --git a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.html b/ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.html
rename to ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.html
diff --git a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.scss b/ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.scss
rename to ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.scss
diff --git a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts b/ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.ts
similarity index 100%
rename from ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts
rename to ui/src/app/connect/components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component.ts
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html b/ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.html
similarity index 100%
rename from ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
rename to ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.html
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.scss b/ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.scss
similarity index 100%
rename from ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.scss
rename to ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.scss
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts b/ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.ts
similarity index 94%
rename from ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
rename to ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.ts
index 5c59ac060..c694cb1ac 100644
--- a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/new-adapter/start-adapter-configuration/start-adapter-configuration.component.ts
@@ -28,11 +28,11 @@ import {
 } from '@streampipes/platform-services';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatStepper } from '@angular/material/stepper';
-import { AdapterStartedDialog } from '../../dialog/adapter-started/adapter-started-dialog.component';
+import { AdapterStartedDialog } from '../../../dialog/adapter-started/adapter-started-dialog.component';
 import { PanelType, DialogService } from '@streampipes/shared-ui';
-import { ShepherdService } from '../../../services/tour/shepherd.service';
-import { ConnectService } from '../../services/connect.service';
-import { TimestampPipe } from '../../filter/timestamp.pipe';
+import { ShepherdService } from '../../../../services/tour/shepherd.service';
+import { ConnectService } from '../../../services/connect.service';
+import { TimestampPipe } from '../../../filter/timestamp.pipe';
 import { MatCheckboxChange } from '@angular/material/checkbox';
 
 @Component({
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index d95ec367d..8726839d8 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -28,7 +28,7 @@ import { ConnectComponent } from './connect.component';
 import { NewAdapterComponent } from './components/new-adapter/new-adapter.component';
 
 import { EditEventPropertyPrimitiveComponent } from './dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component';
-import { EventSchemaComponent } from './components/schema-editor/event-schema/event-schema.component';
+import { EventSchemaComponent } from './components/new-adapter/schema-editor/event-schema/event-schema.component';
 
 import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
 
@@ -43,8 +43,8 @@ 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 { DataMarketplaceService } from './services/data-marketplace.service';
-import { FormatItemComponent } from './components/format-item/format-item.component';
-import { FormatListComponent } from './components/format-list/format-list.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 { IconService } from './services/icon.service';
 import { UnitProviderService } from './services/unit-provider.service';
 
@@ -63,24 +63,24 @@ import { EditTimestampPropertyComponent } from './dialog/edit-event-property/com
 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/schema-editor/event-property-row/event-property-row.component';
-import { EventSchemaPreviewComponent } from './components/schema-editor/event-schema-preview/event-schema-preview.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-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/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/format-configuration/format-configuration.component';
-import { GenericAdapterConfigurationComponent } from './components/generic-adapter-configuration/generic-adapter-configuration.component';
-import { ErrorMessageComponent } from './components/schema-editor/error-message/error-message.component';
-import { LoadingMessageComponent } from './components/schema-editor/loading-message/loading-message.component';
-import { SchemaEditorHeaderComponent } from './components/schema-editor/schema-editor-header/schema-editor-header.component';
-import { StartAdapterConfigurationComponent } from './components/start-adapter-configuration/start-adapter-configuration.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 { 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 { DeleteAdapterDialogComponent } from './dialog/delete-adapter-dialog/delete-adapter-dialog.component';
 import { PlatformServicesModule } from '@streampipes/platform-services';
-import { FormatItemJsonComponent } from './components/format-item-json/format-item-json.component';
+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 {