diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index d0f893da6..329a7d7b3 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -262,6 +262,7 @@ export class AppComponent implements OnInit, OnDestroy { } public fileOver() { + this.settings.globalDropzoneActive = true // allows transition setTimeout(() => { this.fileIsOver = true @@ -272,6 +273,7 @@ export class AppComponent implements OnInit, OnDestroy { } public fileLeave(immediate: boolean = false) { + this.settings.globalDropzoneActive = false const ms = immediate ? 0 : 500 this.fileLeaveTimeoutID = setTimeout(() => { @@ -284,6 +286,7 @@ export class AppComponent implements OnInit, OnDestroy { } public dropped(files: NgxFileDropEntry[]) { + this.settings.globalDropzoneActive = false this.fileLeave(true) this.uploadDocumentsService.uploadFiles(files) this.toastService.showInfo($localize`Initiating upload...`, 3000) diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html index 7b7116c15..a503e143d 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.html +++ b/src-ui/src/app/components/dashboard/dashboard.component.html @@ -6,6 +6,7 @@
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index 1ac2b9962..45ab053a4 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -40,11 +40,6 @@ export class DashboardComponent extends ComponentWithPermissions { ) .filter((v) => v) : [...this.savedViewService.dashboardViews] - console.log( - this.dashboardViews, - sorted, - this.savedViewService.dashboardViews - ) }) } diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 7fbb5e575..610913549 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -56,6 +56,7 @@ export class SettingsService { } public globalDropzoneEnabled: boolean = true + public globalDropzoneActive: boolean = false constructor( rendererFactory: RendererFactory2,