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

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

commit 88971ec4d76178960f20fe1bab59cb8f7d0560b3
Merge: c6cdc93 b296abe
Author: Dominik Riemer <[email protected]>
AuthorDate: Thu Jul 2 22:15:24 2020 +0200

    Merge branch 'STREAMPIPES-145' of github.com:apache/incubator-streampipes 
into STREAMPIPES-145

 .../Apache_StreamPipes___Connect_Master.xml        | 11 ---
 ui/src/app/connect/connect.module.ts               | 12 ++-
 ui/src/app/connect/connect.service.ts              |  4 +-
 .../edit-event-property-primitive.component.html   | 70 -----------------
 .../edit-event-property-primitive.component.ts     | 89 ----------------------
 .../edit-data-type/edit-data-type.component.css}   |  4 +-
 .../edit-data-type/edit-data-type.component.html}  | 16 ++--
 .../edit-data-type/edit-data-type.component.ts}    | 28 ++++---
 .../edit-event-property-list.component.css         |  0
 .../edit-event-property-list.component.html        | 12 +--
 .../edit-event-property-list.component.ts}         | 14 ++++
 .../edit-event-property-primitive.component.css}   |  3 +
 .../edit-event-property-primitive.component.html}  | 29 +++++--
 .../edit-event-property-primitive.component.ts     | 55 +++++++++++++
 .../edit-timestamp-property.component.css}         | 23 +-----
 .../edit-timestamp-property.component.html         | 46 +++++++++++
 .../edit-timestamp-property.component.ts}          | 30 ++++----
 .../edit-unit-transformation.component.css}        |  0
 .../edit-unit-transformation.component.html}       |  4 +-
 .../edit-unit-transformation.component.ts}         | 20 ++---
 .../edit-event-property.component.html             | 22 +++---
 .../edit-event-property.component.ts               | 28 +++++--
 .../connect/new-adapter/new-adapter.component.ts   |  1 -
 .../app/connect/schema-editor/data-type.service.ts | 47 +++++++-----
 .../semantic-type/semantic-type-utils.service.ts   | 18 ++++-
 25 files changed, 278 insertions(+), 308 deletions(-)

diff --cc ui/src/app/connect/connect.module.ts
index f7c0b3a,5d0bf06..969dbbf
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@@ -158,9 -157,10 +160,11 @@@ import { StaticColorPickerComponent } f
          StaticAlternativesComponent,
          StaticCollectionComponent,
          StaticColorPickerComponent,
 +        StaticCodeInputComponent,
          PipelineElementRuntimeInfoComponent,
-         UnitTransformationComponent
+         EditUnitTransformationComponent,
+         EditTimestampPropertyComponent,
+         EditDataTypeComponent
      ],
      providers: [
          RestService,

Reply via email to