From b4c85fcf51f2b11d6d48f41f41fa99aba99067be Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 30 Apr 2025 10:27:19 +0200
Subject: [PATCH] OZG-8129 replace error outline white icon
---
alfa-client/apps/alfa/src/app/app.component.ts | 3 +--
alfa-client/apps/alfa/src/styles/material/_snackbar.scss | 4 ++--
alfa-client/libs/design-system/src/assets/error-white.svg | 4 ++++
.../outgoing-mail-error/outgoing-mail-error.component.html | 2 +-
.../outgoing-mail-error/outgoing-mail-error.component.scss | 5 -----
.../outgoing-mail-error.component.spec.ts | 6 +++---
alfa-client/libs/ui/src/lib/assets/error_outline_white.svg | 1 -
7 files changed, 11 insertions(+), 14 deletions(-)
create mode 100644 alfa-client/libs/design-system/src/assets/error-white.svg
delete mode 100644 alfa-client/libs/ui/src/lib/assets/error_outline_white.svg
diff --git a/alfa-client/apps/alfa/src/app/app.component.ts b/alfa-client/apps/alfa/src/app/app.component.ts
index 973595c4a5..a6a3005058 100644
--- a/alfa-client/apps/alfa/src/app/app.component.ts
+++ b/alfa-client/apps/alfa/src/app/app.component.ts
@@ -24,7 +24,7 @@
import { ApiRootFacade, ApiRootResource } from '@alfa-client/api-root-shared';
import { ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
import { NavigationService } from '@alfa-client/navigation-shared';
-import { InjectorService, StateResource, isNotNull } from '@alfa-client/tech-shared';
+import { StateResource, isNotNull } from '@alfa-client/tech-shared';
import { buildPathSegmentsFromLocalStorage } from '@alfa-client/vorgang-shared';
import { Component, Inject, OnInit } from '@angular/core';
import { Params } from '@angular/router';
@@ -47,7 +47,6 @@ export class AppComponent implements OnInit {
private apiRootFacade: ApiRootFacade,
private oAuthService: OAuthService,
private navigationService: NavigationService,
- private injectorService: InjectorService,
) {}
ngOnInit(): void {
diff --git a/alfa-client/apps/alfa/src/styles/material/_snackbar.scss b/alfa-client/apps/alfa/src/styles/material/_snackbar.scss
index 140a15fa19..ba6fa607d2 100644
--- a/alfa-client/apps/alfa/src/styles/material/_snackbar.scss
+++ b/alfa-client/apps/alfa/src/styles/material/_snackbar.scss
@@ -60,13 +60,13 @@
&:before {
position: absolute;
- content: url('/assets/icons/error_outline_white.svg');
display: block;
+ content: url('/assets/icons/error-white.svg');
background-color: mat.m2-get-color-from-palette($warnPalette);
+ width: 40px;
left: 0;
top: 0;
padding: 11px 9px 11px 7px;
- color: #fff;
height: 100%;
}
diff --git a/alfa-client/libs/design-system/src/assets/error-white.svg b/alfa-client/libs/design-system/src/assets/error-white.svg
new file mode 100644
index 0000000000..374e8d12aa
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/error-white.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="white">
+ <path
+ d="M12 17C12.2833 17 12.5208 16.9042 12.7125 16.7125C12.9042 16.5208 13 16.2833 13 16C13 15.7167 12.9042 15.4792 12.7125 15.2875C12.5208 15.0958 12.2833 15 12 15C11.7167 15 11.4792 15.0958 11.2875 15.2875C11.0958 15.4792 11 15.7167 11 16C11 16.2833 11.0958 16.5208 11.2875 16.7125C11.4792 16.9042 11.7167 17 12 17ZM11 13H13V7H11V13ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html
index ee571d9b2d..376672b17e 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html
@@ -25,7 +25,7 @@
-->
<div *ngIf="postfachMailResource.messageCode" data-test-id="mail-send-error" class="mail-send-error">
<span data-test-class="mail-send-error-text">{{ message }}</span>
- <mat-icon data-test-class="mail-send-error-icon" class="mail-send-error__icon text-error">error_outline_white</mat-icon>
+ <ods-icon name="error" fill="error" data-test-class="mail-send-error-icon" />
</div>
<!-- TODO Eigene Component fuer den Button -->
<ozgcloud-stroked-button-with-spinner
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss
index b657da5994..e4f67423dc 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss
@@ -34,11 +34,6 @@
}
margin: 8px 0 16px;
-
- &__icon {
- flex-shrink: 0;
- overflow: hidden;
- }
}
ozgcloud-stroked-button-with-spinner {
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.spec.ts
index 8bdf6783cd..68fb6193ea 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.spec.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.spec.ts
@@ -21,10 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
import { notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IconComponent } from '@ods/system';
import { createPostfachMailResource } from 'libs/postfach-shared/test/postfach';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
@@ -40,8 +40,8 @@ describe('OutgoingMailFailedComponent', () => {
await TestBed.configureTestingModule({
declarations: [
OutgoingMailErrorComponent,
- MatIcon,
MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
+ MockComponent(IconComponent),
],
}).compileComponents();
});
diff --git a/alfa-client/libs/ui/src/lib/assets/error_outline_white.svg b/alfa-client/libs/ui/src/lib/assets/error_outline_white.svg
deleted file mode 100644
index 93566a7224..0000000000
--- a/alfa-client/libs/ui/src/lib/assets/error_outline_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><path d="M11 15h2v2h-2v-2zm0-8h2v6h-2V7zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/></svg>
\ No newline at end of file
--
GitLab