From da935ad85f7c67f31e714bea42c5cb4737797946 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 25 Apr 2025 14:39:54 +0200
Subject: [PATCH] OZG-8129 replace incoming icon
---
.../libs/design-system/src/assets/incoming.svg | 5 +++++
alfa-client/libs/ui/src/lib/assets/incoming.svg | 1 -
alfa-client/libs/ui/src/lib/icon/icon.model.ts | 1 -
.../libs/ui/src/lib/icon/icon.service.spec.ts | 12 ++----------
...earch-autocomplete-options-content.component.html | 2 +-
...ch-autocomplete-options-content.component.spec.ts | 6 +-----
.../vorgang-created-at.component.html | 2 +-
.../vorgang-created-at.component.scss | 4 ----
.../vorgang-created-at.component.spec.ts | 8 +++-----
9 files changed, 13 insertions(+), 28 deletions(-)
create mode 100644 alfa-client/libs/design-system/src/assets/incoming.svg
delete mode 100644 alfa-client/libs/ui/src/lib/assets/incoming.svg
diff --git a/alfa-client/libs/design-system/src/assets/incoming.svg b/alfa-client/libs/design-system/src/assets/incoming.svg
new file mode 100644
index 0000000000..75c64d842f
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/incoming.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd"
+ stroke-linejoin="round" stroke-miterlimit="2">
+ <path
+ d="M11.34 3.024c-.908.094-1.475.209-2.18.442-2.47.816-4.49 2.706-5.496 5.142a5.018 5.018 0 0 0-.144.37c0 .012.466.022 1.035.022H5.59l.23-.41c.126-.225.339-.563.472-.75.313-.437 1.111-1.235 1.548-1.548a7.224 7.224 0 0 1 3.252-1.293c.578-.073 1.814-.03 2.328.08 2.902.621 5.129 2.966 5.558 5.851.081.549.081 1.591 0 2.14-.335 2.255-1.817 4.269-3.878 5.271-1.146.558-2.417.805-3.612.703-1.792-.153-3.349-.882-4.549-2.129a6.97 6.97 0 0 1-1.234-1.705L5.599 15h-1.04c-.571 0-1.039.01-1.039.022 0 .013.065.179.144.37A9.037 9.037 0 0 0 12.014 21c3.404 0 6.571-1.984 8.066-5.054A8.971 8.971 0 0 0 18.415 5.7a9.054 9.054 0 0 0-5.095-2.599c-.408-.061-1.658-.11-1.98-.077m.14 5.996V11H3v2h8.48v1.98c0 1.089.014 1.98.03 1.98.017 0 1.146-1.116 2.51-2.48L16.5 12l-2.48-2.48c-1.364-1.364-2.493-2.48-2.51-2.48-.016 0-.03.891-.03 1.98" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/ui/src/lib/assets/incoming.svg b/alfa-client/libs/ui/src/lib/assets/incoming.svg
deleted file mode 100644
index fb0032757a..0000000000
--- a/alfa-client/libs/ui/src/lib/assets/incoming.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2"><path d="M11.5 13v4l5-5-5-5v4H3v2h8.5z"/><path d="M3.517 8.988C4.758 5.5 8.089 3 12 3c4.967 0 9 4.033 9 9s-4.033 9-9 9c-3.92 0-7.258-2.512-8.491-6.012h2.088A7.069 7.069 0 0012 19.065 7.069 7.069 0 0019.065 12 7.069 7.069 0 0012 4.935a7.067 7.067 0 00-6.391 4.053H3.517z"/></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 ba322fa837..0d52032985 100644
--- a/alfa-client/libs/ui/src/lib/icon/icon.model.ts
+++ b/alfa-client/libs/ui/src/lib/icon/icon.model.ts
@@ -24,7 +24,6 @@
export enum Icons {
DELETE_FINALLY = 'delete_finally',
EDIT = 'edit',
- INCOMING = 'incoming',
LOGO = 'logo',
MAIL = 'mail',
PDF_EXPORT = 'pdf_export',
diff --git a/alfa-client/libs/ui/src/lib/icon/icon.service.spec.ts b/alfa-client/libs/ui/src/lib/icon/icon.service.spec.ts
index fa050974ab..ceddf51058 100644
--- a/alfa-client/libs/ui/src/lib/icon/icon.service.spec.ts
+++ b/alfa-client/libs/ui/src/lib/icon/icon.service.spec.ts
@@ -21,10 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { MatIconRegistry } from '@angular/material/icon';
-import { IconService } from './icon.service';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { MatIconRegistry } from '@angular/material/icon';
import { Icons } from './icon.model';
+import { IconService } from './icon.service';
describe('IconService', () => {
let service: IconService;
@@ -59,13 +59,5 @@ describe('IconService', () => {
expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalled();
expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalledTimes(iconsObjectLength);
});
-
- it('should call domSanitizer for `incoming` icon', () => {
- service.registerIcons();
-
- expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalledWith(
- iconBasePath + 'incoming.svg',
- );
- });
});
});
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.html b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.html
index b54d43c4ad..cde6b8d5e8 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.html
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.html
@@ -26,7 +26,7 @@
<div class="line name-date">
<span class="name" data-test-id="preview-list-item-vorgang-name">{{ vorgang.name }}</span>
<div class="date">
- <mat-icon svgIcon="incoming"></mat-icon>
+ <ods-icon name="incoming" fill="text" />
<span data-test-id="preview-list-item-created-at">{{ vorgang.createdAt | formatToPrettyDate }}</span>
</div>
</div>
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.spec.ts
index 48a44a87a4..6397afa8b3 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.spec.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-autocomplete-options-content/vorgang-search-autocomplete-options-content.component.spec.ts
@@ -25,8 +25,6 @@ import { FormatToPrettyDatePipe } from '@alfa-client/tech-shared';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
-import { MatIconTestingModule } from '@angular/material/icon/testing';
import { IconComponent } from '@ods/system';
import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
@@ -45,12 +43,10 @@ describe('VorgangSearchAutocompleteOptionsComponent', () => {
declarations: [
VorgangSearchAutocompleteOptionsContentComponent,
FormatToPrettyDatePipe,
- MockComponent(IconComponent),
- MatIcon,
MockComponent(AktenzeichenComponent),
MockComponent(VorgangNummerComponent),
],
- imports: [MatIconTestingModule],
+ imports: [MockComponent(IconComponent)],
}).compileComponents();
});
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.html b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.html
index edfe41eb17..d623fe348d 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.html
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.html
@@ -24,6 +24,6 @@
-->
<div tooltip="Eingang: {{ vorgang.createdAt | formatDateWithTimePipe }}">
- <mat-icon svgIcon="incoming"></mat-icon>
+ <ods-icon name="incoming" fill="text" [class]="'mr-1.5'" />
<span data-test-id="created-at">{{ vorgang.createdAt | formatDateWithoutYearWithTime }}</span>
</div>
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.scss b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.scss
index 06b945b153..7a56f35c7c 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.scss
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.scss
@@ -26,7 +26,3 @@ div {
align-items: center;
white-space: nowrap;
}
-
-mat-icon {
- margin-right: 6px;
-}
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts
index b551e0550b..4aa39267c0 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts
@@ -31,12 +31,10 @@ import { VorgangResource } from '@alfa-client/vorgang-shared';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
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 { VorgangCreatedAtComponent } from './vorgang-created-at.component';
registerLocaleData(localeDe);
@@ -56,7 +54,7 @@ describe('VorgangCreatedAtComponent', () => {
VorgangCreatedAtComponent,
MockDirective(TooltipDirective),
],
- imports: [MatIcon, MatIconTestingModule],
+ imports: [MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(VorgangCreatedAtComponent);
--
GitLab