DM-337 - Add/Remove annotations dialog in DocuMine

This commit is contained in:
Valentin Mihai 2023-07-25 15:30:59 +03:00
parent 38469c392d
commit 11cd73e3bd
3 changed files with 9 additions and 14 deletions

View File

@ -19,6 +19,8 @@ export class AddAnnotationDialogComponent
dictionaries: Dictionary[] = []; dictionaries: Dictionary[] = [];
form!: UntypedFormGroup; form!: UntypedFormGroup;
#applyToAllDossiers: boolean;
readonly #dossier: Dossier; readonly #dossier: Dossier;
readonly #isRss = this._iqserPermissionsService.has(Roles.getRss); readonly #isRss = this._iqserPermissionsService.has(Roles.getRss);
@ -30,6 +32,7 @@ export class AddAnnotationDialogComponent
) { ) {
super(); super();
this.#dossier = _activeDossiersService.find(this.data.dossierId); this.#dossier = _activeDossiersService.find(this.data.dossierId);
this.#applyToAllDossiers = !!this.data.applyToAllDossiers;
this.form = this.#getForm(); this.form = this.#getForm();
} }
@ -79,5 +82,6 @@ export class AddAnnotationDialogComponent
addRedactionRequest.comment = commentValue ? { text: commentValue } : null; addRedactionRequest.comment = commentValue ? { text: commentValue } : null;
addRedactionRequest.section = null; addRedactionRequest.section = null;
addRedactionRequest.value = this.form.get('selectedText').value; addRedactionRequest.value = this.form.get('selectedText').value;
addRedactionRequest.addToAllDossiers = this.data.isApprover && addRedactionRequest.addToDictionary && this.#applyToAllDossiers;
} }
} }

View File

@ -860,20 +860,13 @@ export class FilePreviewScreenComponent
#getRedactTextDialogData(manualRedactionEntryWrapper: ManualRedactionEntryWrapper, file: File): RedactTextData { #getRedactTextDialogData(manualRedactionEntryWrapper: ManualRedactionEntryWrapper, file: File): RedactTextData {
const dossierTemplate = this._dossierTemplatesService.find(this.state.dossierTemplateId); const dossierTemplate = this._dossierTemplatesService.find(this.state.dossierTemplateId);
const isApprover = this.permissionsService.isApprover(this.state.dossier());
const applyDictionaryUpdatesToAllDossiersByDefault = dossierTemplate.applyDictionaryUpdatesToAllDossiersByDefault;
const data = { return {
manualRedactionEntryWrapper, manualRedactionEntryWrapper,
dossierId: this.dossierId, dossierId: this.dossierId,
file, file,
};
if (this.#isDocumine) {
return data;
}
const isApprover = this.permissionsService.isApprover(this.state.dossier());
const applyDictionaryUpdatesToAllDossiersByDefault = dossierTemplate.applyDictionaryUpdatesToAllDossiersByDefault;
return {
...data,
applyToAllDossiers: isApprover ? applyDictionaryUpdatesToAllDossiersByDefault : false, applyToAllDossiers: isApprover ? applyDictionaryUpdatesToAllDossiersByDefault : false,
isApprover, isApprover,
}; };

View File

@ -4,17 +4,15 @@ import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { DetailsRadioOption } from '@iqser/common-ui'; import { DetailsRadioOption } from '@iqser/common-ui';
import { RemoveRedactionOption } from './dialog-options'; import { RemoveRedactionOption } from './dialog-options';
export interface AddAnnotationData { export interface RedactTextData {
manualRedactionEntryWrapper: ManualRedactionEntryWrapper; manualRedactionEntryWrapper: ManualRedactionEntryWrapper;
dossierId: string; dossierId: string;
file: File; file: File;
}
export interface RedactTextData extends AddAnnotationData {
applyToAllDossiers?: boolean; applyToAllDossiers?: boolean;
isApprover?: boolean; isApprover?: boolean;
} }
export type AddAnnotationData = RedactTextData;
export type AddHintData = RedactTextData; export type AddHintData = RedactTextData;
export interface RedactTextResult { export interface RedactTextResult {