From a5767627b4acc40cadfa291e7775e041e4fec4b6 Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Tue, 25 Feb 2025 14:52:46 +0100
Subject: [PATCH] Revert "OZG-5977 fix e2e tests"
This reverts commit b934340c2e4e5c4426e61e3c01f0b50df1cf785f.
---
...scheid-wizard-upload-document-button.component.html | 2 +-
.../multi-file-upload-editor.component.html | 2 +-
.../file-upload-editor.component.html | 2 +-
.../src/lib/attachment/attachment.component.ts | 10 +++++++---
.../src/lib/button-card/button-card.component.ts | 6 +++---
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
index 9bbcdacc9b..0b04ceb6fc 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
@@ -8,7 +8,7 @@
data-test-id="bescheid-wizard-upload-document-upload-editor"
>
<ods-bescheid-upload-icon icon></ods-bescheid-upload-icon>
- <ods-spinner-icon spinner size="extra-large" data-test-class="spinner"></ods-spinner-icon>
+ <ods-spinner-icon spinner size="extra-large"></ods-spinner-icon>
<div text class="text-center">Bescheiddokument hochladen</div>
</ods-single-file-upload-editor>
</div>
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
index 13390c19ef..1bfa1fb537 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
@@ -7,7 +7,7 @@
class="relative w-72"
data-test-id="binary-file-upload"
>
- <ods-spinner-icon spinner size="medium" data-test-class="spinner" />
+ <ods-spinner-icon spinner size="medium" />
<ods-attachment-icon icon size="medium" />
<p text class="text-center">{{ label }}</p>
</ods-file-upload-button>
diff --git a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
index dcb0a58947..ff08ce18e4 100644
--- a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
@@ -36,7 +36,7 @@
[isLoading]="uploadInProgress.loading"
class="relative w-full max-w-72"
>
- <ods-spinner-icon spinner size="medium" data-test-class="spinner"/>
+ <ods-spinner-icon spinner size="medium" />
<ods-attachment-icon icon size="medium" />
<p text class="text-center">{{ label }}</p>
</ods-file-upload-button>
diff --git a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
index 7c64b40df5..4eb93a29d3 100644
--- a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
@@ -33,15 +33,19 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
standalone: true,
imports: [CommonModule, SpinnerIconComponent, FileIconComponent],
styles: [':host {@apply flex}'],
- template: ` <button
+ template: `<button
class="relative flex w-full items-start gap-3 border-b border-b-grayborder bg-background-100 px-3 py-2 hover:bg-background-200"
[disabled]="isLoading"
[attr.aria-disabled]="isLoading"
>
<div class="flex-shrink">
- <ods-file-icon *ngIf="fileType && !isLoading && !hasError" [fileType]="fileType" size="large" />
+ <ods-file-icon
+ *ngIf="fileType && !isLoading && !hasError"
+ [fileType]="fileType"
+ size="large"
+ />
<ods-file-icon *ngIf="!isLoading && hasError" fileType="exclamation" size="large" />
- <ods-spinner-icon *ngIf="isLoading && !hasError" size="large" data-test-class="spinner" />
+ <ods-spinner-icon *ngIf="isLoading && !hasError" size="large" />
</div>
<div class="flex grow flex-col items-start break-all text-start text-text">
<p *ngIf="!hasError && !isLoading && caption" class="text-sm">
diff --git a/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts b/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts
index b764413ff9..2ceda2c4cd 100644
--- a/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts
@@ -31,15 +31,15 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
standalone: true,
imports: [CommonModule, SpinnerIconComponent],
styles: [':host {@apply inline-flex}'],
- template: ` <button
+ template: `<button
type="button"
- class="flex flex-grow items-center justify-center gap-4 rounded-md bg-background-50 py-3 pl-6 pr-6 text-text hover:bg-background-100 focus:outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ozgblue-800 disabled:cursor-wait disabled:hover:bg-background-50"
+ class="flex flex-grow items-center justify-center gap-4 rounded-md bg-background-50 py-3 pl-6 pr-6 text-text hover:bg-background-100 focus:outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ozgblue-800 disabled:cursor-wait disabled:hover:bg-background-50"
[disabled]="isLoading"
[attr.aria-disabled]="isLoading"
[attr.aria-label]="getAriaLabel()"
>
<ng-content *ngIf="!isLoading" select="[icon]"></ng-content>
- <ods-spinner-icon *ngIf="isLoading" size="extra-large" class="shrink-0" data-test-class="spinner" />
+ <ods-spinner-icon *ngIf="isLoading" size="extra-large" class="shrink-0" />
<div class="flex-grow break-all">
{{ text }}
<br *ngIf="subText" aria-hidden="true" />
--
GitLab