This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch
4021-rename-ui-folders-of-data-explorer-to-chart
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/4021-rename-ui-folders-of-data-explorer-to-chart by this push:
new f456ecaf6c refactor(#4021): Rename chart container and chart registry
f456ecaf6c is described below
commit f456ecaf6c5813e32d0e0e3fc8e4e1a98e04a3e9
Author: Philipp Zehnder <[email protected]>
AuthorDate: Thu Dec 4 13:47:43 2025 +0100
refactor(#4021): Rename chart container and chart registry
---
ui/src/app/chart-shared/chart-shared.module.ts | 6 +++---
...ntainer.component.html => chart-container.component.html} | 0
...ntainer.component.scss => chart-container.component.scss} | 0
...t-container.component.ts => chart-container.component.ts} | 12 ++++++------
.../charts/base/base-data-explorer-widget.directive.ts | 4 ++--
...-explorer-chart-registry.ts => chart-registry.service.ts} | 2 +-
.../components/chart-view/abstract-chart-view.directive.ts | 4 ++--
.../chart-view/grid-view/dashboard-grid-view.component.html | 4 ++--
.../slide-view/dashboard-slide-view.component.html | 4 ++--
.../chart-selection/chart-preview/chart-preview.component.ts | 4 ++--
.../chart-view/data-explorer-chart-view.component.html | 4 ++--
.../data-explorer-widget-appearance-settings.component.ts | 4 ++--
.../data-explorer-visualisation-settings.component.ts | 4 ++--
13 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/ui/src/app/chart-shared/chart-shared.module.ts
b/ui/src/app/chart-shared/chart-shared.module.ts
index c0155e5df8..59f8270c74 100644
--- a/ui/src/app/chart-shared/chart-shared.module.ts
+++ b/ui/src/app/chart-shared/chart-shared.module.ts
@@ -57,7 +57,7 @@ import { MatChipsModule } from '@angular/material/chips';
import { PlatformServicesModule } from '@streampipes/platform-services';
import { SharedUiModule } from '@streampipes/shared-ui';
import { NgxEchartsModule } from 'ngx-echarts';
-import { DataExplorerChartContainerComponent } from
'./components/chart-container/data-explorer-chart-container.component';
+import { ChartContainerComponent } from
'./components/chart-container/chart-container.component';
import { CorrelationWidgetConfigComponent } from
'./components/charts/correlation-chart/config/correlation-chart-widget-config.component';
import { GaugeWidgetConfigComponent } from
'./components/charts/gauge/config/gauge-widget-config.component';
import { ImageWidgetComponent } from
'./components/charts/image/image-widget.component';
@@ -146,7 +146,7 @@ import { ColorMappingOptionsConfigComponent } from
'./components/chart-config/co
NgxEchartsModule.forChild(),
],
declarations: [
- DataExplorerChartContainerComponent,
+ ChartContainerComponent,
CorrelationWidgetConfigComponent,
GaugeWidgetConfigComponent,
ImageWidgetComponent,
@@ -186,7 +186,7 @@ import { ColorMappingOptionsConfigComponent } from
'./components/chart-config/co
SpDataZoomConfigComponent,
ColorMappingOptionsConfigComponent,
],
- exports: [DataExplorerChartContainerComponent],
+ exports: [ChartContainerComponent],
})
export class ChartSharedModule {
constructor() {}
diff --git
a/ui/src/app/chart-shared/components/chart-container/data-explorer-chart-container.component.html
b/ui/src/app/chart-shared/components/chart-container/chart-container.component.html
similarity index 100%
rename from
ui/src/app/chart-shared/components/chart-container/data-explorer-chart-container.component.html
rename to
ui/src/app/chart-shared/components/chart-container/chart-container.component.html
diff --git
a/ui/src/app/chart-shared/components/chart-container/data-explorer-chart-container.component.scss
b/ui/src/app/chart-shared/components/chart-container/chart-container.component.scss
similarity index 100%
rename from
ui/src/app/chart-shared/components/chart-container/data-explorer-chart-container.component.scss
rename to
ui/src/app/chart-shared/components/chart-container/chart-container.component.scss
diff --git
a/ui/src/app/chart-shared/components/chart-container/data-explorer-chart-container.component.ts
b/ui/src/app/chart-shared/components/chart-container/chart-container.component.ts
similarity index 97%
rename from
ui/src/app/chart-shared/components/chart-container/data-explorer-chart-container.component.ts
rename to
ui/src/app/chart-shared/components/chart-container/chart-container.component.ts
index 1009b2037a..88b7142b8d 100644
---
a/ui/src/app/chart-shared/components/chart-container/data-explorer-chart-container.component.ts
+++
b/ui/src/app/chart-shared/components/chart-container/chart-container.component.ts
@@ -43,7 +43,7 @@ import {
} from '@streampipes/platform-services';
import { interval, Subscription } from 'rxjs';
import { takeWhile } from 'rxjs/operators';
-import { DataExplorerChartRegistry } from
'../../registry/data-explorer-chart-registry';
+import { ChartRegistry } from '../../registry/chart-registry.service';
import { ChartDirective } from './chart.directive';
import { ChartTypeService } from '../../services/chart-type.service';
import { AuthService } from '../../../services/auth.service';
@@ -63,12 +63,12 @@ import { MatMenuTrigger } from '@angular/material/menu';
import { ResizeService } from '../../services/resize.service';
@Component({
- selector: 'sp-data-explorer-chart-container',
- templateUrl: './data-explorer-chart-container.component.html',
- styleUrls: ['./data-explorer-chart-container.component.scss'],
+ selector: 'sp-chart-container',
+ templateUrl: './chart-container.component.html',
+ styleUrls: ['./chart-container.component.scss'],
standalone: false,
})
-export class DataExplorerChartContainerComponent
+export class ChartContainerComponent
implements OnInit, OnDestroy, OnChanges, AfterViewInit
{
@ViewChild('menuTrigger') menu: MatMenuTrigger;
@@ -150,7 +150,7 @@ export class DataExplorerChartContainerComponent
@ViewChild(ChartDirective, { static: true }) widgetHost!: ChartDirective;
constructor(
- private chartRegistryService: DataExplorerChartRegistry,
+ private chartRegistryService: ChartRegistry,
private dashboardService: ChartSharedService,
private componentFactoryResolver: ComponentFactoryResolver,
private widgetTypeService: ChartTypeService,
diff --git
a/ui/src/app/chart-shared/components/charts/base/base-data-explorer-widget.directive.ts
b/ui/src/app/chart-shared/components/charts/base/base-data-explorer-widget.directive.ts
index c7c4cc0dd7..ef6a4f5567 100644
---
a/ui/src/app/chart-shared/components/charts/base/base-data-explorer-widget.directive.ts
+++
b/ui/src/app/chart-shared/components/charts/base/base-data-explorer-widget.directive.ts
@@ -44,7 +44,7 @@ import {
import { Observable, Subject, Subscription, zip } from 'rxjs';
import { ChartFieldProviderService } from
'../../../services/chart-field-provider.service';
import { catchError, switchMap } from 'rxjs/operators';
-import { DataExplorerChartRegistry } from
'../../../registry/data-explorer-chart-registry';
+import { ChartRegistry } from '../../../registry/chart-registry.service';
import { SpFieldUpdateService } from '../../../services/field-update.service';
import { TimeSelectionService } from '@streampipes/shared-ui';
import { WidgetSize } from '../../../models/dataset.model';
@@ -116,7 +116,7 @@ export abstract class BaseDataExplorerWidgetDirective<
protected widgetConfigurationService = inject(ChartConfigurationService);
protected resizeService = inject(ResizeService);
protected timeSelectionService = inject(TimeSelectionService);
- protected widgetRegistryService = inject(DataExplorerChartRegistry);
+ protected widgetRegistryService = inject(ChartRegistry);
protected fieldUpdateService = inject(SpFieldUpdateService);
public fieldService = inject(ChartFieldProviderService);
diff --git a/ui/src/app/chart-shared/registry/data-explorer-chart-registry.ts
b/ui/src/app/chart-shared/registry/chart-registry.service.ts
similarity index 99%
rename from ui/src/app/chart-shared/registry/data-explorer-chart-registry.ts
rename to ui/src/app/chart-shared/registry/chart-registry.service.ts
index 31d25983f2..111f9ca68f 100644
--- a/ui/src/app/chart-shared/registry/data-explorer-chart-registry.ts
+++ b/ui/src/app/chart-shared/registry/chart-registry.service.ts
@@ -62,7 +62,7 @@ import { StatusWidgetComponent } from
'../components/charts/status/status-widget
import { TranslateService } from '@ngx-translate/core';
@Injectable({ providedIn: 'root' })
-export class DataExplorerChartRegistry {
+export class ChartRegistry {
chartTypes: IWidget<any>[] = [];
constructor(
diff --git
a/ui/src/app/dashboard-shared/components/chart-view/abstract-chart-view.directive.ts
b/ui/src/app/dashboard-shared/components/chart-view/abstract-chart-view.directive.ts
index 01432fa3b5..25a9f59780 100644
---
a/ui/src/app/dashboard-shared/components/chart-view/abstract-chart-view.directive.ts
+++
b/ui/src/app/dashboard-shared/components/chart-view/abstract-chart-view.directive.ts
@@ -25,13 +25,13 @@ import {
DataLakeMeasure,
TimeSettings,
} from '@streampipes/platform-services';
-import { DataExplorerChartRegistry } from
'../../../chart-shared/registry/data-explorer-chart-registry';
+import { ChartRegistry } from
'../../../chart-shared/registry/chart-registry.service';
import { ObservableGenerator } from
'../../../chart-shared/models/dataview-dashboard.model';
@Directive()
export abstract class AbstractChartViewDirective {
protected dataViewDataExplorerService = inject(ChartService);
- protected widgetRegistryService = inject(DataExplorerChartRegistry);
+ protected widgetRegistryService = inject(ChartRegistry);
@Input()
dashboard: Dashboard;
diff --git
a/ui/src/app/dashboard-shared/components/chart-view/grid-view/dashboard-grid-view.component.html
b/ui/src/app/dashboard-shared/components/chart-view/grid-view/dashboard-grid-view.component.html
index 5929888514..2bb1a357c6 100644
---
a/ui/src/app/dashboard-shared/components/chart-view/grid-view/dashboard-grid-view.component.html
+++
b/ui/src/app/dashboard-shared/components/chart-view/grid-view/dashboard-grid-view.component.html
@@ -34,7 +34,7 @@
widgetsAvailable &&
configuredWidgets.has(item.dataViewElementId)
) {
- <sp-data-explorer-chart-container
+ <sp-chart-container
[timeSettings]="timeSettings"
[globalTimeEnabled]="
dashboard.dashboardGeneralSettings.globalTimeEnabled
@@ -53,7 +53,7 @@
[kioskMode]="kioskMode"
[gridMode]="true"
[widgetIndex]="i"
- ></sp-data-explorer-chart-container>
+ ></sp-chart-container>
}
</gridstack-item>
}
diff --git
a/ui/src/app/dashboard-shared/components/chart-view/slide-view/dashboard-slide-view.component.html
b/ui/src/app/dashboard-shared/components/chart-view/slide-view/dashboard-slide-view.component.html
index 2d35c6a182..9c9a907450 100644
---
a/ui/src/app/dashboard-shared/components/chart-view/slide-view/dashboard-slide-view.component.html
+++
b/ui/src/app/dashboard-shared/components/chart-view/slide-view/dashboard-slide-view.component.html
@@ -54,7 +54,7 @@
currentWidget &&
widgetsVisible
) {
- <sp-data-explorer-chart-container
+ <sp-chart-container
[timeSettings]="timeSettings"
[globalTimeEnabled]="
dashboard.dashboardGeneralSettings.globalTimeEnabled
@@ -68,7 +68,7 @@
[editMode]="editMode"
[gridMode]="false"
[widgetIndex]="i"
- ></sp-data-explorer-chart-container>
+ ></sp-chart-container>
}
</div>
</div>
diff --git
a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-preview/chart-preview.component.ts
b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-preview/chart-preview.component.ts
index e07f95111b..d5988e48c1 100644
---
a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-preview/chart-preview.component.ts
+++
b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-preview/chart-preview.component.ts
@@ -18,7 +18,7 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { DataExplorerWidgetModel } from '@streampipes/platform-services';
-import { DataExplorerChartRegistry } from
'../../../../../../chart-shared/registry/data-explorer-chart-registry';
+import { ChartRegistry } from
'../../../../../../chart-shared/registry/chart-registry.service';
@Component({
selector: 'sp-chart-preview',
@@ -35,7 +35,7 @@ export class ChartPreviewComponent implements OnInit {
@Output()
addChartEmitter: EventEmitter<string> = new EventEmitter<string>();
- constructor(private widgetRegistryService: DataExplorerChartRegistry) {}
+ constructor(private widgetRegistryService: ChartRegistry) {}
ngOnInit() {
this.widgetTypeLabel = this.widgetRegistryService.getChartTemplate(
diff --git
a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.html
b/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.html
index 59931c9164..54831a2eb1 100644
---
a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.html
+++
b/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.html
@@ -76,7 +76,7 @@
dataView &&
dataView.dataConfig?.sourceConfigs?.length > 0
) {
- <sp-data-explorer-chart-container
+ <sp-chart-container
fxFlex
[dataViewMode]="true"
[editMode]="editMode"
@@ -89,7 +89,7 @@
"
(startEditModeEmitter)="editDataView()"
>
- </sp-data-explorer-chart-container>
+ </sp-chart-container>
}
</div>
</mat-drawer-content>
diff --git
a/ui/src/app/data-explorer/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
b/ui/src/app/data-explorer/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
index e09d216c65..985589e6f2 100644
---
a/ui/src/app/data-explorer/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
+++
b/ui/src/app/data-explorer/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
@@ -20,7 +20,7 @@ import { Component, Input, OnDestroy, OnInit } from
'@angular/core';
import { ChartConfigurationService } from
'../../../../../chart-shared/services/chart-configuration.service';
import { DataExplorerWidgetModel } from '@streampipes/platform-services';
import { ChartTypeService } from
'../../../../../chart-shared/services/chart-type.service';
-import { DataExplorerChartRegistry } from
'../../../../../chart-shared/registry/data-explorer-chart-registry';
+import { ChartRegistry } from
'../../../../../chart-shared/registry/chart-registry.service';
import { Subscription } from 'rxjs';
@Component({
@@ -55,7 +55,7 @@ export class DataExplorerWidgetAppearanceSettingsComponent
constructor(
private widgetTypeService: ChartTypeService,
- private widgetRegistryService: DataExplorerChartRegistry,
+ private widgetRegistryService: ChartRegistry,
private widgetConfigurationService: ChartConfigurationService,
) {}
diff --git
a/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts
b/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts
index b0bd2043ed..ff295c05d4 100644
---
a/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts
+++
b/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts
@@ -27,7 +27,7 @@ import { DataExplorerWidgetModel } from
'@streampipes/platform-services';
import { ChartTypeService } from
'../../../../../chart-shared/services/chart-type.service';
import { MatSelectChange } from '@angular/material/select';
import { IWidget } from
'../../../../../chart-shared/models/dataview-dashboard.model';
-import { DataExplorerChartRegistry } from
'../../../../../chart-shared/registry/data-explorer-chart-registry';
+import { ChartRegistry } from
'../../../../../chart-shared/registry/chart-registry.service';
@Component({
selector: 'sp-explorer-visualisation-settings',
@@ -42,7 +42,7 @@ export class DataExplorerVisualisationSettingsComponent
constructor(
private widgetTypeService: ChartTypeService,
- private widgetRegistryService: DataExplorerChartRegistry,
+ private widgetRegistryService: ChartRegistry,
) {}
availableWidgets: IWidget<any>[];
