From 8dce331c7de4c51023548da89d0cf077eb6f455d Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Mon, 10 Mar 2025 11:59:25 +0100
Subject: [PATCH] OZG-725 admin provider component entfernen
---
...orm-delete-button-container.component.html | 1 -
...-delete-button-container.component.spec.ts | 21 -------------------
...-form-delete-button-container.component.ts | 13 ------------
.../lib/user-form/user-form.component.html | 2 +-
.../lib/user-form/user-form.component.spec.ts | 2 ++
.../src/lib/user-form/user-form.component.ts | 8 ++++---
6 files changed, 8 insertions(+), 39 deletions(-)
delete mode 100644 alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.html
delete mode 100644 alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.spec.ts
delete mode 100644 alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.ts
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.html b/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.html
deleted file mode 100644
index b49a93cae8..0000000000
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<admin-delete-open-dialog-button />
\ No newline at end of file
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.spec.ts
deleted file mode 100644
index ec691fc665..0000000000
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UserFormDeleteButtonContainerComponent } from './user-form-delete-button-container.component';
-
-describe('UserFormDeleteButtonComponent', () => {
- let component: UserFormDeleteButtonContainerComponent;
- let fixture: ComponentFixture<UserFormDeleteButtonContainerComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [UserFormDeleteButtonContainerComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(UserFormDeleteButtonContainerComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.ts
deleted file mode 100644
index 2c66a5500b..0000000000
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-button/user-form-delete-button-container.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-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 {}
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.html b/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.html
index 5ce59646fd..101227318b 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.html
+++ b/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-container-button data-test-id="delete-button-container"/>
+ <admin-delete-open-dialog-button data-test-id="delete-button-container"/>
}
</div>
</div>
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.spec.ts
index 160ab43cee..fdfb961a94 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.spec.ts
@@ -21,6 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { AdminDeleteOpenDialogButtonComponent } from '@admin-client/shared';
import { User } from '@admin-client/user-shared';
import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, getMockComponent, mock, Mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
@@ -68,6 +69,7 @@ describe('UserFormComponent', () => {
MockComponent(UserFormOrganisationsEinheitListComponent),
MockComponent(UserFormRolesComponent),
MockComponent(UserFormHeadlineComponent),
+ MockComponent(AdminDeleteOpenDialogButtonComponent),
],
providers: [{ provide: DIALOG_COMPONENT, useValue: {} }],
})
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.ts
index a533ff55e3..0bcae1640c 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form.component.ts
@@ -21,15 +21,17 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { AdminDeleteOpenDialogButtonComponent } from '@admin-client/shared';
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 { UserFormDeleteButtonContainerComponent } from './user-form-delete-button/user-form-delete-button-container.component';
+import { UserDeleteDialogContainerComponent } from './user-form-delete-dialog-container/user-delete-dialog-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';
@@ -38,7 +40,7 @@ import { UserFormService } from './user.formservice';
@Component({
selector: 'admin-user-form',
- providers: [UserFormService],
+ providers: [UserFormService, { provide: DIALOG_COMPONENT, useValue: UserDeleteDialogContainerComponent }],
templateUrl: './user-form.component.html',
standalone: true,
imports: [
@@ -51,7 +53,7 @@ import { UserFormService } from './user.formservice';
UserFormOrganisationsEinheitListComponent,
UserFormHeadlineComponent,
UserFormSaveButtonComponent,
- UserFormDeleteButtonContainerComponent,
+ AdminDeleteOpenDialogButtonComponent,
],
})
export class UserFormComponent implements OnInit {
--
GitLab