From 4c599d3b9ea36f9f8b6735791a25103a43656517 Mon Sep 17 00:00:00 2001 From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com> Date: Thu, 3 Apr 2025 15:59:09 +0200 Subject: [PATCH] OZG-7707 replace more icons - exclamation icon - forward vorgang icon --- .../apps/demo/src/app/app.component.spec.ts | 4 +- ...ganisations-einheit-list.component.spec.ts | 3 +- .../user-form-roles.component.spec.ts | 8 ++- .../checkbox-editor.component.spec.ts | 5 +- alfa-client/libs/design-system/src/index.ts | 2 - .../error-message.component.spec.ts | 5 +- .../error-message/error-message.component.ts | 6 +-- .../forwarding-item.component.spec.ts | 4 +- .../forwarding-item.component.ts | 6 +-- .../exclamation-icon.component.spec.ts | 44 --------------- .../exclamation-icon.component.ts | 52 ------------------ .../exclamation-icon.stories.ts | 50 ----------------- .../forward-vorgang-icon.component.spec.ts | 44 --------------- .../forward-vorgang-icon.component.ts | 53 ------------------- .../forward-vorgang-icon.stories.ts | 50 ----------------- .../icons/user-icon/user-icon.component.ts | 3 +- ...forwarding-button-container.component.html | 4 +- ...warding-button-container.component.spec.ts | 8 +-- .../forwarding-button-container.component.ts | 4 +- .../forwarding-button.component.html | 2 +- .../forwarding-button.component.spec.ts | 4 +- .../forwarding-button.component.ts | 4 +- .../vorgang-export-container.component.html | 2 +- ...vorgang-export-container.component.spec.ts | 4 +- .../src/lib/vorgang-detail.module.ts | 2 - 25 files changed, 41 insertions(+), 332 deletions(-) delete mode 100644 alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts delete mode 100644 alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts delete mode 100644 alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts delete mode 100644 alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts delete mode 100644 alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts delete mode 100644 alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts diff --git a/alfa-client/apps/demo/src/app/app.component.spec.ts b/alfa-client/apps/demo/src/app/app.component.spec.ts index 4a014cf975..c532d28824 100644 --- a/alfa-client/apps/demo/src/app/app.component.spec.ts +++ b/alfa-client/apps/demo/src/app/app.component.spec.ts @@ -23,14 +23,14 @@ */ import { TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { IconComponent } from '@ods/system'; +import { ErrorMessageComponent, IconComponent } from '@ods/system'; import { MockComponent } from 'ng-mocks'; import { AppComponent } from './app.component'; describe('AppComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [AppComponent, RouterTestingModule, MockComponent(IconComponent)], + imports: [AppComponent, RouterTestingModule, MockComponent(IconComponent), MockComponent(ErrorMessageComponent)], }).compileComponents(); }); diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts index a680943511..7f17b5fbc0 100644 --- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts +++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts @@ -28,7 +28,7 @@ import { CommonModule } from '@angular/common'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { OpenDialogButtonComponent } from '@ods/component'; -import { ExclamationIconComponent, IconComponent, ListComponent, ListItemComponent } from '@ods/system'; +import { IconComponent, ListComponent, ListItemComponent } from '@ods/system'; import { getConvertedDataTestIdOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { MockComponent } from 'ng-mocks'; import { createAdminOrganisationsEinheit } from '../../../../../organisations-einheit-shared/src/test/organisations-einheit'; @@ -55,7 +55,6 @@ describe('OrganisationsEinheitListComponent', () => { OrganisationsEinheitListComponent, MockComponent(ListComponent), MockComponent(ListItemComponent), - MockComponent(ExclamationIconComponent), MockComponent(IconComponent), ], }).compileComponents(); diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts index 5f21edb7a5..39a21b7faf 100644 --- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts +++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts @@ -21,7 +21,13 @@ describe('UserFormRolesComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [UserFormRolesComponent, ReactiveFormsModule, MockComponent(InfoIconComponent), MockDirective(TooltipDirective)], + imports: [ + UserFormRolesComponent, + ReactiveFormsModule, + MockComponent(InfoIconComponent), + MockComponent(ValidationErrorComponent), + MockDirective(TooltipDirective), + ], }).compileComponents(); fixture = TestBed.createComponent(UserFormRolesComponent); diff --git a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts index cada7efb7a..ca7100ac03 100644 --- a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts +++ b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts @@ -24,9 +24,12 @@ import { getElementFromFixture } from '@alfa-client/test-utils'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { faker } from '@faker-js/faker'; +import { ErrorMessageComponent } from '@ods/system'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { createInvalidParam } from 'libs/tech-shared/test/error'; +import { MockComponent } from 'ng-mocks'; import { MockNgControl } from '../../../../test/form/MockNgControl'; +import { ValidationErrorComponent } from '../validation-error/validation-error.component'; import { CheckboxEditorComponent } from './checkbox-editor.component'; describe('CheckboxEditorComponent', () => { @@ -38,7 +41,7 @@ describe('CheckboxEditorComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [CheckboxEditorComponent], + imports: [CheckboxEditorComponent, ValidationErrorComponent, MockComponent(ErrorMessageComponent)], }).compileComponents(); fixture = TestBed.createComponent(CheckboxEditorComponent); diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts index eda60fb424..489ff70ab8 100644 --- a/alfa-client/libs/design-system/src/index.ts +++ b/alfa-client/libs/design-system/src/index.ts @@ -45,10 +45,8 @@ export * from './lib/form/textarea/textarea.component'; export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component'; export * from './lib/forwarding-item/forwarding-item.component'; export * from './lib/icon/icon.component'; -export * from './lib/icons/exclamation-icon/exclamation-icon.component'; export * from './lib/icons/external-unit-icon/external-unit-icon.component'; export * from './lib/icons/file-icon/file-icon.component'; -export * from './lib/icons/forward-vorgang-icon/forward-vorgang-icon.component'; export * from './lib/icons/help-icon/help-icon.component'; export * from './lib/icons/iconVariants'; export * from './lib/icons/info-icon/info-icon.component'; diff --git a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts index b5a5674105..5590fa5a7a 100644 --- a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts +++ b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts @@ -22,7 +22,8 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExclamationIconComponent } from '../../icons/exclamation-icon/exclamation-icon.component'; +import { MockComponent } from 'ng-mocks'; +import { IconComponent } from '../../icon/icon.component'; import { ErrorMessageComponent } from './error-message.component'; describe('ErrorMessageComponent', () => { @@ -31,7 +32,7 @@ describe('ErrorMessageComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ErrorMessageComponent, ExclamationIconComponent], + imports: [ErrorMessageComponent, MockComponent(IconComponent)], }).compileComponents(); fixture = TestBed.createComponent(ErrorMessageComponent); diff --git a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts index 7e8cc5ae0e..cf7a5aacc0 100644 --- a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts +++ b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts @@ -24,14 +24,14 @@ import { EMPTY_STRING } from '@alfa-client/tech-shared'; import { CommonModule } from '@angular/common'; import { Component, Input } from '@angular/core'; -import { ExclamationIconComponent } from '../../icons/exclamation-icon/exclamation-icon.component'; +import { IconComponent } from '../../icon/icon.component'; @Component({ selector: 'ods-error-message', standalone: true, - imports: [CommonModule, ExclamationIconComponent], + imports: [CommonModule, IconComponent], styles: [':host {@apply flex text-error my-2 text-sm items-center font-medium}'], - template: `<ods-exclamation-icon class="mr-1"></ods-exclamation-icon> + template: `<ods-icon name="exclamation" class="mr-1" fill="error" /> <div class="flex-grow break-words" [id]="id"> {{ text }} <br *ngIf="subText" aria-hidden="true" /> diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts index 5700f02837..5caa55f029 100644 --- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts +++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts @@ -22,6 +22,8 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MockComponent } from 'ng-mocks'; +import { IconComponent } from '../icon/icon.component'; import { ForwardingItemComponent } from './forwarding-item.component'; describe('ForwardingItemComponent', () => { @@ -30,7 +32,7 @@ describe('ForwardingItemComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ForwardingItemComponent], + imports: [ForwardingItemComponent, MockComponent(IconComponent)], }).compileComponents(); fixture = TestBed.createComponent(ForwardingItemComponent); diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts index e1322cfcde..09f4565fcc 100644 --- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts +++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts @@ -22,7 +22,7 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ import { Component, Input } from '@angular/core'; -import { ForwardVorgangIconComponent } from '../icons/forward-vorgang-icon/forward-vorgang-icon.component'; +import { IconComponent } from '../icon/icon.component'; export enum ForwardingDirection { FROM = 'Weitergeleitet von', @@ -32,11 +32,11 @@ export enum ForwardingDirection { @Component({ selector: 'ods-forwarding-item', standalone: true, - imports: [ForwardVorgangIconComponent], + imports: [IconComponent], template: ` <div class="h-full rounded-lg border border-grayborder"> <div class="flex flex-col gap-3 p-3 align-top sm:flex-row"> <div class="flex gap-3"> - <ods-forward-vorgang-icon class="fill-text" /> + <ods-icon name="forward-vorgang" fill="text" /> <div class="font-medium text-gray-500">{{ direction }}:</div> </div> <div class="grow"><ng-content /></div> diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts deleted file mode 100644 index 88727f81f8..0000000000 --- a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExclamationIconComponent } from './exclamation-icon.component'; - -describe('ExclamationIconComponent', () => { - let component: ExclamationIconComponent; - let fixture: ComponentFixture<ExclamationIconComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ExclamationIconComponent], - }).compileComponents(); - - fixture = TestBed.createComponent(ExclamationIconComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts deleted file mode 100644 index f5ccacb8ed..0000000000 --- a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -import { NgClass } from '@angular/common'; -import { Component, Input } from '@angular/core'; -import { twMerge } from 'tailwind-merge'; - -import { IconVariants, iconVariants } from '../iconVariants'; - -@Component({ - selector: 'ods-exclamation-icon', - standalone: true, - imports: [NgClass], - template: `<svg - xmlns="http://www.w3.org/2000/svg" - [ngClass]="[twMerge(iconVariants({ size }), 'fill-error', class)]" - aria-hidden="true" - viewBox="0 0 20 20" - fill="inherit" - > - <path - d="M10.3069 14.7308C10.5416 14.7308 10.7383 14.6533 10.8971 14.4985C11.0559 14.3437 11.1353 14.1518 11.1353 13.923C11.1353 13.6942 11.0559 13.5023 10.8971 13.3475C10.7383 13.1928 10.5416 13.1155 10.3069 13.1155C10.0722 13.1155 9.87548 13.1928 9.71668 13.3475C9.55789 13.5023 9.47849 13.6942 9.47849 13.923C9.47849 14.1518 9.55789 14.3437 9.71668 14.4985C9.87548 14.6533 10.0722 14.7308 10.3069 14.7308ZM10.3072 11.077C10.5253 11.077 10.7079 11.0051 10.8551 10.8613C11.0024 10.7176 11.0761 10.5395 11.0761 10.327V5.827C11.0761 5.6145 11.0023 5.43633 10.8548 5.2925C10.7073 5.14883 10.5246 5.077 10.3066 5.077C10.0885 5.077 9.9059 5.14883 9.75873 5.2925C9.61139 5.43633 9.53772 5.6145 9.53772 5.827V10.327C9.53772 10.5395 9.61148 10.7176 9.75899 10.8613C9.9065 11.0051 10.0892 11.077 10.3072 11.077ZM10.3087 19.5C8.96109 19.5 7.69442 19.2507 6.50868 18.752C5.32295 18.2533 4.29156 17.5766 3.41452 16.7218C2.53748 15.8669 1.84308 14.8617 1.33132 13.706C0.81973 12.5503 0.563934 11.3156 0.563934 10.0017C0.563934 8.68775 0.819644 7.45267 1.33106 6.2965C1.84248 5.14033 2.53654 4.13467 3.41324 3.2795C4.28994 2.42433 5.3209 1.74725 6.50612 1.24825C7.69134 0.749417 8.95767 0.5 10.3051 0.5C11.6527 0.5 12.9194 0.749333 14.1051 1.248C15.2909 1.74667 16.3222 2.42342 17.1993 3.27825C18.0763 4.13308 18.7707 5.13833 19.2825 6.294C19.7941 7.44967 20.0499 8.68442 20.0499 9.99825C20.0499 11.3123 19.7942 12.5473 19.2827 13.7035C18.7713 14.8597 18.0773 15.8653 17.2006 16.7205C16.3239 17.5757 15.2929 18.2528 14.1077 18.7518C12.9225 19.2506 11.6561 19.5 10.3087 19.5Z" - /> - </svg>`, -}) -export class ExclamationIconComponent { - @Input() size: IconVariants['size'] = 'medium'; - @Input() class: string = undefined; - - iconVariants = iconVariants; - twMerge = twMerge; -} diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts deleted file mode 100644 index 4a2cfccb0f..0000000000 --- a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -import type { Meta, StoryObj } from '@storybook/angular'; - -import { ExclamationIconComponent } from './exclamation-icon.component'; - -const meta: Meta<ExclamationIconComponent> = { - title: 'Icons/Exclamation icon', - component: ExclamationIconComponent, - excludeStories: /.*Data$/, - tags: ['autodocs'], -}; - -export default meta; -type Story = StoryObj<ExclamationIconComponent>; - -export const Default: Story = { - args: { size: 'medium' }, - argTypes: { - size: { - control: 'select', - options: ['small', 'medium', 'large', 'extra-large', 'full'], - description: 'Size of icon. Property "full" means 100%', - table: { - defaultValue: { summary: 'medium' }, - }, - }, - }, -}; diff --git a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts deleted file mode 100644 index dcbe4c3e63..0000000000 --- a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ForwardVorgangIconComponent } from './forward-vorgang-icon.component'; - -describe('ForwardVorgangIconComponent', () => { - let component: ForwardVorgangIconComponent; - let fixture: ComponentFixture<ForwardVorgangIconComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ForwardVorgangIconComponent], - }).compileComponents(); - - fixture = TestBed.createComponent(ForwardVorgangIconComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts deleted file mode 100644 index 983f661619..0000000000 --- a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -import { NgClass } from '@angular/common'; -import { Component, Input } from '@angular/core'; -import { twMerge } from 'tailwind-merge'; -import { iconVariants, IconVariants } from '../iconVariants'; - -@Component({ - selector: 'ods-forward-vorgang-icon', - standalone: true, - imports: [NgClass], - template: `<svg - viewBox="0 0 24 24" - xmlns="http://www.w3.org/2000/svg" - [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)" - aria-hidden="true" - > - <path d="M17.7222 16.4V14L22 18.2L17.7222 22.4V19.94C14.6667 19.94 12.5278 20.9 11 23C11.6111 20 13.4444 17 17.7222 16.4Z" /> - <path - fill-rule="evenodd" - clip-rule="evenodd" - d="M16.25 11V3.77384H11.2794L6.875 7.93078L6.875 18.408H9V20.1818H6.875C5.83947 20.1818 5 19.3876 5 18.408V7.93078C5 7.4596 5.19815 7.00779 5.55074 6.67501L9.95513 2.51807C10.3066 2.18631 10.7829 2 11.2794 2H16.25C17.2855 2 18.125 2.79417 18.125 3.77384V11H16.25Z" - /> - </svg>`, -}) -export class ForwardVorgangIconComponent { - @Input() size: IconVariants['size'] = 'medium'; - @Input() class: string = undefined; - - readonly iconVariants = iconVariants; - readonly twMerge = twMerge; -} diff --git a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts deleted file mode 100644 index 2fd3fa932e..0000000000 --- a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -import type { Meta, StoryObj } from '@storybook/angular'; - -import { ForwardVorgangIconComponent } from './forward-vorgang-icon.component'; - -const meta: Meta<ForwardVorgangIconComponent> = { - title: 'Icons/Forward Vorgang icon', - component: ForwardVorgangIconComponent, - excludeStories: /.*Data$/, - tags: ['autodocs'], -}; - -export default meta; -type Story = StoryObj<ForwardVorgangIconComponent>; - -export const Default: Story = { - args: { size: 'large' }, - argTypes: { - size: { - control: 'select', - options: ['small', 'medium', 'large', 'extra-large', 'full'], - description: 'Size of icon. Property "full" means 100%', - table: { - defaultValue: { summary: 'medium' }, - }, - }, - }, -}; diff --git a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts index 5fd4ae92c4..466b89fda0 100644 --- a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts +++ b/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts @@ -24,13 +24,12 @@ import { CommonModule } from '@angular/common'; import { Component, Input } from '@angular/core'; import { twMerge } from 'tailwind-merge'; -import { ExclamationIconComponent } from '../exclamation-icon/exclamation-icon.component'; import { IconVariants, iconVariants } from '../iconVariants'; @Component({ selector: 'ods-user-icon', standalone: true, - imports: [CommonModule, ExclamationIconComponent], + imports: [CommonModule], template: ` <svg viewBox="0 0 112 112" diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html index bdf8537e74..b6d4f9244f 100644 --- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html +++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html @@ -7,11 +7,11 @@ size="fit" dataTestId="forwarding-icon-button" > - <ods-forward-vorgang-icon icon class="fill-text" /> + <ods-icon icon name="forward-vorgang" fill="text" /> </ods-open-dialog-button> } @else { <ods-open-dialog-button label="Weiterleiten" variant="outline" dataTestId="forwarding-button"> - <ods-forward-vorgang-icon icon class="fill-primary" /> + <ods-icon icon name="forward-vorgang" /> </ods-open-dialog-button> } } diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts index 64f911229d..f1c52ac963 100644 --- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts +++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts @@ -3,7 +3,7 @@ import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-u import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { OpenDialogButtonComponent } from '@ods/component'; -import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system'; +import { IconComponent, TooltipDirective } from '@ods/system'; import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { MockComponent, MockDirective } from 'ng-mocks'; @@ -19,11 +19,7 @@ describe('ForwardingButtonContainerComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ForwardingButtonContainerComponent, HasLinkPipe], - declarations: [ - MockComponent(OpenDialogButtonComponent), - MockComponent(ForwardVorgangIconComponent), - MockDirective(TooltipDirective), - ], + declarations: [MockComponent(OpenDialogButtonComponent), MockComponent(IconComponent), MockDirective(TooltipDirective)], }).compileComponents(); fixture = TestBed.createComponent(ForwardingButtonContainerComponent); diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts index 0f6d13f6a5..773d800ddc 100644 --- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts +++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts @@ -4,13 +4,13 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli import { CommonModule } from '@angular/common'; import { Component, Input } from '@angular/core'; import { OpenDialogButtonComponent } from '@ods/component'; -import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system'; +import { IconComponent, TooltipDirective } from '@ods/system'; import { ForwardingDialogContainerComponent } from '../forwarding-dialog-container/forwarding-dialog-container.component'; @Component({ selector: 'alfa-forwarding-button-container', standalone: true, - imports: [CommonModule, ForwardVorgangIconComponent, TooltipDirective, HasLinkPipe, OpenDialogButtonComponent], + imports: [CommonModule, IconComponent, TooltipDirective, HasLinkPipe, OpenDialogButtonComponent], templateUrl: './forwarding-button-container.component.html', providers: [{ provide: DIALOG_COMPONENT, useValue: ForwardingDialogContainerComponent }], styles: [':host {@apply empty:hidden}'], diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html index 6995cd3356..7f70fca2f1 100644 --- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html +++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html @@ -8,5 +8,5 @@ dataTestId="forwarding-dialog-forwarding-button" data-test-id="forwarding-button-container" > - <ods-forward-vorgang-icon icon class="fill-whitetext" /> + <ods-icon icon name="forward-vorgang" fill="whitetext" /> </ods-button-with-spinner> diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts index 661105c1ad..2fa8341da7 100644 --- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts +++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts @@ -2,7 +2,7 @@ import { EMPTY_STRING } from '@alfa-client/tech-shared'; import { dispatchEventFromFixture, MockEvent } from '@alfa-client/test-utils'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ButtonWithSpinnerComponent } from '@ods/component'; -import { ForwardVorgangIconComponent } from '@ods/system'; +import { IconComponent } from '@ods/system'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { MockComponent } from 'ng-mocks'; import { ForwardingButtonComponent } from './forwarding-button.component'; @@ -16,7 +16,7 @@ describe('ForwardingButtonComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ForwardingButtonComponent], - declarations: [MockComponent(ForwardVorgangIconComponent), MockComponent(ButtonWithSpinnerComponent)], + declarations: [MockComponent(IconComponent), MockComponent(ButtonWithSpinnerComponent)], }).compileComponents(); fixture = TestBed.createComponent(ForwardingButtonComponent); diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts index e881014e93..b66d9b2c1a 100644 --- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts +++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts @@ -2,12 +2,12 @@ import { CommandResource } from '@alfa-client/command-shared'; import { EMPTY_STRING, StateResource } from '@alfa-client/tech-shared'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ButtonWithSpinnerComponent } from '@ods/component'; -import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system'; +import { IconComponent, TooltipDirective } from '@ods/system'; @Component({ selector: 'alfa-forwarding-button', standalone: true, - imports: [ButtonWithSpinnerComponent, ForwardVorgangIconComponent, TooltipDirective], + imports: [ButtonWithSpinnerComponent, IconComponent, TooltipDirective], templateUrl: './forwarding-button.component.html', }) export class ForwardingButtonComponent { diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html index 1ab39ddeb6..832c4fdcde 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html @@ -36,7 +36,7 @@ </ods-button-with-spinner> <ng-template #exportNotPossible> <div class="flex items-start gap-2" data-test-id="cannot-export-vorgang"> - <ods-exclamation-icon /> + <ods-icon name="exclamation" fill="error" /> <div> <p class="text-sm font-medium text-error">Vorgang exportieren nicht möglich.</p> <p class="text-sm"> diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts index 56a9ee5d0e..ff4d404d4a 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts @@ -26,7 +26,7 @@ import { getElementFromFixture, mock } from '@alfa-client/test-utils'; import { VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ButtonWithSpinnerComponent } from '@ods/component'; -import { ExclamationIconComponent, SaveIconComponent } from '@ods/system'; +import { IconComponent, SaveIconComponent } from '@ods/system'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { MockComponent } from 'ng-mocks'; @@ -49,7 +49,7 @@ describe('VorgangExportContainerComponent', () => { HasLinkPipe, VorgangExportContainerComponent, MockComponent(ButtonWithSpinnerComponent), - MockComponent(ExclamationIconComponent), + MockComponent(IconComponent), MockComponent(SaveIconComponent), ], providers: [ diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts index 9217c0de90..fafa33cc28 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts @@ -76,7 +76,6 @@ import { DropdownMenuComponent, DropdownMenuTextItemComponent, ErrorMessageComponent, - ExclamationIconComponent, FileIconComponent, IconComponent, MoreIconComponent, @@ -149,7 +148,6 @@ const routes: Routes = [ ButtonComponent, ButtonCardComponent, UndoIconComponent, - ExclamationIconComponent, SaveIconComponent, SendIconComponent, StampIconComponent, -- GitLab