You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/06/20 17:45:23 UTC
[incubator-streampipes] branch STREAMPIPES-79 updated (5223718 ->
fb2673a)
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 5223718 [STREAMPIPES-79] fix order of images (newest to oldest), fix page display
add 8a00761 1st task "pallet"
add 963322c adding functions
add aab2f21 [STREAMPIPES-140] Add streampipes-maven-plugin
add 99f2999 [STREAMPIPES-137] Add license headers to archetype files
add 85c8f04 [STREAMPIPES-137] Update LICENSE file, load fonts externally
add 26bf5ae [STREAMPIPES-137] Add build instructions to README
add d4fdf7e Merge branch 'STREAMPIPES-79' into dev
add 28daf81 Update timing of saving labels in database (timeseries labeling tool)
add 0ed0854 Add missing ASF header to fix build
add 218ab75 Update timing of label saving to database (timeseries labeling tool)
add 1545c25 [STREAMPIPES-142] Handle non-primitive and primitive event data returned from Siddhi
add 68b1d7b Merge branch 'dev' of https://github.com/apache/incubator-streampipes into dev
add 89a376e [hotfix] update cache to prevent outdated package repos
add 4fa6d85 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add 30238b7 [STREAMPIPES-146] Support CustomOutputStrategy in SiddhiEventEngine
add dff37c3 [STREAMPIPES-140] Add feature to create adapter documentation, delete UI images from core
add b027c50 Fix errors in documentation generator
add 47d7197 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add 574b0a5 Merge branch 'dev' of https://github.com/apache/incubator-streampipes into dev
add f6b2fb8 Merge branch 'dev' of https://github.com/apache/incubator-streampipes into dev
add 1c8b94b Adding arrows to ease the process of chnaging selected time interval of monitoring data
add 5bae25f Merge branch 'El-Sherif-dev' into newfeature
add 9b33775 Change arrows to select time range
add 6823724 Change time range selector
add 5340b9d Added description icon for image labeling
add be6c168 Adding new app
add e99a0ac Merge branch 'dev' of https://github.com/El-Sherif/incubator-streampipes into newfeature
add cd294e8 [STREAMPIPES-154]: Remove duplicated websocket configuration from data explorer module
add 09da1e4 [STREAMPIPES-152] Fix by removing the second decryption step
add c0a1c3e Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add f592ce8 Add area field to cooc information
add 472dad2 Merge branch 'dev' into newfeature
add 8f59513 Add aggregation configuration to line-chart
add 6dc052c Remove old version of data explorer
add eee210c Rename date new explorer module
add 36b3c62 Remove som unused methods in the data lake api
add 48e9e97 fix order of images (newest to oldest), fix page number display
add fe5ec0f Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add d765393 Add missing licence headers
add 781b7ae prevent fast image skipping, fix import order
add 73f5abc Merge remote-tracking branch 'origin/dev' into dev
add a6a466a Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add 00a3912 Fix dashboard widget
add 3c983a9 - image container show loading spinner and notify child if it's drawing - image labeling does not allow change image while container is drawing
add 1fa8cd0 Merge remote-tracking branch 'origin/dev' into dev
add b0dd1d4 fix: wrong property access type
add 6cb5ebe [STREAMPIPES-161] Add PR template and contributing guide
add a7aed40 Merge pull request #19 from grainier/STREAMPIPES-161
add 2c0ea0f Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add 9deb75e Remove dependencies with missing headers
add ef7ff63 Remove dependencies from ui
add fffafd9 Fix overlapping shapes in linechart (timeseries labeling tool)
add c46bf0c Remove third party services
add 78c0794 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
add fd566b7 Update README.md
new 3ea570c Merge branch 'dev' into STREAMPIPES-79
new fb2673a Working in grouping for line chart
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/PULL_REQUEST_TEMPLATE.md | 53 +++
.github/workflows/build.yml | 1 +
...data-explorer.component.html => CONTRIBUTING.md | 21 +-
LICENSE | 8 +-
README.md | 34 +-
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../src/main/java/config/Config.java | 19 +
.../src/main/java/config/ConfigKeys.java | 19 +
.../src/main/java/main/Init.java | 19 +
.../__packageName__/__classNamePrefix__.java | 18 +
.../__classNamePrefix__Controller.java | 19 +
.../__classNamePrefix__Parameters.java | 19 +
.../__classNamePrefix__Program.java | 19 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../src/main/java/config/Config.java | 18 +
.../src/main/java/config/ConfigKeys.java | 18 +
.../src/main/java/main/Init.java | 18 +
.../__classNamePrefix__Controller.java | 18 +
.../__classNamePrefix__Parameters.java | 18 +
.../__classNamePrefix__Program.java | 18 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 17 +
.../src/main/java/config/Config.java | 18 +
.../src/main/java/config/ConfigKeys.java | 18 +
.../src/main/java/main/Init.java | 18 +
.../sink/__packageName__/__classNamePrefix__.java | 18 +
.../__classNamePrefix__Controller.java | 18 +
.../__classNamePrefix__Parameters.java | 18 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../deployment/docker-compose.yml | 13 -
.../archetype-resources/deployment/system | 11 -
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../src/main/java/config/Config.java | 18 +
.../src/main/java/config/ConfigKeys.java | 18 +
.../src/main/java/main/Init.java | 18 +
.../main/java/pe/__packageName__/DataSource.java | 17 +
.../__packageName__/__classNamePrefix__Stream.java | 18 +
pom.xml | 34 ++
.../master/management/SourcesManagement.java | 8 +-
streampipes-maven-plugin/pom.xml | 195 ++++++++++
.../apache/streampipes/smp/CreateAssetMojo.java | 108 ++++++
.../streampipes/smp/ExtractDocumentationMojo.java | 188 +++++++++
.../streampipes/smp/constants/PeGridConst.java | 52 +++
.../apache/streampipes/smp/constants/PeType.java | 17 +-
.../smp/extractor/AssetModelItemExtractor.java | 90 +++++
.../smp/extractor/ControllerExtractor.java | 56 +++
.../smp/extractor/ControllerFileFinder.java | 61 +++
.../smp/extractor/DockerImageExtractor.java | 77 ++++
.../streampipes/smp/extractor/ElementFinder.java | 26 +-
.../streampipes/smp/extractor/FieldReplacer.java | 59 +++
.../smp/extractor/LocalesExtractor.java | 60 +++
.../extractor/PipelineElementTypeExtractor.java | 29 +-
.../extractor/ResourceDirectoryElementFinder.java | 72 ++++
.../streampipes/smp/generator/AssetGenerator.java | 59 +++
.../smp/generator/DataJsonGenerator.java | 74 ++++
.../smp/generator/ImagePathReplacer.java | 59 +++
.../smp/generator/MarkdownHeaderGenerator.java | 51 +++
.../smp/generator/MarkdownTitleRemover.java | 14 +-
.../streampipes/smp/generator/OutputGenerator.java | 16 +-
.../generator/PipelineElementGridGenerator.java | 151 ++++++++
.../PipelineElementOverviewGenerator.java | 52 +++
.../smp/generator/SidebarConfigGenerator.java | 33 +-
.../apache/streampipes/smp/model/AssetModel.java | 108 ++++++
.../smp/parser/DocumentationParser.java | 27 +-
.../parser/PipelineElementDescriptionReplacer.java | 24 +-
.../smp/parser/PipelineElementNameReplacer.java | 26 +-
.../smp/parser/PlaceholderReplacer.java | 28 +-
.../streampipes/smp/util/DirectoryManager.java | 16 +-
.../streampipes/smp/util/DuplicateRemover.java | 31 +-
.../org/apache/streampipes/smp/util/Utils.java | 51 +++
.../src/main/resources/docker-compose.yml | 28 +-
.../src/main/resources/documentation.md | 34 +-
.../src/main/resources/expected.documentation.md | 34 +-
.../src/main/resources/placeholder-icon.png | Bin 0 -> 3475 bytes
.../smp/extractor/TestAssetModelExtractor.java | 107 ++++++
.../smp/extractor/TestDockerImageExtractor.java | 32 +-
.../smp/generator/TestMarkdownTitleRemover.java | 109 ++++++
.../TestPipelineElementOverviewGenerator.java | 31 +-
.../smp/parser/TestDocumentationParser.java | 46 +++
.../rest/impl/datalake/DataLakeResourceV3.java | 6 -
.../wrapper/siddhi/engine/SiddhiEventEngine.java | 47 ++-
ui/README.md | 6 +-
ui/angular.json | 15 +-
ui/deployment/dev/config.yml | 3 +-
ui/deployment/modules.yml | 33 +-
ui/package.json | 16 +-
.../app/app-overview/app-overview.component.html | 2 +
ui/src/app/app-overview/app-overview.component.ts | 5 +
ui/src/app/core-model/coco/Annotation.ts | 18 +
ui/src/app/core-model/coco/Category.ts | 18 +
ui/src/app/core-model/coco/Coco.format.ts | 18 +
ui/src/app/core-model/coco/Image.ts | 18 +
.../datalake/datalake-rest.service.ts | 40 +-
.../components/image-bar/image-bar.component.ts | 2 +-
.../image-container/image-container.component.html | 1 +
.../image-container/image-container.component.ts | 12 +
.../image-labels/image-labels.component.ts | 20 +-
.../image-categorize/image-categorize.component.ts | 2 +-
.../image-labeling/image-labeling.component.html | 11 +-
.../image-labeling/image-labeling.component.ts | 63 +--
.../image/image-viewer/image-viewer.component.ts | 2 +-
.../core-ui/image/services/CocoFormat.service.ts | 1 +
.../widget/dashboard-widget.component.html | 6 +
.../components/widgets/pallet/pallet-config.ts} | 7 +-
.../components/widgets/pallet/pallet.component.css | 16 +
.../widgets/pallet/pallet.component.html | 18 +
.../components/widgets/pallet/pallet.component.ts | 78 ++++
.../components/widgets/pallet/pallet_functions.ts | 82 ++++
ui/src/app/dashboard/dashboard.module.ts | 2 +
ui/src/app/dashboard/registry/widget-registry.ts | 44 ++-
.../dashboard/sdk/schema-requirements-builder.ts | 2 +-
.../datadownloadDialog/dataDownload.dialog.css | 56 ---
.../datadownloadDialog/dataDownload.dialog.html | 100 -----
.../table/table.component.css | 27 --
.../table/table.component.html | 66 ----
.../load-data-spinner.component.css | 0
.../load-data-spinner.component.html | 8 -
.../load-data-spinner.component.ts | 15 -
.../no-data/no-data-in-date-range.component.css | 0
.../no-data/no-data-in-date-range.component.html | 10 -
.../no-data/no-data-in-date-range.component.ts | 19 -
.../select-properties.component.css | 0
.../select-properties.component.html | 8 -
.../select-properties.component.ts | 29 --
.../data-explorer-v2.component.html | 56 ---
.../data-explorer-v2/data-explorer-v2.component.ts | 96 -----
.../data-explorer-v2/data-explorer-v2.module.ts | 167 --------
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 0
.../data-explorer-dashboard-grid.component.css | 0
.../data-explorer-dashboard-grid.component.html | 0
.../grid/data-explorer-dashboard-grid.component.ts | 0
.../data-explorer-dashboard-overview.component.css | 0
...data-explorer-dashboard-overview.component.html | 0
.../data-explorer-dashboard-overview.component.ts | 0
.../data-explorer-dashboard-panel.component.css | 0
.../data-explorer-dashboard-panel.component.html | 0
.../data-explorer-dashboard-panel.component.ts | 0
.../time-selector/timeRangeSelector.component.css | 0
.../time-selector/timeRangeSelector.component.html | 11 +-
.../time-selector/timeRangeSelector.component.ts | 23 +-
.../data-explorer-dashboard-widget.component.css | 0
.../data-explorer-dashboard-widget.component.html | 0
.../data-explorer-dashboard-widget.component.ts | 0
.../components/widgets/base/base-config.ts | 0
.../widgets/base/base-data-explorer-widget.ts | 12 +
.../widgets/base/base-ngx-charts-widget.ts | 0
.../components/widgets/image/image-config.ts | 0
.../widgets/image/image-widget.component.css | 0
.../widgets/image/image-widget.component.html | 0
.../widgets/image/image-widget.component.ts | 0
.../widgets/line-chart/line-chart-config.ts | 0
.../line-chart/line-chart-widget.component.css | 0
.../line-chart/line-chart-widget.component.html | 23 +-
.../line-chart/line-chart-widget.component.ts | 234 ++++++++----
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 0
.../base/baseVisualisation.component.ts | 0
.../linechart/lineChart.component.css | 0
.../linechart/lineChart.component.html | 0
.../linechart/lineChart.component.ts | 0
.../table/table.component.css | 0
.../table/table.component.html | 0
.../table/table.component.ts | 0
.../old-explorer.component.html | 0
.../old-explorer-widget/old-explorer.component.ts | 0
.../widgets/old-explorer-widget/old-explorer.css | 0
.../components/widgets/table/table-config.ts | 0
.../widgets/table/table-widget.component.css | 0
.../widgets/table/table-widget.component.html | 0
.../widgets/table/table-widget.component.ts | 0
.../aggregate-configuration.component.css} | 0
.../aggregate-configuration.component.html | 47 +++
.../aggregate-configuration.component.ts} | 30 +-
.../group-configuration.component.css} | 0
.../group-configuration.component.html | 44 +++
.../group-configuration.component.ts} | 34 +-
.../load-data-spinner.component.css} | 0
.../load-data-spinner.component.html} | 10 +-
.../load-data-spinner.component.ts} | 15 +-
.../no-data/no-data-in-date-range.component.css} | 0
.../no-data/no-data-in-date-range.component.html} | 12 +-
.../no-data/no-data-in-date-range.component.ts} | 21 +-
.../select-properties.component.css} | 8 +-
.../select-properties.component.html} | 12 +-
.../select-properties.component.ts} | 29 +-
.../data-explorer.component.css} | 0
.../app/data-explorer/data-explorer.component.html | 39 +-
.../app/data-explorer/data-explorer.component.ts | 89 +++--
ui/src/app/data-explorer/data-explorer.css | 27 --
ui/src/app/data-explorer/data-explorer.module.ts | 166 +++++---
...explorer-add-visualization-dialog.component.css | 0
...xplorer-add-visualization-dialog.component.html | 0
...-explorer-add-visualization-dialog.component.ts | 0
...ta-explorer-edit-data-view-dialog.component.css | 0
...a-explorer-edit-data-view-dialog.component.html | 0
...ata-explorer-edit-data-view-dialog.component.ts | 0
.../datadownloadDialog/dataDownload.dialog.ts | 196 ----------
.../base/baseVisualisation.component.ts | 146 -------
.../linechart/lineChart.component.html | 52 ---
.../linechart/lineChart.component.ts | 200 ----------
.../table/table.component.ts | 99 -----
.../explorer-widget/explorer.component.html | 289 --------------
.../explorer-widget/explorer.component.ts | 425 ---------------------
.../app/data-explorer/explorer-widget/explorer.css | 85 -----
.../models/dataview-dashboard.model.ts | 0
.../models/multi-series.model.ts | 0
.../registry/data-explorer-widget-registry.ts | 0
.../registry/widget-config-builder.ts | 0
.../sdk/collected-schema-requirements.ts | 0
.../sdk/ep-requirements.ts | 0
.../sdk/extractor/static-property-extractor.ts | 0
.../sdk/matching/datatype-match.ts | 0
.../sdk/matching/domain-property-match.ts | 0
.../sdk/matching/mapping-property-generator.ts | 0
.../sdk/matching/primitive-property-match.ts | 0
.../sdk/matching/property-match.ts | 0
.../sdk/model/datatypes.ts | 0
.../sdk/model/vocabulary.ts | 0
.../sdk/schema-requirements-builder.ts | 0
.../services/data-lake.service.ts | 0
.../services/data-view-data-explorer.service.ts | 0
.../services/refresh-dashboard.service.ts | 0
.../services/resize.service.ts | 0
.../time-selector/timeRangeSelector.component.html | 45 ---
ui/src/assets/fonts/Roboto-Regular.css | 27 --
ui/src/assets/fonts/Roboto-Regular.ttf | Bin 171272 -> 0 bytes
ui/src/assets/img/connect/coindesk.png | Bin 17868 -> 0 bytes
ui/src/assets/img/connect/dice.png | Bin 13079 -> 0 bytes
ui/src/assets/img/connect/file.png | Bin 12881 -> 0 bytes
ui/src/assets/img/connect/gdelt.png | Bin 33450 -> 0 bytes
ui/src/assets/img/connect/iexcloud.png | Bin 15675 -> 0 bytes
ui/src/assets/img/connect/influxdb.png | Bin 9982 -> 0 bytes
ui/src/assets/img/connect/kafka.jpg | Bin 12955 -> 0 bytes
ui/src/assets/img/connect/nsw.png | Bin 3016 -> 0 bytes
ui/src/assets/img/connect/opc.png | Bin 5087 -> 0 bytes
ui/src/assets/img/connect/pulsar.png | Bin 22890 -> 0 bytes
ui/src/assets/img/connect/rest.png | Bin 17467 -> 0 bytes
ui/src/assets/img/connect/slack.png | Bin 17473 -> 0 bytes
ui/src/assets/img/connect/sql.png | Bin 99909 -> 0 bytes
ui/src/assets/img/connect/wikipedia.png | Bin 65221 -> 0 bytes
ui/src/scss/main.scss | 2 +-
ui/tsconfig.spec.json | 18 +
258 files changed, 4180 insertions(+), 2823 deletions(-)
create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
copy ui/src/app/data-explorer/data-explorer.component.html => CONTRIBUTING.md (56%)
delete mode 100644 archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/deployment/docker-compose.yml
delete mode 100644 archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/deployment/system
create mode 100644 streampipes-maven-plugin/pom.xml
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/CreateAssetMojo.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/constants/PeGridConst.java
copy ui/src/app/data-explorer-v2/services/data-lake.service.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/constants/PeType.java (74%)
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/AssetModelItemExtractor.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerExtractor.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/DockerImageExtractor.java
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java (62%)
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/FieldReplacer.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/LocalesExtractor.java
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/PipelineElementTypeExtractor.java (53%)
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/AssetGenerator.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/ImagePathReplacer.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/MarkdownHeaderGenerator.java
copy ui/src/app/data-explorer-v2/services/data-lake.service.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/MarkdownTitleRemover.java (74%)
copy ui/src/app/data-explorer-v2/services/data-lake.service.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/OutputGenerator.java (70%)
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementOverviewGenerator.java
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java (51%)
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/model/AssetModel.java
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/DocumentationParser.java (58%)
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementDescriptionReplacer.java (59%)
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementNameReplacer.java (59%)
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PlaceholderReplacer.java (60%)
copy ui/src/app/data-explorer-v2/services/data-lake.service.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/DirectoryManager.java (72%)
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/DuplicateRemover.java (53%)
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
copy ui/deployment/dev/config.yml => streampipes-maven-plugin/src/main/resources/docker-compose.yml (70%)
copy ui/src/app/core-ui/image/components/image-container/image-container.component.html => streampipes-maven-plugin/src/main/resources/documentation.md (72%)
copy ui/src/app/core-ui/image/components/image-container/image-container.component.html => streampipes-maven-plugin/src/main/resources/expected.documentation.md (72%)
create mode 100644 streampipes-maven-plugin/src/main/resources/placeholder-icon.png
create mode 100644 streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/extractor/TestAssetModelExtractor.java
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/extractor/TestDockerImageExtractor.java (52%)
create mode 100644 streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestMarkdownTitleRemover.java
copy ui/src/app/data-explorer/time-selector/timeRangeSelector.component.ts => streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestPipelineElementOverviewGenerator.java (58%)
create mode 100644 streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/parser/TestDocumentationParser.java
copy ui/src/app/{data-explorer-v2/components/widgets/table/table-config.ts => dashboard/components/widgets/pallet/pallet-config.ts} (84%)
create mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet.component.css
create mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet.component.html
create mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet.component.ts
create mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet_functions.ts
delete mode 100644 ui/src/app/data-explorer-v2/components/datadownloadDialog/dataDownload.dialog.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.html
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.html
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.html
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/load-data-spinner/load-data-spinner.component.ts
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.html
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/no-data/no-data-in-date-range.component.ts
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.css
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.html
delete mode 100644 ui/src/app/data-explorer-v2/components/widgets/utils/select-properties/select-properties.component.ts
delete mode 100644 ui/src/app/data-explorer-v2/data-explorer-v2.component.html
delete mode 100644 ui/src/app/data-explorer-v2/data-explorer-v2.component.ts
delete mode 100644 ui/src/app/data-explorer-v2/data-explorer-v2.module.ts
rename ui/src/app/data-explorer/{explorer-widget => components}/datadownloadDialog/dataDownload.dialog.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/datadownloadDialog/dataDownload.dialog.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/datadownloadDialog/dataDownload.dialog.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/grid/data-explorer-dashboard-grid.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/grid/data-explorer-dashboard-grid.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/grid/data-explorer-dashboard-grid.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/overview/data-explorer-dashboard-overview.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/overview/data-explorer-dashboard-overview.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/overview/data-explorer-dashboard-overview.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/panel/data-explorer-dashboard-panel.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/panel/data-explorer-dashboard-panel.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/panel/data-explorer-dashboard-panel.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/time-selector/timeRangeSelector.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/time-selector/timeRangeSelector.component.html (78%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/time-selector/timeRangeSelector.component.ts (73%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widget/data-explorer-dashboard-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widget/data-explorer-dashboard-widget.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widget/data-explorer-dashboard-widget.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/base/base-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/base/base-data-explorer-widget.ts (94%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/base/base-ngx-charts-widget.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-widget.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/image/image-widget.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-widget.component.html (70%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/line-chart/line-chart-widget.component.ts (73%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.css (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/datadownloadDialog/dataDownload.dialog.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/datadownloadDialog/dataDownload.dialog.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/explorer-visualisations/linechart/lineChart.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.ts (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/explorer-visualisations/table/table.component.css (100%)
rename ui/src/app/data-explorer/{explorer-widget => components/widgets/old-explorer-widget}/explorer-visualisations/table/table.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/explorer-visualisations/table/table.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/old-explorer.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/old-explorer.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/old-explorer-widget/old-explorer.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-config.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-widget.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-widget.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/components/widgets/table/table-widget.component.ts (100%)
copy ui/src/app/{connect/static-properties/static-any-input/static-any-input.component.css => data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.css} (100%)
create mode 100644 ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html
copy ui/src/app/data-explorer/{time-selector/timeRangeSelector.component.ts => components/widgets/utils/aggregate-configuration/aggregate-configuration.component.ts} (53%)
copy ui/src/app/{connect/static-properties/static-any-input/static-any-input.component.css => data-explorer/components/widgets/utils/group-configuration/group-configuration.component.css} (100%)
create mode 100644 ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.html
copy ui/src/app/data-explorer/{time-selector/timeRangeSelector.component.ts => components/widgets/utils/group-configuration/group-configuration.component.ts} (52%)
copy ui/src/app/data-explorer/{time-selector/timeRangeSelector.component.css => components/widgets/utils/load-data-spinner/load-data-spinner.component.css} (100%)
copy ui/src/app/{core-ui/image/components/image-container/image-container.component.html => data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.html} (72%)
copy ui/src/app/{data-explorer-v2/services/data-lake.service.ts => data-explorer/components/widgets/utils/load-data-spinner/load-data-spinner.component.ts} (72%)
rename ui/src/app/data-explorer/{time-selector/timeRangeSelector.component.css => components/widgets/utils/no-data/no-data-in-date-range.component.css} (100%)
copy ui/src/app/{core-ui/image/components/image-container/image-container.component.html => data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.html} (65%)
copy ui/src/app/data-explorer/{time-selector/timeRangeSelector.component.ts => components/widgets/utils/no-data/no-data-in-date-range.component.ts} (65%)
rename ui/src/app/{data-explorer-v2/components/widgets/old-explorer-widget/explorer-visualisations/linechart/lineChart.component.css => data-explorer/components/widgets/utils/select-properties/select-properties.component.css} (90%)
copy ui/src/app/{core-ui/image/components/image-container/image-container.component.html => data-explorer/components/widgets/utils/select-properties/select-properties.component.html} (65%)
rename ui/src/app/data-explorer/{time-selector/timeRangeSelector.component.ts => components/widgets/utils/select-properties/select-properties.component.ts} (53%)
rename ui/src/app/{data-explorer-v2/data-explorer-v2.component.css => data-explorer/data-explorer.component.css} (100%)
delete mode 100644 ui/src/app/data-explorer/data-explorer.css
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/add-widget/data-explorer-add-visualization-dialog.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.css (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.html (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component.ts (100%)
delete mode 100644 ui/src/app/data-explorer/explorer-widget/datadownloadDialog/dataDownload.dialog.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/base/baseVisualisation.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.html
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/linechart/lineChart.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer-visualisations/table/table.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer.component.html
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer.component.ts
delete mode 100644 ui/src/app/data-explorer/explorer-widget/explorer.css
rename ui/src/app/{data-explorer-v2 => data-explorer}/models/dataview-dashboard.model.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/models/multi-series.model.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/registry/data-explorer-widget-registry.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/registry/widget-config-builder.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/collected-schema-requirements.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/ep-requirements.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/extractor/static-property-extractor.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/datatype-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/domain-property-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/mapping-property-generator.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/primitive-property-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/matching/property-match.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/model/datatypes.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/model/vocabulary.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/sdk/schema-requirements-builder.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/data-lake.service.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/data-view-data-explorer.service.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/refresh-dashboard.service.ts (100%)
rename ui/src/app/{data-explorer-v2 => data-explorer}/services/resize.service.ts (100%)
delete mode 100644 ui/src/app/data-explorer/time-selector/timeRangeSelector.component.html
delete mode 100644 ui/src/assets/fonts/Roboto-Regular.css
delete mode 100644 ui/src/assets/fonts/Roboto-Regular.ttf
delete mode 100644 ui/src/assets/img/connect/coindesk.png
delete mode 100644 ui/src/assets/img/connect/dice.png
delete mode 100644 ui/src/assets/img/connect/file.png
delete mode 100644 ui/src/assets/img/connect/gdelt.png
delete mode 100644 ui/src/assets/img/connect/iexcloud.png
delete mode 100644 ui/src/assets/img/connect/influxdb.png
delete mode 100644 ui/src/assets/img/connect/kafka.jpg
delete mode 100644 ui/src/assets/img/connect/nsw.png
delete mode 100644 ui/src/assets/img/connect/opc.png
delete mode 100644 ui/src/assets/img/connect/pulsar.png
delete mode 100644 ui/src/assets/img/connect/rest.png
delete mode 100644 ui/src/assets/img/connect/slack.png
delete mode 100644 ui/src/assets/img/connect/sql.png
delete mode 100644 ui/src/assets/img/connect/wikipedia.png
create mode 100644 ui/tsconfig.spec.json
[incubator-streampipes] 01/02: 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 3ea570cfc0f5ad842c3071e3558a5535d7373b14
Merge: 5223718 fd566b7
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Sat Jun 20 19:44:38 2020 +0200
Merge branch 'dev' into STREAMPIPES-79
.github/PULL_REQUEST_TEMPLATE.md | 53 +++
.github/workflows/build.yml | 1 +
...data-explorer.component.html => CONTRIBUTING.md | 21 +-
LICENSE | 8 +-
README.md | 34 +-
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../src/main/java/config/Config.java | 19 +
.../src/main/java/config/ConfigKeys.java | 19 +
.../src/main/java/main/Init.java | 19 +
.../__packageName__/__classNamePrefix__.java | 18 +
.../__classNamePrefix__Controller.java | 19 +
.../__classNamePrefix__Parameters.java | 19 +
.../__classNamePrefix__Program.java | 19 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../src/main/java/config/Config.java | 18 +
.../src/main/java/config/ConfigKeys.java | 18 +
.../src/main/java/main/Init.java | 18 +
.../__classNamePrefix__Controller.java | 18 +
.../__classNamePrefix__Parameters.java | 18 +
.../__classNamePrefix__Program.java | 18 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 17 +
.../src/main/java/config/Config.java | 18 +
.../src/main/java/config/ConfigKeys.java | 18 +
.../src/main/java/main/Init.java | 18 +
.../sink/__packageName__/__classNamePrefix__.java | 18 +
.../__classNamePrefix__Controller.java | 18 +
.../__classNamePrefix__Parameters.java | 18 +
.../documentation.md | 18 +
.../main/resources/archetype-resources/Dockerfile | 15 +
.../deployment/docker-compose.yml | 13 -
.../archetype-resources/deployment/system | 11 -
.../resources/archetype-resources/development/env | 15 +
.../src/main/resources/archetype-resources/pom.xml | 18 +
.../src/main/java/config/Config.java | 18 +
.../src/main/java/config/ConfigKeys.java | 18 +
.../src/main/java/main/Init.java | 18 +
.../main/java/pe/__packageName__/DataSource.java | 17 +
.../__packageName__/__classNamePrefix__Stream.java | 18 +
pom.xml | 34 ++
.../master/management/SourcesManagement.java | 8 +-
streampipes-maven-plugin/pom.xml | 195 ++++++++++
.../apache/streampipes/smp/CreateAssetMojo.java | 108 ++++++
.../streampipes/smp/ExtractDocumentationMojo.java | 188 +++++++++
.../streampipes/smp/constants/PeGridConst.java | 52 +++
.../apache/streampipes/smp/constants/PeType.java | 17 +-
.../smp/extractor/AssetModelItemExtractor.java | 90 +++++
.../smp/extractor/ControllerExtractor.java | 56 +++
.../smp/extractor/ControllerFileFinder.java | 61 +++
.../smp/extractor/DockerImageExtractor.java | 77 ++++
.../streampipes/smp/extractor/ElementFinder.java | 26 +-
.../streampipes/smp/extractor/FieldReplacer.java | 59 +++
.../smp/extractor/LocalesExtractor.java | 60 +++
.../extractor/PipelineElementTypeExtractor.java | 29 +-
.../extractor/ResourceDirectoryElementFinder.java | 72 ++++
.../streampipes/smp/generator/AssetGenerator.java | 59 +++
.../smp/generator/DataJsonGenerator.java | 74 ++++
.../smp/generator/ImagePathReplacer.java | 59 +++
.../smp/generator/MarkdownHeaderGenerator.java | 51 +++
.../smp/generator/MarkdownTitleRemover.java | 14 +-
.../streampipes/smp/generator/OutputGenerator.java | 16 +-
.../generator/PipelineElementGridGenerator.java | 151 ++++++++
.../PipelineElementOverviewGenerator.java | 52 +++
.../smp/generator/SidebarConfigGenerator.java | 33 +-
.../apache/streampipes/smp/model/AssetModel.java | 108 ++++++
.../smp/parser/DocumentationParser.java | 27 +-
.../parser/PipelineElementDescriptionReplacer.java | 24 +-
.../smp/parser/PipelineElementNameReplacer.java | 26 +-
.../smp/parser/PlaceholderReplacer.java | 28 +-
.../streampipes/smp/util/DirectoryManager.java | 16 +-
.../streampipes/smp/util/DuplicateRemover.java | 31 +-
.../org/apache/streampipes/smp/util/Utils.java | 51 +++
.../src/main/resources/docker-compose.yml | 28 +-
.../src/main/resources/documentation.md | 34 +-
.../src/main/resources/expected.documentation.md | 34 +-
.../src/main/resources/placeholder-icon.png | Bin 0 -> 3475 bytes
.../smp/extractor/TestAssetModelExtractor.java | 107 ++++++
.../smp/extractor/TestDockerImageExtractor.java | 32 +-
.../smp/generator/TestMarkdownTitleRemover.java | 109 ++++++
.../TestPipelineElementOverviewGenerator.java | 31 +-
.../smp/parser/TestDocumentationParser.java | 46 +++
.../rest/impl/datalake/DataLakeResourceV3.java | 6 -
.../wrapper/siddhi/engine/SiddhiEventEngine.java | 47 ++-
ui/README.md | 6 +-
ui/angular.json | 15 +-
ui/deployment/dev/config.yml | 3 +-
ui/deployment/modules.yml | 33 +-
ui/package.json | 16 +-
.../app/app-overview/app-overview.component.html | 2 +
ui/src/app/app-overview/app-overview.component.ts | 5 +
ui/src/app/core-model/coco/Annotation.ts | 18 +
ui/src/app/core-model/coco/Category.ts | 18 +
ui/src/app/core-model/coco/Coco.format.ts | 18 +
ui/src/app/core-model/coco/Image.ts | 18 +
.../datalake/datalake-rest.service.ts | 40 +-
.../components/image-bar/image-bar.component.ts | 2 +-
.../image-container/image-container.component.html | 1 +
.../image-container/image-container.component.ts | 12 +
.../image-labels/image-labels.component.ts | 20 +-
.../image-categorize/image-categorize.component.ts | 2 +-
.../image-labeling/image-labeling.component.html | 11 +-
.../image-labeling/image-labeling.component.ts | 63 +--
.../image/image-viewer/image-viewer.component.ts | 2 +-
.../core-ui/image/services/CocoFormat.service.ts | 1 +
.../widget/dashboard-widget.component.html | 6 +
.../components/widgets/pallet/pallet-config.ts} | 7 +-
.../components/widgets/pallet/pallet.component.css | 16 +
.../widgets/pallet/pallet.component.html | 18 +
.../components/widgets/pallet/pallet.component.ts | 78 ++++
.../components/widgets/pallet/pallet_functions.ts | 82 ++++
ui/src/app/dashboard/dashboard.module.ts | 2 +
ui/src/app/dashboard/registry/widget-registry.ts | 44 ++-
.../dashboard/sdk/schema-requirements-builder.ts | 2 +-
.../datadownloadDialog/dataDownload.dialog.css | 56 ---
.../datadownloadDialog/dataDownload.dialog.html | 100 -----
.../table/table.component.css | 27 --
.../table/table.component.html | 66 ----
.../load-data-spinner.component.css | 0
.../load-data-spinner.component.html | 8 -
.../load-data-spinner.component.ts | 15 -
.../no-data/no-data-in-date-range.component.css | 0
.../no-data/no-data-in-date-range.component.html | 10 -
.../no-data/no-data-in-date-range.component.ts | 19 -
.../select-properties.component.css | 0
.../select-properties.component.html | 8 -
.../select-properties.component.ts | 29 --
.../data-explorer-v2.component.html | 56 ---
.../data-explorer-v2/data-explorer-v2.component.ts | 96 -----
.../data-explorer-v2/data-explorer-v2.module.ts | 167 --------
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 0
.../data-explorer-dashboard-grid.component.css | 0
.../data-explorer-dashboard-grid.component.html | 0
.../grid/data-explorer-dashboard-grid.component.ts | 0
.../data-explorer-dashboard-overview.component.css | 0
...data-explorer-dashboard-overview.component.html | 0
.../data-explorer-dashboard-overview.component.ts | 0
.../data-explorer-dashboard-panel.component.css | 0
.../data-explorer-dashboard-panel.component.html | 0
.../data-explorer-dashboard-panel.component.ts | 0
.../time-selector/timeRangeSelector.component.css | 0
.../time-selector/timeRangeSelector.component.html | 11 +-
.../time-selector/timeRangeSelector.component.ts | 23 +-
.../data-explorer-dashboard-widget.component.css | 0
.../data-explorer-dashboard-widget.component.html | 0
.../data-explorer-dashboard-widget.component.ts | 0
.../components/widgets/base/base-config.ts | 0
.../widgets/base/base-data-explorer-widget.ts | 0
.../widgets/base/base-ngx-charts-widget.ts | 0
.../components/widgets/image/image-config.ts | 0
.../widgets/image/image-widget.component.css | 0
.../widgets/image/image-widget.component.html | 0
.../widgets/image/image-widget.component.ts | 0
.../widgets/line-chart/line-chart-config.ts | 0
.../line-chart/line-chart-widget.component.css | 0
.../line-chart/line-chart-widget.component.html | 18 +-
.../line-chart/line-chart-widget.component.ts | 166 ++++----
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 0
.../base/baseVisualisation.component.ts | 0
.../linechart/lineChart.component.css | 0
.../linechart/lineChart.component.html | 0
.../linechart/lineChart.component.ts | 0
.../table/table.component.css | 0
.../table/table.component.html | 0
.../table/table.component.ts | 0
.../old-explorer.component.html | 0
.../old-explorer-widget/old-explorer.component.ts | 0
.../widgets/old-explorer-widget/old-explorer.css | 0
.../components/widgets/table/table-config.ts | 0
.../widgets/table/table-widget.component.css | 0
.../widgets/table/table-widget.component.html | 0
.../widgets/table/table-widget.component.ts | 0
.../aggregate-configuration.component.css} | 5 -
.../aggregate-configuration.component.html | 47 +++
.../aggregate-configuration.component.ts} | 30 +-
.../load-data-spinner.component.css} | 0
.../load-data-spinner.component.html} | 10 +-
.../load-data-spinner.component.ts} | 15 +-
.../no-data/no-data-in-date-range.component.css} | 0
.../no-data/no-data-in-date-range.component.html} | 12 +-
.../no-data/no-data-in-date-range.component.ts} | 21 +-
.../select-properties.component.css} | 8 +-
.../select-properties.component.html} | 12 +-
.../select-properties.component.ts} | 29 +-
.../data-explorer.component.css} | 0
.../app/data-explorer/data-explorer.component.html | 39 +-
.../app/data-explorer/data-explorer.component.ts | 89 +++--
ui/src/app/data-explorer/data-explorer.css | 27 --
ui/src/app/data-explorer/data-explorer.module.ts | 164 +++++---
...explorer-add-visualization-dialog.component.css | 0
...xplorer-add-visualization-dialog.component.html | 0
...-explorer-add-visualization-dialog.component.ts | 0
...ta-explorer-edit-data-view-dialog.component.css | 0
...a-explorer-edit-data-view-dialog.component.html | 0
...ata-explorer-edit-data-view-dialog.component.ts | 0
.../datadownloadDialog/dataDownload.dialog.ts | 196 ----------
.../base/baseVisualisation.component.ts | 146 -------
.../linechart/lineChart.component.html | 52 ---
.../linechart/lineChart.component.ts | 200 ----------
.../table/table.component.ts | 99 -----
.../explorer-widget/explorer.component.html | 289 --------------
.../explorer-widget/explorer.component.ts | 425 ---------------------
.../app/data-explorer/explorer-widget/explorer.css | 85 -----
.../models/dataview-dashboard.model.ts | 0
.../models/multi-series.model.ts | 0
.../registry/data-explorer-widget-registry.ts | 0
.../registry/widget-config-builder.ts | 0
.../sdk/collected-schema-requirements.ts | 0
.../sdk/ep-requirements.ts | 0
.../sdk/extractor/static-property-extractor.ts | 0
.../sdk/matching/datatype-match.ts | 0
.../sdk/matching/domain-property-match.ts | 0
.../sdk/matching/mapping-property-generator.ts | 0
.../sdk/matching/primitive-property-match.ts | 0
.../sdk/matching/property-match.ts | 0
.../sdk/model/datatypes.ts | 0
.../sdk/model/vocabulary.ts | 0
.../sdk/schema-requirements-builder.ts | 0
.../services/data-lake.service.ts | 0
.../services/data-view-data-explorer.service.ts | 0
.../services/refresh-dashboard.service.ts | 0
.../services/resize.service.ts | 0
.../time-selector/timeRangeSelector.component.html | 45 ---
ui/src/assets/fonts/Roboto-Regular.css | 27 --
ui/src/assets/fonts/Roboto-Regular.ttf | Bin 171272 -> 0 bytes
ui/src/assets/img/connect/coindesk.png | Bin 17868 -> 0 bytes
ui/src/assets/img/connect/dice.png | Bin 13079 -> 0 bytes
ui/src/assets/img/connect/file.png | Bin 12881 -> 0 bytes
ui/src/assets/img/connect/gdelt.png | Bin 33450 -> 0 bytes
ui/src/assets/img/connect/iexcloud.png | Bin 15675 -> 0 bytes
ui/src/assets/img/connect/influxdb.png | Bin 9982 -> 0 bytes
ui/src/assets/img/connect/kafka.jpg | Bin 12955 -> 0 bytes
ui/src/assets/img/connect/nsw.png | Bin 3016 -> 0 bytes
ui/src/assets/img/connect/opc.png | Bin 5087 -> 0 bytes
ui/src/assets/img/connect/pulsar.png | Bin 22890 -> 0 bytes
ui/src/assets/img/connect/rest.png | Bin 17467 -> 0 bytes
ui/src/assets/img/connect/slack.png | Bin 17473 -> 0 bytes
ui/src/assets/img/connect/sql.png | Bin 99909 -> 0 bytes
ui/src/assets/img/connect/wikipedia.png | Bin 65221 -> 0 bytes
ui/src/scss/main.scss | 2 +-
ui/tsconfig.spec.json | 18 +
255 files changed, 4023 insertions(+), 2820 deletions(-)
[incubator-streampipes] 02/02: Working in grouping for line chart
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 fb2673aa98d2fd006803a4f56927285897e47a95
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Sat Jun 20 19:44:46 2020 +0200
Working in grouping for line chart
---
.../widgets/base/base-data-explorer-widget.ts | 12 ++++
.../line-chart/line-chart-widget.component.html | 5 ++
.../line-chart/line-chart-widget.component.ts | 68 ++++++++++++++++++++++
.../aggregate-configuration.component.html | 2 +-
.../group-configuration.component.css | 18 ++++++
.../group-configuration.component.html | 44 ++++++++++++++
.../group-configuration.component.ts | 54 +++++++++++++++++
ui/src/app/data-explorer/data-explorer.module.ts | 4 +-
8 files changed, 205 insertions(+), 2 deletions(-)
diff --git a/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts b/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
index bc87317..56923a3 100644
--- a/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
+++ b/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
@@ -98,6 +98,18 @@ export abstract class BaseDataExplorerWidget implements OnChanges {
return propertyKeys;
}
+ getDimenstionProperties(eventSchema: EventSchema) {
+ const result: EventProperty[] = [];
+ eventSchema.eventProperties.forEach(property => {
+ if (property.propertyScope === 'DIMENSION_PROPERTY') {
+ result.push(property);
+ }
+ });
+
+ return result;
+ }
+
+
getTimestampProperty(eventSchema: EventSchema) {
const propertyKeys: string[] = [];
diff --git a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
index 3d2ce8c..1825d4b 100644
--- a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
+++ b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
@@ -31,6 +31,11 @@
(update)="changeResolution($event)">
</sp-aggregate-configuration>
+ <sp-group-configuration [dimensionProperties]="dimensionProperties"
+ (update)="changeGroupingResolution($event)">
+ </sp-group-configuration>
+
+
<button mat-icon-button matTooltip="Download data" class="icon" (click)="downloadDataAsFile()" color="white">
<i class="material-icons">get_app</i>
</button>
diff --git a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
index f62e8a7..1c473d6 100644
--- a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
@@ -26,6 +26,7 @@ import { ChangeChartmodeDialog } from '../../../../core-ui/linechart/labeling-to
import { LabelingDialog } from '../../../../core-ui/linechart/labeling-tool/dialogs/labeling/labeling.dialog';
import { ColorService } from '../../../../core-ui/linechart/labeling-tool/services/color.service';
import { BaseDataExplorerWidget } from '../base/base-data-explorer-widget';
+import { GroupedDataResult } from '../../../../core-model/datalake/GroupedDataResult';
@Component({
selector: 'sp-data-explorer-line-chart-widget',
@@ -37,6 +38,7 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
data: any[] = undefined;
availableColumns: EventProperty[] = [];
selectedColumns: EventProperty[] = [];
+ dimensionProperties: EventProperty[] = [];
yKeys: string[] = [];
xKey: string;
@@ -125,6 +127,8 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
ngOnInit(): void {
this.availableColumns = this.getNumericProperty(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
+ this.dimensionProperties = this.getDimenstionProperties(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
+
// Reduce selected columns when more then 6
this.selectedColumns = this.availableColumns.length > 6 ? this.availableColumns.slice(0, 5) : this.availableColumns;
@@ -133,6 +137,36 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
this.updateData();
}
+ changeGroupingResolution(event) {
+ // TODO next get grouped data from backend
+ const groupValue = event['groupValue'];
+
+ console.log(event);
+ this.dataLakeRestService.getGroupedDataAutoAggergation(
+ this.dataExplorerWidget.dataLakeMeasure.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime()
+ , groupValue)
+ .subscribe((res: GroupedDataResult) => {
+
+ if (res.total === 0) {
+ this.setShownComponents(true, false, false);
+ } else {
+ // res.measureName = this.dataExplorerWidget.dataLakeMeasure.measureName;
+ const tmp = this.transformGroupedData(res, this.xKey);
+ this.data = this.displayGroupedData(tmp, this.yKeys);
+ // this.data['measureName'] = tmp.measureName;
+ // this.data['labels'] = tmp.labels;
+
+ if (this.data['labels'] !== undefined && this.data['labels'].length > 0) {
+ this.addInitialColouredShapesToGraph();
+ }
+
+ this.setShownComponents(false, true, false);
+ }
+
+ }
+ );
+ }
+
changeResolution(event) {
const aggregationTimeUnit = event['aggregationTimeUnit'];
const aggregationValue = event['aggregationValue'];
@@ -218,6 +252,31 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
}
}
+ displayGroupedData(transformedData: GroupedDataResult, yKeys: string[]) {
+ if (this.yKeys.length > 0) {
+
+ const tmp = [];
+
+ const groupNames = Object.keys(transformedData.dataResults);
+ for (const groupName of groupNames) {
+ const value = transformedData.dataResults[groupName];
+ this.yKeys.forEach(key => {
+ value.rows.forEach(serie => {
+ if (serie.name === key) {
+ serie.name = groupName + ' ' + serie.name;
+ tmp.push(serie);
+ }
+ });
+ });
+ }
+ return tmp;
+
+ } else {
+ return undefined;
+ }
+ }
+
+
transformData(data: DataResult, xKey: string): DataResult {
const tmp: any[] = [];
@@ -263,6 +322,15 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
return data;
}
+ transformGroupedData(data: GroupedDataResult, xKey: string): GroupedDataResult {
+ for (const key in data.dataResults) {
+ const dataResult = data.dataResults[key];
+ dataResult.rows = this.transformData(dataResult, xKey).rows;
+ }
+
+ return data;
+ }
+
setSelectedColumn(selectedColumns: EventProperty[]) {
this.selectedColumns = selectedColumns;
this.yKeys = this.getRuntimeNames(selectedColumns);
diff --git a/ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html b/ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html
index 6511b49..cebc440 100644
--- a/ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html
+++ b/ui/src/app/data-explorer/components/widgets/utils/aggregate-configuration/aggregate-configuration.component.html
@@ -19,7 +19,7 @@
<div fxLayout="column" fxLayoutAlign="stretch">
<div fxFlex="100" layout="row" fxLayoutAlign="end center" style="margin-left: 0px;margin-right: 0px;">
- <mat-slide-toggle [(ngModel)]="autoAggregationActive">Group</mat-slide-toggle>
+ <mat-slide-toggle [(ngModel)]="autoAggregationActive">Interval</mat-slide-toggle>
<div *ngIf="autoAggregationActive" class="option" style="margin-left: 5px">
<mat-form-field style="width: 80px; margin-right: 5px">
<input matInput type="number" [(ngModel)]="aggregationValue">
diff --git a/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.css b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.css
new file mode 100644
index 0000000..58ba04b
--- /dev/null
+++ b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.css
@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
diff --git a/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.html b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.html
new file mode 100644
index 0000000..3c90fe4
--- /dev/null
+++ b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.html
@@ -0,0 +1,44 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~
+ -->
+
+
+<div fxLayout="column" fxLayoutAlign="stretch" *ngIf="groupingAvailable">
+ <div fxFlex="100" layout="row" fxLayoutAlign="end center" style="margin-left: 10px;margin-right: 0px;">
+ <mat-slide-toggle [(ngModel)]="groupingActive">Group</mat-slide-toggle>
+ <div *ngIf="groupingActive" class="option" style="margin-left: 5px">
+ <mat-form-field style="width: 100px">
+ <mat-select [(value)]="groupValue">
+ <mat-option
+ style="background-color: #FFFFFF" value="None">
+ None
+ </mat-option>
+ <mat-option
+ *ngFor="let property of this.dimensionProperties"
+ style="background-color: #FFFFFF" value="{{property.runtimeName}}">
+ {{property.runtimeName}}
+ </mat-option>
+ </mat-select>
+ <mat-label>Dimension</mat-label>
+ </mat-form-field>
+<!-- <button mat-button mat-icon-button color="white" (click)="removeWidget()">-->
+ <button (click)="updateData()" mat-button mat-icon-button color="white">
+ <i class="material-icons">autorenew</i>
+ </button>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.ts b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.ts
new file mode 100644
index 0000000..b4abe2c
--- /dev/null
+++ b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { EventProperty } from '../../../../../connect/schema-editor/model/EventProperty';
+
+@Component({
+ selector: 'sp-group-configuration',
+ templateUrl: './group-configuration.component.html',
+ styleUrls: ['./group-configuration.component.css']
+})
+export class GroupConfigurationComponent implements OnInit {
+
+ groupingAvailable = true;
+ groupingActive = false;
+
+ groupValue = 'None';
+
+ @Output()
+ update: EventEmitter<any> = new EventEmitter();
+
+ @Input()
+ dimensionProperties: EventProperty[];
+
+ constructor() {
+ }
+
+ ngOnInit(): void {
+ if (this.dimensionProperties.length === 0) {
+ this.groupingAvailable = false;
+ }
+ }
+
+ updateData() {
+ this.update.emit({'groupValue': this.groupValue});
+ }
+
+
+}
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index 11ac4ab..2f4424c 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -63,6 +63,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 { GroupConfigurationComponent } from './components/widgets/utils/group-configuration/group-configuration.component';
const dashboardWidgets = [
@@ -125,7 +126,8 @@ export const MY_NATIVE_FORMATS = {
LoadDataSpinnerComponent,
DataDownloadDialog,
SelectPropertiesComponent,
- AggregateConfigurationComponent
+ AggregateConfigurationComponent,
+ GroupConfigurationComponent
],
providers: [
DatalakeRestService,