From aa20dc34dba29c773e146b344dd34dbc127f9598 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 22 May 2024 12:54:35 +0200
Subject: [PATCH] OZG-5294-OZG-5774 revert change of hidden button
---
.../abschliessen-button.component.html | 2 +-
.../abschliessen-button.component.spec.ts | 23 -------------------
.../abschliessen-button.component.ts | 4 ----
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index 897a93130b..be0c599a5b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -23,7 +23,7 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<ng-container *ngIf="!isVorgangInBearbeitung && vorgang | hasLink: linkRel.ABSCHLIESSEN">
+<ng-container *ngIf="vorgang | hasLink: linkRel.ABSCHLIESSEN">
<ozgcloud-stroked-button-with-spinner
*ngIf="!showAsIconButton"
data-test-id="abschliessen-button"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
index ff72e92492..4d98aa579e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
@@ -134,18 +134,6 @@ describe('AbschliessenButtonComponent', () => {
expect(buttonElement).not.toBeInstanceOf(HTMLElement);
});
- it('should be hidden if in bearbeitung', () => {
- component.vorgang = {
- ...createVorgangWithEingangResource([VorgangWithEingangLinkRel.ABSCHLIESSEN]),
- status: VorgangStatus.IN_BEARBEITUNG,
- };
-
- fixture.detectChanges();
- const buttonElement = fixture.nativeElement.querySelector(abschliessenButton);
-
- expect(buttonElement).not.toBeInstanceOf(HTMLElement);
- });
-
it('should be visible', () => {
component.vorgang = createVorgangWithEingangResource([
VorgangWithEingangLinkRel.ABSCHLIESSEN,
@@ -173,17 +161,6 @@ describe('AbschliessenButtonComponent', () => {
expect(buttonElement).not.toBeInstanceOf(HTMLElement);
});
- it('should be hidden if in bearbeitung', () => {
- component.vorgang = {
- ...createVorgangWithEingangResource([VorgangWithEingangLinkRel.ABSCHLIESSEN]),
- status: VorgangStatus.IN_BEARBEITUNG,
- };
-
- fixture.detectChanges();
- const buttonElement = fixture.nativeElement.querySelector(abschliessenIconButton);
-
- expect(buttonElement).not.toBeInstanceOf(HTMLElement);
- });
it('should be visible', () => {
component.vorgang = createVorgangWithEingangResource([
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts
index c8475e5aae..15df48ad2b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts
@@ -55,8 +55,4 @@ export class AbschliessenButtonComponent implements OnInit {
public abschliessen(): void {
this.commandStateResource$ = this.vorgangCommandService.abschliessen(this.vorgang);
}
-
- get isVorgangInBearbeitung(): boolean {
- return this.vorgang.status === 'IN_BEARBEITUNG';
- }
}
--
GitLab