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
commit f91527a5cbf3bfda0f925d36008d623183bda76a Author: Philipp Zehnder <[email protected]> AuthorDate: Thu Dec 4 14:46:05 2025 +0100 refactor(#4021): Rename chart configuration components --- ui/src/app/chart/chart.module.ts | 18 +++++++++--------- .../chart-overview-table.component.ts | 2 +- .../components/chart-view/chart-view.component.html | 4 ++-- ...t.html => chart-appearance-settings.component.html} | 0 ...t.scss => chart-appearance-settings.component.scss} | 0 ...onent.ts => chart-appearance-settings.component.ts} | 10 ++++------ ...ponent.html => chart-designer-panel.component.html} | 12 ++++++------ ...ponent.scss => chart-designer-panel.component.scss} | 0 ....component.ts => chart-designer-panel.component.ts} | 16 +++++++--------- ...mponent.html => chart-data-settings.component.html} | 0 ...mponent.scss => chart-data-settings.component.scss} | 0 ...s.component.ts => chart-data-settings.component.ts} | 8 ++++---- ...tml => chart-visualisation-settings.component.html} | 0 ...css => chart-visualisation-settings.component.scss} | 0 ...nt.ts => chart-visualisation-settings.component.ts} | 10 ++++------ .../chart-selection-panel.component.ts | 2 +- 16 files changed, 38 insertions(+), 44 deletions(-) diff --git a/ui/src/app/chart/chart.module.ts b/ui/src/app/chart/chart.module.ts index 123984ce01..3f0a8477c7 100644 --- a/ui/src/app/chart/chart.module.ts +++ b/ui/src/app/chart/chart.module.ts @@ -34,13 +34,13 @@ import { PlatformServicesModule } from '@streampipes/platform-services'; import { CoreUiModule } from '../core-ui/core-ui.module'; import { ChartOverviewComponent } from './components/chart-overview/chart-overview.component'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { DataExplorerDesignerPanelComponent } from './components/chart-view/designer-panel/data-explorer-designer-panel.component'; -import { DataExplorerWidgetAppearanceSettingsComponent } from './components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component'; -import { DataExplorerWidgetDataSettingsComponent } from './components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component'; +import { ChartDesignerPanelComponent } from './components/chart-view/designer-panel/chart-designer-panel.component'; +import { ChartAppearanceSettingsComponent } from './components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component'; +import { ChartDataSettingsComponent } from './components/chart-view/designer-panel/data-settings/chart-data-settings.component'; import { FieldSelectionPanelComponent } from './components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component'; import { FieldSelectionComponent } from './components/chart-view/designer-panel/data-settings/field-selection/field-selection.component'; import { FilterSelectionPanelComponent } from './components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component'; -import { DataExplorerVisualisationSettingsComponent } from './components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component'; +import { ChartVisualisationSettingsComponent } from './components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component'; 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'; @@ -160,18 +160,18 @@ import { AssetDialogComponent } from './dialog/asset-dialog.component'; declarations: [ AggregateConfigurationComponent, ChartOverviewComponent, - DataExplorerDesignerPanelComponent, - DataExplorerWidgetAppearanceSettingsComponent, - DataExplorerWidgetDataSettingsComponent, + ChartDesignerPanelComponent, + ChartAppearanceSettingsComponent, + ChartDataSettingsComponent, ChartViewComponent, ChartViewToolbarComponent, FieldSelectionPanelComponent, FieldSelectionComponent, FilterSelectionPanelComponent, FilterSelectionPanelRowComponent, - DataExplorerVisualisationSettingsComponent, + ChartVisualisationSettingsComponent, GroupSelectionPanelComponent, - DataExplorerVisualisationSettingsComponent, + ChartVisualisationSettingsComponent, OrderSelectionPanelComponent, ChartOverviewTableComponent, FilterSelectionPanelRowPropertySelectionComponent, diff --git a/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts b/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts index d4b2731347..cb9b5547ea 100644 --- a/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts +++ b/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts @@ -37,7 +37,7 @@ import { MatSort } from '@angular/material/sort'; @Component({ selector: 'sp-data-explorer-overview-table', templateUrl: './chart-overview-table.component.html', - styleUrls: ['../chart-overview-table.component.scss'], + styleUrls: ['../chart-overview.component.scss'], standalone: false, }) export class ChartOverviewTableComponent implements OnInit { diff --git a/ui/src/app/chart/components/chart-view/chart-view.component.html b/ui/src/app/chart/components/chart-view/chart-view.component.html index bdfaeed72b..359163a764 100644 --- a/ui/src/app/chart/components/chart-view/chart-view.component.html +++ b/ui/src/app/chart/components/chart-view/chart-view.component.html @@ -60,13 +60,13 @@ (widthChanged)="onWidthChanged($event)" > <div fxLayout="column" fxFlex="100"> - <sp-data-explorer-designer-panel + <sp-chart-designer-panel [currentlyConfiguredWidget]="dataView" [dataLakeMeasure]="dataLakeMeasure" (addWidgetEmitter)="onAddWidget($event)" fxFlex="100" > - </sp-data-explorer-designer-panel> + </sp-chart-designer-panel> </div> </sp-sidebar-resize> </mat-drawer> diff --git a/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html b/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component.html similarity index 100% rename from ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component.html diff --git a/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component.scss similarity index 100% rename from ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component.scss diff --git a/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component.ts similarity index 93% rename from ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component.ts index 985589e6f2..bd498a4f6e 100644 --- a/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts +++ b/ui/src/app/chart/components/chart-view/designer-panel/appearance-settings/chart-appearance-settings.component.ts @@ -24,14 +24,12 @@ import { ChartRegistry } from '../../../../../chart-shared/registry/chart-regist import { Subscription } from 'rxjs'; @Component({ - selector: 'sp-data-explorer-widget-appearance-settings', - templateUrl: './data-explorer-widget-appearance-settings.component.html', - styleUrls: ['./data-explorer-widget-appearance-settings.component.scss'], + selector: 'sp-chart-appearance-settings', + templateUrl: './chart-appearance-settings.component.html', + styleUrls: ['./chart-appearance-settings.component.scss'], standalone: false, }) -export class DataExplorerWidgetAppearanceSettingsComponent - implements OnInit, OnDestroy -{ +export class ChartAppearanceSettingsComponent implements OnInit, OnDestroy { @Input() currentlyConfiguredWidget: DataExplorerWidgetModel; backgroundOption: 'default' | 'custom' = 'default'; diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.html b/ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.html similarity index 93% rename from ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.html index c1f731217e..9a19a5208f 100644 --- a/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.html +++ b/ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.html @@ -32,7 +32,7 @@ [label]="'Data' | translate" > <div class="scroll-tab-content"> - <sp-data-explorer-widget-data-settings + <sp-chart-data-settings #dataSettingsPanel [(dataLakeMeasure)]="dataLakeMeasure" [dataConfig]=" @@ -45,7 +45,7 @@ [widgetId]="currentlyConfiguredWidget.elementId" (createWidgetEmitter)="createNewWidget()" > - </sp-data-explorer-widget-data-settings> + </sp-chart-data-settings> </div> </mat-tab> <mat-tab @@ -60,14 +60,14 @@ > <div class="scroll-tab-content"> @if (currentlyConfiguredWidget.widgetType) { - <sp-explorer-visualisation-settings + <sp-chart-visualisation-settings fxFlex="100" fxLayout="column" [currentlyConfiguredWidget]=" currentlyConfiguredWidget " > - </sp-explorer-visualisation-settings> + </sp-chart-visualisation-settings> } </div> </mat-tab> @@ -76,14 +76,14 @@ [label]="'Appearance' | translate" > <div class="scroll-tab-content"> - <sp-data-explorer-widget-appearance-settings + <sp-chart-appearance-settings fxFlex="100" fxLayout="column" [currentlyConfiguredWidget]=" currentlyConfiguredWidget " > - </sp-data-explorer-widget-appearance-settings> + </sp-chart-appearance-settings> </div> </mat-tab> </mat-tab-group> diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.scss similarity index 100% rename from ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.scss diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.ts similarity index 81% rename from ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.ts index 942d2e87c1..c3de7b6781 100644 --- a/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.ts +++ b/ui/src/app/chart/components/chart-view/designer-panel/chart-designer-panel.component.ts @@ -28,15 +28,15 @@ import { DataLakeMeasure, } from '@streampipes/platform-services'; import { Tuple2 } from '../../../../core-model/base/Tuple2'; -import { DataExplorerWidgetDataSettingsComponent } from './data-settings/data-explorer-widget-data-settings.component'; +import { ChartDataSettingsComponent } from './data-settings/chart-data-settings.component'; @Component({ - selector: 'sp-data-explorer-designer-panel', - templateUrl: './data-explorer-designer-panel.component.html', - styleUrls: ['./data-explorer-designer-panel.component.scss'], + selector: 'sp-chart-designer-panel', + templateUrl: './chart-designer-panel.component.html', + styleUrls: ['./chart-designer-panel.component.scss'], standalone: false, }) -export class DataExplorerDesignerPanelComponent { +export class ChartDesignerPanelComponent { @Input() currentlyConfiguredWidget: DataExplorerWidgetModel; @Input() dataLakeMeasure: DataLakeMeasure; @Input() newWidgetMode = false; @@ -49,7 +49,7 @@ export class DataExplorerDesignerPanelComponent { selectedIndex = 0; - dataSettingsPanel: DataExplorerWidgetDataSettingsComponent; + dataSettingsPanel: ChartDataSettingsComponent; selectOptionsPanel(index: number) { this.selectedIndex = index; @@ -76,9 +76,7 @@ export class DataExplorerDesignerPanelComponent { } @ViewChild('dataSettingsPanel') - public set content( - dataSettingsPanel: DataExplorerWidgetDataSettingsComponent, - ) { + public set content(dataSettingsPanel: ChartDataSettingsComponent) { this.dataSettingsPanel = dataSettingsPanel; } } diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.html similarity index 100% rename from ui/src/app/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.html diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.scss similarity index 100% rename from ui/src/app/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.scss diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.ts similarity index 97% rename from ui/src/app/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.ts index 9d639604b8..2e67e0f6ea 100644 --- a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts +++ b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.ts @@ -42,12 +42,12 @@ import { FieldProvider } from '../../../../../chart-shared/models/dataview-dashb import { ChartTypeService } from '../../../../../chart-shared/services/chart-type.service'; @Component({ - selector: 'sp-data-explorer-widget-data-settings', - templateUrl: './data-explorer-widget-data-settings.component.html', - styleUrls: ['./data-explorer-widget-data-settings.component.scss'], + selector: 'sp-chart-data-settings', + templateUrl: './chart-data-settings.component.html', + styleUrls: ['./chart-data-settings.component.scss'], standalone: false, }) -export class DataExplorerWidgetDataSettingsComponent implements OnInit { +export class ChartDataSettingsComponent implements OnInit { @Input() dataConfig: DataExplorerDataConfig; @Input() dataLakeMeasure: DataLakeMeasure; @Input() newWidgetMode: boolean; diff --git a/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.html b/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component.html similarity index 100% rename from ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component.html diff --git a/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component.scss similarity index 100% rename from ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component.scss diff --git a/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component.ts similarity index 88% rename from ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component.ts index ff295c05d4..92ecc7bf0a 100644 --- a/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts +++ b/ui/src/app/chart/components/chart-view/designer-panel/visualisation-settings/chart-visualisation-settings.component.ts @@ -30,14 +30,12 @@ import { IWidget } from '../../../../../chart-shared/models/dataview-dashboard.m import { ChartRegistry } from '../../../../../chart-shared/registry/chart-registry.service'; @Component({ - selector: 'sp-explorer-visualisation-settings', - templateUrl: './data-explorer-visualisation-settings.component.html', - styleUrls: ['./data-explorer-visualisation-settings.component.scss'], + selector: 'sp-chart-visualisation-settings', + templateUrl: './chart-visualisation-settings.component.html', + styleUrls: ['./chart-visualisation-settings.component.scss'], standalone: false, }) -export class DataExplorerVisualisationSettingsComponent - implements OnInit, OnChanges -{ +export class ChartVisualisationSettingsComponent implements OnInit, OnChanges { @Input() currentlyConfiguredWidget: DataExplorerWidgetModel; constructor( diff --git a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection-panel.component.ts b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection-panel.component.ts index fdd330e32b..6f500ed9f1 100644 --- a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection-panel.component.ts +++ b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection-panel.component.ts @@ -23,7 +23,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; templateUrl: './chart-selection-panel.component.html', styleUrls: [ './chart-selection-panel.component.scss', - '../../../../chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss', + '../../../../chart/components/chart-view/designer-panel/chart-designer-panel.component.scss', ], standalone: false, })
