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/09/12 11:29:36 UTC
[incubator-streampipes] branch rel/0.67.0 updated (1043438 ->
4b53f90)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch rel/0.67.0
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 1043438 Merge remote-tracking branch 'refs/remotes/origin/rel/0.67.0' into rel/0.67.0
new 647d49b [hotfix] Show error if runtime info is not available
new c0f8d3d [hotfix] Fix placeholder in free text static property renderer
new 4b53f90 Merge branch 'rel/0.67.0' of github.com:apache/incubator-streampipes into rel/0.67.0
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-element-runtime-info.component.html | 5 ++++-
.../pipeline-element-runtime-info.component.ts | 24 ++++++++++++++--------
.../static-free-input.component.ts | 9 ++++++--
3 files changed, 26 insertions(+), 12 deletions(-)
[incubator-streampipes] 01/03: [hotfix] Show error if runtime info
is not available
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch rel/0.67.0
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 647d49bea54a105fd7cf2ff0a8272d53e6efc26f
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Sep 12 00:32:32 2020 +0200
[hotfix] Show error if runtime info is not available
---
.../pipeline-element-runtime-info.component.html | 5 ++++-
.../pipeline-element-runtime-info.component.ts | 24 ++++++++++++++--------
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.html b/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.html
index 4537a96..af1bd91 100644
--- a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.html
+++ b/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.html
@@ -16,7 +16,7 @@
~
-->
-<div *ngIf="!runtimeData">
+<div *ngIf="!runtimeData && !runtimeDataError">
<div fxLayout="column">
<div fxLayoutAlign="center" >
<mat-spinner [diameter]="40" fxLayoutAlign="center" style="margin: 10px 0 5px 0" >Loading</mat-spinner>
@@ -44,4 +44,7 @@
</tr>
</tbody>
</table>
+</div>
+<div *ngIf="runtimeDataError">
+ <p>Preview is currently unavailable.</p>
</div>
\ No newline at end of file
diff --git a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts b/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
index 2481972..8be823b 100644
--- a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
+++ b/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
@@ -34,6 +34,7 @@ export class PipelineElementRuntimeInfoComponent implements OnInit, OnDestroy {
runtimeData: any;
timer: any;
+ runtimeDataError: boolean = false;
constructor(private RestService: RestService) {
@@ -51,15 +52,20 @@ export class PipelineElementRuntimeInfoComponent implements OnInit, OnDestroy {
getLatestRuntimeInfo() {
this.RestService.getRuntimeInfo(this.streamDescription).subscribe(data => {
- if (!(Object.keys(data).length === 0 && data.constructor === Object)) {
- this.runtimeData = data;
- }
-
- if (this._pollingActive) {
- this.timer = setTimeout(() => {
- this.getLatestRuntimeInfo();
- }, 1000);
- }
+ if (data) {
+ this.runtimeDataError = false;
+ if (!(Object.keys(data).length === 0 && data.constructor === Object)) {
+ this.runtimeData = data;
+ }
+
+ if (this._pollingActive) {
+ this.timer = setTimeout(() => {
+ this.getLatestRuntimeInfo();
+ }, 1000);
+ }
+ } else {
+ this.runtimeDataError = true;
+ }
});
}
[incubator-streampipes] 02/03: [hotfix] Fix placeholder in free
text static property renderer
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch rel/0.67.0
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit c0f8d3dca713ae9afb5f021ba4b4ef3bb3d2acd5
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Sep 12 01:49:05 2020 +0200
[hotfix] Fix placeholder in free text static property renderer
---
.../static-free-input/static-free-input.component.ts | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.ts b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.ts
index 0cb54bb..b886824 100644
--- a/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.ts
@@ -92,7 +92,12 @@ export class StaticFreeInputComponent
}
applyPlaceholder(runtimeName) {
- let currentIndex = this.quillEditorComponent.quillEditor.selection.savedRange.index;
- this.quillEditorComponent.quillEditor.insertText(currentIndex, "#" + runtimeName + "#", "user");
+ let valueToInsert = "#" + runtimeName + "#";
+ if (this.quillEditorComponent) {
+ let currentIndex = this.quillEditorComponent.quillEditor.selection.savedRange.index;
+ this.quillEditorComponent.quillEditor.insertText(currentIndex, valueToInsert, "user");
+ } else {
+ this.parentForm.controls[this.fieldName].setValue(this.parentForm.controls[this.fieldName].value + " " +valueToInsert);
+ }
}
}
\ No newline at end of file
[incubator-streampipes] 03/03: Merge branch 'rel/0.67.0' of
github.com:apache/incubator-streampipes into rel/0.67.0
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch rel/0.67.0
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 4b53f90d3d7e6a1032037b00cc421ff247602a11
Merge: c0f8d3d 1043438
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Sep 12 01:49:18 2020 +0200
Merge branch 'rel/0.67.0' of github.com:apache/incubator-streampipes into rel/0.67.0
README.md | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)