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/08/31 20:47:51 UTC
[incubator-streampipes] branch dev updated (53f242b -> 277bc6b)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 53f242b [hotfix] adjust size of setup window
new 7b79466 [hotfix] Fix unexpected delay while closing the element customization dialog
new acb6379 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
new 277bc6b [hotfix] Improve pipeline validation, disable pipeline modification dialog for uncompleted pipeline elements
The 3 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:
.../pipeline-assembly/pipeline-assembly.component.ts | 15 +++++++--------
.../pipeline-element-options.component.html | 5 +++--
.../pipeline-element-options.component.ts | 10 ----------
.../editor/components/pipeline/pipeline.component.ts | 17 ++++++++++++++---
.../app/editor/services/pipeline-validation.service.ts | 1 +
5 files changed, 25 insertions(+), 23 deletions(-)
[incubator-streampipes] 02/03: Merge branch 'dev' of
github.com:apache/incubator-streampipes into dev
Posted by 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
commit acb6379857fb2d9a5dee11ef7ab652601fa8f4fd
Merge: 7b79466 53f242b
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Aug 31 21:36:41 2020 +0200
Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
.../widget/data-explorer-dashboard-widget.component.html | 3 +++
ui/src/app/login/components/setup/setup.component.html | 5 ++---
ui/src/app/login/components/setup/setup.component.scss | 7 ++++---
3 files changed, 9 insertions(+), 6 deletions(-)
[incubator-streampipes] 03/03: [hotfix] Improve pipeline validation,
disable pipeline modification dialog for uncompleted pipeline elements
Posted by 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
commit 277bc6bff96d3781351f7fd3732e722f438e795f
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Aug 31 22:47:37 2020 +0200
[hotfix] Improve pipeline validation, disable pipeline modification dialog for uncompleted pipeline elements
---
.../components/pipeline-assembly/pipeline-assembly.component.ts | 4 ++--
.../pipeline-element-options/pipeline-element-options.component.html | 5 +++--
ui/src/app/editor/services/pipeline-validation.service.ts | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
index c2de226..be84a50 100644
--- a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
+++ b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
@@ -218,7 +218,6 @@ export class PipelineAssemblyComponent implements OnInit {
this.currentPipelineName = pipeline.name;
this.currentPipelineDescription = pipeline.description;
this.rawPipelineModel = this.JsplumbService.makeRawPipeline(pipeline, false);
- console.log(this.rawPipelineModel);
this.displayPipelineInEditor(true);
});
};
@@ -228,7 +227,8 @@ export class PipelineAssemblyComponent implements OnInit {
this.PipelinePositioningService.displayPipeline(this.rawPipelineModel, "#assembly", false, autoLayout);
this.EditorService.makePipelineAssemblyEmpty(false);
this.ngZone.run(() => {
- this.pipelineValid = this.PipelineValidationService.isValidPipeline(this.rawPipelineModel);
+ this.pipelineValid = this.PipelineValidationService
+ .isValidPipeline(this.rawPipelineModel.filter(pe => !(pe.settings.disabled)));
});
});
}
diff --git a/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.html b/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.html
index 8dd2bb7..274e157 100644
--- a/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.html
+++ b/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.html
@@ -17,8 +17,9 @@
-->
<div *ngIf="currentMouseOverElement==pipelineElement.payload.dom" class="sp-fade-options">
- <span class="options-button customize-button" *ngIf="pipelineElement.type!='stream'" style="z-index:10">
- <button mat-button mat-icon-button matTooltip="Configure Element" [matTooltipPosition]="'above'"
+ <span class="options-button customize-button" *ngIf="pipelineElement.type!='stream' && pipelineElement.settings.completed" style="z-index:10">
+ <button mat-button mat-icon-button matTooltip="Configure Element"
+ [matTooltipPosition]="'above'"
(click)="customizeElement(pipelineElement)">
<i class="material-icons">settings</i>
</button>
diff --git a/ui/src/app/editor/services/pipeline-validation.service.ts b/ui/src/app/editor/services/pipeline-validation.service.ts
index 53f7bb3..a4d412d 100644
--- a/ui/src/app/editor/services/pipeline-validation.service.ts
+++ b/ui/src/app/editor/services/pipeline-validation.service.ts
@@ -40,6 +40,7 @@ export class PipelineValidationService {
}
isValidPipeline(rawPipelineModel) {
+ console.log(rawPipelineModel);
let streamInAssembly = this.isStreamInAssembly(rawPipelineModel);
let sepaInAssembly = this.isSepaInAssembly(rawPipelineModel);
let actionInAssembly = this.isActionInAssembly(rawPipelineModel);
[incubator-streampipes] 01/03: [hotfix] Fix unexpected delay while
closing the element customization dialog
Posted by 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
commit 7b79466bd745a3e0364aa5dd62ee29494484939e
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Aug 31 21:36:31 2020 +0200
[hotfix] Fix unexpected delay while closing the element customization dialog
---
.../pipeline-assembly/pipeline-assembly.component.ts | 13 ++++++-------
.../pipeline-element-options.component.ts | 10 ----------
.../editor/components/pipeline/pipeline.component.ts | 17 ++++++++++++++---
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
index 709d512..c2de226 100644
--- a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
+++ b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
@@ -16,7 +16,7 @@
*
*/
-import {Component, Input, OnInit,} from "@angular/core";
+import {Component, Input, NgZone, OnInit,} from "@angular/core";
import {JsplumbBridge} from "../../services/jsplumb-bridge.service";
import {PipelinePositioningService} from "../../services/pipeline-positioning.service";
import {PipelineValidationService} from "../../services/pipeline-validation.service";
@@ -75,7 +75,8 @@ export class PipelineAssemblyComponent implements OnInit {
private JsplumbService: JsplumbService,
private ShepherdService: ShepherdService,
private dialogService: DialogService,
- private dialog: MatDialog) {
+ private dialog: MatDialog,
+ private ngZone: NgZone) {
this.selectMode = true;
this.currentZoomLevel = 1;
@@ -88,10 +89,6 @@ export class PipelineAssemblyComponent implements OnInit {
} else {
this.checkAndDisplayCachedPipeline();
}
-
- // this.$rootScope.$on("pipeline.validate", () => {
- // this.pipelineValid = this.PipelineValidationService.isValidPipeline(this.rawPipelineModel);
- // });
}
ngAfterViewInit() {
@@ -230,7 +227,9 @@ export class PipelineAssemblyComponent implements OnInit {
setTimeout(() => {
this.PipelinePositioningService.displayPipeline(this.rawPipelineModel, "#assembly", false, autoLayout);
this.EditorService.makePipelineAssemblyEmpty(false);
- this.pipelineValid = this.PipelineValidationService.isValidPipeline(this.rawPipelineModel);
+ this.ngZone.run(() => {
+ this.pipelineValid = this.PipelineValidationService.isValidPipeline(this.rawPipelineModel);
+ });
});
}
diff --git a/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.ts b/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.ts
index 3a3ff5d..67d8a4b 100644
--- a/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.ts
+++ b/ui/src/app/editor/components/pipeline-element-options/pipeline-element-options.component.ts
@@ -119,16 +119,6 @@ export class PipelineElementOptionsComponent implements OnInit{
this.customize.emit(customizeInfo);
}
- openCustomizeDialog() {
- let restrictedEditMode = ! (this.isRootElement());
- // this.EditorDialogManager.showCustomizeDialog($("#" + this.pipelineElement.payload.dom), "", this.pipelineElement.payload, restrictedEditMode)
- // .then(() => {
- // this.JsplumbService.activateEndpoint(this.pipelineElement.payload.dom, !this.pipelineElement.payload.uncompleted);
- // }, () => {
- // this.JsplumbService.activateEndpoint(this.pipelineElement.payload.dom, !this.pipelineElement.payload.uncompleted);
- // });
- }
-
openHelpDialog() {
this.EditorService.openHelpDialog(this.pipelineElement.payload);
}
diff --git a/ui/src/app/editor/components/pipeline/pipeline.component.ts b/ui/src/app/editor/components/pipeline/pipeline.component.ts
index 97fff39..44694db 100644
--- a/ui/src/app/editor/components/pipeline/pipeline.component.ts
+++ b/ui/src/app/editor/components/pipeline/pipeline.component.ts
@@ -21,7 +21,15 @@ import {JsplumbService} from "../../services/jsplumb.service";
import {PipelineEditorService} from "../../services/pipeline-editor.service";
import {JsplumbBridge} from "../../services/jsplumb-bridge.service";
import {ShepherdService} from "../../../services/tour/shepherd.service";
-import {Component, EventEmitter, Input, OnInit, Output} from "@angular/core";
+import {
+ ChangeDetectorRef,
+ Component,
+ EventEmitter,
+ Input,
+ NgZone,
+ OnInit,
+ Output
+} from "@angular/core";
import {
InvocablePipelineElementUnion,
PipelineElementConfig,
@@ -97,7 +105,8 @@ export class PipelineComponent implements OnInit {
private ShepherdService: ShepherdService,
private PipelineValidationService: PipelineValidationService,
private dialogService: DialogService,
- private dialog: MatDialog) {
+ private dialog: MatDialog,
+ private ngZone: NgZone) {
this.plumbReady = false;
this.currentMouseOverElement = "";
this.currentPipelineModel = new Pipeline();
@@ -113,8 +122,10 @@ export class PipelineComponent implements OnInit {
}
validatePipeline() {
+ this.ngZone.run(() => {
this.pipelineValid = this.PipelineValidationService
.isValidPipeline(this.rawPipelineModel.filter(pe => !(pe.settings.disabled)));
+ });
}
ngOnDestroy() {
@@ -193,7 +204,7 @@ export class PipelineComponent implements OnInit {
if (ui.draggable.hasClass('set')) {
setTimeout(() => {
this.JsplumbService.setDropped(pipelineElementConfig.payload.dom, pipelineElementConfig.payload, true, false);
- }, 10);
+ }, 0);
}
else if (ui.draggable.hasClass('stream')) {
this.checkTopicModel(pipelineElementConfig);