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/02/02 17:55:09 UTC
[incubator-streampipes] branch experimental-module-federation-494 updated: [hotfix] Fix remaining imports of platform service library
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation-494
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/experimental-module-federation-494 by this push:
new 1ae2ff0 [hotfix] Fix remaining imports of platform service library
1ae2ff0 is described below
commit 1ae2ff021b6952ad8897be963eceec26cdfb6e14
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Feb 2 18:54:57 2022 +0100
[hotfix] Fix remaining imports of platform service library
---
.../src/lib/apis/shared-dashboard.service.ts | 4 ++-
.../delete-datalake-index-dialog.component.ts | 2 +-
.../abstract-security-principal-config.ts | 3 +-
.../edit-user-dialog/edit-user-dialog.component.ts | 8 ++---
.../add-to-collection.component.ts | 2 +-
.../components/widgets/gauge/gauge-config.ts | 32 ++++++++++----------
.../components/widgets/html/html-config.ts | 20 ++++++-------
.../components/widgets/image/image-config.ts | 24 +++++++--------
.../dashboard/components/widgets/map/map-config.ts | 2 +-
.../components/widgets/number/number-config.ts | 18 ++++++------
.../widgets/number/number-widget.component.ts | 22 +++++++-------
.../dashboard/components/widgets/raw/raw-config.ts | 14 ++++-----
.../components/widgets/status/status-config.ts | 19 ++++++------
.../components/widgets/table/table-config.ts | 22 +++++++-------
.../widgets/trafficlight/traffic-light-config.ts | 34 +++++++++++-----------
.../wordcloud/wordcloud-widget.component.ts | 32 ++++++++++----------
.../widgets/base/data-explorer-widget-data.ts | 3 +-
.../model/correlation-chart-widget.model.ts | 2 +-
.../model/distribution-chart-widget.model.ts | 2 +-
ui/src/app/data-explorer/data-explorer.module.ts | 9 ++++--
.../components/pipeline/pipeline.component.ts | 1 +
.../dialog/welcome-tour/welcome-tour.component.ts | 2 +-
ui/src/app/editor/editor.component.ts | 6 ++--
ui/src/app/editor/services/jsplumb.service.ts | 6 ++--
.../file-overview/file-overview.component.ts | 3 +-
.../app/notifications/notifications.component.ts | 3 +-
.../import-pipeline-dialog.component.ts | 3 +-
.../profile/components/basic-profile-settings.ts | 2 +-
ui/src/app/profile/profile.service.ts | 4 +--
29 files changed, 152 insertions(+), 152 deletions(-)
diff --git a/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts b/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
index cc19175..f2dbc9d 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
@@ -22,7 +22,9 @@ import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { Dashboard } from '../model/dashboard/dashboard.model';
-@Injectable()
+@Injectable({
+ providedIn: 'root'
+})
export class SharedDatalakeRestService {
constructor(private http: HttpClient) {
diff --git a/ui/src/app/configuration/dialog/delete-datalake-index/delete-datalake-index-dialog.component.ts b/ui/src/app/configuration/dialog/delete-datalake-index/delete-datalake-index-dialog.component.ts
index e9dc426..4bb905e 100644
--- a/ui/src/app/configuration/dialog/delete-datalake-index/delete-datalake-index-dialog.component.ts
+++ b/ui/src/app/configuration/dialog/delete-datalake-index/delete-datalake-index-dialog.component.ts
@@ -18,7 +18,7 @@
import { Component, Input } from '@angular/core';
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
-import { DatalakeRestService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/datalake-rest.service';
+import { DatalakeRestService } from '@streampipes/platform-services';
@Component({
selector: 'sp-delete-datalake-index-dialog',
diff --git a/ui/src/app/configuration/security-configuration/abstract-security-principal-config.ts b/ui/src/app/configuration/security-configuration/abstract-security-principal-config.ts
index 371049f..f35c94a 100644
--- a/ui/src/app/configuration/security-configuration/abstract-security-principal-config.ts
+++ b/ui/src/app/configuration/security-configuration/abstract-security-principal-config.ts
@@ -20,9 +20,8 @@ import { Directive, OnInit, ViewChild } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
-import { UserService } from '../../../../projects/streampipes/platform-services/src/lib/apis/user.service';
+import { UserService, ServiceAccount, UserAccount } from '@streampipes/platform-services';
import { Observable } from 'rxjs';
-import { ServiceAccount, UserAccount } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client';
import { PanelType } from '../../core-ui/dialog/base-dialog/base-dialog.model';
import { DialogService } from '../../core-ui/dialog/base-dialog/base-dialog.service';
import { EditUserDialogComponent } from './edit-user-dialog/edit-user-dialog.component';
diff --git a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
index 536c880..109ef9a 100644
--- a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
+++ b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
@@ -22,7 +22,10 @@ import {
Group,
Role,
ServiceAccount,
- UserAccount
+ UserAccount,
+ MailConfigService,
+ UserService,
+ UserGroupService,
} from '@streampipes/platform-services';
import {
AbstractControl,
@@ -35,13 +38,10 @@ import {
} from '@angular/forms';
import { UserRole } from '../../../_enums/user-role.enum';
import { MatCheckboxChange } from '@angular/material/checkbox';
-import { UserService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/user.service';
-import { UserGroupService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/user-group.service';
import { RoleDescription } from '../../../_models/auth.model';
import { AvailableRolesService } from '../../../services/available-roles.service';
import { AuthService } from '../../../services/auth.service';
import { Router } from '@angular/router';
-import { MailConfigService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/mail-config.service';
@Component({
selector: 'sp-edit-user-dialog',
diff --git a/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.ts b/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.ts
index b798478..88d67fc 100644
--- a/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.ts
@@ -18,7 +18,7 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { StaticPropertyUtilService } from '../../static-property-util.service';
-import { FreeTextStaticProperty, OneOfStaticProperty, StaticProperty } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { FreeTextStaticProperty, OneOfStaticProperty, StaticProperty } from '@streampipes/platform-services';
import { Observable } from 'rxjs';
@Component({
diff --git a/ui/src/app/dashboard/components/widgets/gauge/gauge-config.ts b/ui/src/app/dashboard/components/widgets/gauge/gauge-config.ts
index d8295a4..6c22bda 100644
--- a/ui/src/app/dashboard/components/widgets/gauge/gauge-config.ts
+++ b/ui/src/app/dashboard/components/widgets/gauge/gauge-config.ts
@@ -16,34 +16,34 @@
*
*/
-import {WidgetConfig} from "../base/base-config";
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {EpRequirements} from "../../../sdk/ep-requirements";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfig } from '../base/base-config';
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { EpRequirements } from '../../../sdk/ep-requirements';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class GaugeConfig extends WidgetConfig {
- static readonly TITLE_KEY: string = "title-key";
- static readonly NUMBER_MAPPING_KEY: string = "number-mapping";
- static readonly COLOR_KEY: string = "color-key";
- static readonly MIN_KEY: string = "min-key";
- static readonly MAX_KEY: string = "max-key";
+ static readonly TITLE_KEY: string = 'title-key';
+ static readonly NUMBER_MAPPING_KEY: string = 'number-mapping';
+ static readonly COLOR_KEY: string = 'color-key';
+ static readonly MIN_KEY: string = 'min-key';
+ static readonly MAX_KEY: string = 'max-key';
constructor() {
super();
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel("gauge", "Gauge")
- .withDescription("A gauge visualization")
- .withIcon("fas fa-tachometer-alt")
+ return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel('gauge', 'Gauge')
+ .withDescription('A gauge visualization')
+ .withIcon('fas fa-tachometer-alt')
.requiredSchema(SchemaRequirementsBuilder
.create()
- .requiredPropertyWithUnaryMapping(GaugeConfig.NUMBER_MAPPING_KEY, "Select property", "", EpRequirements.numberReq())
+ .requiredPropertyWithUnaryMapping(GaugeConfig.NUMBER_MAPPING_KEY, 'Select property', '', EpRequirements.numberReq())
.build())
- .requiredIntegerParameter(GaugeConfig.MIN_KEY, "Min Y axis value", "")
- .requiredIntegerParameter(GaugeConfig.MAX_KEY, "Max Y axis value", "")
+ .requiredIntegerParameter(GaugeConfig.MIN_KEY, 'Min Y axis value', '')
+ .requiredIntegerParameter(GaugeConfig.MAX_KEY, 'Max Y axis value', '')
.build();
}
diff --git a/ui/src/app/dashboard/components/widgets/html/html-config.ts b/ui/src/app/dashboard/components/widgets/html/html-config.ts
index b0b9637..bcd7bd0 100644
--- a/ui/src/app/dashboard/components/widgets/html/html-config.ts
+++ b/ui/src/app/dashboard/components/widgets/html/html-config.ts
@@ -15,27 +15,27 @@
* limitations under the License.
*/
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {WidgetConfig} from "../base/base-config";
-import {EpRequirements} from "../../../sdk/ep-requirements";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { WidgetConfig } from '../base/base-config';
+import { EpRequirements } from '../../../sdk/ep-requirements';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class HtmlConfig extends WidgetConfig {
- static readonly HTML_MAPPING_KEY = "html-field";
+ static readonly HTML_MAPPING_KEY = 'html-field';
constructor() {
super();
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel("html", "HTML page")
- .withDescription("Renders HTML markup (e.g., from a website)")
- .withIcon("far fa-window-maximize")
+ return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel('html', 'HTML page')
+ .withDescription('Renders HTML markup (e.g., from a website)')
+ .withIcon('far fa-window-maximize')
.requiredSchema(SchemaRequirementsBuilder
.create()
- .requiredPropertyWithUnaryMapping(HtmlConfig.HTML_MAPPING_KEY, "HTML field", "", EpRequirements.anyProperty())
+ .requiredPropertyWithUnaryMapping(HtmlConfig.HTML_MAPPING_KEY, 'HTML field', '', EpRequirements.anyProperty())
.build())
.build();
}
diff --git a/ui/src/app/dashboard/components/widgets/image/image-config.ts b/ui/src/app/dashboard/components/widgets/image/image-config.ts
index 69983bc..0a2c9e3 100644
--- a/ui/src/app/dashboard/components/widgets/image/image-config.ts
+++ b/ui/src/app/dashboard/components/widgets/image/image-config.ts
@@ -16,30 +16,30 @@
*
*/
-import {WidgetConfig} from "../base/base-config";
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {EpRequirements} from "../../../sdk/ep-requirements";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfig } from '../base/base-config';
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { EpRequirements } from '../../../sdk/ep-requirements';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class ImageConfig extends WidgetConfig {
- static readonly TITLE_KEY: string = "title-key";
- static readonly NUMBER_MAPPING_KEY: string = "number-mapping";
+ static readonly TITLE_KEY: string = 'title-key';
+ static readonly NUMBER_MAPPING_KEY: string = 'number-mapping';
constructor() {
super();
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.create("image", "Image")
- .withDescription("Displays an image (e.g., from a camera)")
- .withIcon("fas fa-image")
+ return WidgetConfigBuilder.create('image', 'Image')
+ .withDescription('Displays an image (e.g., from a camera)')
+ .withIcon('fas fa-image')
.requiredSchema(SchemaRequirementsBuilder
.create()
- .requiredPropertyWithUnaryMapping(ImageConfig.NUMBER_MAPPING_KEY, "Select property", "", EpRequirements.imageReq())
+ .requiredPropertyWithUnaryMapping(ImageConfig.NUMBER_MAPPING_KEY, 'Select property', '', EpRequirements.imageReq())
.build())
- .requiredTextParameter(ImageConfig.TITLE_KEY, "Title", "The title")
+ .requiredTextParameter(ImageConfig.TITLE_KEY, 'Title', 'The title')
.build();
}
diff --git a/ui/src/app/dashboard/components/widgets/map/map-config.ts b/ui/src/app/dashboard/components/widgets/map/map-config.ts
index a9f7156..e08b9fb 100644
--- a/ui/src/app/dashboard/components/widgets/map/map-config.ts
+++ b/ui/src/app/dashboard/components/widgets/map/map-config.ts
@@ -19,7 +19,7 @@ import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
import { EpRequirements } from '../../../sdk/ep-requirements';
import { WidgetConfig } from '../base/base-config';
-import { DashboardWidgetSettings } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class MapConfig extends WidgetConfig {
diff --git a/ui/src/app/dashboard/components/widgets/number/number-config.ts b/ui/src/app/dashboard/components/widgets/number/number-config.ts
index 42ce12b..2b50587 100644
--- a/ui/src/app/dashboard/components/widgets/number/number-config.ts
+++ b/ui/src/app/dashboard/components/widgets/number/number-config.ts
@@ -16,26 +16,26 @@
*
*/
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {EpRequirements} from "../../../sdk/ep-requirements";
-import {WidgetConfig} from "../base/base-config";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { EpRequirements } from '../../../sdk/ep-requirements';
+import { WidgetConfig } from '../base/base-config';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class NumberConfig extends WidgetConfig {
- static readonly NUMBER_MAPPING_KEY: string = "number-mapping";
+ static readonly NUMBER_MAPPING_KEY: string = 'number-mapping';
constructor() {
super();
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel("number", "Single Value")
- .withDescription("Displays a single number or text value")
+ return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel('number', 'Single Value')
+ .withDescription('Displays a single number or text value')
.requiredSchema(SchemaRequirementsBuilder
.create()
- .requiredPropertyWithUnaryMapping(NumberConfig.NUMBER_MAPPING_KEY, "Select property", "", EpRequirements.anyProperty())
+ .requiredPropertyWithUnaryMapping(NumberConfig.NUMBER_MAPPING_KEY, 'Select property', '', EpRequirements.anyProperty())
.build())
.build();
}
diff --git a/ui/src/app/dashboard/components/widgets/number/number-widget.component.ts b/ui/src/app/dashboard/components/widgets/number/number-widget.component.ts
index fbb8f8e..3835cca 100644
--- a/ui/src/app/dashboard/components/widgets/number/number-widget.component.ts
+++ b/ui/src/app/dashboard/components/widgets/number/number-widget.component.ts
@@ -16,14 +16,14 @@
*
*/
-import {Component, OnDestroy, OnInit} from "@angular/core";
-import {RxStompService} from "@stomp/ng2-stompjs";
-import {BaseStreamPipesWidget} from "../base/base-widget";
-import {StaticPropertyExtractor} from "../../../sdk/extractor/static-property-extractor";
-import {NumberConfig} from "./number-config";
-import {ResizeService} from "../../../services/resize.service";
-import {DashboardService} from "../../../services/dashboard.service";
-import {EventPropertyPrimitive} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { RxStompService } from '@stomp/ng2-stompjs';
+import { BaseStreamPipesWidget } from '../base/base-widget';
+import { StaticPropertyExtractor } from '../../../sdk/extractor/static-property-extractor';
+import { NumberConfig } from './number-config';
+import { ResizeService } from '../../../services/resize.service';
+import { DashboardService } from '../../../services/dashboard.service';
+import { EventPropertyPrimitive } from '@streampipes/platform-services';
@Component({
selector: 'number-widget',
@@ -32,7 +32,7 @@ import {EventPropertyPrimitive} from "../../../../../../projects/streampipes/pla
})
export class NumberWidgetComponent extends BaseStreamPipesWidget implements OnInit, OnDestroy {
- item: any = "-";
+ item: any = '-';
selectedProperty: string;
measurementUnitAbbrev: string;
@@ -51,11 +51,11 @@ export class NumberWidgetComponent extends BaseStreamPipesWidget implements OnIn
extractConfig(extractor: StaticPropertyExtractor) {
this.selectedProperty = extractor.mappingPropertyValue(NumberConfig.NUMBER_MAPPING_KEY);
- let eventProperty: EventPropertyPrimitive = extractor.getEventPropertyByName(this.selectedProperty) as EventPropertyPrimitive;
+ const eventProperty: EventPropertyPrimitive = extractor.getEventPropertyByName(this.selectedProperty) as EventPropertyPrimitive;
if (eventProperty.measurementUnit) {
this.dashboardService.getMeasurementUnitInfo(eventProperty.measurementUnit).subscribe(unit => {
this.measurementUnitAbbrev = unit.abbreviation;
- })
+ });
}
}
diff --git a/ui/src/app/dashboard/components/widgets/raw/raw-config.ts b/ui/src/app/dashboard/components/widgets/raw/raw-config.ts
index 3ae1036..989c2d4 100644
--- a/ui/src/app/dashboard/components/widgets/raw/raw-config.ts
+++ b/ui/src/app/dashboard/components/widgets/raw/raw-config.ts
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {WidgetConfig} from "../base/base-config";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { WidgetConfig } from '../base/base-config';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class RawConfig extends WidgetConfig {
@@ -27,9 +27,9 @@ export class RawConfig extends WidgetConfig {
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel("raw", "Raw")
- .withIcon("fas fa-terminal")
- .withDescription("Displays the raw message as it comes in for testing purposes")
+ return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel('raw', 'Raw')
+ .withIcon('fas fa-terminal')
+ .withDescription('Displays the raw message as it comes in for testing purposes')
.requiredSchema(SchemaRequirementsBuilder
.create()
.build())
diff --git a/ui/src/app/dashboard/components/widgets/status/status-config.ts b/ui/src/app/dashboard/components/widgets/status/status-config.ts
index 0577b44..d384d74 100644
--- a/ui/src/app/dashboard/components/widgets/status/status-config.ts
+++ b/ui/src/app/dashboard/components/widgets/status/status-config.ts
@@ -16,28 +16,27 @@
*
*/
-import {WidgetConfig} from "../base/base-config";
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {EpRequirements} from "../../../sdk/ep-requirements";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfig } from '../base/base-config';
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class StatusWidgetConfig extends WidgetConfig {
- static readonly INTERVAL_KEY: string = "interval-key";
+ static readonly INTERVAL_KEY: string = 'interval-key';
constructor() {
super();
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel("status", "Status")
- .withIcon("fas fa-lightbulb")
- .withDescription("Status light")
+ return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel('status', 'Status')
+ .withIcon('fas fa-lightbulb')
+ .withDescription('Status light')
.requiredSchema(SchemaRequirementsBuilder
.create()
.build())
- .requiredIntegerParameter(StatusWidgetConfig.INTERVAL_KEY, "Interval [sec]", "Interval in seconds in which an event must arrive")
+ .requiredIntegerParameter(StatusWidgetConfig.INTERVAL_KEY, 'Interval [sec]', 'Interval in seconds in which an event must arrive')
.build();
}
}
diff --git a/ui/src/app/dashboard/components/widgets/table/table-config.ts b/ui/src/app/dashboard/components/widgets/table/table-config.ts
index 3ccb24a..84a1123 100644
--- a/ui/src/app/dashboard/components/widgets/table/table-config.ts
+++ b/ui/src/app/dashboard/components/widgets/table/table-config.ts
@@ -16,28 +16,28 @@
*
*/
-import {WidgetConfig} from "../base/base-config";
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {EpRequirements} from "../../../sdk/ep-requirements";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfig } from '../base/base-config';
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { EpRequirements } from '../../../sdk/ep-requirements';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class TableConfig extends WidgetConfig {
- static readonly TITLE_KEY: string = "title-key";
- static readonly SELECTED_PROPERTIES_KEYS: string = "selected-fields-key";
+ static readonly TITLE_KEY: string = 'title-key';
+ static readonly SELECTED_PROPERTIES_KEYS: string = 'selected-fields-key';
constructor() {
super();
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel("table", "Table")
- .withIcon("fas fa-table")
- .withDescription("A table visualization with customizable columns")
+ return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel('table', 'Table')
+ .withIcon('fas fa-table')
+ .withDescription('A table visualization with customizable columns')
.requiredSchema(SchemaRequirementsBuilder
.create()
- .requiredPropertyWithNaryMapping(TableConfig.SELECTED_PROPERTIES_KEYS, "Fields to display", "", EpRequirements.anyProperty())
+ .requiredPropertyWithNaryMapping(TableConfig.SELECTED_PROPERTIES_KEYS, 'Fields to display', '', EpRequirements.anyProperty())
.build())
.build();
}
diff --git a/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-config.ts b/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-config.ts
index 50e2c0b..c089ac0 100644
--- a/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-config.ts
+++ b/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-config.ts
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-import {WidgetConfigBuilder} from "../../../registry/widget-config-builder";
-import {SchemaRequirementsBuilder} from "../../../sdk/schema-requirements-builder";
-import {WidgetConfig} from "../base/base-config";
-import {EpRequirements} from "../../../sdk/ep-requirements";
-import {DashboardWidgetSettings} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+import { WidgetConfigBuilder } from '../../../registry/widget-config-builder';
+import { SchemaRequirementsBuilder } from '../../../sdk/schema-requirements-builder';
+import { WidgetConfig } from '../base/base-config';
+import { EpRequirements } from '../../../sdk/ep-requirements';
+import { DashboardWidgetSettings } from '@streampipes/platform-services';
export class TrafficLightConfig extends WidgetConfig {
- static readonly NUMBER_MAPPING_KEY = "number-field";
- static readonly CRITICAL_VALUE_KEY = "critical-value-key";
- static readonly CRITICAL_VALUE_LIMIT = "critical-value-limit";
- static readonly WARNING_RANGE_KEY = "warning-range";
+ static readonly NUMBER_MAPPING_KEY = 'number-field';
+ static readonly CRITICAL_VALUE_KEY = 'critical-value-key';
+ static readonly CRITICAL_VALUE_LIMIT = 'critical-value-limit';
+ static readonly WARNING_RANGE_KEY = 'warning-range';
constructor() {
@@ -34,17 +34,17 @@ export class TrafficLightConfig extends WidgetConfig {
}
getConfig(): DashboardWidgetSettings {
- return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel("trafficlight", "Traffic Light")
- .withIcon("fas fa-traffic-light")
- .withDescription("A traffic light visualization with customizable warning range and threshold")
+ return WidgetConfigBuilder.createWithSelectableColorsAndTitlePanel('trafficlight', 'Traffic Light')
+ .withIcon('fas fa-traffic-light')
+ .withDescription('A traffic light visualization with customizable warning range and threshold')
.requiredSchema(SchemaRequirementsBuilder
.create()
- .requiredPropertyWithUnaryMapping(TrafficLightConfig.NUMBER_MAPPING_KEY, "Field to observe", "", EpRequirements.numberReq())
+ .requiredPropertyWithUnaryMapping(TrafficLightConfig.NUMBER_MAPPING_KEY, 'Field to observe', '', EpRequirements.numberReq())
.build())
- .requiredIntegerParameter(TrafficLightConfig.CRITICAL_VALUE_KEY, "Threshold", "")
- .requiredSingleValueSelection(TrafficLightConfig.CRITICAL_VALUE_LIMIT, "Operator", "", [this.makeOption("Upper" +
- " Limit"), this.makeOption("Under Limit")])
- .requiredIntegerParameter(TrafficLightConfig.WARNING_RANGE_KEY, "Warning range (percent)", "")
+ .requiredIntegerParameter(TrafficLightConfig.CRITICAL_VALUE_KEY, 'Threshold', '')
+ .requiredSingleValueSelection(TrafficLightConfig.CRITICAL_VALUE_LIMIT, 'Operator', '', [this.makeOption('Upper' +
+ ' Limit'), this.makeOption('Under Limit')])
+ .requiredIntegerParameter(TrafficLightConfig.WARNING_RANGE_KEY, 'Warning range (percent)', '')
.build();
}
}
diff --git a/ui/src/app/dashboard/components/widgets/wordcloud/wordcloud-widget.component.ts b/ui/src/app/dashboard/components/widgets/wordcloud/wordcloud-widget.component.ts
index f8858c9..b56ffad 100644
--- a/ui/src/app/dashboard/components/widgets/wordcloud/wordcloud-widget.component.ts
+++ b/ui/src/app/dashboard/components/widgets/wordcloud/wordcloud-widget.component.ts
@@ -16,18 +16,18 @@
*
*/
-import {Component, OnDestroy, OnInit} from "@angular/core";
-import {RxStompService} from "@stomp/ng2-stompjs";
-import {BaseStreamPipesWidget} from "../base/base-widget";
-import {StaticPropertyExtractor} from "../../../sdk/extractor/static-property-extractor";
-import {ResizeService} from "../../../services/resize.service";
-import {DashboardService} from "../../../services/dashboard.service";
-import {EventPropertyList} from "../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
-import {WordCloudConfig} from "./wordcloud-config";
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { RxStompService } from '@stomp/ng2-stompjs';
+import { BaseStreamPipesWidget } from '../base/base-widget';
+import { StaticPropertyExtractor } from '../../../sdk/extractor/static-property-extractor';
+import { ResizeService } from '../../../services/resize.service';
+import { DashboardService } from '../../../services/dashboard.service';
+import { EventPropertyList } from '@streampipes/platform-services';
+import { WordCloudConfig } from './wordcloud-config';
import { EChartsOption } from 'echarts';
import 'echarts-wordcloud';
-import {ECharts} from "echarts/core";
+import { ECharts } from 'echarts/core';
@@ -43,12 +43,12 @@ export class WordcloudWidgetComponent extends BaseStreamPipesWidget implements O
windowSize: number;
eventProperty: EventPropertyList;
- words: Array<any> = new Array<any>();
+ words: any[] = new Array<any>();
currentWidth: number;
currentHeight: number;
- configReady: boolean = false;
+ configReady = false;
eChartsInstance: ECharts;
dynamicData: EChartsOption;
@@ -73,7 +73,7 @@ export class WordcloudWidgetComponent extends BaseStreamPipesWidget implements O
textStyle: {
fontFamily: 'sans-serif',
fontWeight: 'bold',
- color: function () {
+ color () {
return 'rgb(' + [
Math.round(Math.random() * 160),
Math.round(Math.random() * 160),
@@ -109,13 +109,13 @@ export class WordcloudWidgetComponent extends BaseStreamPipesWidget implements O
}
protected onEvent(event: any) {
- let value = event[this.countProperty];
- let name = event[this.nameProperty];
+ const value = event[this.countProperty];
+ const name = event[this.nameProperty];
this.dynamicData = this.chartOption;
if (this.dynamicData.series[0].data.some(d => d.name == name)) {
this.dynamicData.series[0].data.find(d => d.name == name).value = value;
} else {
- this.dynamicData.series[0].data.push({name: name, value: value});
+ this.dynamicData.series[0].data.push({name, value});
}
if (this.dynamicData.series[0].data.length > this.windowSize) {
this.dynamicData.series[0].data.shift();
@@ -139,7 +139,7 @@ export class WordcloudWidgetComponent extends BaseStreamPipesWidget implements O
applySize(width: number, height: number) {
if (this.eChartsInstance) {
- this.eChartsInstance.resize({width: width, height: height});
+ this.eChartsInstance.resize({width, height});
}
}
diff --git a/ui/src/app/data-explorer/components/widgets/base/data-explorer-widget-data.ts b/ui/src/app/data-explorer/components/widgets/base/data-explorer-widget-data.ts
index ddcb524..b6927b1 100644
--- a/ui/src/app/data-explorer/components/widgets/base/data-explorer-widget-data.ts
+++ b/ui/src/app/data-explorer/components/widgets/base/data-explorer-widget-data.ts
@@ -18,8 +18,7 @@
import { EventEmitter } from '@angular/core';
import { GridsterItem, GridsterItemComponent } from 'angular-gridster2';
-import { DashboardItem, TimeSettings } from '@streampipes/platform-services';
-import { DataExplorerWidgetModel } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { DataExplorerWidgetModel, DashboardItem, TimeSettings } from '@streampipes/platform-services';
export interface BaseWidgetData<T extends DataExplorerWidgetModel> {
removeWidgetCallback: EventEmitter<boolean>;
diff --git a/ui/src/app/data-explorer/components/widgets/correlation-chart/model/correlation-chart-widget.model.ts b/ui/src/app/data-explorer/components/widgets/correlation-chart/model/correlation-chart-widget.model.ts
index 9156baa..379405c 100644
--- a/ui/src/app/data-explorer/components/widgets/correlation-chart/model/correlation-chart-widget.model.ts
+++ b/ui/src/app/data-explorer/components/widgets/correlation-chart/model/correlation-chart-widget.model.ts
@@ -16,7 +16,7 @@
*
*/
-import { DataExplorerWidgetModel } from '../../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { DataExplorerWidgetModel } from '@streampipes/platform-services';
import { DataExplorerDataConfig, DataExplorerField, DataExplorerVisConfig } from '../../../../models/dataview-dashboard.model';
export interface CorrelationChartVisConfig extends DataExplorerVisConfig {
diff --git a/ui/src/app/data-explorer/components/widgets/distribution-chart/model/distribution-chart-widget.model.ts b/ui/src/app/data-explorer/components/widgets/distribution-chart/model/distribution-chart-widget.model.ts
index 17b4e27..186b57e 100644
--- a/ui/src/app/data-explorer/components/widgets/distribution-chart/model/distribution-chart-widget.model.ts
+++ b/ui/src/app/data-explorer/components/widgets/distribution-chart/model/distribution-chart-widget.model.ts
@@ -16,7 +16,7 @@
*
*/
-import { DataExplorerWidgetModel } from '../../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { DataExplorerWidgetModel } from '@streampipes/platform-services';
import { DataExplorerDataConfig, DataExplorerField, DataExplorerVisConfig } from '../../../../models/dataview-dashboard.model';
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index 9fc6846..3632edd 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -41,7 +41,12 @@ import { GridsterModule } from 'angular-gridster2';
import { PlotlyViaWindowModule } from 'angular-plotly.js';
import { ColorPickerModule } from 'ngx-color-picker';
import { SemanticTypeUtilsService } from '../core-services/semantic-type/semantic-type-utils.service';
-import { PlatformServicesModule, SharedDatalakeRestService } from '@streampipes/platform-services';
+import {
+ DatalakeRestService,
+ DataViewDataExplorerService,
+ PlatformServicesModule,
+ SharedDatalakeRestService
+} from '@streampipes/platform-services';
import { CoreUiModule } from '../core-ui/core-ui.module';
import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
import { DataDownloadDialog } from './components/datadownloadDialog/dataDownload.dialog';
@@ -60,7 +65,6 @@ import { SelectPropertiesComponent } from './components/widgets/utils/select-pro
import { SelectColorPropertiesComponent } from './components/widgets/utils/select-color-properties/select-color-properties.component';
import { DataExplorerComponent } from './data-explorer.component';
import { DataExplorerEditDataViewDialogComponent } from './dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component';
-import { DataViewDataExplorerService } from '../../../projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service';
import { RefreshDashboardService } from './services/refresh-dashboard.service';
import { ResizeService } from './services/resize.service';
import { GroupConfigurationComponent } from './components/widgets/utils/group-configuration/group-configuration.component';
@@ -77,7 +81,6 @@ import { DataExplorerWidgetDataSettingsComponent } from './components/designer-p
import { WidgetConfigurationService } from './services/widget-configuration.service';
import { TimeSeriesChartWidgetConfigComponent } from './components/widgets/time-series-chart/config/time-series-chart-widget-config.component';
import { ImageWidgetConfigComponent } from './components/widgets/image/config/image-widget-config.component';
-import { DatalakeRestService } from '../../../projects/streampipes/platform-services/src/lib/apis/datalake-rest.service';
import { IndicatorChartWidgetComponent } from './components/widgets/indicator/indicator-chart-widget.component';
import { IndicatorWidgetConfigComponent } from './components/widgets/indicator/config/indicator-chart-widget-config.component';
import { CorrelationChartWidgetComponent } from './components/widgets/correlation-chart/correlation-chart-widget.component';
diff --git a/ui/src/app/editor/components/pipeline/pipeline.component.ts b/ui/src/app/editor/components/pipeline/pipeline.component.ts
index 4508749..eff13c9 100644
--- a/ui/src/app/editor/components/pipeline/pipeline.component.ts
+++ b/ui/src/app/editor/components/pipeline/pipeline.component.ts
@@ -266,6 +266,7 @@ export class PipelineComponent implements OnInit, OnDestroy {
}, 10);
const streamDescription = pipelineElementConfig.payload as SpDataStream;
+ console.log(streamDescription);
if (streamDescription
.eventGrounding
.transportProtocols[0]
diff --git a/ui/src/app/editor/dialog/welcome-tour/welcome-tour.component.ts b/ui/src/app/editor/dialog/welcome-tour/welcome-tour.component.ts
index 70a5dfb..1ee7ec9 100644
--- a/ui/src/app/editor/dialog/welcome-tour/welcome-tour.component.ts
+++ b/ui/src/app/editor/dialog/welcome-tour/welcome-tour.component.ts
@@ -21,7 +21,7 @@ import { ShepherdService } from '../../../services/tour/shepherd.service';
import { Component, Input, OnInit } from '@angular/core';
import { AppConstants } from '../../../services/app.constants';
import { AuthService } from '../../../services/auth.service';
-import { UserAccount, UserInfo } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client';
+import { UserAccount, UserInfo } from '@streampipes/platform-services';
import { ProfileService } from '../../../profile/profile.service';
@Component({
diff --git a/ui/src/app/editor/editor.component.ts b/ui/src/app/editor/editor.component.ts
index c727731..f179da0 100644
--- a/ui/src/app/editor/editor.component.ts
+++ b/ui/src/app/editor/editor.component.ts
@@ -23,9 +23,9 @@ import {
DataSinkInvocation,
DataSourceDescription,
SpDataSet,
- SpDataStream
-} from '../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
-import { PipelineElementService } from '../../../projects/streampipes/platform-services/src/lib/apis/pipeline-element.service';
+ SpDataStream,
+ PipelineElementService
+} from '@streampipes/platform-services';
import {
PipelineElementConfig,
PipelineElementIdentifier,
diff --git a/ui/src/app/editor/services/jsplumb.service.ts b/ui/src/app/editor/services/jsplumb.service.ts
index 94040bb..2277a16 100644
--- a/ui/src/app/editor/services/jsplumb.service.ts
+++ b/ui/src/app/editor/services/jsplumb.service.ts
@@ -195,6 +195,7 @@ export class JsplumbService {
y: coordinates.y
}
};
+ console.log(pipelineElementConfig);
if (!pipelineElementConfig.payload.dom) {
pipelineElementConfig.payload.dom = 'jsplumb_' + this.idCounter + '_' + this.makeId(4);
this.idCounter++;
@@ -207,14 +208,15 @@ export class JsplumbService {
if (pipelineElement instanceof SpDataSet) {
return SpDataSet.fromData(pipelineElement, new SpDataSet());
} else if (pipelineElement instanceof SpDataStream) {
- return SpDataStream.fromData(pipelineElement, new SpDataStream());
+ const cloned = SpDataStream.fromData(pipelineElement, new SpDataStream());
+ return cloned;
} else if (pipelineElement instanceof DataProcessorInvocation) {
const clonedPe = DataProcessorInvocation.fromData(pipelineElement, new DataProcessorInvocation());
if (newElementId) {
this.updateElementIds(clonedPe, newElementId);
}
return clonedPe;
- } else {
+ } else if (pipelineElement instanceof DataSinkInvocation) {
const clonedPe = DataSinkInvocation.fromData(pipelineElement as DataSinkInvocation, new DataSinkInvocation());
if (newElementId) {
this.updateElementIds(clonedPe, newElementId);
diff --git a/ui/src/app/files/components/file-overview/file-overview.component.ts b/ui/src/app/files/components/file-overview/file-overview.component.ts
index 528ba48..bffabb9 100644
--- a/ui/src/app/files/components/file-overview/file-overview.component.ts
+++ b/ui/src/app/files/components/file-overview/file-overview.component.ts
@@ -17,8 +17,7 @@
*/
import { Component, OnInit, ViewChild } from '@angular/core';
-import { FilesService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/files.service';
-import { FileMetadata } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { FilesService, FileMetadata } from '@streampipes/platform-services';
import { MatTableDataSource } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
import { ConfirmDialogComponent } from '../../../core-ui/dialog/confirm-dialog/confirm-dialog.component';
diff --git a/ui/src/app/notifications/notifications.component.ts b/ui/src/app/notifications/notifications.component.ts
index 78691c2..dc623d7 100644
--- a/ui/src/app/notifications/notifications.component.ts
+++ b/ui/src/app/notifications/notifications.component.ts
@@ -25,8 +25,7 @@ import { Subscription } from 'rxjs';
import { RxStompService } from '@stomp/ng2-stompjs';
import { NotificationUtils } from './utils/notifications.utils';
import { NotificationCountService } from '../services/notification-count-service';
-import { FreeTextStaticProperty, Pipeline } from '../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
-import { PipelineService } from '../../../projects/streampipes/platform-services/src/lib/apis/pipeline.service';
+import { FreeTextStaticProperty, Pipeline, PipelineService } from '@streampipes/platform-services';
import { AuthService } from '../services/auth.service';
@Component({
diff --git a/ui/src/app/pipelines/dialog/import-pipeline/import-pipeline-dialog.component.ts b/ui/src/app/pipelines/dialog/import-pipeline/import-pipeline-dialog.component.ts
index 12a8401..484d393 100644
--- a/ui/src/app/pipelines/dialog/import-pipeline/import-pipeline-dialog.component.ts
+++ b/ui/src/app/pipelines/dialog/import-pipeline/import-pipeline-dialog.component.ts
@@ -17,10 +17,9 @@
*/
import { Component } from '@angular/core';
-import { PipelineService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/pipeline.service';
+import { Pipeline, PipelineService } from '@streampipes/platform-services';
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
import { forkJoin } from 'rxjs';
-import { Pipeline } from '@streampipes/platform-services';
@Component({
selector: 'sp-import-pipeline-dialog',
diff --git a/ui/src/app/profile/components/basic-profile-settings.ts b/ui/src/app/profile/components/basic-profile-settings.ts
index 63c2173..f9710fd 100644
--- a/ui/src/app/profile/components/basic-profile-settings.ts
+++ b/ui/src/app/profile/components/basic-profile-settings.ts
@@ -17,7 +17,7 @@
*/
import { ProfileService } from '../profile.service';
-import { UserAccount } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client';
+import { UserAccount } from '@streampipes/platform-services';
import { Directive } from '@angular/core';
import { AppConstants } from '../../services/app.constants';
import { JwtTokenStorageService } from '../../services/jwt-token-storage.service';
diff --git a/ui/src/app/profile/profile.service.ts b/ui/src/app/profile/profile.service.ts
index b4282e9..dc74e35 100644
--- a/ui/src/app/profile/profile.service.ts
+++ b/ui/src/app/profile/profile.service.ts
@@ -17,12 +17,10 @@
*/
import { Injectable } from '@angular/core';
-import { PlatformServicesCommons } from '../../../projects/streampipes/platform-services/src/lib/apis/commons.service';
+import { Message, PlatformServicesCommons, RawUserApiToken, UserAccount } from '@streampipes/platform-services';
import { HttpClient } from '@angular/common/http';
-import { RawUserApiToken, UserAccount } from '../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
-import { Message } from '../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
@Injectable()
export class ProfileService {