You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/06/28 21:45:29 UTC

[incubator-streampipes] 01/01: Merge branch 'dev' into STREAMPIPES-145

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-145
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit fb1c6da0ae1163af88ca02e7249ca3439c9c4ce2
Merge: 0c25839 29da76c
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Jun 28 23:45:09 2020 +0200

    Merge branch 'dev' into STREAMPIPES-145

 .github/PULL_REQUEST_TEMPLATE.md                   |  53 +++
 ...in-date-range.component.html => CONTRIBUTING.md |  18 +-
 .../master/management/SourcesManagement.java       |   8 +-
 .../rest/impl/datalake/DataLakeManagementV3.java   |   2 +-
 .../streampipes/sdk/helpers/EpProperties.java      |  16 +
 .../wrapper/siddhi/engine/SiddhiEventEngine.java   |  35 +-
 ui/README.md                                       |  10 +-
 ui/angular.json                                    |  14 +
 ui/deployment/dev/config.yml                       |   3 +-
 ui/deployment/modules.yml                          |  33 +-
 ui/package.json                                    |  15 +-
 .../app/app-overview/app-overview.component.html   |   2 +
 ui/src/app/app-overview/app-overview.component.ts  |   5 +
 .../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-categorize.component.html                |   2 +-
 .../image-categorize/image-categorize.component.ts |   5 +-
 .../image-labeling/image-labeling.component.html   |  11 +-
 .../image-labeling/image-labeling.component.ts     |  66 ++--
 .../image/image-viewer/image-viewer.component.html |   2 +-
 .../image/image-viewer/image-viewer.component.ts   |   5 +-
 .../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 -----
 .../linechart/lineChart.component.css              |  23 --
 .../table/table.component.css                      |  27 --
 .../table/table.component.html                     |  66 ----
 .../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    |  37 +-
 .../line-chart/line-chart-widget.component.ts      | 254 +++++++++---
 .../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}         |   1 +
 .../aggregate-configuration.component.html         |  43 +++
 .../aggregate-configuration.component.ts}          |  31 +-
 .../group-configuration.component.css}             |   1 +
 .../group-configuration.component.html             |  47 +++
 .../group-configuration.component.ts}              |  43 ++-
 .../load-data-spinner.component.css                |   0
 .../load-data-spinner.component.html               |   0
 .../load-data-spinner.component.ts                 |   0
 .../no-data/no-data-in-date-range.component.css    |   0
 .../no-data/no-data-in-date-range.component.html   |   0
 .../no-data/no-data-in-date-range.component.ts     |   0
 .../select-properties.component.css}               |   8 +-
 .../select-properties.component.html               |   2 +-
 .../select-properties.component.ts                 |   0
 .../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/tsconfig.spec.json                              |  18 +
 142 files changed, 1115 insertions(+), 2481 deletions(-)

diff --cc ui/package.json
index 808e590,a7ecdbe..7aa40a5
--- a/ui/package.json
+++ b/ui/package.json
@@@ -83,12 -85,12 +84,12 @@@
      "leaflet": "1.6.0",
      "lodash": "3.10.1",
      "material-design-icons": "3.0.1",
+     "moment": "2.24.0",
      "ng-dynamic-component": "4.0.3",
      "ng-file-upload": "9.0.13",
-     "@danielmoncada/angular-datetime-picker": "9.2.0",
-     "moment": "2.24.0",
+     "ng-pick-datetime": "7.0.0",
      "ng-prettyjson": "0.1.8",
 -    "ng-showdown": "1.1.0",
 +    "ngx-showdown": "5.1.0",
      "ng-simple-slideshow": "1.2.9",
      "ng2-charts": "2.0.3",
      "ng2-dragula": "1.5.0",
@@@ -100,12 -103,10 +102,11 @@@
      "rxjs": "6.3.3",
      "rxjs-compat": "6.3.3",
      "shepherd.js": "2.4.0",
 +    "showdown": "1.9.1",
      "slick-carousel": "1.6.0",
      "systemjs": "0.21.6",
-     "tslib": "1.11.1",
-     "ng-pick-datetime": "7.0.0",
      "trix": "0.10.1",
+     "tslib": "1.11.1",
      "zone.js": "0.10.2"
    },
    "devDependencies": {