Fixed services

apps/red-ui/src/app/app.module.ts

@@ -28,6 +28,7 @@ import { KeycloakService } from 'keycloak-angular';
 import { DownloadsListScreenComponent } from './components/downloads-list-screen/downloads-list-screen.component';
 import { AppRoutingModule } from './app-routing.module';
 import { SharedModule } from './modules/shared/shared.module';
+import { FileUploadDownloadModule } from './modules/upload-download/file-upload-download.module';
 
 export function HttpLoaderFactory(httpClient: HttpClient) {
     return new TranslateHttpLoader(httpClient, '/assets/i18n/', '.json');
@@ -43,6 +44,7 @@ const components = [AppComponent, LogoComponent, AuthErrorComponent, ToastCompon
         BrowserModule,
         BrowserAnimationsModule,
         SharedModule,
+        FileUploadDownloadModule,
         HttpClientModule,
         AuthModule,
         ApiModule,

apps/red-ui/src/app/modules/projects/components/annotation-actions/annotation-actions.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../../assets/styles/red-variables';
+@import '../../../../../assets/styles/red-variables';
 
 .annotation-actions {
     position: absolute;

apps/red-ui/src/app/modules/projects/components/annotation-actions/annotation-actions.component.ts

@@ -1,9 +1,9 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { AnnotationWrapper } from '../../../../../models/file/annotation.wrapper';
+import { AnnotationWrapper } from '../../../../models/file/annotation.wrapper';
-import { AppStateService } from '../../../../../state/app-state.service';
+import { AppStateService } from '../../../../state/app-state.service';
-import { PermissionsService } from '../../../../../services/permissions.service';
+import { PermissionsService } from '../../../../services/permissions.service';
-import { AnnotationPermissions } from '../../../../../models/file/annotation.permissions';
+import { AnnotationPermissions } from '../../../../models/file/annotation.permissions';
-import { AnnotationActionsService } from '../../../services/annotation-actions.service';
+import { AnnotationActionsService } from '../../services/annotation-actions.service';
 import { Annotations, WebViewerInstance } from '@pdftron/webviewer';
 
 @Component({

apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.ts

@@ -4,7 +4,7 @@ import { UserService } from '../../../../services/user.service';
 import { FileManagementControllerService, ReanalysisControllerService } from '@redaction/red-ui-http';
 import { PermissionsService } from '../../../../services/permissions.service';
 import { FileStatusWrapper } from '../../../../models/file/file-status.wrapper';
-import { FileActionService } from '../../screens/file/service/file-action.service';
+import { FileActionService } from '../../services/file-action.service';
 import { Observable } from 'rxjs';
 import { StatusOverlayService } from '../../../upload-download/services/status-overlay.service';
 import { ProjectsDialogService } from '../../services/projects-dialog.service';

apps/red-ui/src/app/modules/projects/components/comments/comments.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, Input } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Comment } from '@redaction/red-ui-http';
-import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service';
+import { ManualAnnotationService } from '../../services/manual-annotation.service';
 import { AnnotationWrapper } from '../../../../models/file/annotation.wrapper';
 import { UserService } from '../../../../services/user.service';
 import { AppStateService } from '../../../../state/app-state.service';

apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { PermissionsService } from '../../../../services/permissions.service';
 import { FileStatusWrapper } from '../../../../models/file/file-status.wrapper';
 import { AppStateService } from '../../../../state/app-state.service';
-import { FileActionService } from '../../screens/file/service/file-action.service';
+import { FileActionService } from '../../services/file-action.service';
 import { ProjectsDialogService } from '../../services/projects-dialog.service';
 
 @Component({

apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Input, Output, TemplateRef, ViewChild } from '@angular/core';
 import { FilterModel } from '../../../shared/components/filter/model/filter.model';
 import { AnnotationWrapper } from '../../../../models/file/annotation.wrapper';
-import { AnnotationProcessingService } from '../../screens/file/service/annotation-processing.service';
+import { AnnotationProcessingService } from '../../services/annotation-processing.service';
 import { MatDialogRef, MatDialogState } from '@angular/material/dialog';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import { debounce } from '../../../../utils/debounce';

apps/red-ui/src/app/modules/projects/components/pdf-viewer/pdf-viewer.component.ts

@@ -19,11 +19,11 @@ import { TranslateService } from '@ngx-translate/core';
 import { ManualRedactionEntryWrapper } from '../../../../models/file/manual-redaction-entry.wrapper';
 import { AppStateService } from '../../../../state/app-state.service';
 import { AnnotationWrapper } from '../../../../models/file/annotation.wrapper';
-import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service';
+import { ManualAnnotationService } from '../../services/manual-annotation.service';
 import { FileStatusWrapper } from '../../../../models/file/file-status.wrapper';
 import { KeycloakService } from 'keycloak-angular';
 import { environment } from '../../../../../environments/environment';
-import { AnnotationDrawService } from '../../screens/file/service/annotation-draw.service';
+import { AnnotationDrawService } from '../../services/annotation-draw.service';
 import { AnnotationActionsService } from '../../services/annotation-actions.service';
 import { UserPreferenceService } from '../../../../services/user-preference.service';
 import { translateQuads } from '../../../../utils/pdf-coordinates';

apps/red-ui/src/app/modules/projects/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts

@@ -6,7 +6,7 @@ import { ForceRedactionRequest, LegalBasisMappingControllerService } from '@reda
 import { NotificationService } from '../../../../services/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '../../../../services/user.service';
-import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service';
+import { ManualAnnotationService } from '../../services/manual-annotation.service';
 import { PermissionsService } from '../../../../services/permissions.service';
 
 export interface LegalBasisOption {

apps/red-ui/src/app/modules/projects/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts

@@ -7,7 +7,7 @@ import { NotificationService } from '../../../../services/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '../../../../services/user.service';
 import { ManualRedactionEntryWrapper } from '../../../../models/file/manual-redaction-entry.wrapper';
-import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service';
+import { ManualAnnotationService } from '../../services/manual-annotation.service';
 import { ManualAnnotationResponse } from '../../../../models/file/manual-annotation-response';
 import { PermissionsService } from '../../../../services/permissions.service';
 

apps/red-ui/src/app/modules/projects/projects-routing.module.ts

@@ -7,7 +7,7 @@ import { AuthGuard } from '../auth/auth.guard';
 import { RedRoleGuard } from '../auth/red-role.guard';
 import { AppStateGuard } from '../../state/app-state.guard';
 import { ProjectOverviewScreenComponent } from './screens/project-overview-screen/project-overview-screen.component';
-import { FilePreviewScreenComponent } from './screens/file/file-preview-screen/file-preview-screen.component';
+import { FilePreviewScreenComponent } from './screens/file-preview-screen/file-preview-screen.component';
 
 const routes = [
     {

apps/red-ui/src/app/modules/projects/projects.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ProjectListingScreenComponent } from './screens/project-listing-screen/project-listing-screen.component';
 import { ProjectOverviewScreenComponent } from './screens/project-overview-screen/project-overview-screen.component';
-import { FilePreviewScreenComponent } from './screens/file/file-preview-screen/file-preview-screen.component';
+import { FilePreviewScreenComponent } from './screens/file-preview-screen/file-preview-screen.component';
 import { AddEditProjectDialogComponent } from './dialogs/add-edit-project-dialog/add-edit-project-dialog.component';
 import { AssignOwnerDialogComponent } from './dialogs/assign-owner-dialog/assign-owner-dialog.component';
 import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
@@ -15,7 +15,7 @@ import { ProjectDetailsComponent } from './components/project-details/project-de
 import { PageIndicatorComponent } from './components/page-indicator/page-indicator.component';
 import { NeedsWorkBadgeComponent } from './components/needs-work-badge/needs-work-badge.component';
 import { ProjectListingEmptyComponent } from './components/empty-states/project-listing-empty/project-listing-empty.component';
-import { AnnotationActionsComponent } from './screens/file/annotation-actions/annotation-actions.component';
+import { AnnotationActionsComponent } from './components/annotation-actions/annotation-actions.component';
 import { ProjectListingDetailsComponent } from './components/project-listing-details/project-listing-details.component';
 import { FileActionsComponent } from './components/file-actions/file-actions.component';
 import { TypeAnnotationIconComponent } from './components/type-annotation-icon/type-annotation-icon.component';
@@ -30,6 +30,11 @@ import { ProjectsRoutingModule } from './projects-routing.module';
 import { FileUploadDownloadModule } from '../upload-download/file-upload-download.module';
 import { ProjectsDialogService } from './services/projects-dialog.service';
 import { AnnotationActionsService } from './services/annotation-actions.service';
+import { FileActionService } from './services/file-action.service';
+import { PdfViewerDataService } from './services/pdf-viewer-data.service';
+import { ManualAnnotationService } from './services/manual-annotation.service';
+import { AnnotationDrawService } from './services/annotation-draw.service';
+import { AnnotationProcessingService } from './services/annotation-processing.service';
 
 const screens = [ProjectListingScreenComponent, ProjectOverviewScreenComponent, FilePreviewScreenComponent];
 
@@ -66,9 +71,19 @@ const components = [
     ...dialogs
 ];
 
+const services = [
+    ProjectsDialogService,
+    FileActionService,
+    AnnotationActionsService,
+    ManualAnnotationService,
+    PdfViewerDataService,
+    AnnotationDrawService,
+    AnnotationProcessingService
+];
+
 @NgModule({
     declarations: [...components],
-    providers: [ProjectsDialogService, AnnotationActionsService],
+    providers: [...services],
     imports: [CommonModule, SharedModule, FileUploadDownloadModule, ProjectsRoutingModule]
 })
 export class ProjectsModule {}

apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.scss

@@ -1,5 +1,5 @@
-@import '../../../../../../assets/styles/red-variables';
+@import '../../../../../assets/styles/red-variables';
-@import '../../../../../../assets/styles/red-mixins';
+@import '../../../../../assets/styles/red-mixins';
 
 .vertical-line {
     width: 1px;

apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts

@@ -1,35 +1,35 @@
 import { ChangeDetectorRef, Component, HostListener, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AppStateService } from '../../../../../state/app-state.service';
+import { AppStateService } from '../../../../state/app-state.service';
 import { WebViewerInstance } from '@pdftron/webviewer';
-import { PdfViewerComponent } from '../../../components/pdf-viewer/pdf-viewer.component';
+import { PdfViewerComponent } from '../../components/pdf-viewer/pdf-viewer.component';
-import { debounce } from '../../../../../utils/debounce';
+import { debounce } from '../../../../utils/debounce';
 import { MatDialogRef, MatDialogState } from '@angular/material/dialog';
-import { ManualRedactionEntryWrapper } from '../../../../../models/file/manual-redaction-entry.wrapper';
+import { ManualRedactionEntryWrapper } from '../../../../models/file/manual-redaction-entry.wrapper';
-import { AnnotationWrapper } from '../../../../../models/file/annotation.wrapper';
+import { AnnotationWrapper } from '../../../../models/file/annotation.wrapper';
-import { ManualAnnotationService } from '../service/manual-annotation.service';
+import { ManualAnnotationService } from '../../services/manual-annotation.service';
-import { ManualAnnotationResponse } from '../../../../../models/file/manual-annotation-response';
+import { ManualAnnotationResponse } from '../../../../models/file/manual-annotation-response';
-import { AnnotationData, FileDataModel } from '../../../../../models/file/file-data.model';
+import { AnnotationData, FileDataModel } from '../../../../models/file/file-data.model';
-import { FileActionService } from '../service/file-action.service';
+import { FileActionService } from '../../services/file-action.service';
-import { AnnotationDrawService } from '../service/annotation-draw.service';
+import { AnnotationDrawService } from '../../services/annotation-draw.service';
-import { AnnotationProcessingService } from '../service/annotation-processing.service';
+import { AnnotationProcessingService } from '../../services/annotation-processing.service';
-import { FilterModel } from '../../../../shared/components/filter/model/filter.model';
+import { FilterModel } from '../../../shared/components/filter/model/filter.model';
 import { tap } from 'rxjs/operators';
-import { NotificationService } from '../../../../../services/notification.service';
+import { NotificationService } from '../../../../services/notification.service';
 import { TranslateService } from '@ngx-translate/core';
-import { FileStatusWrapper } from '../../../../../models/file/file-status.wrapper';
+import { FileStatusWrapper } from '../../../../models/file/file-status.wrapper';
-import { PermissionsService } from '../../../../../services/permissions.service';
+import { PermissionsService } from '../../../../services/permissions.service';
 import { Subscription, timer } from 'rxjs';
-import { handleFilterDelta, processFilters } from '../../../../shared/components/filter/utils/filter-utils';
+import { handleFilterDelta, processFilters } from '../../../shared/components/filter/utils/filter-utils';
-import { UserPreferenceService } from '../../../../../services/user-preference.service';
+import { UserPreferenceService } from '../../../../services/user-preference.service';
-import { UserService } from '../../../../../services/user.service';
+import { UserService } from '../../../../services/user.service';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { FileManagementControllerService, StatusControllerService } from '@redaction/red-ui-http';
-import { PdfViewerDataService } from '../service/pdf-viewer-data.service';
+import { PdfViewerDataService } from '../../services/pdf-viewer-data.service';
-import { download } from '../../../../../utils/file-download-utils';
+import { download } from '../../../../utils/file-download-utils';
-import { ViewMode } from '../../../../../models/file/view-mode';
+import { ViewMode } from '../../../../models/file/view-mode';
-import { FileWorkloadComponent } from '../../../components/file-workload/file-workload.component';
+import { FileWorkloadComponent } from '../../components/file-workload/file-workload.component';
-import { ProjectsDialogService } from '../../../services/projects-dialog.service';
+import { ProjectsDialogService } from '../../services/projects-dialog.service';
 
 const ALL_HOTKEY_ARRAY = ['Escape', 'F', 'f'];
 

apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts

@@ -2,12 +2,12 @@ import { ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit, ViewChil
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationService, NotificationType } from '../../../../services/notification.service';
 import { AppStateService } from '../../../../state/app-state.service';
-import { FileDropOverlayService } from '../../../upload-download/file-drop/service/file-drop-overlay.service';
+import { FileDropOverlayService } from '../../../upload-download/services/file-drop-overlay.service';
 import { FileUploadModel } from '../../../upload-download/model/file-upload.model';
 import { FileUploadService } from '../../../upload-download/services/file-upload.service';
 import { StatusOverlayService } from '../../../upload-download/services/status-overlay.service';
 import { TranslateService } from '@ngx-translate/core';
-import { FileActionService } from '../file/service/file-action.service';
+import { FileActionService } from '../../services/file-action.service';
 import { FilterModel } from '../../../shared/components/filter/model/filter.model';
 import * as moment from 'moment';
 import { ProjectDetailsComponent } from '../../components/project-details/project-details.component';

apps/red-ui/src/app/modules/projects/services/annotation-actions.service.ts

@@ -1,6 +1,6 @@
 import { EventEmitter, Injectable, NgZone } from '@angular/core';
 import { PermissionsService } from '../../../services/permissions.service';
-import { ManualAnnotationService } from '../screens/file/service/manual-annotation.service';
+import { ManualAnnotationService } from './manual-annotation.service';
 import { AnnotationWrapper } from '../../../models/file/annotation.wrapper';
 import { Observable } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';

apps/red-ui/src/app/modules/projects/services/annotation-draw.service.ts

@@ -1,14 +1,12 @@
 import { Injectable } from '@angular/core';
 import { Annotations, WebViewerInstance } from '@pdftron/webviewer';
 import { Rectangle, RedactionLogControllerService, SectionGrid, SectionRectangle } from '@redaction/red-ui-http';
-import { hexToRgb } from '../../../../../utils/functions';
+import { hexToRgb } from '../../../utils/functions';
-import { AppStateService } from '../../../../../state/app-state.service';
+import { AppStateService } from '../../../state/app-state.service';
-import { AnnotationWrapper } from '../../../../../models/file/annotation.wrapper';
+import { AnnotationWrapper } from '../../../models/file/annotation.wrapper';
-import { UserPreferenceService } from '../../../../../services/user-preference.service';
+import { UserPreferenceService } from '../../../services/user-preference.service';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class AnnotationDrawService {
     constructor(
         private readonly _appStateService: AppStateService,

apps/red-ui/src/app/modules/projects/services/annotation-processing.service.ts

@@ -1,14 +1,11 @@
 import { Injectable } from '@angular/core';
-import { AppStateService } from '../../../../../state/app-state.service';
+import { AppStateService } from '../../../state/app-state.service';
-import { AnnotationWrapper } from '../../../../../models/file/annotation.wrapper';
+import { AnnotationWrapper } from '../../../models/file/annotation.wrapper';
-import { FilterModel } from '../../../../shared/components/filter/model/filter.model';
+import { FilterModel } from '../../shared/components/filter/model/filter.model';
-import { handleCheckedValue } from '../../../../shared/components/filter/utils/filter-utils';
+import { handleCheckedValue } from '../../shared/components/filter/utils/filter-utils';
-import { SuperTypeSorter } from '../../../../../utils/sorters/super-type-sorter';
+import { SuperTypeSorter } from '../../../utils/sorters/super-type-sorter';
-import { getFirstRelevantTextPart } from '../../../../../utils/functions';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class AnnotationProcessingService {
     constructor(private readonly _appStateService: AppStateService) {}
 

apps/red-ui/src/app/modules/projects/services/file-action.service.ts

@@ -1,15 +1,13 @@
 import { Injectable } from '@angular/core';
-import { AppStateService } from '../../../../../state/app-state.service';
+import { AppStateService } from '../../../state/app-state.service';
-import { UserService } from '../../../../../services/user.service';
+import { UserService } from '../../../services/user.service';
 import { FileStatus, ReanalysisControllerService, StatusControllerService } from '@redaction/red-ui-http';
-import { FileStatusWrapper } from '../../../../../models/file/file-status.wrapper';
+import { FileStatusWrapper } from '../../../models/file/file-status.wrapper';
-import { PermissionsService } from '../../../../../services/permissions.service';
+import { PermissionsService } from '../../../services/permissions.service';
 import { isArray } from 'rxjs/internal-compatibility';
-import { ProjectsDialogService } from '../../../services/projects-dialog.service';
+import { ProjectsDialogService } from './projects-dialog.service';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class FileActionService {
     constructor(
         private readonly _dialogService: ProjectsDialogService,

apps/red-ui/src/app/modules/projects/services/manual-annotation.service.ts

@@ -1,16 +1,14 @@
 import { Injectable } from '@angular/core';
-import { AppStateService } from '../../../../../state/app-state.service';
+import { AppStateService } from '../../../state/app-state.service';
 import { AddRedactionRequest, DictionaryControllerService, ForceRedactionRequest, ManualRedactionControllerService } from '@redaction/red-ui-http';
-import { AnnotationWrapper } from '../../../../../models/file/annotation.wrapper';
+import { AnnotationWrapper } from '../../../models/file/annotation.wrapper';
-import { NotificationService, NotificationType } from '../../../../../services/notification.service';
+import { NotificationService, NotificationType } from '../../../services/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 import { tap } from 'rxjs/operators';
-import { UserService } from '../../../../../services/user.service';
+import { UserService } from '../../../services/user.service';
-import { PermissionsService } from '../../../../../services/permissions.service';
+import { PermissionsService } from '../../../services/permissions.service';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class ManualAnnotationService {
     constructor(
         private readonly _appStateService: AppStateService,

apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts

@@ -7,15 +7,13 @@ import {
     RedactionLogControllerService,
     ViewedPagesControllerService
 } from '@redaction/red-ui-http';
-import { FileType } from '../../../../../models/file/file-type';
+import { FileType } from '../../../models/file/file-type';
-import { FileDataModel } from '../../../../../models/file/file-data.model';
+import { FileDataModel } from '../../../models/file/file-data.model';
-import { AppStateService } from '../../../../../state/app-state.service';
+import { AppStateService } from '../../../state/app-state.service';
-import { PermissionsService } from '../../../../../services/permissions.service';
+import { PermissionsService } from '../../../services/permissions.service';
-import { FileStatusWrapper } from '../../../../../models/file/file-status.wrapper';
+import { FileStatusWrapper } from '../../../models/file/file-status.wrapper';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class PdfViewerDataService {
     constructor(
         private readonly _appStateService: AppStateService,

apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts

@@ -19,7 +19,7 @@ import { ProjectWrapper } from '../../../state/model/project.wrapper';
 import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component';
 import { AppStateService } from '../../../state/app-state.service';
 import { ManualRedactionEntryWrapper } from '../../../models/file/manual-redaction-entry.wrapper';
-import { ManualAnnotationService } from '../screens/file/service/manual-annotation.service';
+import { ManualAnnotationService } from './manual-annotation.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
 import { AssignOwnerDialogComponent } from '../dialogs/assign-owner-dialog/assign-owner-dialog.component';

apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts

@@ -7,12 +7,16 @@ import { NgxDropzoneModule } from 'ngx-dropzone';
 import { SharedModule } from '../shared/shared.module';
 import { UploadDownloadDialogService } from './services/upload-download-dialog.service';
 import { OverwriteFilesDialogComponent } from './dialogs/overwrite-files-dialog/overwrite-files-dialog.component';
+import { FileUploadService } from './services/file-upload.service';
+import { FileDownloadService } from './services/file-download.service';
+import { StatusOverlayService } from './services/status-overlay.service';
+import { FileDropOverlayService } from './services/file-drop-overlay.service';
 
 @NgModule({
     imports: [CommonModule, SharedModule, NgxDropzoneModule, OverlayModule],
     declarations: [FileDropComponent, UploadStatusOverlay, OverwriteFilesDialogComponent],
     entryComponents: [FileDropComponent, UploadStatusOverlay],
-    providers: [UploadDownloadDialogService],
+    providers: [UploadDownloadDialogService, FileUploadService, FileDownloadService, StatusOverlayService, FileDropOverlayService],
     exports: [FileDropComponent, UploadStatusOverlay]
 })
 export class FileUploadDownloadModule {}

apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts

@@ -11,9 +11,7 @@ import { AppStateService } from '../../../state/app-state.service';
 import { PermissionsService } from '../../../services/permissions.service';
 import { KeycloakService } from 'keycloak-angular';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class FileDownloadService {
     public downloads: DownloadStatusWrapper[] = [];
 

apps/red-ui/src/app/modules/upload-download/services/file-drop-overlay.service.ts

@@ -1,11 +1,9 @@
 import { Injectable, Injector } from '@angular/core';
 import { Overlay, OverlayRef } from '@angular/cdk/overlay';
-import { FileDropComponent } from '../file-drop.component';
+import { FileDropComponent } from '../file-drop/file-drop.component';
 import { ComponentPortal } from '@angular/cdk/portal';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class FileDropOverlayService {
     private _mouseIn = false;
     private readonly _dropOverlayRef: OverlayRef;

apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts

@@ -13,9 +13,7 @@ export interface ActiveUpload {
     fileUploadModel: FileUploadModel;
 }
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class FileUploadService {
     static readonly MAX_PARALLEL_UPLOADS = 5;
     files: FileUploadModel[] = [];

apps/red-ui/src/app/modules/upload-download/services/status-overlay.service.ts

@@ -3,9 +3,7 @@ import { Overlay, OverlayRef } from '@angular/cdk/overlay';
 import { ComponentPortal } from '@angular/cdk/portal';
 import { UploadStatusOverlay } from '../upload-status-overlay/upload-status-overlay.component';
 
-@Injectable({
+@Injectable()
-    providedIn: 'root'
-})
 export class StatusOverlayService {
     private readonly _uploadStatusOverlayRef: OverlayRef;