From ccd86a1dfd9fd5a55be6433532f21bf567092ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Fri, 1 Jul 2022 22:07:39 +0300
Subject: [PATCH] RED-4467: Don't show overwrite files dialog on empty dossiers

---
 .../services/file-upload.service.ts           | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
index f3ca4fbac..a7a2222f0 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
@@ -11,6 +11,7 @@ import { FilesMapService } from '@services/files/files-map.service';
 import { switchMap, tap, throttleTime } from 'rxjs/operators';
 import { FilesService } from '@services/files/files.service';
 import { UploadDownloadDialogService } from './upload-download-dialog.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 
 export interface ActiveUpload {
     subscription: Subscription;
@@ -37,6 +38,7 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
         private readonly _configService: ConfigService,
         private readonly _dialogService: UploadDownloadDialogService,
         private readonly _errorMessageService: ErrorMessageService,
+        private readonly _activeDossiersService: ActiveDossiersService,
         protected readonly _injector: Injector,
     ) {
         super(_injector, 'upload');
@@ -76,15 +78,17 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
             let currentOption = option;
 
             if (isZip(file)) {
-                const res = await this._dialogService.openOverwriteFileDialog(null);
-                if (res.cancel) {
-                    return;
-                }
-                if (res.option === OverwriteFileOptions.PARTIAL_OVERWRITE) {
-                    file.keepManualRedactions = true;
-                }
-                if (res.option === OverwriteFileOptions.SKIP) {
-                    files = [];
+                if (dossierFiles.length > 0) {
+                    const res = await this._dialogService.openOverwriteFileDialog(null);
+                    if (res.cancel) {
+                        return;
+                    }
+                    if (res.option === OverwriteFileOptions.PARTIAL_OVERWRITE) {
+                        file.keepManualRedactions = true;
+                    }
+                    if (res.option === OverwriteFileOptions.SKIP) {
+                        files = [];
+                    }
                 }
             } else if (dossierFiles.find(pf => pf.filename === file.file.name)) {
                 if (!option) {