]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Fix: dont dismiss active alerts on "dismiss completed" (#6364)
authorshamoon <4887959+shamoon@users.noreply.github.com>
Wed, 10 Apr 2024 17:55:37 +0000 (10:55 -0700)
committerGitHub <noreply@github.com>
Wed, 10 Apr 2024 17:55:37 +0000 (10:55 -0700)
src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts
src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts

index 172239dbbf4fe420f17fcd50888b3d6ee7e794c8..688dc8cd6d0e54db3bf4f895c45eb4c2b1ca0ba4 100644 (file)
@@ -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)
   }))
 })
 
index 176c4e7f85df12e4920224b03b7e45bd4a49775e..28ad891851bb810724b4ddc686de36143bf6006e 100644 (file)
@@ -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) {