From addaabf44d3e553e55900df6214e23976b63dc06 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 22 Apr 2024 16:59:01 +0200
Subject: [PATCH] OZG-5010 attachment isLoading
---
.../binary-file2-container.component.html | 1 +
.../binary-file2-container/binary-file2-container.component.ts | 1 +
.../binary-file2/binary-file2.component.html | 2 +-
.../binary-file2/binary-file2.component.ts | 1 +
...vorgang-detail-bescheiden-result-attachments.component.html | 3 ++-
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.html
index 41fe9ab51a..f901ea0826 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.html
@@ -3,6 +3,7 @@
[file]="file"
[stateResource]="fileStateResource$ | async"
[deletable]="deletable"
+ [isLoading]="isLoading"
[downloadToken]="downloadToken$ | async"
(startDownload)="startDownload($event)"
(startDelete)="startDelete.emit($event)"
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.ts b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.ts
index 90a10b6ffb..3115c1f6c4 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2-container.component.ts
@@ -13,6 +13,7 @@ export class BinaryFile2ContainerComponent {
@Input() file: BinaryFileResource;
@Input() downloadFileNamePrefix: string;
@Input() deletable: boolean = false;
+ @Input() isLoading: boolean = false;
@Output() startDelete: EventEmitter<BinaryFileResource> = new EventEmitter();
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index 2f1b7d16ba..d1a2d88d2e 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -4,7 +4,7 @@
(click)="downloadFile()"
[attr.aria-label]="'Anhang: Dateiname: ' + file.name"
>
- <ods-spinner-icon spinner *ngIf="false" class="mr-3 size-10" />
+ <ods-spinner-icon spinner *ngIf="isLoading" class="mr-3 size-10" />
<ods-icon icon name="file-pdf" class="mr-3 size-10 fill-primary"></ods-icon>
<button
close
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts
index 116b9a6cbc..6f1998b266 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts
@@ -16,6 +16,7 @@ export class BinaryFile2Component {
@Input() stateResource: StateResource<Resource>;
@Input() deletable: boolean = false;
@Input() downloadToken: ApiDownloadToken = <ApiDownloadToken>{};
+ @Input() isLoading: boolean = false;
readonly fileLinkRel = BinaryFileLinkRel;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
index c8aef82deb..2cb3e0e2e3 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
@@ -12,10 +12,11 @@
></alfa-vorgang-detail-bescheiden-form-error>
<p *ngIf="attachment.loading">loading...</p>
<alfa-binary-file2-container
- *ngIf="!attachment.error && attachment.loaded"
+ *ngIf="!attachment.error"
[file]="attachment.resource"
[deletable]="true"
(startDelete)="deleteFile($event)"
+ [isLoading]="attachment.loading"
>
</alfa-binary-file2-container>
</ng-container>
--
GitLab