diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 0931407fea07f701b302757de71ec4f78ab42a58..398b34fb53acbde23ae4426d517fdc95834a5655 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -526,7 +526,7 @@
variant="bescheid_save"
[fullWidthText]="true"
>
- <ods-save-icon />
+ <ods-icon name="save" />
</ods-radio-button-card>
</div>
</form>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 6c8542f5fc0ffeed92ae24d1d895febed52b341d..eed0bd055a49d169478cdce1e7d72c349053664c 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -38,7 +38,6 @@ import {
IconComponent,
InstantSearchComponent,
RadioButtonCardComponent,
- SaveIconComponent,
SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
@@ -74,7 +73,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
RadioButtonCardComponent,
ReactiveFormsModule,
InstantSearchComponent,
- SaveIconComponent,
SendIconComponent,
StampIconComponent,
SpinnerIconComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
index b9ebc81cb5beee11821a7ecdba7e340bc1883fbe..d74b1b2bcda18fee9b243479d885236d46b8a09a 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
@@ -26,7 +26,7 @@
(change)="changeSendBy(bescheidSendBy.MANUAL)"
data-test-id="save-button"
>
- <ods-save-icon size="large"></ods-save-icon>
+ <ods-icon name="save" size="large" />
</ods-radio-button-card>
}
}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
index fc058c004dce9f0e1c8e22efc3960498c03e0d90..1af30b671fdb5d3d4c5ccf37fb33d44934dfef1e 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
@@ -8,7 +8,7 @@ import {
} from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { RadioButtonCardComponent, SaveIconComponent, SendIconComponent } from '@ods/system';
+import { IconComponent, RadioButtonCardComponent, SendIconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { createBescheidResource } from '../../../../../../../bescheid-shared/src/test/bescheid';
import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
@@ -34,7 +34,7 @@ describe('BescheidWizardBescheidVersendenFormComponent', () => {
BescheidWizardBescheidVersendenFormComponent,
MockComponent(RadioButtonCardComponent),
MockComponent(SendIconComponent),
- MockComponent(SaveIconComponent),
+ MockComponent(IconComponent),
HasLinkPipe,
ReactiveFormsModule,
],
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index f025ab427add36faa93608c94a301e04da69b782..eccdfd5ac6abe292f3591456bfa0f5aac01ee849 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -63,7 +63,6 @@ import {
ButtonComponent,
IconComponent,
RadioButtonCardComponent,
- SaveIconComponent,
SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
@@ -130,7 +129,6 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
AttachmentWrapperComponent,
FileUploadEditorComponent,
SendIconComponent,
- SaveIconComponent,
TextEditorComponent,
TextareaEditorComponent,
ConvertForDataTestPipe,
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index b8adf8f12e632fbfa947ee5e9e9fca18068c468f..d56d50c5cebaef7e6a9e15d443516575aaef4376 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -34,7 +34,6 @@ import {
ExternalUnitIconComponent,
IconComponent,
PublicAdministrationIconComponent,
- SaveIconComponent,
SearchIconComponent,
UsersIconComponent,
} from '@ods/system';
@@ -53,7 +52,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
imports: [
CommonModule,
ButtonComponent,
- SaveIconComponent,
IconComponent,
SearchIconComponent,
CollaborationSharedModule,
diff --git a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
index 4f4cde74ff16d7cf22bd3f3db506b369e79925c2..a9c879b2d79db8a89c27046cb0f58888788ba961 100644
--- a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
@@ -23,6 +23,8 @@
*/
import { createEmptyStateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
import { DownloadButtonComponent } from './download-button.component';
describe('DownloadButtonComponent', () => {
@@ -31,7 +33,7 @@ describe('DownloadButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [DownloadButtonComponent],
+ imports: [DownloadButtonComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(DownloadButtonComponent);
diff --git a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
index 14473d08c588ba1a2ee9d63a240cb30ca451d48b..c06c96a11178e45f07a8a133a8634b10a4eaca05 100644
--- a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
+++ b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
@@ -25,7 +25,7 @@ import { CommandResource } from '@alfa-client/command-shared';
import { StateResource } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ButtonComponent, SaveIconComponent, iconVariants } from '@ods/system';
+import { ButtonComponent, IconComponent, iconVariants } from '@ods/system';
import { VariantProps } from 'class-variance-authority';
type IconVariants = VariantProps<typeof iconVariants>;
@@ -33,7 +33,7 @@ type IconVariants = VariantProps<typeof iconVariants>;
@Component({
selector: 'ods-download-button',
standalone: true,
- imports: [CommonModule, ButtonComponent, SaveIconComponent],
+ imports: [CommonModule, ButtonComponent, IconComponent],
template: `<ods-button
[dataTestId]="dataTestId"
variant="ghost"
@@ -42,7 +42,7 @@ type IconVariants = VariantProps<typeof iconVariants>;
[isLoading]="isLoading"
(click)="clickEmitter.emit()"
>
- <ods-save-icon icon [size]="size" class="fill-text"></ods-save-icon>
+ <ods-icon icon name="save" [size]="size" fill="text" />
</ods-button>`,
})
export class DownloadButtonComponent {
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 7f810265e87984259d02d079236ee65dc7e8442a..bbef2a633421a4d1b12df21beca8c8f6d61b63e7 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -52,8 +52,6 @@ export * from './lib/icons/mailbox-icon/mailbox-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/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';
export * from './lib/icons/search-icon/search-icon.component';
export * from './lib/icons/send-icon/send-icon.component';
export * from './lib/icons/settings-icon/settings-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
index ce3a2d8cf0306a232a39217c4ec972e3f0d5b25d..6ab4a39444a60e22fa59c6350f5e4d1583fa7106 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
@@ -24,7 +24,6 @@
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
import { AttachmentComponent } from '../attachment/attachment.component';
-import { SaveIconComponent } from '../icons/save-icon/save-icon.component';
import { AttachmentHeaderComponent } from './attachment-header.component';
const meta: Meta<AttachmentHeaderComponent> = {
@@ -39,7 +38,7 @@ const meta: Meta<AttachmentHeaderComponent> = {
},
decorators: [
moduleMetadata({
- imports: [AttachmentHeaderComponent, AttachmentComponent, SaveIconComponent],
+ imports: [AttachmentHeaderComponent, AttachmentComponent],
}),
],
excludeStories: /.*Data$/,
@@ -62,6 +61,7 @@ export const Default: Story = {
props: args,
template: `<ods-attachment-header ${argsToTemplate(args)}>
<button action-buttons>
+ //TODO OZG-7707
<ods-save-icon size="small" class="fill-text" />
</button>
</ods-attachment-header>`,
diff --git a/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
index 0280a184082284c7dfc6907c57e72e8517ec04fb..4ea7a26b7956c2a1d0ca00a389e1748221d891a5 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
@@ -25,7 +25,6 @@ import { moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
import { AttachmentHeaderComponent } from '../attachment-header/attachment-header.component';
import { AttachmentComponent } from '../attachment/attachment.component';
-import { SaveIconComponent } from '../icons/save-icon/save-icon.component';
import { AttachmentWrapperComponent } from './attachment-wrapper.component';
const meta: Meta<AttachmentWrapperComponent> = {
@@ -40,7 +39,7 @@ const meta: Meta<AttachmentWrapperComponent> = {
},
decorators: [
moduleMetadata({
- imports: [AttachmentWrapperComponent, AttachmentComponent, SaveIconComponent, AttachmentHeaderComponent],
+ imports: [AttachmentWrapperComponent, AttachmentComponent, AttachmentHeaderComponent],
}),
],
excludeStories: /.*Data$/,
@@ -55,6 +54,7 @@ export const Default: Story = {
template: `<ods-attachment-wrapper>
<ods-attachment-header title="Anhänge">
<button action-buttons>
+ //TODO OZG-7707
<ods-save-icon size="small" class="fill-text" />
</button>
</ods-attachment-header>
diff --git a/alfa-client/libs/design-system/src/lib/button/button.stories.ts b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
index a04f3f564a88685399cfca58d4c578066f6d7e28..fa8a838ccf850cc094f5b32a2bdfa08abbddf71e 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
@@ -23,7 +23,6 @@
*/
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { SaveIconComponent } from '../icons/save-icon/save-icon.component';
import { ButtonComponent } from './button.component';
const meta: Meta<ButtonComponent> = {
@@ -31,7 +30,7 @@ const meta: Meta<ButtonComponent> = {
component: ButtonComponent,
decorators: [
moduleMetadata({
- imports: [ButtonComponent, SaveIconComponent],
+ imports: [ButtonComponent],
}),
],
excludeStories: /.*Data$/,
@@ -81,6 +80,7 @@ export const PrimaryWithIcon: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
+ //TODO OZG-7707
<ods-save-icon icon size="small" class="fill-whitetext" />
</ods-button>`,
}),
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
index 122285175c192a415ffed0b4f26de97bb9075ae8..fe7c462d60d072d4854d8f300c2c556a34175850 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
@@ -23,7 +23,6 @@
*/
import { argsToTemplate, componentWrapperDecorator, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { UserIconComponent } from '../../icons/user-icon/user-icon.component';
import { DropdownMenuButtonItemComponent } from '../dropdown-menu-button-item/dropdown-menu-button-item.component';
import { DropdownMenuItemComponent } from '../dropdown-menu-item/dropdown-menu-item.component';
@@ -40,7 +39,6 @@ const meta: Meta<DropdownMenuComponent> = {
DropdownMenuItemComponent,
DropdownMenuButtonItemComponent,
DropdownMenuTextItemComponent,
- SaveIconComponent,
UserIconComponent,
],
}),
@@ -94,6 +92,7 @@ export const ButtonWithIcon: Story = {
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p>
<ods-dropdown-menu-button-item caption="Lorem">
+ //TODO OZG-7707
<ods-save-icon icon size="small" />
</ods-dropdown-menu-button-item>
<ods-dropdown-menu-button-item caption="Lorem ipsum dolor sit amet">
diff --git a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
index fbdbc9ab29768ae344486695c5d9d1a5ba6656ef..454418b34bb192648b757f8e8ac4dc8b050b2c39 100644
--- a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
@@ -25,7 +25,6 @@ import { CommonModule } from '@angular/common';
import { FormGroupDirective } from '@angular/forms';
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { SendIconComponent } from '../../icons/send-icon/send-icon.component';
import { StampIconComponent } from '../../icons/stamp-icon/stamp-icon.component';
import { RadioButtonCardComponent } from './radio-button-card.component';
@@ -35,7 +34,7 @@ const meta: Meta<RadioButtonCardComponent> = {
component: RadioButtonCardComponent,
decorators: [
moduleMetadata({
- imports: [CommonModule, RadioButtonCardComponent, StampIconComponent, SaveIconComponent, SendIconComponent],
+ imports: [CommonModule, RadioButtonCardComponent, StampIconComponent, SendIconComponent],
providers: [FormGroupDirective],
}),
],
@@ -102,7 +101,9 @@ export const Message: Story = {
name="nachrichtOrManual"
variant="bescheid_save"
[fullWidthText]="true"
- ><ods-save-icon></ods-save-icon
+ >
+ //TODO OZG-7707
+ <ods-save-icon></ods-save-icon
></ods-radio-button-card>
</div>`,
}),
diff --git a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.spec.ts
deleted file mode 100644
index e8655275d9a25c7cc96ad3823668079bf2518bf0..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { RequestVorgangDeletionIconComponent } from './request-vorgang-deletion-icon.component';
-
-describe('RequestVorgangDeletionIconComponent', () => {
- let component: RequestVorgangDeletionIconComponent;
- let fixture: ComponentFixture<RequestVorgangDeletionIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [RequestVorgangDeletionIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(RequestVorgangDeletionIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.ts
deleted file mode 100644
index ca9dd83e0e886b1c28dd535951326e4880db7928..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-request-vorgang-deletion-icon',
- standalone: true,
- imports: [CommonModule],
- 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="M11.75 8H13.75V12.15L15.35 10.6L16.75 12L12.75 16L8.75 12L10.15 10.6L11.75 12.15V8Z" />
- <path
- d="M7.75 21C7.2 21 6.72917 20.8042 6.3375 20.4125C5.94583 20.0208 5.75 19.55 5.75 19V6H4.75V4H9.75V3H15.75V4H20.75V6H19.75V19C19.75 19.55 19.5542 20.0208 19.1625 20.4125C18.7708 20.8042 18.3 21 17.75 21H7.75ZM17.75 6H7.75V19H17.75V6Z"
- />
- </svg>`,
-})
-export class RequestVorgangDeletionIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.stories.ts
deleted file mode 100644
index eed9f6bc607a9bf3483a158f6e89e850ab475181..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { RequestVorgangDeletionIconComponent } from './request-vorgang-deletion-icon.component';
-
-const meta: Meta<RequestVorgangDeletionIconComponent> = {
- title: 'Icons/Request Vorgang deletion icon',
- component: RequestVorgangDeletionIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<RequestVorgangDeletionIconComponent>;
-
-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/save-icon/save-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.spec.ts
deleted file mode 100644
index c3763a05e494eb1a78cdb0561ea294cea3dd4924..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-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 { SaveIconComponent } from './save-icon.component';
-
-describe('SaveIconComponent', () => {
- let component: SaveIconComponent;
- let fixture: ComponentFixture<SaveIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [SaveIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(SaveIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
deleted file mode 100644
index bb788b58a02f50a80369e702d153d17f83995e00..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
+++ /dev/null
@@ -1,51 +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-save-icon',
- standalone: true,
- imports: [NgClass],
- template: ` <svg
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- viewBox="0 0 32 32"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M25.3333 16V25.3333H6.66667V16H4V25.3333C4 26.8 5.2 28 6.66667 28H25.3333C26.8 28 28 26.8 28 25.3333V16H25.3333ZM17.3333 16.8933L20.7867 13.4533L22.6667 15.3333L16 22L9.33333 15.3333L11.2133 13.4533L14.6667 16.8933V4H17.3333V16.8933Z"
- />
- </svg>`,
-})
-export class SaveIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.stories.ts
deleted file mode 100644
index 11dea2d96c856a4052f0c196ceeb87fc4e2855b3..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-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 { SaveIconComponent } from './save-icon.component';
-
-const meta: Meta<SaveIconComponent> = {
- title: 'Icons/Save icon',
- component: SaveIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<SaveIconComponent>;
-
-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/loesch-anforderung/src/lib/loesch-anforderung.module.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
index b3de65bde7a96c161de847b607a671a7ac703bbe..52ad122fb7721f0026913c762f8d4f921c08715d 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
@@ -28,12 +28,7 @@ import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import {
- IconComponent,
- RequestVorgangDeletionIconComponent,
- TooltipDirective,
- UndoRequestVorgangDeletionIconComponent,
-} from '@ods/system';
+import { IconComponent, TooltipDirective, UndoRequestVorgangDeletionIconComponent } from '@ods/system';
import { EndgueltigLoeschenButtonContainerComponent } from './endgueltig-loeschen-button-container/endgueltig-loeschen-button-container.component';
import { EndgueltigLoeschenButtonComponent } from './endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component';
import { LoeschAnforderungZuruecknehmenButtonContainerComponent } from './loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button-container.component';
@@ -49,7 +44,6 @@ import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button-co
OzgcloudStrokedButtonWithSpinnerComponent,
IconButtonWithSpinnerComponent,
HasLinkPipe,
- RequestVorgangDeletionIconComponent,
ButtonWithSpinnerComponent,
IconComponent,
UndoRequestVorgangDeletionIconComponent,
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
index 869474ca105b45602a1d2449b5f160533b759cd5..95f199515740f89acc8b8112148e6d3d37e8f421 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
@@ -33,7 +33,7 @@
size="fit"
(clickEmitter)="loeschenAnfordern.emit()"
>
- <ods-request-vorgang-deletion-icon icon class="fill-text" />
+ <ods-icon icon name="request-vorgang-deletion" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -43,6 +43,6 @@
variant="outline"
(clickEmitter)="loeschenAnfordern.emit()"
>
- <ods-request-vorgang-deletion-icon icon />
+ <ods-icon icon name="request-vorgang-deletion" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
index 41d80aba2d58565dd62feb31c0b9cc9cf8aa2fd6..b4a7afd745db2dd2ae2fd0d3e6d3bd0b1861370f 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
@@ -24,7 +24,7 @@
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { RequestVorgangDeletionIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, MockDirective } from 'ng-mocks';
import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button.component';
@@ -41,8 +41,8 @@ describe('LoeschenAnfordernButtonComponent', () => {
declarations: [
LoeschenAnfordernButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(RequestVorgangDeletionIconComponent),
MockDirective(TooltipDirective),
+ MockComponent(IconComponent),
],
}).compileComponents();
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 832c4fdcde21324a39491c31137d7263e45f010d..d89737b377d3f293e1209602894d4ee1de8a4486 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
@@ -32,7 +32,7 @@
variant="outline"
text="Herunterladen"
>
- <ods-save-icon icon />
+ <ods-icon icon name="save" />
</ods-button-with-spinner>
<ng-template #exportNotPossible>
<div class="flex items-start gap-2" data-test-id="cannot-export-vorgang">
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 ff4d404d4ae1d80f131aff9120759340d0a460d6..d2a5387a27455b63aa848cbc4ae59d52f5746e28 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 { IconComponent, SaveIconComponent } from '@ods/system';
+import { IconComponent } 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';
@@ -50,7 +50,6 @@ describe('VorgangExportContainerComponent', () => {
VorgangExportContainerComponent,
MockComponent(ButtonWithSpinnerComponent),
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 35d7845202949066f7a462df258310de623b3e50..19e384ed9a2bf7d1cb897555d11222599c2e2a5e 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
@@ -79,7 +79,6 @@ import {
FileIconComponent,
IconComponent,
RadioButtonCardComponent,
- SaveIconComponent,
SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
@@ -147,7 +146,6 @@ const routes: Routes = [
ButtonComponent,
ButtonCardComponent,
UndoIconComponent,
- SaveIconComponent,
SendIconComponent,
StampIconComponent,
SpinnerIconComponent,
diff --git a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
index 231640ded0433d236945ca15247c90bdc3273231..55b017c0a3f40d6099cc300ca6fe77467eaabaed 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
@@ -33,7 +33,7 @@
size="fit"
dataTestId="speichern-icon-button"
>
- <ods-save-icon icon class="fill-text" />
+ <ods-icon icon name="save" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -43,6 +43,6 @@
variant="outline"
dataTestId="speichern-button"
>
- <ods-save-icon icon />
+ <ods-icon icon name="save" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts
index e5090f94ee1d5a9a24dd5e603e10f726e03ef5e0..330c99e7f5b9d1862ef91bf455437a9d2a57c49e 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts
@@ -30,7 +30,7 @@ import { WiedervorlageService } from '@alfa-client/wiedervorlage-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { SaveIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
import { createCommandResource } from 'libs/command-shared/test/command';
import { MockComponent } from 'ng-mocks';
@@ -56,7 +56,7 @@ describe('SubmitWiedervorlageButtonComponent', () => {
SubmitWiedervorlageButtonComponent,
MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(SaveIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
index bc76593bcd9b2c52c0905e7d0cd69b07937b89d6..aa33ff68ccd9ddc2ad4faf6620a9c631199bb95c 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, SaveIconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system';
+import { IconComponent, 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';
@@ -113,7 +113,6 @@ const routes: Routes = [
TooltipDirective,
UpdateIconComponent,
IconComponent,
- SaveIconComponent,
MultiFileUploadComponent,
],
declarations: [