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 f5904fe0742cdba2b180fdb67d387e665fc058ee Author: Philipp Zehnder <[email protected]> AuthorDate: Thu Dec 4 14:28:07 2025 +0100 refactor(#4021): Rename module data explorer to chart --- ui/deployment/dev/config.yml | 2 +- ui/deployment/modules.yml | 18 +++++++++--------- .../app/chart-shared/services/chart-routing.service.ts | 17 +++++++++++++---- .../data-explorer.module.ts => chart/chart.module.ts} | 6 +++--- .../data-explorer.routes.ts => chart/chart.routes.ts} | 4 ++-- .../chart-view/data-explorer-chart-view.component.html | 2 +- .../chart-view/data-explorer-chart-view.component.scss | 0 .../chart-view/data-explorer-chart-view.component.ts | 2 +- ...-explorer-widget-appearance-settings.component.html | 0 ...-explorer-widget-appearance-settings.component.scss | 0 ...ta-explorer-widget-appearance-settings.component.ts | 0 .../data-explorer-designer-panel.component.html | 0 .../data-explorer-designer-panel.component.scss | 0 .../data-explorer-designer-panel.component.ts | 0 .../aggregate-configuration.component.html | 0 .../aggregate-configuration.component.scss | 0 .../aggregate-configuration.component.ts | 0 .../data-explorer-widget-data-settings.component.html | 0 .../data-explorer-widget-data-settings.component.scss | 0 .../data-explorer-widget-data-settings.component.ts | 0 .../field-selection-panel.component.html | 0 .../field-selection-panel.component.scss | 0 .../field-selection-panel.component.ts | 0 .../field-selection/field-selection.component.html | 0 .../field-selection/field-selection.component.scss | 0 .../field-selection/field-selection.component.ts | 0 .../escape-number-filter.service.ts | 0 .../filter-selection-panel-row.component.html | 0 .../filter-selection-panel-row.component.ts | 0 ...ection-panel-row-operation-selection.component.html | 0 ...election-panel-row-operation-selection.component.ts | 0 ...lection-panel-row-property-selection.component.html | 0 ...selection-panel-row-property-selection.component.ts | 0 ...lection-panel-row-value-autocomplete.component.html | 0 ...selection-panel-row-value-autocomplete.component.ts | 0 ...lter-selection-panel-row-value-input.component.html | 0 ...filter-selection-panel-row-value-input.component.ts | 0 .../filter-selection-panel.component.html | 0 .../filter-selection-panel.component.ts | 0 .../group-selection-panel.component.html | 0 .../group-selection-panel.component.ts | 0 .../order-selection-panel.component.html | 0 .../order-selection-panel.component.scss | 0 .../order-selection-panel.component.ts | 0 ...data-explorer-visualisation-settings.component.html | 0 ...data-explorer-visualisation-settings.component.scss | 0 .../data-explorer-visualisation-settings.component.ts | 0 .../data-explorer-chart-view-toolbar.component.html | 0 .../data-explorer-chart-view-toolbar.component.ts | 0 .../data-explorer-overview-table.component.html | 0 .../data-explorer-overview-table.component.ts | 2 +- .../overview/data-explorer-overview.component.html | 2 +- .../overview/data-explorer-overview.component.scss | 0 .../overview/data-explorer-overview.component.ts | 8 ++++---- .../dialog/asset-dialog.component.html | 0 .../dialog/asset-dialog.component.ts | 0 .../services/chart-detect-changes.service.ts | 0 .../dashboard-overview-table.component.ts | 2 +- .../chart-selection-panel.component.ts | 2 +- .../chart-selection/chart-selection.component.ts | 2 +- .../components/panel/dashboard-panel.component.ts | 8 ++------ 61 files changed, 41 insertions(+), 36 deletions(-) diff --git a/ui/deployment/dev/config.yml b/ui/deployment/dev/config.yml index 39676e6e0f..c3cc6ac96b 100644 --- a/ui/deployment/dev/config.yml +++ b/ui/deployment/dev/config.yml @@ -23,6 +23,6 @@ modules: - spPipelines - spConnect - spDashboard - - spDataExplorer + - spChart - spAssets - spConfiguration diff --git a/ui/deployment/modules.yml b/ui/deployment/modules.yml index 8c30a2c1d3..95624d1bc6 100644 --- a/ui/deployment/modules.yml +++ b/ui/deployment/modules.yml @@ -126,14 +126,14 @@ spDashboard: viewRoles: '[UserPrivilege.PRIVILEGE_READ_DASHBOARD, UserPrivilege.PRIVILEGE_WRITE_DASHBOARD]' createRoles: '[UserPrivilege.PRIVILEGE_WRITE_DASHBOARD]' category: 'visualization' -spDataExplorer: +spChart: componentImport: False - moduleName: 'DataExplorerModule' - component: 'DataExplorerComponent' - componentPath: './data-explorer/data-explorer.component' - path: './data-explorer/data-explorer.module' - link: 'dataexplorer' - url: '/dataexplorer' + moduleName: 'ChartModule' + component: 'ChartComponent' + componentPath: './chart/chart.component' + path: './chart/chart.module' + link: 'chart' + url: '/chart' title: 'Charts' description: 'The chart view lets you visually inspect historical data from your connected sources.' icon: 'query_stats' @@ -141,8 +141,8 @@ spDataExplorer: privileges: '[UserPrivilege.PRIVILEGE_READ_DATA_EXPLORER_VIEW, UserPrivilege.PRIVILEGE_WRITE_DATA_EXPLORER_VIEW]' showStatusBox: true statusBox: - link: "['dataexplorer']" - createLinks: "['dataexplorer']" + link: "['chart']" + createLinks: "['chart']" title: 'Charts' createTitle: 'New chart' dataFns: '[this.chartService.getAllCharts()]' diff --git a/ui/src/app/chart-shared/services/chart-routing.service.ts b/ui/src/app/chart-shared/services/chart-routing.service.ts index e5a5c5dcfb..d8346bdf97 100644 --- a/ui/src/app/chart-shared/services/chart-routing.service.ts +++ b/ui/src/app/chart-shared/services/chart-routing.service.ts @@ -21,13 +21,13 @@ import { Router } from '@angular/router'; @Injectable({ providedIn: 'root' }) export class ChartRoutingService { - private dataViewPath = ['dataexplorer']; + private chartPath = ['chart']; private dashboardPath = ['dashboard']; constructor(private router: Router) {} navigateToDataViewOverview(omitConfirm: boolean = false): void { - this.navigateToOverview(this.dataViewPath, omitConfirm); + this.navigateToOverview(this.chartPath, omitConfirm); } navigateToDashboardOverview(omitConfirm = false): void { @@ -38,12 +38,21 @@ export class ChartRoutingService { this.router.navigate(path, { state: { omitConfirm } }); } - navigateToDataView( + navigateToCreateChart( editMode: boolean, dataViewElementId?: string, newTab = false, ) { - const path = [...this.dataViewPath, 'chart']; + const path = [...this.chartPath, 'create']; + return this.navigate(editMode, path, dataViewElementId, newTab); + } + + navigateToChart( + editMode: boolean, + dataViewElementId?: string, + newTab = false, + ) { + const path = [...this.chartPath]; return this.navigate(editMode, path, dataViewElementId, newTab); } diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/chart/chart.module.ts similarity index 98% rename from ui/src/app/data-explorer/data-explorer.module.ts rename to ui/src/app/chart/chart.module.ts index a90beb5617..474cf711db 100644 --- a/ui/src/app/data-explorer/data-explorer.module.ts +++ b/ui/src/app/chart/chart.module.ts @@ -142,12 +142,12 @@ import { AssetDialogComponent } from './dialog/asset-dialog.component'; component: DataExplorerOverviewComponent, }, { - path: 'chart', + path: 'create', component: DataExplorerChartViewComponent, canDeactivate: [ChartPanelCanDeactivateGuard], }, { - path: 'chart/:id', + path: ':id', component: DataExplorerChartViewComponent, canDeactivate: [ChartPanelCanDeactivateGuard], }, @@ -182,6 +182,6 @@ import { AssetDialogComponent } from './dialog/asset-dialog.component'; ], exports: [], }) -export class DataExplorerModule { +export class ChartModule { constructor() {} } diff --git a/ui/src/app/data-explorer/data-explorer.routes.ts b/ui/src/app/chart/chart.routes.ts similarity index 93% rename from ui/src/app/data-explorer/data-explorer.routes.ts rename to ui/src/app/chart/chart.routes.ts index 4d4f08dc86..afa0d766fa 100644 --- a/ui/src/app/data-explorer/data-explorer.routes.ts +++ b/ui/src/app/chart/chart.routes.ts @@ -18,9 +18,9 @@ import { SpBreadcrumbItem } from '@streampipes/shared-ui'; -export class SpDataExplorerRoutes { +export class SpChartRoutes { static BASE: SpBreadcrumbItem = { label: 'Charts', - link: ['dataexplorer'], + link: ['chart'], }; } diff --git a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.html b/ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.html similarity index 98% rename from ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.html rename to ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.html index 54831a2eb1..d7a8242d4c 100644 --- a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.html +++ b/ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.html @@ -17,7 +17,7 @@ --> @if (dataViewLoaded) { - <sp-basic-view [backLinkTarget]="['dataexplorer']" [showBackLink]="true"> + <sp-basic-view [backLinkTarget]="['chart']" [showBackLink]="true"> <div nav fxFlex="100" diff --git a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.scss b/ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.scss similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.scss rename to ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.scss diff --git a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.ts b/ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.ts similarity index 99% rename from ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.ts rename to ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.ts index c64d9b104b..190f20ec94 100644 --- a/ui/src/app/data-explorer/components/chart-view/data-explorer-chart-view.component.ts +++ b/ui/src/app/chart/components/chart-view/data-explorer-chart-view.component.ts @@ -220,7 +220,7 @@ export class DataExplorerChartViewComponent } editDataView(): void { - this.routingService.navigateToDataView(true, this.dataView.elementId); + this.routingService.navigateToChart(true, this.dataView.elementId); } makeDefaultTimeSettings(): TimeSettings { diff --git a/ui/src/app/data-explorer/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/data-explorer-widget-appearance-settings.component.html similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-widget-appearance-settings.component.html diff --git a/ui/src/app/data-explorer/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/data-explorer-widget-appearance-settings.component.scss similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-widget-appearance-settings.component.scss 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/chart/components/chart-view/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-widget-appearance-settings.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-explorer-designer-panel.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-explorer-designer-panel.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-explorer-designer-panel.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-explorer-designer-panel.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.scss similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.scss diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/aggregate-configuration/aggregate-configuration.component.ts diff --git a/ui/src/app/data-explorer/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/data-explorer-widget-data-settings.component.html similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-widget-data-settings.component.html diff --git a/ui/src/app/data-explorer/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/data-explorer-widget-data-settings.component.scss similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-widget-data-settings.component.scss 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/chart/components/chart-view/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-widget-data-settings.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.scss similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.scss 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/chart/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.scss similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.scss diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/field-selection/field-selection.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/escape-number-filter.service.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/escape-number-filter.service.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/escape-number-filter.service.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/escape-number-filter.service.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/filter-selection-panel-row.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-operation-selection/filter-selection-panel-row-operation-selection.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-property-selection/filter-selection-panel-row-property-selection.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input-autocomplete/filter-selection-panel-row-value-autocomplete.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel-row/panel-row-value-input/filter-selection-panel-row-value-input.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.html 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/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.html 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/chart/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/group-selection-panel/group-selection-panel.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.html b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.html rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.scss b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.scss similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.scss rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.scss diff --git a/ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.ts rename to ui/src/app/chart/components/chart-view/designer-panel/data-settings/order-selection-panel/order-selection-panel.component.ts diff --git a/ui/src/app/data-explorer/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/data-explorer-visualisation-settings.component.html similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-visualisation-settings.component.html diff --git a/ui/src/app/data-explorer/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/data-explorer-visualisation-settings.component.scss similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-visualisation-settings.component.scss 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/chart/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.ts similarity index 100% rename from ui/src/app/data-explorer/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/data-explorer-visualisation-settings.component.ts diff --git a/ui/src/app/data-explorer/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.html b/ui/src/app/chart/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.html similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.html rename to ui/src/app/chart/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.html diff --git a/ui/src/app/data-explorer/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.ts b/ui/src/app/chart/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.ts similarity index 100% rename from ui/src/app/data-explorer/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.ts rename to ui/src/app/chart/components/chart-view/toolbar/data-explorer-chart-view-toolbar.component.ts diff --git a/ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.html b/ui/src/app/chart/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.html similarity index 100% rename from ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.html rename to ui/src/app/chart/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.html diff --git a/ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts b/ui/src/app/chart/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts similarity index 99% rename from ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts rename to ui/src/app/chart/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts index 804e19238f..1ae8992f92 100644 --- a/ui/src/app/data-explorer/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts +++ b/ui/src/app/chart/components/overview/data-explorer-overview-table/data-explorer-overview-table.component.ts @@ -101,7 +101,7 @@ export class SpDataExplorerDataViewOverviewComponent implements OnInit { } openDataView(dataView: DataExplorerWidgetModel, editMode: boolean): void { - this.routingService.navigateToDataView( + this.routingService.navigateToChart( editMode && this.hasDataExplorerWritePrivileges, dataView.elementId, ); diff --git a/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.html b/ui/src/app/chart/components/overview/data-explorer-overview.component.html similarity index 97% rename from ui/src/app/data-explorer/components/overview/data-explorer-overview.component.html rename to ui/src/app/chart/components/overview/data-explorer-overview.component.html index c718ca6c90..e4ee9d1afb 100644 --- a/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.html +++ b/ui/src/app/chart/components/overview/data-explorer-overview.component.html @@ -30,7 +30,7 @@ mat-flat-button color="accent" data-cy="open-new-data-view" - (click)="createNewDataView()" + (click)="createNewChart()" class="mr-10" > <i class="material-icons">add</i> diff --git a/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.scss b/ui/src/app/chart/components/overview/data-explorer-overview.component.scss similarity index 100% rename from ui/src/app/data-explorer/components/overview/data-explorer-overview.component.scss rename to ui/src/app/chart/components/overview/data-explorer-overview.component.scss diff --git a/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.ts b/ui/src/app/chart/components/overview/data-explorer-overview.component.ts similarity index 91% rename from ui/src/app/data-explorer/components/overview/data-explorer-overview.component.ts rename to ui/src/app/chart/components/overview/data-explorer-overview.component.ts index c9e7c16938..5bec5882f9 100644 --- a/ui/src/app/data-explorer/components/overview/data-explorer-overview.component.ts +++ b/ui/src/app/chart/components/overview/data-explorer-overview.component.ts @@ -22,7 +22,7 @@ import { SpBreadcrumbService, } from '@streampipes/shared-ui'; import { AuthService } from '../../../services/auth.service'; -import { SpDataExplorerRoutes } from '../../data-explorer.routes'; +import { SpChartRoutes } from '../../chart.routes'; import { ChartRoutingService } from '../../../chart-shared/services/chart-routing.service'; import { SpDataExplorerDataViewOverviewComponent } from './data-explorer-overview-table/data-explorer-overview-table.component'; import { UserPrivilege } from '../../../_enums/user-privilege.enum'; @@ -48,7 +48,7 @@ export class DataExplorerOverviewComponent implements OnInit, OnDestroy { ngOnInit(): void { this.breadcrumbService.updateBreadcrumb( - this.breadcrumbService.getRootLink(SpDataExplorerRoutes.BASE), + this.breadcrumbService.getRootLink(SpChartRoutes.BASE), ); this.auth$ = this.currentUserService.user$.subscribe(user => { this.hasDataExplorerWritePrivileges = this.authService.hasRole( @@ -57,8 +57,8 @@ export class DataExplorerOverviewComponent implements OnInit, OnDestroy { }); } - createNewDataView(): void { - this.routingService.navigateToDataView(true); + createNewChart(): void { + this.routingService.navigateToCreateChart(true); } ngOnDestroy() { diff --git a/ui/src/app/data-explorer/dialog/asset-dialog.component.html b/ui/src/app/chart/dialog/asset-dialog.component.html similarity index 100% rename from ui/src/app/data-explorer/dialog/asset-dialog.component.html rename to ui/src/app/chart/dialog/asset-dialog.component.html diff --git a/ui/src/app/data-explorer/dialog/asset-dialog.component.ts b/ui/src/app/chart/dialog/asset-dialog.component.ts similarity index 100% rename from ui/src/app/data-explorer/dialog/asset-dialog.component.ts rename to ui/src/app/chart/dialog/asset-dialog.component.ts diff --git a/ui/src/app/data-explorer/services/chart-detect-changes.service.ts b/ui/src/app/chart/services/chart-detect-changes.service.ts similarity index 100% rename from ui/src/app/data-explorer/services/chart-detect-changes.service.ts rename to ui/src/app/chart/services/chart-detect-changes.service.ts 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 fc0131331d..1797b612be 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 @@ -47,7 +47,7 @@ import { MatSort } from '@angular/material/sort'; selector: 'sp-dashboard-overview-table', templateUrl: './dashboard-overview-table.component.html', styleUrls: [ - '../../../../data-explorer/components/overview/data-explorer-overview.component.scss', + '../../../../chart/components/overview/data-explorer-overview.component.scss', ], standalone: false, }) 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 f3b68c48db..fdd330e32b 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', - '../../../../data-explorer/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss', + '../../../../chart/components/chart-view/designer-panel/data-explorer-designer-panel.component.scss', ], standalone: false, }) diff --git a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts index 76edaa1c7e..ee8f41b3a7 100644 --- a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts +++ b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts @@ -61,7 +61,7 @@ export class ChartSelectionComponent implements OnInit { } navigateToDataViewCreation(): void { - this.router.navigate(['dataexplorer', 'chart'], { + this.router.navigate(['chart', 'create'], { queryParams: { editMode: true }, state: { omitConfirm: true }, }); 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 93f4a9932b..13836caa29 100644 --- a/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts +++ b/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts @@ -47,7 +47,7 @@ import { MatDialog } from '@angular/material/dialog'; import { catchError, map, switchMap } from 'rxjs/operators'; import { SpDashboardRoutes } from '../../dashboard.routes'; import { ChartRoutingService } from '../../../chart-shared/services/chart-routing.service'; -import { ChartDetectChangesService } from '../../../data-explorer/services/chart-detect-changes.service'; +import { ChartDetectChangesService } from '../../../chart/services/chart-detect-changes.service'; import { SupportsUnsavedChangeDialog } from '../../../chart-shared/models/dataview-dashboard.model'; import { TranslateService } from '@ngx-translate/core'; import { DataExplorerDashboardService } from '../../../dashboard-shared/services/dashboard.service'; @@ -181,11 +181,7 @@ export class DashboardPanelComponent } startEditMode(widgetModel: DataExplorerWidgetModel) { - this.routingService.navigateToDataView( - true, - widgetModel.elementId, - true, - ); + this.routingService.navigateToChart(true, widgetModel.elementId, true); } removeChartFromDashboard(widgetIndex: number) {
