OZG-7620 cr anmerkungen

alfa-client/libs/admin/shared/src/index.ts

 export * from './lib/admin-cancel-button/admin-cancel-button.component';
+export * from './lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component';
 export * from './lib/admin-save-button/admin-save-button.component';
 export * from './lib/routes';
 export * from './lib/token';

alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button.component.html → alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html

-<ods-open-dialog-button variant='outline_error' label="Löschen" dataTestId="delete-user" data-test-id="delete-user-button-host" >
+<ods-open-dialog-button variant='outline_error' label="Löschen" dataTestId="delete-user" >
   <ods-delete-icon icon />
 </ods-open-dialog-button>
\ No newline at end of file

alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.spec.ts

+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminDeleteOpenDialogButtonComponent } from './admin-delete-open-dialog-button.component';
+
+describe('AdminDeleteOpenDialogButtonComponent', () => {
+  let component: AdminDeleteOpenDialogButtonComponent;
+  let fixture: ComponentFixture<AdminDeleteOpenDialogButtonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AdminDeleteOpenDialogButtonComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminDeleteOpenDialogButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button.component.ts → alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.ts

@@ -3,9 +3,9 @@ import { OpenDialogButtonComponent } from '@ods/component';
 import { DeleteIconComponent } from '@ods/system';
 
 @Component({
-  selector: 'admin-user-form-delete-button',
+  selector: 'admin-delete-open-dialog-button',
   standalone: true,
   imports: [DeleteIconComponent, OpenDialogButtonComponent],
-  templateUrl: './user-form-delete-button.component.html',
+  templateUrl: './admin-delete-open-dialog-button.component.html',
 })
-export class UserFormDeleteButtonComponent {}
+export class AdminDeleteOpenDialogButtonComponent {}

alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.html

+<admin-delete-open-dialog-button />
\ No newline at end of file

alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button.component.spec.ts → alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.spec.ts

 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { UserFormDeleteButtonComponent } from './user-form-delete-button.component';
+import { UserFormDeleteButtonContainerComponent } from './user-form-delete-button-container.component';
 
 describe('UserFormDeleteButtonComponent', () => {
-  let component: UserFormDeleteButtonComponent;
-  let fixture: ComponentFixture<UserFormDeleteButtonComponent>;
+  let component: UserFormDeleteButtonContainerComponent;
+  let fixture: ComponentFixture<UserFormDeleteButtonContainerComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [UserFormDeleteButtonComponent]
-    })
-    .compileComponents();
+      imports: [UserFormDeleteButtonContainerComponent],
+    }).compileComponents();
 
-    fixture = TestBed.createComponent(UserFormDeleteButtonComponent);
+    fixture = TestBed.createComponent(UserFormDeleteButtonContainerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.ts

+import { AdminDeleteOpenDialogButtonComponent } from '@admin-client/shared';
+import { DIALOG_COMPONENT } from '@alfa-client/ui';
+import { Component } from '@angular/core';
+import { UserDeleteDialogContainerComponent } from '../user-form-delete-dialog-container/user-delete-dialog-container.component';
+
+@Component({
+  selector: 'admin-user-form-delete-container-button',
+  standalone: true,
+  imports: [AdminDeleteOpenDialogButtonComponent],
+  providers: [{ provide: DIALOG_COMPONENT, useValue: UserDeleteDialogContainerComponent }],
+  templateUrl: './user-form-delete-button-container.component.html',
+})
+export class UserFormDeleteButtonContainerComponent {}

alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog/user-delete-dialog.component.html

@@ -3,7 +3,7 @@
   <p>Hinweis: Die zugewiesenen Vorgänge bleiben bestehen.</p>
 
   <div class="flex justify-between">
-    <ods-cancel-dialog-button variant='outline' data-test-id="dialog-cancel-button-host" />
+    <ods-cancel-dialog-button data-test-id="dialog-cancel-button-host" />
     <ods-button-with-spinner
       [stateResource]="deleteUserStateResource"
       (clickEmitter)="delete.emit()"

alfa-client/libs/admin/user/src/lib/user-form/user-form.component.html

@@ -35,7 +35,7 @@
     <div class="flex justify-between">
       <admin-user-form-save-button />
       @if (formService.isPatch()) {
-        <admin-user-form-delete-button />
+        <admin-user-form-delete-container-button data-test-id="delete-button-container"/>
       }
     </div>
   </div>

alfa-client/libs/admin/user/src/lib/user-form/user-form.component.spec.ts

@@ -48,7 +48,7 @@ describe('UserFormComponent', () => {
   let formService: Mock<UserFormService>;
 
   const userContent: string = getDataTestIdOf('user-content');
-  const deleteButton: string = getDataTestIdOf('delete-user-button-host');
+  const deleteButtonContainer: string = getDataTestIdOf('delete-button-container');
 
   beforeEach(async () => {
     formService = <any>{
@@ -168,19 +168,19 @@ describe('UserFormComponent', () => {
     });
   });
 
-  describe('admin delete button', () => {
+  describe('admin delete button container', () => {
     it('should exist', () => {
       formService.isPatch.mockReturnValue(true);
       fixture.detectChanges();
 
-      existsAsHtmlElement(fixture, deleteButton);
+      existsAsHtmlElement(fixture, deleteButtonContainer);
     });
 
     it('should not exist', () => {
       formService.isPatch.mockReturnValue(false);
       fixture.detectChanges();
 
-      notExistsAsHtmlElement(fixture, deleteButton);
+      notExistsAsHtmlElement(fixture, deleteButtonContainer);
     });
   });
 });

alfa-client/libs/admin/user/src/lib/user-form/user-form.component.ts

@@ -23,15 +23,13 @@
  */
 import { User } from '@admin-client/user-shared';
 import { StateResource } from '@alfa-client/tech-shared';
-import { DIALOG_COMPONENT } from '@alfa-client/ui';
 import { AsyncPipe } from '@angular/common';
 import { Component, inject, OnInit } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { SpinnerComponent } from '@ods/component';
 import { Observable } from 'rxjs';
 import { UserFormDataComponent } from './user-form-data/user-form-data.component';
-import { UserFormDeleteButtonComponent } from './user-form-delete-button/user-form-delete-button.component';
-import { UserDeleteDialogContainerComponent } from './user-form-delete-dialog-container/user-delete-dialog-container.component';
+import { UserFormDeleteButtonContainerComponent } from './user-form-delete-button/user-form-delete-button-container.component';
 import { UserFormHeadlineComponent } from './user-form-headline/user-form-headline.component';
 import { UserFormOrganisationsEinheitListComponent } from './user-form-organisations-einheit-list/user-form-organisations-einheit-list.component';
 import { UserFormRolesComponent } from './user-form-roles/user-form-roles.component';
@@ -40,7 +38,7 @@ import { UserFormService } from './user.formservice';
 
 @Component({
   selector: 'admin-user-form',
-  providers: [UserFormService, { provide: DIALOG_COMPONENT, useValue: UserDeleteDialogContainerComponent }],
+  providers: [UserFormService],
   templateUrl: './user-form.component.html',
   standalone: true,
   imports: [
@@ -53,7 +51,7 @@ import { UserFormService } from './user.formservice';
     UserFormOrganisationsEinheitListComponent,
     UserFormHeadlineComponent,
     UserFormSaveButtonComponent,
-    UserFormDeleteButtonComponent,
+    UserFormDeleteButtonContainerComponent,
   ],
 })
 export class UserFormComponent implements OnInit {

alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts

 import { OzgcloudDialogService } from '@alfa-client/ui';
-import { Component, inject, Input } from '@angular/core';
-import { ButtonComponent, ButtonVariants } from '@ods/system';
+import { Component, inject } from '@angular/core';
+import { ButtonComponent } from '@ods/system';
 
 @Component({
   selector: 'ods-cancel-dialog-button',
@@ -8,7 +8,7 @@ import { ButtonComponent, ButtonVariants } from '@ods/system';
   imports: [ButtonComponent],
   template: `<ods-button
     (clickEmitter)="cancel()"
-    [variant]="variant"
+    variant="outline"
     text="Abbrechen"
     dataTestId="cancel-dialog"
     data-test-id="cancel-dialog"
@@ -17,8 +17,6 @@ import { ButtonComponent, ButtonVariants } from '@ods/system';
 export class CancelDialogButtonComponent {
   public readonly dialogService = inject(OzgcloudDialogService);
 
-  @Input() variant: ButtonVariants['variant'] = 'outline';
-
   public cancel(): void {
     this.dialogService.closeAll();
   }

alfa-client/libs/design-component/src/lib/open-dialog-button/open-dialog-button.component.ts

@@ -40,9 +40,7 @@ export class OpenDialogButtonComponent {
     this.dialogService
       .openInContext(this._createComponent().instance.constructor, this.viewContainerRef)
       .closed.pipe(first())
-      .subscribe(() => {
-        this.close.emit();
-      });
+      .subscribe(this.close.emit);
   }
 
   _createComponent(): ComponentRef<any> {