This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 76a43042f2 refactor: Rename DataExplorer services to Chart services
and update references (#3987)
76a43042f2 is described below
commit 76a43042f2aa20225811b76fd78ccb9e25f6661a
Author: Philipp Zehnder <[email protected]>
AuthorDate: Fri Nov 28 13:19:58 2025 +0100
refactor: Rename DataExplorer services to Chart services and update
references (#3987)
---
.../components/kiosk/dashboard-kiosk.component.ts | 4 ++--
.../dashboard-overview-table.component.ts | 8 ++++----
.../dashboard/components/panel/dashboard-panel.component.ts | 12 ++++++------
ui/src/app/dashboard/dashboard.module.ts | 6 +++---
.../data-explorer-chart-container.component.ts | 4 ++--
.../charts/base/base-data-explorer-widget.directive.ts | 4 ++--
.../components/charts/base/base-widget-config.ts | 4 ++--
.../charts/gauge/config/gauge-widget-config.component.ts | 4 ++--
.../charts/heatmap/config/heatmap-widget-config.component.ts | 4 ++--
.../charts/map/config/map-widget-config.component.ts | 4 ++--
.../charts/pie/config/pie-chart-widget-config.component.ts | 4 ++--
.../config/status-heatmap-widget-config.component.ts | 4 ++--
.../charts/status/config/status-widget-config.component.ts | 4 ++--
.../charts/table/config/table-widget-config.component.ts | 4 ++--
.../config/time-series-chart-widget-config.component.ts | 4 ++--
.../config/traffic-light-widget-config.component.ts | 4 ++--
.../echarts-renderer/base-echarts-renderer.ts | 8 ++++----
...colorization.service.ts => chart-colorization.service.ts} | 2 +-
...d-provider-service.ts => chart-field-provider.service.ts} | 2 +-
....guard.ts => chart-panel-can-deactivate-guard.service.ts} | 2 +-
...-explorer-routing.service.ts => chart-routing.service.ts} | 2 +-
...ta-explorer-shared.service.ts => chart-shared.service.ts} | 2 +-
.../chart-view/data-explorer-chart-view.component.ts | 12 ++++++------
.../data-explorer-widget-data-settings.component.ts | 4 ++--
.../field-selection-panel/field-selection-panel.component.ts | 4 ++--
.../filter-selection-panel.component.ts | 4 ++--
.../group-selection-panel/group-selection-panel.component.ts | 4 ++--
.../data-explorer-overview-table.component.ts | 8 ++++----
.../components/overview/data-explorer-overview.component.ts | 4 ++--
ui/src/app/data-explorer/data-explorer.module.ts | 4 ++--
...ct-changes.service.ts => chart-detect-changes.service.ts} | 2 +-
31 files changed, 71 insertions(+), 71 deletions(-)
diff --git
a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts
b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts
index 34b7a86df0..1e7009994e 100644
--- a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts
+++ b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts
@@ -29,7 +29,7 @@ import { of, Subscription, timer } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { TimeSelectionService } from '@streampipes/shared-ui';
import { DataExplorerDashboardService } from
'../../../dashboard-shared/services/dashboard.service';
-import { DataExplorerSharedService } from
'../../../data-explorer-shared/services/data-explorer-shared.service';
+import { ChartSharedService } from
'../../../data-explorer-shared/services/chart-shared.service';
import { ObservableGenerator } from
'../../../data-explorer-shared/models/dataview-dashboard.model';
@Component({
@@ -43,7 +43,7 @@ export class DashboardKioskComponent implements OnInit,
OnDestroy {
private dashboardService = inject(DashboardService);
private timeSelectionService = inject(TimeSelectionService);
private dataExplorerDashboardService =
inject(DataExplorerDashboardService);
- private dataExplorerSharedService = inject(DataExplorerSharedService);
+ private dataExplorerSharedService = inject(ChartSharedService);
observableGenerator: ObservableGenerator;
dashboard: Dashboard;
diff --git
a/ui/src/app/dashboard/components/overview/dashboard-overview-table/dashboard-overview-table.component.ts
b/ui/src/app/dashboard/components/overview/dashboard-overview-table/dashboard-overview-table.component.ts
index 919df71aad..0f230b5045 100644
---
a/ui/src/app/dashboard/components/overview/dashboard-overview-table/dashboard-overview-table.component.ts
+++
b/ui/src/app/dashboard/components/overview/dashboard-overview-table/dashboard-overview-table.component.ts
@@ -28,12 +28,12 @@ import {
} from '@streampipes/shared-ui';
import { MatDialog } from '@angular/material/dialog';
import { DataExplorerDashboardService } from
'../../../../dashboard-shared/services/dashboard.service';
-import { DataExplorerSharedService } from
'../../../../data-explorer-shared/services/data-explorer-shared.service';
+import { ChartSharedService } from
'../../../../data-explorer-shared/services/chart-shared.service';
import { TranslateService } from '@ngx-translate/core';
import { Router } from '@angular/router';
import { CloneDashboardDialogComponent } from
'../../../dialogs/clone-dashboard/clone-dashboard-dialog.component';
import { Subscription } from 'rxjs';
-import { DataExplorerRoutingService } from
'../../../../data-explorer-shared/services/data-explorer-routing.service';
+import { ChartRoutingService } from
'../../../../data-explorer-shared/services/chart-routing.service';
@Component({
selector: 'sp-dashboard-overview-table',
@@ -59,13 +59,13 @@ export class DashboardOverviewTableComponent implements
OnInit, OnDestroy {
private dashboardService = inject(DashboardService);
private dataExplorerDashboardService =
inject(DataExplorerDashboardService);
- private dataExplorerSharedService = inject(DataExplorerSharedService);
+ private dataExplorerSharedService = inject(ChartSharedService);
private dialog = inject(MatDialog);
protected translateService = inject(TranslateService);
protected dateFormatService = inject(DateFormatService);
private router = inject(Router);
private assetFilterService = inject(SpAssetBrowserService);
- private routingService = inject(DataExplorerRoutingService);
+ private routingService = inject(ChartRoutingService);
private dialogService = inject(DialogService);
assetFilter$: Subscription;
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 93ca7bb5fc..69879120c9 100644
--- a/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
+++ b/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
@@ -46,12 +46,12 @@ import {
import { MatDialog } from '@angular/material/dialog';
import { catchError, map, switchMap } from 'rxjs/operators';
import { SpDashboardRoutes } from '../../dashboard.routes';
-import { DataExplorerRoutingService } from
'../../../data-explorer-shared/services/data-explorer-routing.service';
-import { DataExplorerDetectChangesService } from
'../../../data-explorer/services/data-explorer-detect-changes.service';
+import { ChartRoutingService } from
'../../../data-explorer-shared/services/chart-routing.service';
+import { ChartDetectChangesService } from
'../../../data-explorer/services/chart-detect-changes.service';
import { SupportsUnsavedChangeDialog } from
'../../../data-explorer-shared/models/dataview-dashboard.model';
import { TranslateService } from '@ngx-translate/core';
import { DataExplorerDashboardService } from
'../../../dashboard-shared/services/dashboard.service';
-import { DataExplorerSharedService } from
'../../../data-explorer-shared/services/data-explorer-shared.service';
+import { ChartSharedService } from
'../../../data-explorer-shared/services/chart-shared.service';
@Component({
selector: 'sp-dashboard-panel',
@@ -88,18 +88,18 @@ export class DashboardPanelComponent
authSubscription: Subscription;
refreshSubscription: Subscription;
- private detectChangesService = inject(DataExplorerDetectChangesService);
+ private detectChangesService = inject(ChartDetectChangesService);
private dialog = inject(MatDialog);
private timeSelectionService = inject(TimeSelectionService);
private authService = inject(AuthService);
private currentUserService = inject(CurrentUserService);
private dashboardService = inject(DashboardService);
private route = inject(ActivatedRoute);
- private routingService = inject(DataExplorerRoutingService);
+ private routingService = inject(ChartRoutingService);
private breadcrumbService = inject(SpBreadcrumbService);
private translateService = inject(TranslateService);
private dataExplorerDashboardService =
inject(DataExplorerDashboardService);
- private dataExplorerSharedService = inject(DataExplorerSharedService);
+ private dataExplorerSharedService = inject(ChartSharedService);
observableGenerator =
this.dataExplorerSharedService.defaultObservableGenerator();
diff --git a/ui/src/app/dashboard/dashboard.module.ts
b/ui/src/app/dashboard/dashboard.module.ts
index 7e480fdb69..93e0fc7966 100644
--- a/ui/src/app/dashboard/dashboard.module.ts
+++ b/ui/src/app/dashboard/dashboard.module.ts
@@ -60,7 +60,7 @@ import { MatChipsModule } from '@angular/material/chips';
import { MatSliderModule } from '@angular/material/slider';
import { DataExplorerSharedModule } from
'../data-explorer-shared/data-explorer-shared.module';
import { DashboardPanelComponent } from
'./components/panel/dashboard-panel.component';
-import { DataExplorerPanelCanDeactivateGuard } from
'../data-explorer-shared/services/data-explorer-panel.can-deactivate.guard';
+import { ChartPanelCanDeactivateGuard } from
'../data-explorer-shared/services/chart-panel-can-deactivate-guard.service';
import { DashboardToolbarComponent } from
'./components/panel/dashboard-toolbar/dashboard-toolbar.component';
import { ChartSelectionPanelComponent } from
'./components/panel/chart-selection-panel/chart-selection-panel.component';
import { ChartPreviewComponent } from
'./components/panel/chart-selection-panel/chart-selection/chart-preview/chart-preview.component';
@@ -128,12 +128,12 @@ import { MatProgressSpinnerModule } from
'@angular/material/progress-spinner';
{
path: ':id',
component: DashboardPanelComponent,
- canDeactivate: [DataExplorerPanelCanDeactivateGuard],
+ canDeactivate: [ChartPanelCanDeactivateGuard],
},
{
path: ':id/:startTime/:endTime',
component: DashboardPanelComponent,
- canDeactivate: [DataExplorerPanelCanDeactivateGuard],
+ canDeactivate: [ChartPanelCanDeactivateGuard],
},
],
},
diff --git
a/ui/src/app/data-explorer-shared/components/chart-container/data-explorer-chart-container.component.ts
b/ui/src/app/data-explorer-shared/components/chart-container/data-explorer-chart-container.component.ts
index 4fb1bb090e..8c5c007a1b 100644
---
a/ui/src/app/data-explorer-shared/components/chart-container/data-explorer-chart-container.component.ts
+++
b/ui/src/app/data-explorer-shared/components/chart-container/data-explorer-chart-container.component.ts
@@ -57,7 +57,7 @@ import {
BaseWidgetData,
ObservableGenerator,
} from '../../models/dataview-dashboard.model';
-import { DataExplorerSharedService } from
'../../services/data-explorer-shared.service';
+import { ChartSharedService } from '../../services/chart-shared.service';
import { MatMenuTrigger } from '@angular/material/menu';
@Component({
@@ -152,7 +152,7 @@ export class DataExplorerChartContainerComponent
constructor(
private chartRegistryService: DataExplorerChartRegistry,
- private dashboardService: DataExplorerSharedService,
+ private dashboardService: ChartSharedService,
private componentFactoryResolver: ComponentFactoryResolver,
private widgetTypeService: ChartTypeService,
private authService: AuthService,
diff --git
a/ui/src/app/data-explorer-shared/components/charts/base/base-data-explorer-widget.directive.ts
b/ui/src/app/data-explorer-shared/components/charts/base/base-data-explorer-widget.directive.ts
index 37d9a719a0..e322d0fc06 100644
---
a/ui/src/app/data-explorer-shared/components/charts/base/base-data-explorer-widget.directive.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/base/base-data-explorer-widget.directive.ts
@@ -44,7 +44,7 @@ import {
ObservableGenerator,
} from '../../../models/dataview-dashboard.model';
import { Observable, Subject, Subscription, zip } from 'rxjs';
-import { DataExplorerFieldProviderService } from
'../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../services/chart-field-provider.service';
import { catchError, switchMap } from 'rxjs/operators';
import { DataExplorerChartRegistry } from
'../../../registry/data-explorer-chart-registry';
import { SpFieldUpdateService } from '../../../services/field-update.service';
@@ -120,7 +120,7 @@ export abstract class BaseDataExplorerWidgetDirective<
protected timeSelectionService = inject(TimeSelectionService);
protected widgetRegistryService = inject(DataExplorerChartRegistry);
protected fieldUpdateService = inject(SpFieldUpdateService);
- public fieldService = inject(DataExplorerFieldProviderService);
+ public fieldService = inject(ChartFieldProviderService);
ngOnInit(): void {
this.heightOffset = this.gridMode ? 70 : 65;
diff --git
a/ui/src/app/data-explorer-shared/components/charts/base/base-widget-config.ts
b/ui/src/app/data-explorer-shared/components/charts/base/base-widget-config.ts
index 1e260e94ae..b1213bd734 100644
---
a/ui/src/app/data-explorer-shared/components/charts/base/base-widget-config.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/base/base-widget-config.ts
@@ -26,7 +26,7 @@ import {
DataExplorerVisConfig,
FieldProvider,
} from '../../../models/dataview-dashboard.model';
-import { DataExplorerFieldProviderService } from
'../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../services/chart-field-provider.service';
import { Subscription } from 'rxjs';
@Directive()
@@ -44,7 +44,7 @@ export abstract class BaseWidgetConfig<
constructor(
protected widgetConfigurationService: ChartConfigurationService,
- protected fieldService: DataExplorerFieldProviderService,
+ protected fieldService: ChartFieldProviderService,
) {}
ngOnInit(): void {
diff --git
a/ui/src/app/data-explorer-shared/components/charts/gauge/config/gauge-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/gauge/config/gauge-widget-config.component.ts
index 81e6a1ff95..666904166e 100644
---
a/ui/src/app/data-explorer-shared/components/charts/gauge/config/gauge-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/gauge/config/gauge-widget-config.component.ts
@@ -19,7 +19,7 @@
import { Component } from '@angular/core';
import { BaseWidgetConfig } from '../../base/base-widget-config';
import { ChartConfigurationService } from
'../../../../services/chart-configuration.service';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
import { GaugeVisConfig, GaugeWidgetModel } from '../model/gauge-widget.model';
import { DataExplorerField } from '@streampipes/platform-services';
@@ -34,7 +34,7 @@ export class GaugeWidgetConfigComponent extends
BaseWidgetConfig<
> {
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/heatmap/config/heatmap-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/heatmap/config/heatmap-widget-config.component.ts
index bb4eb776a3..1c99d78ea8 100644
---
a/ui/src/app/data-explorer-shared/components/charts/heatmap/config/heatmap-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/heatmap/config/heatmap-widget-config.component.ts
@@ -23,7 +23,7 @@ import {
HeatmapVisConfig,
HeatmapWidgetModel,
} from '../model/heatmap-widget.model';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
import { DataExplorerField } from '@streampipes/platform-services';
@Component({
@@ -37,7 +37,7 @@ export class HeatmapWidgetConfigComponent extends
BaseWidgetConfig<
> {
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/map/config/map-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/map/config/map-widget-config.component.ts
index eb784c42e8..9acddbfcb7 100644
---
a/ui/src/app/data-explorer-shared/components/charts/map/config/map-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/map/config/map-widget-config.component.ts
@@ -19,7 +19,7 @@
import { Component } from '@angular/core';
import { BaseWidgetConfig } from '../../base/base-widget-config';
import { ChartConfigurationService } from
'../../../../services/chart-configuration.service';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
import { MapVisConfig, MapWidgetModel } from '../model/map-widget.model';
import { DataExplorerField } from '@streampipes/platform-services';
import { MatCheckboxChange } from '@angular/material/checkbox';
@@ -38,7 +38,7 @@ export class MapWidgetConfigComponent extends
BaseWidgetConfig<
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/pie/config/pie-chart-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/pie/config/pie-chart-widget-config.component.ts
index 40e93c6d1c..d4ca2c6422 100644
---
a/ui/src/app/data-explorer-shared/components/charts/pie/config/pie-chart-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/pie/config/pie-chart-widget-config.component.ts
@@ -24,7 +24,7 @@ import {
} from '../model/pie-chart-widget.model';
import { DataExplorerField } from '@streampipes/platform-services';
import { ChartConfigurationService } from
'../../../../services/chart-configuration.service';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
@Component({
selector: 'sp-pie-chart-widget-config',
@@ -37,7 +37,7 @@ export class SpPieChartWidgetConfigComponent extends
BaseWidgetConfig<
> {
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/status-heatmap/config/status-heatmap-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/status-heatmap/config/status-heatmap-widget-config.component.ts
index d459460c36..1611eba620 100644
---
a/ui/src/app/data-explorer-shared/components/charts/status-heatmap/config/status-heatmap-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/status-heatmap/config/status-heatmap-widget-config.component.ts
@@ -23,7 +23,7 @@ import {
StatusHeatmapVisConfig,
StatusHeatmapWidgetModel,
} from '../model/status-heatmap-widget.model';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
import { DataExplorerField } from '@streampipes/platform-services';
@Component({
@@ -37,7 +37,7 @@ export class StatusHeatmapWidgetConfigComponent extends
BaseWidgetConfig<
> {
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/status/config/status-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/status/config/status-widget-config.component.ts
index 6c3f3a3064..a280aa89b9 100644
---
a/ui/src/app/data-explorer-shared/components/charts/status/config/status-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/status/config/status-widget-config.component.ts
@@ -23,7 +23,7 @@ import {
StatusVisConfig,
StatusWidgetModel,
} from '../model/status-widget.model';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
import { DataExplorerField } from '@streampipes/platform-services';
@Component({
@@ -38,7 +38,7 @@ export class StatusWidgetConfigComponent extends
BaseWidgetConfig<
> {
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/table/config/table-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/table/config/table-widget-config.component.ts
index fd133b5780..0248e9d0ba 100644
---
a/ui/src/app/data-explorer-shared/components/charts/table/config/table-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/table/config/table-widget-config.component.ts
@@ -20,7 +20,7 @@ import { Component } from '@angular/core';
import { BaseWidgetConfig } from '../../base/base-widget-config';
import { ChartConfigurationService } from
'../../../../services/chart-configuration.service';
import { TableVisConfig, TableWidgetModel } from '../model/table-widget.model';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
import { DataExplorerField } from '@streampipes/platform-services';
@Component({
@@ -35,7 +35,7 @@ export class TableWidgetConfigComponent extends
BaseWidgetConfig<
> {
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/time-series-chart/config/time-series-chart-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/time-series-chart/config/time-series-chart-widget-config.component.ts
index ddaadd5e29..a6b362f9ce 100644
---
a/ui/src/app/data-explorer-shared/components/charts/time-series-chart/config/time-series-chart-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/time-series-chart/config/time-series-chart-widget-config.component.ts
@@ -24,7 +24,7 @@ import {
} from '../model/time-series-chart-widget.model';
import { ChartConfigurationService } from
'../../../../services/chart-configuration.service';
import { DataExplorerField } from '@streampipes/platform-services';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
@Component({
selector: 'sp-data-explorer-time-series-chart-widget-config',
@@ -37,7 +37,7 @@ export class TimeSeriesChartWidgetConfigComponent extends
BaseWidgetConfig<
> {
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/components/charts/traffic-light/config/traffic-light-widget-config.component.ts
b/ui/src/app/data-explorer-shared/components/charts/traffic-light/config/traffic-light-widget-config.component.ts
index b866dda32d..d5d48f22ba 100644
---
a/ui/src/app/data-explorer-shared/components/charts/traffic-light/config/traffic-light-widget-config.component.ts
+++
b/ui/src/app/data-explorer-shared/components/charts/traffic-light/config/traffic-light-widget-config.component.ts
@@ -23,7 +23,7 @@ import {
TrafficLightVisConfig,
TrafficLightWidgetModel,
} from '../model/traffic-light-widget.model';
-import { DataExplorerFieldProviderService } from
'../../../../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../services/chart-field-provider.service';
import { DataExplorerField } from '@streampipes/platform-services';
import { TranslateService } from '@ngx-translate/core';
@@ -40,7 +40,7 @@ export class TrafficLightWidgetConfigComponent extends
BaseWidgetConfig<
translateService: TranslateService = inject(TranslateService);
constructor(
widgetConfigurationService: ChartConfigurationService,
- fieldService: DataExplorerFieldProviderService,
+ fieldService: ChartFieldProviderService,
) {
super(widgetConfigurationService, fieldService);
}
diff --git
a/ui/src/app/data-explorer-shared/echarts-renderer/base-echarts-renderer.ts
b/ui/src/app/data-explorer-shared/echarts-renderer/base-echarts-renderer.ts
index 4a1d074d84..68697fc24d 100644
--- a/ui/src/app/data-explorer-shared/echarts-renderer/base-echarts-renderer.ts
+++ b/ui/src/app/data-explorer-shared/echarts-renderer/base-echarts-renderer.ts
@@ -28,7 +28,7 @@ import { EChartsOption } from 'echarts';
import { GeneratedDataset, WidgetSize } from '../models/dataset.model';
import { DataTransformOption } from 'echarts/types/src/data/helper/transform';
import { inject } from '@angular/core';
-import { DataExplorerFieldProviderService } from
'../services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../services/chart-field-provider.service';
import { EchartsAxisGeneratorService } from './echarts-axis-generator.service';
import { EchartsBasicOptionsGeneratorService } from
'./echarts-basic-options-generator.service';
import { EchartsDatasetGeneratorService } from
'./echarts-dataset-generator.service';
@@ -36,14 +36,14 @@ import { EchartsGridGeneratorService } from
'./echarts-grid-generator.service';
import { EchartsUtilsService } from './echarts-utils.service';
import { ToolboxFeatureOption } from
'echarts/types/src/component/toolbox/featureManager';
import { EchartsDatasetUtilsService } from './echarts-dataset-utils.service';
-import { DataExplorerColorizationService } from
'../services/data-explorer-colorization.service';
+import { ChartColorizationService } from
'../services/chart-colorization.service';
import { SpFieldUpdateService } from '../services/field-update.service';
import { FieldUpdateInfo } from '../models/field-update.model';
export abstract class SpBaseEchartsRenderer<T extends DataExplorerWidgetModel>
implements SpEchartsRenderer<T>
{
- protected fieldProvider = inject(DataExplorerFieldProviderService);
+ protected fieldProvider = inject(ChartFieldProviderService);
protected basicOptionsGeneratorService = inject(
EchartsBasicOptionsGeneratorService,
@@ -55,7 +55,7 @@ export abstract class SpBaseEchartsRenderer<T extends
DataExplorerWidgetModel>
protected datasetUtilsService = inject(EchartsDatasetUtilsService);
protected gridGeneratorService = inject(EchartsGridGeneratorService);
protected echartsUtilsService = inject(EchartsUtilsService);
- protected colorizationService = inject(DataExplorerColorizationService);
+ protected colorizationService = inject(ChartColorizationService);
protected fieldUpdateService = inject(SpFieldUpdateService);
public render(
diff --git
a/ui/src/app/data-explorer-shared/services/data-explorer-colorization.service.ts
b/ui/src/app/data-explorer-shared/services/chart-colorization.service.ts
similarity index 98%
rename from
ui/src/app/data-explorer-shared/services/data-explorer-colorization.service.ts
rename to ui/src/app/data-explorer-shared/services/chart-colorization.service.ts
index cd284f0760..35817bc944 100644
---
a/ui/src/app/data-explorer-shared/services/data-explorer-colorization.service.ts
+++ b/ui/src/app/data-explorer-shared/services/chart-colorization.service.ts
@@ -20,7 +20,7 @@ import { Injectable } from '@angular/core';
import { DataExplorerField } from '@streampipes/platform-services';
@Injectable({ providedIn: 'root' })
-export class DataExplorerColorizationService {
+export class ChartColorizationService {
makeColor(
chosenColor: Record<string, string>,
field: DataExplorerField,
diff --git
a/ui/src/app/data-explorer-shared/services/data-explorer-field-provider-service.ts
b/ui/src/app/data-explorer-shared/services/chart-field-provider.service.ts
similarity index 99%
rename from
ui/src/app/data-explorer-shared/services/data-explorer-field-provider-service.ts
rename to
ui/src/app/data-explorer-shared/services/chart-field-provider.service.ts
index baed06fb53..cde144b615 100644
---
a/ui/src/app/data-explorer-shared/services/data-explorer-field-provider-service.ts
+++ b/ui/src/app/data-explorer-shared/services/chart-field-provider.service.ts
@@ -30,7 +30,7 @@ import {
} from '@streampipes/platform-services';
@Injectable({ providedIn: 'root' })
-export class DataExplorerFieldProviderService {
+export class ChartFieldProviderService {
constructor() {}
public generateFieldLists(sourceConfigs: SourceConfig[]): FieldProvider {
diff --git
a/ui/src/app/data-explorer-shared/services/data-explorer-panel.can-deactivate.guard.ts
b/ui/src/app/data-explorer-shared/services/chart-panel-can-deactivate-guard.service.ts
similarity index 96%
rename from
ui/src/app/data-explorer-shared/services/data-explorer-panel.can-deactivate.guard.ts
rename to
ui/src/app/data-explorer-shared/services/chart-panel-can-deactivate-guard.service.ts
index e34eddeeb8..d7b12cfe97 100644
---
a/ui/src/app/data-explorer-shared/services/data-explorer-panel.can-deactivate.guard.ts
+++
b/ui/src/app/data-explorer-shared/services/chart-panel-can-deactivate-guard.service.ts
@@ -26,7 +26,7 @@ import { Observable } from 'rxjs';
import { SupportsUnsavedChangeDialog } from
'../models/dataview-dashboard.model';
@Injectable({ providedIn: 'root' })
-export class DataExplorerPanelCanDeactivateGuard {
+export class ChartPanelCanDeactivateGuard {
constructor(private router: Router) {}
canDeactivate(
component: SupportsUnsavedChangeDialog,
diff --git
a/ui/src/app/data-explorer-shared/services/data-explorer-routing.service.ts
b/ui/src/app/data-explorer-shared/services/chart-routing.service.ts
similarity index 98%
rename from
ui/src/app/data-explorer-shared/services/data-explorer-routing.service.ts
rename to ui/src/app/data-explorer-shared/services/chart-routing.service.ts
index 1dd02c2b15..e5a5c5dcfb 100644
--- a/ui/src/app/data-explorer-shared/services/data-explorer-routing.service.ts
+++ b/ui/src/app/data-explorer-shared/services/chart-routing.service.ts
@@ -20,7 +20,7 @@ import { Injectable } from '@angular/core';
import { Router } from '@angular/router';
@Injectable({ providedIn: 'root' })
-export class DataExplorerRoutingService {
+export class ChartRoutingService {
private dataViewPath = ['dataexplorer'];
private dashboardPath = ['dashboard'];
diff --git
a/ui/src/app/data-explorer-shared/services/data-explorer-shared.service.ts
b/ui/src/app/data-explorer-shared/services/chart-shared.service.ts
similarity index 99%
rename from
ui/src/app/data-explorer-shared/services/data-explorer-shared.service.ts
rename to ui/src/app/data-explorer-shared/services/chart-shared.service.ts
index da1c5215cd..17ad7c138f 100644
--- a/ui/src/app/data-explorer-shared/services/data-explorer-shared.service.ts
+++ b/ui/src/app/data-explorer-shared/services/chart-shared.service.ts
@@ -34,7 +34,7 @@ import { TranslateService } from '@ngx-translate/core';
import { ObservableGenerator } from '../models/dataview-dashboard.model';
@Injectable({ providedIn: 'root' })
-export class DataExplorerSharedService {
+export class ChartSharedService {
private dialogService = inject(DialogService);
private translateService = inject(TranslateService);
private dataViewQueryGeneratorService = inject(
diff --git
a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.ts
b/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.ts
index 0489ead3bc..e32fe3cc06 100644
---
a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.ts
+++
b/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.ts
@@ -46,9 +46,9 @@ import {
PanelType,
TimeSelectionService,
} from '@streampipes/shared-ui';
-import { DataExplorerRoutingService } from
'../../../data-explorer-shared/services/data-explorer-routing.service';
-import { DataExplorerSharedService } from
'../../../data-explorer-shared/services/data-explorer-shared.service';
-import { DataExplorerDetectChangesService } from
'../../services/data-explorer-detect-changes.service';
+import { ChartRoutingService } from
'../../../data-explorer-shared/services/chart-routing.service';
+import { ChartSharedService } from
'../../../data-explorer-shared/services/chart-shared.service';
+import { ChartDetectChangesService } from
'../../services/chart-detect-changes.service';
import { SupportsUnsavedChangeDialog } from
'../../../data-explorer-shared/models/dataview-dashboard.model';
import { Observable, of, Subscription } from 'rxjs';
import { MatDialog } from '@angular/material/dialog';
@@ -85,12 +85,12 @@ export class DataExplorerChartViewComponent
resizeEchartsService = inject(ResizeEchartsService);
- private dataExplorerSharedService = inject(DataExplorerSharedService);
- private detectChangesService = inject(DataExplorerDetectChangesService);
+ private dataExplorerSharedService = inject(ChartSharedService);
+ private detectChangesService = inject(ChartDetectChangesService);
private route = inject(ActivatedRoute);
private router = inject(Router);
private dialog = inject(MatDialog);
- private routingService = inject(DataExplorerRoutingService);
+ private routingService = inject(ChartRoutingService);
private dataViewService = inject(ChartService);
private timeSelectionService = inject(TimeSelectionService);
private translateService = inject(TranslateService);
diff --git
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts
index 8a1f195b13..9bcaac512d 100644
---
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts
+++
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts
@@ -37,7 +37,7 @@ import { ChartConfigurationService } from
'../../../../../data-explorer-shared/s
import { FieldSelectionPanelComponent } from
'./field-selection-panel/field-selection-panel.component';
import { GroupSelectionPanelComponent } from
'./group-selection-panel/group-selection-panel.component';
import { TableVisConfig } from
'../../../../../data-explorer-shared/components/charts/table/model/table-widget.model';
-import { DataExplorerFieldProviderService } from
'../../../../../data-explorer-shared/services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../../data-explorer-shared/services/chart-field-provider.service';
import { FieldProvider } from
'../../../../../data-explorer-shared/models/dataview-dashboard.model';
import { ChartTypeService } from
'../../../../../data-explorer-shared/services/chart-type.service';
@@ -78,7 +78,7 @@ export class DataExplorerWidgetDataSettingsComponent
implements OnInit {
constructor(
private datalakeRestService: DatalakeRestService,
private widgetConfigService: ChartConfigurationService,
- private fieldProviderService: DataExplorerFieldProviderService,
+ private fieldProviderService: ChartFieldProviderService,
private widgetTypeService: ChartTypeService,
private router: Router,
) {}
diff --git
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts
index 6aa810cee9..f26b43c27a 100644
---
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts
+++
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts
@@ -22,7 +22,7 @@ import {
FieldConfig,
SourceConfig,
} from '@streampipes/platform-services';
-import { DataExplorerFieldProviderService } from
'../../../../../../data-explorer-shared/services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../../../data-explorer-shared/services/chart-field-provider.service';
import { ChartConfigurationService } from
'../../../../../../data-explorer-shared/services/chart-configuration.service';
@Component({
@@ -42,7 +42,7 @@ export class FieldSelectionPanelComponent implements OnInit {
expandFields = false;
constructor(
- private fieldProvider: DataExplorerFieldProviderService,
+ private fieldProvider: ChartFieldProviderService,
private widgetConfigService: ChartConfigurationService,
) {}
diff --git
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
index e16dc42817..5462b01a45 100644
---
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
+++
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
@@ -23,7 +23,7 @@ import {
SourceConfig,
} from '@streampipes/platform-services';
import { ChartConfigurationService } from
'../../../../../../data-explorer-shared/services/chart-configuration.service';
-import { DataExplorerFieldProviderService } from
'../../../../../../data-explorer-shared/services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../../../data-explorer-shared/services/chart-field-provider.service';
@Component({
selector: 'sp-filter-selection-panel',
@@ -37,7 +37,7 @@ export class FilterSelectionPanelComponent implements OnInit {
constructor(
private widgetConfigService: ChartConfigurationService,
- private fieldProviderService: DataExplorerFieldProviderService,
+ private fieldProviderService: ChartFieldProviderService,
private dataLakeRestService: DatalakeRestService,
) {}
diff --git
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.ts
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.ts
index 89026080eb..4064d260b3 100644
---
a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.ts
+++
b/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, Input, OnInit } from '@angular/core';
-import { DataExplorerFieldProviderService } from
'../../../../../../data-explorer-shared/services/data-explorer-field-provider-service';
+import { ChartFieldProviderService } from
'../../../../../../data-explorer-shared/services/chart-field-provider.service';
import { ChartConfigurationService } from
'../../../../../../data-explorer-shared/services/chart-configuration.service';
import {
EventPropertyUnion,
@@ -34,7 +34,7 @@ export class GroupSelectionPanelComponent implements OnInit {
@Input() sourceConfig: SourceConfig;
constructor(
- private fieldProvider: DataExplorerFieldProviderService,
+ private fieldProvider: ChartFieldProviderService,
private widgetConfigService: ChartConfigurationService,
) {}
diff --git
a/ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts
b/ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts
index 4ad6f5cd57..4fc974a78c 100644
---
a/ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts
+++
b/ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts
@@ -27,10 +27,10 @@ import {
DateFormatService,
SpAssetBrowserService,
} from '@streampipes/shared-ui';
-import { DataExplorerSharedService } from
'../../../../data-explorer-shared/services/data-explorer-shared.service';
+import { ChartSharedService } from
'../../../../data-explorer-shared/services/chart-shared.service';
import { MatDialog } from '@angular/material/dialog';
import { TranslateService } from '@ngx-translate/core';
-import { DataExplorerRoutingService } from
'../../../../data-explorer-shared/services/data-explorer-routing.service';
+import { ChartRoutingService } from
'../../../../data-explorer-shared/services/chart-routing.service';
import { Subscription } from 'rxjs';
@Component({
@@ -54,11 +54,11 @@ export class SpDataExplorerDataViewOverviewComponent
implements OnInit {
filteredCharts: DataExplorerWidgetModel[] = [];
private dataViewService = inject(ChartService);
- private dataExplorerDashboardService = inject(DataExplorerSharedService);
+ private dataExplorerDashboardService = inject(ChartSharedService);
private dialog = inject(MatDialog);
private translateService = inject(TranslateService);
private dateFormatService = inject(DateFormatService);
- private routingService = inject(DataExplorerRoutingService);
+ private routingService = inject(ChartRoutingService);
private assetFilterService = inject(SpAssetBrowserService);
assetFilter$: Subscription;
diff --git
a/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.ts
b/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.ts
index 915bfcfd82..d58dbc1731 100644
---
a/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.ts
+++
b/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.ts
@@ -23,7 +23,7 @@ import {
} from '@streampipes/shared-ui';
import { AuthService } from '../../../services/auth.service';
import { SpDataExplorerRoutes } from '../../data-explorer.routes';
-import { DataExplorerRoutingService } from
'../../../data-explorer-shared/services/data-explorer-routing.service';
+import { ChartRoutingService } from
'../../../data-explorer-shared/services/chart-routing.service';
import { SpDataExplorerDataViewOverviewComponent } from
'./data-explorer-overview-table/data-explorer-overview-table.component';
import { UserPrivilege } from '../../../_enums/user-privilege.enum';
import { Subscription } from 'rxjs';
@@ -42,7 +42,7 @@ export class DataExplorerOverviewComponent implements OnInit,
OnDestroy {
hasDataExplorerWritePrivileges = false;
private breadcrumbService = inject(SpBreadcrumbService);
- private routingService = inject(DataExplorerRoutingService);
+ private routingService = inject(ChartRoutingService);
private currentUserService = inject(CurrentUserService);
private authService = inject(AuthService);
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts
b/ui/src/app/data-explorer/data-explorer.module.ts
index ac4ab4fe07..87f584497f 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -46,7 +46,7 @@ import { DataExplorerVisualisationSettingsComponent } from
'./components/chart-v
import { GroupSelectionPanelComponent } from
'./components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component';
import { RouterModule } from '@angular/router';
import { SharedUiModule } from '@streampipes/shared-ui';
-import { DataExplorerPanelCanDeactivateGuard } from
'../data-explorer-shared/services/data-explorer-panel.can-deactivate.guard';
+import { ChartPanelCanDeactivateGuard } from
'../data-explorer-shared/services/chart-panel-can-deactivate-guard.service';
import { NgxEchartsModule } from 'ngx-echarts';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -151,7 +151,7 @@ import { AssetDialogComponent } from
'./dialog/asset-dialog.component';
{
path: 'chart/:id',
component: DataExplorerChartViewComponent,
- canDeactivate: [DataExplorerPanelCanDeactivateGuard],
+ canDeactivate: [ChartPanelCanDeactivateGuard],
},
],
},
diff --git
a/ui/src/app/data-explorer/services/data-explorer-detect-changes.service.ts
b/ui/src/app/data-explorer/services/chart-detect-changes.service.ts
similarity index 98%
rename from
ui/src/app/data-explorer/services/data-explorer-detect-changes.service.ts
rename to ui/src/app/data-explorer/services/chart-detect-changes.service.ts
index bf3631205d..7ee58f650a 100644
--- a/ui/src/app/data-explorer/services/data-explorer-detect-changes.service.ts
+++ b/ui/src/app/data-explorer/services/chart-detect-changes.service.ts
@@ -24,7 +24,7 @@ import {
} from '@streampipes/platform-services';
@Injectable({ providedIn: 'root' })
-export class DataExplorerDetectChangesService {
+export class ChartDetectChangesService {
constructor() {}
shouldShowConfirm<T extends Dashboard | DataExplorerWidgetModel>(
