diff --git a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.html b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.html index ba995fafd..3ad1e5cb8 100644 --- a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.html +++ b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.html @@ -17,16 +17,10 @@
-
+
{{ model.file?.name }}
-
- {{ model.progress }}% -
+
{{ model.progress }}%
@@ -35,11 +29,7 @@
-
+
{{ model.error.message }}
@@ -48,28 +38,22 @@ (click)="uploadItem(model)" [matTooltip]="'upload-status.dialog.actions.re-upload' | translate" matTooltipPosition="above" - class="error-action" + class="error-action pointer" > - key
- +
diff --git a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts index a33e48257..23d886df6 100644 --- a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts +++ b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts @@ -13,25 +13,18 @@ export class UploadStatusOverlay implements OnInit { uploadStatusInterval: number; - constructor( - public readonly uploadService: FileUploadService, - private readonly _overlayRef: OverlayRef - ) {} + constructor(public readonly uploadService: FileUploadService, private readonly _overlayRef: OverlayRef) {} ngOnInit() { this.uploadStatusInterval = setInterval(() => { if (this.uploadService.files.length > 0) { - const result = this.uploadService.files.reduce( - (a, file) => a && file.completed && !file.error, - true - ); - if (result) { - setTimeout(() => { - this.closeDialog(); - }, 3000); + // keep only errors + this.uploadService.files = this.uploadService.files.filter((file) => !file.completed || file.error); + if (this.uploadService.files.length === 0) { + this.closeDialog(); } } - }, 1000); + }, 2500); } cancelItem(item: FileUploadModel) {}