From 7f6a50be5b5c2250534e182c4d066f591c341d03 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:55:37 -0700 Subject: [PATCH] Fix: dont dismiss active alerts on "dismiss completed" (#6364) --- .../upload-file-widget.component.spec.ts | 4 ++-- .../upload-file-widget/upload-file-widget.component.ts | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts index 172239dbb..688dc8cd6 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts @@ -149,7 +149,7 @@ describe('UploadFileWidgetComponent', () => { expect(dismissSpy).toHaveBeenCalled() }) - it('should allow dismissing all alerts', fakeAsync(() => { + it('should allow dismissing completed alerts', fakeAsync(() => { mockConsumerStatuses(consumerStatusService) component.alertsExpanded = true fixture.detectChanges() @@ -160,7 +160,7 @@ describe('UploadFileWidgetComponent', () => { component.dismissCompleted() tick(1000) fixture.detectChanges() - expect(dismissSpy).toHaveBeenCalledTimes(10) + expect(dismissSpy).toHaveBeenCalledTimes(4) })) }) diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts index 176c4e7f8..28ad89185 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts @@ -115,12 +115,9 @@ export class UploadFileWidgetComponent extends ComponentWithPermissions { } dismissCompleted() { - this.alerts.forEach((a) => a.close()) - if (this.alertsExpanded) { - this.getStatusCompleted().forEach((status) => - this.consumerStatusService.dismiss(status) - ) - } + this.getStatusCompleted().forEach((status) => + this.consumerStatusService.dismiss(status) + ) } public onFileSelected(event: Event) {