Merge branch 'OZG-7474-bugfix' of...

Merge branch 'OZG-7474-bugfix' of code.schleswig-holstein.de:ozg-cloud/app/frontend-clients into OZG-7474-bugfix

alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html

@@ -27,7 +27,7 @@
   <!-- TODO Aufteilen in 3 einzelne Komponenten -->
   @if (showAsIconButton) {
     <ods-button
-      data-test-id="send-mail-icon-button"
+      dataTestId="send-mail-icon-button"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       tooltip="Neue Nachricht erstellen"
       variant="ghost"
@@ -36,9 +36,10 @@
     >
       <ods-mailbox-icon icon />
     </ods-button>
-  } @else if (text && !toolTip) {
+  }
+  @if (!showAsIconButton && text && !toolTip) {
     <ods-button
-      data-test-id="create-mail-button-with-text"
+      dataTestId="create-mail-button-with-text"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       [text]="text"
       variant="outline"
@@ -46,9 +47,10 @@
     >
       <ods-plus-icon icon />
     </ods-button>
-  } @else if (!text && toolTip) {
+  }
+  @if (!showAsIconButton && !text && toolTip) {
     <ods-button
-      data-test-id="create-mail-button-without-text"
+      dataTestId="create-mail-button-without-text"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       [tooltip]="toolTip"
       variant="ghost"

alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts

@@ -28,7 +28,7 @@ import { faker } from '@faker-js/faker';
 import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { createPostfachMailListResource } from 'libs/postfach-shared/test/postfach';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent, MockDirective } from 'ng-mocks';
 import { PostfachMailButtonComponent } from './postfach-mail-button.component';
 
@@ -36,9 +36,9 @@ describe('PostfachMailButtonComponent', () => {
   let component: PostfachMailButtonComponent;
   let fixture: ComponentFixture<PostfachMailButtonComponent>;
 
-  const sendMailButtonWithText: string = getDataTestIdOf('create-mail-button-with-text');
-  const sendMailButtonWithoutText: string = getDataTestIdOf('create-mail-button-without-text');
-  const sendMailIconButton: string = getDataTestIdOf('send-mail-icon-button');
+  const sendMailButtonWithText: string = getDataTestIdAttributeOf('create-mail-button-with-text');
+  const sendMailButtonWithoutText: string = getDataTestIdAttributeOf('create-mail-button-without-text');
+  const sendMailIconButton: string = getDataTestIdAttributeOf('send-mail-icon-button');
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({

alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html

@@ -27,7 +27,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="wiedereroeffnen-icon-button"
+      dataTestId="wiedereroeffnen-icon-button"
       tooltip="Vorgang wiedereröffnen"
       variant="ghost"
       size="fit"
@@ -38,7 +38,7 @@
   } @else {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="wiedereroeffnen-button"
+      dataTestId="wiedereroeffnen-button"
       text="Wiedereröffnen"
       variant="outline"
       (clickEmitter)="wiedereroeffnen()"

alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts

@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { UndoIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
@@ -37,8 +37,8 @@ import { WiedereroeffnenButtonComponent } from './wiedereroeffnen-button.compone
 describe('WiedereroeffnenButtonComponent', () => {
   let component: WiedereroeffnenButtonComponent;
   let fixture: ComponentFixture<WiedereroeffnenButtonComponent>;
-  const wiedereroeffnenButton: string = getDataTestIdOf('wiedereroeffnen-button');
-  const wiedereroeffnenIconButton: string = getDataTestIdOf('wiedereroeffnen-icon-button');
+  const wiedereroeffnenButton: string = getDataTestIdAttributeOf('wiedereroeffnen-button');
+  const wiedereroeffnenIconButton: string = getDataTestIdAttributeOf('wiedereroeffnen-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),