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/02/01 16:19:08 UTC
[incubator-streampipes] branch experimental-module-federation updated: [experimental-module-federation] Add platform service module to the connect module
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/experimental-module-federation by this push:
new d2534bb [experimental-module-federation] Add platform service module to the connect module
d2534bb is described below
commit d2534bb171778a72de7097f96bca529f284b2bf2
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Feb 1 17:18:10 2022 +0100
[experimental-module-federation] Add platform service module to the
connect module
---
.../all_pipeline_elements_jvm.xml | 3 ++-
.idea/runConfigurations/backend.xml | 1 +
.idea/runConfigurations/connect_adapters_iiot.xml | 1 +
ui/cypress.json | 2 +-
.../configuration-group.component.ts | 2 +-
.../adapter-description.component.ts | 2 +-
.../data-marketplace/data-marketplace.component.ts | 2 +-
.../existing-adapters.component.ts | 5 ++---
.../format-configuration.component.ts | 2 +-
.../format-item/format-item.component.ts | 2 +-
.../format-list/format-list.component.ts | 2 +-
.../generic-adapter-configuration.component.ts | 2 +-
.../new-adapter/new-adapter.component.ts | 2 +-
.../pipeline-element-runtime-info.component.ts | 12 +++++------
.../error-message/error-message.component.ts | 2 +-
.../event-property-row.component.ts | 19 ++++++++--------
.../event-schema-preview.component.ts | 2 +-
.../event-schema/event-schema.component.ts | 2 +-
.../loading-message/loading-message.component.ts | 2 +-
.../specific-adapter-configuration.component.ts | 2 +-
.../start-adapter-configuration.component.ts | 2 +-
ui/src/app/connect/connect.component.ts | 2 +-
ui/src/app/connect/connect.module.ts | 2 ++
.../adapter-export-dialog.component.ts | 12 +++++------
.../adapter-started-dialog.component.ts | 6 +++---
.../adapter-upload-dialog.component.ts | 14 ++++++------
.../delete-adapter-dialog.component.ts | 2 +-
.../edit-correction-value.component.ts | 2 +-
.../edit-data-type/edit-data-type.component.ts | 4 ++--
.../edit-event-property-list.component.ts | 2 +-
.../edit-event-property-primitive.component.ts | 6 +++---
.../edit-timestamp-property.component.ts | 2 +-
.../edit-unit-transformation.component.ts | 14 ++++++------
.../edit-event-property.component.ts | 6 +++---
ui/src/app/connect/filter/filter.pipe.ts | 13 +++++------
ui/src/app/connect/filter/timestamp.pipe.ts | 2 +-
.../model/TimestampTransformationRuleMode.ts | 6 +++---
ui/src/app/connect/services/connect.service.ts | 2 +-
.../connect/services/data-marketplace.service.ts | 8 +++----
ui/src/app/connect/services/data-type.service.ts | 2 +-
ui/src/app/connect/services/icon.service.ts | 2 +-
.../services/transformation-rule.service.spec.ts | 2 +-
.../services/transformation-rule.service.ts | 25 ++++++++++------------
.../app/connect/services/unit-provider.service.ts | 4 ++--
.../static-properties/static-property.component.ts | 2 +-
45 files changed, 107 insertions(+), 106 deletions(-)
diff --git a/.idea/runConfigurations/all_pipeline_elements_jvm.xml b/.idea/runConfigurations/all_pipeline_elements_jvm.xml
index d13e0a0..0dbe4a8 100644
--- a/.idea/runConfigurations/all_pipeline_elements_jvm.xml
+++ b/.idea/runConfigurations/all_pipeline_elements_jvm.xml
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="all-pipeline-elements-jvm" type="Application" factoryName="Application">
- <option name="ALTERNATIVE_JRE_PATH" value="11" />
+ <option name="ALTERNATIVE_JRE_PATH" value="/Library/Java/JavaVirtualMachines/jdk-17.0.1.jdk/Contents/Home" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<envs>
<env name="SP_PORT" value="7023" />
@@ -13,6 +13,7 @@
<env name="SP_BACKEND_HOST" value="localhost" />
<env name="SP_BACKEND_PORT" value="8030" />
<env name="SP_IMAGE_STORAGE_LOCATION" value=".streampipes/spImages/" />
+ <env name="SP_HOST" value="141.21.12.107" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
<module name="streampipes-pipeline-elements-all-jvm" />
diff --git a/.idea/runConfigurations/backend.xml b/.idea/runConfigurations/backend.xml
index ff3c772..b4a2f8a 100644
--- a/.idea/runConfigurations/backend.xml
+++ b/.idea/runConfigurations/backend.xml
@@ -14,6 +14,7 @@
<env name="SP_JMS_HOST" value="localhost" />
<env name="SP_DEBUG" value="true " />
<env name="SP_PRIORITIZED_PROTOCOL" value="kafka" />
+ <env name="SP_HOST" value="141.21.12.107" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/connect_adapters_iiot.xml b/.idea/runConfigurations/connect_adapters_iiot.xml
index ace1686..977637b 100644
--- a/.idea/runConfigurations/connect_adapters_iiot.xml
+++ b/.idea/runConfigurations/connect_adapters_iiot.xml
@@ -5,6 +5,7 @@
<env name="SP_DATA_LOCATION" value="./test_data/" />
<env name="SP_DEBUG" value="true" />
<env name="SP_DEBUG_CONNECT" value="false" />
+ <env name="SP_HOST" value="141.21.12.107" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.connect.iiot.ConnectAdapterIiotInit" />
<module name="streampipes-connect-adapters-iiot" />
diff --git a/ui/cypress.json b/ui/cypress.json
index fedb503..02563ff 100644
--- a/ui/cypress.json
+++ b/ui/cypress.json
@@ -8,7 +8,7 @@
"runMode": 1,
"openMode": 0
},
- "baseUrl": "http://localhost",
+ "baseUrl": "http://localhost:8082",
"trashAssetsBeforeRuns": false,
"videoCompression": false,
"viewportWidth": 1920,
diff --git a/ui/src/app/connect/components/configuration-group/configuration-group.component.ts b/ui/src/app/connect/components/configuration-group/configuration-group.component.ts
index 1aefc6c..ae8f76b 100644
--- a/ui/src/app/connect/components/configuration-group/configuration-group.component.ts
+++ b/ui/src/app/connect/components/configuration-group/configuration-group.component.ts
@@ -18,7 +18,7 @@
import { Component, Input, OnInit } from '@angular/core';
import { FormGroup } from '@angular/forms';
-import { StaticPropertyUnion } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { StaticPropertyUnion } from '@streampipes/platform-services';
import { ConfigurationInfo } from '../../model/ConfigurationInfo';
@Component({
diff --git a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts
index d290dca..97b9f00 100644
--- a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts
+++ b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts
@@ -21,7 +21,7 @@ import { ConnectService } from '../../../services/connect.service';
import { DataMarketplaceService } from '../../../services/data-marketplace.service';
import { AdapterExportDialog } from '../../../dialog/adapter-export/adapter-export-dialog.component';
import { MatDialog } from '@angular/material/dialog';
-import { AdapterDescription } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { AdapterDescription } from '@streampipes/platform-services';
import { PanelType } from '../../../../core-ui/dialog/base-dialog/base-dialog.model';
import { DialogService } from '../../../../core-ui/dialog/base-dialog/base-dialog.service';
diff --git a/ui/src/app/connect/components/data-marketplace/data-marketplace.component.ts b/ui/src/app/connect/components/data-marketplace/data-marketplace.component.ts
index 40d0726..d5e6463 100644
--- a/ui/src/app/connect/components/data-marketplace/data-marketplace.component.ts
+++ b/ui/src/app/connect/components/data-marketplace/data-marketplace.component.ts
@@ -21,7 +21,7 @@ import { DataMarketplaceService } from '../../services/data-marketplace.service'
import { ShepherdService } from '../../../services/tour/shepherd.service';
import { ConnectService } from '../../services/connect.service';
import { FilterPipe } from '../../filter/filter.pipe';
-import { AdapterDescriptionUnion } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { AdapterDescriptionUnion } from '@streampipes/platform-services';
import { DialogService } from '../../../core-ui/dialog/base-dialog/base-dialog.service';
@Component({
diff --git a/ui/src/app/connect/components/data-marketplace/existing-adapters/existing-adapters.component.ts b/ui/src/app/connect/components/data-marketplace/existing-adapters/existing-adapters.component.ts
index baa5274..2219f32 100644
--- a/ui/src/app/connect/components/data-marketplace/existing-adapters/existing-adapters.component.ts
+++ b/ui/src/app/connect/components/data-marketplace/existing-adapters/existing-adapters.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { AdapterDescriptionUnion } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { AdapterDescriptionUnion, PipelineElementService } from '@streampipes/platform-services';
import { MatTableDataSource } from '@angular/material/table';
import { ConnectService } from '../../../services/connect.service';
import { DataMarketplaceService } from '../../../services/data-marketplace.service';
@@ -30,8 +30,7 @@ import { MatSort } from '@angular/material/sort';
import { ObjectPermissionDialogComponent } from '../../../../core-ui/object-permission-dialog/object-permission-dialog.component';
import { UserRole } from '../../../../_enums/user-role.enum';
import { AuthService } from '../../../../services/auth.service';
-import {PipelineElementService} from "../../../../../../projects/streampipes/platform-services/src/lib/apis/pipeline-element.service";
-import {HelpComponent} from "../../../../editor/dialog/help/help.component";
+import { HelpComponent } from '../../../../editor/dialog/help/help.component';
@Component({
selector: 'sp-existing-adapters',
diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts b/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
index 9decb30..1ef937f 100644
--- a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
+++ b/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
@@ -22,7 +22,7 @@ import {
FormatDescription,
GenericAdapterSetDescription,
GenericAdapterStreamDescription
-} from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
import { FormBuilder, FormGroup } from '@angular/forms';
import { RestService } from '../../services/rest.service';
import { MatStepper } from '@angular/material/stepper';
diff --git a/ui/src/app/connect/components/format-item/format-item.component.ts b/ui/src/app/connect/components/format-item/format-item.component.ts
index ff21ab2..779a93e 100644
--- a/ui/src/app/connect/components/format-item/format-item.component.ts
+++ b/ui/src/app/connect/components/format-item/format-item.component.ts
@@ -18,7 +18,7 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { ShepherdService } from '../../../services/tour/shepherd.service';
-import { FormatDescription } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { FormatDescription } from '@streampipes/platform-services';
@Component({
selector: 'sp-format-item',
diff --git a/ui/src/app/connect/components/format-list/format-list.component.ts b/ui/src/app/connect/components/format-list/format-list.component.ts
index 9c34b59..e9c2493 100644
--- a/ui/src/app/connect/components/format-list/format-list.component.ts
+++ b/ui/src/app/connect/components/format-list/format-list.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { FormatDescription } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { FormatDescription } from '@streampipes/platform-services';
@Component({
selector: 'sp-format-list',
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
index 5a391db..5746201 100644
--- a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
@@ -22,7 +22,7 @@ import {
GenericAdapterSetDescription,
GenericAdapterStreamDescription,
ProtocolDescription
-} from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MatStepper } from '@angular/material/stepper';
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 7393e26..cbe25c7 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
@@ -27,7 +27,7 @@ import {
SpecificAdapterSetDescription,
SpecificAdapterStreamDescription,
TransformationRuleDescriptionUnion
-} from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
import { ShepherdService } from '../../../services/tour/shepherd.service';
import { Logger } from '../../../shared/logger/default-log.service';
import { ConnectService } from '../../services/connect.service';
diff --git a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts b/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
index 49d1c2b..a00e7b6 100644
--- a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
+++ b/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
@@ -16,9 +16,9 @@
*
*/
-import {Component, Input, OnDestroy, OnInit} from '@angular/core';
-import {EventPropertyUnion, SpDataStream} from "../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
-import {RestService} from "../../services/rest.service";
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { EventPropertyUnion, SpDataStream } from '@streampipes/platform-services';
+import { RestService } from '../../services/rest.service';
@Component({
selector: 'pipeline-element-runtime-info',
@@ -34,9 +34,9 @@ export class PipelineElementRuntimeInfoComponent implements OnInit, OnDestroy {
runtimeData: any;
timer: any;
- runtimeDataError: boolean = false;
+ runtimeDataError = false;
- constructor(private RestService: RestService) {
+ constructor(private restService: RestService) {
}
@@ -51,7 +51,7 @@ export class PipelineElementRuntimeInfoComponent implements OnInit, OnDestroy {
}
getLatestRuntimeInfo() {
- this.RestService.getRuntimeInfo(this.streamDescription).subscribe(data => {
+ this.restService.getRuntimeInfo(this.streamDescription).subscribe(data => {
if (data) {
this.runtimeDataError = false;
if (!(Object.keys(data).length === 0 && data.constructor === Object)) {
diff --git a/ui/src/app/connect/components/schema-editor/error-message/error-message.component.ts b/ui/src/app/connect/components/schema-editor/error-message/error-message.component.ts
index d0e0faa..4e64c25 100644
--- a/ui/src/app/connect/components/schema-editor/error-message/error-message.component.ts
+++ b/ui/src/app/connect/components/schema-editor/error-message/error-message.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, Input, OnInit } from '@angular/core';
-import { Notification } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { Notification } from '@streampipes/platform-services';
@Component({
selector: 'sp-error-message',
diff --git a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.ts b/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.ts
index eba574a..4186a36 100644
--- a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.ts
+++ b/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.ts
@@ -16,7 +16,7 @@
*
*/
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { UUID } from 'angular2-uuid';
import { TreeNode } from '@circlon/angular-tree-component';
import { MatDialog } from '@angular/material/dialog';
@@ -27,7 +27,7 @@ import {
EventPropertyPrimitive,
EventPropertyUnion,
EventSchema
-} from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
import { EditEventPropertyComponent } from '../../../dialog/edit-event-property/edit-event-property.component';
@Component({
@@ -35,24 +35,23 @@ import { EditEventPropertyComponent } from '../../../dialog/edit-event-property/
templateUrl: './event-property-row.component.html',
styleUrls: ['./event-property-row.component.scss']
})
-export class EventPropertyRowComponent implements OnChanges {
+export class EventPropertyRowComponent implements OnInit, OnChanges {
@Input() node: TreeNode;
@Input() isEditable = true;
@Input() eventSchema: EventSchema = new EventSchema();
@Input() countSelected: number;
- //@Output() nodeChange = new EventEmitter<TreeNode>();
@Output() isEditableChange = new EventEmitter<boolean>();
@Output() eventSchemaChange = new EventEmitter<EventSchema>();
@Output() refreshTreeEmitter = new EventEmitter<void>();
@Output() countSelectedChange = new EventEmitter<number>();
label: string;
- isPrimitive: boolean = false;
- isNested: boolean = false;
- isList: boolean = false;
- timestampProperty: boolean = false;
+ isPrimitive = false;
+ isNested = false;
+ isList = false;
+ timestampProperty = false;
constructor(private dialog: MatDialog) {
@@ -110,7 +109,7 @@ export class EventPropertyRowComponent implements OnChanges {
}
public openEditDialog(data): void {
- let dialogRef = this.dialog.open(EditEventPropertyComponent, {
+ const dialogRef = this.dialog.open(EditEventPropertyComponent, {
data: {
property: data,
isEditable: this.isEditable
@@ -178,7 +177,7 @@ export class EventPropertyRowComponent implements OnChanges {
if (!eventProperty.eventProperties) {
eventProperty.eventProperties = new Array<EventPropertyUnion>();
}
- let property: EventPropertyNested = new EventPropertyNested();
+ const property: EventPropertyNested = new EventPropertyNested();
property.elementId = uuid;
eventProperty.eventProperties.push(property);
this.refreshTreeEmitter.emit();
diff --git a/ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.ts b/ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.ts
index 3814ccd..f80de67 100644
--- a/ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.ts
+++ b/ui/src/app/connect/components/schema-editor/event-schema-preview/event-schema-preview.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, Input } from '@angular/core';
-import { EventSchema } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { EventSchema } from '@streampipes/platform-services';
@Component({
selector: 'sp-event-schema-preview',
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
index de0fcfe..8cf453f 100644
--- a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
+++ b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
@@ -29,7 +29,7 @@ import {
EventSchema,
GuessSchema,
Notification
-} from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
import { MatStepper } from '@angular/material/stepper';
import { UserErrorMessage } from '../../../../core-model/base/UserErrorMessage';
diff --git a/ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.ts b/ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.ts
index e7ed2cd..eeea191 100644
--- a/ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.ts
+++ b/ui/src/app/connect/components/schema-editor/loading-message/loading-message.component.ts
@@ -16,7 +16,7 @@
*
*/
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
@Component({
selector: 'sp-loading-message',
diff --git a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts b/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts
index 6903af3..7295585 100644
--- a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { AdapterDescriptionUnion } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { AdapterDescriptionUnion } from '@streampipes/platform-services';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MatStepper } from '@angular/material/stepper';
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
index 471af05..5796937 100644
--- a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
@@ -25,7 +25,7 @@ import {
GenericAdapterSetDescription,
RemoveDuplicatesTransformationRuleDescription,
SpecificAdapterSetDescription
-} from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MatStepper } from '@angular/material/stepper';
import { AdapterStartedDialog } from '../../dialog/adapter-started/adapter-started-dialog.component';
diff --git a/ui/src/app/connect/connect.component.ts b/ui/src/app/connect/connect.component.ts
index 894cde7..7313e1d 100644
--- a/ui/src/app/connect/connect.component.ts
+++ b/ui/src/app/connect/connect.component.ts
@@ -17,7 +17,7 @@
*/
import { Component } from '@angular/core';
-import { AdapterDescriptionUnion } from '../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { AdapterDescriptionUnion } from '@streampipes/platform-services';
@Component({
selector: 'sp-connect',
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index eb31b6f..fa1a258 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -79,6 +79,7 @@ import { LoadingMessageComponent } from './components/schema-editor/loading-mess
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 { DeleteAdapterDialogComponent } from './dialog/delete-adapter-dialog/delete-adapter-dialog.component';
+import { PlatformServicesModule } from '@streampipes/platform-services';
@NgModule({
imports: [
@@ -94,6 +95,7 @@ import { DeleteAdapterDialogComponent } from './dialog/delete-adapter-dialog/del
MatInputModule,
MatFormFieldModule,
MatSliderModule,
+ PlatformServicesModule,
CoreUiModule,
TreeModule
],
diff --git a/ui/src/app/connect/dialog/adapter-export/adapter-export-dialog.component.ts b/ui/src/app/connect/dialog/adapter-export/adapter-export-dialog.component.ts
index fe5b334..302eba1 100644
--- a/ui/src/app/connect/dialog/adapter-export/adapter-export-dialog.component.ts
+++ b/ui/src/app/connect/dialog/adapter-export/adapter-export-dialog.component.ts
@@ -16,9 +16,9 @@
*
*/
-import {Component, Input} from '@angular/core';
-import {AdapterDescriptionUnion} from "../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
-import {DialogRef} from "../../../core-ui/dialog/base-dialog/dialog-ref";
+import { Component, Input } from '@angular/core';
+import { AdapterDescriptionUnion } from '@streampipes/platform-services';
+import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
@Component({
selector: 'sp-dialog-adapter-started-dialog',
@@ -40,9 +40,9 @@ export class AdapterExportDialog {
}
download() {
- let adapterDescriptionAsList = [this.adapter];
- var data = "data:application/json;charset=utf-8," + encodeURIComponent(JSON.stringify(adapterDescriptionAsList, null, 2));
- var downloader = document.createElement('a');
+ const adapterDescriptionAsList = [this.adapter];
+ const data = 'data:application/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(adapterDescriptionAsList, null, 2));
+ const downloader = document.createElement('a');
downloader.setAttribute('href', data);
downloader.setAttribute('download', this.adapter.name + '-adapter-template.json');
downloader.click();
diff --git a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
index 3c405fe..df98418 100644
--- a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
+++ b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
@@ -25,10 +25,10 @@ import {
Message,
PipelineOperationStatus,
SpDataStream,
- SpecificAdapterSetDescription
-} from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+ SpecificAdapterSetDescription,
+ PipelineTemplateService,
+} from '@streampipes/platform-services';
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
-import { PipelineTemplateService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/pipeline-template.service';
import { PipelineInvocationBuilder } from '../../../core-services/template/PipelineInvocationBuilder';
diff --git a/ui/src/app/connect/dialog/adapter-upload/adapter-upload-dialog.component.ts b/ui/src/app/connect/dialog/adapter-upload/adapter-upload-dialog.component.ts
index a995ee9..dbd7247 100644
--- a/ui/src/app/connect/dialog/adapter-upload/adapter-upload-dialog.component.ts
+++ b/ui/src/app/connect/dialog/adapter-upload/adapter-upload-dialog.component.ts
@@ -16,7 +16,7 @@
*
*/
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { RestService } from '../../services/rest.service';
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
@@ -25,10 +25,10 @@ import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
templateUrl: './adapter-upload-dialog.html',
styleUrls: ['./adapter-upload-dialog.component.scss']
})
-export class AdapterUploadDialog {
+export class AdapterUploadDialog implements OnInit {
private selectedUploadFile: File;
- uploaded: boolean = false;
+ uploaded = false;
constructor(private dialogRef: DialogRef<AdapterUploadDialog>,
private restService: RestService) {
@@ -41,12 +41,12 @@ export class AdapterUploadDialog {
handleFileInput(files: any) {
this.selectedUploadFile = files[0];
- let fileReader = new FileReader();
+ const fileReader = new FileReader();
fileReader.onload = (e) => {
this.uploaded = true;
- var jsonString: any = fileReader.result;
- let allTemplates: any[] = JSON.parse(jsonString);
+ const jsonString: any = fileReader.result;
+ const allTemplates: any[] = JSON.parse(jsonString);
// allTemplates.forEach(adapterTemplate => {
// this.restService.addAdapterTemplate(adapterTemplate).subscribe(x => {
@@ -61,4 +61,4 @@ export class AdapterUploadDialog {
this.dialogRef.close();
}
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/connect/dialog/delete-adapter-dialog/delete-adapter-dialog.component.ts b/ui/src/app/connect/dialog/delete-adapter-dialog/delete-adapter-dialog.component.ts
index 7a7daad..b81aadf 100644
--- a/ui/src/app/connect/dialog/delete-adapter-dialog/delete-adapter-dialog.component.ts
+++ b/ui/src/app/connect/dialog/delete-adapter-dialog/delete-adapter-dialog.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, Input } from '@angular/core';
-import { AdapterDescriptionUnion } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { AdapterDescriptionUnion } from '@streampipes/platform-services';
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
import { DataMarketplaceService } from '../../services/data-marketplace.service';
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.ts
index 44c6284..ed52644 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.ts
@@ -16,7 +16,7 @@
*
*/
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
@Component({
selector: 'sp-edit-correction-value',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
index a1127b5..77e0d82 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
@@ -16,8 +16,8 @@
*
*/
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {DataTypesService} from '../../../../services/data-type.service';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { DataTypesService } from '../../../../services/data-type.service';
@Component({
selector: 'sp-edit-data-type',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
index f94072b..6c95c13 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
@@ -16,7 +16,7 @@
*
*/
-import {Component, Input} from '@angular/core';
+import { Component, Input } from '@angular/core';
@Component({
selector: 'sp-edit-event-property-list',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
index 7f50bb7..182685e 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
@@ -16,8 +16,8 @@
*
*/
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {DataTypesService} from '../../../../services/data-type.service';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { DataTypesService } from '../../../../services/data-type.service';
@Component({
selector: 'sp-edit-event-property-primitive',
@@ -50,7 +50,7 @@ export class EditEventPropertyPrimitiveComponent implements OnInit {
this.hideUnitTransformation = this.isTimestampProperty ||
!this.dataTypesService.isNumeric(this.cachedProperty.runtimeType);
- if(this.dataTypesService.isNumeric(this.cachedProperty.runtimeType)) {
+ if (this.dataTypesService.isNumeric(this.cachedProperty.runtimeType)) {
this.isNumericDataType.emit(true);
} else {
this.isNumericDataType.emit(false);
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts
index a895558..8bd9ec4 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts
@@ -16,7 +16,7 @@
*
*/
-import {Component, Input} from '@angular/core';
+import { Component, Input } from '@angular/core';
@Component({
selector: 'sp-edit-timestamp-property',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
index 7c6209d..3c04151 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
@@ -16,13 +16,13 @@
*
*/
-import {Component, Input, OnInit} from '@angular/core';
-import {FormBuilder, FormControl} from '@angular/forms';
-import {Observable} from 'rxjs';
-import {map, startWith} from 'rxjs/operators';
-import {UnitDescription} from '../../../../model/UnitDescription';
-import {RestService} from '../../../../services/rest.service';
-import {UnitProviderService} from '../../../../services/unit-provider.service';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormBuilder, FormControl } from '@angular/forms';
+import { Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+import { UnitDescription } from '../../../../model/UnitDescription';
+import { RestService } from '../../../../services/rest.service';
+import { UnitProviderService } from '../../../../services/unit-provider.service';
@Component({
selector: 'sp-edit-unit-transformation',
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
index f8a22d3..d7c7189 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
@@ -23,11 +23,11 @@ import {
EventPropertyList,
EventPropertyNested,
EventPropertyPrimitive,
- EventPropertyUnion
-} from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+ EventPropertyUnion,
+ SemanticTypesService
+} from '@streampipes/platform-services';
import { SemanticTypeUtilsService } from '../../../core-services/semantic-type/semantic-type-utils.service';
import { DataTypesService } from '../../services/data-type.service';
-import { SemanticTypesService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/semantic-types.service';
import { Observable } from 'rxjs';
import { debounceTime, distinctUntilChanged, startWith, switchMap } from 'rxjs/operators';
diff --git a/ui/src/app/connect/filter/filter.pipe.ts b/ui/src/app/connect/filter/filter.pipe.ts
index 81bc0da..b7f663f 100644
--- a/ui/src/app/connect/filter/filter.pipe.ts
+++ b/ui/src/app/connect/filter/filter.pipe.ts
@@ -16,8 +16,8 @@
*
*/
-import {Pipe, PipeTransform} from '@angular/core';
-import {AdapterDescriptionUnion} from "../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { Pipe, PipeTransform } from '@angular/core';
+import { AdapterDescriptionUnion } from '@streampipes/platform-services';
@Pipe({
name: 'filter'
@@ -25,15 +25,16 @@ import {AdapterDescriptionUnion} from "../../../../projects/streampipes/platform
export class FilterPipe implements PipeTransform {
- transform(adapterDescriptions: AdapterDescriptionUnion[], filterTerm?: any): any{
- //check if search filterTerm is undefined
- if(filterTerm == undefined || !adapterDescriptions) return adapterDescriptions;
+ transform(adapterDescriptions: AdapterDescriptionUnion[], filterTerm?: any): any {
+ // check if search filterTerm is undefined
+ if (filterTerm === undefined || !adapterDescriptions) { return adapterDescriptions; }
return adapterDescriptions.filter(adapterDescription => {
if (adapterDescription.name == null) {
return true;
} else {
adapterDescription.name.replace(' ', '_');
- return adapterDescription.name.toLowerCase().includes(filterTerm.toLowerCase()) || adapterDescription.description.toLowerCase().includes(filterTerm.toLowerCase());
+ return adapterDescription.name.toLowerCase().includes(filterTerm.toLowerCase()) ||
+ adapterDescription.description.toLowerCase().includes(filterTerm.toLowerCase());
}
});
}
diff --git a/ui/src/app/connect/filter/timestamp.pipe.ts b/ui/src/app/connect/filter/timestamp.pipe.ts
index 17ccbd0..cc30e8b 100644
--- a/ui/src/app/connect/filter/timestamp.pipe.ts
+++ b/ui/src/app/connect/filter/timestamp.pipe.ts
@@ -17,7 +17,7 @@
*/
import { Pipe, PipeTransform } from '@angular/core';
-import { EventPropertyUnion } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { EventPropertyUnion } from '@streampipes/platform-services';
@Pipe({
name: 'timestampFilter',
diff --git a/ui/src/app/connect/model/TimestampTransformationRuleMode.ts b/ui/src/app/connect/model/TimestampTransformationRuleMode.ts
index c8153a0..879dc06 100644
--- a/ui/src/app/connect/model/TimestampTransformationRuleMode.ts
+++ b/ui/src/app/connect/model/TimestampTransformationRuleMode.ts
@@ -18,8 +18,8 @@
export enum TimestampTransformationRuleMode {
- FORMAT_STRING = "formatString",
- TIME_UNIT = "timeUnit",
+ FORMAT_STRING = 'formatString',
+ TIME_UNIT = 'timeUnit',
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/connect/services/connect.service.ts b/ui/src/app/connect/services/connect.service.ts
index 7943117..1e4b73d 100644
--- a/ui/src/app/connect/services/connect.service.ts
+++ b/ui/src/app/connect/services/connect.service.ts
@@ -24,7 +24,7 @@ import {
GenericAdapterStreamDescription,
SpecificAdapterSetDescription,
SpecificAdapterStreamDescription
-} from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
@Injectable()
export class ConnectService {
diff --git a/ui/src/app/connect/services/data-marketplace.service.ts b/ui/src/app/connect/services/data-marketplace.service.ts
index 5fca6b1..a8dc5f9 100644
--- a/ui/src/app/connect/services/data-marketplace.service.ts
+++ b/ui/src/app/connect/services/data-marketplace.service.ts
@@ -25,12 +25,12 @@ import {
AdapterDescriptionUnion,
GenericAdapterSetDescription,
GenericAdapterStreamDescription,
- Message, SpDataStream, SpDataStreamUnion,
+ Message,
SpecificAdapterSetDescription,
- SpecificAdapterStreamDescription
-} from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+ SpecificAdapterStreamDescription,
+ PlatformServicesCommons
+} from '@streampipes/platform-services';
import { Observable } from 'rxjs';
-import { PlatformServicesCommons } from '../../../../projects/streampipes/platform-services/src/lib/apis/commons.service';
@Injectable()
export class DataMarketplaceService {
diff --git a/ui/src/app/connect/services/data-type.service.ts b/ui/src/app/connect/services/data-type.service.ts
index e8e0841..649e7e7 100644
--- a/ui/src/app/connect/services/data-type.service.ts
+++ b/ui/src/app/connect/services/data-type.service.ts
@@ -20,7 +20,7 @@ import { Injectable } from '@angular/core';
@Injectable()
export class DataTypesService {
- private dataTypes: Array<{ label: string, url: string }> = [
+ private dataTypes: { label: string, url: string }[] = [
{
label: 'String - A textual datatype, e.g., \'machine1\'',
url: 'http://www.w3.org/2001/XMLSchema#string'
diff --git a/ui/src/app/connect/services/icon.service.ts b/ui/src/app/connect/services/icon.service.ts
index 82f3e78..f3a4416 100644
--- a/ui/src/app/connect/services/icon.service.ts
+++ b/ui/src/app/connect/services/icon.service.ts
@@ -16,7 +16,7 @@
*
*/
-import {Injectable} from '@angular/core';
+import { Injectable } from '@angular/core';
@Injectable()
export class IconService {
diff --git a/ui/src/app/connect/services/transformation-rule.service.spec.ts b/ui/src/app/connect/services/transformation-rule.service.spec.ts
index d880560..ed2afa2 100644
--- a/ui/src/app/connect/services/transformation-rule.service.spec.ts
+++ b/ui/src/app/connect/services/transformation-rule.service.spec.ts
@@ -27,7 +27,7 @@ import {
EventSchema,
MoveRuleDescription,
RenameRuleDescription
-} from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
describe('TransformationRuleService', () => {
diff --git a/ui/src/app/connect/services/transformation-rule.service.ts b/ui/src/app/connect/services/transformation-rule.service.ts
index 1145878..8781956 100644
--- a/ui/src/app/connect/services/transformation-rule.service.ts
+++ b/ui/src/app/connect/services/transformation-rule.service.ts
@@ -33,8 +33,7 @@ import {
TimestampTranfsformationRuleDescription,
TransformationRuleDescriptionUnion,
UnitTransformRuleDescription
-} from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
-import { Logger } from '../../shared/logger/default-log.service';
+} from '@streampipes/platform-services';
import { TimestampTransformationRuleMode } from '../model/TimestampTransformationRuleMode';
@Injectable()
@@ -43,7 +42,7 @@ export class TransformationRuleService {
private oldEventSchema: EventSchema = null;
private newEventSchema: EventSchema = null;
- constructor(public logger: Logger) {
+ constructor() {
}
public setOldEventSchema(oldEventSchema: EventSchema) {
@@ -58,7 +57,7 @@ export class TransformationRuleService {
let transformationRuleDescription: TransformationRuleDescriptionUnion[] = [];
if (this.oldEventSchema == null || this.newEventSchema == null) {
- this.logger.error('Old and new schema must be defined');
+ console.log('Old and new schema must be defined');
} else {
const addedTimestampProperties = this.getTimestampProperty(this.newEventSchema.eventProperties);
@@ -144,11 +143,8 @@ export class TransformationRuleService {
// old key is equals old route and new name
let keyOfOldValue = '';
- if (keyOldPrefix === '') {
- keyOfOldValue = keyNew.substr(keyNew.lastIndexOf('.') + 1, keyNew.length);
- } else {
- keyOfOldValue = keyOldPrefix + '.' + keyNew.substr(keyNew.lastIndexOf('.') + 1, keyNew.length);
- }
+ keyOfOldValue = keyOldPrefix === '' ? keyNew.substr(keyNew.lastIndexOf('.') + 1, keyNew.length) :
+ keyOldPrefix + '.' + keyNew.substr(keyNew.lastIndexOf('.') + 1, keyNew.length);
const rule: MoveRuleDescription = new MoveRuleDescription();
rule['@class'] = 'org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription';
rule.oldRuntimeKey = keyOfOldValue;
@@ -202,7 +198,8 @@ export class TransformationRuleService {
renameRule.newRuntimeKey = keyNew;
result.push(renameRule);
if (eventProperty instanceof EventPropertyNested) {
- const tmpResults: RenameRuleDescription[] = this.getRenameRules((eventProperty as EventPropertyNested).eventProperties, oldEventSchema, newEventSchema);
+ const tmpResults: RenameRuleDescription[] =
+ this.getRenameRules((eventProperty as EventPropertyNested).eventProperties, oldEventSchema, newEventSchema);
result = result.concat(tmpResults);
}
@@ -229,7 +226,7 @@ export class TransformationRuleService {
for (const id of allOldIds) {
// if not in new ids create delete rule
- if (allNewIds.indexOf(id) == -1) {
+ if (allNewIds.indexOf(id) === -1) {
const key = this.getCompleteRuntimeNameKey(oldEventSchema.eventProperties, id);
resultKeys.push(key);
}
@@ -239,7 +236,7 @@ export class TransformationRuleService {
return arrArg.filter((elem, pos, arr) => {
let r = true;
for (const a of arr) {
- if (elem.startsWith(a) && a != elem) {
+ if (elem.startsWith(a) && a !== elem) {
r = false;
}
}
@@ -333,7 +330,7 @@ export class TransformationRuleService {
if (completeKey) {
const keyElements = completeKey.split('.');
- if (keyElements.length == 0) {
+ if (keyElements.length === 0) {
return completeKey;
} else {
return keyElements[keyElements.length - 1];
@@ -443,7 +440,7 @@ export class TransformationRuleService {
for (const res of result) {
// TODO: better solution to check if the mode is valid
if (res.mode === TimestampTransformationRuleMode.FORMAT_STRING
- || (res.multiplier != 0 && res.mode === TimestampTransformationRuleMode.TIME_UNIT)) {
+ || (res.multiplier !== 0 && res.mode === TimestampTransformationRuleMode.TIME_UNIT)) {
filteredResult.push(res);
}
}
diff --git a/ui/src/app/connect/services/unit-provider.service.ts b/ui/src/app/connect/services/unit-provider.service.ts
index 85a8559..63f6f20 100644
--- a/ui/src/app/connect/services/unit-provider.service.ts
+++ b/ui/src/app/connect/services/unit-provider.service.ts
@@ -16,8 +16,8 @@
*
*/
-import {UnitDescription} from '../model/UnitDescription';
-import {Injectable} from "@angular/core";
+import { UnitDescription } from '../model/UnitDescription';
+import { Injectable } from '@angular/core';
@Injectable()
export class UnitProviderService {
diff --git a/ui/src/app/core-ui/static-properties/static-property.component.ts b/ui/src/app/core-ui/static-properties/static-property.component.ts
index 19d1087..04e79ab 100644
--- a/ui/src/app/core-ui/static-properties/static-property.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-property.component.ts
@@ -39,7 +39,7 @@ import {
StaticProperty,
StaticPropertyAlternatives,
StaticPropertyGroup
-} from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+} from '@streampipes/platform-services';
import { FormGroup } from '@angular/forms';
import { InvocablePipelineElementUnion } from '../../editor/model/editor.model';