From 860f8d923a6f91c6cf561614b3114da0ca8ba032 Mon Sep 17 00:00:00 2001 From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com> Date: Thu, 24 Apr 2025 16:28:16 +0200 Subject: [PATCH] OZG-8129 replace nummer icon --- alfa-client/libs/design-system/src/assets/nummer.svg | 5 +++++ alfa-client/libs/ui/src/lib/assets/nr.svg | 1 - alfa-client/libs/ui/src/lib/icon/icon.model.ts | 1 - .../src/lib/vorgang-nummer/vorgang-nummer.component.html | 2 +- .../lib/vorgang-nummer/vorgang-nummer.component.spec.ts | 8 +++----- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 alfa-client/libs/design-system/src/assets/nummer.svg delete mode 100644 alfa-client/libs/ui/src/lib/assets/nr.svg diff --git a/alfa-client/libs/design-system/src/assets/nummer.svg b/alfa-client/libs/design-system/src/assets/nummer.svg new file mode 100644 index 0000000000..f5a5c03e6a --- /dev/null +++ b/alfa-client/libs/design-system/src/assets/nummer.svg @@ -0,0 +1,5 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <path + d="M13.266 16h-1.483L7.98 9.947V16H6.498V7.469H7.98l3.815 6.076V7.469h1.47V16h.001Zm4.933-5.04a3.526 3.526 0 0 0-.58-.046c-.652 0-1.092.25-1.318.75V16h-1.424V9.66h1.36l.035.71c.343-.552.82-.827 1.43-.827" /> + <path d="M22 4a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V4ZM4 4h16v16H4V4Z" /> +</svg> \ No newline at end of file diff --git a/alfa-client/libs/ui/src/lib/assets/nr.svg b/alfa-client/libs/ui/src/lib/assets/nr.svg deleted file mode 100644 index cb8b3e91d0..0000000000 --- a/alfa-client/libs/ui/src/lib/assets/nr.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M13.266 16h-1.483L7.98 9.947V16H6.498V7.469H7.98l3.815 6.076V7.469h1.47V16h.001Zm4.933-5.04a3.526 3.526 0 0 0-.58-.046c-.652 0-1.092.25-1.318.75V16h-1.424V9.66h1.36l.035.71c.343-.552.82-.827 1.43-.827"/><path d="M22 4a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V4ZM4 4h16v16H4V4Z"/></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 2772b09080..6629ec4360 100644 --- a/alfa-client/libs/ui/src/lib/icon/icon.model.ts +++ b/alfa-client/libs/ui/src/lib/icon/icon.model.ts @@ -28,7 +28,6 @@ export enum Icons { INCOMING = 'incoming', LOGO = 'logo', MAIL = 'mail', - NR = 'nr', PDF_EXPORT = 'pdf_export', RESUBMISSION_EXPIRED = 'resubmission_expired', PASTE_FROM_CLIPBOARD = 'paste_from_clipboard', diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.html b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.html index 3a5eabc30c..dc6680a1be 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.html +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.html @@ -24,7 +24,7 @@ --> <div class="flex flex-shrink-0"> - <mat-icon svgIcon="nr" style="width: 1.5rem; height: 1.5rem"></mat-icon> + <ods-icon name="nummer" fill="text" /> </div> <div class="line-clamp-1 flex-shrink overflow-hidden break-all text-base font-normal lg:line-clamp-none lg:flex" diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts index c6b0813916..236b247df8 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts @@ -24,12 +24,10 @@ import { getElementFromFixture } from '@alfa-client/test-utils'; import { VorgangResource } from '@alfa-client/vorgang-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatIcon } from '@angular/material/icon'; -import { MatIconTestingModule } from '@angular/material/icon/testing'; -import { TooltipDirective } from '@ods/system'; +import { IconComponent, TooltipDirective } from '@ods/system'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang'; -import { MockDirective } from 'ng-mocks'; +import { MockComponent, MockDirective } from 'ng-mocks'; import { VorgangNummerComponent } from './vorgang-nummer.component'; describe('VorgangNummerComponent', () => { @@ -42,7 +40,7 @@ describe('VorgangNummerComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [MockDirective(TooltipDirective), VorgangNummerComponent], - imports: [MatIcon, MatIconTestingModule], + imports: [MockComponent(IconComponent)], }).compileComponents(); }); -- GitLab