You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by oe...@apache.org on 2026/07/16 16:11:46 UTC
(streampipes) branch 4725-cant-delete-code-in-javascript-evaluator updated (f8ec4d2ae3 -> f5e2a5bd96)
This is an automated email from the ASF dual-hosted git repository.
SvenO3 pushed a change to branch 4725-cant-delete-code-in-javascript-evaluator
in repository https://gitbox.apache.org/repos/asf/streampipes.git
from f8ec4d2ae3 feat(#4690): deprecate legacy plc4x s7 and modbus adapters (#4691)
new 6889d0d56c Fix output schema display
new f5e2a5bd96 Fix keyboard shortcuts
The 2 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:
.../src/lib/services/keyboard-shortcut.service.ts | 8 ++-
.../user-defined-output.component.html | 75 ++++++++++++----------
.../user-defined-output.component.ts | 5 +-
3 files changed, 50 insertions(+), 38 deletions(-)
(streampipes) 01/02: Fix output schema display
Posted by oe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
SvenO3 pushed a commit to branch 4725-cant-delete-code-in-javascript-evaluator
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 6889d0d56c32008719dfe8c8c9550bfc2095e6f2
Author: Sven Oehler <oe...@web.de>
AuthorDate: Thu Jul 16 17:52:38 2026 +0200
Fix output schema display
---
.../user-defined-output.component.html | 75 ++++++++++++----------
.../user-defined-output.component.ts | 5 +-
2 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.html b/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.html
index baa4732b8b..3342ae3ff0 100644
--- a/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.html
+++ b/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.html
@@ -40,43 +40,52 @@
@for (ep of outputStrategy.eventProperties; track ep; let i = $index) {
<div fxFlex="100" fxLayout="row" fxLayoutGap="10px">
<div fxLayout="column" fxFlex="30">
- <mat-form-field fxFlex color="accent">
- <mat-label>{{ 'Runtime name' | translate }}</mat-label>
- <input
- [(ngModel)]="ep.runtimeName"
- data-cy="runtime-name"
- fxFlex
- matInput
- />
- </mat-form-field>
+ <sp-form-field [level]="3" [label]="'Runtime name' | translate">
+ <mat-form-field fxFlex color="accent">
+ <input
+ [(ngModel)]="ep.runtimeName"
+ data-cy="runtime-name"
+ fxFlex
+ matInput
+ />
+ </mat-form-field>
+ </sp-form-field>
</div>
<div fxLayout="column" fxFlex="30">
- <mat-form-field class="example-full-width" color="accent">
- <mat-label>{{ 'Runtime type' | translate }}</mat-label>
- <mat-select
- [(ngModel)]="ep.runtimeType"
- [disabled]="restrictedEditMode"
- data-cy="runtime-type"
- >
- @for (primitive of primitiveClasses; track primitive) {
- <mat-option [value]="primitive.id">
- {{ primitive.label }}
- </mat-option>
- }
- </mat-select>
- </mat-form-field>
+ <sp-form-field [level]="3" [label]="'Runtime type' | translate">
+ <mat-form-field class="example-full-width" color="accent">
+ <mat-select
+ [(ngModel)]="ep.runtimeType"
+ [disabled]="restrictedEditMode"
+ data-cy="runtime-type"
+ >
+ @for (
+ primitive of primitiveClasses;
+ track primitive
+ ) {
+ <mat-option [value]="primitive.id">
+ {{ primitive.label }}
+ </mat-option>
+ }
+ </mat-select>
+ </mat-form-field>
+ </sp-form-field>
</div>
<div fxLayout="column" fxFlex="30">
- <mat-form-field fxFlex color="accent">
- <mat-label>{{ 'Semantic type' | translate }}</mat-label>
- <input
- [(ngModel)]="ep.semanticType"
- [disabled]="restrictedEditMode"
- data-cy="semantic-type"
- fxFlex
- matInput
- />
- </mat-form-field>
+ <sp-form-field
+ [level]="3"
+ [label]="'Semantic type' | translate"
+ >
+ <mat-form-field fxFlex color="accent">
+ <input
+ [(ngModel)]="ep.semanticType"
+ [disabled]="restrictedEditMode"
+ data-cy="semantic-type"
+ fxFlex
+ matInput
+ />
+ </mat-form-field>
+ </sp-form-field>
</div>
<div fxLayout="column" fxFlex="10">
<button
diff --git a/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts b/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts
index 2ac2e5f7d3..c855382ff3 100644
--- a/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts
+++ b/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts
@@ -32,11 +32,12 @@ import {
LayoutGapDirective,
} from '@ngbracket/ngx-layout/flex';
import { MatButton, MatIconButton } from '@angular/material/button';
-import { MatFormField, MatLabel } from '@angular/material/form-field';
+import { MatFormField } from '@angular/material/form-field';
import { MatInput } from '@angular/material/input';
import { MatOption, MatSelect } from '@angular/material/select';
import { MatIcon } from '@angular/material/icon';
import { TranslatePipe } from '@ngx-translate/core';
+import { FormFieldComponent } from '@streampipes/shared-ui';
@Component({
selector: 'sp-user-defined-output-strategy',
@@ -48,8 +49,8 @@ import { TranslatePipe } from '@ngx-translate/core';
LayoutAlignDirective,
MatButton,
LayoutGapDirective,
+ FormFieldComponent,
MatFormField,
- MatLabel,
MatInput,
FormsModule,
MatSelect,
(streampipes) 02/02: Fix keyboard shortcuts
Posted by oe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
SvenO3 pushed a commit to branch 4725-cant-delete-code-in-javascript-evaluator
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit f5e2a5bd96b015b9befbe0407d881617ee733b22
Author: Sven Oehler <oe...@web.de>
AuthorDate: Thu Jul 16 18:11:31 2026 +0200
Fix keyboard shortcuts
---
.../shared-ui/src/lib/services/keyboard-shortcut.service.ts | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ui/projects/streampipes/shared-ui/src/lib/services/keyboard-shortcut.service.ts b/ui/projects/streampipes/shared-ui/src/lib/services/keyboard-shortcut.service.ts
index c891ba6db7..d4085522a7 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/services/keyboard-shortcut.service.ts
+++ b/ui/projects/streampipes/shared-ui/src/lib/services/keyboard-shortcut.service.ts
@@ -84,14 +84,16 @@ export class KeyboardShortcutService implements OnDestroy {
);
if (match) {
+ if (this.dialogService.hasOpenDialogs && !match.allowInDialog) {
+ return;
+ }
+
if (match.preventDefault !== false) {
event.preventDefault();
event.stopPropagation();
}
- if (!this.dialogService.hasOpenDialogs || match.allowInDialog) {
- match.action(event);
- }
+ match.action(event);
}
}