OZG-7798 adjust dataTestId after merge; remove suffx from text component

alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts

@@ -5,9 +5,9 @@ export class StatistikFieldsFormE2EComponent {
   private readonly formIdInput: string = 'form-id-text-input';
   private readonly formDataFieldInput: string = 'mapping-field-';
   private readonly addDataFieldButton: string = 'add-mapping-button';
-  private readonly deleteDataFieldButtonPrefix: string = 'remove-mapping-';
+  private readonly deleteDataFieldButtonPrefix: string = 'remove-mapping-button-';
   private readonly saveButton: string = 'save-button';
-  private readonly cancelButton: string = 'cancel-routing-button';
+  private readonly cancelButton: string = 'cancel-button';
 
   public getFormEngineInput(): Cypress.Chainable<Element> {
     return cy.getTestElement(this.formEngineInput);
@@ -42,7 +42,7 @@ export class StatistikFieldsFormE2EComponent {
   }
 
   public getDataFieldDeleteButton(index: number): Cypress.Chainable<Element> {
-    return cy.getTestElement(this.deleteDataFieldButtonPrefix + index + '-button');
+    return cy.getTestElement(this.deleteDataFieldButtonPrefix + index);
   }
 
   public deleteDataField(index: number): void {

alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts

 export class StatistikE2EComponent {
   private readonly locatorHeaderText: string = 'statistik-header-text';
-  private readonly locatorWeitereFelderAuswertenButton = 'weitere-felder-auswerten-routing-button';
+  private readonly locatorWeitereFelderAuswertenButton = 'weitere-felder-auswerten-button';
 
   public getHeaderText(): Cypress.Chainable<Element> {
     return cy.getTestElement(this.locatorHeaderText);

alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/daria.cy.ts

 import { MainPage, waitForSpinnerToDisappear } from 'apps/admin-e2e/src/page-objects/main.po';
-import { exist, notExist } from 'apps/admin-e2e/src/support/cypress.util';
+import { exist, notExist, visible } from 'apps/admin-e2e/src/support/cypress.util';
 import { loginAsDaria } from 'apps/admin-e2e/src/support/user-util';
 import { StatistikE2EComponent } from '../../../components/statistik/statistik.e2e.component';
 
@@ -37,7 +37,7 @@ describe('Navigation', () => {
       });
 
       it('should show header text', () => {
-        statistikPage.isHeaderTextVisible();
+        visible(statistikPage.getHeaderText());
       });
     });
   });

alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/safira.cy.ts

 import { MainPage, waitForSpinnerToDisappear } from 'apps/admin-e2e/src/page-objects/main.po';
-import { exist } from 'apps/admin-e2e/src/support/cypress.util';
+import { exist, visible } from 'apps/admin-e2e/src/support/cypress.util';
 import { loginAsSafira } from 'apps/admin-e2e/src/support/user-util';
 import { StatistikE2EComponent } from '../../../components/statistik/statistik.e2e.component';
 
@@ -38,7 +38,7 @@ describe('Navigation', () => {
         });
 
         it('should show page on selection', () => {
-          statistikPage.isHeaderTextVisible();
+          visible(statistikPage.getHeaderText());
         });
 
         it('should mark navigation item as selected', () => {

alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html

-<ods-routing-button [linkPath]="linkPath" text="Abbrechen" variant="outline" dataTestId="cancel">
+<ods-routing-button [linkPath]="linkPath" text="Abbrechen" variant="outline" dataTestId="cancel-button">
   <ods-close-icon icon class="fill-primary" />
 </ods-routing-button>

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-button" >
+<ods-open-dialog-button variant="outline_error" label="Löschen" dataTestId="delete-button">
   <ods-delete-icon icon />
 </ods-open-dialog-button>

alfa-client/libs/admin/shared/src/lib/admin-save-button/admin-save-button.component.html

-<ods-button-with-spinner (clickEmitter)="submit()" text="Speichern" dataTestId="save" [stateResource]="stateResource$ | async" />
+<ods-button-with-spinner
+  (clickEmitter)="submit()"
+  text="Speichern"
+  dataTestId="save-button"
+  [stateResource]="stateResource$ | async"
+/>

alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html

@@ -28,7 +28,7 @@
   <ods-routing-button
     [linkPath]="ROUTES.STATISTIK_NEU"
     text="Weitere Felder auswerten"
-    dataTestId="weitere-felder-auswerten"
+    dataTestId="weitere-felder-auswerten-button"
   ></ods-routing-button>
 </div>
 

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

@@ -22,7 +22,7 @@
   </form>
   <ods-button
     text="Datenfeld hinzufügen"
-    dataTestId="add-mapping"
+    dataTestId="add-mapping-button"
     data-test-id="add-mapping"
     (clickEmitter)="formService.addMapping()"
   >

alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.html

@@ -19,8 +19,8 @@
         size="fit"
         destructive="true"
         (clickEmitter)="formService.removeMapping(i)"
-        [dataTestId]="'remove-mapping-' + i"
-        [attr.data-test-id]="'remove-mapping-button-' + i"
+        [dataTestId]="'remove-mapping-button-' + i"
+        [attr.data-test-id]="'remove-mapping-' + i"
       >
         <ods-delete-icon icon />
       </ods-button>

alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.spec.ts

@@ -15,7 +15,7 @@ describe('AdminStatistikFieldsFormMappingComponent', () => {
   let fixture: ComponentFixture<AdminStatistikFieldsFormMappingComponent>;
 
   const mappingField: string = getDataTestIdOf('mapping-field-0');
-  const removeMappingButton: string = getDataTestIdOf('remove-mapping-button-0');
+  const removeMappingButton: string = getDataTestIdOf('remove-mapping-0');
 
   const formBuilder: FormBuilder = new FormBuilder();
 

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

@@ -8,11 +8,7 @@ import { ButtonVariants, buttonVariants } from '@ods/system';
   standalone: true,
   imports: [CommonModule, RouterLink],
   host: { class: 'block' },
-  template: `<a
-    [routerLink]="'/' + linkPath"
-    [attr.data-test-id]="dataTestId + '-routing-button'"
-    [ngClass]="buttonVariants({ size, variant })"
-  >
+  template: `<a [routerLink]="'/' + linkPath" [attr.data-test-id]="dataTestId" [ngClass]="buttonVariants({ size, variant })">
     <ng-content select="[icon]" />
     @if (text) {
       <p class="flex-grow">{{ text }}</p>

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

@@ -95,7 +95,7 @@ export type ButtonVariants = VariantProps<typeof buttonVariants>;
     [disabled]="isDisabled"
     [attr.aria-disabled]="isDisabled"
     [attr.aria-label]="text"
-    [attr.data-test-id]="dataTestId + '-button'"
+    [attr.data-test-id]="dataTestId"
     (click)="clickEmitter.emit()"
   >
     <ng-content *ngIf="!isLoading" select="[icon]"></ng-content>