Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-4467: Don't show overwrite files dialog on empty dossiers

Browse Source
This commit is contained in:
Adina Țeudan 2022-07-01 22:07:39 +03:00
parent aafa0690cd
commit ccd86a1dfd
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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