diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html index 346b7322ddeef11cd3c74b98dc1577243bf7714e..3cc94bd5121130e0b2cdd8ed60d8023ea858a266 100644 --- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html +++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html @@ -42,7 +42,7 @@ data-test-id="add-mapping" (clickEmitter)="formService.addMapping()" > - <ods-plus-icon icon class="fill-whitetext" /> + <ods-icon icon name="plus" fill="whitetext" /> </ods-button> <div class="mt-4 flex gap-4"> diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts index 2abba71105c82b854633725a837836ec7f278f0a..bc0591357508d2365c14482d79e837367cb0ba95 100644 --- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts +++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts @@ -13,7 +13,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { expect } from '@jest/globals'; import { TextEditorComponent } from '@ods/component'; -import { ButtonComponent, PlusIconComponent } from '@ods/system'; +import { ButtonComponent, IconComponent } from '@ods/system'; import { MockComponent } from 'ng-mocks'; import { of } from 'rxjs'; import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test'; @@ -57,7 +57,7 @@ describe('AggregationMappingFormComponent', () => { AggregationMappingFormComponent, MockComponent(TextEditorComponent), MockComponent(ButtonComponent), - MockComponent(PlusIconComponent), + MockComponent(IconComponent), MockComponent(AdminSaveButtonComponent), MockComponent(AdminCancelButtonComponent), MockComponent(AggregationMappingFieldListFormComponent), diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts index 4865e5521255cca5a9d421d8fc7a42e4764d433a..40cb4986f17ef94ffd0da4b0242216ef944a6d68 100644 --- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts +++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts @@ -5,7 +5,7 @@ import { AsyncPipe } from '@angular/common'; import { Component, inject } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { SpinnerComponent, TextEditorComponent } from '@ods/component'; -import { ButtonComponent, PlusIconComponent } from '@ods/system'; +import { ButtonComponent, IconComponent } from '@ods/system'; import { Observable } from 'rxjs'; import { AggregationMappingFieldListFormComponent } from './aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component'; import { AggregationMappingFormservice } from './aggregation-mapping.formservice'; @@ -16,7 +16,7 @@ import { AggregationMappingFormservice } from './aggregation-mapping.formservice standalone: true, imports: [ ButtonComponent, - PlusIconComponent, + IconComponent, ReactiveFormsModule, AdminSaveButtonComponent, AdminCancelButtonComponent, diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts index 64f63f23282e5c63bc1d8225b7e815f963477c25..7f810265e87984259d02d079236ee65dc7e8442a 100644 --- a/alfa-client/libs/design-system/src/index.ts +++ b/alfa-client/libs/design-system/src/index.ts @@ -49,10 +49,8 @@ export * from './lib/icons/external-unit-icon/external-unit-icon.component'; export * from './lib/icons/file-icon/file-icon.component'; export * from './lib/icons/iconVariants'; export * from './lib/icons/mailbox-icon/mailbox-icon.component'; -export * from './lib/icons/orga-unit-icon/orga-unit-icon.component'; export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component'; export * from './lib/icons/person-icon/person-icon.component'; -export * from './lib/icons/plus-icon/plus-icon.component'; export * from './lib/icons/public-administration-icon/public-administration-icon.component'; export * from './lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component'; export * from './lib/icons/save-icon/save-icon.component'; diff --git a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.spec.ts deleted file mode 100644 index c17ebd9f4d40f16a3c67a37056ee80049605b70b..0000000000000000000000000000000000000000 --- a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-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 { OrgaUnitIconComponent } from './orga-unit-icon.component'; - -describe('OrgaUnitIconComponent', () => { - let component: OrgaUnitIconComponent; - let fixture: ComponentFixture<OrgaUnitIconComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [OrgaUnitIconComponent], - }).compileComponents(); - - fixture = TestBed.createComponent(OrgaUnitIconComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.ts deleted file mode 100644 index 83f064cbb0e7bce485040eacf4bc4c34e837b8f7..0000000000000000000000000000000000000000 --- a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-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-orga-unit-icon', - standalone: true, - imports: [NgClass], - template: `<svg - xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 24 24" - fill="currentColor" - [ngClass]="twMerge(iconVariants({ size }), 'fill-text', class)" - > - <path - fill-rule="evenodd" - d="M3 2.25a.75.75 0 0 0 0 1.5v16.5h-.75a.75.75 0 0 0 0 1.5H15v-18a.75.75 0 0 0 0-1.5H3ZM6.75 19.5v-2.25a.75.75 0 0 1 .75-.75h3a.75.75 0 0 1 .75.75v2.25a.75.75 0 0 1-.75.75h-3a.75.75 0 0 1-.75-.75ZM6 6.75A.75.75 0 0 1 6.75 6h.75a.75.75 0 0 1 0 1.5h-.75A.75.75 0 0 1 6 6.75ZM6.75 9a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM6 12.75a.75.75 0 0 1 .75-.75h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 6a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75Zm-.75 3.75A.75.75 0 0 1 10.5 9h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 12a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM16.5 6.75v15h5.25a.75.75 0 0 0 0-1.5H21v-12a.75.75 0 0 0 0-1.5h-4.5Zm1.5 4.5a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Zm.75 2.25a.75.75 0 0 0-.75.75v.008c0 .414.336.75.75.75h.008a.75.75 0 0 0 .75-.75v-.008a.75.75 0 0 0-.75-.75h-.008ZM18 17.25a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Z" - clip-rule="evenodd" - /> - </svg>`, -}) -export class OrgaUnitIconComponent { - @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/orga-unit-icon/orga-unit-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.stories.ts deleted file mode 100644 index 84159a06910ee86a2b688badfbfe834eb10c5382..0000000000000000000000000000000000000000 --- a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-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 { OrgaUnitIconComponent } from './orga-unit-icon.component'; - -const meta: Meta<OrgaUnitIconComponent> = { - title: 'Icons/Orgaunit icon', - component: OrgaUnitIconComponent, - excludeStories: /.*Data$/, - tags: ['autodocs'], -}; - -export default meta; -type Story = StoryObj<OrgaUnitIconComponent>; - -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/plus-icon/plus-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.spec.ts deleted file mode 100644 index 1f91573b1d3ec90ca862afc9c4d6f502dab9b6f5..0000000000000000000000000000000000000000 --- a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { PlusIconComponent } from './plus-icon.component'; - -describe('PlusIconComponent', () => { - let component: PlusIconComponent; - let fixture: ComponentFixture<PlusIconComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [PlusIconComponent], - }).compileComponents(); - - fixture = TestBed.createComponent(PlusIconComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.ts deleted file mode 100644 index f5816ec7f3952297c69bf3905b67d9a1cb557748..0000000000000000000000000000000000000000 --- a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgClass } from '@angular/common'; -import { Component, Input } from '@angular/core'; -import { twMerge } from 'tailwind-merge'; -import { iconVariants, IconVariants } from '../iconVariants'; - -@Component({ - selector: 'ods-plus-icon', - standalone: true, - imports: [NgClass], - template: `<svg - [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]" - aria-hidden="true" - viewBox="0 0 24 24" - fill="none" - xmlns="http://www.w3.org/2000/svg" - > - <path d="M11 13H5V11H11V5H13V11H19V13H13V19H11V13Z" /> - </svg>`, -}) -export class PlusIconComponent { - @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/plus-icon/plus-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.stories.ts deleted file mode 100644 index dbf9d8acaa8669520c43d5541d7d2a9f21b44f97..0000000000000000000000000000000000000000 --- a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-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 { PlusIconComponent } from './plus-icon.component'; - -const meta: Meta<PlusIconComponent> = { - title: 'Icons/Plus icon', - component: PlusIconComponent, - excludeStories: /.*Data$/, - tags: ['autodocs'], -}; - -export default meta; -type Story = StoryObj<PlusIconComponent>; - -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/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html index eff1422c21167306dee76fb8185217b4475d9a7a..0d36e972d6676af3f3f214893b8ec15af0c34d36 100644 --- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html +++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html @@ -46,7 +46,7 @@ variant="outline" (clickEmitter)="openPostfachNachrichtenDialog.emit()" > - <ods-plus-icon icon /> + <ods-icon icon name="plus" /> </ods-button> } @if (!showAsIconButton && !text && toolTip) { @@ -58,7 +58,7 @@ size="fit" (clickEmitter)="openPostfachNachrichtenDialog.emit()" > - <ods-plus-icon icon /> + <ods-icon icon name="plus" /> </ods-button> } } diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts index 10a405d1058f6fb7f5321e823b602614b294c5e3..3ada8d77ebe66c173653ddc4e09009717382fc7c 100644 --- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts +++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts @@ -25,7 +25,7 @@ import { PostfachMailListLinkRel } from '@alfa-client/postfach-shared'; import { EMPTY_STRING, HasLinkPipe, createStateResource } from '@alfa-client/tech-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { faker } from '@faker-js/faker'; -import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system'; +import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system'; import { createCommandResource } from 'libs/command-shared/test/command'; import { createPostfachMailListResource } from 'libs/postfach-shared/test/postfach'; import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test'; @@ -46,7 +46,7 @@ describe('PostfachMailButtonComponent', () => { PostfachMailButtonComponent, HasLinkPipe, MockComponent(ButtonComponent), - MockComponent(PlusIconComponent), + MockComponent(IconComponent), MockComponent(MailboxIconComponent), MockDirective(TooltipDirective), ], diff --git a/alfa-client/libs/postfach/src/lib/postfach.module.ts b/alfa-client/libs/postfach/src/lib/postfach.module.ts index 88fd93b41fff801fb308bfc6a227483cc5042fc4..a8a162fe8dc3101bfe6887bd904a0da0f5cf7f63 100644 --- a/alfa-client/libs/postfach/src/lib/postfach.module.ts +++ b/alfa-client/libs/postfach/src/lib/postfach.module.ts @@ -24,7 +24,17 @@ import { BinaryFileModule } from '@alfa-client/binary-file'; import { ON_PAGE, PostfachSharedModule } from '@alfa-client/postfach-shared'; import { ConvertForDataTestPipe, FormatDateWithTimePipe, HasLinkPipe, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared'; -import { BackButtonComponent, CheckboxEnumEditorComponent, IconButtonWithSpinnerComponent, OzgcloudIconComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, SubnavigationComponent, TextAreaEditorComponent, } from '@alfa-client/ui'; +import { + BackButtonComponent, + CheckboxEnumEditorComponent, + IconButtonWithSpinnerComponent, + OzgcloudIconComponent, + OzgcloudStrokedButtonWithSpinnerComponent, + OzgcloudTextEditorComponent, + SpinnerComponent, + SubnavigationComponent, + TextAreaEditorComponent, +} from '@alfa-client/ui'; import { UserProfileModule } from '@alfa-client/user-profile'; import { VorgangSharedUiModule } from '@alfa-client/vorgang-shared-ui'; import { CommonModule } from '@angular/common'; @@ -32,7 +42,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIcon } from '@angular/material/icon'; import { RouterModule, Routes } from '@angular/router'; -import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system'; +import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system'; import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component'; import { PostfachMailButtonContainerComponent } from './postfach-mail-button-container/postfach-mail-button-container.component'; import { PostfachMailButtonComponent } from './postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component'; @@ -85,7 +95,7 @@ const routes: Routes = [ BackButtonComponent, IconButtonWithSpinnerComponent, ButtonComponent, - PlusIconComponent, + IconComponent, MailboxIconComponent, TooltipDirective, MultiFileUploadComponent, diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html index 6fde7ac98e2140dbdf500d44ae877b8b66a3234a..bc133076150c031158642f2bb903b549330b0240 100644 --- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html +++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html @@ -39,7 +39,7 @@ </ods-button-with-spinner> } @else { <ods-button-with-spinner data-test-id="create-wiedervorlage" text="Wiedervorlage" variant="outline"> - <ods-plus-icon icon /> + <ods-icon icon name="plus" /> </ods-button-with-spinner> } </a> diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts index 5060ed010141168e658dd40bbfde3dd6092bdbda..a17d8393d32e00090fd98328a77e4cc353598293 100644 --- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts +++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts @@ -26,7 +26,7 @@ import { WiedervorlageListLinkRel } from '@alfa-client/wiedervorlage-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { ButtonWithSpinnerComponent } from '@ods/component'; -import { PlusIconComponent, UpdateIconComponent } from '@ods/system'; +import { IconComponent, UpdateIconComponent } from '@ods/system'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { createWiedervorlageListResource } from 'libs/wiedervorlage-shared/test/wiedervorlage'; import { MockComponent } from 'ng-mocks'; @@ -44,7 +44,7 @@ describe('WiedervorlageCreateButtonComponent', () => { WiedervorlageCreateButtonComponent, HasLinkPipe, MockComponent(ButtonWithSpinnerComponent), - MockComponent(PlusIconComponent), + MockComponent(IconComponent), MockComponent(UpdateIconComponent), ], imports: [RouterTestingModule], diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts index ad7d40f1289323f1b0dcb4805d11ca482d8052d8..bc76593bcd9b2c52c0905e7d0cd69b07937b89d6 100644 --- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts +++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts @@ -52,7 +52,7 @@ import { MatIcon } from '@angular/material/icon'; import { MatTooltip } from '@angular/material/tooltip'; import { RouterModule, Routes } from '@angular/router'; import { ButtonWithSpinnerComponent } from '@ods/component'; -import { IconComponent, PlusIconComponent, SaveIconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system'; +import { IconComponent, SaveIconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system'; import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component'; import { CreateWiedervorlageButtonContainerComponent } from './create-wiedervorlage-button-container/create-wiedervorlage-button-container.component'; import { ErledigenButtonContainerComponent } from './erledigen-button-container/erledigen-button-container.component'; @@ -112,7 +112,6 @@ const routes: Routes = [ ButtonWithSpinnerComponent, TooltipDirective, UpdateIconComponent, - PlusIconComponent, IconComponent, SaveIconComponent, MultiFileUploadComponent,