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:06 UTC
[incubator-streampipes] branch STREAMPIPES-79 updated (25ed819 ->
7547f86)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch STREAMPIPES-79
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 25ed819 Working on new data explorer
add adeb9ec STREAMPIPES-100: Remove iconUrl option from pipeline element builder
add 0a623ca STREAMPIPES-84: Fix links on info page
add fb7a0d1 STREAMPIPES-83: Fix bug in FeedbackController
add db4dc9e STREAMPIPES-90: Fix bug that prevented pipeline categories to be persisted
add b009aaa STREAMPIPES-92: Disable log button until feature is implemented
add d7f3619 STREAMPIPES-86: Improve validation of pipelines
add c3a75b9 [STREAMPIPES-94] dashboard requires a name
add 9b850d3 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add a91ca25 STREAMPIPES-85: Cached pipelines are rendered correctly
add c9b3d69 STREAMPIPES-87: Password field uses full width
add ab06f17 STREAMPIPES-89: Display status message after modification of pipelines
add 0558b5a STREAMPIPES-58: Dashboard overview allows to directly edit dashboards
add 79a3f73 STREAMPIPES-58: Add map widget
add e80d2b2 STREAMPIPES-58: Add raw widget
add bde55bf STREAMPIPES-58: Add HTML widget
add 3fff83f STREAMPIPES-58: Add traffic light widget
add ac155d3 Use node version 13.x in build process
add e1636a7 Clean NPM cache in workflow file
add 113f385 Fix data set adapters
add c276f20 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add bea2425 Clean NPM cache in workflow file
add 28f59d9 STREAMPIPES-58: Improve layout of AddVisualization dialog
add 2291fb6 Remove old Angular1 dashboard
add 49cfe21 Move dashboardv2 module to dashboard directory
add cc2e25c Upgrade Angular version
add d577166 Disable ES5 build to fix build issue
add d7d0e48 STREAMPIPES-95: Add support for standalone dashboards
add 9a1d08d STREAMPIPES-91: Update pipeline in QuickEdit view
new 2dc7f3c Merge branch 'dev' into STREAMPIPES-79
new ff7c439 Working on data explorer
new b5dbb19 Select runtime names from event schema
new 7547f86 Add component for property selector
The 4 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:
.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 +
.../serializers/jsonld/JsonLdTransformer.java | 3 +-
.../apache/streampipes/vocabulary/StreamPipes.java | 2 +
ui/angular.json | 7 +-
ui/browserslist | 18 +-
ui/deployment/dev/config.yml | 3 +-
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 +
.../shared/shared-dashboard.service.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} | 33 +--
.../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 ---------
.../grid/data-explorer-dashboard-grid.component.ts | 2 +-
.../widgets/base/base-data-explorer-widget.ts | 52 +++++
.../line-chart/line-chart-widget.component.html | 9 +-
.../line-chart/line-chart-widget.component.ts | 21 +-
.../widgets/table/table-widget.component.html | 9 +-
.../widgets/table/table-widget.component.ts | 14 +-
.../select-keys.component.css} | 0
.../utils/select-keys/select-keys.component.html | 8 +
.../utils/select-keys/select-keys.component.ts | 30 +++
.../data-explorer-v2/data-explorer-v2.module.ts | 4 +-
.../data-explorer-v2/services/resize.service.ts | 2 +-
.../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 | 3 +-
ui/webpack.config.base.js | 131 -----------
ui/webpack.config.dev.js | 60 -----
ui/webpack.config.js | 21 --
ui/webpack.config.prod.js | 74 ------
228 files changed, 1588 insertions(+), 4629 deletions(-)
copy ui/src/app/{dashboard-v2/components/widgets/area/area-widget.component.css => core-model/base/Tuple2.ts} (92%)
delete mode 100644 ui/src/app/dashboard-v2/dashboard.module.ts
delete mode 100644 ui/src/app/dashboard/add-widget-template.html
delete mode 100644 ui/src/app/dashboard/add-widget.controller.ts
delete mode 100644 ui/src/app/dashboard/components/config-item.component.ts
delete mode 100644 ui/src/app/dashboard/components/config-item.controller.ts
delete mode 100644 ui/src/app/dashboard/components/config-item.tmpl.html
rename ui/src/app/{dashboard-v2 => dashboard}/components/grid/dashboard-grid.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/grid/dashboard-grid.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/grid/dashboard-grid.component.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/overview/dashboard-overview.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/overview/dashboard-overview.component.html (76%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/overview/dashboard-overview.component.ts (78%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/panel/dashboard-panel.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/panel/dashboard-panel.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/panel/dashboard-panel.component.ts (100%)
copy ui/src/app/{dashboard-v2/components/widgets/area/area-widget.component.css => dashboard/components/standalone/standalone-dashboard.component.css} (83%)
create mode 100644 ui/src/app/dashboard/components/standalone/standalone-dashboard.component.html
create mode 100644 ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts
rename ui/src/app/{dashboard-v2 => dashboard}/components/widget/dashboard-widget.component.css (83%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widget/dashboard-widget.component.html (64%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widget/dashboard-widget.component.ts (91%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/area/area-config.ts (82%)
copy ui/src/app/{dashboard-v2 => dashboard}/components/widgets/area/area-widget.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/area/area-widget.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/area/area-widget.component.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/base/base-config.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/base/base-ngx-charts-widget.ts (56%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/base/base-ngx-line-charts-widget.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/base/base-ngx-line-config.ts (92%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/base/base-widget.ts (72%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/gauge/gauge-config.ts (94%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/gauge/gauge-widget.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/gauge/gauge-widget.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/gauge/gauge-widget.component.ts (100%)
create mode 100644 ui/src/app/dashboard/components/widgets/html/html-config.ts
copy ui/src/app/{dashboard-v2/components/widgets/area/area-widget.component.css => dashboard/components/widgets/html/html-widget.component.css} (86%)
create mode 100644 ui/src/app/dashboard/components/widgets/html/html-widget.component.html
create mode 100644 ui/src/app/dashboard/components/widgets/html/html-widget.component.ts
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/image/image-config.ts (91%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/image/image-widget.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/image/image-widget.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/image/image-widget.component.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/line/line-config.ts (82%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/line/line-widget.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/line/line-widget.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/line/line-widget.component.ts (100%)
create mode 100644 ui/src/app/dashboard/components/widgets/map/map-config.ts
copy ui/src/app/{dashboard-v2/components/widgets/area/area-widget.component.css => dashboard/components/widgets/map/map-widget.component.css} (87%)
create mode 100644 ui/src/app/dashboard/components/widgets/map/map-widget.component.html
create mode 100644 ui/src/app/dashboard/components/widgets/map/map-widget.component.ts
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/number/number-config.ts (94%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/number/number-widget.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/number/number-widget.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/number/number-widget.component.ts (87%)
copy ui/{webpack.partial.base.js => src/app/dashboard/components/widgets/raw/raw-config.ts} (51%)
copy ui/src/app/{dashboard-v2/components/widgets/area/area-widget.component.css => dashboard/components/widgets/raw/raw-widget.component.css} (83%)
create mode 100644 ui/src/app/dashboard/components/widgets/raw/raw-widget.component.html
create mode 100644 ui/src/app/dashboard/components/widgets/raw/raw-widget.component.ts
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/table/table-config.ts (92%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/table/table-widget.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/table/table-widget.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/components/widgets/table/table-widget.component.ts (89%)
create mode 100644 ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-config.ts
rename ui/src/app/{dashboard-v2/components/widgets/area/area-widget.component.css => dashboard/components/widgets/trafficlight/traffic-light-widget.component.css} (59%)
create mode 100644 ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.html
create mode 100644 ui/src/app/dashboard/components/widgets/trafficlight/traffic-light-widget.component.ts
delete mode 100644 ui/src/app/dashboard/dashboard-frame.html
delete mode 100644 ui/src/app/dashboard/dashboard-layout-frame.html
rename ui/src/app/{dashboard-v2 => dashboard}/dashboard.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/dashboard.component.html (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/dashboard.component.ts (93%)
delete mode 100644 ui/src/app/dashboard/dashboard.controller.ts
delete mode 100644 ui/src/app/dashboard/dashboard.html
delete mode 100644 ui/src/app/dashboard/dialog/no-pipeline-present-dialog.controller.ts
delete mode 100644 ui/src/app/dashboard/dialog/no-pipeline-present-dialog.tmpl.html
rename ui/src/app/{dashboard-v2 => dashboard}/dialogs/add-widget/add-visualization-dialog.component.css (85%)
rename ui/src/app/{dashboard-v2 => dashboard}/dialogs/add-widget/add-visualization-dialog.component.html (68%)
rename ui/src/app/{dashboard-v2 => dashboard}/dialogs/add-widget/add-visualization-dialog.component.ts (88%)
rename ui/src/app/{dashboard-v2 => dashboard}/dialogs/edit-dashboard/edit-dashboard-dialog.component.css (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/dialogs/edit-dashboard/edit-dashboard-dialog.component.html (90%)
rename ui/src/app/{dashboard-v2 => dashboard}/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/models/dashboard.model.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/models/gridster-info.model.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/models/multi-series.model.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/registry/widget-config-builder.ts (73%)
rename ui/src/app/{dashboard-v2 => dashboard}/registry/widget-registry.ts (81%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/collected-schema-requirements.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/ep-requirements.ts (88%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/extractor/static-property-extractor.ts (85%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/matching/datatype-match.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/matching/domain-property-match.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/matching/mapping-property-generator.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/matching/primitive-property-match.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/matching/property-match.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/model/datatypes.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/model/vocabulary.ts (92%)
rename ui/src/app/{dashboard-v2 => dashboard}/sdk/schema-requirements-builder.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/services/dashboard.service.ts (88%)
rename ui/src/app/{dashboard-v2 => dashboard}/services/refresh-dashboard.service.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/services/resize.service.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/services/websocket.config.ts (100%)
rename ui/src/app/{dashboard-v2 => dashboard}/services/websocket.settings.ts (100%)
delete mode 100644 ui/src/app/dashboard/socket-connection-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/gauge/gauge-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/gauge/gauge-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/gauge/gauge.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/gauge/gauge.html
delete mode 100644 ui/src/app/dashboard/templates/gauge/gaugeConfig.html
delete mode 100644 ui/src/app/dashboard/templates/heatmap/heatmap-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/heatmap/heatmap-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/heatmap/heatmap.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/heatmap/heatmap.html
delete mode 100644 ui/src/app/dashboard/templates/heatmap/heatmapConfig.html
delete mode 100644 ui/src/app/dashboard/templates/html/html-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/html/html-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/html/html.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/html/htmlConfig.html
delete mode 100644 ui/src/app/dashboard/templates/html/htmltemplate.html
delete mode 100644 ui/src/app/dashboard/templates/image/image-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/image/image-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/image/image.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/image/image.html
delete mode 100644 ui/src/app/dashboard/templates/image/imageConfig.html
delete mode 100644 ui/src/app/dashboard/templates/line/line-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/line/line-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/line/line.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/line/line.html
delete mode 100644 ui/src/app/dashboard/templates/line/lineConfig.html
delete mode 100644 ui/src/app/dashboard/templates/map.deprecated/map-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/map.deprecated/map-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/map.deprecated/map.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/map.deprecated/map.html
delete mode 100644 ui/src/app/dashboard/templates/map.deprecated/mapConfig.html
delete mode 100644 ui/src/app/dashboard/templates/map/map-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/map/map-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/map/map.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/map/map.html
delete mode 100644 ui/src/app/dashboard/templates/map/mapConfig.html
delete mode 100644 ui/src/app/dashboard/templates/number/number-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/number/number-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/number/number.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/number/number.html
delete mode 100644 ui/src/app/dashboard/templates/number/numberConfig.html
delete mode 100644 ui/src/app/dashboard/templates/raw/raw-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/raw/raw-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/raw/raw.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/raw/raw.html
delete mode 100644 ui/src/app/dashboard/templates/raw/rawConfig.html
delete mode 100644 ui/src/app/dashboard/templates/so.filter.ts
delete mode 100644 ui/src/app/dashboard/templates/table/table-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/table/table-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/table/table.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/table/table.html
delete mode 100644 ui/src/app/dashboard/templates/table/tableConfig.html
delete mode 100644 ui/src/app/dashboard/templates/trafficlight/trafficlight-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/trafficlight/trafficlight-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/trafficlight/trafficlight.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/trafficlight/trafficlight.html
delete mode 100644 ui/src/app/dashboard/templates/trafficlight/trafficlightConfig.html
delete mode 100644 ui/src/app/dashboard/templates/verticalbar/verticalbar-config.component.ts
delete mode 100644 ui/src/app/dashboard/templates/verticalbar/verticalbar-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/templates/verticalbar/verticalbar.directive.ts
delete mode 100644 ui/src/app/dashboard/templates/verticalbar/verticalbar.html
delete mode 100644 ui/src/app/dashboard/templates/verticalbar/verticalbarConfig.html
delete mode 100644 ui/src/app/dashboard/templates/widget-templates.service.ts
delete mode 100644 ui/src/app/dashboard/widget-data-model.service.ts
delete mode 100644 ui/src/app/dashboard/widget-instances.service.ts
copy ui/src/app/data-explorer-v2/components/widgets/utils/{no-data/no-data-in-date-range.component.css => select-keys/select-keys.component.css} (100%)
create mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.html
create mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.ts
delete mode 100644 ui/src/assets/fonts/MaterialIcons-Regular.css
delete mode 100644 ui/src/assets/fonts/MaterialIcons-Regular.eot
delete mode 100644 ui/src/assets/fonts/MaterialIcons-Regular.ttf
delete mode 100644 ui/src/assets/fonts/MaterialIcons-Regular.woff
delete mode 100644 ui/src/assets/fonts/MaterialIcons-Regular.woff2
delete mode 100644 ui/webpack.config.base.js
delete mode 100644 ui/webpack.config.dev.js
delete mode 100644 ui/webpack.config.js
delete mode 100644 ui/webpack.config.prod.js
[incubator-streampipes] 02/04: Working on 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 STREAMPIPES-79
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit ff7c439634a4f476f2382200eddda08ff76595c5
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Mar 10 09:50:14 2020 +0100
Working on data explorer
---
.../serializers/jsonld/JsonLdTransformer.java | 3 +--
ui/deployment/dev/config.yml | 5 -----
.../core-services/shared/shared-dashboard.service.ts | 2 +-
.../grid/data-explorer-dashboard-grid.component.ts | 2 +-
.../widgets/base/base-data-explorer-widget.ts | 19 +++++++++++++++++++
.../line-chart/line-chart-widget.component.ts | 20 ++++++++++++++------
.../widgets/table/table-widget.component.ts | 14 ++++++++++----
.../app/data-explorer-v2/services/resize.service.ts | 2 +-
ui/src/scss/main.scss | 3 ---
9 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/JsonLdTransformer.java b/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/JsonLdTransformer.java
index 5c952a7..5d2be10 100644
--- a/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/JsonLdTransformer.java
+++ b/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/JsonLdTransformer.java
@@ -69,8 +69,7 @@ public class JsonLdTransformer implements RdfTransformer {
StreamPipes.CONNECT_WORKER_CONTAINER,
StreamPipes.DASHBOARD_WIDGET_MODEL,
StreamPipes.DASHBOARD_MODEL,
- StreamPipes.DATA_EXPLORER_WIDGET_MODEL,
- StreamPipes.DATA_LAKE_MEASURE
+ StreamPipes.DATA_EXPLORER_WIDGET_MODEL
);
private List<String> selectedRootElements;
diff --git a/ui/deployment/dev/config.yml b/ui/deployment/dev/config.yml
index 693875b..568a8c6 100644
--- a/ui/deployment/dev/config.yml
+++ b/ui/deployment/dev/config.yml
@@ -26,10 +26,5 @@ modules:
- spAdd
- spMyElements
- spDataExplorer
-<<<<<<< HEAD
- spConfiguration
- - spDashboard2
- spDataExplorer2
-=======
- - spConfiguration
->>>>>>> dev
diff --git a/ui/src/app/core-services/shared/shared-dashboard.service.ts b/ui/src/app/core-services/shared/shared-dashboard.service.ts
index 47bcbde..b2f40ff 100644
--- a/ui/src/app/core-services/shared/shared-dashboard.service.ts
+++ b/ui/src/app/core-services/shared/shared-dashboard.service.ts
@@ -19,7 +19,7 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
-import { Dashboard } from '../../dashboard-v2/models/dashboard.model';
+import { Dashboard } from '../../dashboard/models/dashboard.model';
import { AuthStatusService } from '../../services/auth-status.service';
@Injectable()
diff --git a/ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.ts b/ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.ts
index d97b418..1d38a95 100644
--- a/ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.ts
+++ b/ui/src/app/data-explorer-v2/components/grid/data-explorer-dashboard-grid.component.ts
@@ -28,7 +28,7 @@ import {
import { GridsterItemComponent, GridType } from 'angular-gridster2';
import { DataExplorerWidgetModel } from '../../../core-model/datalake/DataExplorerWidgetModel';
import { DateRange } from '../../../core-model/datalake/DateRange';
-import { GridsterInfo } from '../../../dashboard-v2/models/gridster-info.model';
+import { GridsterInfo } from '../../../dashboard/models/gridster-info.model';
import { IDataViewDashboard, IDataViewDashboardConfig, IDataViewDashboardItem } from '../../models/dataview-dashboard.model';
import { DataViewDataExplorerService } from '../../services/data-view-data-explorer.service';
import { RefreshDashboardService } from '../../services/refresh-dashboard.service';
diff --git a/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts b/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
index 9ff0f47..5ecfceb 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
@@ -21,6 +21,8 @@ import { GridsterItem, GridsterItemComponent } from 'angular-gridster2';
import { DataExplorerWidgetModel } from '../../../../core-model/datalake/DataExplorerWidgetModel';
import { DateRange } from '../../../../core-model/datalake/DateRange';
import { IDataViewDashboardItem } from '../../../models/dataview-dashboard.model';
+import { EventSchema } from '../../../../connect/schema-editor/model/EventSchema';
+import { EventPropertyPrimitive } from '../../../../connect/schema-editor/model/EventPropertyPrimitive';
export abstract class BaseDataExplorerWidget implements OnChanges {
@@ -65,4 +67,21 @@ export abstract class BaseDataExplorerWidget implements OnChanges {
public abstract updateData();
+ // TODO add static properties that are ignored
+ getPropertyKeys(eventSchema: EventSchema, except: string[] = []) {
+ const propertyKeys: string[] = [];
+
+ // eventSchema.eventProperties.forEach(p => {
+ // if (except.p.domainProperty)
+ // propertyKeys.push(p.getRuntimeName());
+ // });
+
+ return propertyKeys;
+ }
+
+ // TODO add get a specific property
+ getPropertyKeysOfStaticProperty(eventSchema) {
+
+ }
+
}
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
index d746adc..f3f57e5 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
@@ -29,15 +29,26 @@ import { BaseDataExplorerWidget } from '../base/base-data-explorer-widget';
export class LineChartWidgetComponent extends BaseDataExplorerWidget implements OnInit {
data: any[] = undefined;
- availableColumns: string[] = ['time', 'count', 'randomText', 'randomNumber', 'timestamp'];
- yKeys: string[] = ['time', 'count', 'randomText', 'randomNumber', 'timestamp'];
- xKey = 'time';
+ availableColumns: string[] = [];
+ yKeys: string[] = [];
+ xKey = 'timestamp';
constructor(private dataLakeRestService: DatalakeRestService) {
super();
}
+ ngOnInit(): void {
+
+ this.availableColumns = this.getPropertyKeys(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
+
+ // Reduce selected columns when more then 6
+ this.yKeys = this.availableColumns.length > 6 ? this.availableColumns.slice(0, 5) : this.availableColumns;
+
+ this.updateData();
+ }
+
+
updatemenus = [
{
buttons: [
@@ -88,9 +99,6 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
};
- ngOnInit(): void {
- this.updateData();
- }
updateData() {
diff --git a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts b/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts
index 8cd2b06..9f33492 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts
@@ -16,9 +16,10 @@
*
*/
-import { Component, OnChanges, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
+import { EventSchema } from '../../../../connect/schema-editor/model/EventSchema';
import { DataResult } from '../../../../core-model/datalake/DataResult';
import { DatalakeRestService } from '../../../../core-services/datalake/datalake-rest.service';
import { BaseDataExplorerWidget } from '../base/base-data-explorer-widget';
@@ -33,8 +34,8 @@ export class TableWidgetComponent extends BaseDataExplorerWidget implements OnIn
@ViewChild(MatSort, {static: true}) sort: MatSort;
- availableColumns: string[] = ['time', 'count', 'randomText', 'randomNumber', 'timestamp'];
- selectedColumns: string[] = ['time'];
+ availableColumns: string[];
+ selectedColumns: string[];
dataSource = new MatTableDataSource();
@@ -44,12 +45,17 @@ export class TableWidgetComponent extends BaseDataExplorerWidget implements OnIn
ngOnInit(): void {
this.dataSource.sort = this.sort;
+ this.availableColumns = this.getPropertyKeys(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
- this.updateData();
+ // Reduce selected columns when more then 6
+ this.selectedColumns = this.availableColumns.length > 6 ? this.availableColumns.slice(0, 5) : this.availableColumns;
+ this.updateData();
}
+
+
updateData() {
this.setShownComponents(false, false, true);
diff --git a/ui/src/app/data-explorer-v2/services/resize.service.ts b/ui/src/app/data-explorer-v2/services/resize.service.ts
index e4f1e49..e856b09 100644
--- a/ui/src/app/data-explorer-v2/services/resize.service.ts
+++ b/ui/src/app/data-explorer-v2/services/resize.service.ts
@@ -18,7 +18,7 @@
import { Injectable } from '@angular/core';
import { ReplaySubject } from 'rxjs';
-import { GridsterInfo } from '../../dashboard-v2/models/gridster-info.model';
+import { GridsterInfo } from '../../dashboard/models/gridster-info.model';
@Injectable()
export class ResizeService {
diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss
index 9077c1c..2532e19 100644
--- a/ui/src/scss/main.scss
+++ b/ui/src/scss/main.scss
@@ -35,12 +35,9 @@
@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/Roboto-Regular.css';
[incubator-streampipes] 01/04: Merge branch 'dev' into
STREAMPIPES-79
Posted by ze...@apache.org.
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';
[incubator-streampipes] 03/04: Select runtime names from event
schema
Posted by ze...@apache.org.
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 b5dbb190059859dd8576180217412b319148f3cd
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Mar 11 22:43:30 2020 +0100
Select runtime names from event schema
---
.../widgets/base/base-data-explorer-widget.ts | 44 +++++++++++++++++++---
.../line-chart/line-chart-widget.component.ts | 5 ++-
.../widgets/table/table-widget.component.ts | 2 +-
3 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts b/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
index 5ecfceb..3589308 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
@@ -23,6 +23,7 @@ import { DateRange } from '../../../../core-model/datalake/DateRange';
import { IDataViewDashboardItem } from '../../../models/dataview-dashboard.model';
import { EventSchema } from '../../../../connect/schema-editor/model/EventSchema';
import { EventPropertyPrimitive } from '../../../../connect/schema-editor/model/EventPropertyPrimitive';
+import { EventPropertyComponent } from '../../../../connect/schema-editor/event-property/event-property.component';
export abstract class BaseDataExplorerWidget implements OnChanges {
@@ -67,18 +68,49 @@ export abstract class BaseDataExplorerWidget implements OnChanges {
public abstract updateData();
- // TODO add static properties that are ignored
- getPropertyKeys(eventSchema: EventSchema, except: string[] = []) {
+ getValuePropertyKeys(eventSchema: EventSchema) {
const propertyKeys: string[] = [];
- // eventSchema.eventProperties.forEach(p => {
- // if (except.p.domainProperty)
- // propertyKeys.push(p.getRuntimeName());
- // });
+ eventSchema.eventProperties.forEach(p => {
+ if (p.domainProperty !== 'http://schema.org/DateTime') {
+ propertyKeys.push(p.getRuntimeName());
+ }
+ });
return propertyKeys;
}
+ getNumericPropertyKeys(eventSchema: EventSchema) {
+ const propertyKeys: string[] = [];
+
+ eventSchema.eventProperties.forEach(p => {
+ if (p.domainProperty !== 'http://schema.org/DateTime' && this.isNumber(p)) {
+ propertyKeys.push(p.getRuntimeName());
+ }
+ });
+
+ return propertyKeys;
+ }
+
+ getTimestampPropertyKey(eventSchema: EventSchema) {
+ const propertyKeys: string[] = [];
+
+ const result = eventSchema.eventProperties.find(p =>
+ p.domainProperty === 'http://schema.org/DateTime'
+ );
+
+ return result.getRuntimeName();
+ }
+
+ isNumber(p: EventProperty): boolean {
+ return (p instanceof EventPropertyPrimitive &&
+ (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#number') ||
+ (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#float') ||
+ (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#double') ||
+ (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#integer'))
+ ? true : false;
+}
+
// TODO add get a specific property
getPropertyKeysOfStaticProperty(eventSchema) {
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
index f3f57e5..8d4f3b5 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
@@ -31,7 +31,7 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
data: any[] = undefined;
availableColumns: string[] = [];
yKeys: string[] = [];
- xKey = 'timestamp';
+ xKey: string;
constructor(private dataLakeRestService: DatalakeRestService) {
super();
@@ -40,7 +40,8 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
ngOnInit(): void {
- this.availableColumns = this.getPropertyKeys(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
+ this.availableColumns = this.getNumericPropertyKeys(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
+ this.xKey = this.getTimestampPropertyKey(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
// Reduce selected columns when more then 6
this.yKeys = this.availableColumns.length > 6 ? this.availableColumns.slice(0, 5) : this.availableColumns;
diff --git a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts b/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts
index 9f33492..59540a8 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.ts
@@ -45,7 +45,7 @@ export class TableWidgetComponent extends BaseDataExplorerWidget implements OnIn
ngOnInit(): void {
this.dataSource.sort = this.sort;
- this.availableColumns = this.getPropertyKeys(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
+ this.availableColumns = this.getValuePropertyKeys(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
// Reduce selected columns when more then 6
this.selectedColumns = this.availableColumns.length > 6 ? this.availableColumns.slice(0, 5) : this.availableColumns;
[incubator-streampipes] 04/04: Add component for property selector
Posted by ze...@apache.org.
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 7547f86f00b084101e5947c73c6b514f1cf35e29
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Thu Mar 12 21:45:24 2020 +0100
Add component for property selector
---
.../widgets/base/base-data-explorer-widget.ts | 9 ++++---
.../line-chart/line-chart-widget.component.html | 9 +------
.../widgets/table/table-widget.component.html | 9 +------
.../utils/select-keys/select-keys.component.css | 0
.../utils/select-keys/select-keys.component.html | 8 ++++++
.../utils/select-keys/select-keys.component.ts | 30 ++++++++++++++++++++++
.../data-explorer-v2/data-explorer-v2.module.ts | 4 ++-
7 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts b/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
index 3589308..a534f7e 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/base/base-data-explorer-widget.ts
@@ -24,6 +24,7 @@ import { IDataViewDashboardItem } from '../../../models/dataview-dashboard.model
import { EventSchema } from '../../../../connect/schema-editor/model/EventSchema';
import { EventPropertyPrimitive } from '../../../../connect/schema-editor/model/EventPropertyPrimitive';
import { EventPropertyComponent } from '../../../../connect/schema-editor/event-property/event-property.component';
+import { EventProperty } from '../../../../connect/schema-editor/model/EventProperty';
export abstract class BaseDataExplorerWidget implements OnChanges {
@@ -104,10 +105,10 @@ export abstract class BaseDataExplorerWidget implements OnChanges {
isNumber(p: EventProperty): boolean {
return (p instanceof EventPropertyPrimitive &&
- (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#number') ||
- (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#float') ||
- (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#double') ||
- (p.runtimeType === 'http://www.w3.org/2001/XMLSchema#integer'))
+ ((p as EventPropertyPrimitive).runtimeType === 'http://www.w3.org/2001/XMLSchema#number') ||
+ (p as EventPropertyPrimitive).runtimeType === 'http://www.w3.org/2001/XMLSchema#float') ||
+ ((p as EventPropertyPrimitive).runtimeType === 'http://www.w3.org/2001/XMLSchema#double') ||
+ ((p as EventPropertyPrimitive).runtimeType === 'http://www.w3.org/2001/XMLSchema#integer')
? true : false;
}
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
index 9ceede3..7393197 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
+++ b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
@@ -19,14 +19,7 @@
<div fxLayout="column" fxLayoutAlign="stretch">
<div class="assemblyOptions sp-blue-bg m-0 row header h-40" style="margin-left: 0px;margin-right: 0px;">
<div fxFlex="100" layout="row" fxLayoutAlign="end center" style="margin-left: 0px;margin-right: 0px;">
- <mat-form-field appearance="outline">
- <mat-label>Select Columns</mat-label>
- <mat-select [ngModel]="this.yKeys" (selectionChange)="setSelectedColumn($event.value)" multiple>
- <mat-option *ngFor="let column of availableColumns" [value]="column" style="background-color: #FFFFFF">
- {{column}}
- </mat-option>
- </mat-select>
- </mat-form-field>
+ <sp-select-keys (changeSelectedKeys)="setSelectedColumn($event)" [availableKeys]="availableColumns" [selectedKeys]="yKeys"></sp-select-keys>
<button mat-button mat-icon-button color="white" (click)="removeWidget()">
<i class="material-icons">clear</i>
</button>
diff --git a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.html b/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.html
index ab1a7dc..d0d068a 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.html
+++ b/ui/src/app/data-explorer-v2/components/widgets/table/table-widget.component.html
@@ -21,14 +21,7 @@
<div fxLayout="column" fxLayoutAlign="stretch">
<div class="assemblyOptionsDataExplorer sp-blue-bg m-0 row header h-40" style="margin-left: 0px;margin-right: 0px;">
<div fxFlex="100" layout="row" fxLayoutAlign="end center" style="margin-left: 0px;margin-right: 0px;">
- <mat-form-field appearance="outline">
- <mat-label>Select Columns</mat-label>
- <mat-select [ngModel]="this.selectedColumns" (selectionChange)="setSelectedColumn($event.value)" multiple>
- <mat-option *ngFor="let column of availableColumns" [value]="column" style="background-color: #FFFFFF">
- {{column}}
- </mat-option>
- </mat-select>
- </mat-form-field>
+ <sp-select-keys (changeSelectedKeys)="setSelectedColumn($event)" [availableKeys]="availableColumns" [selectedKeys]="selectedColumns"></sp-select-keys>
<button mat-button mat-icon-button color="white" (click)="removeWidget()">
<i class="material-icons">clear</i>
</button>
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.css b/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.html b/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.html
new file mode 100644
index 0000000..8e4acc2
--- /dev/null
+++ b/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.html
@@ -0,0 +1,8 @@
+<mat-form-field appearance="outline">
+ <mat-label>Select Columns</mat-label>
+ <mat-select [ngModel]="this.selectedKeys" (selectionChange)="triggerSelectedKeys($event.value)" multiple>
+ <mat-option *ngFor="let column of availableKeys" [value]="column" style="background-color: #FFFFFF">
+ {{column}}
+ </mat-option>
+ </mat-select>
+</mat-form-field>
diff --git a/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.ts b/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.ts
new file mode 100644
index 0000000..e8d58ec
--- /dev/null
+++ b/ui/src/app/data-explorer-v2/components/widgets/utils/select-keys/select-keys.component.ts
@@ -0,0 +1,30 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { GridsterItem } from 'angular-gridster2';
+
+@Component({
+ selector: 'sp-select-keys',
+ templateUrl: './select-keys.component.html',
+ styleUrls: ['./select-keys.component.css']
+})
+export class SelectKeysComponent implements OnInit {
+
+ @Output()
+ changeSelectedKeys: EventEmitter<string[]> = new EventEmitter();
+
+ @Input()
+ availableKeys: string[];
+
+ @Input()
+ selectedKeys: string[];
+
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+ triggerSelectedKeys(keys: string[]) {
+ this.changeSelectedKeys.emit(keys);
+ }
+
+}
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 18eb0f1..0f369d1 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
@@ -56,6 +56,7 @@ 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 { SelectKeysComponent } from './components/widgets/utils/select-keys/select-keys.component';
const dashboardWidgets = [
@@ -111,7 +112,8 @@ export const MY_NATIVE_FORMATS = {
TimeRangeSelectorComponent,
OldExplorerComponent,
NoDataInDateRangeComponent,
- LoadDataSpinnerComponent
+ LoadDataSpinnerComponent,
+ SelectKeysComponent
],
providers: [
SharedDatalakeRestService,