[incubator-streampipes] branch dev updated: STREAMPIPES-90: Fix bug that prevented pipeline categories to be persisted

[ri...@apache.org]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new db4dc9e  STREAMPIPES-90: Fix bug that prevented pipeline categories to be persisted
db4dc9e is described below

commit db4dc9ea5640e15f80a68df2a4121b1d4a158f08
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Mar 1 22:59:09 2020 +0100

    STREAMPIPES-90: Fix bug that prevented pipeline categories to be persisted
---
 .../streampipes/rest/impl/PipelineWithUserResource.java      |  1 +
 .../dialog/pipeline-categories-dialog.controller.ts          | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java
index 78d36da..1ccf4b9 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineWithUserResource.java
@@ -250,6 +250,7 @@ public class PipelineWithUserResource extends AbstractRestInterface implements I
         storedPipeline.setSepas(pipeline.getSepas());
         storedPipeline.setActions(pipeline.getActions());
         storedPipeline.setCreatedAt(System.currentTimeMillis());
+        storedPipeline.setPipelineCategories(pipeline.getPipelineCategories());
         Operations.updatePipeline(storedPipeline);
         return statusMessage(Notifications.success("Pipeline modified"));
     }
diff --git a/ui/src/app/pipelines/dialog/pipeline-categories-dialog.controller.ts b/ui/src/app/pipelines/dialog/pipeline-categories-dialog.controller.ts
index 9f776cd..da05c8a 100644
--- a/ui/src/app/pipelines/dialog/pipeline-categories-dialog.controller.ts
+++ b/ui/src/app/pipelines/dialog/pipeline-categories-dialog.controller.ts
@@ -17,11 +17,12 @@
  */
 
 import * as angular from 'angular';
+import {RestApi} from "../../services/rest-api.service";
 
 export class PipelineCategoriesDialogController {
 
     $mdDialog: any;
-    RestApi: any;
+    RestApi: RestApi;
     newCategory: any;
     addSelected: any;
     addPipelineToCategorySelected: any;
@@ -32,7 +33,7 @@ export class PipelineCategoriesDialogController {
     refreshPipelines: any;
     getPipelineCategories;
 
-    constructor($mdDialog, RestApi, getPipelineCategories, refreshPipelines)
+    constructor($mdDialog, RestApi: RestApi, getPipelineCategories, refreshPipelines)
     {
         this.$mdDialog = $mdDialog;
         this.RestApi = RestApi;
@@ -47,6 +48,7 @@ export class PipelineCategoriesDialogController {
         this.refreshPipelines = refreshPipelines;
 
         this.fetchPipelineCategories();
+        this.fetchPipelines();
 
     }
 
@@ -103,6 +105,12 @@ export class PipelineCategoriesDialogController {
             });
     };
 
+    fetchPipelines() {
+        this.RestApi.getOwnPipelines().then(pipelines => {
+            this.pipelines = pipelines.data;
+        })
+    }
+
     showAddToCategoryInput(categoryId, show) {
         this.addPipelineToCategorySelected[categoryId] = show;
         this.categoryDetailsVisible[categoryId] = true;