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 14:16:30 UTC
[incubator-streampipes] branch experimental-module-federation updated: [WIP] Working on platform-services
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 7543332 [WIP] Working on platform-services
7543332 is described below
commit 7543332aef1f9e5278c3432c6d574cb07897fcd6
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Feb 1 15:16:12 2022 +0100
[WIP] Working on platform-services
---
ui/angular.json | 2 +-
.../streampipes/platform-services/package.json | 3 ++-
.../src/lib/apis/data-view-data-explorer.service.ts | 6 ++----
.../src/lib/apis/datalake-rest.service.ts | 2 +-
.../src/lib/apis}/shared-dashboard.service.ts | 6 +++---
.../src/lib/model/dashboard}/dashboard.model.ts | 5 +++--
.../lib/model}/datalake/DatalakeQueryParameters.ts | 0
.../src/lib/model/datalake/DateRange.ts | 2 +-
.../streampipes/platform-services/src/public-api.ts | 12 ++++++++++--
.../components/view-asset/view-asset.component.ts | 2 +-
.../datalake-configuration.component.ts | 2 +-
.../datalake/DatalakeQueryParameterBuilder.ts | 2 +-
.../core-services/datalake/datalake-rest.service.ts | 5 +++--
.../components/grid/dashboard-grid.component.ts | 21 ++++++++-------------
.../overview/dashboard-overview.component.ts | 2 +-
.../components/panel/dashboard-panel.component.ts | 2 +-
.../standalone/standalone-dashboard.component.ts | 4 ++--
.../components/widget/dashboard-widget.component.ts | 2 +-
.../components/widgets/base/base-widget.ts | 2 +-
ui/src/app/dashboard/dashboard.component.ts | 2 +-
.../add-visualization-dialog.component.ts | 2 +-
.../edit-dashboard-dialog.component.ts | 2 +-
ui/src/app/dashboard/models/gridster-info.model.ts | 4 ++--
ui/src/app/dashboard/services/dashboard.service.ts | 2 +-
.../grid/data-explorer-dashboard-grid.component.ts | 18 ++++++++----------
.../data-explorer-dashboard-overview.component.ts | 2 +-
.../data-explorer-dashboard-panel.component.ts | 2 +-
.../time-selector/timeRangeSelector.component.ts | 2 +-
.../data-explorer-dashboard-widget.component.ts | 2 +-
.../base/base-data-explorer-widget.directive.ts | 2 +-
.../widgets/base/data-explorer-widget-data.ts | 2 +-
.../widgets/image/image-widget.component.ts | 2 +-
.../no-data/no-data-in-date-range.component.ts | 2 +-
ui/src/app/data-explorer/data-explorer.component.ts | 2 +-
ui/src/app/data-explorer/data-explorer.module.ts | 2 +-
...data-explorer-edit-data-view-dialog.component.ts | 2 +-
.../services/data-view-query-generator.service.ts | 2 +-
.../services/time-selection.service.ts | 2 +-
38 files changed, 70 insertions(+), 68 deletions(-)
diff --git a/ui/angular.json b/ui/angular.json
index 40ad572..73cfa9e 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -37,7 +37,7 @@
"node_modules/jquery/dist/jquery.min.js",
"node_modules/datatables.net/js/jquery.dataTables.js",
"node_modules/jquery-ui-dist/jquery-ui.js",
- "node_modules/quill/dist/quill.js",
+ "node_modules/quill/dist/quill.js"
]
},
"configurations": {
diff --git a/ui/projects/streampipes/platform-services/package.json b/ui/projects/streampipes/platform-services/package.json
index 12336b0..5f389bd 100644
--- a/ui/projects/streampipes/platform-services/package.json
+++ b/ui/projects/streampipes/platform-services/package.json
@@ -4,7 +4,8 @@
"peerDependencies": {
"@angular/common": "^12.2.0",
"@angular/core": "^12.2.0",
- "rxjs": "6.6.2"
+ "rxjs": "6.6.2",
+ "angular-gridster2": "12.1.1"
},
"dependencies": {
"tslib": "^2.3.0"
diff --git a/ui/projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service.ts b/ui/projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service.ts
index abcca59..ea89b7d 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service.ts
@@ -19,11 +19,11 @@
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
-import { SharedDatalakeRestService } from '../../../../../../src/app/core-services/shared/shared-dashboard.service';
-import { Dashboard } from '../../../../../../src/app/dashboard/models/dashboard.model';
+import { Dashboard } from '../model/dashboard/dashboard.model';
import { Injectable } from '@angular/core';
import { DatalakeRestService } from './datalake-rest.service';
import { DataExplorerWidgetModel, DataLakeMeasure } from '../model/gen/streampipes-model';
+import { SharedDatalakeRestService } from './shared-dashboard.service';
@Injectable({
@@ -31,8 +31,6 @@ import { DataExplorerWidgetModel, DataLakeMeasure } from '../model/gen/streampip
})
export class DataViewDataExplorerService {
- localDashboards: Dashboard[] = [];
-
constructor(private http: HttpClient,
private dataLakeRestService: DatalakeRestService,
private sharedDatalakeRestService: SharedDatalakeRestService) {
diff --git a/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts b/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts
index 6c9d50a..d4f1331 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts
@@ -21,7 +21,7 @@ import { HttpClient, HttpRequest } from '@angular/common/http';
import { Observable } from 'rxjs';
import { DataLakeMeasure, PageResult, SpQueryResult } from '../model/gen/streampipes-model';
import { map } from 'rxjs/operators';
-import { DatalakeQueryParameters } from '../../../../../../src/app/core-services/datalake/DatalakeQueryParameters';
+import { DatalakeQueryParameters } from '../model/datalake/DatalakeQueryParameters';
@Injectable({
providedIn: 'root'
diff --git a/ui/src/app/core-services/shared/shared-dashboard.service.ts b/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
similarity index 92%
rename from ui/src/app/core-services/shared/shared-dashboard.service.ts
rename to ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
index 86d7044..cc19175 100644
--- a/ui/src/app/core-services/shared/shared-dashboard.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
@@ -18,9 +18,9 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { Dashboard } from '../../dashboard/models/dashboard.model';
-import { map } from "rxjs/operators";
-import { Observable } from "rxjs";
+import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { Dashboard } from '../model/dashboard/dashboard.model';
@Injectable()
export class SharedDatalakeRestService {
diff --git a/ui/src/app/dashboard/models/dashboard.model.ts b/ui/projects/streampipes/platform-services/src/lib/model/dashboard/dashboard.model.ts
similarity index 88%
rename from ui/src/app/dashboard/models/dashboard.model.ts
rename to ui/projects/streampipes/platform-services/src/lib/model/dashboard/dashboard.model.ts
index f33dfd5..a83fe88 100644
--- a/ui/src/app/dashboard/models/dashboard.model.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/dashboard/dashboard.model.ts
@@ -17,11 +17,12 @@
*/
import { GridsterConfig, GridsterItem } from 'angular-gridster2';
-import { TimeSettings } from '../../../../projects/streampipes/platform-services/src/lib/model/datalake/DateRange';
+import { TimeSettings } from '../datalake/DateRange';
+// tslint:disable-next-line:no-empty-interface
export interface DashboardConfig extends GridsterConfig {}
-export interface DashboardItem extends GridsterItem {
+interface DashboardItem extends GridsterItem {
widgetId: string;
widgetType: string;
id: string;
diff --git a/ui/src/app/core-services/datalake/DatalakeQueryParameters.ts b/ui/projects/streampipes/platform-services/src/lib/model/datalake/DatalakeQueryParameters.ts
similarity index 100%
rename from ui/src/app/core-services/datalake/DatalakeQueryParameters.ts
rename to ui/projects/streampipes/platform-services/src/lib/model/datalake/DatalakeQueryParameters.ts
diff --git a/ui/projects/streampipes/platform-services/src/lib/model/datalake/DateRange.ts b/ui/projects/streampipes/platform-services/src/lib/model/datalake/DateRange.ts
index 0914d01..a47f476 100644
--- a/ui/projects/streampipes/platform-services/src/lib/model/datalake/DateRange.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/datalake/DateRange.ts
@@ -36,7 +36,7 @@ export class DateRange {
}
static fromTimeSettings(timeSettings: TimeSettings): DateRange {
- let range = new DateRange();
+ const range = new DateRange();
range.startDate = new Date(timeSettings.startTime);
range.endDate = new Date(timeSettings.endTime);
return range;
diff --git a/ui/projects/streampipes/platform-services/src/public-api.ts b/ui/projects/streampipes/platform-services/src/public-api.ts
index eac8597..a09e536 100644
--- a/ui/projects/streampipes/platform-services/src/public-api.ts
+++ b/ui/projects/streampipes/platform-services/src/public-api.ts
@@ -3,9 +3,10 @@
*/
export * from './lib/platform-services.module';
+
export * from './lib/apis/commons.service';
-//export * from './lib/apis/data-view-data-explorer.service';
-//export * from './lib/apis/datalake-rest.service';
+export * from './lib/apis/data-view-data-explorer.service';
+export * from './lib/apis/datalake-rest.service';
export * from './lib/apis/files.service';
export * from './lib/apis/general-config.service';
export * from './lib/apis/mail-config.service';
@@ -21,3 +22,10 @@ export * from './lib/apis/pipeline-template.service';
export * from './lib/apis/semantic-types.service';
export * from './lib/apis/user.service';
export * from './lib/apis/user-group.service';
+export * from './lib/apis/shared-dashboard.service';
+
+export * from './lib/model/datalake/DateRange';
+export * from './lib/model/datalake/DatalakeQueryParameters';
+export * from './lib/model/dashboard/dashboard.model';
+export * from './lib/model/gen/streampipes-model-client';
+export * from './lib/model/gen/streampipes-model';
diff --git a/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts b/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts
index d485fe0..bed60f4 100644
--- a/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts
+++ b/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts
@@ -28,7 +28,7 @@ import {
Pipeline,
VisualizablePipeline
} from "../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
-import {DashboardItem} from "../../../dashboard/models/dashboard.model";
+import {DashboardItem} from "@streampipes/platform-services/src/lib/model/dashboard/dashboard.model";
interface Window {
Image: any;
diff --git a/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.ts b/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.ts
index b8adeb2..61eaa82 100644
--- a/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.ts
+++ b/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.ts
@@ -21,7 +21,7 @@ import { DatalakeRestService } from '../../../../projects/streampipes/platform-s
import { MatTableDataSource } from '@angular/material/table';
import { DataViewDataExplorerService } from '../../../../projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service';
import { DataLakeConfigurationEntry } from './datalake-configuration-entry';
-import { DatalakeQueryParameters } from '../../core-services/datalake/DatalakeQueryParameters';
+import { DatalakeQueryParameters } from '@streampipes/platform-services/src/lib/model/datalake/DatalakeQueryParameters';
import { DatalakeQueryParameterBuilder } from '../../core-services/datalake/DatalakeQueryParameterBuilder';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
diff --git a/ui/src/app/core-services/datalake/DatalakeQueryParameterBuilder.ts b/ui/src/app/core-services/datalake/DatalakeQueryParameterBuilder.ts
index 0a58d9d..1ce0852 100644
--- a/ui/src/app/core-services/datalake/DatalakeQueryParameterBuilder.ts
+++ b/ui/src/app/core-services/datalake/DatalakeQueryParameterBuilder.ts
@@ -16,8 +16,8 @@
*
*/
-import { DatalakeQueryParameters } from './DatalakeQueryParameters';
import { FieldConfig, SelectedFilter } from '../../data-explorer/models/dataview-dashboard.model';
+import { DatalakeQueryParameters } from '@streampipes/platform-services/src/lib/model/datalake/DatalakeQueryParameters';
export class DatalakeQueryParameterBuilder {
diff --git a/ui/src/app/core-services/datalake/datalake-rest.service.ts b/ui/src/app/core-services/datalake/datalake-rest.service.ts
index 3df7d03..7cfc005 100644
--- a/ui/src/app/core-services/datalake/datalake-rest.service.ts
+++ b/ui/src/app/core-services/datalake/datalake-rest.service.ts
@@ -19,9 +19,10 @@
import { HttpClient, HttpRequest } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
-import { DataLakeMeasure, SpQueryResult } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+// import { DataLakeMeasure, SpQueryResult } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
import { map } from 'rxjs/operators';
-import { DatalakeQueryParameters } from './DatalakeQueryParameters';
+import { DatalakeQueryParameters } from '@streampipes/platform-services/src/lib/model/datalake/DatalakeQueryParameters';
+import { DataLakeMeasure } from 'projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
@Injectable()
export class DatalakeRestService {
diff --git a/ui/src/app/dashboard/components/grid/dashboard-grid.component.ts b/ui/src/app/dashboard/components/grid/dashboard-grid.component.ts
index 7d464ec..1e441c8 100644
--- a/ui/src/app/dashboard/components/grid/dashboard-grid.component.ts
+++ b/ui/src/app/dashboard/components/grid/dashboard-grid.component.ts
@@ -26,14 +26,11 @@ import {
QueryList,
SimpleChanges,
ViewChildren
-} from "@angular/core";
-import {Dashboard, DashboardConfig, DashboardItem} from "../../models/dashboard.model";
-import {GridsterInfo} from "../../models/gridster-info.model";
-import {ResizeService} from "../../services/resize.service";
-import {GridsterItemComponent, GridType} from "angular-gridster2";
-import {DashboardService} from "../../services/dashboard.service";
-import {RefreshDashboardService} from "../../services/refresh-dashboard.service";
-import {DashboardWidgetModel} from "../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model";
+} from '@angular/core';
+import { Dashboard, DashboardConfig, DashboardItem } from '@streampipes/platform-services';
+import { ResizeService } from '../../services/resize.service';
+import { GridsterItemComponent, GridType } from 'angular-gridster2';
+import { DashboardWidgetModel } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
@Component({
selector: 'dashboard-grid',
@@ -50,13 +47,11 @@ export class DashboardGridComponent implements OnInit, OnChanges {
@Output() updateCallback: EventEmitter<DashboardWidgetModel> = new EventEmitter<DashboardWidgetModel>();
options: DashboardConfig;
- loaded: boolean = false;
+ loaded = false;
@ViewChildren(GridsterItemComponent) gridsterItemComponents: QueryList<GridsterItemComponent>;
- constructor(private resizeService: ResizeService,
- private dashboardService: DashboardService,
- private refreshDashboardService: RefreshDashboardService) {
+ constructor(private resizeService: ResizeService) {
}
@@ -83,7 +78,7 @@ export class DashboardGridComponent implements OnInit, OnChanges {
}
ngOnChanges(changes: SimpleChanges): void {
- if (changes["editMode"] && this.options) {
+ if (changes['editMode'] && this.options) {
this.options.draggable.enabled = this.editMode;
this.options.resizable.enabled = this.editMode;
this.options.displayGrid = this.editMode ? 'always' : 'none';
diff --git a/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts b/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
index c290837..1653b93 100644
--- a/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
+++ b/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Dashboard } from '../../models/dashboard.model';
+import { Dashboard } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { MatTableDataSource } from '@angular/material/table';
import { MatDialog } from '@angular/material/dialog';
import { DashboardService } from '../../services/dashboard.service';
diff --git a/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts b/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
index 6312c6b..3a09746 100644
--- a/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
+++ b/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
@@ -17,7 +17,7 @@
*/
import {Component, EventEmitter, Input, OnInit, Output} from "@angular/core";
-import {Dashboard, DashboardItem} from "../../models/dashboard.model";
+import {Dashboard, DashboardItem} from "@streampipes/platform-services/src/lib/model/dashboard/dashboard.model";
import {forkJoin, Observable, Subscription} from "rxjs";
import {AddVisualizationDialogComponent} from "../../dialogs/add-widget/add-visualization-dialog.component";
import {DashboardService} from "../../services/dashboard.service";
diff --git a/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts b/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts
index 0300e8f..748a52f 100644
--- a/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts
+++ b/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts
@@ -16,7 +16,7 @@
*/
import {Component, OnInit} from "@angular/core";
-import {Dashboard} from "../../models/dashboard.model";
+import {Dashboard} from "@streampipes/platform-services/src/lib/model/dashboard/dashboard.model";
import {DashboardService} from "../../services/dashboard.service";
import {ActivatedRoute} from "@angular/router";
@@ -45,4 +45,4 @@ export class StandaloneDashboardComponent implements OnInit {
}
});
}
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/dashboard/components/widget/dashboard-widget.component.ts b/ui/src/app/dashboard/components/widget/dashboard-widget.component.ts
index 39b4dae..965e521 100644
--- a/ui/src/app/dashboard/components/widget/dashboard-widget.component.ts
+++ b/ui/src/app/dashboard/components/widget/dashboard-widget.component.ts
@@ -17,7 +17,7 @@
*/
import {Component, EventEmitter, Input, OnInit, Output} from "@angular/core";
-import {DashboardItem} from "../../models/dashboard.model";
+import {DashboardItem} from "@streampipes/platform-services/src/lib/model/dashboard/dashboard.model";
import {DashboardService} from "../../services/dashboard.service";
import {GridsterItem, GridsterItemComponent} from "angular-gridster2";
import {AddVisualizationDialogComponent} from "../../dialogs/add-widget/add-visualization-dialog.component";
diff --git a/ui/src/app/dashboard/components/widgets/base/base-widget.ts b/ui/src/app/dashboard/components/widgets/base/base-widget.ts
index d85adf7..96000d4 100644
--- a/ui/src/app/dashboard/components/widgets/base/base-widget.ts
+++ b/ui/src/app/dashboard/components/widgets/base/base-widget.ts
@@ -17,7 +17,7 @@
*/
import { Input, OnChanges, SimpleChanges, Directive } from "@angular/core";
-import {DashboardItem} from "../../../models/dashboard.model";
+import {DashboardItem} from "@streampipes/platform-services/src/lib/model/dashboard/dashboard.model";
import {StaticPropertyExtractor} from "../../../sdk/extractor/static-property-extractor";
import {RxStompService} from "@stomp/ng2-stompjs";
import {Message} from "@stomp/stompjs";
diff --git a/ui/src/app/dashboard/dashboard.component.ts b/ui/src/app/dashboard/dashboard.component.ts
index 8ee7370..384d16e 100644
--- a/ui/src/app/dashboard/dashboard.component.ts
+++ b/ui/src/app/dashboard/dashboard.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, OnInit } from '@angular/core';
-import { Dashboard } from './models/dashboard.model';
+import { Dashboard } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { DashboardService } from './services/dashboard.service';
import { RefreshDashboardService } from './services/refresh-dashboard.service';
import { Tuple2 } from '../core-model/base/Tuple2';
diff --git a/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
index bcd068b..228cf0d 100644
--- a/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
+++ b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
@@ -18,7 +18,7 @@
import { AfterViewInit, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
import { ElementIconText } from '../../../services/get-element-icon-text.service';
-import { Dashboard } from '../../models/dashboard.model';
+import { Dashboard } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { WidgetConfigBuilder } from '../../registry/widget-config-builder';
import { WidgetRegistry } from '../../registry/widget-registry';
import { MappingPropertyGenerator } from '../../sdk/matching/mapping-property-generator';
diff --git a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
index e13f583..9e00ec9 100644
--- a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
+++ b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
@@ -18,7 +18,7 @@
import { Component, Input } from "@angular/core";
import { DashboardService } from "../../services/dashboard.service";
-import { Dashboard } from "../../models/dashboard.model";
+import { Dashboard } from "@streampipes/platform-services/src/lib/model/dashboard/dashboard.model";
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
@Component({
diff --git a/ui/src/app/dashboard/models/gridster-info.model.ts b/ui/src/app/dashboard/models/gridster-info.model.ts
index c25992d..7034867 100644
--- a/ui/src/app/dashboard/models/gridster-info.model.ts
+++ b/ui/src/app/dashboard/models/gridster-info.model.ts
@@ -16,11 +16,11 @@
*
*/
-import {GridsterItem, GridsterItemComponent} from "angular-gridster2";
+import { GridsterItem, GridsterItemComponent } from 'angular-gridster2';
export interface GridsterInfo {
gridsterItem: GridsterItem;
- gridsterItemComponent: GridsterItemComponent
+ gridsterItemComponent: GridsterItemComponent;
}
export interface WidgetInfo {
diff --git a/ui/src/app/dashboard/services/dashboard.service.ts b/ui/src/app/dashboard/services/dashboard.service.ts
index 96f15c1..af53917 100644
--- a/ui/src/app/dashboard/services/dashboard.service.ts
+++ b/ui/src/app/dashboard/services/dashboard.service.ts
@@ -20,7 +20,7 @@ import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
-import { Dashboard } from '../models/dashboard.model';
+import { Dashboard } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { MeasurementUnit } from '../../core-model/measurement-unit/MeasurementUnit';
import {
DashboardWidgetModel,
diff --git a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
index 38e65d9..31520ba 100644
--- a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
+++ b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
@@ -16,20 +16,18 @@
*
*/
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output, QueryList, SimpleChanges, ViewChildren } from '@angular/core';
+import { EventEmitter, Input, OnChanges, OnInit, Output, QueryList, SimpleChanges, ViewChildren } from '@angular/core';
import { GridsterItemComponent, GridType } from 'angular-gridster2';
import { GridsterInfo } from '../../../dashboard/models/gridster-info.model';
import { IDataViewDashboardConfig } from '../../models/dataview-dashboard.model';
import { ResizeService } from '../../services/resize.service';
-import { DataExplorerWidgetModel, DataLakeMeasure } from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
-import { Dashboard, TimeSettings } from '../../../dashboard/models/dashboard.model';
-import { DataViewDataExplorerService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service';
-
-@Component({
- selector: 'sp-data-explorer-dashboard-grid',
- templateUrl: './data-explorer-dashboard-grid.component.html',
- styleUrls: ['./data-explorer-dashboard-grid.component.scss']
-})
+import { DataViewDataExplorerService, Dashboard } from '@streampipes/platform-services';
+import {
+ DataExplorerWidgetModel,
+ DataLakeMeasure
+} from '../../../../../dist/streampipes/platform-services/lib/model/gen/streampipes-model';
+import { TimeSettings } from '../../../../../dist/streampipes/platform-services';
+
export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
@Input()
diff --git a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
index a8d17d4..e5b9dfc 100644
--- a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
+++ b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
@@ -20,7 +20,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { MatTableDataSource } from '@angular/material/table';
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 { Dashboard } from '../../../dashboard/models/dashboard.model';
+import { Dashboard } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { Tuple2 } from '../../../core-model/base/Tuple2';
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/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
index ed67eb7..299b120 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
+++ b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
@@ -24,7 +24,7 @@ import { DataExplorerWidgetModel, DataLakeMeasure } from '../../../../../project
import { DataExplorerDashboardGridComponent } from '../grid/data-explorer-dashboard-grid.component';
import { MatDrawer } from '@angular/material/sidenav';
import { Tuple2 } from '../../../core-model/base/Tuple2';
-import { Dashboard, DashboardItem, TimeSettings } from '../../../dashboard/models/dashboard.model';
+import { Dashboard, DashboardItem, TimeSettings } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { DataExplorerDesignerPanelComponent } from '../designer-panel/data-explorer-designer-panel.component';
import { DataViewDataExplorerService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service';
import { TimeSelectionService } from '../../services/time-selection.service';
diff --git a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.ts b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.ts
index fc004b7..61290db 100644
--- a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.ts
+++ b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
-import { TimeSettings } from '../../../dashboard/models/dashboard.model';
+import { TimeSettings } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
@Component({
selector: 'sp-time-range-selector',
diff --git a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
index e70737d..b7babb1 100644
--- a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
@@ -33,7 +33,7 @@ import {
DataLakeMeasure
} from '../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
import { DataDownloadDialog } from '../datadownloadDialog/dataDownload.dialog';
-import { DashboardItem, TimeSettings } from '../../../dashboard/models/dashboard.model';
+import { DashboardItem, TimeSettings } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { DataViewDataExplorerService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service';
import { interval } from 'rxjs';
import { takeWhile } from 'rxjs/operators';
diff --git a/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.directive.ts b/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.directive.ts
index d6a75c2..46161f4 100644
--- a/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.directive.ts
+++ b/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.directive.ts
@@ -20,7 +20,7 @@ import { Directive, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output
import { GridsterItem, GridsterItemComponent } from 'angular-gridster2';
import { DataExplorerWidgetModel, SpQueryResult } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
import { WidgetConfigurationService } from '../../../services/widget-configuration.service';
-import { DashboardItem, TimeSettings } from '../../../../dashboard/models/dashboard.model';
+import { DashboardItem, TimeSettings } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { ResizeService } from '../../../services/resize.service';
import { DatalakeRestService } from '../../../../../../projects/streampipes/platform-services/src/lib/apis/datalake-rest.service';
import { DataViewQueryGeneratorService } from '../../../services/data-view-query-generator.service';
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 d3166b8..9ff9d68 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,7 +18,7 @@
import { EventEmitter } from '@angular/core';
import { GridsterItem, GridsterItemComponent } from 'angular-gridster2';
-import { DashboardItem, TimeSettings } from '../../../../dashboard/models/dashboard.model';
+import { DashboardItem, TimeSettings } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { DataExplorerWidgetModel } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
export interface BaseWidgetData<T extends DataExplorerWidgetModel> {
diff --git a/ui/src/app/data-explorer/components/widgets/image/image-widget.component.ts b/ui/src/app/data-explorer/components/widgets/image/image-widget.component.ts
index 7231368..02cd7c9 100644
--- a/ui/src/app/data-explorer/components/widgets/image/image-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widgets/image/image-widget.component.ts
@@ -21,7 +21,7 @@ import { MatSort } from '@angular/material/sort';
import { BaseDataExplorerWidgetDirective } from '../base/base-data-explorer-widget.directive';
import { EventPropertyUnion, EventSchema, SpQueryResult } from '../../../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
import { ImageWidgetModel } from './model/image-widget.model';
-import { DatalakeQueryParameters } from '../../../../core-services/datalake/DatalakeQueryParameters';
+import { DatalakeQueryParameters } from '@streampipes/platform-services/src/lib/model/datalake/DatalakeQueryParameters';
import { DatalakeQueryParameterBuilder } from '../../../../core-services/datalake/DatalakeQueryParameterBuilder';
import { DataExplorerField } from '../../../models/dataview-dashboard.model';
diff --git a/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.ts b/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.ts
index 0f46829..ba7dce7 100644
--- a/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.ts
+++ b/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.ts
@@ -17,7 +17,7 @@
*/
import {Component, Input, OnInit} from '@angular/core';
-import {TimeSettings} from "../../../../../dashboard/models/dashboard.model";
+import {TimeSettings} from "@streampipes/platform-services/src/lib/model/dashboard/dashboard.model";
@Component({
selector: 'sp-no-data-in-date-range',
diff --git a/ui/src/app/data-explorer/data-explorer.component.ts b/ui/src/app/data-explorer/data-explorer.component.ts
index 476826c..d579065 100644
--- a/ui/src/app/data-explorer/data-explorer.component.ts
+++ b/ui/src/app/data-explorer/data-explorer.component.ts
@@ -20,7 +20,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { DataViewDataExplorerService } from '../../../projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service';
import { RefreshDashboardService } from './services/refresh-dashboard.service';
import { DataExplorerDashboardPanelComponent } from './components/panel/data-explorer-dashboard-panel.component';
-import { Dashboard } from '../dashboard/models/dashboard.model';
+import { Dashboard } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { Tuple2 } from '../core-model/base/Tuple2';
import { ActivatedRoute } from '@angular/router';
import { AuthService } from '../services/auth.service';
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index 268d660..d8df602 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -41,7 +41,7 @@ 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 { SharedDatalakeRestService } from '../core-services/shared/shared-dashboard.service';
+import { SharedDatalakeRestService } from '@streampipes/platform-services/src/lib/apis/shared-dashboard.service';
import { CoreUiModule } from '../core-ui/core-ui.module';
import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
import { DataDownloadDialog } from './components/datadownloadDialog/dataDownload.dialog';
diff --git a/ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts b/ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts
index 07c17c6..c327e38 100644
--- a/ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts
+++ b/ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts
@@ -18,7 +18,7 @@
import { Component, Input, OnInit } from '@angular/core';
import { DataViewDataExplorerService } from '../../../../../projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service';
-import { Dashboard } from '../../../dashboard/models/dashboard.model';
+import { Dashboard } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
@Component({
diff --git a/ui/src/app/data-explorer/services/data-view-query-generator.service.ts b/ui/src/app/data-explorer/services/data-view-query-generator.service.ts
index 624454a..e59fd72 100644
--- a/ui/src/app/data-explorer/services/data-view-query-generator.service.ts
+++ b/ui/src/app/data-explorer/services/data-view-query-generator.service.ts
@@ -20,7 +20,7 @@ import { Injectable } from '@angular/core';
import { DataExplorerDataConfig, SourceConfig } from '../models/dataview-dashboard.model';
import { DatalakeQueryParameterBuilder } from '../../core-services/datalake/DatalakeQueryParameterBuilder';
import { Observable } from 'rxjs';
-import { DatalakeQueryParameters } from '../../core-services/datalake/DatalakeQueryParameters';
+import { DatalakeQueryParameters } from '@streampipes/platform-services/src/lib/model/datalake/DatalakeQueryParameters';
import { DatalakeRestService } from '../../../../projects/streampipes/platform-services/src/lib/apis/datalake-rest.service';
import { SpQueryResult } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
diff --git a/ui/src/app/data-explorer/services/time-selection.service.ts b/ui/src/app/data-explorer/services/time-selection.service.ts
index acb80fc..fe3f48c 100644
--- a/ui/src/app/data-explorer/services/time-selection.service.ts
+++ b/ui/src/app/data-explorer/services/time-selection.service.ts
@@ -18,7 +18,7 @@
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs';
-import { TimeSettings } from '../../dashboard/models/dashboard.model';
+import { TimeSettings } from '@streampipes/platform-services/src/lib/model/dashboard/dashboard.model';
@Injectable()
export class TimeSelectionService {