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

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

commit 28a4777d6ed23c19caa4929f9d9c73c21ba0b700
Author: Philipp Zehnder <[email protected]>
AuthorDate: Wed Jul 1 19:01:15 2020 +0200

    [STREAMPIPES-145] Move edit event property dialog
---
 ui/src/app/connect/connect.module.ts                       | 14 +++++++-------
 .../edit-event-property-list.component.css}                |  0
 .../edit-event-property-list.component.html}               |  0
 .../edit-event-property-list.component.ts}                 |  8 ++++----
 .../edit-event-property-primitive.component.css}           |  0
 .../edit-event-property-primitive.component.html}          |  0
 .../edit-event-property-primitive.component.ts}            | 14 +++++++-------
 .../edit-event-property/edit-event-property.component.css} |  0
 .../edit-event-property.component.html}                    |  0
 .../edit-event-property/edit-event-property.component.ts}  | 10 +++++-----
 .../event-property-row/event-property-row.component.ts     |  4 ++--
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/ui/src/app/connect/connect.module.ts 
b/ui/src/app/connect/connect.module.ts
index 3003ca0..e122740 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -30,8 +30,7 @@ import {NewAdapterComponent} from 
'./new-adapter/new-adapter.component';
 
 import {FormatFormComponent} from './format-form/format-form.component';
 
-import {EventPropertyPrimitiveComponent} from 
'./schema-editor/event-property-primitive/event-property-primitive.component';
-import {EventPropertyComponent} from 
'./schema-editor/event-property/event-property.component';
+import {EditEventPropertyPrimitiveComponent} from 
'./dialog/edit-event-property-primitive/edit-event-property-primitive.component';
 import {EventSchemaComponent} from 
'./schema-editor/event-schema/event-schema.component';
 
 import {StaticPropertyComponent} from 
'./static-properties/static-property.component';
@@ -75,7 +74,7 @@ import {StaticCollectionComponent} from 
'./static-properties/static-collection/s
 import {FilterPipe} from '../connect/data-marketplace/filter.pipe';
 import {AdapterExportDialog} from 
'./data-marketplace/adapter-export/adapter-export-dialog.component';
 import {AdapterUploadDialog} from 
'./data-marketplace/adapter-upload/adapter-upload-dialog.component';
-import {EventPropertyListComponent} from 
'./schema-editor/event-property-list/event-property-list.component';
+import {EditEventPropertyListComponent} from 
'./dialog/edit-event-property-list/edit-event-property-list.component';
 import {StaticMappingNaryComponent} from 
'./static-properties/static-mapping-nary/static-mapping-nary.component';
 import {StaticMappingUnaryComponent} from 
'./static-properties/static-mapping-unary/static-mapping-unary.component';
 import {TimestampPipe} from './filter/timestamp.pipe';
@@ -92,6 +91,7 @@ import {xsService} from "../NS/XS.service";
 import {MatSliderModule} from "@angular/material/slider";
 import { QuillModule } from 'ngx-quill'
 import {MatChipsModule} from "@angular/material/chips";
+import { EditEventPropertyComponent } from 
'./dialog/edit-event-property/edit-event-property.component';
 
 
 @NgModule({
@@ -123,10 +123,10 @@ import {MatChipsModule} from "@angular/material/chips";
         NewAdapterComponent,
         FormatFormComponent,
         EventSchemaComponent,
-        EventPropertyPrimitiveComponent,
-        EventPropertyComponent,
+        EditEventPropertyPrimitiveComponent,
+        EditEventPropertyComponent,
         EventPropertyRowComponent,
-        EventPropertyListComponent,
+        EditEventPropertyListComponent,
         StaticPropertyComponent,
         AdapterStartedDialog,
         AdapterExportDialog,
@@ -187,6 +187,6 @@ import {MatChipsModule} from "@angular/material/chips";
             deps: ['$injector'],
         },
     ],
-    entryComponents: [ConnectComponent, AdapterStartedDialog, 
AdapterExportDialog, AdapterUploadDialog, EventPropertyComponent],
+    entryComponents: [ConnectComponent, AdapterStartedDialog, 
AdapterExportDialog, AdapterUploadDialog, EditEventPropertyComponent],
 })
 export class ConnectModule { }
diff --git 
a/ui/src/app/connect/schema-editor/event-property-list/event-property-list.component.css
 
b/ui/src/app/connect/dialog/edit-event-property-list/edit-event-property-list.component.css
similarity index 100%
rename from 
ui/src/app/connect/schema-editor/event-property-list/event-property-list.component.css
rename to 
ui/src/app/connect/dialog/edit-event-property-list/edit-event-property-list.component.css
diff --git 
a/ui/src/app/connect/schema-editor/event-property-list/event-property-list.component.html
 
b/ui/src/app/connect/dialog/edit-event-property-list/edit-event-property-list.component.html
similarity index 100%
rename from 
ui/src/app/connect/schema-editor/event-property-list/event-property-list.component.html
rename to 
ui/src/app/connect/dialog/edit-event-property-list/edit-event-property-list.component.html
diff --git 
a/ui/src/app/connect/schema-editor/event-property-list/event-property-list.component.ts
 
b/ui/src/app/connect/dialog/edit-event-property-list/edit-event-property-list.component.ts
similarity index 84%
rename from 
ui/src/app/connect/schema-editor/event-property-list/event-property-list.component.ts
rename to 
ui/src/app/connect/dialog/edit-event-property-list/edit-event-property-list.component.ts
index 451144d..87238c2 100644
--- 
a/ui/src/app/connect/schema-editor/event-property-list/event-property-list.component.ts
+++ 
b/ui/src/app/connect/dialog/edit-event-property-list/edit-event-property-list.component.ts
@@ -17,16 +17,16 @@
  */
 
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {DataTypesService} from '../data-type.service';
+import {DataTypesService} from '../../schema-editor/data-type.service';
 import {EventProperty} from "../../../core-model/gen/streampipes-model";
 
 
 @Component({
   selector: 'app-event-property-list',
-  templateUrl: './event-property-list.component.html',
-  styleUrls: ['./event-property-list.component.css']
+  templateUrl: './edit-event-property-list.component.html',
+  styleUrls: ['./edit-event-property-list.component.css']
 })
-export class EventPropertyListComponent implements OnInit {
+export class EditEventPropertyListComponent implements OnInit {
 
   constructor(private dataTypeService: DataTypesService) { }
 
diff --git 
a/ui/src/app/connect/schema-editor/event-property-primitive/event-property-primitive.component.css
 
b/ui/src/app/connect/dialog/edit-event-property-primitive/edit-event-property-primitive.component.css
similarity index 100%
rename from 
ui/src/app/connect/schema-editor/event-property-primitive/event-property-primitive.component.css
rename to 
ui/src/app/connect/dialog/edit-event-property-primitive/edit-event-property-primitive.component.css
diff --git 
a/ui/src/app/connect/schema-editor/event-property-primitive/event-property-primitive.component.html
 
b/ui/src/app/connect/dialog/edit-event-property-primitive/edit-event-property-primitive.component.html
similarity index 100%
rename from 
ui/src/app/connect/schema-editor/event-property-primitive/event-property-primitive.component.html
rename to 
ui/src/app/connect/dialog/edit-event-property-primitive/edit-event-property-primitive.component.html
diff --git 
a/ui/src/app/connect/schema-editor/event-property-primitive/event-property-primitive.component.ts
 
b/ui/src/app/connect/dialog/edit-event-property-primitive/edit-event-property-primitive.component.ts
similarity index 93%
rename from 
ui/src/app/connect/schema-editor/event-property-primitive/event-property-primitive.component.ts
rename to 
ui/src/app/connect/dialog/edit-event-property-primitive/edit-event-property-primitive.component.ts
index e8b85c1..9d535f6 100644
--- 
a/ui/src/app/connect/schema-editor/event-property-primitive/event-property-primitive.component.ts
+++ 
b/ui/src/app/connect/dialog/edit-event-property-primitive/edit-event-property-primitive.component.ts
@@ -19,23 +19,23 @@
 import {Component, DoCheck, EventEmitter, Input, OnInit, Output} from 
'@angular/core';
 import {Observable, Subscription} from 'rxjs';
 import {FormBuilder, FormControl, FormGroup} from '@angular/forms';
-import {DataTypesService} from '../data-type.service';
-import {DomainPropertyProbabilityList} from 
'../model/DomainPropertyProbabilityList';
+import {DataTypesService} from '../../schema-editor/data-type.service';
+import {DomainPropertyProbabilityList} from 
'../../schema-editor/model/DomainPropertyProbabilityList';
 import {ShepherdService} from '../../../services/tour/shepherd.service';
 import {RestService} from '../../rest.service';
 import {UnitDescription} from '../../model/UnitDescription';
-import {UnitProviderService} from '../unit-provider.service';
+import {UnitProviderService} from '../../schema-editor/unit-provider.service';
 import {map, startWith} from 'rxjs/operators';
 import {EventProperty} from "../../../core-model/gen/streampipes-model";
 
 @Component({
   selector: 'app-event-property-primitive',
-  templateUrl: './event-property-primitive.component.html',
-  styleUrls: ['./event-property-primitive.component.css']
+  templateUrl: './edit-event-property-primitive.component.html',
+  styleUrls: ['./edit-event-property-primitive.component.css']
 })
-export class EventPropertyPrimitiveComponent implements OnInit, DoCheck {
+export class EditEventPropertyPrimitiveComponent implements OnInit, DoCheck {
 
-  soTimestamp = "http://schema.org/DateTime";;
+  soTimestamp = 'http://schema.org/DateTime';
 
   @Input() property: any;
   @Input() index: number;
diff --git 
a/ui/src/app/connect/schema-editor/event-property/event-property.component.css 
b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.css
similarity index 100%
rename from 
ui/src/app/connect/schema-editor/event-property/event-property.component.css
rename to 
ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.css
diff --git 
a/ui/src/app/connect/schema-editor/event-property/event-property.component.html 
b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
similarity index 100%
rename from 
ui/src/app/connect/schema-editor/event-property/event-property.component.html
rename to 
ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
diff --git 
a/ui/src/app/connect/schema-editor/event-property/event-property.component.ts 
b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
similarity index 94%
rename from 
ui/src/app/connect/schema-editor/event-property/event-property.component.ts
rename to 
ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
index 78d75b5..179de53 100644
--- 
a/ui/src/app/connect/schema-editor/event-property/event-property.component.ts
+++ 
b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
@@ -19,7 +19,7 @@
 import {Component, EventEmitter, Inject, OnInit, Output} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
-import {DataTypesService} from '../data-type.service';
+import {DataTypesService} from '../../schema-editor/data-type.service';
 import {
     EventPropertyList,
     EventPropertyNested,
@@ -30,12 +30,12 @@ import {
 
 @Component({
     selector: 'app-event-property',
-    templateUrl: './event-property.component.html',
-    styleUrls: ['./event-property.component.css']
+    templateUrl: './edit-event-property.component.html',
+    styleUrls: ['./edit-event-property.component.css']
 })
-export class EventPropertyComponent implements OnInit {
+export class EditEventPropertyComponent implements OnInit {
 
-    soTimestamp = "http://schema.org/DateTime";;
+    soTimestamp = 'http://schema.org/DateTime';
 
     @Output() propertyChange = new EventEmitter<EventPropertyUnion>();
 
diff --git 
a/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
 
b/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
index 83592ed..04afd00 100644
--- 
a/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
+++ 
b/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
@@ -29,7 +29,7 @@ import {
     EventPropertyUnion,
     EventSchema
 } from "../../../core-model/gen/streampipes-model";
-import {EventPropertyComponent} from 
"../event-property/event-property.component";
+import { EditEventPropertyComponent } from 
'../../dialog/edit-event-property/edit-event-property.component';
 
 @Component({
     selector: 'event-property-row',
@@ -113,7 +113,7 @@ export class EventPropertyRowComponent implements OnChanges 
{
 
 
     public openEditDialog(data): void {
-        let dialogRef = this.dialog.open(EventPropertyComponent, {
+        let dialogRef = this.dialog.open(EditEventPropertyComponent, {
             data: {
                 property: data,
                 isEditable: this.isEditable

Reply via email to