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/02/06 10:38:57 UTC

[incubator-streampipes] branch new_dashboard updated (7a48b9b -> b8009ce)

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

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


    from 7a48b9b  Add serialization/deserialization support for new dashboard
     add f5d713d  STREAMPIPES-70: Auto-save pipelines in pipeline development mode
     add 74e40da  Add icon and adapter type
     add 2467c44  Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
     add f50064e  Add null check for alternative labels in label generator
     add fa749b5  Bug Fixing: -Fix in Connect getting Protocol-Assets Bug -Fix Generating Label for Protocol Description
     add 32bffb7  Create Assets for Adapters/Protocols
     add 97c2a06  Add header to file .asf.yaml
     add 25f898c  Merge remote-tracking branch 'origin/dev' into dev
     add 1d1f628  Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
     add 4da032e  Improve layout of icon bar in pipeline editor
     new b8009ce  Merge branch 'dev' into new_dashboard

The 1 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:
 .asf.yaml                                          |  15 ++++
 .../backend/StreamPipesResourceConfig.java         |   5 ++
 .../master/management/DescriptionManagement.java   |  18 +++--
 .../connect/container/master/management/Utils.java |   8 ++
 .../master/management/WorkerRestClient.java        |  37 ++++-----
 .../container/master/rest/DescriptionResource.java |  90 +++++++++++++++------
 .../container/locales/LabelGenerator.java          |  11 ++-
 .../org/apache/streampipes/model/AdapterType.java  |   1 +
 ...ineElementCategory.java => IPipelineCache.java} |  11 +--
 ...PipelineElementFile.java => PipelineCache.java} |  49 +++++------
 .../data-marketplace/data-marketplace.service.ts   |   5 ++
 .../model/connect/grounding/ProtocolDescription.ts |  12 +++
 ui/src/app/core/button/button.directive.ts         |   4 +
 .../pipeline-assembly.controller.ts                |  33 +++++++-
 .../pipeline-assembly/pipeline-assembly.tmpl.html  |  38 ++++++---
 .../pipeline-element-options.controller.ts         |   9 ++-
 .../components/pipeline/pipeline.component.ts      |   4 +-
 .../components/pipeline/pipeline.controller.ts     |  32 +++++++-
 .../save-pipeline/save-pipeline.controller.ts      |   1 +
 .../preview/pipeline-preview.controller.ts         |   2 +-
 .../app/services/pipeline-positioning.service.ts   |  56 +++++++------
 ui/src/app/services/rest-api.service.ts            |  12 +++
 .../{pe_icons/influx.png => connect/influxdb.png}  | Bin
 ui/src/assets/img/connect/mqtt.png                 | Bin 22561 -> 0 bytes
 ui/src/assets/img/connect/ti_sensor_tag.png        | Bin 12579 -> 0 bytes
 ui/src/scss/main.scss                              |   1 +
 ui/src/scss/sp/buttons.ng1.scss                    |  10 +++
 ui/src/scss/sp/pipeline-assembly.scss              |  12 +++
 28 files changed, 351 insertions(+), 125 deletions(-)
 copy streampipes-rest/src/main/java/org/apache/streampipes/rest/api/{IPipelineElementCategory.java => IPipelineCache.java} (81%)
 copy streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/{PipelineElementFile.java => PipelineCache.java} (50%)
 copy ui/src/assets/img/{pe_icons/influx.png => connect/influxdb.png} (100%)
 delete mode 100644 ui/src/assets/img/connect/mqtt.png
 delete mode 100644 ui/src/assets/img/connect/ti_sensor_tag.png
 create mode 100644 ui/src/scss/sp/pipeline-assembly.scss


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

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b8009cec5a5a1f279280ecf52d0b160931a7ecd3
Merge: 7a48b9b 4da032e
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Thu Feb 6 11:38:37 2020 +0100

    Merge branch 'dev' into new_dashboard

 .asf.yaml                                          |  15 ++++
 .../backend/StreamPipesResourceConfig.java         |   5 ++
 .../master/management/DescriptionManagement.java   |  18 +++--
 .../connect/container/master/management/Utils.java |   8 ++
 .../master/management/WorkerRestClient.java        |  37 ++++-----
 .../container/master/rest/DescriptionResource.java |  90 +++++++++++++++------
 .../container/locales/LabelGenerator.java          |  11 ++-
 .../org/apache/streampipes/model/AdapterType.java  |   1 +
 .../streampipes/rest/api/IPipelineCache.java       |  26 +++---
 .../streampipes/rest/impl/PipelineCache.java       |  65 +++++++++++++++
 .../data-marketplace/data-marketplace.service.ts   |   5 ++
 .../model/connect/grounding/ProtocolDescription.ts |  12 +++
 ui/src/app/core/button/button.directive.ts         |   4 +
 .../pipeline-assembly.controller.ts                |  33 +++++++-
 .../pipeline-assembly/pipeline-assembly.tmpl.html  |  38 ++++++---
 .../pipeline-element-options.controller.ts         |   9 ++-
 .../components/pipeline/pipeline.component.ts      |   4 +-
 .../components/pipeline/pipeline.controller.ts     |  32 +++++++-
 .../save-pipeline/save-pipeline.controller.ts      |   1 +
 .../preview/pipeline-preview.controller.ts         |   2 +-
 .../app/services/pipeline-positioning.service.ts   |  56 +++++++------
 ui/src/app/services/rest-api.service.ts            |  12 +++
 ui/src/assets/img/connect/influxdb.png             | Bin 0 -> 9982 bytes
 ui/src/assets/img/connect/mqtt.png                 | Bin 22561 -> 0 bytes
 ui/src/assets/img/connect/ti_sensor_tag.png        | Bin 12579 -> 0 bytes
 ui/src/scss/main.scss                              |   1 +
 ui/src/scss/sp/buttons.ng1.scss                    |  10 +++
 ui/src/scss/sp/pipeline-assembly.scss              |  12 +++
 28 files changed, 397 insertions(+), 110 deletions(-)

diff --cc streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
index d73c330,ea63713..aa14ee9
--- a/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
+++ b/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
@@@ -113,9 -111,7 +117,10 @@@ public class StreamPipesResourceConfig 
      register(DataLakeNoUserResourceV3.class);
      register(PipelineElementFile.class);
      register(FileServingResource.class);
 +    register(DashboardWidget.class);
 +    register(Dashboard.class);
 +    register(VisualizablePipeline.class);
+     register(PipelineCache.class);
  
  
      // Serializers