From 9b3083f0a941e5292865347d7edf6029befdc9c1 Mon Sep 17 00:00:00 2001 From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com> Date: Thu, 6 Feb 2025 14:11:51 +0100 Subject: [PATCH] OZG-7474 Replace assign user profile button --- ...er-profile-button-container.component.html | 20 +++++++++++-------- ...profile-button-container.component.spec.ts | 8 +++++--- .../src/lib/user-profile.module.ts | 4 ++++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html index ac709eb5dc..6469c2a6d8 100644 --- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html +++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html @@ -23,11 +23,15 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<ozgcloud-icon-button-with-spinner - *ngIf="vorgang | hasLink: linkRel.ASSIGN" - svgIcon="account_outline" - toolTip="Bearbeiter zuordnen" - (clickEmitter)="showUserProfileSearch()" - data-test-id="assign-user-profile-icon-button" -> -</ozgcloud-icon-button-with-spinner> +@if (vorgang | hasLink: linkRel.ASSIGN) { + <ods-button-with-spinner + svgIcon="account_outline" + tooltip="Bearbeiter zuordnen" + data-test-id="assign-user-profile-icon-button" + variant="icon" + size="fit" + (clickEmitter)="showUserProfileSearch()" + > + <ods-account-circle-icon icon class="fill-text" /> + </ods-button-with-spinner> +} diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts index 5f82315849..531805961b 100644 --- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts +++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts @@ -21,12 +21,13 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HasLinkPipe } from '@alfa-client/tech-shared'; import { mock } from '@alfa-client/test-utils'; -import { IconButtonWithSpinnerComponent } from '@alfa-client/ui'; import { UserProfileService } from '@alfa-client/user-profile-shared'; import { VorgangHeaderLinkRel } from '@alfa-client/vorgang-shared'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ButtonWithSpinnerComponent } from '@ods/component'; +import { AccountCircleIconComponent } from '@ods/system'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { MockComponent } from 'ng-mocks'; import { AssignUserProfileButtonContainerComponent } from './assign-user-profile-button-container.component'; @@ -44,7 +45,8 @@ describe('AssignUserProfileButtonContainerComponent', () => { declarations: [ AssignUserProfileButtonContainerComponent, HasLinkPipe, - MockComponent(IconButtonWithSpinnerComponent), + MockComponent(ButtonWithSpinnerComponent), + MockComponent(AccountCircleIconComponent), ], providers: [ { diff --git a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts index 11ab2e9213..408ace4cfb 100644 --- a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts +++ b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts @@ -27,7 +27,9 @@ import { UserProfileSharedModule } from '@alfa-client/user-profile-shared'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { ButtonWithSpinnerComponent } from '@ods/component'; import { + AccountCircleIconComponent, DropdownMenuButtonItemComponent, DropdownMenuComponent, DropdownMenuItemComponent, @@ -69,6 +71,8 @@ import { UserProfileComponent } from './user-profile/user-profile.component'; DropdownMenuComponent, DropdownMenuItemComponent, DropdownMenuButtonItemComponent, + ButtonWithSpinnerComponent, + AccountCircleIconComponent, TooltipDirective, ], declarations: [ -- GitLab