You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/03/07 21:34:05 UTC
[incubator-streampipes] 03/04: Move dashboardv2 module to dashboard
directory
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 49cfe215aabeb98003a8f736367ca2cd08c6aef3
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Mar 7 20:38:10 2020 +0100
Move dashboardv2 module to dashboard directory
---
ui/deployment/dev/config.yml | 5 ++--
ui/deployment/modules.yml | 28 ++++++----------------
.../components/grid/dashboard-grid.component.css | 0
.../components/grid/dashboard-grid.component.html | 0
.../components/grid/dashboard-grid.component.ts | 0
.../overview/dashboard-overview.component.css | 0
.../overview/dashboard-overview.component.html | 0
.../overview/dashboard-overview.component.ts | 0
.../components/panel/dashboard-panel.component.css | 0
.../panel/dashboard-panel.component.html | 0
.../components/panel/dashboard-panel.component.ts | 0
.../widget/dashboard-widget.component.css | 0
.../widget/dashboard-widget.component.html | 0
.../widget/dashboard-widget.component.ts | 0
.../components/widgets/area/area-config.ts | 0
.../widgets/area/area-widget.component.css | 0
.../widgets/area/area-widget.component.html | 0
.../widgets/area/area-widget.component.ts | 0
.../components/widgets/base/base-config.ts | 0
.../widgets/base/base-ngx-charts-widget.ts | 0
.../widgets/base/base-ngx-line-charts-widget.ts | 0
.../widgets/base/base-ngx-line-config.ts | 0
.../components/widgets/base/base-widget.ts | 0
.../components/widgets/gauge/gauge-config.ts | 0
.../widgets/gauge/gauge-widget.component.css | 0
.../widgets/gauge/gauge-widget.component.html | 0
.../widgets/gauge/gauge-widget.component.ts | 0
.../components/widgets/html/html-config.ts | 0
.../widgets/html/html-widget.component.css | 0
.../widgets/html/html-widget.component.html | 0
.../widgets/html/html-widget.component.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
.../components/widgets/line/line-config.ts | 0
.../widgets/line/line-widget.component.css | 0
.../widgets/line/line-widget.component.html | 0
.../widgets/line/line-widget.component.ts | 0
.../components/widgets/map/map-config.ts | 0
.../widgets/map/map-widget.component.css | 0
.../widgets/map/map-widget.component.html | 0
.../components/widgets/map/map-widget.component.ts | 0
.../components/widgets/number/number-config.ts | 0
.../widgets/number/number-widget.component.css | 0
.../widgets/number/number-widget.component.html | 0
.../widgets/number/number-widget.component.ts | 0
.../components/widgets/raw/raw-config.ts | 0
.../widgets/raw/raw-widget.component.css | 0
.../widgets/raw/raw-widget.component.html | 0
.../components/widgets/raw/raw-widget.component.ts | 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
.../widgets/trafficlight/traffic-light-config.ts | 0
.../traffic-light-widget.component.css | 0
.../traffic-light-widget.component.html | 0
.../trafficlight/traffic-light-widget.component.ts | 0
.../dashboard.component.css | 0
.../dashboard.component.html | 0
.../dashboard.component.ts | 0
.../dashboard.module.ts | 0
.../add-visualization-dialog.component.css | 0
.../add-visualization-dialog.component.html | 0
.../add-visualization-dialog.component.ts | 0
.../edit-dashboard-dialog.component.css | 0
.../edit-dashboard-dialog.component.html | 0
.../edit-dashboard-dialog.component.ts | 0
.../models/dashboard.model.ts | 0
.../models/gridster-info.model.ts | 0
.../models/multi-series.model.ts | 0
.../registry/widget-config-builder.ts | 0
.../registry/widget-registry.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/dashboard.service.ts | 0
.../services/refresh-dashboard.service.ts | 0
.../services/resize.service.ts | 0
.../services/websocket.config.ts | 0
.../services/websocket.settings.ts | 0
90 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/ui/deployment/dev/config.yml b/ui/deployment/dev/config.yml
index 0424e05..28f18b3 100644
--- a/ui/deployment/dev/config.yml
+++ b/ui/deployment/dev/config.yml
@@ -21,10 +21,9 @@ modules:
- spEditor
- spPipelines
- spConnect
-# - spDashboard
+ - spDashboard
- spAppOverview
- spAdd
- spMyElements
- spDataExplorer
- - spConfiguration
- - spDashboard2
\ No newline at end of file
+ - spConfiguration
\ No newline at end of file
diff --git a/ui/deployment/modules.yml b/ui/deployment/modules.yml
index 62432db..f2d1ef8 100644
--- a/ui/deployment/modules.yml
+++ b/ui/deployment/modules.yml
@@ -55,20 +55,6 @@ spPipelines:
icon: 'av:ic_play_arrow_24px'
homeImage: '/assets/img/home/pipelines.png'
admin: False
-spDashboard:
- ng5: False
- ng1_templateUrl: '../dashboard/dashboard.html'
- ng5_moduleName: ''
- ng5_component: ''
- ng5_componentPath: ''
- path: './dashboard/dashboard.module'
- link: 'streampipes.dashboard'
- url: '/dashboard'
- title: 'Live Dashboard'
- description: 'The live dashboard visualizes data in real-time'
- icon: 'editor:ic_insert_chart_24px'
- homeImage: '/assets/img/home/dashboard.png'
- admin: False
spSensors:
ng5: False
ng1_templateUrl: '../sensors/sensors.html'
@@ -155,18 +141,18 @@ spAppOverview:
icon: 'navigation:ic_apps_24px'
homeImage: '/assets/img/home/configuration.png'
admin: false
-spDashboard2:
+spDashboard:
ng5: True
ng1_templateUrl: ''
ng1_controller: ''
ng5_moduleName: 'DashboardModule'
ng5_component: 'DashboardComponent'
- ng5_componentPath: '../dashboard-v2/dashboard.component'
- path: './dashboard-v2/dashboard.module'
- link: 'streampipes.dashboardv2'
- url: '/dashboardv2'
+ ng5_componentPath: '../dashboard/dashboard.component'
+ path: './dashboard/dashboard.module'
+ link: 'streampipes.dashboard'
+ url: '/dashboard'
title: 'Dashboard'
- description: 'dashboard-v2'
- icon: 'navigation:ic_apps_24px'
+ description: 'The live dashboard visualizes data in real-time'
+ icon: 'editor:ic_insert_chart_24px'
homeImage: '/assets/img/home/configuration.png'
admin: false
\ No newline at end of file
diff --git a/ui/src/app/dashboard-v2/components/grid/dashboard-grid.component.css b/ui/src/app/dashboard/components/grid/dashboard-grid.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/grid/dashboard-grid.component.css
rename to ui/src/app/dashboard/components/grid/dashboard-grid.component.css
diff --git a/ui/src/app/dashboard-v2/components/grid/dashboard-grid.component.html b/ui/src/app/dashboard/components/grid/dashboard-grid.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/grid/dashboard-grid.component.html
rename to ui/src/app/dashboard/components/grid/dashboard-grid.component.html
diff --git a/ui/src/app/dashboard-v2/components/grid/dashboard-grid.component.ts b/ui/src/app/dashboard/components/grid/dashboard-grid.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/grid/dashboard-grid.component.ts
rename to ui/src/app/dashboard/components/grid/dashboard-grid.component.ts
diff --git a/ui/src/app/dashboard-v2/components/overview/dashboard-overview.component.css b/ui/src/app/dashboard/components/overview/dashboard-overview.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/overview/dashboard-overview.component.css
rename to ui/src/app/dashboard/components/overview/dashboard-overview.component.css
diff --git a/ui/src/app/dashboard-v2/components/overview/dashboard-overview.component.html b/ui/src/app/dashboard/components/overview/dashboard-overview.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/overview/dashboard-overview.component.html
rename to ui/src/app/dashboard/components/overview/dashboard-overview.component.html
diff --git a/ui/src/app/dashboard-v2/components/overview/dashboard-overview.component.ts b/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/overview/dashboard-overview.component.ts
rename to ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
diff --git a/ui/src/app/dashboard-v2/components/panel/dashboard-panel.component.css b/ui/src/app/dashboard/components/panel/dashboard-panel.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/panel/dashboard-panel.component.css
rename to ui/src/app/dashboard/components/panel/dashboard-panel.component.css
diff --git a/ui/src/app/dashboard-v2/components/panel/dashboard-panel.component.html b/ui/src/app/dashboard/components/panel/dashboard-panel.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/panel/dashboard-panel.component.html
rename to ui/src/app/dashboard/components/panel/dashboard-panel.component.html
diff --git a/ui/src/app/dashboard-v2/components/panel/dashboard-panel.component.ts b/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/panel/dashboard-panel.component.ts
rename to ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widget/dashboard-widget.component.css b/ui/src/app/dashboard/components/widget/dashboard-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widget/dashboard-widget.component.css
rename to ui/src/app/dashboard/components/widget/dashboard-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widget/dashboard-widget.component.html b/ui/src/app/dashboard/components/widget/dashboard-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widget/dashboard-widget.component.html
rename to ui/src/app/dashboard/components/widget/dashboard-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widget/dashboard-widget.component.ts b/ui/src/app/dashboard/components/widget/dashboard-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widget/dashboard-widget.component.ts
rename to ui/src/app/dashboard/components/widget/dashboard-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/area/area-config.ts b/ui/src/app/dashboard/components/widgets/area/area-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/area/area-config.ts
rename to ui/src/app/dashboard/components/widgets/area/area-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/area/area-widget.component.css b/ui/src/app/dashboard/components/widgets/area/area-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/area/area-widget.component.css
rename to ui/src/app/dashboard/components/widgets/area/area-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/area/area-widget.component.html b/ui/src/app/dashboard/components/widgets/area/area-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/area/area-widget.component.html
rename to ui/src/app/dashboard/components/widgets/area/area-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/area/area-widget.component.ts b/ui/src/app/dashboard/components/widgets/area/area-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/area/area-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/area/area-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/base/base-config.ts b/ui/src/app/dashboard/components/widgets/base/base-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/base/base-config.ts
rename to ui/src/app/dashboard/components/widgets/base/base-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/base/base-ngx-charts-widget.ts b/ui/src/app/dashboard/components/widgets/base/base-ngx-charts-widget.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/base/base-ngx-charts-widget.ts
rename to ui/src/app/dashboard/components/widgets/base/base-ngx-charts-widget.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/base/base-ngx-line-charts-widget.ts b/ui/src/app/dashboard/components/widgets/base/base-ngx-line-charts-widget.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/base/base-ngx-line-charts-widget.ts
rename to ui/src/app/dashboard/components/widgets/base/base-ngx-line-charts-widget.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/base/base-ngx-line-config.ts b/ui/src/app/dashboard/components/widgets/base/base-ngx-line-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/base/base-ngx-line-config.ts
rename to ui/src/app/dashboard/components/widgets/base/base-ngx-line-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/base/base-widget.ts b/ui/src/app/dashboard/components/widgets/base/base-widget.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/base/base-widget.ts
rename to ui/src/app/dashboard/components/widgets/base/base-widget.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/gauge/gauge-config.ts b/ui/src/app/dashboard/components/widgets/gauge/gauge-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/gauge/gauge-config.ts
rename to ui/src/app/dashboard/components/widgets/gauge/gauge-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/gauge/gauge-widget.component.css b/ui/src/app/dashboard/components/widgets/gauge/gauge-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/gauge/gauge-widget.component.css
rename to ui/src/app/dashboard/components/widgets/gauge/gauge-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/gauge/gauge-widget.component.html b/ui/src/app/dashboard/components/widgets/gauge/gauge-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/gauge/gauge-widget.component.html
rename to ui/src/app/dashboard/components/widgets/gauge/gauge-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/gauge/gauge-widget.component.ts b/ui/src/app/dashboard/components/widgets/gauge/gauge-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/gauge/gauge-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/gauge/gauge-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/html/html-config.ts b/ui/src/app/dashboard/components/widgets/html/html-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/html/html-config.ts
rename to ui/src/app/dashboard/components/widgets/html/html-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/html/html-widget.component.css b/ui/src/app/dashboard/components/widgets/html/html-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/html/html-widget.component.css
rename to ui/src/app/dashboard/components/widgets/html/html-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/html/html-widget.component.html b/ui/src/app/dashboard/components/widgets/html/html-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/html/html-widget.component.html
rename to ui/src/app/dashboard/components/widgets/html/html-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/html/html-widget.component.ts b/ui/src/app/dashboard/components/widgets/html/html-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/html/html-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/html/html-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/image/image-config.ts b/ui/src/app/dashboard/components/widgets/image/image-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/image/image-config.ts
rename to ui/src/app/dashboard/components/widgets/image/image-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/image/image-widget.component.css b/ui/src/app/dashboard/components/widgets/image/image-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/image/image-widget.component.css
rename to ui/src/app/dashboard/components/widgets/image/image-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/image/image-widget.component.html b/ui/src/app/dashboard/components/widgets/image/image-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/image/image-widget.component.html
rename to ui/src/app/dashboard/components/widgets/image/image-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/image/image-widget.component.ts b/ui/src/app/dashboard/components/widgets/image/image-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/image/image-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/image/image-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/line/line-config.ts b/ui/src/app/dashboard/components/widgets/line/line-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/line/line-config.ts
rename to ui/src/app/dashboard/components/widgets/line/line-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/line/line-widget.component.css b/ui/src/app/dashboard/components/widgets/line/line-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/line/line-widget.component.css
rename to ui/src/app/dashboard/components/widgets/line/line-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/line/line-widget.component.html b/ui/src/app/dashboard/components/widgets/line/line-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/line/line-widget.component.html
rename to ui/src/app/dashboard/components/widgets/line/line-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/line/line-widget.component.ts b/ui/src/app/dashboard/components/widgets/line/line-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/line/line-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/line/line-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/map/map-config.ts b/ui/src/app/dashboard/components/widgets/map/map-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/map/map-config.ts
rename to ui/src/app/dashboard/components/widgets/map/map-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/map/map-widget.component.css b/ui/src/app/dashboard/components/widgets/map/map-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/map/map-widget.component.css
rename to ui/src/app/dashboard/components/widgets/map/map-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/map/map-widget.component.html b/ui/src/app/dashboard/components/widgets/map/map-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/map/map-widget.component.html
rename to ui/src/app/dashboard/components/widgets/map/map-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/map/map-widget.component.ts b/ui/src/app/dashboard/components/widgets/map/map-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/map/map-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/map/map-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/number/number-config.ts b/ui/src/app/dashboard/components/widgets/number/number-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/number/number-config.ts
rename to ui/src/app/dashboard/components/widgets/number/number-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/number/number-widget.component.css b/ui/src/app/dashboard/components/widgets/number/number-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/number/number-widget.component.css
rename to ui/src/app/dashboard/components/widgets/number/number-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/number/number-widget.component.html b/ui/src/app/dashboard/components/widgets/number/number-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/number/number-widget.component.html
rename to ui/src/app/dashboard/components/widgets/number/number-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/number/number-widget.component.ts b/ui/src/app/dashboard/components/widgets/number/number-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/number/number-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/number/number-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/raw/raw-config.ts b/ui/src/app/dashboard/components/widgets/raw/raw-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/raw/raw-config.ts
rename to ui/src/app/dashboard/components/widgets/raw/raw-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/raw/raw-widget.component.css b/ui/src/app/dashboard/components/widgets/raw/raw-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/raw/raw-widget.component.css
rename to ui/src/app/dashboard/components/widgets/raw/raw-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/raw/raw-widget.component.html b/ui/src/app/dashboard/components/widgets/raw/raw-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/raw/raw-widget.component.html
rename to ui/src/app/dashboard/components/widgets/raw/raw-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/raw/raw-widget.component.ts b/ui/src/app/dashboard/components/widgets/raw/raw-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/raw/raw-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/raw/raw-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/table/table-config.ts b/ui/src/app/dashboard/components/widgets/table/table-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/table/table-config.ts
rename to ui/src/app/dashboard/components/widgets/table/table-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/table/table-widget.component.css b/ui/src/app/dashboard/components/widgets/table/table-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/table/table-widget.component.css
rename to ui/src/app/dashboard/components/widgets/table/table-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/table/table-widget.component.html b/ui/src/app/dashboard/components/widgets/table/table-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/table/table-widget.component.html
rename to ui/src/app/dashboard/components/widgets/table/table-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/table/table-widget.component.ts b/ui/src/app/dashboard/components/widgets/table/table-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/table/table-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/table/table-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-config.ts b/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-config.ts
rename to ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-config.ts
diff --git a/ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-widget.component.css b/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-widget.component.css
rename to ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.css
diff --git a/ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-widget.component.html b/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-widget.component.html
rename to ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.html
diff --git a/ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-widget.component.ts b/ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/components/widgets/trafficlight/traffic-light-widget.component.ts
rename to ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.ts
diff --git a/ui/src/app/dashboard-v2/dashboard.component.css b/ui/src/app/dashboard/dashboard.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/dashboard.component.css
rename to ui/src/app/dashboard/dashboard.component.css
diff --git a/ui/src/app/dashboard-v2/dashboard.component.html b/ui/src/app/dashboard/dashboard.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/dashboard.component.html
rename to ui/src/app/dashboard/dashboard.component.html
diff --git a/ui/src/app/dashboard-v2/dashboard.component.ts b/ui/src/app/dashboard/dashboard.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/dashboard.component.ts
rename to ui/src/app/dashboard/dashboard.component.ts
diff --git a/ui/src/app/dashboard-v2/dashboard.module.ts b/ui/src/app/dashboard/dashboard.module.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/dashboard.module.ts
rename to ui/src/app/dashboard/dashboard.module.ts
diff --git a/ui/src/app/dashboard-v2/dialogs/add-widget/add-visualization-dialog.component.css b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/dialogs/add-widget/add-visualization-dialog.component.css
rename to ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.css
diff --git a/ui/src/app/dashboard-v2/dialogs/add-widget/add-visualization-dialog.component.html b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/dialogs/add-widget/add-visualization-dialog.component.html
rename to ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.html
diff --git a/ui/src/app/dashboard-v2/dialogs/add-widget/add-visualization-dialog.component.ts b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/dialogs/add-widget/add-visualization-dialog.component.ts
rename to ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
diff --git a/ui/src/app/dashboard-v2/dialogs/edit-dashboard/edit-dashboard-dialog.component.css b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.css
similarity index 100%
rename from ui/src/app/dashboard-v2/dialogs/edit-dashboard/edit-dashboard-dialog.component.css
rename to ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.css
diff --git a/ui/src/app/dashboard-v2/dialogs/edit-dashboard/edit-dashboard-dialog.component.html b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html
similarity index 100%
rename from ui/src/app/dashboard-v2/dialogs/edit-dashboard/edit-dashboard-dialog.component.html
rename to ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html
diff --git a/ui/src/app/dashboard-v2/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
rename to ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
diff --git a/ui/src/app/dashboard-v2/models/dashboard.model.ts b/ui/src/app/dashboard/models/dashboard.model.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/models/dashboard.model.ts
rename to ui/src/app/dashboard/models/dashboard.model.ts
diff --git a/ui/src/app/dashboard-v2/models/gridster-info.model.ts b/ui/src/app/dashboard/models/gridster-info.model.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/models/gridster-info.model.ts
rename to ui/src/app/dashboard/models/gridster-info.model.ts
diff --git a/ui/src/app/dashboard-v2/models/multi-series.model.ts b/ui/src/app/dashboard/models/multi-series.model.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/models/multi-series.model.ts
rename to ui/src/app/dashboard/models/multi-series.model.ts
diff --git a/ui/src/app/dashboard-v2/registry/widget-config-builder.ts b/ui/src/app/dashboard/registry/widget-config-builder.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/registry/widget-config-builder.ts
rename to ui/src/app/dashboard/registry/widget-config-builder.ts
diff --git a/ui/src/app/dashboard-v2/registry/widget-registry.ts b/ui/src/app/dashboard/registry/widget-registry.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/registry/widget-registry.ts
rename to ui/src/app/dashboard/registry/widget-registry.ts
diff --git a/ui/src/app/dashboard-v2/sdk/collected-schema-requirements.ts b/ui/src/app/dashboard/sdk/collected-schema-requirements.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/collected-schema-requirements.ts
rename to ui/src/app/dashboard/sdk/collected-schema-requirements.ts
diff --git a/ui/src/app/dashboard-v2/sdk/ep-requirements.ts b/ui/src/app/dashboard/sdk/ep-requirements.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/ep-requirements.ts
rename to ui/src/app/dashboard/sdk/ep-requirements.ts
diff --git a/ui/src/app/dashboard-v2/sdk/extractor/static-property-extractor.ts b/ui/src/app/dashboard/sdk/extractor/static-property-extractor.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/extractor/static-property-extractor.ts
rename to ui/src/app/dashboard/sdk/extractor/static-property-extractor.ts
diff --git a/ui/src/app/dashboard-v2/sdk/matching/datatype-match.ts b/ui/src/app/dashboard/sdk/matching/datatype-match.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/matching/datatype-match.ts
rename to ui/src/app/dashboard/sdk/matching/datatype-match.ts
diff --git a/ui/src/app/dashboard-v2/sdk/matching/domain-property-match.ts b/ui/src/app/dashboard/sdk/matching/domain-property-match.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/matching/domain-property-match.ts
rename to ui/src/app/dashboard/sdk/matching/domain-property-match.ts
diff --git a/ui/src/app/dashboard-v2/sdk/matching/mapping-property-generator.ts b/ui/src/app/dashboard/sdk/matching/mapping-property-generator.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/matching/mapping-property-generator.ts
rename to ui/src/app/dashboard/sdk/matching/mapping-property-generator.ts
diff --git a/ui/src/app/dashboard-v2/sdk/matching/primitive-property-match.ts b/ui/src/app/dashboard/sdk/matching/primitive-property-match.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/matching/primitive-property-match.ts
rename to ui/src/app/dashboard/sdk/matching/primitive-property-match.ts
diff --git a/ui/src/app/dashboard-v2/sdk/matching/property-match.ts b/ui/src/app/dashboard/sdk/matching/property-match.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/matching/property-match.ts
rename to ui/src/app/dashboard/sdk/matching/property-match.ts
diff --git a/ui/src/app/dashboard-v2/sdk/model/datatypes.ts b/ui/src/app/dashboard/sdk/model/datatypes.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/model/datatypes.ts
rename to ui/src/app/dashboard/sdk/model/datatypes.ts
diff --git a/ui/src/app/dashboard-v2/sdk/model/vocabulary.ts b/ui/src/app/dashboard/sdk/model/vocabulary.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/model/vocabulary.ts
rename to ui/src/app/dashboard/sdk/model/vocabulary.ts
diff --git a/ui/src/app/dashboard-v2/sdk/schema-requirements-builder.ts b/ui/src/app/dashboard/sdk/schema-requirements-builder.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/sdk/schema-requirements-builder.ts
rename to ui/src/app/dashboard/sdk/schema-requirements-builder.ts
diff --git a/ui/src/app/dashboard-v2/services/dashboard.service.ts b/ui/src/app/dashboard/services/dashboard.service.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/services/dashboard.service.ts
rename to ui/src/app/dashboard/services/dashboard.service.ts
diff --git a/ui/src/app/dashboard-v2/services/refresh-dashboard.service.ts b/ui/src/app/dashboard/services/refresh-dashboard.service.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/services/refresh-dashboard.service.ts
rename to ui/src/app/dashboard/services/refresh-dashboard.service.ts
diff --git a/ui/src/app/dashboard-v2/services/resize.service.ts b/ui/src/app/dashboard/services/resize.service.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/services/resize.service.ts
rename to ui/src/app/dashboard/services/resize.service.ts
diff --git a/ui/src/app/dashboard-v2/services/websocket.config.ts b/ui/src/app/dashboard/services/websocket.config.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/services/websocket.config.ts
rename to ui/src/app/dashboard/services/websocket.config.ts
diff --git a/ui/src/app/dashboard-v2/services/websocket.settings.ts b/ui/src/app/dashboard/services/websocket.settings.ts
similarity index 100%
rename from ui/src/app/dashboard-v2/services/websocket.settings.ts
rename to ui/src/app/dashboard/services/websocket.settings.ts