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 <[email protected]> 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(); + } + }); }); }
