From 5a07a79636fe8d37019b32222c6522fbcb8f3538 Mon Sep 17 00:00:00 2001 From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com> Date: Mon, 28 Apr 2025 14:27:47 +0200 Subject: [PATCH] OZG-8129 replace mail icon --- alfa-client/libs/ui/src/lib/assets/mail.svg | 1 - alfa-client/libs/ui/src/lib/icon/icon.model.ts | 1 - .../lib/icon/postfach-icon/postfach-icon.component.html | 8 ++++---- .../icon/postfach-icon/postfach-icon.component.spec.ts | 7 +++---- .../src/lib/icon/postfach-icon/postfach-icon.component.ts | 4 ++-- 5 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 alfa-client/libs/ui/src/lib/assets/mail.svg diff --git a/alfa-client/libs/ui/src/lib/assets/mail.svg b/alfa-client/libs/ui/src/lib/assets/mail.svg deleted file mode 100644 index 510a1dc44d..0000000000 --- a/alfa-client/libs/ui/src/lib/assets/mail.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V8l8 5 8-5v10zm-8-7L4 6h16l-8 5z"/></svg> \ No newline at end of file diff --git a/alfa-client/libs/ui/src/lib/icon/icon.model.ts b/alfa-client/libs/ui/src/lib/icon/icon.model.ts index c62112e933..d5475665c9 100644 --- a/alfa-client/libs/ui/src/lib/icon/icon.model.ts +++ b/alfa-client/libs/ui/src/lib/icon/icon.model.ts @@ -22,6 +22,5 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ export enum Icons { - MAIL = 'mail', PDF_EXPORT = 'pdf_export', } diff --git a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.html b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.html index b7f3f441b9..334cf7bf87 100644 --- a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.html +++ b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.html @@ -23,11 +23,11 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<mat-icon +<ods-icon + name="mailbox" + fill="text" data-test-class="postfach-icon-mat-icon" - svgIcon="mail" matBadge="⁠" [matBadgeHidden]="!showBadge" matBadgeSize="small" -> -</mat-icon> +/> diff --git a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts index a5ce3c8c70..0cfb481791 100644 --- a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts +++ b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts @@ -24,9 +24,9 @@ import { getElementFromFixture } from '@alfa-client/test-utils'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatBadge, MatBadgeModule } from '@angular/material/badge'; -import { MatIcon } from '@angular/material/icon'; -import { MatIconTestingModule } from '@angular/material/icon/testing'; +import { IconComponent } from '@ods/system'; import { getDataTestClassOf } from 'libs/tech-shared/test/data-test'; +import { MockComponent } from 'ng-mocks'; import { PostfachIconComponent } from './postfach-icon.component'; describe('PostfachIconComponent', () => { @@ -37,7 +37,7 @@ describe('PostfachIconComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [MatIconTestingModule, MatBadgeModule, MatBadge, MatIcon, PostfachIconComponent], + imports: [MatBadgeModule, MatBadge, PostfachIconComponent, MockComponent(IconComponent)], }).compileComponents(); }); @@ -58,7 +58,6 @@ describe('PostfachIconComponent', () => { const icon: HTMLElement = getElementFromFixture(fixture, postfachIcon); - expect(icon).toHaveClass('mat-icon'); expect(icon).toHaveClass('mat-badge-hidden'); }); diff --git a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts index 684c8781ea..addaacd57c 100644 --- a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts +++ b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts @@ -23,14 +23,14 @@ */ import { Component, Input } from '@angular/core'; import { MatBadge } from '@angular/material/badge'; -import { MatIcon } from '@angular/material/icon'; +import { IconComponent } from '@ods/system'; @Component({ selector: 'ozgcloud-postfach-icon', templateUrl: './postfach-icon.component.html', styleUrls: ['./postfach-icon.component.scss'], standalone: true, - imports: [MatIcon, MatBadge], + imports: [MatBadge, IconComponent], }) export class PostfachIconComponent { @Input() showBadge: boolean = false; -- GitLab