diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts index c4553cf30882baa5265e0189b4ac320dafee551b..9f7b60a883c3ad40fc3bb29b3bd56d8a058d9197 100644 --- a/alfa-client/libs/design-system/src/index.ts +++ b/alfa-client/libs/design-system/src/index.ts @@ -13,7 +13,7 @@ export * from './lib/icons/attachment-icon/attachment-icon.component'; export * from './lib/icons/bescheid-generate-icon/bescheid-generate-icon.component'; export * from './lib/icons/bescheid-upload-icon/bescheid-upload-icon.component'; export * from './lib/icons/close-icon/close-icon.component'; -export * from './lib/icons/exclamate-icon/exclamate-icon.component'; +export * from './lib/icons/exclamation-icon/exclamation-icon.component'; export * from './lib/icons/file-icon/file-icon.component'; export * from './lib/icons/save-icon/save-icon.component'; export * from './lib/icons/send-icon/send-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 2ca00ff49bcf029d32498a692af9368217ac19f2..b89607a810b4bc7bd67c136edce54c4a65b28cb4 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 @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExclamateIconComponent } from '../../icons/exclamate-icon/exclamate-icon.component'; +import { ExclamationIconComponent } from '../../icons/exclamation-icon/exclamation-icon.component'; import { ErrorMessageComponent } from './error-message.component'; describe('ErrorMessageComponent', () => { @@ -8,7 +8,7 @@ describe('ErrorMessageComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ErrorMessageComponent, ExclamateIconComponent], + imports: [ErrorMessageComponent, ExclamationIconComponent], }).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 8fc3456345c220e957ee99aaf370dd2cb21b172f..45c7dc662666e8456d1ba736da8a094d8d0538c0 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 @@ -1,13 +1,13 @@ import { CommonModule } from '@angular/common'; import { Component, Input } from '@angular/core'; -import { ExclamateIconComponent } from '../../icons/exclamate-icon/exclamate-icon.component'; +import { ExclamationIconComponent } from '../../icons/exclamation-icon/exclamation-icon.component'; @Component({ selector: 'ods-error-message', standalone: true, - imports: [CommonModule, ExclamateIconComponent], + imports: [CommonModule, ExclamationIconComponent], styles: [':host {@apply flex text-error my-2 text-sm items-center font-medium}'], - template: `<ods-exclamate-icon class="mr-1"></ods-exclamate-icon> + template: `<ods-exclamation-icon class="mr-1"></ods-exclamation-icon> <div class="flex-grow break-all"> {{ text }} <br *ngIf="subText" aria-hidden="true" /> diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.component.spec.ts deleted file mode 100644 index 26417da63df4fe5d7d59b0ffcbf3e5a712a17410..0000000000000000000000000000000000000000 --- a/alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.component.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExclamateIconComponent } from './exclamate-icon.component'; - -describe('ExclamateIconComponent', () => { - let component: ExclamateIconComponent; - let fixture: ComponentFixture<ExclamateIconComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ExclamateIconComponent], - }).compileComponents(); - - fixture = TestBed.createComponent(ExclamateIconComponent); - 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.spec.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..7e580ce2831f1785a20905def5533243991722d0 --- /dev/null +++ b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts @@ -0,0 +1,21 @@ +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/exclamate-icon/exclamate-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts similarity index 96% rename from alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.component.ts rename to alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts index dec6b285ff6324df13d45bd1cfca115843b524af..9dda95ea08ca28bee431be67e9400e6ccaa6f0ec 100644 --- a/alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.component.ts +++ b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts @@ -5,7 +5,7 @@ import { twMerge } from 'tailwind-merge'; import { IconVariants, iconVariants } from '../IconClasses'; @Component({ - selector: 'ods-exclamate-icon', + selector: 'ods-exclamation-icon', standalone: true, imports: [NgClass], template: `<svg @@ -20,7 +20,7 @@ import { IconVariants, iconVariants } from '../IconClasses'; /> </svg>`, }) -export class ExclamateIconComponent { +export class ExclamationIconComponent { @Input() size: IconVariants['size'] = 'medium'; @Input() class: string = undefined; diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts similarity index 65% rename from alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.stories.ts rename to alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts index 502a70571ec5c26bcfbc9f4121a1b0dfbd761cfd..7fbca7f8bf95db9d3d40528470aa67186235f2cf 100644 --- a/alfa-client/libs/design-system/src/lib/icons/exclamate-icon/exclamate-icon.stories.ts +++ b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts @@ -1,16 +1,16 @@ import type { Meta, StoryObj } from '@storybook/angular'; -import { ExclamateIconComponent } from './exclamate-icon.component'; +import { ExclamationIconComponent } from './exclamation-icon.component'; -const meta: Meta<ExclamateIconComponent> = { - title: 'Icons/Exclamate icon', - component: ExclamateIconComponent, +const meta: Meta<ExclamationIconComponent> = { + title: 'Icons/Exclamation icon', + component: ExclamationIconComponent, excludeStories: /.*Data$/, tags: ['autodocs'], }; export default meta; -type Story = StoryObj<ExclamateIconComponent>; +type Story = StoryObj<ExclamationIconComponent>; export const Default: Story = { args: { size: 'medium' }, 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 b3ce1c48f27a061a2ee0e3ee70995ff9cac657f0..4fbe39f39937a006977709e805d4d05ea4d1c534 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 @@ -8,10 +8,10 @@ icon="save_alt" /> <div *ngIf="!canExport" class="flex gap-2 items-start" data-test-id="cannot-export-vorgang"> - <ods-exclamate-icon /> + <ods-exclamation-icon /> <div> <p class="text-error font-medium text-sm">Vorgang exportieren nicht möglich.</p> - <p class="text-sm">Die xdomea-Datei kann nur im <b class="font-medium">Status Abgeschlossen</b> heruntergeladen werden.</p> + <p class="text-sm">Die xdomea-Datei kann nur im <strong class="font-medium">Status Abgeschlossen</strong> heruntergeladen werden.</p> </div> </div> </ng-container> 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 f9164132fc814470a3f78184956f0352c9d6158f..04d921568b9e3c72e0ad109f238e1c1edca3ba80 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 @@ -3,7 +3,7 @@ import { getElementFromFixture, mock } from '@alfa-client/test-utils'; import { OzgcloudButtonWithSpinnerComponent } from '@alfa-client/ui'; import { VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExclamateIconComponent } from '@ods/system'; +import { ExclamationIconComponent } 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'; @@ -16,20 +16,16 @@ describe('VorgangExportContainerComponent', () => { const vorgangExportStateResource: StateResource<boolean> = createStateResource(false); const vorgangService = mock(VorgangService); - const vorgangResourceWithLink = createVorgangWithEingangResource([ - VorgangWithEingangLinkRel.EXPORT, - ]); - const vorgangResource = createVorgangWithEingangResource(); const buttonWithSpinner: string = '[dataTestId="export-vorgang"]'; - const cannotExportMessage: string = getDataTestIdOf('cannot-export-vorgang'); + const cannotExportMessageDataTestId: string = getDataTestIdOf('cannot-export-vorgang'); beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [ VorgangExportContainerComponent, MockComponent(OzgcloudButtonWithSpinnerComponent), - MockComponent(ExclamateIconComponent), + MockComponent(ExclamationIconComponent), ], providers: [ { @@ -75,17 +71,23 @@ describe('VorgangExportContainerComponent', () => { }); }); - describe('canExport', () => { - it('should be true', () => { - component.vorgangWithEingang = vorgangResourceWithLink; + describe('set vorgang with eingang property', () => { + it('should set canExport to true', () => { + const vorgangResourceWithExportLink = createVorgangWithEingangResource([ + VorgangWithEingangLinkRel.EXPORT, + ]); - expect(component.canExport).toBe(true); + component.vorgangWithEingang = vorgangResourceWithExportLink; + + expect(component.canExport).toBeTruthy(); }); - it('should be false', () => { + it('should set canExport to false', () => { + const vorgangResource = createVorgangWithEingangResource(); + component.vorgangWithEingang = vorgangResource; - expect(component.canExport).toBe(false); + expect(component.canExport).toBeFalsy(); }); }); @@ -103,7 +105,7 @@ describe('VorgangExportContainerComponent', () => { component.canExport = false; fixture.detectChanges(); - const element = getElementFromFixture(fixture, cannotExportMessage); + const element = getElementFromFixture(fixture, cannotExportMessageDataTestId); expect(element).toBeInstanceOf(HTMLElement); }); 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 48fc1910fcb8ee6d0194cf9eb70f166b2dfadb33..910757039e1fdfe3e1b5ff885a2491687d92cfa2 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 @@ -57,7 +57,7 @@ import { ButtonComponent, CloseIconComponent, ErrorMessageComponent, - ExclamateIconComponent, + ExclamationIconComponent, RadioButtonCardComponent, SaveIconComponent, SendIconComponent, @@ -147,7 +147,7 @@ const routes: Routes = [ ButtonComponent, ButtonCardComponent, CloseIconComponent, - ExclamateIconComponent, + ExclamationIconComponent, SaveIconComponent, SendIconComponent, StampIconComponent,