You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/06/08 11:51:37 UTC
[incubator-streampipes] 02/02: Rename date new explorer module
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/incubator-streampipes.git
commit eee210ca87acb620611eca6ff0d14899fc3b7d54
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Jun 8 13:51:08 2020 +0200
Rename date new explorer module
---
ui/deployment/dev/config.yml | 2 +-
ui/deployment/modules.yml | 16 ++++++++--------
.../core-ui/image/image-viewer/image-viewer.component.ts | 2 +-
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../components/datadownloadDialog/dataDownload.dialog.ts | 0
.../grid/data-explorer-dashboard-grid.component.css | 0
.../grid/data-explorer-dashboard-grid.component.html | 0
.../grid/data-explorer-dashboard-grid.component.ts | 0
.../data-explorer-dashboard-overview.component.css | 0
.../data-explorer-dashboard-overview.component.html | 0
.../data-explorer-dashboard-overview.component.ts | 0
.../panel/data-explorer-dashboard-panel.component.css | 0
.../panel/data-explorer-dashboard-panel.component.html | 0
.../panel/data-explorer-dashboard-panel.component.ts | 0
.../time-selector/timeRangeSelector.component.css | 0
.../time-selector/timeRangeSelector.component.html | 0
.../time-selector/timeRangeSelector.component.ts | 0
.../widget/data-explorer-dashboard-widget.component.css | 0
.../widget/data-explorer-dashboard-widget.component.html | 0
.../widget/data-explorer-dashboard-widget.component.ts | 0
.../components/widgets/base/base-config.ts | 0
.../components/widgets/base/base-data-explorer-widget.ts | 0
.../components/widgets/base/base-ngx-charts-widget.ts | 0
.../components/widgets/image/image-config.ts | 0
.../components/widgets/image/image-widget.component.css | 0
.../components/widgets/image/image-widget.component.html | 0
.../components/widgets/image/image-widget.component.ts | 0
.../components/widgets/line-chart/line-chart-config.ts | 0
.../widgets/line-chart/line-chart-widget.component.css | 0
.../widgets/line-chart/line-chart-widget.component.html | 0
.../widgets/line-chart/line-chart-widget.component.ts | 0
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 0
.../base/baseVisualisation.component.ts | 0
.../linechart/lineChart.component.css | 0
.../linechart/lineChart.component.html | 0
.../linechart/lineChart.component.ts | 0
.../explorer-visualisations/table/table.component.css | 0
.../explorer-visualisations/table/table.component.html | 0
.../explorer-visualisations/table/table.component.ts | 0
.../old-explorer-widget/old-explorer.component.html | 0
.../old-explorer-widget/old-explorer.component.ts | 0
.../widgets/old-explorer-widget/old-explorer.css | 0
.../components/widgets/table/table-config.ts | 0
.../components/widgets/table/table-widget.component.css | 0
.../components/widgets/table/table-widget.component.html | 0
.../components/widgets/table/table-widget.component.ts | 0
.../aggregate-configuration.component.css | 0
.../aggregate-configuration.component.html | 0
.../aggregate-configuration.component.ts | 0
.../load-data-spinner/load-data-spinner.component.css | 0
.../load-data-spinner/load-data-spinner.component.html | 0
.../load-data-spinner/load-data-spinner.component.ts | 0
.../utils/no-data/no-data-in-date-range.component.css | 0
.../utils/no-data/no-data-in-date-range.component.html | 0
.../utils/no-data/no-data-in-date-range.component.ts | 0
.../select-properties/select-properties.component.css | 0
.../select-properties/select-properties.component.html | 0
.../select-properties/select-properties.component.ts | 0
.../data-explorer.component.css} | 0
.../data-explorer.component.html} | 0
.../data-explorer.component.ts} | 8 ++++----
.../data-explorer.module.ts} | 14 +++++++-------
.../data-explorer-add-visualization-dialog.component.css | 0
...data-explorer-add-visualization-dialog.component.html | 0
.../data-explorer-add-visualization-dialog.component.ts | 0
.../data-explorer-edit-data-view-dialog.component.css | 0
.../data-explorer-edit-data-view-dialog.component.html | 0
.../data-explorer-edit-data-view-dialog.component.ts | 0
.../models/dataview-dashboard.model.ts | 0
.../models/multi-series.model.ts | 0
.../registry/data-explorer-widget-registry.ts | 0
.../registry/widget-config-builder.ts | 0
.../sdk/collected-schema-requirements.ts | 0
.../sdk/ep-requirements.ts | 0
.../sdk/extractor/static-property-extractor.ts | 0
.../sdk/matching/datatype-match.ts | 0
.../sdk/matching/domain-property-match.ts | 0
.../sdk/matching/mapping-property-generator.ts | 0
.../sdk/matching/primitive-property-match.ts | 0
.../sdk/matching/property-match.ts | 0
.../sdk/model/datatypes.ts | 0
.../sdk/model/vocabulary.ts | 0
.../sdk/schema-requirements-builder.ts | 0
.../services/data-lake.service.ts | 0
.../services/data-view-data-explorer.service.ts | 0
.../services/refresh-dashboard.service.ts | 0
.../services/resize.service.ts | 0
90 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ui/deployment/dev/config.yml b/ui/deployment/dev/config.yml
index c5c44a8..9f2edef 100644
--- a/ui/deployment/dev/config.yml
+++ b/ui/deployment/dev/config.yml
@@ -22,7 +22,7 @@ modules:
- spPipelines
- spConnect
- spDashboard
- - spDataExplorer2
+ - spDataExplorer
- spAppOverview
- spAdd
- spMyElements
diff --git a/ui/deployment/modules.yml b/ui/deployment/modules.yml
index 20e4158..6bd6dbd 100644
--- a/ui/deployment/modules.yml
+++ b/ui/deployment/modules.yml
@@ -141,18 +141,18 @@ spDashboard:
icon: 'editor:ic_insert_chart_24px'
homeImage: '/assets/img/home/configuration.png'
admin: false
-spDataExplorer2:
+spDataExplorer:
ng5: True
ng1_templateUrl: ''
ng1_controller: ''
- ng5_moduleName: 'DataExplorerV2Module'
- ng5_component: 'DataExplorerV2Component'
- ng5_componentPath: '../data-explorer-v2/data-explorer-v2.component'
- path: './data-explorer-v2/data-explorer-v2.module'
- link: 'streampipes.dataexplorerv2'
- url: '/dataexplorerv2'
+ ng5_moduleName: 'DataExplorerModule'
+ ng5_component: 'DataExplorerComponent'
+ ng5_componentPath: '../data-explorer/data-explorer.component'
+ path: './data-explorer/data-explorer.module'
+ link: 'streampipes.dataexplorer'
+ url: '/dataexplorer'
title: 'Data Explorer'
- description: 'data-explorer-v2'
+ description: 'data-explorer'
icon: 'action:ic_search_24px'
homeImage: '/assets/img/home/configuration.png'
admin: false
\ No newline at end of file
diff --git a/ui/src/app/core-ui/image/image-viewer/image-viewer.component.ts b/ui/src/app/core-ui/image/image-viewer/image-viewer.component.ts
index 4ac950d..16fa667 100644
--- a/ui/src/app/core-ui/image/image-viewer/image-viewer.component.ts
+++ b/ui/src/app/core-ui/image/image-viewer/image-viewer.component.ts
@@ -19,7 +19,7 @@ import { Component, OnInit } from '@angular/core';
import { DatalakeRestService } from '../../../core-services/datalake/datalake-rest.service';
import { Observable } from 'rxjs';
import { DataLakeMeasure } from '../../../core-model/datalake/DataLakeMeasure';
-import { DataViewDataExplorerService } from '../../../data-explorer-v2/services/data-view-data-explorer.service';
+import { DataViewDataExplorerService } from '../../../data-explorer/services/data-view-data-explorer.service';
import { TsonLdSerializerService } from '../../../platform-services/tsonld-serializer.service';
@Component({
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.css b/ui/src/app/data-explorer/components/datadownloadDialog/dataDownload.dialog.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.css
rename to ui/src/app/data-explorer/components/datadownloadDialog/dataDownload.dialog.css
diff --git a/ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.html b/ui/src/app/data-explorer/components/datadownloadDialog/dataDownload.dialog.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.html
rename to ui/src/app/data-explorer/components/datadownloadDialog/dataDownload.dialog.html
diff --git a/ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.ts b/ui/src/app/data-explorer/components/datadownloadDialog/dataDownload.dialog.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.ts
rename to ui/src/app/data-explorer/components/datadownloadDialog/dataDownload.dialog.ts
diff --git a/ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.css b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.css
rename to ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.css
diff --git a/ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.html b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.html
rename to ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
diff --git a/ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.ts b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.ts
rename to ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/overview/data-explorer-dashboard-overview.component.css b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/overview/data-explorer-dashboard-overview.component.css
rename to ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.css
diff --git a/ui/src/app/data-explorer-v2/components/overview/data-explorer-dashboard-overview.component.html b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/overview/data-explorer-dashboard-overview.component.html
rename to ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.html
diff --git a/ui/src/app/data-explorer-v2/components/overview/data-explorer-dashboard-overview.component.ts b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/overview/data-explorer-dashboard-overview.component.ts
rename to ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/panel/data-explorer-dashboard-panel.component.css b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/panel/data-explorer-dashboard-panel.component.css
rename to ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
diff --git a/ui/src/app/data-explorer-v2/components/panel/data-explorer-dashboard-panel.component.html b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/panel/data-explorer-dashboard-panel.component.html
rename to ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
diff --git a/ui/src/app/data-explorer-v2/components/panel/data-explorer-dashboard-panel.component.ts b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/panel/data-explorer-dashboard-panel.component.ts
rename to ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.css b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.css
rename to ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.css
diff --git a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.html b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.html
rename to ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
diff --git a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts
rename to ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widget/data-explorer-dashboard-widget.component.css b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widget/data-explorer-dashboard-widget.component.css
rename to ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widget/data-explorer-dashboard-widget.component.html b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widget/data-explorer-dashboard-widget.component.html
rename to ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widget/data-explorer-dashboard-widget.component.ts b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widget/data-explorer-dashboard-widget.component.ts
rename to ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/base/base-config.ts b/ui/src/app/data-explorer/components/widgets/base/base-config.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/base/base-config.ts
rename to ui/src/app/data-explorer/components/widgets/base/base-config.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts b/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
rename to ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/base/base-ngx-charts-widget.ts b/ui/src/app/data-explorer/components/widgets/base/base-ngx-charts-widget.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/base/base-ngx-charts-widget.ts
rename to ui/src/app/data-explorer/components/widgets/base/base-ngx-charts-widget.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/image/image-config.ts b/ui/src/app/data-explorer/components/widgets/image/image-config.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/image/image-config.ts
rename to ui/src/app/data-explorer/components/widgets/image/image-config.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/image/image-widget.component.css b/ui/src/app/data-explorer/components/widgets/image/image-widget.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/image/image-widget.component.css
rename to ui/src/app/data-explorer/components/widgets/image/image-widget.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/image/image-widget.component.html b/ui/src/app/data-explorer/components/widgets/image/image-widget.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/image/image-widget.component.html
rename to ui/src/app/data-explorer/components/widgets/image/image-widget.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/image/image-widget.component.ts b/ui/src/app/data-explorer/components/widgets/image/image-widget.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/image/image-widget.component.ts
rename to ui/src/app/data-explorer/components/widgets/image/image-widget.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-config.ts b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-config.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-config.ts
rename to ui/src/app/data-explorer/components/widgets/line-chart/line-chart-config.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.css b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.css
rename to ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
rename to ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
rename to ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.css b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.css
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.html b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.html
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.ts b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.ts
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.css b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.css
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.html b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.html
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.ts b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.ts
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.css b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.css
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.html b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.html
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.ts b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.ts
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/old-explorer.component.html b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/old-explorer.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/old-explorer.component.html
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/old-explorer.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/old-explorer.component.ts b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/old-explorer.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/old-explorer.component.ts
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/old-explorer.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/old-explorer.css b/ui/src/app/data-explorer/components/widgets/old-explorer-widget/old-explorer.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/old-explorer.css
rename to ui/src/app/data-explorer/components/widgets/old-explorer-widget/old-explorer.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/table/table-config.ts b/ui/src/app/data-explorer/components/widgets/table/table-config.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/table/table-config.ts
rename to ui/src/app/data-explorer/components/widgets/table/table-config.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.css b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.css
rename to ui/src/app/data-explorer/components/widgets/table/table-widget.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.html b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.html
rename to ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts
rename to ui/src/app/data-explorer/components/widgets/table/table-widget.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.css b/ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.css
rename to ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html b/ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html
rename to ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.ts b/ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.ts
rename to ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.css b/ui/src/app/data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.css
rename to ui/src/app/data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.html b/ui/src/app/data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.html
rename to ui/src/app/data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.ts b/ui/src/app/data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.ts
rename to ui/src/app/data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.css b/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.css
rename to ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.html b/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.html
rename to ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.ts b/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.ts
rename to ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.ts
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.css b/ui/src/app/data-explorer/components/widgets/utils/select-properties/select-properties.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.css
rename to ui/src/app/data-explorer/components/widgets/utils/select-properties/select-properties.component.css
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.html b/ui/src/app/data-explorer/components/widgets/utils/select-properties/select-properties.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.html
rename to ui/src/app/data-explorer/components/widgets/utils/select-properties/select-properties.component.html
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.ts b/ui/src/app/data-explorer/components/widgets/utils/select-properties/select-properties.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.ts
rename to ui/src/app/data-explorer/components/widgets/utils/select-properties/select-properties.component.ts
diff --git a/ui/src/app/data-explorer-v2/data-explorer-v2.component.css b/ui/src/app/data-explorer/data-explorer.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/data-explorer-v2.component.css
rename to ui/src/app/data-explorer/data-explorer.component.css
diff --git a/ui/src/app/data-explorer-v2/data-explorer-v2.component.html b/ui/src/app/data-explorer/data-explorer.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/data-explorer-v2.component.html
rename to ui/src/app/data-explorer/data-explorer.component.html
diff --git a/ui/src/app/data-explorer-v2/data-explorer-v2.component.ts b/ui/src/app/data-explorer/data-explorer.component.ts
similarity index 94%
rename from ui/src/app/data-explorer-v2/data-explorer-v2.component.ts
rename to ui/src/app/data-explorer/data-explorer.component.ts
index 1b52ccb..a4f22c6 100644
--- a/ui/src/app/data-explorer-v2/data-explorer-v2.component.ts
+++ b/ui/src/app/data-explorer/data-explorer.component.ts
@@ -23,11 +23,11 @@ import { DataViewDataExplorerService } from './services/data-view-data-explorer.
import { RefreshDashboardService } from './services/refresh-dashboard.service';
@Component({
- selector: 'sp-data-explorer-v2',
- templateUrl: './data-explorer-v2.component.html',
- styleUrls: ['./data-explorer-v2.component.css']
+ selector: 'sp-data-explorer',
+ templateUrl: './data-explorer.component.html',
+ styleUrls: ['./data-explorer.component.css']
})
-export class DataExplorerV2Component implements OnInit {
+export class DataExplorerComponent implements OnInit {
selectedDataViewDashboard: IDataViewDashboard;
selectedIndex = 0;
diff --git a/ui/src/app/data-explorer-v2/data-explorer-v2.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
similarity index 97%
rename from ui/src/app/data-explorer-v2/data-explorer-v2.module.ts
rename to ui/src/app/data-explorer/data-explorer.module.ts
index 13d713d..11ac4ab 100644
--- a/ui/src/app/data-explorer-v2/data-explorer-v2.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -36,6 +36,7 @@ import { PlotlyViaWindowModule } from 'angular-plotly.js';
import { DynamicModule } from 'ng-dynamic-component';
import { ColorPickerModule } from 'ngx-color-picker';
import { ConnectModule } from '../connect/connect.module';
+import { DatalakeRestService } from '../core-services/datalake/datalake-rest.service';
import { SemanticTypeUtilsService } from '../core-services/semantic-type/semantic-type-utils.service';
import { SharedDatalakeRestService } from '../core-services/shared/shared-dashboard.service';
import { CoreUiModule } from '../core-ui/core-ui.module';
@@ -51,18 +52,17 @@ import { DataExplorerDashboardWidgetComponent } from './components/widget/data-e
import { ImageWidgetComponent } from './components/widgets/image/image-widget.component';
import { LineChartWidgetComponent } from './components/widgets/line-chart/line-chart-widget.component';
import { TableWidgetComponent } from './components/widgets/table/table-widget.component';
+import { AggregateConfigurationComponent } from './components/widgets/utils/aggregate-configuration/aggregate-configuration.component';
import { LoadDataSpinnerComponent } from './components/widgets/utils/load-data-spinner/load-data-spinner.component';
import { NoDataInDateRangeComponent } from './components/widgets/utils/no-data/no-data-in-date-range.component';
import { SelectPropertiesComponent } from './components/widgets/utils/select-properties/select-properties.component';
-import { DataExplorerV2Component } from './data-explorer-v2.component';
+import { DataExplorerComponent } from './data-explorer.component';
import { DataExplorerAddVisualizationDialogComponent } from './dialogs/add-widget/data-explorer-add-visualization-dialog.component';
import { DataExplorerEditDataViewDialogComponent } from './dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component';
import { DataLakeService } from './services/data-lake.service';
import { DataViewDataExplorerService } from './services/data-view-data-explorer.service';
import { RefreshDashboardService } from './services/refresh-dashboard.service';
import { ResizeService } from './services/resize.service';
-import { AggregateConfigurationComponent } from './components/widgets/utils/aggregate-configuration/aggregate-configuration.component';
-import { DatalakeRestService } from '../core-services/datalake/datalake-rest.service';
const dashboardWidgets = [
@@ -110,7 +110,7 @@ export const MY_NATIVE_FORMATS = {
LabelingToolModule
],
declarations: [
- DataExplorerV2Component,
+ DataExplorerComponent,
DataExplorerDashboardGridComponent,
DataExplorerDashboardOverviewComponent,
DataExplorerDashboardPanelComponent,
@@ -146,16 +146,16 @@ export const MY_NATIVE_FORMATS = {
}
],
exports: [
- DataExplorerV2Component
+ DataExplorerComponent
],
entryComponents: [
- DataExplorerV2Component,
+ DataExplorerComponent,
DataExplorerAddVisualizationDialogComponent,
DataDownloadDialog,
DataExplorerEditDataViewDialogComponent
]
})
-export class DataExplorerV2Module {
+export class DataExplorerModule {
constructor() {
}
diff --git a/ui/src/app/data-explorer-v2/dialogs/add-widget/data-explorer-add-visualization-dialog.component.css b/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/dialogs/add-widget/data-explorer-add-visualization-dialog.component.css
rename to ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.css
diff --git a/ui/src/app/data-explorer-v2/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html b/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html
rename to ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html
diff --git a/ui/src/app/data-explorer-v2/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts b/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts
rename to ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts
diff --git a/ui/src/app/data-explorer-v2/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.css b/ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.css
similarity index 100%
rename from ui/src/app/data-explorer-v2/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.css
rename to ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.css
diff --git a/ui/src/app/data-explorer-v2/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.html b/ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.html
similarity index 100%
rename from ui/src/app/data-explorer-v2/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.html
rename to ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.html
diff --git a/ui/src/app/data-explorer-v2/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts b/ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts
rename to ui/src/app/data-explorer/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts
diff --git a/ui/src/app/data-explorer-v2/models/dataview-dashboard.model.ts b/ui/src/app/data-explorer/models/dataview-dashboard.model.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/models/dataview-dashboard.model.ts
rename to ui/src/app/data-explorer/models/dataview-dashboard.model.ts
diff --git a/ui/src/app/data-explorer-v2/models/multi-series.model.ts b/ui/src/app/data-explorer/models/multi-series.model.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/models/multi-series.model.ts
rename to ui/src/app/data-explorer/models/multi-series.model.ts
diff --git a/ui/src/app/data-explorer-v2/registry/data-explorer-widget-registry.ts b/ui/src/app/data-explorer/registry/data-explorer-widget-registry.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/registry/data-explorer-widget-registry.ts
rename to ui/src/app/data-explorer/registry/data-explorer-widget-registry.ts
diff --git a/ui/src/app/data-explorer-v2/registry/widget-config-builder.ts b/ui/src/app/data-explorer/registry/widget-config-builder.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/registry/widget-config-builder.ts
rename to ui/src/app/data-explorer/registry/widget-config-builder.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/collected-schema-requirements.ts b/ui/src/app/data-explorer/sdk/collected-schema-requirements.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/collected-schema-requirements.ts
rename to ui/src/app/data-explorer/sdk/collected-schema-requirements.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/ep-requirements.ts b/ui/src/app/data-explorer/sdk/ep-requirements.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/ep-requirements.ts
rename to ui/src/app/data-explorer/sdk/ep-requirements.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/extractor/static-property-extractor.ts b/ui/src/app/data-explorer/sdk/extractor/static-property-extractor.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/extractor/static-property-extractor.ts
rename to ui/src/app/data-explorer/sdk/extractor/static-property-extractor.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/matching/datatype-match.ts b/ui/src/app/data-explorer/sdk/matching/datatype-match.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/matching/datatype-match.ts
rename to ui/src/app/data-explorer/sdk/matching/datatype-match.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/matching/domain-property-match.ts b/ui/src/app/data-explorer/sdk/matching/domain-property-match.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/matching/domain-property-match.ts
rename to ui/src/app/data-explorer/sdk/matching/domain-property-match.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/matching/mapping-property-generator.ts b/ui/src/app/data-explorer/sdk/matching/mapping-property-generator.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/matching/mapping-property-generator.ts
rename to ui/src/app/data-explorer/sdk/matching/mapping-property-generator.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/matching/primitive-property-match.ts b/ui/src/app/data-explorer/sdk/matching/primitive-property-match.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/matching/primitive-property-match.ts
rename to ui/src/app/data-explorer/sdk/matching/primitive-property-match.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/matching/property-match.ts b/ui/src/app/data-explorer/sdk/matching/property-match.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/matching/property-match.ts
rename to ui/src/app/data-explorer/sdk/matching/property-match.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/model/datatypes.ts b/ui/src/app/data-explorer/sdk/model/datatypes.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/model/datatypes.ts
rename to ui/src/app/data-explorer/sdk/model/datatypes.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/model/vocabulary.ts b/ui/src/app/data-explorer/sdk/model/vocabulary.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/model/vocabulary.ts
rename to ui/src/app/data-explorer/sdk/model/vocabulary.ts
diff --git a/ui/src/app/data-explorer-v2/sdk/schema-requirements-builder.ts b/ui/src/app/data-explorer/sdk/schema-requirements-builder.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/sdk/schema-requirements-builder.ts
rename to ui/src/app/data-explorer/sdk/schema-requirements-builder.ts
diff --git a/ui/src/app/data-explorer-v2/services/data-lake.service.ts b/ui/src/app/data-explorer/services/data-lake.service.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/services/data-lake.service.ts
rename to ui/src/app/data-explorer/services/data-lake.service.ts
diff --git a/ui/src/app/data-explorer-v2/services/data-view-data-explorer.service.ts b/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/services/data-view-data-explorer.service.ts
rename to ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
diff --git a/ui/src/app/data-explorer-v2/services/refresh-dashboard.service.ts b/ui/src/app/data-explorer/services/refresh-dashboard.service.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/services/refresh-dashboard.service.ts
rename to ui/src/app/data-explorer/services/refresh-dashboard.service.ts
diff --git a/ui/src/app/data-explorer-v2/services/resize.service.ts b/ui/src/app/data-explorer/services/resize.service.ts
similarity index 100%
rename from ui/src/app/data-explorer-v2/services/resize.service.ts
rename to ui/src/app/data-explorer/services/resize.service.ts