From f5139e661e3acbf4fce1380fe2c10a5347ebb761 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 10 Feb 2025 09:58:23 +0100
Subject: [PATCH] OZG-7474 Rename discard icon
---
alfa-client/libs/design-system/src/index.ts | 2 +-
.../discard-icon.component.spec.ts | 21 -------------------
.../discard-vorgang-icon.component.spec.ts | 21 +++++++++++++++++++
.../discard-vorgang-icon.component.ts} | 4 ++--
.../discard-vorgang-icon.stories.ts} | 10 ++++-----
.../verwerfen-button.component.html | 4 ++--
.../verwerfen-button.component.spec.ts | 4 ++--
.../src/lib/vorgang-detail.module.ts | 4 ++--
8 files changed, 35 insertions(+), 35 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.component.spec.ts
create mode 100644 alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
rename alfa-client/libs/design-system/src/lib/icons/{discard-icon/discard-icon.component.ts => discard-vorgang-icon/discard-vorgang-icon.component.ts} (93%)
rename alfa-client/libs/design-system/src/lib/icons/{discard-icon/discard-icon.stories.ts => discard-vorgang-icon/discard-vorgang-icon.stories.ts} (63%)
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 67b4390634..fb9bd32b7b 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -54,7 +54,7 @@ export * from './lib/icons/check-circle-icon/check-circle-icon.component';
export * from './lib/icons/check-icon/check-icon.component';
export * from './lib/icons/close-icon/close-icon.component';
export * from './lib/icons/delete-finally-icon/delete-finally-icon.component';
-export * from './lib/icons/discard-icon/discard-icon.component';
+export * from './lib/icons/discard-vorgang-icon/discard-vorgang-icon.component';
export * from './lib/icons/edit-icon/edit-icon.component';
export * from './lib/icons/error-icon/error-icon.component';
export * from './lib/icons/exclamation-icon/exclamation-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.component.spec.ts
deleted file mode 100644
index 485cdcd99d..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DiscardIconComponent } from './discard-icon.component';
-
-describe('DiscardIconComponent', () => {
- let component: DiscardIconComponent;
- let fixture: ComponentFixture<DiscardIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [DiscardIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(DiscardIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
new file mode 100644
index 0000000000..42eed91241
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { DiscardVorgangIconComponent } from './discard-vorgang-icon.component';
+
+describe('DiscardVorgangIconComponent', () => {
+ let component: DiscardVorgangIconComponent;
+ let fixture: ComponentFixture<DiscardVorgangIconComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [DiscardVorgangIconComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(DiscardVorgangIconComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
similarity index 93%
rename from alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.component.ts
rename to alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
index 377bf1af5b..1cee910fac 100644
--- a/alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
@@ -4,7 +4,7 @@ import { twMerge } from 'tailwind-merge';
import { IconVariants, iconVariants } from '../iconVariants';
@Component({
- selector: 'ods-discard-icon',
+ selector: 'ods-discard-vorgang-icon',
standalone: true,
imports: [CommonModule],
template: `<svg
@@ -23,7 +23,7 @@ import { IconVariants, iconVariants } from '../iconVariants';
/>
</svg>`,
})
-export class DiscardIconComponent {
+export class DiscardVorgangIconComponent {
@Input() size: IconVariants['size'] = 'medium';
@Input() class: string = '';
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
similarity index 63%
rename from alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.stories.ts
rename to alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
index 9237024932..6c73a8fd59 100644
--- a/alfa-client/libs/design-system/src/lib/icons/discard-icon/discard-icon.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
@@ -1,16 +1,16 @@
import type { Meta, StoryObj } from '@storybook/angular';
-import { DiscardIconComponent } from './discard-icon.component';
+import { DiscardVorgangIconComponent } from './discard-vorgang-icon.component';
-const meta: Meta<DiscardIconComponent> = {
- title: 'Icons/Discard icon',
- component: DiscardIconComponent,
+const meta: Meta<DiscardVorgangIconComponent> = {
+ title: 'Icons/Discard Vorgang icon',
+ component: DiscardVorgangIconComponent,
excludeStories: /.*Data$/,
tags: ['autodocs'],
};
export default meta;
-type Story = StoryObj<DiscardIconComponent>;
+type Story = StoryObj<DiscardVorgangIconComponent>;
export const Default: Story = {
args: { size: 'large' },
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
index b5e8bd07fb..8d663e5e9b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
@@ -33,7 +33,7 @@
size="fit"
(clickEmitter)="verwerfen()"
>
- <ods-discard-icon icon class="fill-text" />
+ <ods-discard-vorgang-icon icon class="fill-text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -43,7 +43,7 @@
variant="outline"
(clickEmitter)="verwerfen()"
>
- <ods-discard-icon icon />
+ <ods-discard-vorgang-icon icon />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
index b751788dcc..ebdb6df88b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { DiscardIconComponent } from '@ods/system';
+import { DiscardVorgangIconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -51,7 +51,7 @@ describe('VerwerfenButtonComponent', () => {
declarations: [
VerwerfenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(DiscardIconComponent),
+ MockComponent(DiscardVorgangIconComponent),
HasLinkPipe,
],
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 dc75d98df3..6c46766049 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
@@ -61,7 +61,7 @@ import {
CheckCircleIconComponent,
CheckIconComponent,
CloseIconComponent,
- DiscardIconComponent,
+ DiscardVorgangIconComponent,
DropdownMenuComponent,
DropdownMenuTextItemComponent,
EditIconComponent,
@@ -188,7 +188,7 @@ const routes: Routes = [
ForwardByOzgcloudButtonContainerComponent,
TooltipDirective,
EditIconComponent,
- DiscardIconComponent,
+ DiscardVorgangIconComponent,
],
declarations: [
VorgangDetailPageComponent,
--
GitLab