-
-
- {{status.filename}}
- @if (!isFinished(status) || (isFinished(status) && !status.documentId)) {
- {{status.message}}
- }
-
-
- @if (isFinished(status)) {
-
- @if (status.documentId) {
-
- }
-
+
+ {{status.filename}}
+ @if (!isFinished(status) || (isFinished(status) && !status.documentId)) {
+ {{status.message}}
+ }
+
+
+ @if (isFinished(status)) {
+
+ @if (status.documentId) {
+
}
-
+ }
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index 3192be0ec..f0e80c1f4 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -35,3 +35,7 @@ form {
::ng-deep .ngx-file-drop__drop-zone--over {
background-color: var(--pngx-primary-faded) !important;
}
+
+.consumer-status-card {
+ background-color: rgba(var(--bs-body-bg-rgb), .95) !important;
+}
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 30215d542..5ecc116c2 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
@@ -26,6 +26,7 @@ import { UploadDocumentsService } from 'src/app/services/upload-documents.servic
import { WidgetFrameComponent } from '../widget-frame/widget-frame.component'
import { UploadFileWidgetComponent } from './upload-file-widget.component'
import { DragDropModule } from '@angular/cdk/drag-drop'
+import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
const FAILED_STATUSES = [new FileStatus()]
const WORKING_STATUSES = [new FileStatus(), new FileStatus()]
@@ -73,6 +74,7 @@ describe('UploadFileWidgetComponent', () => {
RouterTestingModule.withRoutes(routes),
NgbAlertModule,
DragDropModule,
+ NgxBootstrapIconsModule.pick(allIcons),
],
}).compileComponents()
@@ -147,12 +149,16 @@ describe('UploadFileWidgetComponent', () => {
it('should allow dismissing all alerts', fakeAsync(() => {
mockConsumerStatuses(consumerStatusService)
+ component.alertsExpanded = true
fixture.detectChanges()
+ jest
+ .spyOn(component, 'getStatusCompleted')
+ .mockImplementation(() => SUCCESS_STATUSES)
const dismissSpy = jest.spyOn(consumerStatusService, 'dismiss')
component.dismissCompleted()
tick(1000)
fixture.detectChanges()
- expect(dismissSpy).toHaveBeenCalledTimes(6)
+ expect(dismissSpy).toHaveBeenCalledTimes(10)
}))
})
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 a06352797..176c4e7f8 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
@@ -116,6 +116,11 @@ export class UploadFileWidgetComponent extends ComponentWithPermissions {
dismissCompleted() {
this.alerts.forEach((a) => a.close())
+ if (this.alertsExpanded) {
+ this.getStatusCompleted().forEach((status) =>
+ this.consumerStatusService.dismiss(status)
+ )
+ }
}
public onFileSelected(event: Event) {