OZG-7707 replace more icons

- undo request vorgang deletion icon
- update icon

alfa-client/libs/design-system/src/index.ts

@@ -53,8 +53,6 @@ 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/spinner-icon/spinner-icon.component';
-export * from './lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component';
-export * from './lib/icons/update-icon/update-icon.component';
 export * from './lib/icons/user-icon/user-icon.component';
 export * from './lib/icons/users-icon/users-icon.component';
 export * from './lib/instant-search/instant-search/instant-search.component';

alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.spec.ts

-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UndoRequestVorgangDeletionIconComponent } from './undo-request-vorgang-deletion-icon.component';
-
-describe('UndoRequestVorgangDeletionIconComponent', () => {
-  let component: UndoRequestVorgangDeletionIconComponent;
-  let fixture: ComponentFixture<UndoRequestVorgangDeletionIconComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [UndoRequestVorgangDeletionIconComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(UndoRequestVorgangDeletionIconComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.ts

-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
-  selector: 'ods-undo-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 16H13.75V11.85L15.35 13.4L16.75 12L12.75 8L8.75 12L10.15 13.4L11.75 11.85V16ZM7.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 UndoRequestVorgangDeletionIconComponent {
-  @Input() size: IconVariants['size'] = 'medium';
-  @Input() class: string = '';
-
-  readonly iconVariants = iconVariants;
-  readonly twMerge = twMerge;
-}

alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.stories.ts

-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { UndoRequestVorgangDeletionIconComponent } from './undo-request-vorgang-deletion-icon.component';
-
-const meta: Meta<UndoRequestVorgangDeletionIconComponent> = {
-  title: 'Icons/Undo request vorgang deletion icon',
-  component: UndoRequestVorgangDeletionIconComponent,
-  excludeStories: /.*Data$/,
-  tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<UndoRequestVorgangDeletionIconComponent>;
-
-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' },
-      },
-    },
-  },
-};

alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.spec.ts

-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UpdateIconComponent } from './update-icon.component';
-
-describe('UpdateIconComponent', () => {
-  let component: UpdateIconComponent;
-  let fixture: ComponentFixture<UpdateIconComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [UpdateIconComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(UpdateIconComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.ts

-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
-  selector: 'ods-update-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="M21.75 10.12H14.97L17.71 7.3C14.98 4.6 10.56 4.5 7.83 7.2C5.1 9.91 5.1 14.28 7.83 16.99C10.56 19.7 14.98 19.7 17.71 16.99C19.07 15.65 19.75 14.08 19.75 12.1H21.75C21.75 14.08 20.87 16.65 19.11 18.39C15.6 21.87 9.9 21.87 6.39 18.39C2.89 14.92 2.86 9.28 6.37 5.81C9.88 2.34 15.51 2.34 19.02 5.81L21.75 3V10.12ZM13.25 8V12.25L16.75 14.33L16.03 15.54L11.75 13V8H13.25Z"
-    />
-  </svg>`,
-})
-export class UpdateIconComponent {
-  @Input() size: IconVariants['size'] = 'medium';
-  @Input() class: string = '';
-
-  readonly iconVariants = iconVariants;
-  readonly twMerge = twMerge;
-}

alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.stories.ts

-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { UpdateIconComponent } from './update-icon.component';
-
-const meta: Meta<UpdateIconComponent> = {
-  title: 'Icons/Update icon',
-  component: UpdateIconComponent,
-  excludeStories: /.*Data$/,
-  tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<UpdateIconComponent>;
-
-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' },
-      },
-    },
-  },
-};

alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html

@@ -33,7 +33,7 @@
     size="fit"
     (clickEmitter)="loeschAnforderungZuruecknehmen.emit()"
   >
-    <ods-undo-request-vorgang-deletion-icon icon class="fill-text" />
+    <ods-icon icon name="undo-request-vorgang-deletion" fill="text" />
   </ods-button-with-spinner>
 } @else {
   <ods-button-with-spinner
@@ -43,6 +43,6 @@
     variant="outline"
     (clickEmitter)="loeschAnforderungZuruecknehmen.emit()"
   >
-    <ods-undo-request-vorgang-deletion-icon icon />
+    <ods-icon icon name="undo-request-vorgang-deletion" />
   </ods-button-with-spinner>
 }

alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-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 { TooltipDirective, UndoRequestVorgangDeletionIconComponent } 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 { LoeschAnforderungZuruecknehmenButtonComponent } from './loesch-anforderung-zuruecknehmen-button.component';
@@ -41,7 +41,7 @@ describe('LoeschAnforderungZuruecknehmenButtonComponent', () => {
       declarations: [
         LoeschAnforderungZuruecknehmenButtonComponent,
         MockComponent(ButtonWithSpinnerComponent),
-        MockComponent(UndoRequestVorgangDeletionIconComponent),
+        MockComponent(IconComponent),
         MockDirective(TooltipDirective),
       ],
     }).compileComponents();

alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts

@@ -28,7 +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, TooltipDirective, UndoRequestVorgangDeletionIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } 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';
@@ -46,7 +46,6 @@ import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button-co
     HasLinkPipe,
     ButtonWithSpinnerComponent,
     IconComponent,
-    UndoRequestVorgangDeletionIconComponent,
     TooltipDirective,
   ],
   declarations: [

alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html

@@ -35,7 +35,7 @@
           [tooltip]="'Wiedervorlage erstellen'"
           tooltipAriaType="aria-labelledby"
         >
-          <ods-update-icon icon class="fill-text" />
+          <ods-icon icon name="update" fill="text" />
         </ods-button-with-spinner>
       } @else {
         <ods-button-with-spinner data-test-id="create-wiedervorlage" text="Wiedervorlage" variant="outline">

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 { IconComponent, UpdateIconComponent } from '@ods/system';
+import { IconComponent } 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';
@@ -45,7 +45,6 @@ describe('WiedervorlageCreateButtonComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(IconComponent),
-        MockComponent(UpdateIconComponent),
       ],
       imports: [RouterTestingModule],
     }).compileComponents();

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, TooltipDirective, UpdateIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } 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';
@@ -111,7 +111,6 @@ const routes: Routes = [
     ConvertForDataTestPipe,
     ButtonWithSpinnerComponent,
     TooltipDirective,
-    UpdateIconComponent,
     IconComponent,
     MultiFileUploadComponent,
   ],