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:35 UTC
[incubator-streampipes] branch dev updated (8f59513 -> eee210c)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 8f59513 Add aggregation configuration to line-chart
new 6dc052c Remove old version of data explorer
new eee210c Rename date new explorer module
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ui/deployment/dev/config.yml | 3 +-
ui/deployment/modules.yml | 33 +-
.../image/image-viewer/image-viewer.component.ts | 2 +-
.../datadownloadDialog/dataDownload.dialog.css | 56 ---
.../datadownloadDialog/dataDownload.dialog.html | 100 -----
.../linechart/lineChart.component.css | 23 --
.../table/table.component.css | 27 --
.../table/table.component.html | 66 ----
.../data-explorer-v2.component.html | 56 ---
.../data-explorer-v2/data-explorer-v2.component.ts | 96 -----
.../data-explorer-v2/data-explorer-v2.module.ts | 160 --------
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 0
.../data-explorer-dashboard-grid.component.css | 0
.../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
.../data-explorer-dashboard-panel.component.css | 0
.../data-explorer-dashboard-panel.component.html | 0
.../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
.../data-explorer-dashboard-widget.component.css | 0
.../data-explorer-dashboard-widget.component.html | 0
.../data-explorer-dashboard-widget.component.ts | 0
.../components/widgets/base/base-config.ts | 0
.../widgets/base/base-data-explorer-widget.ts | 0
.../widgets/base/base-ngx-charts-widget.ts | 0
.../components/widgets/image/image-config.ts | 0
.../widgets/image/image-widget.component.css | 0
.../widgets/image/image-widget.component.html | 0
.../widgets/image/image-widget.component.ts | 0
.../widgets/line-chart/line-chart-config.ts | 0
.../line-chart/line-chart-widget.component.css | 0
.../line-chart/line-chart-widget.component.html | 0
.../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
.../table/table.component.css | 0
.../table/table.component.html | 0
.../table/table.component.ts | 0
.../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
.../widgets/table/table-widget.component.css | 0
.../widgets/table/table-widget.component.html | 0
.../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.component.css | 0
.../load-data-spinner.component.html | 0
.../load-data-spinner.component.ts | 0
.../no-data/no-data-in-date-range.component.css | 0
.../no-data/no-data-in-date-range.component.html | 0
.../no-data/no-data-in-date-range.component.ts | 0
.../select-properties.component.css | 0
.../select-properties.component.html | 0
.../select-properties.component.ts | 0
.../data-explorer.component.css} | 0
.../app/data-explorer/data-explorer.component.html | 39 +-
.../app/data-explorer/data-explorer.component.ts | 89 +++--
ui/src/app/data-explorer/data-explorer.css | 27 --
ui/src/app/data-explorer/data-explorer.module.ts | 164 +++++---
...explorer-add-visualization-dialog.component.css | 0
...xplorer-add-visualization-dialog.component.html | 0
...-explorer-add-visualization-dialog.component.ts | 0
...ta-explorer-edit-data-view-dialog.component.css | 0
...a-explorer-edit-data-view-dialog.component.html | 0
...ata-explorer-edit-data-view-dialog.component.ts | 0
.../datadownloadDialog/dataDownload.dialog.ts | 196 ----------
.../base/baseVisualisation.component.ts | 146 -------
.../linechart/lineChart.component.html | 52 ---
.../linechart/lineChart.component.ts | 200 ----------
.../table/table.component.ts | 99 -----
.../explorer-widget/explorer.component.html | 289 --------------
.../explorer-widget/explorer.component.ts | 425 ---------------------
.../app/data-explorer/explorer-widget/explorer.css | 85 -----
.../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
.../time-selector/timeRangeSelector.component.css | 17 -
.../time-selector/timeRangeSelector.component.html | 45 ---
.../time-selector/timeRangeSelector.component.ts | 38 --
110 files changed, 220 insertions(+), 2313 deletions(-)
delete mode 100644 ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.html
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.html
delete mode 100644 ui/src/app/data-explorer-v2/data-explorer-v2.component.html
delete mode 100644 ui/src/app/data-explorer-v2/data-explorer-v2.component.ts
delete mode 100644 ui/src/app/data-explorer-v2/data-explorer-v2.module.ts
rename ui/src/app/data-explorer/{explorer-widget => components}/datadownloadDialog/dataDownload.dialog.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/datadownloadDialog/dataDownload.dialog.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/datadownloadDialog/dataDownload.dialog.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/grid/data-explorer-dashboard-grid.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/grid/data-explorer-dashboard-grid.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/grid/data-explorer-dashboard-grid.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/overview/data-explorer-dashboard-overview.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/overview/data-explorer-dashboard-overview.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/overview/data-explorer-dashboard-overview.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/panel/data-explorer-dashboard-panel.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/panel/data-explorer-dashboard-panel.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/panel/data-explorer-dashboard-panel.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/time-selector/timeRangeSelector.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/time-selector/timeRangeSelector.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/time-selector/timeRangeSelector.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widget/data-explorer-dashboard-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widget/data-explorer-dashboard-widget.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widget/data-explorer-dashboard-widget.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/base/base-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/base/base-data-explorer-widget.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/base/base-ngx-charts-widget.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-widget.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-widget.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-widget.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-widget.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.css (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/datadownloadDialog/dataDownload.dialog.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/explorer-visualisations/linechart/lineChart.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.ts (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/explorer-visualisations/table/table.component.css (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/explorer-visualisations/table/table.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/old-explorer.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/old-explorer.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/old-explorer.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-widget.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-widget.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/load-data-spinner/load-data-spinner.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/load-data-spinner/load-data-spinner.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/load-data-spinner/load-data-spinner.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/no-data/no-data-in-date-range.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/no-data/no-data-in-date-range.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/no-data/no-data-in-date-range.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/select-properties/select-properties.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/select-properties/select-properties.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/utils/select-properties/select-properties.component.ts (100%)
rename ui/src/app/{data-explorer-v2/data-explorer-v2.component.css => data-explorer/data-explorer.component.css} (100%)
delete mode 100644 ui/src/app/data-explorer/data-explorer.css
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/add-widget/data-explorer-add-visualization-dialog.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts (100%)
delete mode 100644 ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.html
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer.component.html
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer.css
rename ui/src/app/{data-explorer-v2 => data-explorer}/models/dataview-dashboard.model.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/models/multi-series.model.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/registry/data-explorer-widget-registry.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/registry/widget-config-builder.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/collected-schema-requirements.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/ep-requirements.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/extractor/static-property-extractor.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/datatype-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/domain-property-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/mapping-property-generator.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/primitive-property-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/property-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/model/datatypes.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/model/vocabulary.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/schema-requirements-builder.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/data-lake.service.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/data-view-data-explorer.service.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/refresh-dashboard.service.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/resize.service.ts (100%)
delete mode 100644 ui/src/app/data-explorer/time-selector/timeRangeSelector.component.css
delete mode 100644 ui/src/app/data-explorer/time-selector/timeRangeSelector.component.html
delete mode 100644 ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts
[incubator-streampipes] 01/02: Remove old version of data explorer
Posted by ze...@apache.org.
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 6dc052c91de800f4d0aa9cc6b529b3887c12927a
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Jun 8 13:39:18 2020 +0200
Remove old version of data explorer
---
ui/deployment/dev/config.yml | 3 +-
ui/deployment/modules.yml | 17 +-
.../data-explorer-v2/data-explorer-v2.module.ts | 4 +-
.../app/data-explorer/data-explorer.component.html | 29 --
.../app/data-explorer/data-explorer.component.ts | 75 ----
ui/src/app/data-explorer/data-explorer.css | 27 --
ui/src/app/data-explorer/data-explorer.module.ts | 84 ----
.../datadownloadDialog/dataDownload.dialog.css | 56 ---
.../datadownloadDialog/dataDownload.dialog.html | 100 -----
.../datadownloadDialog/dataDownload.dialog.ts | 196 ----------
.../base/baseVisualisation.component.ts | 146 -------
.../linechart/lineChart.component.css | 23 --
.../linechart/lineChart.component.html | 52 ---
.../linechart/lineChart.component.ts | 200 ----------
.../table/table.component.css | 27 --
.../table/table.component.html | 66 ----
.../table/table.component.ts | 99 -----
.../explorer-widget/explorer.component.html | 289 --------------
.../explorer-widget/explorer.component.ts | 425 ---------------------
.../app/data-explorer/explorer-widget/explorer.css | 85 -----
.../time-selector/timeRangeSelector.component.css | 17 -
.../time-selector/timeRangeSelector.component.html | 45 ---
.../time-selector/timeRangeSelector.component.ts | 38 --
23 files changed, 5 insertions(+), 2098 deletions(-)
diff --git a/ui/deployment/dev/config.yml b/ui/deployment/dev/config.yml
index 568a8c6..c5c44a8 100644
--- a/ui/deployment/dev/config.yml
+++ b/ui/deployment/dev/config.yml
@@ -22,9 +22,8 @@ modules:
- spPipelines
- spConnect
- spDashboard
+ - spDataExplorer2
- spAppOverview
- spAdd
- spMyElements
- - spDataExplorer
- spConfiguration
- - spDataExplorer2
diff --git a/ui/deployment/modules.yml b/ui/deployment/modules.yml
index 65231fe..20e4158 100644
--- a/ui/deployment/modules.yml
+++ b/ui/deployment/modules.yml
@@ -111,21 +111,6 @@ spConfiguration:
icon: 'action:ic_settings_24px'
homeImage: '/assets/img/home/configuration.png'
admin: True
-spDataExplorer:
- ng5: True
- ng1_templateUrl: ''
- ng1_controller: ''
- ng5_moduleName: 'DataExplorerModule'
- ng5_component: 'DataExplorerComponent'
- ng5_componentPath: '../data-explorer/data-explorer.component'
- path: './data-explorer/data-explorer.module'
- link: 'streampipes.data-explorer'
- url: '/data-explorer'
- title: 'Data Explorer'
- description: 'Data Explorer'
- icon: 'action:ic_view_headline_24px'
- homeImage: ''
- admin: false
spAppOverview:
ng5: True
ng1_templateUrl: ''
@@ -168,6 +153,6 @@ spDataExplorer2:
url: '/dataexplorerv2'
title: 'Data Explorer'
description: 'data-explorer-v2'
- icon: 'navigation:ic_apps_24px'
+ 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/data-explorer-v2/data-explorer-v2.module.ts b/ui/src/app/data-explorer-v2/data-explorer-v2.module.ts
index eacb161..13d713d 100644
--- a/ui/src/app/data-explorer-v2/data-explorer-v2.module.ts
+++ b/ui/src/app/data-explorer-v2/data-explorer-v2.module.ts
@@ -51,7 +51,6 @@ 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';
@@ -62,6 +61,8 @@ 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 = [
@@ -127,6 +128,7 @@ export const MY_NATIVE_FORMATS = {
AggregateConfigurationComponent
],
providers: [
+ DatalakeRestService,
SharedDatalakeRestService,
DataViewDataExplorerService,
DataLakeService,
diff --git a/ui/src/app/data-explorer/data-explorer.component.html b/ui/src/app/data-explorer/data-explorer.component.html
deleted file mode 100644
index 5c22258..0000000
--- a/ui/src/app/data-explorer/data-explorer.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<div flex class="page-container page-container-padding" style="height: 1px">
- <div flex="100" layout="column" style="padding:0px;background-color:#f6f6f6; display: inline-block; width: 100%;" >
- <div flex layout-fill layout="row" layout-align="end center"
- style="height:48px;padding-left:10px;font-size:14px;line-height:24px;border-bottom:1px solid #ccc">
- </div>
- </div>
-
- <div class="container-fluid">
- <sp-explorer></sp-explorer>
- </div>
-</div>
diff --git a/ui/src/app/data-explorer/data-explorer.component.ts b/ui/src/app/data-explorer/data-explorer.component.ts
deleted file mode 100644
index d530eb5..0000000
--- a/ui/src/app/data-explorer/data-explorer.component.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { Component, OnInit } from '@angular/core';
-import { FormControl } from '@angular/forms';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { Observable } from 'rxjs/Observable';
-import { map, startWith } from 'rxjs/operators';
-import { DataLakeMeasure } from '../core-model/datalake/DataLakeMeasure';
-import { DatalakeRestService } from '../core-services/datalake/datalake-rest.service';
-
-@Component({
- selector: 'sp-data-explorer',
- templateUrl: './data-explorer.component.html',
- styleUrls: ['./data-explorer.css']
-})
-export class DataExplorerComponent implements OnInit {
-
- myControl = new FormControl();
- infoResult: DataLakeMeasure[];
- filteredIndexInfos: Observable<DataLakeMeasure[]>;
-
- page = 0;
- selectedInfoResult: DataLakeMeasure = undefined;
-
- downloadFormat = 'csv';
- isDownloading = false;
-
- constructor(private restService: DatalakeRestService, private snackBar: MatSnackBar) {
-
- }
-
- ngOnInit(): void {
- this.restService.getAllInfos().subscribe(res => {
- this.infoResult = res;
- this.filteredIndexInfos = this.myControl.valueChanges
- .pipe(
- startWith(''),
- map(value => this._filter(value))
- );
- }
- );
- }
-
- selectIndex(index: string) {
- this.selectedInfoResult = this._filter(index)[0];
- }
-
- _filter(value: string): DataLakeMeasure[] {
- const filterValue = value.toLowerCase();
-
- return this.infoResult.filter(option => option.measureName.toLowerCase().includes(filterValue));
- }
-
- openSnackBar(message: string) {
- this.snackBar.open(message, 'Close', {
- duration: 2000,
- });
- }
-}
diff --git a/ui/src/app/data-explorer/data-explorer.css b/ui/src/app/data-explorer/data-explorer.css
deleted file mode 100644
index 5bddafa..0000000
--- a/ui/src/app/data-explorer/data-explorer.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-::ng-deep .mat-form-field-underline {
- background-color: rgba(255, 255, 255, 0.8);
-}
-
-::ng-deep .mat-select-content{
- width:2000px;
- background-color: red;
- font-size: 10px;
-}
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
deleted file mode 100644
index ae4eb74..0000000
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { FlexLayoutModule } from '@angular/flex-layout';
-
-import { DataExplorerComponent } from './data-explorer.component';
-
-import { CdkTableModule } from '@angular/cdk/table';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import {
- OWL_DATE_TIME_FORMATS,
- OwlDateTimeModule,
- OwlNativeDateTimeModule
-} from '@danielmoncada/angular-datetime-picker';
-import { DatalakeRestService } from '../core-services/datalake/datalake-rest.service';
-import { CoreUiModule } from '../core-ui/core-ui.module';
-import { LabelingToolModule } from '../core-ui/linechart/labeling-tool/labeling-tool.module';
-import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
-import { ExplorerComponent } from './explorer-widget/explorer.component';
-import { DataDownloadDialog } from './explorer-widget/datadownloadDialog/dataDownload.dialog';
-
-export const MY_NATIVE_FORMATS = {
- fullPickerInput: {year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', hour12: false},
- datePickerInput: {year: 'numeric', month: 'numeric', day: 'numeric', hour12: false},
- timePickerInput: {hour: 'numeric', minute: 'numeric', hour12: false},
- monthYearLabel: {year: 'numeric', month: 'short', hour12: false},
- dateA11yLabel: {year: 'numeric', month: 'long', day: 'numeric', hour12: false},
- monthYearA11yLabel: {year: 'numeric', month: 'long', hour12: false},
-};
-
-@NgModule({
- imports: [
- CommonModule,
- FlexLayoutModule,
- CustomMaterialModule,
- ReactiveFormsModule,
- FormsModule,
- CdkTableModule,
- MatSnackBarModule,
- MatProgressSpinnerModule,
- CoreUiModule,
- OwlDateTimeModule,
- OwlNativeDateTimeModule,
- LabelingToolModule
- ],
- declarations: [
- DataExplorerComponent,
- ExplorerComponent,
- DataDownloadDialog,
- ],
- providers: [
- DatalakeRestService,
- {
- provide: OWL_DATE_TIME_FORMATS, useValue: MY_NATIVE_FORMATS
- },
- ],
- entryComponents: [
- DataExplorerComponent,
- DataDownloadDialog,
- ],
- exports: [
- ]
-})
-export class DataExplorerModule {
-}
diff --git a/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.css b/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.css
deleted file mode 100644
index c503893..0000000
--- a/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-example-radio-group {
- display: flex;
- flex-direction: column;
- margin: 15px 0;
-}
-.example-radio-button {
- margin: 5px;
- width: 100%;
-}
-
-mat-toolbar {
- background: #39b54a;
- color:white;
-}
-
-mat-dialog-content {
- padding: 24px;
- -webkit-box-ordinal-group: 2;
- -webkit-order: 1;
- order: 1;
- -webkit-box-orient: vertical;
- -webkit-box-direction: normal;
- -webkit-flex-direction: column;
- flex-direction: column;
- overflow: auto;
- -webkit-overflow-scrolling: touch;
-}
-
-.mat-dialog-content {
- width:100%;
- height:74%;
- margin: 0px;
-}
-
-.mat-dialog-actions {
- margin-bottom:0px;
- padding-right:10px;
-}
diff --git a/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.html b/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.html
deleted file mode 100644
index 055abed..0000000
--- a/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<mat-toolbar>
- <div class="md-toolbar-tools">
- <h2>Download Data</h2>
- <span fxFlex></span>
- <button mat-icon-button (click)="exitDialog()">
- <i class="material-icons">close</i>
- </button>
- </div>
-</mat-toolbar>
-
-<div mat-dialog-content class="md-dialog-content">
-
-
- <mat-horizontal-stepper #stepper>
- <mat-step>
- <ng-template matStepLabel>Select Data</ng-template>
- <div>
- <mat-radio-group class="example-radio-group" [(ngModel)]="selectedData">
- <mat-radio-button value="visible" class="example-radio-button">
- Visible data in charts
- </mat-radio-button>
- <mat-radio-button value="all" class="example-radio-button">
- All data in database
- </mat-radio-button>
- <mat-radio-button value="customInterval" class="example-radio-button">
- All data in custom time interval
- </mat-radio-button>
- </mat-radio-group>
- <div fxLayout="row" fxLayoutAlign="start center" style="margin-left: 35px">
- <mat-form-field style="top: -10px; width: 270px">
- <input matInput [owlDateTime]="dt1" [owlDateTimeTrigger]="dt1"
- [(ngModel)]="dateRange" [selectMode]="'range'" [disabled]="selectedData !== 'customInterval'">
- <mat-icon matSuffix [owlDateTimeTrigger]="dt1" *ngIf="selectedData === 'customInterval'">event</mat-icon>
- <mat-icon matSuffix style="color: #e0e0e0" *ngIf="selectedData !== 'customInterval'">event</mat-icon>
- <owl-date-time #dt1></owl-date-time>
- </mat-form-field>
- </div>
- </div>
- </mat-step>
-
-
-
- <mat-step>
- <ng-template matStepLabel>Select Format</ng-template>
- <div>
- <mat-radio-group class="example-radio-group" [(ngModel)]="downloadFormat">
- <mat-radio-button value="json" class="example-radio-button">
- JSON
- </mat-radio-button>
- <mat-radio-button value="csv" class="example-radio-button">
- CSV
- </mat-radio-button>
- </mat-radio-group>
- </div>
- </mat-step>
-
-
-
-
-
- <mat-step>
- <ng-template matStepLabel>Download</ng-template>
- <div div fxLayout="column" fxLayoutAlign="space-around center" *ngIf="!downloadFinish">
- <mat-spinner></mat-spinner>
- <label *ngIf="downloadedMBs !== undefined">{{downloadedMBs | number : '1.0-2' }} Mb</label>
- <button mat-button warn color="warn" (click)="cancelDownload()">Cancel</button>
- </div>
- <div div fxLayout="column" fxLayoutAlign="space-around center" *ngIf="downloadFinish">
- <mat-icon style="font-size: 100px;height: 100px; width: 100px; color:#b3b3b3;">check</mat-icon>
- </div>
- </mat-step>
- </mat-horizontal-stepper>
-
-</div>
-
-<mat-divider></mat-divider>
-<div mat-dialog-actions fxLayout="row" fxLayoutAlign="end center">
- <button mat-button *ngIf="stepper.selectedIndex == 1" color="primary" (click)="previousStep()">Previous</button>
- <button mat-button mat-raised-button *ngIf="stepper.selectedIndex < 1" color="primary" (click)="nextStep()">Next</button>
- <button mat-button mat-raised-button *ngIf="stepper.selectedIndex == 1" color="accent" (click)="downloadData()">Download</button>
- <button mat-button mat-raised-button *ngIf="downloadFinish" color="primary" (click)="exitDialog()">Close</button>
-</div>
diff --git a/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.ts b/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.ts
deleted file mode 100644
index fc57118..0000000
--- a/ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {Component, Inject, ViewChild} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
-import {MatStepper} from '@angular/material/stepper';
-import {HttpEventType} from '@angular/common/http';
-import {DatalakeRestService} from '../../../core-services/datalake/datalake-rest.service';
-
-@Component({
- selector: 'sp-dataDownload-dialog',
- templateUrl: 'dataDownload.dialog.html',
- styleUrls: ['./dataDownload.dialog.css']
-})
-export class DataDownloadDialog {
-
-
- downloadFormat: string = 'csv';
- selectedData: string = 'visible';
- downloadFinish: boolean = false;
- downloadedMBs: number = undefined;
-
- @ViewChild('stepper', { static: true }) stepper: MatStepper;
-
- downloadHttpRequestSubscribtion;
-
- dateRange: Date [] = []; // [0] start, [1] end
-
-
- constructor(public dialogRef: MatDialogRef<DataDownloadDialog>,
- @Inject(MAT_DIALOG_DATA) public data, private restService: DatalakeRestService,) {
- this.dateRange[0] = new Date();
- this.dateRange[1] = new Date(this.dateRange[0].getTime() + 60000 * 60 * 24);
- }
-
- downloadData() {
- this.nextStep();
- switch (this.selectedData) {
- case "visible":
-
- if (this.data.yAxesKeys === undefined) {
- this.createFile('', this.downloadFormat, this.data.index, this.getDateString(this.data.date[0]),
- this.getDateString((this.data.date[1])));
-
- } else if (this.data.data["headers"] !== undefined) {
- //Single Data
- let result = this.convertData(this.data.data, this.downloadFormat, this.data.xAxesKey, this.data.yAxesKeys);
- this.createFile(result, this.data.downloadFormat, this.data.index, this.getDateString(this.data.date[0]),
- this.getDateString(this.data.date[1]));
- } else {
- //group data
- Object.keys(this.data.data.dataResults).forEach( groupName => {
- let dataResult = this.data.data.dataResults[groupName];
- let result = this.convertData(dataResult, this.downloadFormat, this.data.xAxesKey, this.data.yAxesKeys);
- let fileName = this.data.index + ' ' + groupName;
- this.createFile(result, this.data.downloadFormat, fileName, this.getDateString(this.data.date[0]),
- this.getDateString(this.data.date[1]));
- });
-
- }
- this.downloadFinish = true;
- break;
- case "all":
- this.performRequest(this.restService.downloadRowData(this.data.index, this.downloadFormat), '', '');
- break;
- case "customInterval":
- this.performRequest(this.restService.downloadRowDataTimeInterval(this.data.index, this.downloadFormat,
- this.dateRange[0].getTime(), this.dateRange[1].getTime()), this.getDateString(this.dateRange[0]),
- this.getDateString(this.dateRange[1]));
-
- }
- }
-
- performRequest(request, startDate, endDate) {
- this.downloadHttpRequestSubscribtion = request.subscribe(event => {
- // progress
- if (event.type === HttpEventType.DownloadProgress) {
- this.downloadedMBs = event.loaded / 1024 / 1014
- }
-
- // finished
- if (event.type === HttpEventType.Response) {
- this.createFile(event.body, this.downloadFormat, this.data.index, startDate, endDate);
- this.downloadFinish = true
- }
- });
- }
-
- convertData(data, format, xAxesKey, yAxesKeys) {
- let indexXKey = data.headers.findIndex(headerName => headerName === xAxesKey);
- let indicesYKeys = [];
- yAxesKeys.forEach(key => {
- indicesYKeys.push(data.headers.findIndex(headerName => headerName === key))
- });
-
- if (format === "json") {
- let resultJson = [];
-
-
- data.rows.forEach(row => {
- let tmp = {"time": new Date(row[indexXKey]).getTime()};
- indicesYKeys.forEach(index => {
- if (row[index] !== undefined) {
- tmp[data.headers[index]] = row[index]
- }
- });
- resultJson.push(tmp)
- });
-
- return JSON.stringify(resultJson);
- } else {
- //CSV
- let resultCsv: string = '';
-
- //header
- resultCsv += xAxesKey;
- yAxesKeys.forEach(key => {
- resultCsv += ';';
- resultCsv += key;
- });
-
-
- //content
- data.rows.forEach(row => {
- resultCsv += '\n';
- resultCsv += new Date(row[indexXKey]).getTime();
- indicesYKeys.forEach(index => {
- resultCsv += ';';
- if (row[index] !== undefined) {
- resultCsv += row[index]
- }
- })
- });
-
- return resultCsv;
- }
- }
-
- createFile(data, format, fileName, startDate, endDate) {
- var a = document.createElement("a");
- document.body.appendChild(a);
- a.style.display = "display: none";
-
- //let name = 'sp_' + startDate + '_' + endDate + '_' + fileName + '.' + this.downloadFormat;
- let name = 'sp_' + startDate + '_' + fileName + '.' + this.downloadFormat;
- name = name.replace('__','_');
-
- var url = window.URL.createObjectURL(new Blob([String(data)], { type: 'data:text/' + format + ';charset=utf-8' }));
- a.href = url;
- a.download = name;
- a.click();
- window.URL.revokeObjectURL(url)
- }
-
- cancelDownload() {
- try {
- this.downloadHttpRequestSubscribtion.unsubscribe();
- } finally {
- this.exitDialog();
- }
- }
-
-
- exitDialog(): void {
- this.dialogRef.close();
- }
-
- nextStep() {
- this.stepper.next();
- }
-
- previousStep() {
- this.stepper.previous();
- }
-
- getDateString(date: Date) {
- return date.toLocaleDateString() + 'T' + date.toLocaleTimeString().replace(':','.')
- .replace(':','.');
- }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts b/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts
deleted file mode 100644
index 1f4d7f6..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { Directive, EventEmitter, Injectable, Input, Output } from '@angular/core';
-import { EventSchema } from '../../../../connect/schema-editor/model/EventSchema';
-import { DataResult } from '../../../../core-model/datalake/DataResult';
-import { GroupedDataResult } from '../../../../core-model/datalake/GroupedDataResult';
-
-@Injectable()
-@Directive()
-export abstract class BaseVisualisationComponent {
-
-
- @Input() set datas(value: DataResult | GroupedDataResult) {
- if (value !== undefined) {
- this.data = this.clone(value);
- if (this.data !== undefined && this.xKey !== undefined && this.yKeys !== undefined) {
- this.transform();
- this.display();
- }
- } else {
- this.stopDisplayData();
- this.data = undefined;
- }
- }
- @Input() set xAxesKey(value: string) {
- if (value !== undefined) {
- this.xKey = value;
- if (this.data !== undefined && this.xKey !== undefined && this.yKeys !== undefined) {
- this.transform();
- this.display();
- }
- } else {
- this.stopDisplayData();
- this.xKey = undefined;
- }
- }
- @Input() set yAxesKeys(value: string[]) {
- if (value !== undefined) {
- this.yKeys = value;
- if (this.data !== undefined && this.xKey !== undefined && this.yKeys !== undefined) {
- if (this.transformedData === undefined) {
- this.transform();
- }
- this.display();
- }
- } else {
- this.stopDisplayData();
- this.yKeys = undefined;
- }
- }
-
- @Input() eventschema: EventSchema = undefined;
-
- @Input() startDateData: Date = undefined;
- @Input() endDateData: Date = undefined;
-
-
- @Input() currentPage: number = undefined;
- @Input() maxPage: number = undefined;
- @Input() enablePaging = false;
-
- @Output() previousPage = new EventEmitter<boolean>();
- @Output() nextPage = new EventEmitter<boolean>();
- @Output() firstPage = new EventEmitter<boolean>();
- @Output() lastPage = new EventEmitter<boolean>();
-
- xKey: string = undefined;
- yKeys: string[] = undefined;
-
- data: DataResult | GroupedDataResult = undefined;
- transformedData: DataResult | GroupedDataResult = undefined;
-
-
- dataMode = '';
-
-
- transform() {
- if (this.data['headers'] !== undefined) {
- this.transformedData = this.transformData(this.data as DataResult, this.xKey);
- this.dataMode = 'single';
- } else {
- this.transformedData = this.transformGroupedData(this.data as GroupedDataResult, this.xKey);
- this.dataMode = 'group';
- }
- }
-
- display() {
- if (this.data['headers'] !== undefined) {
- this.displayData(this.transformedData as DataResult, this.yKeys);
- } else {
- this.displayGroupedData(this.transformedData as GroupedDataResult, this.yKeys);
- }
- }
-
- // transform the input data to the schema of the chart
- abstract transformData(data: DataResult, xKey: String): DataResult;
-
- // transform the grouped input data to the schema of the chart
- abstract transformGroupedData(data: GroupedDataResult, xKey: string): GroupedDataResult;
-
- // display the data
- abstract displayData(transformedData: DataResult, yKeys: string[]);
-
- // display the grouped data
- abstract displayGroupedData(transformedData: GroupedDataResult, yKeys: string[]);
-
- //
- abstract stopDisplayData();
-
- clickPreviousPage() {
- this.previousPage.emit();
- }
-
- clickNextPage() {
- this.nextPage.emit();
- }
-
- clickFirstPage() {
- this.firstPage.emit();
- }
-
- clickLastPage() {
- this.lastPage.emit();
- }
-
- clone(value): DataResult {
- return (JSON.parse(JSON.stringify(value)));
- }
-
-}
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.css b/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.css
deleted file mode 100644
index 724cdf8..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-.paging-button {
- top: 15px;
- border: #202020 solid 1px;
- margin-left: 5px;
-}
\ No newline at end of file
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.html b/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.html
deleted file mode 100644
index 75d7118..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<div style="width: 100%; height: 500px">
-
-
- <div fxLayout="row">
- <div *ngIf="enablePaging" fxFlex="5">
- <button mat-icon-button (click)="clickPreviousPage()" class="paging-button" matTooltip="Going backwards in time">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">
- chevron_left
- </mat-icon>
- </button>
- </div>
-
-
- <!-- Chart -->
- <plotly-plot fxFlex
- *ngIf="dataToDisplay !== undefined"
- flex
- [data]="dataToDisplay"
- [layout]="graph.layout"
- (relayout)="zoomIn($event)">
- </plotly-plot>
-
- <div *ngIf="enablePaging" fxFlex="5">
- <button mat-icon-button (click)="clickNextPage()" class="paging-button" matTooltip="Going forwards in time">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">
- chevron_right
- </mat-icon>
- </button>
- </div>
- </div>
-
-
-</div>
-
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.ts b/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.ts
deleted file mode 100644
index ee949b3..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { DataResult } from '../../../../core-model/datalake/DataResult';
-import { GroupedDataResult } from '../../../../core-model/datalake/GroupedDataResult';
-import { BaseVisualisationComponent } from '../base/baseVisualisation.component';
-
-
-@Component({
- selector: 'sp-lineChart',
- templateUrl: './lineChart.component.html',
- styleUrls: ['./lineChart.component.css']
-})
-export class LineChartComponent extends BaseVisualisationComponent implements OnChanges {
-
- @Output() zoomEvent = new EventEmitter<[number, number]>();
-
- constructor() {
- super();
- }
-
- dataToDisplay: any[] = undefined;
-
- updatemenus = [
- {
- buttons: [
- {
- args: ['mode', 'lines'],
- label: 'Line',
- method: 'restyle'
- },
- {
- args: ['mode', 'markers'],
- label: 'Dots',
- method: 'restyle'
- },
-
- {
- args: ['mode', 'lines+markers'],
- label: 'Dots + Lines',
- method: 'restyle'
- }
- ],
- direction: 'left',
- pad: {'r': 10, 't': 10},
- showactive: true,
- type: 'buttons',
- x: 0.0,
- xanchor: 'left',
- y: 1.3,
- yanchor: 'top',
- font: {color: '#000'},
- bgcolor: '#fafafa',
- bordercolor: '#000'
- }
- ];
-
- graph = {
- layout: {
- autosize: true,
- plot_bgcolor: '#fafafa',
- paper_bgcolor: '#fafafa',
- xaxis: {
- type: 'date',
- },
- yaxis: {
- fixedrange: true
- },
- updatemenus: this.updatemenus,
- }
- };
-
- ngOnChanges(changes: SimpleChanges) {
- // TODO: is needed because bindings are not working correct
- if (changes.endDateData !== undefined) {
- this.endDateData = changes.endDateData.currentValue;
- }
- if (changes.startDateData !== undefined) {
- this.startDateData = changes.startDateData.currentValue;
- }
- // TODO should be done in displaydata
- if (this.startDateData !== undefined && this.endDateData !== undefined) {
- this.graph.layout.xaxis['range'] = [this.startDateData.getTime(), this.endDateData.getTime()];
- }
- }
-
-
-
- displayData(transformedData: DataResult, yKeys: string[]) {
- if (this.yKeys.length > 0) {
- const tmp = [];
- this.yKeys.forEach(key => {
- transformedData.rows.forEach(serie => {
- if (serie.name === key) {
- tmp.push(serie);
- }
- });
- });
- this.dataToDisplay = tmp;
-
- } else {
- this.dataToDisplay = undefined;
-
- }
- }
-
- displayGroupedData(transformedData: GroupedDataResult, yKeys: string[]) {
- if (this.yKeys.length > 0) {
-
- const tmp = [];
-
- const groupNames = Object.keys(transformedData.dataResults);
- for (const groupName of groupNames) {
- const value = transformedData.dataResults[groupName];
- this.yKeys.forEach(key => {
- value.rows.forEach(serie => {
- if (serie.name === key) {
- serie.name = groupName + ' ' + serie.name;
- tmp.push(serie);
- }
- });
- });
- }
- this.dataToDisplay = tmp;
-
- } else {
- this.dataToDisplay = undefined;
- }
- }
-
- transformData(data: DataResult, xKey: String): DataResult {
- const tmp: any[] = [];
-
- const dataKeys = [];
-
- data.rows.forEach(row => {
- data.headers.forEach((headerName, index) => {
- if (!dataKeys.includes(index) && typeof row[index] == 'number') {
- dataKeys.push(index);
- }
- });
- });
-
- const indexXkey = data.headers.findIndex(headerName => headerName === this.xKey);
-
- dataKeys.forEach(key => {
- const headerName = data.headers[key];
- tmp[key] = {
- type: 'scatter', mode: 'lines', name: headerName, connectgaps: false, x: [], y: []};
- });
- data.rows.forEach(row => {
- data.headers.forEach((headerName, index) => {
- if (dataKeys.includes(index)) {
- tmp[index].x.push(new Date(row[indexXkey]));
- if ((row[index]) !== undefined) {
- tmp[index].y.push(row[index]);
- } else {
- tmp[index].y.push(null);
- }
- }
- });
- });
- data.rows = tmp;
-
- return data;
- }
-
- transformGroupedData(data: GroupedDataResult, xKey: string): GroupedDataResult {
- for (const key in data.dataResults) {
- const dataResult = data.dataResults[key];
- dataResult.rows = this.transformData(dataResult, xKey).rows;
- }
-
- return data;
- }
-
- stopDisplayData() {
- }
-
- zoomIn($event) {
- this.zoomEvent.emit([$event['xaxis.range[0]'], $event['xaxis.range[1]']]);
- }
-
-}
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.css b/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.css
deleted file mode 100644
index 937c182..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-table {
- background: none;
- width: 100%;
-}
-
-.paging-button {
- border: #202020 solid 1px;
- margin: 5px;
-}
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.html b/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.html
deleted file mode 100644
index 6ebd3fa..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<div>
- <div fxLayout="column" fxLayoutAlign=" stretch">
- <div *ngIf="enablePaging" fxLayout="row" fxLayoutAlign="space-between center">
- <div>
- <button mat-icon-button (click)="clickPreviousPage()" class="paging-button" matTooltip="Going backwards in time">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">
- chevron_left
- </mat-icon>
- </button>
- </div>
-
- <div *ngIf="dataMode === 'group' && transformedData !== undefined">
- <mat-form-field style="margin-right: 1px;top: -3px;height: 1px" appearance="outline">
- <mat-label>Select Group</mat-label>
- <mat-select [ngModel]="this.selectedGroup" (selectionChange)="selectGroup($event.value)">
- <mat-option *ngFor="let key of getGroupKeys()" [value]="key" style="background-color: #FFFFFF">
- {{key}}
- </mat-option>
- </mat-select>
- </mat-form-field>
- </div>
-
- <div>
- <button mat-icon-button (click)="clickNextPage()" class="paging-button" matTooltip="Going forwards in time">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">
- chevron_right
- </mat-icon>
- </button>
- </div>
- </div>
-
-
- <div style="overflow: auto">
- <table mat-table [dataSource]="dataSource">
-
- <ng-container *ngFor="let element of displayedColumns" [cdkColumnDef]="element">
- <th mat-header-cell *matHeaderCellDef><label style="font-size: large">{{element}}</label></th>
- <td mat-cell *matCellDef="let row">{{row[element]}}</td>
- </ng-container>
-
- <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr>
- <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-
- </table>
- </div>
-
- </div>
-</div>
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.ts b/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.ts
deleted file mode 100644
index 00d4784..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { Component } from '@angular/core';
-import { MatTableDataSource } from '@angular/material/table';
-import { DataResult } from '../../../../core-model/datalake/DataResult';
-import { GroupedDataResult } from '../../../../core-model/datalake/GroupedDataResult';
-import { BaseVisualisationComponent } from '../base/baseVisualisation.component';
-
-@Component({
- selector: 'sp-table',
- templateUrl: './table.component.html',
- styleUrls: ['./table.component.css']
-})
-export class TableComponent extends BaseVisualisationComponent {
-
- displayedColumns: string[] = [];
- dataSource = new MatTableDataSource();
-
- selectedGroup: string = undefined;
-
- constructor() {
- super();
- }
-
- transformData(data: DataResult, xKey: string): DataResult {
- const tmp = [];
- data.rows.forEach(row =>
- tmp.push(this.createTableObject(data.headers, row))
- );
- data.rows = tmp;
-
- return data;
- }
-
- transformGroupedData(data: GroupedDataResult, xKey: string): GroupedDataResult {
- for (const key in data.dataResults) {
- const dataResult = data.dataResults[key];
- dataResult.rows = this.transformData(dataResult, xKey).rows;
- }
- return data;
- }
-
- displayData(transformedData: DataResult, yKeys: string[]) {
- this.displayedColumns = Object.assign([], yKeys);
- this.displayedColumns.unshift(this.xKey);
-
- this.dataSource.data = transformedData.rows;
- }
-
- displayGroupedData(transformedData: GroupedDataResult, yKeys: string[]) {
- this.displayedColumns = {...[], ...yKeys};
- this.displayedColumns.unshift(this.xKey);
-
- if (this.selectedGroup === undefined) {
- this.selectedGroup = this.getGroupKeys()[0];
- }
- this.dataSource.data = transformedData.dataResults[this.selectedGroup].rows;
- }
-
- stopDisplayData() {
- // this.dataSource.data = [];
- }
-
- createTableObject(keys, values) {
- const object = {};
- keys.forEach((key, index) => {
- object[key] = values[index];
- });
- return object;
- }
-
- getGroupKeys() {
- return Object.keys((this.transformedData as GroupedDataResult).dataResults);
- }
-
- selectGroup(value) {
- this.selectedGroup = value;
- if (this.selectedGroup !== undefined) {
- this.dataSource.data = (this.transformedData as GroupedDataResult)
- .dataResults[this.selectedGroup].rows;
- }
- }
-}
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer.component.html b/ui/src/app/data-explorer/explorer-widget/explorer.component.html
deleted file mode 100644
index fef5927..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer.component.html
+++ /dev/null
@@ -1,289 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<div>
- <div class="assemblyOptions sp-blue-bg">
-
- <div fxLayout="row" fxLayoutAlign="space-between start" >
- <div>
- <h4 style="display: initial">Select Index:</h4>
- <mat-form-field style="margin-top: 0px; margin-bottom: -20px; margin-left: 14px;">
- <input type="text" matInput [formControl]="myControl" [matAutocomplete]="auto">
- <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selectIndex($event.option.value)">
- <mat-option *ngFor="let indexInfo of filteredIndexInfos | async" [value]="indexInfo.measureName">
- {{indexInfo.measureName}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
- </div>
- <div fxLayout="column" style="margin-top: 10px; margin-left: 5px" *ngIf="selectedInfoResult !== undefined">
- <div fxLayout="row" fxLayoutAlign="start stretch">
- <mat-form-field style="margin-right: 1px;top: -3px;height: 1px; width: 100px" appearance="outline"
- *ngIf="dimensionProperties.length > 0">
- <mat-label>Group by</mat-label>
- <mat-select (selectionChange)="selectDimensionProperty($event.value)">
- <mat-option style="background-color: #FFFFFF">None</mat-option>
- <mat-option *ngFor="let key of dimensionProperties" [value]="key" style="background-color: #FFFFFF">
- {{key}}
- </mat-option>
- </mat-select>
- </mat-form-field>
- <mat-form-field style="margin-right: 1px;top: -3px;height: 1px;" appearance="outline">
- <mat-label>Select Data</mat-label>
- <mat-select [ngModel]="this.yAxesKeys" (selectionChange)="selectKey($event.value)" multiple>
- <mat-option *ngFor="let key of dataKeys" [value]="key" style="background-color: #FFFFFF">
- {{key}}
- </mat-option>
- </mat-select>
- </mat-form-field>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Hour'" (click)="selectTimeUnit('1 Hour')">1 Hour</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Hour'"color="primary" mat-raised-button>1 Hour</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Day'" (click)="selectTimeUnit('1 Day')">1 Day</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Day'"color="primary" mat-raised-button>1 Day</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Week'" (click)="selectTimeUnit('1 Week')">1 Week</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Week'" color="primary" mat-raised-button>1 Week</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Month'" (click)="selectTimeUnit('1 Month')">1 Month</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Month'" color="primary" mat-raised-button>1 Month</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Year'" (click)="selectTimeUnit('1 Year')">1 Year</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Year'" color="primary" mat-raised-button>1 Year</button>
-
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== 'Custom'" (click)="selectTimeUnit('Custom')">Custom</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === 'Custom'" color="primary" mat-raised-button>Custom</button>
-
- <button mat-icon-button *ngIf="!enableAdvanceOptions" class="icon" (click)="enableAdvanceOptions = true"
- style="margin-left: 5px; margin-top: -15px;" color="primary" matTooltip="Display Advanced Options">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">expand_more</mat-icon>
- </button>
- <button mat-icon-button *ngIf="enableAdvanceOptions" mat-raised-button class="icon" (click)="enableAdvanceOptions = false"
- style="margin-left: 5px; margin-top: -15px;" color="primary" matTooltip="Hide Advanced Options">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">expand_less</mat-icon>
- </button>
-
- <button mat-icon-button matTooltip="Download data" class="icon" (click)="downloadDataAsFile()"
- style="margin-top: -15px;" color="primary">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">
- get_app
- </mat-icon>
- </button>
- </div>
- <div class="optionContainer clearfix">
- <div *ngIf=enableAdvanceOptions>
- <div class="option" style="margin-left: 5px">
- <div class="optionName">Group values by time</div>
- <mat-form-field style="top: -10px; width: 80px; margin-right: 5px">
- <input matInput type="number" [(ngModel)]="groupbyValue">
- </mat-form-field>
- <mat-form-field style="top: -10px; width: 100px">
- <mat-select [(value)]="groupbyUnit">
- <!-- <mat-option style="background-color: #FFFFFF" value="ns">Nanoseconds</mat-option>
- <mat-option style="background-color: #FFFFFF" value="u">Microseconds</mat-option> -->
- <mat-option style="background-color: #FFFFFF" value="ms">Milliseconds</mat-option>
- <mat-option style="background-color: #FFFFFF" value="s">Second</mat-option>
- <mat-option style="background-color: #FFFFFF" value="m">Minute</mat-option>
- <mat-option style="background-color: #FFFFFF" value="h">Hour</mat-option>
- <mat-option style="background-color: #FFFFFF" value="d">Day</mat-option>
- <mat-option style="background-color: #FFFFFF" value="w">Week</mat-option>
- <mat-option style="background-color: #FFFFFF" value="month">Month</mat-option>
- <mat-option style="background-color: #FFFFFF" value="year">Year</mat-option>
- </mat-select>
- </mat-form-field>
- </div>
- </div>
-
- <div *ngIf="selectedTimeUnit === 'Custom'">
- <div class="option">
- <div class="optionName">Date range</div>
- <mat-form-field style="top: -10px; width: 270px">
- <input matInput [owlDateTime]="dt1" [owlDateTimeTrigger]="dt1"
- [(ngModel)]="dateRange" [selectMode]="'range'" (dateTimeChange)="loadData()">
- <mat-icon matSuffix [owlDateTimeTrigger]="dt1" style="color: white">event</mat-icon>
- <owl-date-time #dt1></owl-date-time>
- </mat-form-field>
- </div>
- </div>
-
- <button *ngIf="enableAdvanceOptions"
- mat-icon-button class="icon" style="margin-left: 5px" color="primary">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px" (click)="loadData()">autorenew</mat-icon>
- </button>
- <!--
- <div class="option" style="margin-left: 5px">
- <div class="optionName">Aggregation</div>
- <mat-form-field style="top: -10px">
- <mat-select [(value)]="sad">
- <mat-option style="background-color: #FFFFFF" value="ns">Min</mat-option>
- <mat-option style="background-color: #FFFFFF" value="u">Max</mat-option>
- <mat-option style="background-color: #FFFFFF" value="ms">Mean</mat-option>
- </mat-select>
- </mat-form-field>
- </div>
- -->
- </div>
-
- </div>
- </div>
-
-
-
- </div>
-
-
-
-
- <div layout="row">
- <div class="sp-blue-border" style="padding-top: 0px">
-
- <!-- loading -->
- <div *ngIf="displayIsLoadingData" fxLayout="column" fxLayoutAlign="space-around center" >
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <mat-spinner></mat-spinner>
- </div>
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <h3>Loading Data</h3>
- </div>
- </div>
-
- <!-- No Data in Timerange -->
- <div *ngIf="noDateFoundinTimeRange" fxLayout="column" fxLayoutAlign="space-around center" >
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <!-- TODO Icon -->
- </div>
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <button mat-icon-button (click)="handlePreviousPage()" class="paging-button" matTooltip="Going backwards in time">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">
- chevron_left
- </mat-icon>
- </button>
- <h3>Found no data in selected time range ({{dateRange[0] | date:'MM/dd/yyyy HH:mm'}} - {{dateRange[1] | date:'MM/dd/yyyy HH:mm'}})</h3>
- <button mat-icon-button (click)="handleNextPage()" class="paging-button" matTooltip="Going forwards in time">
- <mat-icon style="font-size: 30px;height: 30px; width: 30px">
- chevron_right
- </mat-icon>
- </button>
- </div>
- </div>
-
- <!-- No Data Keys Selected -->
- <div *ngIf="noKeySelected" fxLayout="column" fxLayoutAlign="space-around center" >
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <!-- TODO Icon -->
- </div>
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <h3>Please select data key(s)</h3>
- </div>
- </div>
-
- <!-- No Index Selected -->
- <div *ngIf="noIndexSelection" fxLayout="column" fxLayoutAlign="space-around center" >
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <!-- TODO Icon -->
- </div>
- <div fxLayout="row" fxLayoutAlign="center center" style="margin-top: 30px">
- <h3>Please select Index</h3>
- </div>
- </div>
-
- <!-- update data -->
- <div fxLayout="row" fxLayoutAlign="end center" *ngIf="!displayIsLoadingData && data !== undefined && yAxesKeys.length > 0">
- <button mat-icon-button class="icon" (click)="reloadData()" style="margin-right: 5px; top: 5px; z-index: 100" color="primary">
- <mat-icon style="font-size: 30px; margin-top: -4px; width: 30px"
- [ngClass]="{'rotate': autoUpdateData}">autorenew</mat-icon>
- <label *ngIf="optionAutoUpdateData" style="font-size: 12px; position: absolute;
- margin-left: -19px;">A</label>
- </button>
-
- <button mat-icon-button [matMenuTriggerFor]="menu" style="z-index: 100;top: 4px; margin-left: -10px;
- margin-right: -5px;">
- <mat-icon>more_vert</mat-icon>
- </button>
- <mat-menu #menu="matMenu">
- <div mat-menu-item (click)="$event.stopPropagation();">
- <mat-slide-toggle
- [checked]="optionAutoUpdateData"
- (change)="optionAutoUpdateData = $event.checked"
- [color]="'primary'">
- Automatic periodic update
- </mat-slide-toggle>
- </div>
- <div mat-menu-item *ngIf="optionAutoUpdateData" (click)="$event.stopPropagation();">
- <mat-icon>timelapse</mat-icon>
- <mat-form-field>
- <input matInput type="number" [(ngModel)]="autoUpdatePeriod"
- placeholder="Update period in secs">
- </mat-form-field>
- </div>
- <!--
- <div mat-menu-item disabled (click)="$event.stopPropagation();">
- <mat-slide-toggle
- [color]="'primary'">
- Reload all data instead just new ones
- </mat-slide-toggle>
- </div>
- -->
- </mat-menu>
-
- </div>
-
-
- <!-- Charts -->
- <mat-tab-group *ngIf="!displayIsLoadingData && data !== undefined && yAxesKeys.length > 0"
- [selectedIndex]="selectedMatGroup.value"
- (selectedIndexChange)="selectedMatGroup.setValue($event)"
- style="margin-top: -35px;">
- <mat-tab label="Table">
- <sp-table
- *ngIf="selectedInfoResult !== undefined"
- [datas]="data"
- [xAxesKey]="xAxesKey"
- [yAxesKeys]="yAxesKeys"
- [eventschema]="selectedInfoResult.eventSchema"
- [startDateData]="dateRange[0]"
- [endDateData]="dateRange[1]"
- [currentPage]="currentPage"
- [maxPage]="maxPage"
- [enablePaging]="true"
- (nextPage)="handleNextPage()"
- (previousPage)="handlePreviousPage()"
- (firstPage)=handleFirstPage()
- (lastPage)="handleLastPage()">
- </sp-table>
- </mat-tab>
- <mat-tab label="Line chart">
- <sp-lineChart
- *ngIf="selectedInfoResult !== undefined && selectedMatGroup.value === 1"
- [datas]="data"
- [xAxesKey]="xAxesKey"
- [yAxesKeys]="yAxesKeys"
- [eventschema]="selectedInfoResult.eventSchema"
- [startDateData]="dateRange[0]"
- [endDateData]="dateRange[1]"
- [currentPage]="currentPage"
- [maxPage]="maxPage"
- [enablePaging]="true"
- (nextPage)="handleNextPage()"
- (previousPage)="handlePreviousPage()"
- (firstPage)=handleFirstPage()
- (lastPage)="handleLastPage()"
- (zoomEvent)="zoomEventHandler($event)">
- </sp-lineChart>
- </mat-tab>
- </mat-tab-group>
- </div>
-
- </div>
-</div>
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer.component.ts b/ui/src/app/data-explorer/explorer-widget/explorer.component.ts
deleted file mode 100644
index 0d40513..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer.component.ts
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { Component, OnInit } from '@angular/core';
-import { FormControl } from '@angular/forms';
-import { MatDialog } from '@angular/material/dialog';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { timer } from 'rxjs/internal/observable/timer';
-import { Observable } from 'rxjs/Observable';
-import { map, startWith } from 'rxjs/operators';
-import { DataResult } from '../../core-model/datalake/DataResult';
-import { GroupedDataResult } from '../../core-model/datalake/GroupedDataResult';
-import { DataLakeMeasure } from '../../core-model/datalake/DataLakeMeasure';
-import { DatalakeRestService } from '../../core-services/datalake/datalake-rest.service';
-import { DataDownloadDialog } from './datadownloadDialog/dataDownload.dialog';
-
-@Component({
- selector: 'sp-explorer',
- templateUrl: './explorer.component.html',
- styleUrls: ['./explorer.css'],
-})
-export class ExplorerComponent implements OnInit {
-
- myControl = new FormControl();
- infoResult: DataLakeMeasure[];
- filteredIndexInfos: Observable<DataLakeMeasure[]>;
-
- page = 0;
- // selectedIndex: string = '';
- selectedInfoResult: DataLakeMeasure = undefined;
-
- // timeunit selection
- selectedTimeUnit = '1 Hour';
-
- // aggregation / advanced options
- // group by
- enableAdvanceOptions = false;
- groupbyUnit = 'd';
- groupbyValue = 1;
-
- // key selections
- dataKeys: string[] = [];
-
- // grouped Data
- dimensionProperties: string[] = [];
- selectedGroup = undefined;
-
- // y and x axe
- yAxesKeys: [] = [];
- xAxesKey = 'time';
-
- data;
-
- isLoadingData;
- displayIsLoadingData = false;
-
- // user messages
- noDateFoundinTimeRange;
- noKeySelected;
- noIndexSelection;
-
- // custom time range
- dateRange: Date []; // [0] start, [1] end
-
- // Mat Group
- selectedMatGroup = new FormControl(0);
-
- // auto update data
- optionAutoUpdateData = false;
- autoUpdateData = false;
- autoUpdatePeriod = 10;
- autoUpdateTimer;
- autoUpdateTimerSubcribtion;
-
- constructor(private restService: DatalakeRestService, private snackBar: MatSnackBar, public dialog: MatDialog) {
- const dateTmp = new Date();
- this.setDateRange(dateTmp, new Date(dateTmp.getTime() - 60000 * 60 * 1));
- }
-
- ngOnInit(): void {
- this.restService.getAllInfos().subscribe(res => {
- this.infoResult = res;
- this.filteredIndexInfos = this.myControl.valueChanges
- .pipe(
- startWith(''),
- map(value => this._filter(value))
- );
- this.noIndexSelection = true;
- }
- );
- }
-
- // selectTimeUnit(value) {
- // this.selectedTimeUnit = value;
- //
- // if (this.selectedTimeUnit === '1 Day') {
- // this.groupbyUnit = 's';
- // this.groupbyValue = 10;
- // } else if (this.selectedTimeUnit === '1 Day') {
- // this.groupbyUnit = 'm';
- // this.groupbyValue = 1;
- // } else if (this.selectedTimeUnit === '1 Week') {
- // this.groupbyUnit = 'm';
- // this.groupbyValue = 30;
- // } else if (this.selectedTimeUnit === '1 Month') {
- // this.groupbyUnit = 'h';
- // this.groupbyValue = 4;
- // } else if (this.selectedTimeUnit === '1 Year') {
- // this.groupbyUnit = 'h';
- // this.groupbyValue = 12;
- // }
- //
- // this.loadData(false);
- // }
-
- loadData(silentLoading?) {
- this.isLoadingData = true;
- this.noDateFoundinTimeRange = false;
- this.noIndexSelection = false;
-
- if (!silentLoading) {
- this.displayIsLoadingData = true;
- }
-
- if (this.selectedTimeUnit !== 'Custom') {
- const endDateTmp = new Date();
- let startDateTmp;
-
- if (this.selectedTimeUnit === '1 Hour') {
- startDateTmp = new Date(endDateTmp.getTime() - 60000 * 60 * 1); // 1 Hour
- } else if (this.selectedTimeUnit === '1 Day') {
- startDateTmp = new Date(endDateTmp.getTime() - 60000 * 60 * 24 * 1); // 1 Day
- } else if (this.selectedTimeUnit === '1 Week') {
- startDateTmp = new Date(endDateTmp.getTime() - 60000 * 60 * 24 * 7); // 7 Days
- } else if (this.selectedTimeUnit === '1 Month') {
- startDateTmp = new Date(endDateTmp.getTime() - 60000 * 60 * 24 * 30); // 30 Days
- } else if (this.selectedTimeUnit === '1 Year') {
- startDateTmp = new Date(endDateTmp.getTime() - 60000 * 60 * 24 * 365); // 365 Days
- }
- this.setDateRange(startDateTmp, endDateTmp);
- }
-
- if (this.enableAdvanceOptions) {
- let groupbyUnit = this.groupbyUnit;
- let groupbyValue = this.groupbyValue;
- if (this.groupbyUnit === 'month') {
- groupbyUnit = 'w';
- groupbyValue = 4 * groupbyValue;
- } else if (this.groupbyUnit === 'year') {
- groupbyUnit = 'd';
- groupbyValue = 365 * groupbyValue;
- }
- if (this.selectedGroup === undefined) {
- const startTime = new Date().getTime();
- this.restService.getData(this.selectedInfoResult.measureName, this.dateRange[0].getTime(), this.dateRange[1].getTime(),
- groupbyUnit, groupbyValue).subscribe(
- res => {
- this.processReceivedData(res);
-
- }
- );
- } else {
- this.restService.getGroupedData(this.selectedInfoResult.measureName, this.dateRange[0].getTime(),
- this.dateRange[1].getTime(), groupbyUnit, groupbyValue, this.selectedGroup).subscribe(
- res => {
- this.processReceivedGroupedData(res);
- }
- );
- }
-
- } else {
- if (this.selectedGroup === undefined) {
- this.restService.getDataAutoAggergation(this.selectedInfoResult.measureName, this.dateRange[0].getTime(), this.dateRange[1].getTime()).subscribe(
- res => {
- this.processReceivedData(res);
- }
- );
- } else {
- this.restService.getGroupedDataAutoAggergation(this.selectedInfoResult.measureName, this.dateRange[0].getTime(),
- this.dateRange[1].getTime(), this.selectedGroup).subscribe(
- res => {
- this.processReceivedGroupedData(res);
- }
- );
- }
-
- }
-
- }
-
- reloadData() {
- if (this.optionAutoUpdateData) {
- if (this.autoUpdateData) {
- this.autoUpdateData = false;
- this.autoUpdateTimerSubcribtion.unsubscribe();
- } else {
- this.autoUpdateData = true;
- this.autoUpdateTimer = timer(this.autoUpdatePeriod * 1000, this.autoUpdatePeriod * 1000);
- this.autoUpdateTimerSubcribtion = this.autoUpdateTimer.subscribe(val => {
- // Just Load new data if last request finished
- if (!this.isLoadingData) {
- this.loadData(true);
- }
- });
- }
- } else {
- this.loadData(false);
- }
- }
-
- processReceivedData(res) {
- if (res.total > 0) {
- res.measureName = this.selectedInfoResult.measureName;
- this.data = res as DataResult;
- this.noDateFoundinTimeRange = false;
- if (this.yAxesKeys.length === 0) {
- this.noKeySelected = true;
- }
- } else {
- this.data = undefined;
- this.noDateFoundinTimeRange = true;
- this.noKeySelected = false;
- }
- this.isLoadingData = false;
- this.displayIsLoadingData = false;
- }
-
- processReceivedGroupedData(res) {
- if (res.total > 0) {
- this.data = res as GroupedDataResult;
- } else {
- this.data = undefined;
- this.noDateFoundinTimeRange = true;
- this.noKeySelected = false;
- }
- this.isLoadingData = false;
- this.displayIsLoadingData = false;
- }
-
- selectIndex(index: string) {
- this.dataKeys = [];
- this.dimensionProperties = [];
- this.selectedGroup = undefined;
- this.selectedInfoResult = this._filter(index)[0];
- this.selectedInfoResult.eventSchema.eventProperties.forEach(property => {
-
- //Check if property is Primitive (only primitives has a runtimeType)
- if (property['runtimeType'] !== undefined) {
- if (property['propertyScope'] !== undefined && property['propertyScope'] === 'DIMENSION_PROPERTY') {
- this.dimensionProperties.push(property['runtimeName']);
- } else if (this.isNumberProperty(property) &&
- (property['domainProperties'] === undefined || (property.domainProperty !== 'http://schema.org/DateTime' &&
- property['domainProperties'][0] != 'http://schema.org/DateTime'))) {
-
- this.dataKeys.push(property['runtimeName']);
- }
- else if (this.isLabelProperty(property) &&
- (property['domainProperties'] === undefined || (property.domainProperty !== 'http://schema.org/DateTime' &&
- property['domainProperties'][0] != 'http://schema.org/DateTime'))) {
- this.dataKeys.push(property['runtimeName']);
- }
- } else {
- // list and nested properties
- this.dataKeys.push(property['runtimeName']);
- }
- });
- this.selectKey(this.dataKeys.slice(0, 3));
- this.loadData(false);
- }
-
- selectKey(value) {
- if (this.data === undefined) {
- this.noDateFoundinTimeRange = true;
- } else {
- this.noDateFoundinTimeRange = false;
- }
- if (value.length === 0 && !this.noDateFoundinTimeRange) {
- this.noKeySelected = true;
- } else {
- this.noKeySelected = false;
- }
- this.yAxesKeys = value;
-
- }
-
- selectDimensionProperty(value) {
- if (value !== this.selectedGroup) {
- // remove group property from the "data selection"
- this.dataKeys = this.dataKeys.filter(key => key !== value);
- this.selectKey(this.dataKeys.filter(key => key !== value));
-
- // add last grouped property
- if (this.selectedGroup !== undefined) {
- this.dataKeys.push(this.selectedGroup);
- }
-
-
- this.selectedGroup = value;
- this.loadData(false);
- }
- }
-
- downloadDataAsFile() {
- const dialogRef = this.dialog.open(DataDownloadDialog, {
- width: '600px',
- data: {data: this.data, xAxesKey: this.xAxesKey, yAxesKeys: this.yAxesKeys, index: this.selectedInfoResult.measureName, date: this.dateRange},
- panelClass: 'custom-dialog-container'
-
- });
- }
-
-
- handleNextPage() {
- let offset;
- if (this.selectedTimeUnit === 'Custom') {
- offset = this.dateRange[1].getTime() - this.dateRange[0].getTime();
- } else {
- if (this.selectedTimeUnit === '1 Day') {
- offset = 60000 * 60 * 24 * 1;
- } else if (this.selectedTimeUnit === '1 Week') {
- offset = 60000 * 60 * 24 * 7;
- } else if (this.selectedTimeUnit === '1 Month') {
- offset = 60000 * 60 * 24 * 30;
- } else if (this.selectedTimeUnit === '1 Year') {
- offset = 60000 * 60 * 24 * 365;
- }
- this.selectedTimeUnit = 'Custom';
- }
- this.setDateRange(new Date(this.dateRange[0].getTime() + offset), new Date(this.dateRange[1].getTime() + offset));
- this.loadData(false);
- }
-
- handlePreviousPage() {
- let offset;
- if (this.selectedTimeUnit === 'Custom') {
- offset = -(this.dateRange[1].getTime() - this.dateRange[0].getTime());
- } else {
- if (this.selectedTimeUnit === '1 Day') {
- offset = -60000 * 60 * 24 * 1;
- } else if (this.selectedTimeUnit === '1 Week') {
- offset = -60000 * 60 * 24 * 7;
- } else if (this.selectedTimeUnit === '1 Month') {
- offset = -60000 * 60 * 24 * 30;
- } else if (this.selectedTimeUnit === '1 Year') {
- offset = -60000 * 60 * 24 * 365;
- }
- this.selectedTimeUnit = 'Custom';
- }
- this.setDateRange(new Date(this.dateRange[0].getTime() + offset), new Date(this.dateRange[1].getTime() + offset));
- this.loadData(false);
- }
-
- handleFirstPage() {
- // TODO
- }
-
- handleLastPage() {
- // TODO
- }
-
- setDateRange(start, end) {
- this.dateRange = [];
- this.dateRange[0] = start;
- this.dateRange[1] = end;
- }
-
- openSnackBar(message: string) {
- this.snackBar.open(message, 'Close', {
- duration: 2000,
- });
- }
-
- _filter(value: string): DataLakeMeasure[] {
- const filterValue = value.toLowerCase();
-
- return this.infoResult.filter(option => option.measureName.toLowerCase().includes(filterValue));
- }
-
-
- isNumberProperty(prop) {
- if (prop.runtimeType === 'http://schema.org/Number' ||
- prop.runtimeType === 'http://www.w3.org/2001/XMLSchema#float' ||
- prop.runtimeType === 'http://www.w3.org/2001/XMLSchema#integer' ||
- prop.runtimeType === 'http://www.w3.org/2001/XMLSchema#double' ||
- prop.runtimeType === 'http://www.w3.org/2001/XMLSchema#decimal') {
-
- return true;
- } else {
- return false;
- }
- }
-
- isLabelProperty(prop) {
- if (prop.runtimeType === 'http://www.w3.org/2001/XMLSchema#string' &&
- prop.runtimeName === 'sp_internal_label') {
-
- return true;
- } else {
- return false;
- }
- }
-
- zoomEventHandler(timeRange) {
- this.selectedTimeUnit = 'Custom';
- if (timeRange[0] !== undefined) {
- this.setDateRange(new Date(timeRange[0]), new Date(timeRange[1]));
- }
- this.loadData(true);
- }
-}
diff --git a/ui/src/app/data-explorer/explorer-widget/explorer.css b/ui/src/app/data-explorer/explorer-widget/explorer.css
deleted file mode 100644
index ed244b2..0000000
--- a/ui/src/app/data-explorer/explorer-widget/explorer.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-::ng-deep .mat-form-field-underline {
- background-color: rgba(255, 255, 255, 0.8);
-}
-
-::ng-deep .mat-select-content{
- width:2000px;
- background-color: red;
- font-size: 10px;
-}
-
-.option {
- border: #ffffff solid 1px;
- border-radius: 5px;
- margin-top: 10px;
- height: 50px;
- float: left;
- padding-left: 5px;
- padding-right: 5px;
-}
-
-.optionName {
- margin-top: -10px;
- margin-left: 8px;
- padding-left: 3px;
- padding-right: 2px;
- width: fit-content;
- background:#9c9c9c;
-}
-
-.icon {
- top: 15px;
- border: #202020 solid 1px;
- margin-left: 5px
-}
-
-.optionContainer {
-}
-
-.clearfix:after {
- content: "";
- display: table;
- clear: both;
-}
-
-.paging-button {
- top: 6px;
- margin: 10px;
- border: #202020 solid 1px;
-}
-
-.custom-dialog-container .mat-dialog-container {
- padding-top: 0px !important;
-}
-
-.rotate {
- -webkit-animation:spin 4s linear infinite;
- -moz-animation:spin 4s linear infinite;
- animation:spin 4s linear infinite;
-}
-
-@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
-@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
-@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
-
-::ng-deep .mat-select-panel {
- max-height: 70vh !important;
-}
\ No newline at end of file
diff --git a/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.css b/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.css
deleted file mode 100644
index 13cbc4a..0000000
--- a/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
diff --git a/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.html b/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.html
deleted file mode 100644
index 91b77af..0000000
--- a/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<div flex layout-fill layout="row" layout-align="start center" style="padding-top: 5px;">
-
-
- <!--<div flex layout-fill class="option">-->
- <!--<div class="optionName">Date range</div>-->
- <!--<mat-form-field style="top: -10px; width: 270px">-->
- <!--<input matInput [owlDateTime]="dt1" [owlDateTimeTrigger]="dt1"-->
- <!--[(ngModel)]="dateRange" [selectMode]="'range'" (dateTimeChange)="loadData()">-->
- <!--<mat-icon matSuffix [owlDateTimeTrigger]="dt1" style="color: grey">event</mat-icon>-->
- <!--<owl-date-time #dt1></owl-date-time>-->
- <!--</mat-form-field>-->
- <!--</div>-->
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Hour'" (click)="selectTimeUnit('1 Hour')">1 Hour</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Hour'"color="primary" mat-raised-button>1 Hour</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Day'" (click)="selectTimeUnit('1 Day')">1 Day</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Day'"color="primary" mat-raised-button>1 Day</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Week'" (click)="selectTimeUnit('1 Week')">1 Week</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Week'" color="primary" mat-raised-button>1 Week</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Month'" (click)="selectTimeUnit('1 Month')">1 Month</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Month'" color="primary" mat-raised-button>1 Month</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== '1 Year'" (click)="selectTimeUnit('1 Year')">1 Year</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === '1 Year'" color="primary" mat-raised-button>1 Year</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit !== 'Custom'" (click)="selectTimeUnit('Custom')">Custom</button>
- <button mat-button mat-stroked-button *ngIf="selectedTimeUnit === 'Custom'" color="primary" mat-raised-button>Custom</button>
-
-
-</div>
diff --git a/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts b/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts
deleted file mode 100644
index beaff8c..0000000
--- a/ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'sp-old-time-range-selector',
- templateUrl: 'timeRangeSelector.component.html',
- styleUrls: ['./timeRangeSelector.component.css']
-})
-export class TimeRangeSelectorComponent {
-
- selectedTimeUnit = '1 Hour';
-
- dateRange: Date []; // [0] start, [1] end
-
- constructor() {
- }
-
- selectTimeUnit(value) {
- this.selectedTimeUnit = value;
- }
-}
[incubator-streampipes] 02/02: Rename date new explorer module
Posted by ze...@apache.org.
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