Rename services

ui/deployment/home.service.mst

@@ -22,7 +22,9 @@ import { AuthService } from '../services/auth.service';
 import { ServiceLink } from './models/home.model';
 import {
     AdapterService,
-    DataViewDataExplorerService, PipelineElementService,
+    DashboardService,
+    ChartService,
+    PipelineElementService,
     PipelineService
 } from '@streampipes/platform-services';
 import { UserPrivilege } from '../_enums/user-privilege.enum';
@@ -32,7 +34,8 @@ export class HomeService {
 
     constructor(private authService: AuthService,
                 private adapterService: AdapterService,
-                private dataViewService: DataViewDataExplorerService,
+                private chartService: ChartService,
+                private dashboardService: DashboardService,
                 private pipelineService: PipelineService,
                 private pipelineElementService: PipelineElementService) {
     }

ui/deployment/modules.yml

@@ -118,7 +118,7 @@ spDashboard:
         createLinks: "['dashboard']"
         title: 'Dashboards'
         createTitle: 'New dashboard'
-        dataFns: '[this.dataViewService.getDataViews()]'
+        dataFns: '[this.dashboardService.getDashboards()]'
         viewRoles: '[UserPrivilege.PRIVILEGE_READ_DASHBOARD, UserPrivilege.PRIVILEGE_WRITE_DASHBOARD]'
         createRoles: '[UserPrivilege.PRIVILEGE_WRITE_DASHBOARD]'
 spDataExplorer:
@@ -140,6 +140,6 @@ spDataExplorer:
         createLinks: "['dataexplorer']"
         title: 'Charts'
         createTitle: 'New chart'
-        dataFns: '[this.dataViewService.getAllWidgets()]'
+        dataFns: '[this.chartService.getAllCharts()]'
         viewRoles: '[UserPrivilege.PRIVILEGE_READ_DATA_EXPLORER_VIEW, UserPrivilege.PRIVILEGE_WRITE_DATA_EXPLORER_VIEW]'
         createRoles: '[UserPrivilege.PRIVILEGE_WRITE_DATA_EXPLORER_VIEW]'

ui/projects/streampipes/platform-services/src/lib/apis/data-view-data-explorer.service.ts → ui/projects/streampipes/platform-services/src/lib/apis/chart.service.ts

@@ -16,80 +16,28 @@
  *
  */
 
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { HttpClient } from '@angular/common/http';
 import { catchError, Observable, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Dashboard } from '../model/dashboard/dashboard.model';
 import { Injectable } from '@angular/core';
 import {
     DataExplorerWidgetModel,
     DataLakeMeasure,
 } from '../model/gen/streampipes-model';
-import { SharedDatalakeRestService } from './shared-dashboard.service';
 
 @Injectable({
     providedIn: 'root',
 })
-export class DataViewDataExplorerService {
-    constructor(
-        private http: HttpClient,
-        private sharedDatalakeRestService: SharedDatalakeRestService,
-    ) {}
+export class ChartService {
+    constructor(private http: HttpClient) {}
 
-    getDataViews(): Observable<Dashboard[]> {
-        return this.sharedDatalakeRestService.getDashboards(this.dashboardUrl);
-    }
-
-    getDashboard(dashboardId: string): Observable<Dashboard> {
-        return this.http
-            .get(`${this.dashboardUrl}/${dashboardId}`)
-            .pipe(map(data => data as Dashboard));
-    }
-
-    updateDashboard(dashboard: Dashboard): Observable<Dashboard> {
-        return this.sharedDatalakeRestService.updateDashboard(
-            this.dashboardUrl,
-            dashboard,
-        );
-    }
-
-    deleteDashboard(dashboard: Dashboard): Observable<any> {
-        return this.sharedDatalakeRestService.deleteDashboard(
-            this.dashboardUrl,
-            dashboard,
-        );
-    }
-
-    saveDataView(dataViewDashboard: Dashboard): Observable<any> {
-        return this.sharedDatalakeRestService.saveDashboard(
-            this.dashboardUrl,
-            dataViewDashboard,
-        );
-    }
-
-    private get baseUrl() {
-        return '/streampipes-backend';
-    }
-
-    private get persistedDataStreamsUrl() {
-        return `${this.baseUrl}/api/v3/datalake/pipelines`;
-    }
-
-    private get dashboardUrl() {
-        return `${this.baseUrl}/api/v3/datalake/dashboard`;
-    }
-
-    private get dashboardWidgetUrl() {
-        return `${this.baseUrl}/api/v3/datalake/dashboard/widgets`;
-    }
-
-    getAllWidgets(): Observable<DataExplorerWidgetModel[]> {
+    getAllCharts(): Observable<DataExplorerWidgetModel[]> {
         return this.http
             .get(this.dashboardWidgetUrl)
             .pipe(map(res => res as DataExplorerWidgetModel[]));
     }
 
-    getWidget(widgetId: string): Observable<DataExplorerWidgetModel> {
+    getChart(widgetId: string): Observable<DataExplorerWidgetModel> {
         return this.http.get(this.dashboardWidgetUrl + '/' + widgetId).pipe(
             catchError(() => {
                 return throwError(() => new Error('Failed to get widget data'));
@@ -102,7 +50,7 @@ export class DataViewDataExplorerService {
         );
     }
 
-    saveWidget(
+    saveChart(
         widget: DataExplorerWidgetModel,
     ): Observable<DataExplorerWidgetModel> {
         return this.http.post(this.dashboardWidgetUrl, widget).pipe(
@@ -114,17 +62,29 @@ export class DataViewDataExplorerService {
         );
     }
 
-    deleteWidget(widgetId: string): Observable<any> {
+    deleteChart(widgetId: string): Observable<any> {
         return this.http.delete(`${this.dashboardWidgetUrl}/${widgetId}`);
     }
 
-    updateWidget(widget: DataExplorerWidgetModel): Observable<any> {
+    updateChart(widget: DataExplorerWidgetModel): Observable<any> {
         return this.http.put(
             this.dashboardWidgetUrl + '/' + widget.elementId,
             widget,
         );
     }
 
+    private get baseUrl() {
+        return '/streampipes-backend';
+    }
+
+    private get persistedDataStreamsUrl() {
+        return `${this.baseUrl}/api/v3/datalake/pipelines`;
+    }
+
+    private get dashboardWidgetUrl() {
+        return `${this.baseUrl}/api/v3/datalake/dashboard/widgets`;
+    }
+
     getPersistedDataStream(
         pipelineId: string,
         measureName: string,

ui/projects/streampipes/platform-services/src/lib/apis/dashboard.service.ts

@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import { HttpClient } from '@angular/common/http';
+import {
+    Dashboard,
+    SharedDatalakeRestService,
+} from '@streampipes/platform-services';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class DashboardService {
+    constructor(
+        private http: HttpClient,
+        private sharedDatalakeRestService: SharedDatalakeRestService,
+    ) {}
+
+    getDashboards(): Observable<Dashboard[]> {
+        return this.sharedDatalakeRestService.getDashboards(this.dashboardUrl);
+    }
+
+    getDashboard(dashboardId: string): Observable<Dashboard> {
+        return this.http
+            .get(`${this.dashboardUrl}/${dashboardId}`)
+            .pipe(map(data => data as Dashboard));
+    }
+
+    updateDashboard(dashboard: Dashboard): Observable<Dashboard> {
+        return this.sharedDatalakeRestService.updateDashboard(
+            this.dashboardUrl,
+            dashboard,
+        );
+    }
+
+    deleteDashboard(dashboard: Dashboard): Observable<any> {
+        return this.sharedDatalakeRestService.deleteDashboard(
+            this.dashboardUrl,
+            dashboard,
+        );
+    }
+
+    saveDashboard(dashboard: Dashboard): Observable<any> {
+        return this.sharedDatalakeRestService.saveDashboard(
+            this.dashboardUrl,
+            dashboard,
+        );
+    }
+
+    private get baseUrl() {
+        return '/streampipes-backend';
+    }
+
+    private get dashboardUrl() {
+        return `${this.baseUrl}/api/v3/datalake/dashboard`;
+    }
+}

ui/projects/streampipes/platform-services/src/public-api.ts

@@ -27,7 +27,8 @@ export * from './lib/apis/adapter.service';
 export * from './lib/apis/adapter-monitoring.service';
 export * from './lib/apis/asset-management.service';
 export * from './lib/apis/compact-pipeline.service';
-export * from './lib/apis/data-view-data-explorer.service';
+export * from './lib/apis/chart.service';
+export * from './lib/apis/dashboard.service';
 export * from './lib/apis/datalake-rest.service';
 export * from './lib/apis/files.service';
 export * from './lib/apis/functions.service';

ui/src/app/assets/dialog/base-asset-links.directive.ts

@@ -20,11 +20,12 @@ import { Directive } from '@angular/core';
 import {
     AdapterDescription,
     AdapterService,
+    ChartService,
     Dashboard,
+    DashboardService,
     DataExplorerWidgetModel,
     DataLakeMeasure,
     DatalakeRestService,
-    DataViewDataExplorerService,
     FileMetadata,
     FilesService,
     GenericStorageService,
@@ -51,7 +52,8 @@ export abstract class BaseAssetLinksDirective {
     constructor(
         protected genericStorageService: GenericStorageService,
         protected pipelineService: PipelineService,
-        protected dataViewService: DataViewDataExplorerService,
+        protected chartService: ChartService,
+        protected dashboardService: DashboardService,
         protected dataLakeService: DatalakeRestService,
         protected pipelineElementService: PipelineElementService,
         protected adapterService: AdapterService,
@@ -65,8 +67,8 @@ export abstract class BaseAssetLinksDirective {
     getAllResources() {
         zip(
             this.pipelineService.getPipelines(),
-            this.dataViewService.getAllWidgets(),
-            this.dataViewService.getDataViews(),
+            this.chartService.getAllCharts(),
+            this.dashboardService.getDashboards(),
             this.pipelineElementService.getDataStreams(),
             this.dataLakeService.getAllMeasurementSeries(),
             this.filesService.getFileMetadata(),

ui/src/app/assets/dialog/create-asset/create-asset-dialog.component.ts

@@ -19,7 +19,6 @@
 import { Component, Input } from '@angular/core';
 import {
     AssetManagementService,
-    DataViewDataExplorerService,
     SpAssetModel,
 } from '@streampipes/platform-services';
 import { DialogRef } from '@streampipes/shared-ui';

ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts

@@ -22,12 +22,13 @@ import {
     AdapterService,
     AssetLink,
     AssetLinkType,
+    ChartService,
+    DashboardService,
     DatalakeRestService,
-    DataViewDataExplorerService,
+    FilesService,
     GenericStorageService,
-    PipelineService,
     PipelineElementService,
-    FilesService,
+    PipelineService,
 } from '@streampipes/platform-services';
 import { UntypedFormGroup } from '@angular/forms';
 import { MatSelectChange } from '@angular/material/select';
@@ -63,7 +64,8 @@ export class EditAssetLinkDialogComponent
         private dialogRef: DialogRef<EditAssetLinkDialogComponent>,
         protected genericStorageService: GenericStorageService,
         protected pipelineService: PipelineService,
-        protected dataViewService: DataViewDataExplorerService,
+        protected chartService: ChartService,
+        protected dashboardService: DashboardService,
         protected dataLakeService: DatalakeRestService,
         protected pipelineElementService: PipelineElementService,
         protected adapterService: AdapterService,
@@ -72,7 +74,8 @@ export class EditAssetLinkDialogComponent
         super(
             genericStorageService,
             pipelineService,
-            dataViewService,
+            chartService,
+            dashboardService,
             dataLakeService,
             pipelineElementService,
             adapterService,

ui/src/app/assets/dialog/manage-asset-links/manage-asset-links-dialog.component.ts

@@ -22,12 +22,13 @@ import {
     AdapterService,
     AssetLink,
     AssetLinkType,
+    ChartService,
+    DashboardService,
     DatalakeRestService,
-    DataViewDataExplorerService,
+    FilesService,
     GenericStorageService,
-    PipelineService,
     PipelineElementService,
-    FilesService,
+    PipelineService,
 } from '@streampipes/platform-services';
 import { BaseAssetLinksDirective } from '../base-asset-links.directive';
 
@@ -58,7 +59,8 @@ export class SpManageAssetLinksDialogComponent
         private dialogRef: DialogRef<SpManageAssetLinksDialogComponent>,
         protected genericStorageService: GenericStorageService,
         protected pipelineService: PipelineService,
-        protected dataViewService: DataViewDataExplorerService,
+        protected chartService: ChartService,
+        protected dashboardService: DashboardService,
         protected dataLakeService: DatalakeRestService,
         protected pipelineElementService: PipelineElementService,
         protected adapterService: AdapterService,
@@ -67,7 +69,8 @@ export class SpManageAssetLinksDialogComponent
         super(
             genericStorageService,
             pipelineService,
-            dataViewService,
+            chartService,
+            dashboardService,
             dataLakeService,
             pipelineElementService,
             adapterService,

ui/src/app/configuration/datalake-configuration/datalake-configuration.component.ts

@@ -20,8 +20,8 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import { DataLakeConfigurationEntry } from './datalake-configuration-entry';
 import {
+    ChartService,
     DatalakeRestService,
-    DataViewDataExplorerService,
 } from '@streampipes/platform-services';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
@@ -64,7 +64,7 @@ export class DatalakeConfigurationComponent implements OnInit {
 
     constructor(
         private datalakeRestService: DatalakeRestService,
-        private dataViewDataExplorerService: DataViewDataExplorerService,
+        private dataViewDataExplorerService: ChartService,
         private dialogService: DialogService,
         private breadcrumbService: SpBreadcrumbService,
         private tabService: SpConfigurationTabsService,