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/03/12 20:47:07 UTC
[incubator-streampipes] 01/04: Merge branch 'dev' into
STREAMPIPES-79
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-79
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 2dc7f3c2052b5d618016dfebda961f05bc9d24c1
Merge: 25ed819 9a1d08d
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Mar 9 13:34:37 2020 +0100
Merge branch 'dev' into STREAMPIPES-79
.github/workflows/build.yml | 2 +-
.../worker/management/AdapterWorkerManagement.java | 2 +-
.../streampipes/connect/adapter/Adapter.java | 7 +
.../messaging/kafka/SpKafkaProducer.java | 1 +
.../model/dashboard/DashboardWidgetSettings.java | 22 ++
.../rest/impl/PipelineWithUserResource.java | 3 +-
.../builder/AbstractPipelineElementBuilder.java | 4 +
.../apache/streampipes/vocabulary/StreamPipes.java | 2 +
ui/angular.json | 7 +-
ui/browserslist | 18 +-
ui/deployment/dev/config.yml | 6 +-
ui/deployment/modules.yml | 28 +--
ui/deployment/state.config.mst | 10 +
ui/deployment/toolbar.controller.mst | 2 +-
ui/package.json | 40 ++--
ui/src/app/connect/model/Option.ts | 7 +-
.../model/RuntimeResolvableAnyStaticProperty.ts | 4 +-
.../model/RuntimeResolvableOneOfStaticProperty.ts | 4 +-
.../app/connect/model/SelectionStaticProperty.ts | 3 +-
.../static-property-util.service.ts | 8 +-
.../static-secret-input.component.html | 4 +-
.../base/Tuple2.ts} | 9 +-
.../dashboard/DashboardWidgetSettings.ts | 6 +
.../core-model/dashboard/VisualizablePipeline.ts | 2 +
ui/src/app/dashboard-v2/dashboard.module.ts | 126 ----------
ui/src/app/dashboard/add-widget-template.html | 129 -----------
ui/src/app/dashboard/add-widget.controller.ts | 180 ---------------
.../dashboard/components/config-item.component.ts | 31 ---
.../dashboard/components/config-item.controller.ts | 21 --
.../app/dashboard/components/config-item.tmpl.html | 29 ---
.../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 | 28 ++-
.../overview/dashboard-overview.component.ts | 20 +-
.../components/panel/dashboard-panel.component.css | 0
.../panel/dashboard-panel.component.html | 0
.../components/panel/dashboard-panel.component.ts | 0
.../standalone/standalone-dashboard.component.css} | 15 +-
.../standalone/standalone-dashboard.component.html | 21 ++
.../standalone/standalone-dashboard.component.ts | 44 ++++
.../widget/dashboard-widget.component.css | 14 ++
.../widget/dashboard-widget.component.html | 32 ++-
.../widget/dashboard-widget.component.ts | 9 +-
.../components/widgets/area/area-config.ts | 10 +-
.../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 | 36 +--
.../widgets/base/base-ngx-line-charts-widget.ts | 0
.../widgets/base/base-ngx-line-config.ts | 6 +
.../components/widgets/base/base-widget.ts | 41 +++-
.../components/widgets/gauge/gauge-config.ts | 4 +-
.../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 | 43 ++++
.../widgets/html/html-widget.component.css} | 14 +-
.../widgets/html/html-widget.component.html | 25 ++
.../widgets/html/html-widget.component.ts | 65 ++++++
.../components/widgets/image/image-config.ts | 4 +-
.../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 | 10 +-
.../widgets/line/line-widget.component.css | 0
.../widgets/line/line-widget.component.html | 0
.../widgets/line/line-widget.component.ts | 0
.../dashboard/components/widgets/map/map-config.ts | 49 ++++
.../widgets/map/map-widget.component.css} | 13 +-
.../widgets/map/map-widget.component.html | 28 +++
.../components/widgets/map/map-widget.component.ts | 122 ++++++++++
.../components/widgets/number/number-config.ts | 3 +-
.../widgets/number/number-widget.component.css | 0
.../widgets/number/number-widget.component.html | 0
.../widgets/number/number-widget.component.ts | 8 +-
.../components/widgets/raw/raw-config.ts} | 25 +-
.../widgets/raw/raw-widget.component.css} | 18 +-
.../widgets/raw/raw-widget.component.html | 27 +++
.../components/widgets/raw/raw-widget.component.ts | 67 ++++++
.../components/widgets/table/table-config.ts | 4 +-
.../widgets/table/table-widget.component.css | 0
.../widgets/table/table-widget.component.html | 0
.../widgets/table/table-widget.component.ts | 8 +-
.../widgets/trafficlight/traffic-light-config.ts | 50 ++++
.../traffic-light-widget.component.css} | 40 +++-
.../traffic-light-widget.component.html | 31 +++
.../trafficlight/traffic-light-widget.component.ts | 124 ++++++++++
ui/src/app/dashboard/dashboard-frame.html | 71 ------
ui/src/app/dashboard/dashboard-layout-frame.html | 54 -----
.../dashboard.component.css | 0
.../dashboard.component.html | 0
.../dashboard.component.ts | 6 +-
ui/src/app/dashboard/dashboard.controller.ts | 181 ---------------
ui/src/app/dashboard/dashboard.html | 22 --
ui/src/app/dashboard/dashboard.module.ts | 256 ++++++++++-----------
.../no-pipeline-present-dialog.controller.ts | 36 ---
.../dialog/no-pipeline-present-dialog.tmpl.html | 43 ----
.../add-visualization-dialog.component.css | 16 ++
.../add-visualization-dialog.component.html | 42 ++--
.../add-visualization-dialog.component.ts | 25 +-
.../edit-dashboard-dialog.component.css | 0
.../edit-dashboard-dialog.component.html | 4 +-
.../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 | 45 +++-
.../registry/widget-registry.ts | 10 +-
.../sdk/collected-schema-requirements.ts | 0
.../sdk/ep-requirements.ts | 9 +
.../sdk/extractor/static-property-extractor.ts | 11 +
.../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 | 1 +
.../sdk/schema-requirements-builder.ts | 0
.../services/dashboard.service.ts | 25 +-
.../services/refresh-dashboard.service.ts | 0
.../services/resize.service.ts | 0
.../services/websocket.config.ts | 0
.../services/websocket.settings.ts | 0
.../socket-connection-data-model.service.ts | 102 --------
.../templates/gauge/gauge-config.component.ts | 30 ---
.../templates/gauge/gauge-data-model.service.ts | 33 ---
.../dashboard/templates/gauge/gauge.directive.ts | 67 ------
ui/src/app/dashboard/templates/gauge/gauge.html | 19 --
.../app/dashboard/templates/gauge/gaugeConfig.html | 52 -----
.../templates/heatmap/heatmap-config.component.ts | 30 ---
.../heatmap/heatmap-data-model.service.ts | 34 ---
.../templates/heatmap/heatmap.directive.ts | 74 ------
.../app/dashboard/templates/heatmap/heatmap.html | 25 --
.../dashboard/templates/heatmap/heatmapConfig.html | 38 ---
.../templates/html/html-config.component.ts | 30 ---
.../templates/html/html-data-model.service.ts | 33 ---
.../app/dashboard/templates/html/html.directive.ts | 51 ----
.../app/dashboard/templates/html/htmlConfig.html | 30 ---
.../app/dashboard/templates/html/htmltemplate.html | 20 --
.../templates/image/image-config.component.ts | 30 ---
.../templates/image/image-data-model.service.ts | 33 ---
.../dashboard/templates/image/image.directive.ts | 51 ----
ui/src/app/dashboard/templates/image/image.html | 19 --
.../app/dashboard/templates/image/imageConfig.html | 30 ---
.../templates/line/line-config.component.ts | 31 ---
.../templates/line/line-data-model.service.ts | 33 ---
.../app/dashboard/templates/line/line.directive.ts | 63 -----
ui/src/app/dashboard/templates/line/line.html | 19 --
.../app/dashboard/templates/line/lineConfig.html | 60 -----
.../map.deprecated/map-config.component.ts | 30 ---
.../map.deprecated/map-data-model.service.ts | 34 ---
.../templates/map.deprecated/map.directive.ts | 48 ----
.../dashboard/templates/map.deprecated/map.html | 25 --
.../templates/map.deprecated/mapConfig.html | 49 ----
.../templates/map/map-config.component.ts | 36 ---
.../templates/map/map-data-model.service.ts | 34 ---
.../app/dashboard/templates/map/map.directive.ts | 129 -----------
ui/src/app/dashboard/templates/map/map.html | 37 ---
ui/src/app/dashboard/templates/map/mapConfig.html | 61 -----
.../templates/number/number-config.component.ts | 30 ---
.../templates/number/number-data-model.service.ts | 33 ---
.../dashboard/templates/number/number.directive.ts | 71 ------
ui/src/app/dashboard/templates/number/number.html | 25 --
.../dashboard/templates/number/numberConfig.html | 27 ---
.../templates/raw/raw-config.component.ts | 30 ---
.../templates/raw/raw-data-model.service.ts | 47 ----
.../app/dashboard/templates/raw/raw.directive.ts | 46 ----
ui/src/app/dashboard/templates/raw/raw.html | 24 --
ui/src/app/dashboard/templates/raw/rawConfig.html | 19 --
ui/src/app/dashboard/templates/so.filter.ts | 93 --------
.../templates/table/table-config.component.ts | 50 ----
.../templates/table/table-data-model.service.ts | 43 ----
.../dashboard/templates/table/table.directive.ts | 84 -------
ui/src/app/dashboard/templates/table/table.html | 26 ---
.../app/dashboard/templates/table/tableConfig.html | 31 ---
.../trafficlight/trafficlight-config.component.ts | 30 ---
.../trafficlight-data-model.service.ts | 33 ---
.../trafficlight/trafficlight.directive.ts | 80 -------
.../templates/trafficlight/trafficlight.html | 23 --
.../templates/trafficlight/trafficlightConfig.html | 62 -----
.../verticalbar/verticalbar-config.component.ts | 31 ---
.../verticalbar/verticalbar-data-model.service.ts | 33 ---
.../templates/verticalbar/verticalbar.directive.ts | 60 -----
.../templates/verticalbar/verticalbar.html | 36 ---
.../templates/verticalbar/verticalbarConfig.html | 49 ----
.../templates/widget-templates.service.ts | 157 -------------
ui/src/app/dashboard/widget-data-model.service.ts | 46 ----
ui/src/app/dashboard/widget-instances.service.ts | 108 ---------
.../pipeline-assembly.controller.ts | 16 +-
.../pipeline-element-options.controller.ts | 4 +-
.../components/pipeline/pipeline.controller.ts | 1 -
.../save-pipeline/save-pipeline.controller.ts | 6 +-
ui/src/app/info/about/about.component.html | 12 +-
.../app/layout/components/feedback.controller.ts | 8 +-
.../components/actions/pipeline-actions.tmpl.html | 20 +-
.../components/edit/quickedit.controller.ts | 8 +-
.../components/edit/quickedit.tmpl.html | 12 +-
ui/src/app/pipeline-details/pipeline-details.html | 3 +-
.../pipeline-details/pipeline-details.tmpl.html | 14 +-
.../pipeline-categories-dialog.controller.ts | 12 +-
.../app/services/pipeline-positioning.service.ts | 18 +-
ui/src/assets/fonts/MaterialIcons-Regular.css | 54 -----
ui/src/assets/fonts/MaterialIcons-Regular.eot | Bin 143258 -> 0 bytes
ui/src/assets/fonts/MaterialIcons-Regular.ttf | Bin 128180 -> 0 bytes
ui/src/assets/fonts/MaterialIcons-Regular.woff | Bin 57620 -> 0 bytes
ui/src/assets/fonts/MaterialIcons-Regular.woff2 | Bin 44300 -> 0 bytes
ui/src/scss/main.scss | 6 +-
ui/webpack.config.base.js | 131 -----------
ui/webpack.config.dev.js | 60 -----
ui/webpack.config.js | 21 --
ui/webpack.config.prod.js | 74 ------
215 files changed, 1471 insertions(+), 4588 deletions(-)
diff --cc streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
index 90a4bff,3fca213..b5484e3
--- a/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
+++ b/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
@@@ -377,10 -376,6 +377,12 @@@ public class StreamPipes
public static final String DASHBOARD_WIDGET_DATA_CONFIG = NS + "DashboardWidgetDataConfig" ;
public static final String COLOR_PICKER_STATIC_PROPERTY = NS + "ColorPickerStaticProperty";
public static final String SELECTED_COLOR = NS + "hasSelectedColor";
+
+ public static final String DATA_EXPLORER_WIDGET_MODEL = NS + "DataExplorerWidgetModel";
+ public static final String DATA_LAKE_MEASURE = NS + "DataLakeMeasure";
+ public static final String HAS_DATA_LAKE_MEASURE = NS + "hasDataLakeMeasure";
+ public static final String HAS_MEASUREMENT_NAME = NS + "hasMeasurementName";
+ public static final String HAS_EVENT_SCHEMA = NS + "hasEventSchema";
+ public static final String HAS_WIDGET_ICON_NAME = NS + "hasWidgetIconName";
+ public static final String HAS_WIDGET_DESCRIPTION = NS + "hasWidgetDescription";
}
diff --cc ui/deployment/dev/config.yml
index 789ce73,28f18b3..693875b
--- a/ui/deployment/dev/config.yml
+++ b/ui/deployment/dev/config.yml
@@@ -26,6 -26,4 +26,10 @@@ modules
- spAdd
- spMyElements
- spDataExplorer
- - spConfiguration
++<<<<<<< HEAD
+ - spConfiguration
+ - spDashboard2
+ - spDataExplorer2
++=======
++ - spConfiguration
++>>>>>>> dev
diff --cc ui/deployment/modules.yml
index 1285959,f2d1ef8..65231fe
--- a/ui/deployment/modules.yml
+++ b/ui/deployment/modules.yml
@@@ -161,27 -147,12 +147,27 @@@ spDashboard
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
+spDataExplorer2:
+ 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'
+ title: 'Data Explorer'
+ description: 'data-explorer-v2'
+ icon: 'navigation:ic_apps_24px'
+ homeImage: '/assets/img/home/configuration.png'
admin: false
diff --cc ui/package.json
index 558dae5,c2cb577..abd79c3
--- a/ui/package.json
+++ b/ui/package.json
@@@ -17,19 -15,19 +15,20 @@@
"lint": "tslint -c tslint.json 'src/**/*.ts*"
},
"dependencies": {
- "@angular/animations": "9.0.1",
- "@angular/cdk": "9.0.0",
- "@angular/common": "9.0.1",
- "@angular/compiler": "9.0.1",
- "@angular/core": "9.0.1",
+ "@angular/animations": "9.0.5",
+ "@angular/cdk": "9.1.1",
+ "@angular/common": "9.0.5",
+ "@angular/compiler": "9.0.5",
+ "@angular/core": "9.0.5",
"@angular/flex-layout": "9.0.0-beta.29",
- "@angular/forms": "9.0.1",
- "@angular/material": "9.0.0",
- "@angular/platform-browser": "9.0.1",
- "@angular/platform-browser-dynamic": "9.0.1",
- "@angular/router": "9.0.1",
- "@angular/upgrade": "9.0.1",
+ "@angular/forms": "9.0.5",
+ "@angular/material": "9.1.1",
+ "@angular/platform-browser": "9.0.5",
+ "@angular/platform-browser-dynamic": "9.0.5",
+ "@angular/router": "9.0.5",
+ "@angular/upgrade": "9.0.5",
+ "@asymmetrik/ngx-leaflet": "^6.0.1",
+ "@danielmoncada/angular-datetime-picker": "^9.2.0",
"@fortawesome/fontawesome-free": "^5.12.1",
"@ngui/datetime-picker": "0.16.2",
"@stomp/ng2-stompjs": "^7.2.0",
@@@ -80,9 -78,12 +79,11 @@@
"jsplumb": "2.1.3",
"jszip": "^3.2.1",
"konva": "^3.2.4",
+ "leaflet": "^1.6.0",
"lodash": "3.10.1",
+ "material-design-icons": "^3.0.1",
"ng-dynamic-component": "4.0.3",
"ng-file-upload": "9.0.13",
- "@danielmoncada/angular-datetime-picker": "^9.2.0",
"ng-prettyjson": "0.1.8",
"ng-showdown": "^1.1.0",
"ng-simple-slideshow": "^1.2.9",
@@@ -110,12 -110,13 +111,13 @@@
"@ngtools/webpack": "9.0.2",
"@types/angular": "^1.6.43",
"@types/jasmine": "~2.8.3",
- "@types/jqueryui": "^1.12.10",
- "@types/node": "^12.12.29",
+ "@types/jqueryui": "^1.12.7",
+ "@types/leaflet": "^1.5.9",
+ "@types/node": "^12.11.1",
"@types/rx": "^4.1.1",
"codelyzer": "^5.1.2",
+ "compression-webpack-plugin": "^3.1.0",
"copy-webpack-plugin": "^5.0.2",
- "compression-webpack-plugin": "^3.0.0",
"css-loader": "^0.28.11",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.6",
diff --cc ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
index b0a5361,f93c651..b022565
--- a/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
+++ b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
@@@ -74,14 -74,25 +74,25 @@@ export class AddVisualizationDialogComp
ngOnInit() {
if (!this.data) {
- this.dialogTitle = "Add widget";
+ this.dialogTitle = 'Add widget';
this.dashboardService.getVisualizablePipelines().subscribe(visualizations => {
- this.visualizablePipelines = visualizations;
+ this.visualizablePipelines = [];
+ visualizations.forEach(vis => {
+ this.dashboardService.getPipelineById(vis.pipelineId).subscribe(pipeline => {
+ vis.pipelineName = pipeline.name;
+ this.visualizablePipelines.push(vis);
+ this.sortPipeline();
+ });
+ })
+ });
+
+ this.availableWidgets = WidgetRegistry.getAvailableWidgetTemplates()
+ this.availableWidgets.sort((a, b) => {
+ return a.widgetLabel < b.widgetLabel ? -1 : 1;
});
- this.availableWidgets = WidgetRegistry.getAvailableWidgetTemplates();
} else {
- this.dialogTitle = 'Edit widget';
- this.selectedPipeline = this.data.widget.dashboardWidgetDataConfig;
+ this.dialogTitle = "Edit widget";
+ this.selectedPipeline = this.data.pipeline;
this.selectedWidget = this.data.widget.dashboardWidgetSettings;
this.page = 'configure-widget';
}
diff --cc ui/src/scss/main.scss
index 3e98f84,2e08972..9077c1c
--- a/ui/src/scss/main.scss
+++ b/ui/src/scss/main.scss
@@@ -35,9 -35,9 +35,13 @@@
@import '~prismjs/themes/prism.css';
@import '~angular-loading-bar/build/loading-bar.min.css';
@import '~shepherd.js/dist/css/shepherd-theme-default.css';
++<<<<<<< HEAD
+@import "~ng-pick-datetime/assets/style/picker.min.css";
++=======
+ @import '~leaflet/dist/leaflet.css';
+ @import '~material-design-icons/iconfont/material-icons.css';
++>>>>>>> dev
- @import '../assets/fonts/MaterialIcons-Regular.css';
@import '../assets/fonts/Roboto-Regular.css';
@import './sp/shepherd-new';