You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ho...@apache.org on 2026/07/10 06:51:42 UTC
(streampipes) branch 1358-harmonize-resource-creation-workflow-for-connect updated (93fa173821 -> 42e437c599)
This is an automated email from the ASF dual-hosted git repository.
JHoelli pushed a change to branch 1358-harmonize-resource-creation-workflow-for-connect
in repository https://gitbox.apache.org/repos/asf/streampipes.git
from 93fa173821 chore(deps-dev): bump soupsieve from 2.7 to 2.8.4 in /streampipes-client-python (#4705)
new e6e3f38da6 exchanged dialog and removed unecessary items
new 7c3d9bcb02 show Code
new 42e437c599 translations
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:
ui/deployment/i18n/de.json | 7 +-
ui/deployment/i18n/en.json | 7 +-
ui/deployment/i18n/pl.json | 7 +-
.../start-adapter-configuration.component.html | 25 ++-----
.../existing-adapters.component.html | 16 +++--
.../existing-adapters.component.ts | 77 ++++++++++++++++------
6 files changed, 82 insertions(+), 57 deletions(-)
(streampipes) 02/03: show Code
Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
JHoelli pushed a commit to branch 1358-harmonize-resource-creation-workflow-for-connect
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 7c3d9bcb0247540339ca7ef98912e9b7669e6b52
Author: Jacqueline Höllig <j....@gmx.net>
AuthorDate: Fri Jul 10 06:48:23 2026 +0000
show Code
---
.../existing-adapters.component.html | 8 ++++++++
.../existing-adapters/existing-adapters.component.ts | 19 +++++++++++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index 6e3e8cfcca..23b7f2ae97 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -252,6 +252,14 @@
<mat-icon>visibility</mat-icon>
<span>{{ 'Show' | translate }}</span>
</button>
+ <button
+ mat-menu-item
+ data-cy="show-adapter-code"
+ (click)="showCodeDialog(element)"
+ >
+ <mat-icon>code</mat-icon>
+ <span>{{ 'Show as Code' | translate }}</span>
+ </button>
<button
mat-menu-item
data-cy="edit-adapter"
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
index 5f98712f4c..bf041514d7 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
@@ -53,6 +53,7 @@ import {
SpTableActionsDirective,
SpTableComponent,
} from '@streampipes/shared-ui';
+import { AdapterCodePanelComponent } from '../adapter-code-panel/adapter-code-panel.component';
import { DeleteAdapterDialogComponent } from '../../dialog/delete-adapter-dialog/delete-adapter-dialog.component';
import { AllAdapterActionsComponent } from '../../dialog/start-all-adapters/all-adapter-actions-dialog.component';
import { MatSort, MatSortHeader } from '@angular/material/sort';
@@ -325,7 +326,7 @@ export class ExistingAdaptersComponent implements OnInit, OnDestroy {
}
showManageDialog(adapter: AdapterSummaryDto): void {
- this.adapterService.getAdapter(adapter.elementId).subscribe(fullAdapter => {
+ this.adapterService.getAdapter(adapter.elementId).subscribe(fullAdapter => {
const resourceConfig: ObjectManageDialogResourceConfig<AdapterDescription> =
{
resourceLabel: 'Adapter',
@@ -363,9 +364,23 @@ export class ExistingAdaptersComponent implements OnInit, OnDestroy {
this.getAdaptersRunning();
}
});
- });
+ });
}
+showCodeDialog(adapter: AdapterSummaryDto): void {
+ this.adapterService.getAdapter(adapter.elementId).subscribe(fullAdapter => {
+ this.dialogService.open(AdapterCodePanelComponent, {
+ panelType: PanelType.STANDARD_PANEL,
+ title: this.translate.instant('Show as Code'),
+ width: '70vw',
+ data: {
+ adapterDescription: fullAdapter,
+ maxHeight: 'none',
+ },
+ });
+ });
+}
+
/**
* Start edit mode
* @param adapter
(streampipes) 01/03: exchanged dialog and removed unecessary items
Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
JHoelli pushed a commit to branch 1358-harmonize-resource-creation-workflow-for-connect
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit e6e3f38da6742dc5c559115e6b704eeed30b7448
Author: Jacqueline Höllig <j....@gmx.net>
AuthorDate: Fri Jul 10 06:36:30 2026 +0000
exchanged dialog and removed unecessary items
---
.../start-adapter-configuration.component.html | 25 ++-------
.../existing-adapters.component.html | 8 +--
.../existing-adapters.component.ts | 60 ++++++++++++++--------
3 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
index f12efdc35e..43e017bee3 100644
--- a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
+++ b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
@@ -17,11 +17,13 @@
-->
<div [formGroup]="startAdapterForm" fxLayout="column" fxFlex="100">
+ @if(!isEditMode){
<sp-basic-inner-panel
[panelTitle]="'Adapter settings' | translate"
outerMargin="20px 0px 10px 0px"
>
<div fxFlex="100">
+
<div fxLayoutAlign="center" fxLayout="column" fxFlex="100">
<sp-form-field [level]="2" [label]="'Name' | translate">
<mat-form-field color="accent">
@@ -93,7 +95,7 @@
</div>
</div>
</sp-basic-inner-panel>
-
+ }
<div fxFlex="100" fxLayout="column">
@if (!isEditMode) {
<sp-adapter-options-panel
@@ -107,7 +109,7 @@
</sp-adapter-options-panel>
}
- @if (isAssetAdmin) {
+ @if (isAssetAdmin && !isEditMode) {
<sp-adapter-options-panel
[optionTitle]="'Add to Asset' | translate"
[optionDescription]="
@@ -283,24 +285,7 @@
}
}
- <sp-adapter-options-panel
- [optionTitle]="'Show code' | translate"
- [optionDescription]="
- 'Show code to programmatically deploy this adapter over the API'
- | translate
- "
- optionIcon="code"
- dataCy="show-code-checkbox"
- (optionSelectedEmitter)="showCode = $event"
- >
- @if (showCode) {
- <sp-adapter-code-panel
- [adapterDescription]="adapterDescription"
- class="w-100"
- >
- </sp-adapter-code-panel>
- }
- </sp-adapter-options-panel>
+
</div>
<div fxLayoutAlign="end" style="margin-top: 10px">
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index 935b295329..6e3e8cfcca 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -262,11 +262,11 @@
</button>
<button
mat-menu-item
- data-cy="open-manage-permissions"
- (click)="showPermissionsDialog(element)"
+ data-cy="open-manage-adapter"
+ (click)="showManageDialog(element)"
>
- <mat-icon>share</mat-icon>
- <span>{{ 'Manage permissions' | translate }}</span>
+ <mat-icon>settings</mat-icon>
+ <span>{{ 'Manage' | translate }}</span>
</button>
<button
mat-menu-item
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
index ff39d474de..5f98712f4c 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
@@ -18,6 +18,7 @@
import { Component, inject, OnDestroy, OnInit, ViewChild } from '@angular/core';
import {
+ AdapterDescription,
AdapterMonitoringService,
AdapterService,
AdapterSummaryDto,
@@ -37,7 +38,8 @@ import {
CurrentUserService,
DialogRef,
DialogService,
- ObjectPermissionDialogComponent,
+ ObjectManageDialogComponent,
+ ObjectManageDialogResourceConfig,
PanelType,
SpAssetBrowserService,
SpBasicHeaderTitleComponent,
@@ -322,27 +324,45 @@ export class ExistingAdaptersComponent implements OnInit, OnDestroy {
}
}
- showPermissionsDialog(adapter: AdapterSummaryDto): void {
- const dialogRef = this.dialogService.open(
- ObjectPermissionDialogComponent,
- {
- panelType: PanelType.SLIDE_IN_PANEL,
- title: this.translate.instant('Manage permissions'),
- width: '50vw',
- data: {
- objectInstanceId: adapter.correspondingDataStreamElementId,
- headerTitle:
- this.translate.instant(
- 'Manage permissions for adapter ',
- ) + adapter.name,
+ showManageDialog(adapter: AdapterSummaryDto): void {
+ this.adapterService.getAdapter(adapter.elementId).subscribe(fullAdapter => {
+ const resourceConfig: ObjectManageDialogResourceConfig<AdapterDescription> =
+ {
+ resourceLabel: 'Adapter',
+ nameLabel: 'Adapter name',
+ descriptionLabel: 'Adapter description',
+ nameProperty: 'name',
+ assetLinkType: 'adapter',
+ assetLinkCheckboxLabel:
+ 'Add the current adapter to an existing asset',
+ saveResource: resource =>
+ this.adapterService.updateAdapter(resource),
+ };
+
+ const dialogRef = this.dialogService.open(
+ ObjectManageDialogComponent,
+ {
+ panelType: PanelType.SLIDE_IN_PANEL,
+ title: this.translate.instant('Manage'),
+ width: '50vw',
+ data: {
+ objectInstanceId:
+ fullAdapter.correspondingDataStreamElementId,
+ resource: fullAdapter,
+ saveMode: 'immediate',
+ resourceConfig,
+ headerTitle:
+ this.translate.instant('Manage Adapter ') +
+ adapter.name,
+ },
},
- },
- );
+ );
- dialogRef.afterClosed().subscribe(refresh => {
- if (refresh) {
- this.getAdaptersRunning();
- }
+ dialogRef.afterClosed().subscribe(refresh => {
+ if (refresh) {
+ this.getAdaptersRunning();
+ }
+ });
});
}
(streampipes) 03/03: translations
Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
JHoelli pushed a commit to branch 1358-harmonize-resource-creation-workflow-for-connect
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 42e437c599f07b79e45d1b242f3b8b1f4c320149
Author: Jacqueline Höllig <j....@gmx.net>
AuthorDate: Fri Jul 10 06:51:30 2026 +0000
translations
---
ui/deployment/i18n/de.json | 7 +++----
ui/deployment/i18n/en.json | 7 +++----
ui/deployment/i18n/pl.json | 7 +++----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ui/deployment/i18n/de.json b/ui/deployment/i18n/de.json
index 9a5288c723..293bf8a50c 100644
--- a/ui/deployment/i18n/de.json
+++ b/ui/deployment/i18n/de.json
@@ -643,6 +643,7 @@
"Mail Template": "Mail-Vorlage",
"Make available to all users with appropriate role": "Allen Benutzern mit entsprechender Rolle zur Verfügung stellen",
"Manage": "Verwalten",
+ "Manage Adapter ": "Adapter verwalten ",
"Manage Asset ": "Asset verwalten ",
"Manage Chart ": "Diagramm verwalten",
"Manage Dashboard ": "Dashboard verwalten",
@@ -654,7 +655,6 @@
"Manage datasets": "Datensätze verwalten",
"Manage links": "Verwalten von Links",
"Manage permissions": "Berechtigungen verwalten",
- "Manage permissions for adapter ": "Berechtigungen für Adapter verwalten",
"Manage permissions for dataset ": "Berechtigungen für Datensatz verwalten",
"Manage permissions for pipeline element {{name}}": "Berechtigungen für Pipeline-Element {{name}} verwalten",
"Manage roles": "Rollen verwalten",
@@ -1004,9 +1004,8 @@
"Show Last Seen Timestamp": "Letzten Zeitstempel anzeigen",
"Show Pointer": "Zeiger anzeigen",
"Show Value in Traffic Light": "Wert anzeigen",
+ "Show as Code": "Code anzeigen",
"Show asset": "Asset anzeigen",
- "Show code": "Code anzeigen",
- "Show code to programmatically deploy this adapter over the API": "Code anzeigen, um diesen Adapter programmatisch über die API einzusetzen",
"Show delta indicator": "Delta-Indikator anzeigen",
"Show details": "Details anzeigen",
"Show documentation": "Dokumentation anzeigen",
@@ -1336,4 +1335,4 @@
"waiting": "Warten",
"{{ widgetTitle }} Clone": "{{ widgetTitle }} Kopie",
"{{action}} {{ current }} of {{ total }} ({{ name }})...{{ status }}": "{{action}} {{ current }} von {{ total }} ({{name}})...{{ status }}"
-}
+}
\ No newline at end of file
diff --git a/ui/deployment/i18n/en.json b/ui/deployment/i18n/en.json
index a2a0063823..f7ee6efcca 100644
--- a/ui/deployment/i18n/en.json
+++ b/ui/deployment/i18n/en.json
@@ -643,6 +643,7 @@
"Mail Template": null,
"Make available to all users with appropriate role": null,
"Manage": null,
+ "Manage Adapter ": null,
"Manage Asset ": null,
"Manage Chart ": null,
"Manage Dashboard ": null,
@@ -654,7 +655,6 @@
"Manage datasets": null,
"Manage links": null,
"Manage permissions": null,
- "Manage permissions for adapter ": null,
"Manage permissions for dataset ": null,
"Manage permissions for pipeline element {{name}}": "Manage permissions for pipeline element {{name}}",
"Manage roles": null,
@@ -1004,9 +1004,8 @@
"Show Last Seen Timestamp": null,
"Show Pointer": null,
"Show Value in Traffic Light": null,
+ "Show as Code": null,
"Show asset": null,
- "Show code": null,
- "Show code to programmatically deploy this adapter over the API": null,
"Show delta indicator": null,
"Show details": null,
"Show documentation": null,
@@ -1336,4 +1335,4 @@
"waiting": null,
"{{ widgetTitle }} Clone": "{{ widgetTitle }} Clone",
"{{action}} {{ current }} of {{ total }} ({{ name }})...{{ status }}": "{{action}} {{ current }} of {{ total }} ({{name}})...{{ status }}"
-}
+}
\ No newline at end of file
diff --git a/ui/deployment/i18n/pl.json b/ui/deployment/i18n/pl.json
index a54c8b4a4a..9863dcf111 100644
--- a/ui/deployment/i18n/pl.json
+++ b/ui/deployment/i18n/pl.json
@@ -643,6 +643,7 @@
"Mail Template": "Szablon wiadomości",
"Make available to all users with appropriate role": "Udostępnij wszystkim użytkownikom z odpowiednią rolą",
"Manage": "Zarządzanie",
+ "Manage Adapter ": "Zarządzaj adapterem ",
"Manage Asset ": "Zarządzanie aktywami ",
"Manage Chart ": "Zarządzaj wykresem",
"Manage Dashboard ": "Zarządzaj pulpitem nawigacyjnym",
@@ -654,7 +655,6 @@
"Manage datasets": "Zarządzaj zestawami danych",
"Manage links": "Zarządzaj linkami",
"Manage permissions": "Zarządzaj uprawnieniami",
- "Manage permissions for adapter ": "Zarządzaj uprawnieniami dla adaptera ",
"Manage permissions for dataset ": "Zarządzaj uprawnieniami dla zbioru danych ",
"Manage permissions for pipeline element {{name}}": "Zarządzaj uprawnieniami dla elementu strumienia {{name}}",
"Manage roles": "Zarządzaj rolami",
@@ -1004,9 +1004,8 @@
"Show Last Seen Timestamp": "Pokaż znacznik czasu ostatniego wystąpienia",
"Show Pointer": "Pokaż wskaźnik",
"Show Value in Traffic Light": "Pokaż wartość na sygnalizatorze",
+ "Show as Code": "Pokaż jako kod",
"Show asset": "Pokaż zasób",
- "Show code": "Pokaż kod",
- "Show code to programmatically deploy this adapter over the API": "Pokaż kod do programowego wdrożenia tego adaptera przez API",
"Show delta indicator": "Pokaż wskaźnik zmiany",
"Show details": "Pokaż szczegóły",
"Show documentation": "Pokaż dokumentację",
@@ -1336,4 +1335,4 @@
"waiting": "oczekiwanie",
"{{ widgetTitle }} Clone": "Kopia {{ widgetTitle }}",
"{{action}} {{ current }} of {{ total }} ({{ name }})...{{ status }}": "{{action}} {{ current }} z {{ total }} ({{ name }})...{{ status }}"
-}
+}
\ No newline at end of file