Skip to content
Snippets Groups Projects
Verified Commit a5767627 authored by Sebastian Bergandy's avatar Sebastian Bergandy :keyboard:
Browse files

Revert "OZG-5977 fix e2e tests"

This reverts commit b934340c.
parent b934340c
No related branches found
No related tags found
1 merge request!67OZG-5977 add multi option to file upload button
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
data-test-id="bescheid-wizard-upload-document-upload-editor" data-test-id="bescheid-wizard-upload-document-upload-editor"
> >
<ods-bescheid-upload-icon icon></ods-bescheid-upload-icon> <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> <div text class="text-center">Bescheiddokument hochladen</div>
</ods-single-file-upload-editor> </ods-single-file-upload-editor>
</div> </div>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
class="relative w-72" class="relative w-72"
data-test-id="binary-file-upload" 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" /> <ods-attachment-icon icon size="medium" />
<p text class="text-center">{{ label }}</p> <p text class="text-center">{{ label }}</p>
</ods-file-upload-button> </ods-file-upload-button>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
[isLoading]="uploadInProgress.loading" [isLoading]="uploadInProgress.loading"
class="relative w-full max-w-72" 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" /> <ods-attachment-icon icon size="medium" />
<p text class="text-center">{{ label }}</p> <p text class="text-center">{{ label }}</p>
</ods-file-upload-button> </ods-file-upload-button>
...@@ -39,9 +39,13 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone ...@@ -39,9 +39,13 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
[attr.aria-disabled]="isLoading" [attr.aria-disabled]="isLoading"
> >
<div class="flex-shrink"> <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-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>
<div class="flex grow flex-col items-start break-all text-start text-text"> <div class="flex grow flex-col items-start break-all text-start text-text">
<p *ngIf="!hasError && !isLoading && caption" class="text-sm"> <p *ngIf="!hasError && !isLoading && caption" class="text-sm">
......
...@@ -39,7 +39,7 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone ...@@ -39,7 +39,7 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
[attr.aria-label]="getAriaLabel()" [attr.aria-label]="getAriaLabel()"
> >
<ng-content *ngIf="!isLoading" select="[icon]"></ng-content> <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"> <div class="flex-grow break-all">
{{ text }} {{ text }}
<br *ngIf="subText" aria-hidden="true" /> <br *ngIf="subText" aria-hidden="true" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment