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/03/03 21:43:26 UTC
[incubator-streampipes] branch dev updated: STREAMPIPES-85: Cached
pipelines are rendered correctly
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 a91ca25 STREAMPIPES-85: Cached pipelines are rendered correctly
a91ca25 is described below
commit a91ca25738fbb2b04cd81c376dff712784ba1a04
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue Mar 3 22:43:09 2020 +0100
STREAMPIPES-85: Cached pipelines are rendered correctly
---
.../pipeline-assembly/pipeline-assembly.controller.ts | 2 +-
ui/src/app/services/pipeline-positioning.service.ts | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.controller.ts b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.controller.ts
index b20e898..bbb65e3 100644
--- a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.controller.ts
+++ b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.controller.ts
@@ -197,7 +197,7 @@ export class PipelineAssemblyController {
this.rawPipelineModel = msg.data;
this.$timeout(() => {
this.displayPipelineInEditor(true);
- });
+ }, 100);
}
});
}
diff --git a/ui/src/app/services/pipeline-positioning.service.ts b/ui/src/app/services/pipeline-positioning.service.ts
index 8123f50..290b400 100644
--- a/ui/src/app/services/pipeline-positioning.service.ts
+++ b/ui/src/app/services/pipeline-positioning.service.ts
@@ -42,14 +42,16 @@ export class PipelinePositioningService {
for (var i = 0; i < rawPipelineModel.length; i++) {
var currentPe = rawPipelineModel[i];
- if (currentPe.type === "stream") {
- this.JsplumbService.streamDropped(currentPe.payload.DOM, currentPe.payload, true, isPreview);
- }
- if (currentPe.type === "sepa") {
- this.JsplumbService.sepaDropped(currentPe.payload.DOM, currentPe.payload, true, isPreview);
- }
- if (currentPe.type === "action") {
- this.JsplumbService.actionDropped(currentPe.payload.DOM, currentPe.payload, true, isPreview);
+ if (!currentPe.settings.disabled) {
+ if (currentPe.type === "stream") {
+ this.JsplumbService.streamDropped(currentPe.payload.DOM, currentPe.payload, true, isPreview);
+ }
+ if (currentPe.type === "sepa") {
+ this.JsplumbService.sepaDropped(currentPe.payload.DOM, currentPe.payload, true, isPreview);
+ }
+ if (currentPe.type === "action") {
+ this.JsplumbService.actionDropped(currentPe.payload.DOM, currentPe.payload, true, isPreview);
+ }
}
}