You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by te...@apache.org on 2020/02/21 08:54:40 UTC
[incubator-streampipes] 01/06: Merge branch 'dev' into
image-labeling
This is an automated email from the ASF dual-hosted git repository.
tex pushed a commit to branch image-labeling
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 1af31a3c2e8b6f66e2e8e34a3d7688304b01bba8
Merge: 4ebdd83 49ed58d
Author: tex <te...@fzi.de>
AuthorDate: Thu Feb 20 11:19:10 2020 +0100
Merge branch 'dev' into image-labeling
# Conflicts:
# ui/src/app/core-ui/core-ui.module.ts
.github/workflows/build.yml | 84 +++++++++--
.gitlab-ci.yml | 166 +++------------------
streampipes-backend/Dockerfile | 2 +-
.../{Dockerfile => aarch64.Dockerfile} | 8 +-
.../{Dockerfile.arm => arm.Dockerfile} | 4 +-
.../{Dockerfile.arm => aarch64.Dockerfile} | 4 +-
.../{Dockerfile.arm => arm.Dockerfile} | 2 +-
.../manager/setup/CouchDbInstallationStep.java | 1 +
.../rest/impl/dashboard/DashboardWidget.java | 1 +
.../couchdb/impl/DashboardWidgetStorageImpl.java | 2 +-
ui/.angular-cli.json | 23 ---
ui/Dockerfile | 31 ++--
ui/{Dockerfile.arm => aarch64.Dockerfile} | 36 ++---
ui/angular.json | 88 +++++++++++
ui/{Dockerfile.arm => arm.Dockerfile} | 38 ++---
.../Dockerfile.arm => ui/browserslist | 19 +--
ui/deployment/app.module.mst | 72 ++-------
ui/deployment/appng5.module.mst | 4 +-
ui/deployment/dev/config.yml | 2 +-
ui/deployment/state.config.mst | 3 +-
ui/deployment/toolbar.controller.mst | 4 +-
ui/karma.conf.js | 10 +-
ui/package.json | 69 +++++----
.../app/CustomMaterial/custom-material.module.ts | 38 +++--
.../app-asset-monitoring.module.ts | 4 +-
.../create-asset/create-asset.component.ts | 2 +-
.../add-pipeline/add-pipeline-dialog.component.ts | 2 +-
.../save-dashboard-dialog.component.ts | 2 +-
ui/src/app/app-container/app-container.module.ts | 2 +-
ui/src/app/app-container/view/view.component.ts | 6 +-
ui/src/app/app-overview/app-overview.module.ts | 4 +-
.../app-transport-monitoring.module.ts | 4 +-
.../transport-selection.component.ts | 5 +-
.../app/configuration/configuration.component.ts | 3 +-
ui/src/app/configuration/configuration.module.ts | 14 +-
.../consul-configs-boolean.component.ts | 2 +-
.../consul-configs-number.component.ts | 2 +-
.../consul-configs-password.component.ts | 6 +-
.../consul-configs-text.component.ts | 2 +-
.../messaging-configuration.component.ts | 4 +-
.../pipeline-element-configuration.component.ts | 5 +-
ui/src/app/connect/connect.module.ts | 8 +-
.../adapter-description.component.ts | 2 +-
.../adapter-export-dialog.component.ts | 4 +-
.../adapter-upload-dialog.component.ts | 4 +-
.../data-marketplace/data-marketplace.component.ts | 2 +-
.../file-management/file-management.component.ts | 2 +-
.../connect/format-component/format.component.ts | 3 +-
.../app/connect/model/ColorPickerStaticProperty.ts | 18 +++
ui/src/app/connect/model/MappingPropertyNary.ts | 2 +-
ui/src/app/connect/model/MappingPropertyUnary.ts | 2 +-
.../app/connect/model/UnnamedStreamPipesEntity.ts | 18 +++
.../component/adapter-started-dialog.component.ts | 4 +-
.../connect/new-adapter/new-adapter.component.ts | 8 +-
.../event-property-list.component.ts | 2 +-
.../event-property-primitive.component.ts | 7 +-
.../event-property-row.component.ts | 4 +-
.../event-property/event-property.component.ts | 4 +-
.../event-schema/event-schema.component.css | 30 ++--
.../event-schema/event-schema.component.html | 2 +-
.../event-schema/event-schema.component.ts | 8 +-
.../schema-editor/model/EventPropertyList.ts | 3 +-
.../schema-editor/model/QuantitativeValue.ts | 6 +-
.../static-collection.component.ts | 2 +-
.../static-color-picker.component.css | 17 +++
.../static-color-picker.component.html | 10 +-
.../static-color-picker.component.ts | 28 +++-
.../static-file-input.component.ts | 15 +-
.../static-free-input.component.ts | 10 +-
.../static-mapping-nary.component.ts | 4 +-
.../static-mapping-unary.component.html | 2 +-
.../static-mapping-unary.component.ts | 4 +-
.../static-mapping/static-mapping.ts | 18 +++
.../static-number-input.component.ts | 10 +-
.../static-properties/static-property.component.ts | 4 +-
.../static-secret-input.component.ts | 8 +-
.../static-text-input.component.ts | 11 +-
.../static-url-input/static-url-input.component.ts | 7 +-
ui/src/app/core-model/dashboard/Dashboard.ts | 18 +++
ui/src/app/core-model/dashboard/DashboardWidget.ts | 18 +++
.../dashboard/DashboardWidgetDataConfig.ts | 18 +++
.../dashboard/DashboardWidgetSettings.ts | 18 +++
.../core-model/dashboard/VisualizablePipeline.ts | 18 +++
ui/src/app/core-ui/chart/baseChart.component.ts | 3 +-
ui/src/app/core-ui/core-ui.module.ts | 16 +-
ui/src/app/core-ui/table/table.component.ts | 2 +-
ui/src/app/core/http-provider.config.ts | 4 +-
ui/src/app/core/icon-provider.config.ts | 3 +-
ui/src/app/core/md-theming-provider.config.ts | 70 +++++++++
ui/src/app/core/root-scope-delegate.decorator.ts | 28 ++++
.../components/grid/dashboard-grid.component.css | 17 +++
.../components/grid/dashboard-grid.component.html | 28 +++-
.../components/grid/dashboard-grid.component.ts | 50 ++++++-
.../overview/dashboard-overview.component.css | 18 +++
.../overview/dashboard-overview.component.ts | 24 ++-
.../components/panel/dashboard-panel.component.css | 18 +++
.../panel/dashboard-panel.component.html | 26 +++-
.../components/panel/dashboard-panel.component.ts | 80 ++++++++--
.../widget/dashboard-widget.component.css | 29 +++-
.../widget/dashboard-widget.component.html | 49 ++++--
.../widget/dashboard-widget.component.ts | 48 +++++-
.../components/widgets/area/area-config.ts} | 19 ++-
.../widgets/area/area-widget.component.css | 24 +++
.../widgets/area/area-widget.component.html | 41 +++++
.../widgets/area/area-widget.component.ts} | 28 ++--
.../components/widgets/base/base-config.ts | 18 +++
.../widgets/base/base-ngx-charts-widget.ts | 44 +++++-
.../base-ngx-line-charts-widget.ts} | 43 +++---
.../widgets/base/base-ngx-line-config.ts | 47 ++++++
.../components/widgets/base/base-widget.ts | 69 ++++++++-
.../components/widgets/gauge/gauge-config.ts | 22 ++-
.../widgets/gauge/gauge-widget.component.css | 32 ++++
.../widgets/gauge/gauge-widget.component.html | 46 ++++--
.../widgets/gauge/gauge-widget.component.ts | 26 +++-
.../components/widgets/image/image-config.ts | 18 +++
.../widgets/image/image-widget.component.css | 18 +++
.../widgets/image/image-widget.component.html | 18 +++
.../widgets/image/image-widget.component.ts | 18 +++
.../components/widgets/line/line-config.ts | 46 +++---
.../widgets/line/line-widget.component.css | 27 +++-
.../widgets/line/line-widget.component.html | 40 +++--
.../widgets/line/line-widget.component.ts | 63 +++-----
.../components/widgets/number/number-config.ts | 24 ++-
.../widgets/number/number-widget.component.css | 26 +++-
.../widgets/number/number-widget.component.html | 24 ++-
.../widgets/number/number-widget.component.ts | 22 ++-
.../components/widgets/table/table-config.ts | 20 ++-
.../widgets/table/table-widget.component.css | 26 ++++
.../widgets/table/table-widget.component.html | 41 ++++-
.../widgets/table/table-widget.component.ts | 20 ++-
ui/src/app/dashboard-v2/dashboard.component.css | 18 +++
ui/src/app/dashboard-v2/dashboard.component.html | 22 ++-
ui/src/app/dashboard-v2/dashboard.component.ts | 33 +++-
ui/src/app/dashboard-v2/dashboard.module.ts | 21 ++-
.../add-visualization-dialog.component.html | 9 +-
.../add-visualization-dialog.component.ts | 36 +++--
.../edit-dashboard-dialog.component.ts | 2 +-
ui/src/app/dashboard-v2/models/dashboard.model.ts | 18 +++
.../app/dashboard-v2/models/gridster-info.model.ts | 18 +++
.../app/dashboard-v2/models/multi-series.model.ts | 18 +++
.../dashboard-v2/registry/widget-config-builder.ts | 51 ++++++-
.../app/dashboard-v2/registry/widget-registry.ts | 22 ++-
.../sdk/collected-schema-requirements.ts | 18 +++
ui/src/app/dashboard-v2/sdk/ep-requirements.ts | 18 +++
.../sdk/extractor/static-property-extractor.ts | 24 ++-
.../dashboard-v2/sdk/matching/datatype-match.ts | 18 +++
.../sdk/matching/domain-property-match.ts | 18 +++
.../sdk/matching/mapping-property-generator.ts | 18 +++
.../sdk/matching/primitive-property-match.ts | 18 +++
.../dashboard-v2/sdk/matching/property-match.ts | 18 +++
ui/src/app/dashboard-v2/sdk/model/datatypes.ts | 18 +++
ui/src/app/dashboard-v2/sdk/model/vocabulary.ts | 18 +++
.../sdk/schema-requirements-builder.ts | 18 +++
.../dashboard-v2/services/MockDashboard.service.ts | 18 +++
.../app/dashboard-v2/services/dashboard.service.ts | 35 ++++-
.../services/refresh-dashboard.service.ts | 26 +++-
ui/src/app/dashboard-v2/services/resize.service.ts | 22 ++-
.../app/dashboard-v2/services/websocket.config.ts | 18 +++
.../dashboard-v2/services/websocket.settings.ts | 18 +++
.../app/data-explorer/data-explorer.component.ts | 2 +-
ui/src/app/data-explorer/data-explorer.module.ts | 7 +-
.../datadownloadDialog/dataDownload.dialog.ts | 5 +-
.../data-explorer/explorer/explorer.component.html | 2 +-
.../data-explorer/explorer/explorer.component.ts | 5 +-
.../components/freetext/freetext.controller.ts | 3 +
.../customize.controller.ts | 11 +-
ui/src/app/editor/editor.module.ts | 3 +-
ui/src/app/home/home.module.ts | 3 +-
ui/src/app/info/info.component.ts | 2 +-
ui/src/app/info/info.module.ts | 16 +-
ui/src/app/layout/app.controller.ts | 3 +
ui/src/app/login/login.controller.ts | 6 +-
ui/src/app/login/setup.controller.ts | 2 +-
ui/src/app/login/startup/startup.controller.ts | 5 +-
.../dialog/pipeline-status-dialog.controller.ts | 6 +-
.../dialog/pipeline-status-dialog.tmpl.html | 2 +-
ui/src/app/pipelines/pipelines.module.ts | 5 +-
ui/src/app/platform-services/tsonld/Float.ts | 20 +++
ui/src/app/platform-services/tsonld/tsonld.ts | 7 +-
ui/src/app/services/auth.service.ts | 5 +-
ui/src/app/services/jsplumb.service.ts | 13 +-
ui/src/app/services/object-provider.service.ts | 2 +-
ui/src/app/services/pipeline-editor.service.ts | 2 +-
.../app/services/pipeline-positioning.service.ts | 6 +-
ui/src/app/services/rest-api.service.ts | 2 +-
.../route-transition-interceptor.service.ts | 5 +-
ui/src/app/services/tour/shepherd.service.ts | 5 +-
ui/src/app/services/tour/tour-provider.service.ts | 7 +-
ui/src/app/services/transition.service.ts | 3 +-
ui/src/polyfills.ts | 38 +----
ui/src/scss/sp/main.scss | 4 +
ui/src/tsconfig.app.json | 14 +-
ui/src/tsconfig.spec.json | 3 +-
ui/tsconfig.json | 14 +-
ui/tslint.json | 10 +-
ui/webpack.config.base.js | 26 ++--
ui/webpack.config.prod.js | 6 +-
ui/webpack.partial.base.js | 32 ++++
ui/webpack.partial.dev.js | 58 +++++++
.../http-provider.config.ts => webpack.partial.js} | 8 +-
ui/webpack.partial.prod.js | 26 ++++
201 files changed, 2709 insertions(+), 890 deletions(-)