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

Merge branch 'release/4.839.x' of https://gitlab.knecon.com/redactmanager/red-ui into release/4.839.x

Browse Source
This commit is contained in:
Dan Percic 2024-08-19 12:02:30 +03:00
commit e3ef820bac
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { HeadersConfiguration } from '@iqser/common-ui/lib/utils';
import { LicenseService } from '@services/license.service';
import { LicenseFeatures } from '../../admin/screens/license/utils/constants';
import { TenantsService } from '@common-ui/tenants';
import { UserPreferenceService } from '@users/user-preference.service';
export interface ActiveUpload {
@ -45,6 +46,7 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
private readonly _licenseService: LicenseService,
private readonly _toaster: Toaster,
private readonly _userPreferenceService: UserPreferenceService,
private readonly _tenantsService: TenantsService,
) {
super();
const fileFetch$ = this.#fetchFiles$.pipe(
@ -111,6 +113,11 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
option = res.applyToAllFiles ? currentOption : undefined;
}
const existingFile = dossierFiles.find(pf => pf.filename === file.file.name);
if (OverwriteFileOptions.FULL_OVERWRITE === currentOption || OverwriteFileOptions.PARTIAL_OVERWRITE === currentOption) {
localStorage.removeItem(`${this._tenantsService.activeTenantId}-annotations-${existingFile.id}`);
}
if (currentOption === OverwriteFileOptions.PARTIAL_OVERWRITE) {
file.keepManualRedactions = true;
}