From 8bb290327d5f71b00ae915374df6cf4ab1041b6d Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 12 Mar 2025 16:53:40 +0100
Subject: [PATCH 01/23] OZG-725 Modify disabled button state Sub-Task: OZG-7894

---
 .../button-with-spinner.component.ts          |  2 +-
 .../src/lib/button/button.component.spec.ts   | 23 +++++++++++++++++++
 .../src/lib/button/button.component.ts        | 11 ++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.ts b/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.ts
index 4c1ebd4cfe..79e617880c 100644
--- a/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.ts
+++ b/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.ts
@@ -45,7 +45,7 @@ type ButtonVariants = VariantProps<typeof buttonVariants>;
       [dataTestId]="dataTestId"
       [isLoading]="isLoading"
       [disabled]="disabled"
-      (click)="clickEmitter.emit()"
+      (clickEmitter)="clickEmitter.emit()"
     >
       <ng-content icon select="[icon]" />
     </ods-button>`,
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
index ecd327e0aa..f9b51e9277 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
@@ -41,4 +41,27 @@ describe('ButtonComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  describe('component', () => {
+    beforeEach(() => {
+      component.clickEmitter.emit = jest.fn();
+    });
+
+    describe('onClick', () => {
+      it('should emit click', () => {
+        component.onClick();
+
+        expect(component.clickEmitter.emit).toHaveBeenCalled();
+      });
+
+      it('should NOT emit click', () => {
+        component.disabled = true;
+        fixture.detectChanges();
+
+        component.onClick();
+
+        expect(component.clickEmitter.emit).not.toHaveBeenCalled();
+      });
+    });
+  });
 });
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index 47e76172ad..7d0f0f35b9 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -91,13 +91,12 @@ export type ButtonVariants = VariantProps<typeof buttonVariants>;
   imports: [CommonModule, SpinnerIconComponent],
   template: ` <button
     type="button"
-    [ngClass]="buttonVariants({ size, variant, disabled, destructive })"
-    [disabled]="isDisabled"
+    [ngClass]="buttonVariants({ size, variant, disabled: isDisabled, destructive })"
     [attr.aria-disabled]="isDisabled"
     [attr.aria-label]="text"
     [attr.data-test-id]="dataTestId"
     [attr.data-test-class]="dataTestClass"
-    (click)="clickEmitter.emit()"
+    (click)="onClick()"
   >
     <ng-content *ngIf="!isLoading" select="[icon]"></ng-content>
     <ods-spinner-icon *ngIf="isLoading" [size]="spinnerSize" data-test-class="spinner"></ods-spinner-icon>
@@ -121,5 +120,11 @@ export class ButtonComponent {
     return this.disabled || this.isLoading;
   }
 
+  onClick(): void {
+    if (!this.isDisabled) {
+      this.clickEmitter.emit();
+    }
+  }
+
   readonly buttonVariants = buttonVariants;
 }
-- 
GitLab


From 0c23988173c2fe4face29693330f021629a2b7c1 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 14 Mar 2025 16:39:01 +0100
Subject: [PATCH 02/23] OZG-725 Add styling Sub-Task: OZG-7894

---
 .../src/lib/button/button.component.spec.ts   |  2 +-
 .../src/lib/button/button.component.ts        | 56 +++++++++++++------
 .../spinner-icon/spinner-icon.component.ts    |  8 ++-
 .../src/lib/tailwind-preset/root.css          |  2 +
 .../lib/tailwind-preset/tailwind.config.js    |  1 +
 .../forwarding-button.component.html          | 12 +++-
 .../forwarding-button.component.spec.ts       | 16 ++++++
 .../forwarding-button.component.ts            | 16 +++++-
 .../forwarding-dialog.component.html          | 12 ++--
 9 files changed, 90 insertions(+), 35 deletions(-)

diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
index f9b51e9277..75f8afba23 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
@@ -54,7 +54,7 @@ describe('ButtonComponent', () => {
         expect(component.clickEmitter.emit).toHaveBeenCalled();
       });
 
-      it('should NOT emit click', () => {
+      it('should NOT emit click if button is disabled', () => {
         component.disabled = true;
         fixture.detectChanges();
 
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index 7d0f0f35b9..a513012d4c 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -31,18 +31,18 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
 export const buttonVariants = cva(
   [
     'flex items-center gap-3 rounded-lg text-sm font-medium box-border',
-    'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
+    'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 outline-focus',
   ],
   {
     variants: {
       variant: {
-        primary: 'bg-primary text-whitetext shadow-md hover:enabled:bg-primary-hover focus-visible:bg-primary-hover',
+        primary: 'bg-primary text-whitetext shadow-md hover:bg-primary-hover focus-visible:bg-primary-hover',
         outline:
-          'border border-primary bg-background-50 text-primary shadow-md hover:enabled:bg-ghost-hover focus-visible:bg-ghost-hover focus-visible:border-background-200',
+          'border border-primary bg-background-50 text-primary shadow-md hover:bg-ghost-hover focus-visible:bg-ghost-hover focus-visible:border-background-200',
         outline_error:
-          'border border-error bg-background-50 text-error shadow-md hover:enabled:bg-ghost-hover focus-visible:bg-ghost-hover focus-visible:border-background-200',
+          'border border-error bg-background-50 text-error shadow-md hover:bg-ghost-hover focus-visible:bg-ghost-hover focus-visible:border-background-200',
         ghost:
-          'border border-transparent hover:enabled:bg-ghost-hover text-primary focus-visible:border-background-200 focus-visible:bg-ghost-hover font-semibold [&]:focus-visible:outline-offset-1',
+          'border border-transparent hover:bg-ghost-hover text-primary focus-visible:border-background-200 focus-visible:bg-ghost-hover font-semibold [&]:focus-visible:outline-offset-1',
       },
       size: {
         medium: 'h-9 py-2 px-4 min-w-32',
@@ -50,11 +50,11 @@ export const buttonVariants = cva(
       },
       disabled: {
         false: null,
-        true: ['opacity-70', 'cursor-not-allowed'],
+        true: '[&]:outline-disabled-button cursor-not-allowed',
       },
       destructive: {
-        false: 'outline-focus',
-        true: 'outline-destructive',
+        false: null,
+        true: '[&]:outline-destructive',
       },
     },
     defaultVariants: {
@@ -66,19 +66,34 @@ export const buttonVariants = cva(
       {
         variant: 'primary',
         destructive: true,
-        class:
-          '[&]:hover:enabled:bg-destructive-primary-hover [&]:bg-destructive [&]:outline-destructive [&]:focus-visible:bg-destructive-primary-hover',
+        class: '[&]:hover:bg-destructive-primary-hover [&]:bg-destructive [&]:focus-visible:bg-destructive-primary-hover',
       },
       {
         variant: 'outline',
         destructive: true,
         class:
-          '[&]:border-destructive [&]:text-destructive [&]:hover:enabled:bg-destructive-hover [&]:focus-visible:bg-destructive-hover',
+          '[&]:border-destructive [&]:text-destructive [&]:hover:bg-destructive-hover [&]:focus-visible:bg-destructive-hover',
       },
       {
         variant: 'ghost',
         destructive: true,
-        class: '[&]:text-destructive [&]:hover:enabled:bg-destructive-hover [&]:focus-visible:bg-destructive-hover',
+        class: '[&]:text-destructive [&]:hover:bg-destructive-hover [&]:focus-visible:bg-destructive-hover',
+      },
+      {
+        variant: 'primary',
+        disabled: true,
+        class: '[&]:bg-disabled-button [&]:hover:bg-disabled-button/90 [&]:focus-visible:bg-disabled-button/90',
+      },
+      {
+        variant: 'outline',
+        disabled: true,
+        class:
+          '[&]:text-disabled-button [&]:border-disabled-button [&]:hover:bg-disabled-button/10 [&]:focus-visible:bg-disabled-button/10',
+      },
+      {
+        variant: 'ghost',
+        disabled: true,
+        class: '[&]:text-disabled-button [&]:hover:bg-disabled-button/10 [&]:focus-visible:bg-disabled-button/10',
       },
     ],
   },
@@ -89,7 +104,7 @@ export type ButtonVariants = VariantProps<typeof buttonVariants>;
   selector: 'ods-button',
   standalone: true,
   imports: [CommonModule, SpinnerIconComponent],
-  template: ` <button
+  template: `<button
     type="button"
     [ngClass]="buttonVariants({ size, variant, disabled: isDisabled, destructive })"
     [attr.aria-disabled]="isDisabled"
@@ -98,17 +113,22 @@ export type ButtonVariants = VariantProps<typeof buttonVariants>;
     [attr.data-test-class]="dataTestClass"
     (click)="onClick()"
   >
-    <ng-content *ngIf="!isLoading" select="[icon]"></ng-content>
-    <ods-spinner-icon *ngIf="isLoading" [size]="spinnerSize" data-test-class="spinner"></ods-spinner-icon>
-    <div *ngIf="text" class="flex-grow">{{ text }}</div>
+    @if (isLoading) {
+      <ods-spinner-icon [class]="isDisabled && 'fill-disabled-button'" [size]="spinnerSize" data-test-class="spinner" />
+    } @else {
+      <ng-content select="[icon]" />
+    }
+    @if (text) {
+      <p class="flex-grow">{{ text }}</p>
+    }
   </button>`,
 })
 export class ButtonComponent {
   @Input() text: string = '';
   @Input() dataTestId: string = '';
   @Input() dataTestClass: string = '';
-  @Input() disabled: boolean = false;
-  @Input() isLoading: boolean = false;
+  @Input({ transform: booleanAttribute }) disabled: boolean = false;
+  @Input({ transform: booleanAttribute }) isLoading: boolean = false;
   @Input({ transform: booleanAttribute }) destructive: boolean = false;
   @Input() variant: ButtonVariants['variant'];
   @Input() size: ButtonVariants['size'];
diff --git a/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts
index d361292b08..20ca2f1c2a 100644
--- a/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts
@@ -24,6 +24,7 @@
 import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 
+import { twMerge } from 'tailwind-merge';
 import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
@@ -33,8 +34,7 @@ import { IconVariants, iconVariants } from '../iconVariants';
   template: `
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      [ngClass]="iconVariants({ size })"
-      class="animate-spin fill-primary text-gray-200 dark:text-gray-600"
+      [ngClass]="twMerge('animate-spin fill-primary text-gray-200 dark:text-gray-600', iconVariants({ size }), class)"
       aria-hidden="true"
       viewBox="0 0 100 100"
       fill="none"
@@ -53,6 +53,8 @@ import { IconVariants, iconVariants } from '../iconVariants';
 })
 export class SpinnerIconComponent {
   @Input() size: IconVariants['size'] = 'full';
+  @Input() class: string;
 
-  iconVariants = iconVariants;
+  readonly iconVariants = iconVariants;
+  readonly twMerge = twMerge;
 }
diff --git a/alfa-client/libs/design-system/src/lib/tailwind-preset/root.css b/alfa-client/libs/design-system/src/lib/tailwind-preset/root.css
index a3c8f7b01b..333257d60e 100644
--- a/alfa-client/libs/design-system/src/lib/tailwind-preset/root.css
+++ b/alfa-client/libs/design-system/src/lib/tailwind-preset/root.css
@@ -18,6 +18,7 @@
 
   --color-disabled: 206 14% 95%;
   --color-disabled-dark: 208 12% 65%;
+  --color-disabled-button: 0 0% 42%;
 
   --color-destructive: 360, 71%, 49%, 1;
   --color-destructive-hover: 360, 71%, 49%, 0.07;
@@ -59,6 +60,7 @@
 
   --color-disabled: 206 14% 15%;
   --color-disabled-dark: 208 12% 33%;
+  --color-disabled-button: 0 0% 68%;
 
   --color-destructive: 360, 71%, 49%, 1;
   --color-destructive-hover: 360, 71%, 49%, 0.2;
diff --git a/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js b/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
index cf2abfcb2f..9c5ba7a4e5 100644
--- a/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
+++ b/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
@@ -146,6 +146,7 @@ module.exports = {
         focus: 'hsl(var(--color-focus))',
         disabled: {
           dark: 'hsl(var(--color-disabled-dark) / <alpha-value>)',
+          button: 'hsl(var(--color-disabled-button) / <alpha-value>)',
           DEFAULT: 'hsl(var(--color-disabled) / <alpha-value>)',
         },
         destructive: 'hsla(var(--color-destructive))',
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
index d0dd3c9c05..4196535914 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
@@ -1,3 +1,9 @@
-<ods-button-with-spinner [disabled]="disabled" text="Weiterleiten" variant="outline" dataTestId="forwarding-button">
-  <ods-forward-vorgang-icon icon class="fill-primary" />
-</ods-button-with-spinner>
\ No newline at end of file
+<ods-button-with-spinner
+  [disabled]="disabled"
+  text="Weiterleiten"
+  [tooltip]="tooltip"
+  tooltipPosition="above"
+  dataTestId="forwarding-button"
+>
+  <ods-forward-vorgang-icon icon class="fill-whitetext" />
+</ods-button-with-spinner>
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
index ec3ee8288b..9a3db6373c 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
@@ -23,4 +23,20 @@ describe('ForwardingButtonComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  describe('component', () => {
+    describe('set disabled', () => {
+      it('should set tooltip text', () => {
+        component.disabled = true;
+
+        expect(component.tooltip).not.toBe('');
+      });
+
+      it('should set empty tooltip', () => {
+        component.disabled = false;
+
+        expect(component.tooltip).toBe('');
+      });
+    });
+  });
 });
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
index 63fec70d17..05e20b8b4d 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
@@ -1,13 +1,23 @@
 import { Component, Input } from '@angular/core';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { ForwardVorgangIconComponent } from '@ods/system';
+import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
 
 @Component({
   selector: 'alfa-forwarding-button',
   standalone: true,
-  imports: [ButtonWithSpinnerComponent, ForwardVorgangIconComponent],
+  imports: [ButtonWithSpinnerComponent, ForwardVorgangIconComponent, TooltipDirective],
   templateUrl: './forwarding-button.component.html',
 })
 export class ForwardingButtonComponent {
-  @Input() disabled: boolean;
+  @Input() set disabled(value: boolean) {
+    this._disabled = value;
+    this.tooltip = value ? 'Bitte ein Amt oder Stelle auswählen' : '';
+  }
+
+  public tooltip: string;
+  private _disabled: boolean;
+
+  get disabled() {
+    return this._disabled;
+  }
 }
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 3d60550c44..f557b1c6c7 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -1,20 +1,18 @@
-<div class="flex w-[620px] max-w-full flex-col gap-4 bg-background-100 p-8">
-  <div class="flex items-center justify-between" >
+<div class="flex w-[860px] max-w-full flex-col gap-4 bg-background-100 p-8">
+  <div class="flex items-center justify-between">
     <h1 class="text-xl font-semibold text-primary">Vorgang weiterleiten</h1>
     <ods-cancel-dialog-button showAsIconButton="true" />
   </div>
 
   @if (!selectedSearchResult) {
     <alfa-search-zustaendige-stelle-form-container cdkFocusInitial focusOnSearchField="true" data-test-id="zufi-search" />
+    <div class="h-[calc(50vh)]"></div>
   } @else {
-    <alfa-forwarding-item-in-dialog
-      [organisationsEinheitResource]="selectedSearchResult"
-      data-test-id="forwarding-item"
-    />
+    <alfa-forwarding-item-in-dialog [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
   }
 
   <div class="flex gap-4">
-    <alfa-forwarding-button [disabled]="!selectedSearchResult"/>
+    <alfa-forwarding-button [disabled]="!selectedSearchResult" />
     <ods-cancel-dialog-button />
   </div>
 </div>
-- 
GitLab


From 072ffc531860eda608e629318929a0b9b267d810 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 17 Mar 2025 17:03:28 +0100
Subject: [PATCH 03/23] OZG-725 Wrap search in forwarding item

---
 alfa-client/libs/design-system/src/index.ts   |  1 +
 .../forwarding-item-info.component.spec.ts    | 21 +++++++++++
 .../forwarding-item-info.component.ts         | 12 +++++++
 .../forwarding-item.component.ts              | 14 +++-----
 .../forwarding-item.stories.ts                | 35 +++++++++----------
 .../forwarding-dialog.component.html          |  8 +++--
 .../forwarding-dialog.component.ts            |  2 ++
 .../forwarding-item.component.html            | 10 ++++--
 .../forwarding-item.component.spec.ts         | 16 +++++----
 .../forwarding-item.component.ts              |  9 +++--
 10 files changed, 86 insertions(+), 42 deletions(-)
 create mode 100644 alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.spec.ts
 create mode 100644 alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.ts

diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index d05d44db8c..a820f6d4ce 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -41,6 +41,7 @@ export * from './lib/form/file-upload-button/file-upload-button.component';
 export * from './lib/form/radio-button-card/radio-button-card.component';
 export * from './lib/form/text-input/text-input.component';
 export * from './lib/form/textarea/textarea.component';
+export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
 export * from './lib/forwarding-item/forwarding-item.component';
 export * from './lib/icons/accessibility-icon/accessibility-icon.component';
 export * from './lib/icons/account-circle-icon/account-circle-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.spec.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.spec.ts
new file mode 100644
index 0000000000..aa29de4338
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ForwardingItemInfoComponent } from './forwarding-item-info.component';
+
+describe('ForwardingItemInfoComponent', () => {
+  let component: ForwardingItemInfoComponent;
+  let fixture: ComponentFixture<ForwardingItemInfoComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ForwardingItemInfoComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ForwardingItemInfoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.ts
new file mode 100644
index 0000000000..abace4dec6
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item-info/forwarding-item-info.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ods-forwarding-item-info',
+  standalone: true,
+  template: `<p class="font-medium">{{ label }}</p>
+    <p>{{ address }}</p>`,
+})
+export class ForwardingItemInfoComponent {
+  @Input({ required: true }) label!: string;
+  @Input({ required: true }) address!: string;
+}
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
index 7f8ebfd800..71d2aee374 100644
--- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { CommonModule } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { ForwardVorgangIconComponent } from '../icons/forward-vorgang-icon/forward-vorgang-icon.component';
 
@@ -33,25 +32,20 @@ export enum ForwardingDirection {
 @Component({
   selector: 'ods-forwarding-item',
   standalone: true,
-  imports: [CommonModule, ForwardVorgangIconComponent],
+  imports: [ForwardVorgangIconComponent],
   template: `<div
     class="flex flex-col items-start justify-between gap-2 rounded-lg border border-grayborder p-3 md:flex-row md:items-center md:gap-0"
   >
-    <div class="flex gap-3">
+    <div class="flex flex-1 gap-3">
       <ods-forward-vorgang-icon class="fill-text" />
       <p class="text-gray-500">{{ direction }}:</p>
-      <div>
-        <p class="font-medium">{{ label }}</p>
-        <p>{{ address }}</p>
-      </div>
+      <ng-content />
     </div>
     <div class="text-end empty:hidden">
-      <ng-content />
+      <ng-content select="[end-content]" />
     </div>
   </div>`,
 })
 export class ForwardingItemComponent {
-  @Input({ required: true }) label!: string;
-  @Input({ required: true }) address!: string;
   @Input() direction: ForwardingDirection = ForwardingDirection.TO;
 }
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.stories.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.stories.ts
index 53d2116e9f..d70b202b11 100644
--- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.stories.ts
@@ -24,11 +24,9 @@
 import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
 
 import { ButtonComponent } from '../button/button.component';
+import { ForwardingItemInfoComponent } from './forwarding-item-info/forwarding-item-info.component';
 import { ForwardingDirection, ForwardingItemComponent } from './forwarding-item.component';
 
-const label: string = 'Bund für Umwelt und Naturschutz Kreisgruppe Kiel';
-const address: string = 'Kaiserstraße 25, 12443 Kiel';
-
 const meta: Meta<ForwardingItemComponent> = {
   title: 'Forwarding item',
   component: ForwardingItemComponent,
@@ -41,7 +39,7 @@ const meta: Meta<ForwardingItemComponent> = {
   },
   decorators: [
     moduleMetadata({
-      imports: [ForwardingItemComponent, ButtonComponent],
+      imports: [ForwardingItemComponent, ForwardingItemInfoComponent, ButtonComponent],
     }),
   ],
   excludeStories: /.*Data$/,
@@ -53,40 +51,39 @@ type Story = StoryObj<ForwardingItemComponent>;
 
 export const Default: Story = {
   args: {
-    label: label,
-    address: address,
     direction: ForwardingDirection.TO,
   },
   argTypes: {
     direction: { control: 'select', options: [ForwardingDirection.TO, ForwardingDirection.FROM] },
   },
+  render: () => ({
+    template: `<ods-forwarding-item>
+        <ods-forwarding-item-info label="Bund für Umwelt und Naturschutz Kreisgruppe Kiel" address="Kaiserstraße 25, 12443 Kiel" />
+      </ods-forwarding-item>`,
+  }),
 };
 
 export const WithButton: Story = {
-  args: {
-    label: label,
-    address: address,
-  },
-
-  render: (args: ForwardingItemComponent) => ({
-    props: args,
-    template: `<ods-forwarding-item ${argsToTemplate(args)}>
-        <ods-button variant="outline" text="Stelle ändern" />
+  render: () => ({
+    template: `<ods-forwarding-item>
+        <ods-forwarding-item-info label="Bund für Umwelt und Naturschutz Kreisgruppe Kiel" address="Kaiserstraße 25, 12443 Kiel" />
+        <ods-button variant="outline" text="Stelle ändern" end-content />
       </ods-forwarding-item>`,
   }),
 };
 
 export const WithCreationInfo: Story = {
   args: {
-    label: label,
-    address: address,
     direction: ForwardingDirection.FROM,
   },
   render: (args: ForwardingItemComponent) => ({
     props: args,
     template: `<ods-forwarding-item ${argsToTemplate(args)}>
-        <p>20. Dez. 09:35</p>
-        <p class="text-sm">Karin Wanowski-Müller</p>
+        <ods-forwarding-item-info label="Bund für Umwelt und Naturschutz Kreisgruppe Kiel" address="Kaiserstraße 25, 12443 Kiel" />
+        <div end-content>
+          <p>20. Dez. 09:35</p>
+          <p class="text-sm">Karin Wanowski-Müller</p>
+        </div>
       </ods-forwarding-item>`,
   }),
 };
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index f557b1c6c7..581556972e 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -5,11 +5,15 @@
   </div>
 
   @if (!selectedSearchResult) {
-    <alfa-search-zustaendige-stelle-form-container cdkFocusInitial focusOnSearchField="true" data-test-id="zufi-search" />
-    <div class="h-[calc(50vh)]"></div>
+    <ods-forwarding-item>
+      <div class="w-full">
+        <alfa-search-zustaendige-stelle-form-container cdkFocusInitial focusOnSearchField="true" data-test-id="zufi-search" />
+      </div>
+    </ods-forwarding-item>
   } @else {
     <alfa-forwarding-item-in-dialog [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
   }
+  <div class="h-[calc(50vh)]"></div>
 
   <div class="flex gap-4">
     <alfa-forwarding-button [disabled]="!selectedSearchResult" />
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
index c1695f42a0..5e27faec88 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
@@ -4,6 +4,7 @@ import { A11yModule } from '@angular/cdk/a11y';
 import { Component, Input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { CancelDialogButtonComponent } from '@ods/component';
+import { ForwardingItemComponent } from '@ods/system';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingItemInDialogComponent } from './forwarding-item/forwarding-item.component';
 
@@ -17,6 +18,7 @@ import { ForwardingItemInDialogComponent } from './forwarding-item/forwarding-it
     ZustaendigeStelleModule,
     ForwardingButtonComponent,
     ForwardingItemInDialogComponent,
+    ForwardingItemComponent,
   ],
   templateUrl: './forwarding-dialog.component.html',
 })
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.html
index bd41e43d6a..89aad7082d 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.html
@@ -1,3 +1,7 @@
-<ods-forwarding-item [label]="organisationsEinheitResource.name" [address]="organisationsEinheitResource.anschrift | anschriftToString" >
-  <alfa-forwarding-item-change-button-container />
-</ods-forwarding-item>
\ No newline at end of file
+<ods-forwarding-item>
+  <ods-forwarding-item-info
+    [label]="organisationsEinheitResource.name"
+    [address]="organisationsEinheitResource.anschrift | anschriftToString"
+  />
+  <alfa-forwarding-item-change-button-container end-content />
+</ods-forwarding-item>
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.spec.ts
index b8ffb55d8a..66e27ffe0d 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { getMockComponent } from '@alfa-client/test-utils';
 import { Anschrift, OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
-import { ForwardingItemComponent } from '@ods/system';
+import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/system';
 import { MockComponent } from 'ng-mocks';
 import { createOrganisationsEinheitResource } from '../../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ForwardingItemChangeButtonContainerComponent } from './forwarding-item-change-button-container/forwarding-item-change-button-container.component';
@@ -18,7 +18,11 @@ describe('ForwardingDialogForwardingItemComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ForwardingItemInDialogComponent],
-      declarations: [MockComponent(ForwardingItemChangeButtonContainerComponent), MockComponent(ForwardingItemComponent)],
+      declarations: [
+        MockComponent(ForwardingItemChangeButtonContainerComponent),
+        MockComponent(ForwardingItemComponent),
+        MockComponent(ForwardingItemInfoComponent),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ForwardingItemInDialogComponent);
@@ -31,12 +35,12 @@ describe('ForwardingDialogForwardingItemComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  describe('forwarding item', () => {
+  describe('forwarding item info', () => {
     it('should exist with input', () => {
-      const forwardingItem: ForwardingItemComponent = getMockComponent(fixture, ForwardingItemComponent);
+      const forwardingItemInfo: ForwardingItemInfoComponent = getMockComponent(fixture, ForwardingItemInfoComponent);
 
-      expect(forwardingItem.label).toBe(organisationsEinheitResource.name);
-      expect(forwardingItem.address).toBe(`${anschrift.strasse} ${anschrift.hausnummer}, ${anschrift.plz} ${anschrift.ort}`);
+      expect(forwardingItemInfo.label).toBe(organisationsEinheitResource.name);
+      expect(forwardingItemInfo.address).toBe(`${anschrift.strasse} ${anschrift.hausnummer}, ${anschrift.plz} ${anschrift.ort}`);
     });
   });
 });
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.ts
index 9828f682d8..dba40ffa11 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.ts
@@ -1,12 +1,17 @@
 import { AnschriftToStringPipe, OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
 import { Component, Input } from '@angular/core';
-import { ForwardingItemComponent } from '@ods/system';
+import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/system';
 import { ForwardingItemChangeButtonContainerComponent } from './forwarding-item-change-button-container/forwarding-item-change-button-container.component';
 
 @Component({
   selector: 'alfa-forwarding-item-in-dialog',
   standalone: true,
-  imports: [ForwardingItemChangeButtonContainerComponent, AnschriftToStringPipe, ForwardingItemComponent],
+  imports: [
+    ForwardingItemChangeButtonContainerComponent,
+    AnschriftToStringPipe,
+    ForwardingItemComponent,
+    ForwardingItemInfoComponent,
+  ],
   templateUrl: './forwarding-item.component.html',
 })
 export class ForwardingItemInDialogComponent {
-- 
GitLab


From ec458f68768c40a15ebeee1e10384f169dd86f61 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 11:31:17 +0100
Subject: [PATCH 04/23] OZG-725-7894 renaming

---
 ...warding-item.component.html => search-selected.component.html} | 0
 ...g-item.component.spec.ts => search-selected.component.spec.ts} | 0
 ...{forwarding-item.component.ts => search-selected.component.ts} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/{forwarding-item.component.html => search-selected.component.html} (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/{forwarding-item.component.spec.ts => search-selected.component.spec.ts} (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/{forwarding-item.component.ts => search-selected.component.ts} (100%)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.ts
-- 
GitLab


From 6e37c69c9fb6cf7d99f2eacb133807ee3953be44 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 11:42:32 +0100
Subject: [PATCH 05/23] OZG-725-7894 move

---
 .../forwarding-item-change-button-container.component.html        | 0
 .../forwarding-item-change-button-container.component.spec.ts     | 0
 .../forwarding-item-change-button-container.component.ts          | 0
 .../search-selected.component.html                                | 0
 .../search-selected.component.spec.ts                             | 0
 .../search-selected.component.ts                                  | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{forwarding-item => search-selected}/forwarding-item-change-button-container/forwarding-item-change-button-container.component.html (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{forwarding-item => search-selected}/forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{forwarding-item => search-selected}/forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{forwarding-item => search-selected}/search-selected.component.html (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{forwarding-item => search-selected}/search-selected.component.spec.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{forwarding-item => search-selected}/search-selected.component.ts (100%)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item-change-button-container/forwarding-item-change-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item-change-button-container/forwarding-item-change-button-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-item/search-selected.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
-- 
GitLab


From 2a243b502894035b61191c98c12fbec0bdff9edb Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 11:44:27 +0100
Subject: [PATCH 06/23] OZG-725-7894 rename

---
 .../change-button-container.component.html}                       | 0
 .../change-button-container.component.spec.ts}                    | 0
 .../change-button-container.component.ts}                         | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/{forwarding-item-change-button-container/forwarding-item-change-button-container.component.html => change-button-container/change-button-container.component.html} (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/{forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts => change-button-container/change-button-container.component.spec.ts} (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/{forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts => change-button-container/change-button-container.component.ts} (100%)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/forwarding-item-change-button-container/forwarding-item-change-button-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts
-- 
GitLab


From 6dcec670817ed161adc4a3a6b170d8afde8fe3ce Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 11:44:52 +0100
Subject: [PATCH 07/23] OZG-725-7894 ui ux

---
 .../cancel-dialog-button.component.ts         |  6 ++-
 .../forwarding-item.component.spec.ts         | 44 ----------------
 .../forwarding-item.component.ts              | 51 -------------------
 ...forwarding-button-container.component.html |  4 +-
 .../forwarding-dialog.component.html          | 21 ++++----
 .../forwarding-dialog.component.ts            |  8 +--
 ...earch-organisations-einheit.component.html |  3 ++
 ...ch-organisations-einheit.component.spec.ts | 22 ++++++++
 .../search-organisations-einheit.component.ts | 11 ++++
 .../change-button-container.component.spec.ts | 10 ++--
 .../change-button-container.component.ts      |  6 +--
 .../search-selected.component.html            |  4 +-
 .../search-selected.component.spec.ts         |  4 +-
 .../search-selected.component.ts              | 10 ++--
 14 files changed, 73 insertions(+), 131 deletions(-)
 delete mode 100644 alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
 delete mode 100644 alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
 create mode 100644 alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html
 create mode 100644 alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts
 create mode 100644 alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.ts

diff --git a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
index 7c41c1bbcd..7211cb480d 100644
--- a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
+++ b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
@@ -27,7 +27,11 @@ import { ButtonComponent, CloseIconComponent, TooltipDirective } from '@ods/syst
         text="Abbrechen"
         dataTestId="cancel-dialog-button"
         data-test-id="cancel-dialog-button"
-      />
+      >
+        <ng-container icon>
+          <ods-close-icon class="fill-primary" />
+        </ng-container>
+      </ods-button>
     }`,
 })
 export class CancelDialogButtonComponent {
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
deleted file mode 100644
index 5700f02837..0000000000
--- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ForwardingItemComponent } from './forwarding-item.component';
-
-describe('ForwardingItemComponent', () => {
-  let component: ForwardingItemComponent;
-  let fixture: ComponentFixture<ForwardingItemComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [ForwardingItemComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ForwardingItemComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
deleted file mode 100644
index 71d2aee374..0000000000
--- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { Component, Input } from '@angular/core';
-import { ForwardVorgangIconComponent } from '../icons/forward-vorgang-icon/forward-vorgang-icon.component';
-
-export enum ForwardingDirection {
-  FROM = 'Weitergeleitet von',
-  TO = 'An',
-}
-
-@Component({
-  selector: 'ods-forwarding-item',
-  standalone: true,
-  imports: [ForwardVorgangIconComponent],
-  template: `<div
-    class="flex flex-col items-start justify-between gap-2 rounded-lg border border-grayborder p-3 md:flex-row md:items-center md:gap-0"
-  >
-    <div class="flex flex-1 gap-3">
-      <ods-forward-vorgang-icon class="fill-text" />
-      <p class="text-gray-500">{{ direction }}:</p>
-      <ng-content />
-    </div>
-    <div class="text-end empty:hidden">
-      <ng-content select="[end-content]" />
-    </div>
-  </div>`,
-})
-export class ForwardingItemComponent {
-  @Input() direction: ForwardingDirection = ForwardingDirection.TO;
-}
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
index bdf8537e74..ad9a5561e6 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
@@ -1,4 +1,4 @@
-@if (vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_OZGCLOUD) {
+<!--@if (vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_OZGCLOUD) {-->
   @if (showAsIconButton) {
     <ods-open-dialog-button
       [tooltip]="'Vorgang weiterleiten'"
@@ -14,4 +14,4 @@
       <ods-forward-vorgang-icon icon class="fill-primary" />
     </ods-open-dialog-button>
   }
-}
+<!--}-->
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 581556972e..9dbcc5ecbf 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -1,19 +1,16 @@
-<div class="flex w-[860px] max-w-full flex-col gap-4 bg-background-100 p-8">
-  <div class="flex items-center justify-between">
+<div class="w-[860px] flex flex-col max-w-full max-h-full rounded-lg bg-background-50 p-8 ">
+  <div class="flex items-center justify-between mb-4">
     <h1 class="text-xl font-semibold text-primary">Vorgang weiterleiten</h1>
     <ods-cancel-dialog-button showAsIconButton="true" />
   </div>
 
-  @if (!selectedSearchResult) {
-    <ods-forwarding-item>
-      <div class="w-full">
-        <alfa-search-zustaendige-stelle-form-container cdkFocusInitial focusOnSearchField="true" data-test-id="zufi-search" />
-      </div>
-    </ods-forwarding-item>
-  } @else {
-    <alfa-forwarding-item-in-dialog [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
-  }
-  <div class="h-[calc(50vh)]"></div>
+  <div class="mb-6" style="height: calc(50vh + 4.5rem)">
+    @if (!selectedSearchResult) {
+      <alfa-forwarding-search-organisations-einheit data-test-id="zufi-search" />
+    } @else {
+      <alfa-search-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
+    }
+  </div>
 
   <div class="flex gap-4">
     <alfa-forwarding-button [disabled]="!selectedSearchResult" />
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
index 5e27faec88..343171d3d5 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
@@ -4,9 +4,9 @@ import { A11yModule } from '@angular/cdk/a11y';
 import { Component, Input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { CancelDialogButtonComponent } from '@ods/component';
-import { ForwardingItemComponent } from '@ods/system';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
-import { ForwardingItemInDialogComponent } from './forwarding-item/forwarding-item.component';
+import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
+import { SearchSelectedComponent } from './search-selected/search-selected.component';
 
 @Component({
   selector: 'alfa-forwarding-dialog',
@@ -17,8 +17,8 @@ import { ForwardingItemInDialogComponent } from './forwarding-item/forwarding-it
     ReactiveFormsModule,
     ZustaendigeStelleModule,
     ForwardingButtonComponent,
-    ForwardingItemInDialogComponent,
-    ForwardingItemComponent,
+    ForwardingSearchOrganisationsEinheitComponent,
+    SearchSelectedComponent,
   ],
   templateUrl: './forwarding-dialog.component.html',
 })
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html
new file mode 100644
index 0000000000..80f2ebb748
--- /dev/null
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html
@@ -0,0 +1,3 @@
+<ods-forwarding-item>
+  <alfa-search-zustaendige-stelle-form-container cdkFocusInitial focusOnSearchField="true"/>
+</ods-forwarding-item>
\ No newline at end of file
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts
new file mode 100644
index 0000000000..bbaa57292a
--- /dev/null
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit.component';
+
+describe('ForwardingSearchOrganisationsEinheitComponent', () => {
+  let component: ForwardingSearchOrganisationsEinheitComponent;
+  let fixture: ComponentFixture<ForwardingSearchOrganisationsEinheitComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ForwardingSearchOrganisationsEinheitComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ForwardingSearchOrganisationsEinheitComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.ts
new file mode 100644
index 0000000000..bc974a66d4
--- /dev/null
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.ts
@@ -0,0 +1,11 @@
+import { ZustaendigeStelleModule } from '@alfa-client/zustaendige-stelle';
+import { Component } from '@angular/core';
+import { ForwardingItemComponent } from '@ods/system';
+
+@Component({
+  selector: 'alfa-forwarding-search-organisations-einheit',
+  standalone: true,
+  imports: [ForwardingItemComponent, ZustaendigeStelleModule],
+  templateUrl: './search-organisations-einheit.component.html',
+})
+export class ForwardingSearchOrganisationsEinheitComponent {}
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts
index 49e50eaa84..86ce46346d 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts
@@ -5,11 +5,11 @@ import { OrganisationsEinheitService, ZUSTAENDIGE_STELLE_SERVICE } from '@alfa-c
 import { ButtonComponent } from '@ods/system';
 import { MockComponent } from 'ng-mocks';
 import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
-import { ForwardingItemChangeButtonContainerComponent } from './forwarding-item-change-button-container.component';
+import { ChangeButtonContainerComponent } from './change-button-container.component';
 
 describe('ForwardingItemChangeButtonContainerComponent', () => {
-  let component: ForwardingItemChangeButtonContainerComponent;
-  let fixture: ComponentFixture<ForwardingItemChangeButtonContainerComponent>;
+  let component: ChangeButtonContainerComponent;
+  let fixture: ComponentFixture<ChangeButtonContainerComponent>;
 
   const buttonContainer: string = getDataTestIdOf('forwarding-item-change-button-container');
 
@@ -19,12 +19,12 @@ describe('ForwardingItemChangeButtonContainerComponent', () => {
     service = mock(OrganisationsEinheitService);
 
     TestBed.configureTestingModule({
-      imports: [ForwardingItemChangeButtonContainerComponent],
+      imports: [ChangeButtonContainerComponent],
       declarations: [MockComponent(ButtonComponent)],
       providers: [{ provide: ZUSTAENDIGE_STELLE_SERVICE, useValue: service }],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(ForwardingItemChangeButtonContainerComponent);
+    fixture = TestBed.createComponent(ChangeButtonContainerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts
index 5a0ca9ccbe..549bd4342b 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts
@@ -3,12 +3,12 @@ import { Component, inject } from '@angular/core';
 import { ButtonComponent } from '@ods/system';
 
 @Component({
-  selector: 'alfa-forwarding-item-change-button-container',
+  selector: 'alfa-change-button-container',
   standalone: true,
   imports: [ButtonComponent],
-  templateUrl: './forwarding-item-change-button-container.component.html',
+  templateUrl: './change-button-container.component.html',
 })
-export class ForwardingItemChangeButtonContainerComponent {
+export class ChangeButtonContainerComponent {
   private readonly organisationsEinheitService = inject(ZUSTAENDIGE_STELLE_SERVICE) as OrganisationsEinheitService;
 
   public onClick(): void {
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html
index 89aad7082d..66f8b9cac1 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html
@@ -1,7 +1,7 @@
-<ods-forwarding-item>
+<ods-forwarding-item class="block">
   <ods-forwarding-item-info
     [label]="organisationsEinheitResource.name"
     [address]="organisationsEinheitResource.anschrift | anschriftToString"
   />
-  <alfa-forwarding-item-change-button-container end-content />
+  <alfa-change-button-container end-content />
 </ods-forwarding-item>
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
index 66e27ffe0d..c4c5b403d6 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
@@ -5,7 +5,7 @@ import { Anschrift, OrganisationsEinheitResource } from '@alfa-client/zustaendig
 import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/system';
 import { MockComponent } from 'ng-mocks';
 import { createOrganisationsEinheitResource } from '../../../../../../zustaendige-stelle-shared/test/organisations-einheit';
-import { ForwardingItemChangeButtonContainerComponent } from './forwarding-item-change-button-container/forwarding-item-change-button-container.component';
+import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
 import { ForwardingItemInDialogComponent } from './forwarding-item.component';
 
 describe('ForwardingDialogForwardingItemComponent', () => {
@@ -19,7 +19,7 @@ describe('ForwardingDialogForwardingItemComponent', () => {
     await TestBed.configureTestingModule({
       imports: [ForwardingItemInDialogComponent],
       declarations: [
-        MockComponent(ForwardingItemChangeButtonContainerComponent),
+        MockComponent(ChangeButtonContainerComponent),
         MockComponent(ForwardingItemComponent),
         MockComponent(ForwardingItemInfoComponent),
       ],
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
index dba40ffa11..dd9581e3b0 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
@@ -1,19 +1,19 @@
 import { AnschriftToStringPipe, OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
 import { Component, Input } from '@angular/core';
 import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/system';
-import { ForwardingItemChangeButtonContainerComponent } from './forwarding-item-change-button-container/forwarding-item-change-button-container.component';
+import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
 
 @Component({
-  selector: 'alfa-forwarding-item-in-dialog',
+  selector: 'alfa-search-selected',
   standalone: true,
   imports: [
-    ForwardingItemChangeButtonContainerComponent,
+    ChangeButtonContainerComponent,
     AnschriftToStringPipe,
     ForwardingItemComponent,
     ForwardingItemInfoComponent,
   ],
-  templateUrl: './forwarding-item.component.html',
+  templateUrl: './search-selected.component.html',
 })
-export class ForwardingItemInDialogComponent {
+export class SearchSelectedComponent {
   @Input() organisationsEinheitResource: OrganisationsEinheitResource;
 }
-- 
GitLab


From 60e831028c7398e46cc56d7ed807991e1d32e136 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 11:53:58 +0100
Subject: [PATCH 08/23] OZG-725-7894 ui ux

---
 .../forwarding-item.component.spec.ts         | 44 +++++++++++++++
 .../forwarding-item.component.ts              | 53 +++++++++++++++++++
 .../search-selected.component.ts              |  7 +--
 3 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
 create mode 100644 alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts

diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
new file mode 100644
index 0000000000..5700f02837
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
+ * Ministerpräsidenten des Landes Schleswig-Holstein
+ * Staatskanzlei
+ * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+ *
+ * Lizenziert unter der EUPL, Version 1.2 oder - sobald
+ * diese von der Europäischen Kommission genehmigt wurden -
+ * Folgeversionen der EUPL ("Lizenz");
+ * Sie dürfen dieses Werk ausschließlich gemäß
+ * dieser Lizenz nutzen.
+ * Eine Kopie der Lizenz finden Sie hier:
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Sofern nicht durch anwendbare Rechtsvorschriften
+ * gefordert oder in schriftlicher Form vereinbart, wird
+ * die unter der Lizenz verbreitete Software "so wie sie
+ * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+ * ausdrücklich oder stillschweigend - verbreitet.
+ * Die sprachspezifischen Genehmigungen und Beschränkungen
+ * unter der Lizenz sind dem Lizenztext zu entnehmen.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ForwardingItemComponent } from './forwarding-item.component';
+
+describe('ForwardingItemComponent', () => {
+  let component: ForwardingItemComponent;
+  let fixture: ComponentFixture<ForwardingItemComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ForwardingItemComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ForwardingItemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
new file mode 100644
index 0000000000..11df4ff802
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
+ * Ministerpräsidenten des Landes Schleswig-Holstein
+ * Staatskanzlei
+ * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+ *
+ * Lizenziert unter der EUPL, Version 1.2 oder - sobald
+ * diese von der Europäischen Kommission genehmigt wurden -
+ * Folgeversionen der EUPL ("Lizenz");
+ * Sie dürfen dieses Werk ausschließlich gemäß
+ * dieser Lizenz nutzen.
+ * Eine Kopie der Lizenz finden Sie hier:
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Sofern nicht durch anwendbare Rechtsvorschriften
+ * gefordert oder in schriftlicher Form vereinbart, wird
+ * die unter der Lizenz verbreitete Software "so wie sie
+ * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+ * ausdrücklich oder stillschweigend - verbreitet.
+ * Die sprachspezifischen Genehmigungen und Beschränkungen
+ * unter der Lizenz sind dem Lizenztext zu entnehmen.
+ */
+import { Component, Input } from '@angular/core';
+import { ForwardVorgangIconComponent } from '../icons/forward-vorgang-icon/forward-vorgang-icon.component';
+
+export enum ForwardingDirection {
+  FROM = 'Weitergeleitet von',
+  TO = 'An',
+}
+
+@Component({
+  selector: 'ods-forwarding-item',
+  standalone: true,
+  imports: [ForwardVorgangIconComponent],
+  template: ` <div class="block h-full rounded-lg border border-grayborder">
+    <div class="flex flex-col items-start justify-between gap-2 p-3 md:flex-row md:items-center md:gap-0">
+      <div class="flex flex-1 gap-3">
+        <ods-forward-vorgang-icon class="fill-text" />
+        <p class="text-gray-500">{{ direction }}:</p>
+        <div class="mt-[-8px] w-full">
+          <ng-content />
+        </div>
+      </div>
+      <div class="text-end empty:hidden">
+        <ng-content select="[end-content]" />
+      </div>
+    </div>
+  </div>`,
+})
+export class ForwardingItemComponent {
+  @Input() direction: ForwardingDirection = ForwardingDirection.TO;
+}
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
index dd9581e3b0..eaf514653f 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
@@ -6,12 +6,7 @@ import { ChangeButtonContainerComponent } from './change-button-container/change
 @Component({
   selector: 'alfa-search-selected',
   standalone: true,
-  imports: [
-    ChangeButtonContainerComponent,
-    AnschriftToStringPipe,
-    ForwardingItemComponent,
-    ForwardingItemInfoComponent,
-  ],
+  imports: [ChangeButtonContainerComponent, AnschriftToStringPipe, ForwardingItemComponent, ForwardingItemInfoComponent],
   templateUrl: './search-selected.component.html',
 })
 export class SearchSelectedComponent {
-- 
GitLab


From bbc36b6b0e47c10be8693ea3e8de3904f6c114b7 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 12:46:23 +0100
Subject: [PATCH 09/23] OZG-725-7894 dialog container

---
 alfa-client/libs/design-system/src/index.ts   |  1 +
 .../dialog-container.component.spec.ts        | 23 +++++++++++++
 .../dialog-container.component.ts             | 13 +++++++
 ...forwarding-button-container.component.html |  4 +--
 .../forwarding-dialog.component.html          | 34 ++++++++++---------
 .../forwarding-dialog.component.spec.ts       | 10 +++---
 .../forwarding-dialog.component.ts            |  2 ++
 ...earch-organisations-einheit.component.html |  2 +-
 ...ch-organisations-einheit.component.spec.ts |  4 +++
 .../search-selected.component.spec.ts         | 12 +++----
 10 files changed, 75 insertions(+), 30 deletions(-)
 create mode 100644 alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.spec.ts
 create mode 100644 alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts

diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index a820f6d4ce..c17fdb29f5 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -28,6 +28,7 @@ export * from './lib/bescheid-status-text/bescheid-status-text.component';
 export * from './lib/bescheid-wrapper/bescheid-wrapper.component';
 export * from './lib/button-card/button-card.component';
 export * from './lib/button/button.component';
+export * from './lib/dialog-container/dialog-container.component';
 export * from './lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component';
 export * from './lib/dropdown-menu/dropdown-menu-item/dropdown-menu-item.component';
 export * from './lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component';
diff --git a/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.spec.ts b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.spec.ts
new file mode 100644
index 0000000000..d1f894406f
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DialogContainerComponent } from './dialog-container.component';
+
+describe('DialogContainerComponent', () => {
+  let component: DialogContainerComponent;
+  let fixture: ComponentFixture<DialogContainerComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [DialogContainerComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(DialogContainerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
new file mode 100644
index 0000000000..2757af20ff
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ods-dialog-container',
+  standalone: true,
+  imports: [],
+  template: `
+    <div class="w-[860px] rounded-lg bg-background-50 p-8">
+      <ng-content />
+    </div>
+  `,
+})
+export class DialogContainerComponent {}
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
index ad9a5561e6..bdf8537e74 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
@@ -1,4 +1,4 @@
-<!--@if (vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_OZGCLOUD) {-->
+@if (vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_OZGCLOUD) {
   @if (showAsIconButton) {
     <ods-open-dialog-button
       [tooltip]="'Vorgang weiterleiten'"
@@ -14,4 +14,4 @@
       <ods-forward-vorgang-icon icon class="fill-primary" />
     </ods-open-dialog-button>
   }
-<!--}-->
+}
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 9dbcc5ecbf..4c8e926ea5 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -1,19 +1,21 @@
-<div class="w-[860px] flex flex-col max-w-full max-h-full rounded-lg bg-background-50 p-8 ">
-  <div class="flex items-center justify-between mb-4">
-    <h1 class="text-xl font-semibold text-primary">Vorgang weiterleiten</h1>
-    <ods-cancel-dialog-button showAsIconButton="true" />
-  </div>
+<ods-dialog-container>
+  <div clas="flex flex-col">
+    <div class="mb-4 flex items-center justify-between">
+      <h1 class="text-xl font-semibold text-primary">Vorgang weiterleiten</h1>
+      <ods-cancel-dialog-button showAsIconButton="true" />
+    </div>
 
-  <div class="mb-6" style="height: calc(50vh + 4.5rem)">
-    @if (!selectedSearchResult) {
-      <alfa-forwarding-search-organisations-einheit data-test-id="zufi-search" />
-    } @else {
-      <alfa-search-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
-    }
-  </div>
+    <div class="mb-6" style="height: calc(50vh + 4.5rem)">
+      @if (!selectedSearchResult) {
+        <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="zufi-search" />
+      } @else {
+        <alfa-search-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
+      }
+    </div>
 
-  <div class="flex gap-4">
-    <alfa-forwarding-button [disabled]="!selectedSearchResult" />
-    <ods-cancel-dialog-button />
+    <div class="flex gap-4">
+      <alfa-forwarding-button [disabled]="!selectedSearchResult" />
+      <ods-cancel-dialog-button />
+    </div>
   </div>
-</div>
+</ods-dialog-container>
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index 6d4454c8e3..82a577be60 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -1,14 +1,14 @@
 import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { ZustaendigeStelleModule } from '@alfa-client/zustaendige-stelle';
 import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CancelDialogButtonComponent } from '@ods/component';
-import { MockComponent, MockModule } from 'ng-mocks';
+import { MockComponent } from 'ng-mocks';
 import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
 import { createOrganisationsEinheitResource } from '../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
-import { ForwardingItemInDialogComponent } from './forwarding-item/forwarding-item.component';
 import { ForwardingDialogComponent } from './forwarding-dialog.component';
+import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
+import { SearchSelectedComponent } from './search-selected/search-selected.component';
 
 describe('ForwardingDialogComponent', () => {
   let component: ForwardingDialogComponent;
@@ -24,8 +24,8 @@ describe('ForwardingDialogComponent', () => {
       declarations: [
         MockComponent(CancelDialogButtonComponent),
         MockComponent(ForwardingButtonComponent),
-        MockComponent(ForwardingItemInDialogComponent),
-        MockModule(ZustaendigeStelleModule),
+        MockComponent(SearchSelectedComponent),
+        MockComponent(ForwardingSearchOrganisationsEinheitComponent),
       ],
     }).compileComponents();
 
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
index 343171d3d5..4efb0c7949 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
@@ -4,6 +4,7 @@ import { A11yModule } from '@angular/cdk/a11y';
 import { Component, Input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { CancelDialogButtonComponent } from '@ods/component';
+import { DialogContainerComponent } from '@ods/system';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
 import { SearchSelectedComponent } from './search-selected/search-selected.component';
@@ -19,6 +20,7 @@ import { SearchSelectedComponent } from './search-selected/search-selected.compo
     ForwardingButtonComponent,
     ForwardingSearchOrganisationsEinheitComponent,
     SearchSelectedComponent,
+    DialogContainerComponent,
   ],
   templateUrl: './forwarding-dialog.component.html',
 })
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html
index 80f2ebb748..410a1ed860 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.html
@@ -1,3 +1,3 @@
 <ods-forwarding-item>
-  <alfa-search-zustaendige-stelle-form-container cdkFocusInitial focusOnSearchField="true"/>
+  <alfa-search-zustaendige-stelle-form-container focusOnSearchField="true"/>
 </ods-forwarding-item>
\ No newline at end of file
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts
index bbaa57292a..84b0884543 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-organisations-einheit/search-organisations-einheit.component.spec.ts
@@ -1,5 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { ZustaendigeStelleModule } from '@alfa-client/zustaendige-stelle';
+import { ForwardingItemComponent } from '@ods/system';
+import { MockComponent, MockModule } from 'ng-mocks';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit.component';
 
 describe('ForwardingSearchOrganisationsEinheitComponent', () => {
@@ -9,6 +12,7 @@ describe('ForwardingSearchOrganisationsEinheitComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ForwardingSearchOrganisationsEinheitComponent],
+      declarations: [MockComponent(ForwardingItemComponent), MockModule(ZustaendigeStelleModule)],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ForwardingSearchOrganisationsEinheitComponent);
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
index c4c5b403d6..3866c37766 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
@@ -6,18 +6,18 @@ import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/syste
 import { MockComponent } from 'ng-mocks';
 import { createOrganisationsEinheitResource } from '../../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
-import { ForwardingItemInDialogComponent } from './forwarding-item.component';
+import { SearchSelectedComponent } from './search-selected.component';
 
-describe('ForwardingDialogForwardingItemComponent', () => {
-  let component: ForwardingItemInDialogComponent;
-  let fixture: ComponentFixture<ForwardingItemInDialogComponent>;
+describe('ForwardingSearchOrganisationsEinheitComponent', () => {
+  let component: SearchSelectedComponent;
+  let fixture: ComponentFixture<SearchSelectedComponent>;
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
   const anschrift: Anschrift = organisationsEinheitResource.anschrift;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ForwardingItemInDialogComponent],
+      imports: [SearchSelectedComponent],
       declarations: [
         MockComponent(ChangeButtonContainerComponent),
         MockComponent(ForwardingItemComponent),
@@ -25,7 +25,7 @@ describe('ForwardingDialogForwardingItemComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(ForwardingItemInDialogComponent);
+    fixture = TestBed.createComponent(SearchSelectedComponent);
     component = fixture.componentInstance;
     component.organisationsEinheitResource = organisationsEinheitResource;
     fixture.detectChanges();
-- 
GitLab


From 82ac8fb947b0bbef5d4aaa4b9605701a7d1755d9 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 12:58:18 +0100
Subject: [PATCH 10/23] OZG-725-7894 renaming

---
 .../forwarding-dialog.component.html            |  4 ++--
 .../forwarding-dialog.component.spec.ts         | 17 +++++++++--------
 .../forwarding-dialog.component.ts              |  4 ++--
 .../change-button-container.component.html      |  0
 .../change-button-container.component.spec.ts   |  0
 .../change-button-container.component.ts        |  0
 .../search-item-selected.component.html}        |  0
 .../search-item-selected.component.spec.ts}     | 10 +++++-----
 .../search-item-selected.component.ts}          |  6 +++---
 9 files changed, 21 insertions(+), 20 deletions(-)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-selected => search-item-selected}/change-button-container/change-button-container.component.html (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-selected => search-item-selected}/change-button-container/change-button-container.component.spec.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-selected => search-item-selected}/change-button-container/change-button-container.component.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-selected/search-selected.component.html => search-item-selected/search-item-selected.component.html} (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-selected/search-selected.component.spec.ts => search-item-selected/search-item-selected.component.spec.ts} (85%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-selected/search-selected.component.ts => search-item-selected/search-item-selected.component.ts} (80%)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 4c8e926ea5..1da6032af8 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -7,9 +7,9 @@
 
     <div class="mb-6" style="height: calc(50vh + 4.5rem)">
       @if (!selectedSearchResult) {
-        <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="zufi-search" />
+        <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="organisations-einheit-search" />
       } @else {
-        <alfa-search-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
+        <alfa-search-item-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="search-item-selected" />
       }
     </div>
 
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index 82a577be60..1e2238fe26 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -8,23 +8,24 @@ import { createOrganisationsEinheitResource } from '../../../../../zustaendige-s
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingDialogComponent } from './forwarding-dialog.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
-import { SearchSelectedComponent } from './search-selected/search-selected.component';
+import { SearchItemSelectedComponent } from './search-selected/search-item-selected.component';
 
 describe('ForwardingDialogComponent', () => {
   let component: ForwardingDialogComponent;
   let fixture: ComponentFixture<ForwardingDialogComponent>;
 
-  const zufiSearch: string = getDataTestIdOf('zufi-search');
-  const forwardingItem: string = getDataTestIdOf('forwarding-item');
+  const organisationsEinheitSearch: string = getDataTestIdOf('organisations-einheit-search');
+  const searchItemSelected: string = getDataTestIdOf('search-item-selected');
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ForwardingDialogComponent],
       declarations: [
         MockComponent(CancelDialogButtonComponent),
         MockComponent(ForwardingButtonComponent),
-        MockComponent(SearchSelectedComponent),
+        MockComponent(SearchItemSelectedComponent),
         MockComponent(ForwardingSearchOrganisationsEinheitComponent),
       ],
     }).compileComponents();
@@ -45,7 +46,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        existsAsHtmlElement(fixture, zufiSearch);
+        existsAsHtmlElement(fixture, organisationsEinheitSearch);
       });
 
       it('should NOT render if selectedSearchResult is NOT null', () => {
@@ -53,7 +54,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        notExistsAsHtmlElement(fixture, zufiSearch);
+        notExistsAsHtmlElement(fixture, organisationsEinheitSearch);
       });
     });
   });
@@ -71,7 +72,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        existsAsHtmlElement(fixture, forwardingItem);
+        existsAsHtmlElement(fixture, searchItemSelected);
       });
 
       it('should NOT render if selectedSearchResult is null', () => {
@@ -79,7 +80,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        notExistsAsHtmlElement(fixture, forwardingItem);
+        notExistsAsHtmlElement(fixture, searchItemSelected);
       });
     });
   });
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
index 4efb0c7949..2350186c35 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
@@ -6,8 +6,8 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { CancelDialogButtonComponent } from '@ods/component';
 import { DialogContainerComponent } from '@ods/system';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
+import { SearchItemSelectedComponent } from './search-item-selected/search-item-selected.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
-import { SearchSelectedComponent } from './search-selected/search-selected.component';
 
 @Component({
   selector: 'alfa-forwarding-dialog',
@@ -19,7 +19,7 @@ import { SearchSelectedComponent } from './search-selected/search-selected.compo
     ZustaendigeStelleModule,
     ForwardingButtonComponent,
     ForwardingSearchOrganisationsEinheitComponent,
-    SearchSelectedComponent,
+    SearchItemSelectedComponent,
     DialogContainerComponent,
   ],
   templateUrl: './forwarding-dialog.component.html',
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
index 3866c37766..ff1f2e2a77 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
@@ -6,18 +6,18 @@ import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/syste
 import { MockComponent } from 'ng-mocks';
 import { createOrganisationsEinheitResource } from '../../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
-import { SearchSelectedComponent } from './search-selected.component';
+import { SearchItemSelectedComponent } from './search-item-selected.component';
 
 describe('ForwardingSearchOrganisationsEinheitComponent', () => {
-  let component: SearchSelectedComponent;
-  let fixture: ComponentFixture<SearchSelectedComponent>;
+  let component: SearchItemSelectedComponent;
+  let fixture: ComponentFixture<SearchItemSelectedComponent>;
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
   const anschrift: Anschrift = organisationsEinheitResource.anschrift;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SearchSelectedComponent],
+      imports: [SearchItemSelectedComponent],
       declarations: [
         MockComponent(ChangeButtonContainerComponent),
         MockComponent(ForwardingItemComponent),
@@ -25,7 +25,7 @@ describe('ForwardingSearchOrganisationsEinheitComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(SearchSelectedComponent);
+    fixture = TestBed.createComponent(SearchItemSelectedComponent);
     component = fixture.componentInstance;
     component.organisationsEinheitResource = organisationsEinheitResource;
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
similarity index 80%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
index eaf514653f..640f93dfb6 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
@@ -4,11 +4,11 @@ import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/syste
 import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
 
 @Component({
-  selector: 'alfa-search-selected',
+  selector: 'alfa-search-item-selected',
   standalone: true,
   imports: [ChangeButtonContainerComponent, AnschriftToStringPipe, ForwardingItemComponent, ForwardingItemInfoComponent],
-  templateUrl: './search-selected.component.html',
+  templateUrl: './search-item-selected.component.html',
 })
-export class SearchSelectedComponent {
+export class SearchItemSelectedComponent {
   @Input() organisationsEinheitResource: OrganisationsEinheitResource;
 }
-- 
GitLab


From 92f4c2927f1b66be9e79bc3c6286759910483ed7 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 13:01:28 +0100
Subject: [PATCH 11/23] OZG-725-7894 renaming

---
 .../forwarding-dialog/forwarding-dialog.component.spec.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index 1e2238fe26..42aa015eee 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -7,8 +7,8 @@ import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
 import { createOrganisationsEinheitResource } from '../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingDialogComponent } from './forwarding-dialog.component';
+import { SearchItemSelectedComponent } from './search-item-selected/search-item-selected.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
-import { SearchItemSelectedComponent } from './search-selected/search-item-selected.component';
 
 describe('ForwardingDialogComponent', () => {
   let component: ForwardingDialogComponent;
-- 
GitLab


From 92d08e977200db4f070542e71763bfd990174057 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 14:24:25 +0100
Subject: [PATCH 12/23] OZG-725 e2e test

---
 .../vorgang-forwarding-dialog.e2e.component.ts |  8 ++++----
 .../vorgang-forwarding.cy.ts                   | 18 +++++++++---------
 .../apps/alfa-e2e/src/support/cypress.util.ts  |  8 ++++----
 .../forwarding-button.component.html           |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
index 27fbc0aa69..e4cc26dba1 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
@@ -2,12 +2,12 @@ export class ForwardingDialogE2EComponent {
   private readonly root: string = 'forwarding-dialog';
   private readonly cancelButton: string = 'cancel-dialog-button';
   private readonly cancelIconButton: string = 'cancel-dialog-icon-button';
-  private readonly forwardingButton: string = 'forwarding-button';
+  private readonly forwardingButton: string = 'forwarding-dialog-button';
   private readonly searchText: string = 'instant_search-text-input';
   private readonly searchEntry: string = 'item-button';
   private readonly forwardingItem: string = 'forwarding-item';
   private readonly changeButton: string = 'forwarding-item-change-button';
-  private readonly zufiSearch: string = 'zufi-search';
+  private readonly organisationsEinheitSearch: string = 'organisations-einheit-search';
 
   public getRoot() {
     return cy.getTestElement(this.root);
@@ -45,7 +45,7 @@ export class ForwardingDialogE2EComponent {
     return cy.getTestElement(this.changeButton);
   }
 
-  public getZufiSearch() {
-    return cy.getTestElement(this.zufiSearch);
+  public getOrganisationsEinheitSearch() {
+    return cy.getTestElement(this.organisationsEinheitSearch);
   }
 }
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
index d91019905c..607622c24d 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
@@ -2,6 +2,7 @@ import { registerLocaleData } from '@angular/common';
 import localeDe from '@angular/common/locales/de';
 import localeDeExtra from '@angular/common/locales/extra/de';
 import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
+import { ForwardingDialogE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component';
 import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
 import { E2EVorgangNavigator } from '../../../helper/vorgang/vorgang.navigator';
 import { E2EVorgangVerifier } from '../../../helper/vorgang/vorgang.verifier';
@@ -9,10 +10,9 @@ import { VorgangE2E } from '../../../model/vorgang';
 import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
 import { VorgangPage } from '../../../page-objects/vorgang.po';
 import { dropCollections } from '../../../support/cypress-helper';
-import { beDisabled, contains, exist, notBeDisabled, notExist } from '../../../support/cypress.util';
+import { beAriaDisabled, contains, exist, notBeAriaDisabled, notExist } from '../../../support/cypress.util';
 import { loginAsPeter, loginAsSabine } from '../../../support/user-util';
 import { createVorgang, initVorgaenge } from '../../../support/vorgang-util';
-import { ForwardingDialogE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component';
 
 registerLocaleData(localeDe, 'de', localeDeExtra);
 
@@ -59,12 +59,12 @@ describe('Vorgang weiterleiten', () => {
       exist(forwardingDialog.getRoot());
     });
 
-    it('should have zufi search', () => {
-      exist(forwardingDialog.getZufiSearch());
+    it('should have organisations einheit search', () => {
+      exist(forwardingDialog.getOrganisationsEinheitSearch());
     });
 
     it('should have disabled forwarding button', () => {
-      beDisabled(forwardingDialog.getForwardingButton());
+      beAriaDisabled(forwardingDialog.getForwardingButton());
     });
 
     it('should close dialog on escape', () => {
@@ -98,19 +98,19 @@ describe('Vorgang weiterleiten', () => {
     });
 
     it('should not show zufi search on search select', () => {
-      notExist(forwardingDialog.getZufiSearch());
+      notExist(forwardingDialog.getOrganisationsEinheitSearch());
     });
 
     it('should not disable forwarding button on search select', () => {
-      notBeDisabled(forwardingDialog.getForwardingButton());
+      notBeAriaDisabled(forwardingDialog.getForwardingButton());
     });
 
     it('should clear forwarding item on change button click', () => {
       forwardingDialog.getChangeButton().click();
 
       notExist(forwardingDialog.getForwardingItem());
-      exist(forwardingDialog.getZufiSearch());
-      beDisabled(forwardingDialog.getForwardingButton());
+      exist(forwardingDialog.getOrganisationsEinheitSearch());
+      beAriaDisabled(forwardingDialog.getForwardingButton());
     });
 
     it('should not display Weiterleiten button in status Angenommen', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
index f62a66e73e..768db5ed90 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
@@ -97,12 +97,12 @@ export function notBeChecked(element: any): void {
   element.should('not.be.checked');
 }
 
-export function beDisabled(element: any): void {
-  element.should('be.disabled');
+export function beAriaDisabled(element: any): void {
+  element.should('have.attr', 'aria-disabled', 'true');
 }
 
-export function notBeDisabled(element: any): void {
-  element.should('not.be.disabled');
+export function notBeAriaDisabled(element: any): void {
+  element.should('have.attr', 'aria-disabled', 'false');
 }
 
 //TODO: "first()" rausnehmen -> im html eine entprechende data-test-id ansprechen?! | trennen in "get" und "verify"
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
index 4196535914..dd8cb9767e 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
@@ -3,7 +3,7 @@
   text="Weiterleiten"
   [tooltip]="tooltip"
   tooltipPosition="above"
-  dataTestId="forwarding-button"
+  dataTestId="forwarding-dialog-button"
 >
   <ods-forward-vorgang-icon icon class="fill-whitetext" />
 </ods-button-with-spinner>
-- 
GitLab


From 4bfac4f0dbace85cebbe23bc5558c11700ca1b3b Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 14:30:19 +0100
Subject: [PATCH 13/23] OZG-7712 e2e

---
 .../vorgang-forwarding-dialog.e2e.component.ts       |  6 +++---
 .../vorgang-detailansicht/vorgang-forwarding.cy.ts   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
index e4cc26dba1..ace192e02c 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
@@ -5,7 +5,7 @@ export class ForwardingDialogE2EComponent {
   private readonly forwardingButton: string = 'forwarding-dialog-button';
   private readonly searchText: string = 'instant_search-text-input';
   private readonly searchEntry: string = 'item-button';
-  private readonly forwardingItem: string = 'forwarding-item';
+  private readonly searchItemSelected: string = 'search-item-selected';
   private readonly changeButton: string = 'forwarding-item-change-button';
   private readonly organisationsEinheitSearch: string = 'organisations-einheit-search';
 
@@ -37,8 +37,8 @@ export class ForwardingDialogE2EComponent {
     cy.getTestElement(this.searchEntry).eq(index).click();
   }
 
-  public getForwardingItem() {
-    return cy.getTestElement(this.forwardingItem);
+  public getSearchItemSelected() {
+    return cy.getTestElement(this.searchItemSelected);
   }
 
   public getChangeButton() {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
index 607622c24d..e0b1b6c25c 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
@@ -87,14 +87,14 @@ describe('Vorgang weiterleiten', () => {
       notExist(forwardingDialog.getRoot());
     });
 
-    it('should show forwarding item on search select', () => {
+    it('should show selected search item on search select', () => {
       vorgangFormularButtons.getForwardButton().click();
       forwardingDialog.search(organisationsEinheitName);
       forwardingDialog.clickSearchEntry(0);
 
-      exist(forwardingDialog.getForwardingItem());
-      contains(forwardingDialog.getForwardingItem(), organisationsEinheitName);
-      contains(forwardingDialog.getForwardingItem(), organisationsEinheitAddress);
+      exist(forwardingDialog.getSearchItemSelected());
+      contains(forwardingDialog.getSearchItemSelected(), organisationsEinheitName);
+      contains(forwardingDialog.getSearchItemSelected(), organisationsEinheitAddress);
     });
 
     it('should not show zufi search on search select', () => {
@@ -105,10 +105,10 @@ describe('Vorgang weiterleiten', () => {
       notBeAriaDisabled(forwardingDialog.getForwardingButton());
     });
 
-    it('should clear forwarding item on change button click', () => {
+    it('should clear selected search item on change button click', () => {
       forwardingDialog.getChangeButton().click();
 
-      notExist(forwardingDialog.getForwardingItem());
+      notExist(forwardingDialog.getSearchItemSelected());
       exist(forwardingDialog.getOrganisationsEinheitSearch());
       beAriaDisabled(forwardingDialog.getForwardingButton());
     });
-- 
GitLab


From 92f2ae4922cc3b3752929d31a111f420a049c784 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <kontakt@webkreation.de>
Date: Wed, 19 Mar 2025 15:04:50 +0100
Subject: [PATCH 14/23] OZG-725-7934 opt layout

---
 .../form/text-input/text-input.component.ts   | 40 +++++++++----------
 .../forwarding-item.component.ts              | 16 +++-----
 .../forwarding-dialog.component.html          |  6 +--
 3 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts b/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts
index cd01ba0190..1740d7ba39 100644
--- a/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts
+++ b/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts
@@ -57,27 +57,27 @@ type TextInputVariants = VariantProps<typeof textInputVariants>;
       <label *ngIf="showLabel" [for]="id" class="text-md mb-2 block font-medium text-text">
         {{ inputLabel }}<ng-container *ngIf="required"><i aria-hidden="true">*</i></ng-container>
       </label>
-      <div class="mt-2">
-        <div *ngIf="withPrefix" class="pointer-events-none absolute bottom-2 left-2 flex size-6 items-center justify-center">
-          <ng-content select="[prefix]" />
-        </div>
-        <input
-          type="text"
-          [id]="id"
-          [formControl]="fieldControl"
-          [ngClass]="[textInputVariants({ variant }), withPrefix ? 'pl-10' : '', withSuffix ? 'pr-10' : '']"
-          [placeholder]="placeholder"
-          [autocomplete]="autocomplete"
-          [attr.aria-required]="required"
-          [attr.aria-invalid]="variant === 'error'"
-          [attr.data-test-id]="_dataTestId + '-text-input'"
-          (click)="clickEmitter.emit()"
-          #inputElement
-        />
-        <div *ngIf="withSuffix" class="absolute bottom-2 right-2 flex size-6 items-center justify-center">
-          <ng-content select="[suffix]" />
-        </div>
+
+      <div *ngIf="withPrefix" class="pointer-events-none absolute bottom-2 left-2 flex size-6 items-center justify-center">
+        <ng-content select="[prefix]" />
+      </div>
+      <input
+        type="text"
+        [id]="id"
+        [formControl]="fieldControl"
+        [ngClass]="[textInputVariants({ variant }), withPrefix ? 'pl-10' : '', withSuffix ? 'pr-10' : '']"
+        [placeholder]="placeholder"
+        [autocomplete]="autocomplete"
+        [attr.aria-required]="required"
+        [attr.aria-invalid]="variant === 'error'"
+        [attr.data-test-id]="_dataTestId + '-text-input'"
+        (click)="clickEmitter.emit()"
+        #inputElement
+      />
+      <div *ngIf="withSuffix" class="absolute bottom-2 right-2 flex size-6 items-center justify-center">
+        <ng-content select="[suffix]" />
       </div>
+
       <ng-content select="[error]"></ng-content>
     </div>
   `,
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
index 11df4ff802..e1322cfcde 100644
--- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
@@ -33,18 +33,14 @@ export enum ForwardingDirection {
   selector: 'ods-forwarding-item',
   standalone: true,
   imports: [ForwardVorgangIconComponent],
-  template: ` <div class="block h-full rounded-lg border border-grayborder">
-    <div class="flex flex-col items-start justify-between gap-2 p-3 md:flex-row md:items-center md:gap-0">
-      <div class="flex flex-1 gap-3">
+  template: ` <div class="h-full rounded-lg border border-grayborder">
+    <div class="flex flex-col gap-3 p-3 align-top sm:flex-row">
+      <div class="flex gap-3">
         <ods-forward-vorgang-icon class="fill-text" />
-        <p class="text-gray-500">{{ direction }}:</p>
-        <div class="mt-[-8px] w-full">
-          <ng-content />
-        </div>
-      </div>
-      <div class="text-end empty:hidden">
-        <ng-content select="[end-content]" />
+        <div class="font-medium text-gray-500">{{ direction }}:</div>
       </div>
+      <div class="grow"><ng-content /></div>
+      <div class="flex items-center"><ng-content select="[end-content]" /></div>
     </div>
   </div>`,
 })
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 9dbcc5ecbf..b61988d33c 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -1,6 +1,6 @@
-<div class="w-[860px] flex flex-col max-w-full max-h-full rounded-lg bg-background-50 p-8 ">
-  <div class="flex items-center justify-between mb-4">
-    <h1 class="text-xl font-semibold text-primary">Vorgang weiterleiten</h1>
+<div class="flex max-h-full w-[860px] max-w-full flex-col rounded-lg bg-background-50 p-6 shadow-md">
+  <div class="mb-4 flex items-center justify-between">
+    <h1 class="text-lg font-medium text-primary">Vorgang weiterleiten</h1>
     <ods-cancel-dialog-button showAsIconButton="true" />
   </div>
 
-- 
GitLab


From 09d2fb05300583b465847873ce8c54869b3cac1a Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Wed, 19 Mar 2025 16:40:54 +0100
Subject: [PATCH 15/23] OZG-725 merge main

---
 .../forwarding-dialog.component.html                 |  1 +
 .../forwarding-dialog.component.spec.ts              | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index a220280a3f..86964888f9 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -19,6 +19,7 @@
         [disabled]="!selectedSearchResult"
         (clickEmitter)="onForwarding()"
         data-test-id="foward-dialog-forward-button"
+      />
       <ods-cancel-dialog-button />
     </div>
   </div>
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index 94b0ebe900..cc001a9f05 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -1,4 +1,10 @@
-import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
+import {
+  dispatchEventFromFixture,
+  existsAsHtmlElement,
+  getMockComponent,
+  MockEvent,
+  notExistsAsHtmlElement,
+} from '@alfa-client/test-utils';
 import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { getUrl } from '@ngxp/rest';
@@ -73,7 +79,7 @@ describe('ForwardingDialogComponent', () => {
 
       fixture.detectChanges();
 
-        existsAsHtmlElement(fixture, searchItemSelected);
+      existsAsHtmlElement(fixture, searchItemSelected);
     });
 
     it('should NOT render if selectedSearchResult is null', () => {
@@ -81,7 +87,7 @@ describe('ForwardingDialogComponent', () => {
 
       fixture.detectChanges();
 
-        notExistsAsHtmlElement(fixture, searchItemSelected);
+      notExistsAsHtmlElement(fixture, searchItemSelected);
     });
   });
 
-- 
GitLab


From 9da11037ef8fde2f8dbfdbf55dcee2e52a54c90c Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <kontakt@webkreation.de>
Date: Thu, 20 Mar 2025 10:45:50 +0100
Subject: [PATCH 16/23] OZG-725-7934 fix instant-search hover

---
 .../search-result-item/search-result-item.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alfa-client/libs/design-system/src/lib/instant-search/search-result-item/search-result-item.component.ts b/alfa-client/libs/design-system/src/lib/instant-search/search-result-item/search-result-item.component.ts
index 3f5364877b..3d76515489 100644
--- a/alfa-client/libs/design-system/src/lib/instant-search/search-result-item/search-result-item.component.ts
+++ b/alfa-client/libs/design-system/src/lib/instant-search/search-result-item/search-result-item.component.ts
@@ -32,7 +32,7 @@ import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@
     *ngIf="title"
     [ngClass]="[
       'flex w-full justify-between border-2 border-transparent px-6 py-3',
-      'hover:border-focus focus:border-focus focus:outline-none',
+      'hover:bg-background-150 focus:border-focus focus:outline-none',
     ]"
     role="listitem"
     tabindex="-1"
-- 
GitLab


From 9c4fc7f6ee32afc75872bc6f1e7ec23e0c90eb05 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <kontakt@webkreation.de>
Date: Thu, 20 Mar 2025 13:20:54 +0100
Subject: [PATCH 17/23] OZG-725-7934 opt responsive layout

---
 .../src/lib/dialog-container/dialog-container.component.ts  | 6 ++++--
 .../forwarding-button/forwarding-button.component.html      | 2 +-
 .../forwarding-dialog/forwarding-dialog.component.html      | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
index 0ae05ed9e1..ceed8aa71c 100644
--- a/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
+++ b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
@@ -5,8 +5,10 @@ import { Component } from '@angular/core';
   standalone: true,
   imports: [],
   template: `
-    <div class="max-h-full w-[860px] max-w-full rounded-lg bg-background-50 p-6 shadow-md">
-      <ng-content />
+    <div class="static flex w-[calc(50vw)] flex-col">
+      <div class="flex grow flex-col rounded-lg bg-background-50 p-6 shadow-md">
+        <ng-content />
+      </div>
     </div>
   `,
 })
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
index dd8cb9767e..495c9518c7 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
@@ -1,6 +1,6 @@
 <ods-button-with-spinner
   [disabled]="disabled"
-  text="Weiterleiten"
+  text="Jetzt weiterleiten"
   [tooltip]="tooltip"
   tooltipPosition="above"
   dataTestId="forwarding-dialog-button"
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 48919266d4..524484a464 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -1,10 +1,10 @@
 <ods-dialog-container>
-  <div class="flex flex-col">
-    <div class="mb-4 flex items-center justify-between">
+  <div class="flex grow flex-col gap-6">
+    <div class="flex items-center justify-between">
       <h1 class="text-lg font-medium text-primary">Vorgang weiterleiten</h1>
       <ods-cancel-dialog-button showAsIconButton="true" />
     </div>
-    <div class="mb-6" style="height: calc(50vh + 4.5rem)">
+    <div class="h-[calc(50vh+4.5rem)] grow">
       @if (!selectedSearchResult) {
         <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="organisations-einheit-search" />
       } @else {
-- 
GitLab


From fc52e324096b237a2db2394aa65674a7dc37038b Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <kontakt@webkreation.de>
Date: Thu, 20 Mar 2025 16:22:39 +0100
Subject: [PATCH 18/23] OZG-725-7934 OPT dialog size

---
 .../src/lib/dialog-container/dialog-container.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
index ceed8aa71c..3df7faf24a 100644
--- a/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
+++ b/alfa-client/libs/design-system/src/lib/dialog-container/dialog-container.component.ts
@@ -5,8 +5,8 @@ import { Component } from '@angular/core';
   standalone: true,
   imports: [],
   template: `
-    <div class="static flex w-[calc(50vw)] flex-col">
-      <div class="flex grow flex-col rounded-lg bg-background-50 p-6 shadow-md">
+    <div class="static flex w-[calc(100vw-2rem)] justify-center">
+      <div class="flex max-w-4xl grow flex-col rounded-lg bg-background-50 p-6 shadow-md">
         <ng-content />
       </div>
     </div>
-- 
GitLab


From 0d5b009e60385d72d38f794d0ec19d75b8fbdd5f Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Fri, 21 Mar 2025 10:26:09 +0100
Subject: [PATCH 19/23] OZG-725 CR Anmerkungen

---
 .../src/lib/button/button.component.spec.ts            |  1 -
 .../design-system/src/lib/button/button.component.ts   |  2 +-
 .../forwarding-button.component.spec.ts                |  5 +++--
 .../forwarding-button/forwarding-button.component.ts   |  4 ++--
 .../forwarding-dialog/forwarding-dialog.component.html |  2 +-
 .../forwarding-dialog.component.spec.ts                | 10 +++++-----
 .../forwarding-dialog/forwarding-dialog.component.ts   |  4 ++--
 ...ponent.html => selected-search-item.component.html} |  0
 ....spec.ts => selected-search-item.component.spec.ts} | 10 +++++-----
 ....component.ts => selected-search-item.component.ts} |  6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/{search-item-selected.component.html => selected-search-item.component.html} (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/{search-item-selected.component.spec.ts => selected-search-item.component.spec.ts} (85%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/{search-item-selected.component.ts => selected-search-item.component.ts} (80%)

diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
index 75f8afba23..fc5322e9e5 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
@@ -56,7 +56,6 @@ describe('ButtonComponent', () => {
 
       it('should NOT emit click if button is disabled', () => {
         component.disabled = true;
-        fixture.detectChanges();
 
         component.onClick();
 
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index a513012d4c..3f88a32abc 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -140,7 +140,7 @@ export class ButtonComponent {
     return this.disabled || this.isLoading;
   }
 
-  onClick(): void {
+  public onClick(): void {
     if (!this.isDisabled) {
       this.clickEmitter.emit();
     }
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
index 0b9cd364d1..661105c1ad 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
@@ -1,3 +1,4 @@
+import { EMPTY_STRING } from '@alfa-client/tech-shared';
 import { dispatchEventFromFixture, MockEvent } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
@@ -32,13 +33,13 @@ describe('ForwardingButtonComponent', () => {
       it('should set tooltip text', () => {
         component.disabled = true;
 
-        expect(component.tooltip).not.toBe('');
+        expect(component.tooltip).not.toBe(EMPTY_STRING);
       });
 
       it('should set empty tooltip', () => {
         component.disabled = false;
 
-        expect(component.tooltip).toBe('');
+        expect(component.tooltip).toBe(EMPTY_STRING);
       });
     });
   });
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
index 3e0cb495d9..e881014e93 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
@@ -1,5 +1,5 @@
 import { CommandResource } from '@alfa-client/command-shared';
-import { StateResource } from '@alfa-client/tech-shared';
+import { EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
@@ -13,7 +13,7 @@ import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
 export class ForwardingButtonComponent {
   @Input() set disabled(value: boolean) {
     this._disabled = value;
-    this.tooltip = value ? 'Bitte ein Amt oder Stelle auswählen' : '';
+    this.tooltip = value ? 'Bitte ein Amt oder Stelle auswählen' : EMPTY_STRING;
   }
   @Input() stateResource: StateResource<CommandResource>;
 
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 7811a8e2d1..af7bf0bb34 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -8,7 +8,7 @@
       @if (!selectedSearchResult) {
         <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="organisations-einheit-search" />
       } @else {
-        <alfa-search-item-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="search-item-selected" />
+        <alfa-selected-search-item [organisationsEinheitResource]="selectedSearchResult" data-test-id="selected-search-item" />
       }
     </div>
 
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index cc001a9f05..7a57c749ab 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -14,7 +14,7 @@ import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
 import { createOrganisationsEinheitResource } from '../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingDialogComponent } from './forwarding-dialog.component';
-import { SearchItemSelectedComponent } from './search-item-selected/search-item-selected.component';
+import { SelectedSearchItemComponent } from './search-item-selected/selected-search-item.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
 
 describe('ForwardingDialogComponent', () => {
@@ -22,7 +22,7 @@ describe('ForwardingDialogComponent', () => {
   let fixture: ComponentFixture<ForwardingDialogComponent>;
 
   const organisationsEinheitSearch: string = getDataTestIdOf('organisations-einheit-search');
-  const searchItemSelected: string = getDataTestIdOf('search-item-selected');
+  const selectedSearchItem: string = getDataTestIdOf('selected-search-item');
   const forwardButton: string = getDataTestIdOf('foward-dialog-forward-button');
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
@@ -33,7 +33,7 @@ describe('ForwardingDialogComponent', () => {
       declarations: [
         MockComponent(CancelDialogButtonComponent),
         MockComponent(ForwardingButtonComponent),
-        MockComponent(SearchItemSelectedComponent),
+        MockComponent(SelectedSearchItemComponent),
         MockComponent(ForwardingSearchOrganisationsEinheitComponent),
       ],
     }).compileComponents();
@@ -79,7 +79,7 @@ describe('ForwardingDialogComponent', () => {
 
       fixture.detectChanges();
 
-      existsAsHtmlElement(fixture, searchItemSelected);
+      existsAsHtmlElement(fixture, selectedSearchItem);
     });
 
     it('should NOT render if selectedSearchResult is null', () => {
@@ -87,7 +87,7 @@ describe('ForwardingDialogComponent', () => {
 
       fixture.detectChanges();
 
-      notExistsAsHtmlElement(fixture, searchItemSelected);
+      notExistsAsHtmlElement(fixture, selectedSearchItem);
     });
   });
 
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
index 58ab3e2f54..c23893e1f5 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
@@ -9,7 +9,7 @@ import { getUrl, ResourceUri } from '@ngxp/rest';
 import { CancelDialogButtonComponent } from '@ods/component';
 import { DialogContainerComponent } from '@ods/system';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
-import { SearchItemSelectedComponent } from './search-item-selected/search-item-selected.component';
+import { SelectedSearchItemComponent } from './search-item-selected/selected-search-item.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
 
 @Component({
@@ -22,7 +22,7 @@ import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisa
     ZustaendigeStelleModule,
     ForwardingButtonComponent,
     ForwardingSearchOrganisationsEinheitComponent,
-    SearchItemSelectedComponent,
+    SelectedSearchItemComponent,
     DialogContainerComponent,
   ],
   templateUrl: './forwarding-dialog.component.html',
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.spec.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.spec.ts
index ff1f2e2a77..c95fd052a7 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.spec.ts
@@ -6,18 +6,18 @@ import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/syste
 import { MockComponent } from 'ng-mocks';
 import { createOrganisationsEinheitResource } from '../../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
-import { SearchItemSelectedComponent } from './search-item-selected.component';
+import { SelectedSearchItemComponent } from './selected-search-item.component';
 
 describe('ForwardingSearchOrganisationsEinheitComponent', () => {
-  let component: SearchItemSelectedComponent;
-  let fixture: ComponentFixture<SearchItemSelectedComponent>;
+  let component: SelectedSearchItemComponent;
+  let fixture: ComponentFixture<SelectedSearchItemComponent>;
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
   const anschrift: Anschrift = organisationsEinheitResource.anschrift;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SearchItemSelectedComponent],
+      imports: [SelectedSearchItemComponent],
       declarations: [
         MockComponent(ChangeButtonContainerComponent),
         MockComponent(ForwardingItemComponent),
@@ -25,7 +25,7 @@ describe('ForwardingSearchOrganisationsEinheitComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(SearchItemSelectedComponent);
+    fixture = TestBed.createComponent(SelectedSearchItemComponent);
     component = fixture.componentInstance;
     component.organisationsEinheitResource = organisationsEinheitResource;
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.ts
similarity index 80%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.ts
index 640f93dfb6..c407378205 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.ts
@@ -4,11 +4,11 @@ import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/syste
 import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
 
 @Component({
-  selector: 'alfa-search-item-selected',
+  selector: 'alfa-selected-search-item',
   standalone: true,
   imports: [ChangeButtonContainerComponent, AnschriftToStringPipe, ForwardingItemComponent, ForwardingItemInfoComponent],
-  templateUrl: './search-item-selected.component.html',
+  templateUrl: './selected-search-item.component.html',
 })
-export class SearchItemSelectedComponent {
+export class SelectedSearchItemComponent {
   @Input() organisationsEinheitResource: OrganisationsEinheitResource;
 }
-- 
GitLab


From 4c12d34af58b2b2d03917f9ba2b56fdc8c445f85 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Fri, 21 Mar 2025 10:30:36 +0100
Subject: [PATCH 20/23] OZG-725 CR Anmerkungen

---
 .../vorgang/vorgang-forwarding-dialog.e2e.component.ts    | 6 +++---
 .../vorgang-detailansicht/vorgang-forwarding.cy.ts        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
index fe10a2f124..34702bb369 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
@@ -5,7 +5,7 @@ export class ForwardingDialogE2EComponent {
   private readonly forwardingButton: string = 'forwarding-dialog-forwarding-button';
   private readonly searchText: string = 'instant_search-text-input';
   private readonly searchEntry: string = 'item-button';
-  private readonly searchItemSelected: string = 'selected-search-item';
+  private readonly selectedSearchItem: string = 'selected-search-item';
   private readonly changeButton: string = 'forwarding-item-change-button';
   private readonly organisationsEinheitSearch: string = 'organisations-einheit-search';
 
@@ -37,8 +37,8 @@ export class ForwardingDialogE2EComponent {
     cy.getTestElement(this.searchEntry).eq(index).click();
   }
 
-  public getSearchItemSelected() {
-    return cy.getTestElement(this.searchItemSelected);
+  public getSelectedSearchItem() {
+    return cy.getTestElement(this.selectedSearchItem);
   }
 
   public getChangeButton() {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
index e0b1b6c25c..8634b339b8 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts
@@ -92,9 +92,9 @@ describe('Vorgang weiterleiten', () => {
       forwardingDialog.search(organisationsEinheitName);
       forwardingDialog.clickSearchEntry(0);
 
-      exist(forwardingDialog.getSearchItemSelected());
-      contains(forwardingDialog.getSearchItemSelected(), organisationsEinheitName);
-      contains(forwardingDialog.getSearchItemSelected(), organisationsEinheitAddress);
+      exist(forwardingDialog.getSelectedSearchItem());
+      contains(forwardingDialog.getSelectedSearchItem(), organisationsEinheitName);
+      contains(forwardingDialog.getSelectedSearchItem(), organisationsEinheitAddress);
     });
 
     it('should not show zufi search on search select', () => {
@@ -108,7 +108,7 @@ describe('Vorgang weiterleiten', () => {
     it('should clear selected search item on change button click', () => {
       forwardingDialog.getChangeButton().click();
 
-      notExist(forwardingDialog.getSearchItemSelected());
+      notExist(forwardingDialog.getSelectedSearchItem());
       exist(forwardingDialog.getOrganisationsEinheitSearch());
       beAriaDisabled(forwardingDialog.getForwardingButton());
     });
-- 
GitLab


From 4653da4e4d68f70927c284076e87534018a7d040 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Fri, 21 Mar 2025 16:06:30 +0100
Subject: [PATCH 21/23] OZG-725 renaming  folder

---
 .../change-button-container.component.html                        | 0
 .../change-button-container.component.spec.ts                     | 0
 .../change-button-container/change-button-container.component.ts  | 0
 .../selected-search-item.component.html                           | 0
 .../selected-search-item.component.spec.ts                        | 0
 .../selected-search-item.component.ts                             | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-item-selected => selected-search-item}/change-button-container/change-button-container.component.html (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-item-selected => selected-search-item}/change-button-container/change-button-container.component.spec.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-item-selected => selected-search-item}/change-button-container/change-button-container.component.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-item-selected => selected-search-item}/selected-search-item.component.html (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-item-selected => selected-search-item}/selected-search-item.component.spec.ts (100%)
 rename alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/{search-item-selected => selected-search-item}/selected-search-item.component.ts (100%)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/change-button-container/change-button-container.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/change-button-container/change-button-container.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/change-button-container/change-button-container.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/change-button-container/change-button-container.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/change-button-container/change-button-container.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/change-button-container/change-button-container.component.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/selected-search-item.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/selected-search-item.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/selected-search-item.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/selected-search-item.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/selected-search-item.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/selected-search-item/selected-search-item.component.ts
-- 
GitLab


From 6e325ec4e5a3a5eb967fe5c18d4dd2daa6c6b610 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Fri, 21 Mar 2025 16:07:04 +0100
Subject: [PATCH 22/23] OZG-7473 renaming folder

---
 .../forwarding-dialog/forwarding-dialog.component.spec.ts       | 2 +-
 .../forwarding-dialog/forwarding-dialog.component.ts            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index 7a57c749ab..be35437dac 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -14,7 +14,7 @@ import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
 import { createOrganisationsEinheitResource } from '../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingDialogComponent } from './forwarding-dialog.component';
-import { SelectedSearchItemComponent } from './search-item-selected/selected-search-item.component';
+import { SelectedSearchItemComponent } from './selected-search-item/selected-search-item.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
 
 describe('ForwardingDialogComponent', () => {
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
index c23893e1f5..9ff338f0a8 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
@@ -9,7 +9,7 @@ import { getUrl, ResourceUri } from '@ngxp/rest';
 import { CancelDialogButtonComponent } from '@ods/component';
 import { DialogContainerComponent } from '@ods/system';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
-import { SelectedSearchItemComponent } from './search-item-selected/selected-search-item.component';
+import { SelectedSearchItemComponent } from './selected-search-item/selected-search-item.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
 
 @Component({
-- 
GitLab


From 68c18063e0ec0691eb5c4e012b6da9cc2424f292 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Fri, 21 Mar 2025 16:43:09 +0100
Subject: [PATCH 23/23] OZG-725 small fix

---
 .../apps/alfa-e2e/src/helper/forwarding/forwarding.executor.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alfa-client/apps/alfa-e2e/src/helper/forwarding/forwarding.executor.ts b/alfa-client/apps/alfa-e2e/src/helper/forwarding/forwarding.executor.ts
index 22295bb180..659d24215d 100644
--- a/alfa-client/apps/alfa-e2e/src/helper/forwarding/forwarding.executor.ts
+++ b/alfa-client/apps/alfa-e2e/src/helper/forwarding/forwarding.executor.ts
@@ -9,7 +9,7 @@ export class E2EForwardingExecutor {
     this.forwardingDialog.getSearchText().type(organisationsEinheit);
     waitForSpinnerToDisappear();
     this.forwardingDialog.clickSearchEntry(0);
-    exist(this.forwardingDialog.getForwardingItem());
+    exist(this.forwardingDialog.getSelectedSearchItem());
     this.forwardingDialog.getForwardingButton().click();
     waitForSpinnerToDisappear();
   }
-- 
GitLab