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

Merge branch 'VM/DM-337'

Browse Source
This commit is contained in:
Valentin Mihai 2023-07-24 00:47:25 +03:00
commit 9a20b6dbce
25 changed files with 542 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/red-ui/src/app/modules/file-preview/dialogs/add-hint-dialog/add-hint-dialog.component.ts
View File

@ -8,18 +8,15 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { tap } from 'rxjs/operators';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { IqserDialogComponent } from '@common-ui/dialog/iqser-dialog-component.directive';
import { RedactOrHintData, RedactOrHintResult } from '../../utils/dialog-types';
import { IqserDialogComponent } from '@iqser/common-ui';
import { getRedactOrHintOptions, RedactOrHintOption, RedactOrHintOptions } from '../../utils/dialog-options';
import { AddHintData, AddHintResult } from '../../utils/dialog-types';
@Component({
templateUrl: './add-hint-dialog.component.html',
styleUrls: ['./add-hint-dialog.component.scss'],
})
export class AddHintDialogComponent
extends IqserDialogComponent<AddHintDialogComponent, RedactOrHintData, RedactOrHintResult>
implements OnInit
{
export class AddHintDialogComponent extends IqserDialogComponent<AddHintDialogComponent, AddHintData, AddHintResult> implements OnInit {
readonly roles = Roles;
readonly iconButtonTypes = IconButtonTypes;
readonly options: DetailsRadioOption<RedactOrHintOption>[];
@ -27,7 +24,6 @@ export class AddHintDialogComponent
dictionaries: Dictionary[] = [];
form!: UntypedFormGroup;
#manualRedactionTypeExists = true;
#applyToAllDossiers: boolean;
readonly #dossier: Dossier;
@ -43,7 +39,6 @@ export class AddHintDialogComponent
super();
this.#dossier = _activeDossiersService.find(this.data.dossierId);
this.#applyToAllDossiers = this.data.applyToAllDossiers ?? true;
this.#manualRedactionTypeExists = this._dictionaryService.hasManualType(this.#dossier.dossierTemplateId);
this.options = getRedactOrHintOptions(this.#dossier, this.#isRss, true, this.#applyToAllDossiers, this.data.isApprover);
this.form = this.#getForm();
@ -122,11 +117,8 @@ export class AddHintDialogComponent
#getForm(): UntypedFormGroup {
return this._formBuilder.group({
selectedText: this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value,
reason: [null],
comment: [null],
dictionary: [this.#manualRedactionTypeExists ? SuperTypes.ManualRedaction : null],
classification: ['non-readable content'],
section: [null],
dictionary: [null],
option: [this.options[0]],
});
}
@ -134,7 +126,7 @@ export class AddHintDialogComponent
#enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
addRedactionRequest.reason = 'Dictionary Request';
addRedactionRequest.type = this.form.get('dictionary').value;
addRedactionRequest.section = this.form.get('section').value;
addRedactionRequest.section = null;
addRedactionRequest.value = this.form.get('selectedText').value;
const selectedType = this.dictionaries.find(d => d.type === addRedactionRequest.type);
@ -154,10 +146,6 @@ export class AddHintDialogComponent
if (!this.#isRss) {
this.options[1].extraOption.checked = this.#applyToAllDossiers;
}
if (this.dictionaryRequest) {
this.form.get('dictionary').setValue(null);
return;
}
this.form.get('dictionary').setValue(this.#manualRedactionTypeExists ? SuperTypes.ManualRedaction : null);
this.form.get('dictionary').setValue(null);
}
}

56
apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html Normal file
View File

@ -0,0 +1,56 @@
<section class="dialog">
<form (submit)="save()" [formGroup]="form">
<div [translate]="'add-annotation.dialog.title'" class="dialog-header heading-l"></div>
<div class="dialog-content">
<div class="iqser-input-group w-450">
<label [translate]="'add-annotation.dialog.content.selected-text'"></label>
{{ form.get('selectedText').value }}
</div>
<div class="iqser-input-group required w-450">
<label [translate]="'add-annotation.dialog.content.type'"></label>
<mat-form-field>
<mat-select formControlName="dictionary" [placeholder]="'add-annotation.dialog.content.type-placeholder' | translate">
<mat-select-trigger>{{ displayedDictionaryLabel }}</mat-select-trigger>
<mat-option
*ngFor="let dictionary of dictionaries"
[matTooltip]="dictionary.description"
[value]="dictionary.type"
matTooltipPosition="after"
>
<span> {{ dictionary.label }} </span>
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="iqser-input-group w-450">
<label [translate]="'add-annotation.dialog.content.comment'"></label>
<textarea
formControlName="comment"
iqserHasScrollbar
name="comment"
rows="4"
type="text"
[placeholder]="'add-annotation.dialog.content.comment-placeholder' | translate"
></textarea>
</div>
</div>
<div class="dialog-actions">
<iqser-icon-button
[label]="'add-annotation.dialog.actions.save' | translate"
[submit]="true"
[type]="iconButtonTypes.primary"
[disabled]="disabled"
>
</iqser-icon-button>
<div class="all-caps-label cancel" mat-dialog-close [translate]="'add-annotation.dialog.actions.cancel'"></div>
</div>
</form>
<iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
</section>

8
apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.scss Normal file
View File

@ -0,0 +1,8 @@
label {
font-weight: bold;
padding-bottom: 8px;
}
iqser-details-radio {
padding-top: 20px;
}

84
apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.ts Normal file
View File

@ -0,0 +1,84 @@
import { Component, OnInit } from '@angular/core';
import { IconButtonTypes, IqserPermissionsService } from '@iqser/common-ui';
import { Dictionary, Dossier, IAddRedactionRequest, SuperTypes } from '@red/domain';
import { FormBuilder, UntypedFormGroup } from '@angular/forms';
import { Roles } from '@users/roles';
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { IqserDialogComponent } from '@iqser/common-ui';
import { AddAnnotationData, AddAnnotationResult } from '../../../utils/dialog-types';
@Component({
templateUrl: './add-annotation-dialog.component.html',
styleUrls: ['./add-annotation-dialog.component.scss'],
})
export class AddAnnotationDialogComponent
extends IqserDialogComponent<AddAnnotationDialogComponent, AddAnnotationData, AddAnnotationResult>
implements OnInit
{
readonly iconButtonTypes = IconButtonTypes;
dictionaries: Dictionary[] = [];
form!: UntypedFormGroup;
readonly #dossier: Dossier;
readonly #isRss = this._iqserPermissionsService.has(Roles.getRss);
constructor(
private readonly _activeDossiersService: ActiveDossiersService,
private readonly _dictionaryService: DictionaryService,
private readonly _iqserPermissionsService: IqserPermissionsService,
private readonly _formBuilder: FormBuilder,
) {
super();
this.#dossier = _activeDossiersService.find(this.data.dossierId);
this.form = this.#getForm();
}
get displayedDictionaryLabel() {
const dictType = this.form.get('dictionary').value;
if (dictType) {
return this.dictionaries.find(d => d.type === dictType)?.label ?? null;
}
return null;
}
get disabled() {
return !this.#isRss || !this.form.get('dictionary').value;
}
async ngOnInit(): Promise<void> {
this.dictionaries = this._dictionaryService.getRedactionTypes(this.#dossier.dossierTemplateId);
}
save(): void {
this.#enhanceManualRedaction(this.data.manualRedactionEntryWrapper.manualRedactionEntry);
const redaction = this.data.manualRedactionEntryWrapper.manualRedactionEntry;
this.dialogRef.close({
redaction,
dictionary: this.dictionaries.find(d => d.type === this.form.get('dictionary').value),
});
}
#getForm(): UntypedFormGroup {
return this._formBuilder.group({
selectedText: this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value,
comment: [null],
dictionary: [null],
});
}
#enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
addRedactionRequest.type = this.form.get('dictionary').value;
const selectedType = this.dictionaries.find(d => d.type === addRedactionRequest.type);
addRedactionRequest.addToDictionary = !!selectedType?.hasDictionary;
if (!addRedactionRequest.reason) {
addRedactionRequest.reason = 'Dictionary Request';
}
const commentValue = this.form.get('comment').value;
addRedactionRequest.comment = commentValue ? { text: commentValue } : null;
addRedactionRequest.section = null;
addRedactionRequest.value = this.form.get('selectedText').value;
}
}

34
apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/remove-annotation-dialog/remove-annotation-dialog.component.html Normal file
View File

@ -0,0 +1,34 @@
<section class="dialog">
<form (submit)="save()" [formGroup]="form">
<div [innerHTML]="'remove-annotation.dialog.title' | translate" class="dialog-header heading-l"></div>
<div class="dialog-content">
<iqser-details-radio [options]="options" formControlName="option"></iqser-details-radio>
<div class="iqser-input-group w-450">
<label [translate]="'remove-annotation.dialog.content.comment'"></label>
<textarea
formControlName="comment"
iqserHasScrollbar
name="comment"
rows="4"
type="text"
[placeholder]="'remove-annotation.dialog.content.comment-placeholder' | translate"
></textarea>
</div>
</div>
<div class="dialog-actions">
<iqser-icon-button
[label]="'remove-annotation.dialog.actions.save' | translate"
[submit]="true"
[type]="iconButtonTypes.primary"
>
</iqser-icon-button>
<div class="all-caps-label cancel" mat-dialog-close [translate]="'remove-annotation.dialog.actions.cancel'"></div>
</div>
</form>
<iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
</section>

0
apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/remove-annotation-dialog/remove-annotation-dialog.component.scss Normal file
View File

44
apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/remove-annotation-dialog/remove-annotation-dialog.component.ts Normal file
View File

@ -0,0 +1,44 @@
import { Component } from '@angular/core';
import { DetailsRadioOption, IconButtonTypes } from '@iqser/common-ui';
import { FormBuilder, UntypedFormGroup } from '@angular/forms';
import { IqserDialogComponent } from '@iqser/common-ui';
import { PermissionsService } from '@services/permissions.service';
import { RemoveAnnotationData, RemoveAnnotationResult } from '../../../utils/dialog-types';
import { getRemoveRedactionOptions, RemoveAnnotationOption, RemoveAnnotationOptions } from '../../../utils/dialog-options';
@Component({
templateUrl: './remove-annotation-dialog.component.html',
styleUrls: ['./remove-annotation-dialog.component.scss'],
})
export class RemoveAnnotationDialogComponent extends IqserDialogComponent<
RemoveAnnotationDialogComponent,
RemoveAnnotationData,
RemoveAnnotationResult
> {
readonly iconButtonTypes = IconButtonTypes;
readonly options: DetailsRadioOption<RemoveAnnotationOption>[];
form!: UntypedFormGroup;
constructor(private readonly _formBuilder: FormBuilder, private readonly _permissionsService: PermissionsService) {
super();
this.options = getRemoveRedactionOptions(this.data, true);
this.form = this.#getForm();
}
get #applyToAllDossiers(): boolean {
const selectedOption = this.form.get('option').value.value;
return selectedOption === RemoveAnnotationOptions.IN_DOSSIER || selectedOption === RemoveAnnotationOptions.FALSE_POSITIVE;
}
save(): void {
this.dialogRef.close({ ...this.form.getRawValue(), applyToAllDossiers: this.#applyToAllDossiers });
}
#getForm(): UntypedFormGroup {
return this._formBuilder.group({
comment: [null],
option: [this.options[0]],
});
}
}

9
apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
View File

@ -10,16 +10,16 @@ import { LegalBasisOption } from '../manual-redaction-dialog/manual-annotation-d
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { tap } from 'rxjs/operators';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { IqserDialogComponent } from '@common-ui/dialog/iqser-dialog-component.directive';
import { IqserDialogComponent } from '@iqser/common-ui';
import { getRedactOrHintOptions, RedactOrHintOption, RedactOrHintOptions } from '../../utils/dialog-options';
import { RedactOrHintData, RedactOrHintResult } from '../../utils/dialog-types';
import { RedactTextData, RedactTextResult } from '../../utils/dialog-types';
@Component({
templateUrl: './redact-text-dialog.component.html',
styleUrls: ['./redact-text-dialog.component.scss'],
})
export class RedactTextDialogComponent
extends IqserDialogComponent<RedactTextDialogComponent, RedactOrHintData, RedactOrHintResult>
extends IqserDialogComponent<RedactTextDialogComponent, RedactTextData, RedactTextResult>
implements OnInit
{
readonly roles = Roles;
@ -137,7 +137,6 @@ export class RedactTextDialogComponent
reason: [null],
comment: [null],
dictionary: [this.#manualRedactionTypeExists ? SuperTypes.ManualRedaction : null],
section: [null],
option: [this.options[0]],
});
}
@ -150,7 +149,7 @@ export class RedactTextDialogComponent
#enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
addRedactionRequest.type = this.form.get('dictionary').value;
addRedactionRequest.section = this.form.get('section').value;
addRedactionRequest.section = null;
addRedactionRequest.value = this.form.get('selectedText').value;
const legalOption: LegalBasisOption = this.form.get('reason').value;

2
apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
View File

@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { DetailsRadioOption, IconButtonTypes } from '@iqser/common-ui';
import { FormBuilder, UntypedFormGroup } from '@angular/forms';
import { IqserDialogComponent } from '@common-ui/dialog/iqser-dialog-component.directive';
import { IqserDialogComponent } from '@iqser/common-ui';
import { PermissionsService } from '@services/permissions.service';
import { tap } from 'rxjs/operators';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';

24
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -73,7 +73,8 @@ import { copyLocalStorageFiltersValues, FilterService, NestedFilter, processFilt
import { AutoUnsubscribe, Bind, bool, Debounce, List, OnAttach, OnDetach } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
import { AddHintDialogComponent } from './dialogs/add-hint-dialog/add-hint-dialog.component';
import { RedactOrHintData } from './utils/dialog-types';
import { AddAnnotationDialogComponent } from './dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component';
import { RedactTextData } from './utils/dialog-types';
const textActions = [TextPopups.REDACT_TEXT, TextPopups.ADD_HINT, TextPopups.ADD_FALSE_POSITIVE];
@ -368,16 +369,13 @@ export class FilePreviewScreenComponent
);
}
async openRedactTextDialog(manualRedactionEntryWrapper: ManualRedactionEntryWrapper) {
async #openRedactTextDialog(manualRedactionEntryWrapper: ManualRedactionEntryWrapper) {
const file = this.state.file();
const hint = manualRedactionEntryWrapper.type === ManualRedactionEntryTypes.HINT;
const data = this.#getRedactTextDialogData(manualRedactionEntryWrapper, file);
const ref = hint
? this._iqserDialog.openDefault(AddHintDialogComponent, { data: data as RedactOrHintData })
: this._iqserDialog.openDefault(RedactTextDialogComponent, { data: data as RedactOrHintData });
const result = await this.#getRedactTextDialog(hint, data).result();
const result = await ref.result();
if (!result) {
return;
}
@ -652,7 +650,7 @@ export class FilePreviewScreenComponent
});
this.addActiveScreenSubscription = this.pdfProxyService.redactTextRequested$.subscribe($event => {
this.openRedactTextDialog($event).then();
this.#openRedactTextDialog($event).then();
});
this.addActiveScreenSubscription = this.pdfProxyService.pageChanged$.subscribe(page =>
@ -850,7 +848,17 @@ export class FilePreviewScreenComponent
}
}
#getRedactTextDialogData(manualRedactionEntryWrapper: ManualRedactionEntryWrapper, file: File) {
#getRedactTextDialog(hint: boolean, data: RedactTextData) {
if (this.#isDocumine) {
return this._iqserDialog.openDefault(AddAnnotationDialogComponent, { data });
}
if (hint) {
return this._iqserDialog.openDefault(AddHintDialogComponent, { data });
}
return this._iqserDialog.openDefault(RedactTextDialogComponent, { data });
}
#getRedactTextDialogData(manualRedactionEntryWrapper: ManualRedactionEntryWrapper, file: File): RedactTextData {
const dossierTemplate = this._dossierTemplatesService.find(this.state.dossierTemplateId);
const data = {

4
apps/red-ui/src/app/modules/file-preview/file-preview.module.ts
View File

@ -67,6 +67,8 @@ import { IqserFiltersModule } from '@iqser/common-ui/lib/filtering';
import { StatusBarComponent } from '@iqser/common-ui/lib/shared';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
import { AddHintDialogComponent } from './dialogs/add-hint-dialog/add-hint-dialog.component';
import { AddAnnotationDialogComponent } from './dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component';
import { RemoveAnnotationDialogComponent } from './dialogs/docu-mine/remove-annotation-dialog/remove-annotation-dialog.component';
const routes: IqserRoutes = [
{
@ -91,6 +93,8 @@ const dialogs = [
RedactTextDialogComponent,
AddHintDialogComponent,
RemoveRedactionDialogComponent,
AddAnnotationDialogComponent,
RemoveAnnotationDialogComponent,
];
const components = [

54
apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts
View File

@ -19,7 +19,7 @@ import {
AcceptRecommendationDialogComponent,
AcceptRecommendationReturnType,
} from '../dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component';
import { defaultDialogConfig } from '@iqser/common-ui';
import { defaultDialogConfig, getConfig } from '@iqser/common-ui';
import { filter } from 'rxjs/operators';
import { MatDialog } from '@angular/material/dialog';
import { FilePreviewStateService } from './file-preview-state.service';
@ -34,11 +34,19 @@ import { IqserDialog } from '@common-ui/dialog/iqser-dialog.service';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { isJustOne, List } from '@iqser/common-ui/lib/utils';
import { PermissionsService } from '@services/permissions.service';
import { RemoveRedactionPermissions, RemoveRedactionResult } from '../utils/dialog-types';
import {
RedactTextData,
RemoveAnnotationResult,
RemoveRedactionData,
RemoveRedactionPermissions,
RemoveRedactionResult,
} from '../utils/dialog-types';
import { RemoveRedactionOptions } from '../utils/dialog-options';
import { RemoveAnnotationDialogComponent } from '../dialogs/docu-mine/remove-annotation-dialog/remove-annotation-dialog.component';
@Injectable()
export class AnnotationActionsService {
readonly #isDocumine;
constructor(
private readonly _manualRedactionService: ManualRedactionService,
private readonly _dialogService: FilePreviewDialogService,
@ -53,13 +61,8 @@ export class AnnotationActionsService {
private readonly _skippedService: SkippedService,
private readonly _dossierTemplatesService: DossierTemplatesService,
private readonly _permissionsService: PermissionsService,
) {}
acceptSuggestion(annotations: AnnotationWrapper[]) {
const { dossierId, fileId } = this._state;
const ids = annotations.map(a => a.id);
const request = this._manualRedactionService.approve(ids, dossierId, fileId);
this.#processObsAndEmit(request).then();
) {
this.#isDocumine = getConfig().IS_DOCUMINE;
}
removeHighlights(highlights: AnnotationWrapper[]): void {
@ -127,18 +130,16 @@ export class AnnotationActionsService {
const dossierTemplate = this._dossierTemplatesService.find(this._state.dossierTemplateId);
const isApprover = this._permissionsService.isApprover(this._state.dossier());
const result: RemoveRedactionResult = await this._iqserDialog
.openDefault(RemoveRedactionDialogComponent, {
data: {
redaction,
dossier: this._state.dossier(),
falsePositiveContext: this._getFalsePositiveText(redaction),
permissions: removePermissions,
applyToAllDossiers: isApprover ? dossierTemplate.applyDictionaryUpdatesToAllDossiersByDefault : false,
isApprover,
},
})
.result();
const data = {
redaction,
dossier: this._state.dossier(),
falsePositiveContext: this._getFalsePositiveText(redaction),
permissions: removePermissions,
applyToAllDossiers: isApprover ? dossierTemplate.applyDictionaryUpdatesToAllDossiersByDefault : false,
isApprover,
};
const result = await this.#getRemoveRedactionDialog(data).result();
if (result) {
if (result.option.value === RemoveRedactionOptions.FALSE_POSITIVE) {
@ -382,7 +383,7 @@ export class AnnotationActionsService {
type: redaction.type,
positions: redaction.positions,
addToDictionary: true,
addToAllDossiers: !!dialogResult.option.extraOption?.checked,
addToAllDossiers: !!dialogResult.option.extraOption?.checked || !!dialogResult.applyToAllDossiers,
reason: 'False Positive',
dictionaryEntryType: redaction.isRecommendation
? DictionaryEntryTypes.FALSE_RECOMMENDATION
@ -400,11 +401,18 @@ export class AnnotationActionsService {
annotationId: redaction.id,
comment: dialogResult.comment,
removeFromDictionary,
removeFromAllDossiers: !!dialogResult.option.extraOption?.checked,
removeFromAllDossiers: !!dialogResult.option.extraOption?.checked || !!dialogResult.applyToAllDossiers,
};
const { dossierId, fileId } = this._state;
this.#processObsAndEmit(
this._manualRedactionService.removeRedaction([body], dossierId, fileId, removeFromDictionary, redaction.isHint),
).then();
}
#getRemoveRedactionDialog(data: RemoveRedactionData) {
if (this.#isDocumine) {
return this._iqserDialog.openDefault(RemoveAnnotationDialogComponent, { data });
}
return this._iqserDialog.openDefault(RemoveRedactionDialogComponent, { data });
}
}

21
apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
View File

@ -9,7 +9,7 @@ import {
} from '@models/file/manual-redaction-entry.wrapper';
import { AnnotationDrawService } from '../../pdf-viewer/services/annotation-draw.service';
import { UserPreferenceService } from '@users/user-preference.service';
import { IqserPermissionsService } from '@iqser/common-ui';
import { getConfig, IqserPermissionsService } from '@iqser/common-ui';
import { toPosition } from '../utils/pdf-calculation.utils';
import { MultiSelectService } from './multi-select.service';
import { FilePreviewStateService } from './file-preview-state.service';
@ -50,6 +50,7 @@ export class PdfProxyService {
readonly #addRedactionIcon = this._iqserPermissionsService.has(Roles.getRss)
? this._convertPath('/assets/icons/general/pdftron-action-add-annotation.svg')
: this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg');
readonly #isDocumine;
readonly #addHintIcon = this._convertPath('/assets/icons/general/pdftron-action-add-hint.svg');
readonly annotationSelected$ = this.#annotationSelected$;
readonly manualAnnotationRequested$ = new Subject<ManualRedactionEntryWrapper>();
@ -113,6 +114,7 @@ export class PdfProxyService {
this._viewerHeaderService.disable([HeaderElements.TOGGLE_READABLE_REDACTIONS]);
}
});
this.#isDocumine = getConfig().IS_DOCUMINE;
}
get #annotationSelected$() {
@ -186,13 +188,16 @@ export class PdfProxyService {
title: this.#getTitle(ManualRedactionEntryTypes.REDACT),
onClick: () => this._ngZone.run(() => this.#redactText(ManualRedactionEntryTypes.REDACT)),
});
popups.push({
type: 'actionButton',
dataElement: TextPopups.ADD_HINT,
img: this.#addHintIcon,
title: this.#getTitle(ManualRedactionEntryTypes.HINT),
onClick: () => this._ngZone.run(() => this.#redactText(ManualRedactionEntryTypes.HINT)),
});
if (!this.#isDocumine) {
popups.push({
type: 'actionButton',
dataElement: TextPopups.ADD_HINT,
img: this.#addHintIcon,
title: this.#getTitle(ManualRedactionEntryTypes.HINT),
onClick: () => this._ngZone.run(() => this.#redactText(ManualRedactionEntryTypes.HINT)),
});
}
}
this._pdf.configureTextPopups(popups);

34
apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
View File

@ -4,6 +4,7 @@ import { redactTextTranslations } from '@translations/redact-text-translations';
import { Dossier } from '@red/domain';
import { removeRedactionTranslations } from '@translations/remove-redaction-translations';
import { RemoveRedactionData } from './dialog-types';
import { removeAnnotationTranslations } from '@translations/remove-annotation-translations';
const PIN_ICON = 'red:push-pin';
const FOLDER_ICON = 'red:folder';
@ -21,8 +22,10 @@ export const RemoveRedactionOptions = {
IN_DOSSIER: 'IN_DOSSIER',
FALSE_POSITIVE: 'FALSE_POSITIVE',
} as const;
export const RemoveAnnotationOptions = RemoveRedactionOptions;
export type RemoveRedactionOption = keyof typeof RemoveRedactionOptions;
export type RemoveAnnotationOption = RemoveRedactionOption;
export const getRedactOrHintOptions = (
dossier: Dossier,
@ -57,8 +60,11 @@ export const getRedactOrHintOptions = (
return options;
};
export const getRemoveRedactionOptions = (data: RemoveRedactionData): DetailsRadioOption<RemoveRedactionOption>[] => {
const translations = removeRedactionTranslations;
export const getRemoveRedactionOptions = (
data: RemoveRedactionData,
isDocumine: boolean = false,
): DetailsRadioOption<RemoveRedactionOption>[] => {
const translations = isDocumine ? removeAnnotationTranslations : removeRedactionTranslations;
const { permissions, redaction, applyToAllDossiers, isApprover, falsePositiveContext } = data;
const options: DetailsRadioOption<RemoveRedactionOption>[] = [];
@ -78,11 +84,13 @@ export const getRemoveRedactionOptions = (data: RemoveRedactionData): DetailsRad
descriptionParams: { type: redaction.hint ? 'hint' : 'redact', value: redaction.value },
icon: FOLDER_ICON,
value: RemoveRedactionOptions.IN_DOSSIER,
extraOption: {
label: translations.IN_DOSSIER.extraOptionLabel,
checked: applyToAllDossiers ?? true,
hidden: !isApprover,
},
extraOption: !isDocumine
? {
label: translations.IN_DOSSIER.extraOptionLabel,
checked: applyToAllDossiers ?? true,
hidden: !isApprover,
}
: null,
});
}
if (permissions.canMarkAsFalsePositive) {
@ -92,11 +100,13 @@ export const getRemoveRedactionOptions = (data: RemoveRedactionData): DetailsRad
descriptionParams: { value: redaction.value, type: redaction.type, context: falsePositiveContext },
icon: REMOVE_FROM_DICT_ICON,
value: RemoveRedactionOptions.FALSE_POSITIVE,
extraOption: {
label: translations.FALSE_POSITIVE.extraOptionLabel,
checked: applyToAllDossiers ?? true,
hidden: !isApprover,
},
extraOption: !isDocumine
? {
label: translations.FALSE_POSITIVE.extraOptionLabel,
checked: applyToAllDossiers ?? true,
hidden: !isApprover,
}
: null,
});
}
return options;

22
apps/red-ui/src/app/modules/file-preview/utils/dialog-types.ts
View File

@ -4,19 +4,27 @@ import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { DetailsRadioOption } from '@iqser/common-ui';
import { RemoveRedactionOption } from './dialog-options';
export interface RedactOrHintData {
export interface AddAnnotationData {
manualRedactionEntryWrapper: ManualRedactionEntryWrapper;
dossierId: string;
file: File;
applyToAllDossiers: boolean;
isApprover: boolean;
}
export interface RedactOrHintResult {
export interface RedactTextData extends AddAnnotationData {
applyToAllDossiers?: boolean;
isApprover?: boolean;
}
export type AddHintData = RedactTextData;
export interface RedactTextResult {
redaction: IManualRedactionEntry;
dictionary: Dictionary;
}
export type AddHintResult = RedactTextResult;
export type AddAnnotationResult = RedactTextResult;
export interface RemoveRedactionPermissions {
canRemoveOnlyHere: boolean;
canRemoveFromDictionary: boolean;
@ -32,8 +40,12 @@ export interface RemoveRedactionData {
isApprover: boolean;
}
export type RemoveAnnotationData = RemoveRedactionData;
export interface RemoveRedactionResult {
comment: string;
option: DetailsRadioOption<RemoveRedactionOption>;
applyToAllDossiers: boolean | null;
applyToAllDossiers?: boolean;
}
export type RemoveAnnotationResult = RemoveRedactionResult;

10
apps/red-ui/src/app/services/entity-services/dictionary.service.ts
View File

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { firstValueFrom, forkJoin, Observable, of, throwError } from 'rxjs';
import { firstValueFrom, forkJoin, Observable, throwError } from 'rxjs';
import { EntitiesService, QueryParam, Toaster } from '@iqser/common-ui';
import { Dictionary, DictionaryEntryType, DictionaryEntryTypes, IDictionary, IUpdateDictionary, SuperTypes } from '@red/domain';
import { catchError, map, switchMap, tap } from 'rxjs/operators';
@ -213,9 +213,7 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
}
});
possibleDictionaries.sort((a, b) => a.label.localeCompare(b.label));
return possibleDictionaries;
return possibleDictionaries.sort((a, b) => a.label.localeCompare(b.label));
}
getRedactionTypes(dossierTemplateId: string): Dictionary[] {
@ -227,9 +225,7 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
}
}
possibleDictionaries.sort((a, b) => a.label.localeCompare(b.label));
return possibleDictionaries;
return possibleDictionaries.sort((a, b) => a.label.localeCompare(b.label));
}
async getDictionariesOptions(dossierTemplateId: string, dossierId: string): Promise<Dictionary[]> {

4
apps/red-ui/src/app/translations/add-hint-translations.ts
View File

@ -1,7 +1,7 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { RedactOrHintOption } from '@translations/redact-text-translations';
import { DialogOption } from '@translations/redact-text-translations';
export const addHintTranslations: Record<'onlyHere' | 'inDossier', RedactOrHintOption> = {
export const addHintTranslations: Record<'onlyHere' | 'inDossier', DialogOption> = {
onlyHere: {
label: _('add-hint.dialog.content.options.only-here.label'),
description: _('add-hint.dialog.content.options.only-here.description'),

4
apps/red-ui/src/app/translations/redact-text-translations.ts
View File

@ -1,12 +1,12 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
export interface RedactOrHintOption {
export interface DialogOption {
label: string;
description: string;
extraOptionLabel?: string;
}
export const redactTextTranslations: Record<'onlyHere' | 'inDossier', RedactOrHintOption> = {
export const redactTextTranslations: Record<'onlyHere' | 'inDossier', DialogOption> = {
onlyHere: {
label: _('redact-text.dialog.content.options.only-here.label'),
description: _('redact-text.dialog.content.options.only-here.description'),

18
apps/red-ui/src/app/translations/remove-annotation-translations.ts Normal file
View File

@ -0,0 +1,18 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { RemoveAnnotationOption } from '../modules/file-preview/utils/dialog-options';
import { DialogOption } from '@translations/redact-text-translations';
export const removeAnnotationTranslations: { [key in RemoveAnnotationOption]: DialogOption } = {
ONLY_HERE: {
label: _('remove-annotation.dialog.content.options.only-here.label'),
description: _('remove-annotation.dialog.content.options.only-here.description'),
},
IN_DOSSIER: {
label: _('remove-annotation.dialog.content.options.in-dossier.label'),
description: _('remove-annotation.dialog.content.options.in-dossier.description'),
},
FALSE_POSITIVE: {
label: _('remove-annotation.dialog.content.options.false-positive.label'),
description: _('remove-annotation.dialog.content.options.false-positive.description'),
},
};

9
apps/red-ui/src/app/translations/remove-redaction-translations.ts
View File

@ -1,13 +1,8 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { RemoveRedactionOption } from '../modules/file-preview/utils/dialog-options';
import { DialogOption } from '@translations/redact-text-translations';
interface Option {
label: string;
description: string;
extraOptionLabel?: string;
}
export const removeRedactionTranslations: { [key in RemoveRedactionOption]: Option } = {
export const removeRedactionTranslations: { [key in RemoveRedactionOption]: DialogOption } = {
ONLY_HERE: {
label: _('remove-redaction.dialog.content.options.only-here.label'),
description: _('remove-redaction.dialog.content.options.only-here.description'),

6
apps/red-ui/src/assets/config/config.json
View File

@ -1,9 +1,9 @@
{
"ADMIN_CONTACT_NAME": null,
"ADMIN_CONTACT_URL": null,
"API_URL": "https://dan.iqser.cloud",
"API_URL": "https://dev-04.iqser.cloud",
"APP_NAME": "RedactManager very very very very long",
"IS_DOCUMINE": false,
"IS_DOCUMINE": true,
"AUTO_READ_TIME": 3,
"BACKEND_APP_VERSION": "4.4.40",
"EULA_URL": "EULA_URL",
@ -12,7 +12,7 @@
"MAX_RETRIES_ON_SERVER_ERROR": 3,
"OAUTH_CLIENT_ID": "redaction",
"OAUTH_IDP_HINT": null,
"OAUTH_URL": "https://dan.iqser.cloud/auth",
"OAUTH_URL": "https://dev-04.iqser.cloud/auth",
"RECENT_PERIOD_IN_HOURS": 24,
"SELECTION_MODE": "structural",
"MANUAL_BASE_URL": "https://docs.redactmanager.com/preview",

43
apps/red-ui/src/assets/i18n/redact/de.json
View File

@ -11,6 +11,22 @@
"all": "Alle",
"none": "Keine"
},
"add-annotation": {
"dialog": {
"actions": {
"cancel": "",
"save": ""
},
"content": {
"comment": "",
"comment-placeholder": "",
"selected-text": "",
"type": "",
"type-placeholder": ""
},
"title": ""
}
},
"add-dossier-dialog": {
"actions": {
"save": "Speichern",
@ -1964,6 +1980,33 @@
},
"redaction-abbreviation": "R",
"references": "",
"remove-annotation": {
"dialog": {
"actions": {
"cancel": "",
"save": ""
},
"content": {
"comment": "",
"comment-placeholder": "",
"options": {
"false-positive": {
"description": "",
"label": ""
},
"in-dossier": {
"description": "",
"label": ""
},
"only-here": {
"description": "",
"label": ""
}
}
},
"title": ""
}
},
"remove-redaction": {
"dialog": {
"actions": {

43
apps/red-ui/src/assets/i18n/redact/en.json
View File

@ -11,6 +11,22 @@
"all": "All",
"none": "None"
},
"add-annotation": {
"dialog": {
"actions": {
"cancel": "Cancel",
"save": "Save"
},
"content": {
"comment": "Comment",
"comment-placeholder": "Add remarks or mentions...",
"selected-text": "Selected text:",
"type": "Type",
"type-placeholder": "Select type ..."
},
"title": "Add annotation"
}
},
"add-dossier-dialog": {
"actions": {
"save": "Save",
@ -1964,6 +1980,33 @@
},
"redaction-abbreviation": "R",
"references": "{count} {count, plural, one{reference} other{references}}",
"remove-annotation": {
"dialog": {
"actions": {
"cancel": "Cancel",
"save": "Save"
},
"content": {
"comment": "Comment",
"comment-placeholder": "Add remarks or mentions ...",
"options": {
"false-positive": {
"description": "\"{value}\" is not a {type} in this context: \"{context}\".",
"label": "False positive"
},
"in-dossier": {
"description": "Do not annotate \"{value}\" in any document of the current dossier.",
"label": "Remove from dossier"
},
"only-here": {
"description": "Do not annotate \"{value}\" at this position in the current document.",
"label": "Remove here"
}
}
},
"title": "Remove annotation"
}
},
"remove-redaction": {
"dialog": {
"actions": {

43
apps/red-ui/src/assets/i18n/scm/de.json
View File

@ -11,6 +11,22 @@
"all": "Alle",
"none": "Keine"
},
"add-annotation": {
"dialog": {
"actions": {
"cancel": "",
"save": ""
},
"content": {
"comment": "",
"comment-placeholder": "",
"selected-text": "",
"type": "",
"type-placeholder": ""
},
"title": ""
}
},
"add-dossier-dialog": {
"actions": {
"save": "Speichern",
@ -1964,6 +1980,33 @@
},
"redaction-abbreviation": "C",
"references": "",
"remove-annotation": {
"dialog": {
"actions": {
"cancel": "",
"save": ""
},
"content": {
"comment": "",
"comment-placeholder": "",
"options": {
"false-positive": {
"description": "",
"label": ""
},
"in-dossier": {
"description": "",
"label": ""
},
"only-here": {
"description": "",
"label": ""
}
}
},
"title": ""
}
},
"remove-redaction": {
"dialog": {
"actions": {

43
apps/red-ui/src/assets/i18n/scm/en.json
View File

@ -11,6 +11,22 @@
"all": "All",
"none": "None"
},
"add-annotation": {
"dialog": {
"actions": {
"cancel": "Cancel",
"save": "Save"
},
"content": {
"comment": "Comment",
"comment-placeholder": "Add remarks or mentions...",
"selected-text": "Selected text:",
"type": "Type",
"type-placeholder": "Select type ..."
},
"title": "Add annotation"
}
},
"add-dossier-dialog": {
"actions": {
"save": "Save",
@ -1964,6 +1980,33 @@
},
"redaction-abbreviation": "A",
"references": "{count} {count, plural, one{reference} other{references}}",
"remove-annotation": {
"dialog": {
"actions": {
"cancel": "Cancel",
"save": "Save"
},
"content": {
"comment": "Comment",
"comment-placeholder": "Add remarks or mentions ...",
"options": {
"false-positive": {
"description": "\"{value}\" is not a {type} in this context: \"{context}\".",
"label": "False positive"
},
"in-dossier": {
"description": "Do not annotate \"{value}\" in any document of the current dossier.",
"label": "Remove from dossier"
},
"only-here": {
"description": "Do not annotate \"{value}\" at this position in the current document.",
"label": "Remove here"
}
}
},
"title": "Remove annotation"
}
},
"remove-redaction": {
"dialog": {
"actions": {