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

RED-7340 - converted ManualAnnotationDialog into RectangleAnnotationDialog

Browse Source
This commit is contained in:
Valentin Mihai 2024-10-05 20:50:40 +03:00
parent 40d9eb15cf
commit 7a1e968a52
18 changed files with 139 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts
View File

@ -11,12 +11,7 @@ import { MatOption, MatSelect, MatSelectTrigger } from '@angular/material/select
import { NgForOf, NgIf } from '@angular/common';
import { MatTooltip } from '@angular/material/tooltip';
import { TranslateModule } from '@ngx-translate/core';
export interface LegalBasisOption {
label?: string;
legalBasis?: string;
description?: string;
}
import { LegalBasisOption } from '../../utils/dialog-types';
@Component({
templateUrl: './change-legal-basis-dialog.component.html',

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

@ -26,8 +26,7 @@ import {
ValueColumn,
} from '../../components/selected-annotations-table/selected-annotations-table.component';
import { getEditRedactionOptions } from '../../utils/dialog-options';
import { EditRedactionData, EditRedactionOption, EditRedactResult } from '../../utils/dialog-types';
import { LegalBasisOption } from '../manual-redaction-dialog/manual-annotation-dialog.component';
import { EditRedactionData, EditRedactionOption, EditRedactResult, LegalBasisOption } from '../../utils/dialog-types';
import { DetailsRadioComponent } from '@common-ui/inputs/details-radio/details-radio.component';
import { DetailsRadioOption } from '@common-ui/inputs/details-radio/details-radio-option';

10
apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts
View File

@ -26,17 +26,11 @@ import { MatOption, MatSelect, MatSelectTrigger } from '@angular/material/select
import { MatTooltip } from '@angular/material/tooltip';
import { TranslateModule } from '@ngx-translate/core';
import { DetailsRadioOption } from '@common-ui/inputs/details-radio/details-radio-option';
import { ForceAnnotationOption, RedactOrHintOption } from '../../utils/dialog-types';
import { getForceAnnotationOptions, getRedactOrHintOptions } from '../../utils/dialog-options';
import { ForceAnnotationOption, LegalBasisOption } from '../../utils/dialog-types';
import { getForceAnnotationOptions } from '../../utils/dialog-options';
import { DetailsRadioComponent } from '@common-ui/inputs/details-radio/details-radio.component';
import { SystemDefaults } from '../../../account/utils/dialog-defaults';
export interface LegalBasisOption {
label?: string;
legalBasis?: string;
description?: string;
}
const DOCUMINE_LEGAL_BASIS = 'n-a.';
@Component({

38
apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html → apps/red-ui/src/app/modules/file-preview/dialogs/rectangle-annotation-dialog/rectangle-annotation-dialog.component.html
View File

@ -3,35 +3,11 @@
<div [translate]="title" class="dialog-header heading-l"></div>
<div class="dialog-content">
<iqser-details-radio [options]="options" (extraOptionChanged)="extraOptionChanged($event)" formControlName="option">
</iqser-details-radio>
<div *ngIf="!isRectangle" class="iqser-input-group w-450">
<label [translate]="'manual-annotation.dialog.content.text'"></label>
<div *ngIf="!isEditingSelectedText" class="flex-align-items-center">
{{ form.get('selectedText').value }}
<iqser-circle-button
(action)="isEditingSelectedText = true"
*ngIf="isDictionaryRequest"
[tooltip]="'manual-annotation.dialog.content.edit-selected-text' | translate"
icon="iqser:edit"
tooltipPosition="below"
></iqser-circle-button>
</div>
<textarea
*ngIf="isEditingSelectedText"
formControlName="selectedText"
iqserHasScrollbar
name="comment"
rows="4"
type="text"
></textarea>
</div>
<div *ngIf="isRectangle" class="iqser-input-group">
<label [translate]="'manual-annotation.dialog.content.rectangle'"></label>
</div>
<iqser-details-radio
[options]="options"
(extraOptionChanged)="extraOptionChanged($event)"
formControlName="option"
></iqser-details-radio>
<div
*ngIf="!isFalsePositiveRequest && (isDictionaryRequest || !manualRedactionTypeExists)"
@ -80,12 +56,12 @@
<input [value]="form.get('reason').value?.legalBasis" disabled type="text" />
</div>
<div *ngIf="isRectangle" class="iqser-input-group w-450">
<div class="iqser-input-group w-450">
<label [translate]="'manual-annotation.dialog.content.section'"></label>
<input formControlName="section" name="section" type="text" />
</div>
<div *ngIf="isRectangle" class="iqser-input-group w-450">
<div class="iqser-input-group w-450">
<label [translate]="'manual-annotation.dialog.content.classification'"></label>
<input formControlName="classification" name="classification" type="text" />
</div>

5
apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.scss → apps/red-ui/src/app/modules/file-preview/dialogs/rectangle-annotation-dialog/rectangle-annotation-dialog.component.scss
View File

@ -2,6 +2,11 @@
width: 100%;
}
.dialog-content {
height: 650px;
overflow-y: auto;
}
.apply-on-multiple-pages {
min-height: 55px;
display: flex;

123
apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts → apps/red-ui/src/app/modules/file-preview/dialogs/rectangle-annotation-dialog/rectangle-annotation-dialog.component.ts
View File

@ -1,24 +1,23 @@
import { Component, Inject, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, ReactiveFormsModule, UntypedFormGroup, Validators } from '@angular/forms';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import {
BaseDialogComponent,
CircleButtonComponent,
HasScrollbarDirective,
IconButtonComponent,
IqserDenyDirective,
IqserDialogComponent,
IqserPermissionsService,
Toaster,
} from '@iqser/common-ui';
import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
import { Dictionary, Dossier, File, IAddRedactionRequest, SuperTypes } from '@red/domain';
import { Dictionary, Dossier, File, IAddRedactionRequest, IManualRedactionEntry, SuperTypes } from '@red/domain';
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { JustificationsService } from '@services/entity-services/justifications.service';
import { Roles } from '@users/roles';
import { firstValueFrom } from 'rxjs';
import { ManualRedactionService } from '../../services/manual-redaction.service';
import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-manager.service';
import { NgForOf, NgIf } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { MatFormField } from '@angular/material/form-field';
@ -26,23 +25,28 @@ import { MatOption, MatSelect, MatSelectTrigger } from '@angular/material/select
import { MatTooltip } from '@angular/material/tooltip';
import { MatCheckbox } from '@angular/material/checkbox';
import { DetailsRadioOption } from '@common-ui/inputs/details-radio/details-radio-option';
import { RectangleRedactOption, RectangleRedactOptions, RedactOrHintOption } from '../../utils/dialog-types';
import { LegalBasisOption, RectangleRedactOption, RectangleRedactOptions } from '../../utils/dialog-types';
import { getRectangleRedactOptions } from '../../utils/dialog-options';
import { DetailsRadioComponent } from '@common-ui/inputs/details-radio/details-radio.component';
import { SystemDefaults } from '../../../account/utils/dialog-defaults';
import { validatePageRange } from '../../utils/form-validators';
import { getMultiplePagesRectangle } from '../../utils/enhance-manual-redaction-request.utils';
export interface LegalBasisOption {
label?: string;
legalBasis?: string;
description?: string;
interface RectangleDialogData {
dossierId: string;
manualRedactionEntryWrapper: ManualRedactionEntryWrapper;
file: File;
}
export interface RectangleDialogResult {
annotation: IManualRedactionEntry;
dictionary: Dictionary;
}
export const NON_READABLE_CONTENT = 'non-readable content';
@Component({
templateUrl: './manual-annotation-dialog.component.html',
styleUrls: ['./manual-annotation-dialog.component.scss'],
templateUrl: './rectangle-annotation-dialog.component.html',
styleUrls: ['./rectangle-annotation-dialog.component.scss'],
standalone: true,
imports: [
ReactiveFormsModule,
@ -63,29 +67,30 @@ export const NON_READABLE_CONTENT = 'non-readable content';
],
providers: [ManualRedactionService],
})
export class ManualAnnotationDialogComponent extends BaseDialogComponent implements OnInit {
export class RectangleAnnotationDialog
extends IqserDialogComponent<RectangleAnnotationDialog, RectangleDialogData, RectangleDialogResult>
implements OnInit
{
readonly #dossier: Dossier;
protected readonly roles = Roles;
protected readonly options: DetailsRadioOption<RectangleRedactOption>[];
protected isDictionaryRequest: boolean;
protected isFalsePositiveRequest: boolean;
protected isEditingSelectedText = false;
protected applyOnMultiplePages = false;
protected manualRedactionTypeExists = true;
protected possibleDictionaries: Dictionary[] = [];
protected legalOptions: LegalBasisOption[] = [];
readonly form: UntypedFormGroup;
constructor(
readonly iqserPermissionsService: IqserPermissionsService,
private readonly iqserPermissionsService: IqserPermissionsService,
private readonly _justificationsService: JustificationsService,
private readonly _manualRedactionService: ManualRedactionService,
activeDossiersService: ActiveDossiersService,
private readonly activeDossiersService: ActiveDossiersService,
private readonly _dictionaryService: DictionaryService,
protected readonly _dialogRef: MatDialogRef<ManualAnnotationDialogComponent>,
private readonly _annotationManager: REDAnnotationManager,
@Inject(MAT_DIALOG_DATA) readonly data: { manualRedactionEntryWrapper: ManualRedactionEntryWrapper; dossierId: string; file: File },
private readonly _formBuilder: FormBuilder,
private readonly _toaster: Toaster,
) {
super(_dialogRef);
super();
this.#dossier = activeDossiersService.find(this.data.dossierId);
this.isFalsePositiveRequest = this.data.manualRedactionEntryWrapper.type === 'FALSE_POSITIVE';
@ -111,10 +116,6 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
return this._manualRedactionService.getTitle(this.data.manualRedactionEntryWrapper.type);
}
get isRectangle() {
return !!this.data.manualRedactionEntryWrapper.manualRedactionEntry.rectangle;
}
get displayedDictionaryLabel() {
const dictType = this.form.get('dictionary').value;
if (dictType) {
@ -124,7 +125,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
}
get disabled() {
return this.form.invalid || (this.applyOnMultiplePages && !this.form.get('multiplePages')?.value);
return this.form.invalid;
}
async ngOnInit() {
@ -142,21 +143,17 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
this.legalOptions.sort((a, b) => a.label.localeCompare(b.label));
this.#selectReason();
if (!this.isRectangle) {
this.#formatSelectedTextValue();
}
}
save() {
this.#enhanceManualRedaction(this.data.manualRedactionEntryWrapper.manualRedactionEntry);
try {
const annotations =
this.isRectangle && !!this.form.get('multiplePages').value
? this.#getRectangles()
: [this.data.manualRedactionEntryWrapper];
this._dialogRef.close({
annotations,
const annotation =
this.form.get('option').value.value === RectangleRedactOptions.MULTIPLE_PAGES
? getMultiplePagesRectangle(this.#multiplePagesRectangleData).manualRedactionEntry
: this.data.manualRedactionEntryWrapper;
super.close({
annotation,
dictionary: this.possibleDictionaries.find(d => d.type === this.form.get('dictionary').value),
});
} catch (e) {
@ -164,47 +161,12 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
}
}
close() {
super.close();
if (this.isRectangle) {
this._annotationManager.delete(this._annotationManager.selected[0].Id);
}
}
#getRectangles() {
const quads = this.data.manualRedactionEntryWrapper.manualRedactionEntry.positions.find(a => !!a);
const value: string = this.form.get('multiplePages').value.replace(/[^0-9-,]/g, '');
const entry = { ...this.data.manualRedactionEntryWrapper.manualRedactionEntry };
const wrapper = { ...this.data.manualRedactionEntryWrapper };
const wrappers: ManualRedactionEntryWrapper[] = [wrapper];
value.split(',').forEach(range => {
const splitted = range.split('-');
const startPage = parseInt(splitted[0], 10);
const endPage = splitted.length > 1 ? parseInt(splitted[1], 10) : startPage;
if (!startPage || !endPage || startPage > this.data.file.numberOfPages || endPage > this.data.file.numberOfPages) {
throw new Error();
}
for (let page = startPage; page <= endPage; page++) {
if (page === wrapper.manualRedactionEntry.positions[0].page) {
continue;
}
const manualRedactionEntry = { ...entry, positions: [{ ...quads, page }] };
wrappers.push({ ...wrapper, manualRedactionEntry });
}
});
return wrappers;
}
#formatSelectedTextValue() {
this.data.manualRedactionEntryWrapper.manualRedactionEntry.value =
this.data.manualRedactionEntryWrapper.manualRedactionEntry.value.replace(
// eslint-disable-next-line no-control-regex,max-len
/([^\s\d-]{2,})[-\u00AD]\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
'$1',
);
get #multiplePagesRectangleData() {
return {
manualRedactionEntryWrapper: this.data.manualRedactionEntryWrapper,
pages: this.form.get('option').value.additionalInput.value,
file: this.data.file,
};
}
#getForm() {
@ -217,7 +179,6 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
: [this.manualRedactionTypeExists ? SuperTypes.ManualRedaction : null, Validators.required],
comment: [null],
classification: [NON_READABLE_CONTENT],
multiplePages: '',
option: [this.#getOption(SystemDefaults.RECTANGLE_REDACT_DEFAULT), validatePageRange()],
});
}
@ -243,9 +204,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
const commentValue = this.form.get('comment').value;
addRedactionRequest.comment = commentValue ? { text: commentValue } : null;
addRedactionRequest.section = this.form.get('section').value;
addRedactionRequest.value = addRedactionRequest.rectangle
? this.form.get('classification').value
: this.form.get('selectedText').value;
addRedactionRequest.value = this.form.get('classification').value;
}
#getOption(option: RectangleRedactOption): DetailsRadioOption<RectangleRedactOption> {

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

@ -23,13 +23,13 @@ import {
} from '../../components/selected-annotations-table/selected-annotations-table.component';
import { getRedactOrHintOptions } from '../../utils/dialog-options';
import {
LegalBasisOption,
RedactOrHintOption,
RedactOrHintOptions,
RedactRecommendationData,
RedactRecommendationResult,
ResizeOptions,
} from '../../utils/dialog-types';
import { LegalBasisOption } from '../manual-redaction-dialog/manual-annotation-dialog.component';
@Component({
templateUrl: './redact-recommendation-dialog.component.html',

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

@ -21,8 +21,14 @@ import { firstValueFrom, Observable } from 'rxjs';
import { map, tap } from 'rxjs/operators';
import { SystemDefaultOption, SystemDefaults } from '../../../account/utils/dialog-defaults';
import { getRedactOrHintOptions } from '../../utils/dialog-options';
import { RedactOrHintOption, RedactOrHintOptions, RedactTextData, RedactTextResult, ResizeOptions } from '../../utils/dialog-types';
import { LegalBasisOption } from '../manual-redaction-dialog/manual-annotation-dialog.component';
import {
LegalBasisOption,
RedactOrHintOption,
RedactOrHintOptions,
RedactTextData,
RedactTextResult,
ResizeOptions,
} from '../../utils/dialog-types';
import { enhanceManualRedactionRequest, EnhanceRequestData } from '../../utils/enhance-manual-redaction-request.utils';
const MAXIMUM_TEXT_AREA_WIDTH = 421;

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

@ -21,7 +21,7 @@ import { copyLocalStorageFiltersValues, FilterService, NestedFilter, processFilt
import { AutoUnsubscribe, Bind, bool, List, OnAttach, OnDetach } from '@iqser/common-ui/lib/utils';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { ManualRedactionEntryTypes, ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
import { Dictionary, File, ViewModes } from '@red/domain';
import { File, ViewModes } from '@red/domain';
import { ConfigService } from '@services/config.service';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { DossiersService } from '@services/dossiers/dossiers.service';
@ -71,6 +71,7 @@ import { TypeFilterComponent } from '@shared/components/type-filter/type-filter.
import { FileHeaderComponent } from './components/file-header/file-header.component';
import { StructuredComponentManagementComponent } from './components/structured-component-management/structured-component-management.component';
import { DocumentInfoService } from './services/document-info.service';
import { RectangleAnnotationDialog } from './dialogs/rectangle-annotation-dialog/rectangle-annotation-dialog.component';
@Component({
templateUrl: './file-preview-screen.component.html',
@ -363,29 +364,27 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
this._viewerHeaderService.resetLayers();
}
openManualAnnotationDialog(manualRedactionEntryWrapper: ManualRedactionEntryWrapper) {
async openRectangleAnnotationDialog(manualRedactionEntryWrapper: ManualRedactionEntryWrapper) {
const file = this.state.file();
this._dialogService.openDialog(
'manualAnnotation',
{ manualRedactionEntryWrapper, dossierId: this.dossierId, file },
(result: { annotations: ManualRedactionEntryWrapper[]; dictionary?: Dictionary }) => {
const selectedAnnotations = this._annotationManager.selected;
if (selectedAnnotations.length > 0) {
this._annotationManager.delete([selectedAnnotations[0].Id]);
}
const data = { manualRedactionEntryWrapper, file, dossierId: this.dossierId };
const result = await this._iqserDialog.openDefault(RectangleAnnotationDialog, { data }).result();
const add$ = this._manualRedactionService.addAnnotation(
result.annotations.map(w => w.manualRedactionEntry).filter(e => e.positions[0].page <= file.numberOfPages),
this.dossierId,
this.fileId,
{ dictionaryLabel: result.dictionary?.label },
);
if (!result) {
return;
}
const addAndReload$ = add$.pipe(switchMap(() => this._filesService.reload(this.dossierId, file)));
return firstValueFrom(addAndReload$.pipe(catchError(() => of(undefined))));
},
);
const selectedAnnotations = this._annotationManager.selected;
if (selectedAnnotations.length > 0) {
this._annotationManager.delete([selectedAnnotations[0].Id]);
}
const add$ = this._manualRedactionService.addAnnotation([result.annotation], this.dossierId, this.fileId, {
dictionaryLabel: result.dictionary?.label,
});
const addAndReload$ = add$.pipe(switchMap(() => this._filesService.reload(this.dossierId, file)));
return firstValueFrom(addAndReload$.pipe(catchError(() => of(undefined))));
}
async viewerReady(pageNumber?: string) {
@ -622,7 +621,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
.subscribe();
this.addActiveScreenSubscription = this.pdfProxyService.manualAnnotationRequested$.subscribe($event => {
this.openManualAnnotationDialog($event);
this.openRectangleAnnotationDialog($event).then();
});
this.addActiveScreenSubscription = this.pdfProxyService.redactTextRequested$.subscribe($event => {

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

@ -48,7 +48,7 @@ import { FilePreviewDialogService } from './file-preview-dialog.service';
import { FilePreviewStateService } from './file-preview-state.service';
import { ManualRedactionService } from './manual-redaction.service';
import { SkippedService } from './skipped.service';
import { NON_READABLE_CONTENT } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
import { NON_READABLE_CONTENT } from '../dialogs/rectangle-annotation-dialog/rectangle-annotation-dialog.component';
@Injectable()
export class AnnotationActionsService {

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

@ -5,9 +5,8 @@ import { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-d
import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component';
import { ForceAnnotationDialogComponent } from '../dialogs/force-redaction-dialog/force-annotation-dialog.component';
import { HighlightActionDialogComponent } from '../dialogs/highlight-action-dialog/highlight-action-dialog.component';
import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
type DialogType = 'confirm' | 'documentInfo' | 'changeLegalBasis' | 'forceAnnotation' | 'manualAnnotation' | 'highlightAction';
type DialogType = 'confirm' | 'documentInfo' | 'changeLegalBasis' | 'forceAnnotation' | 'highlightAction';
@Injectable()
export class FilePreviewDialogService extends DialogService<DialogType> {
@ -26,10 +25,6 @@ export class FilePreviewDialogService extends DialogService<DialogType> {
forceAnnotation: {
component: ForceAnnotationDialogComponent,
},
manualAnnotation: {
component: ManualAnnotationDialogComponent,
dialogConfig: { autoFocus: true },
},
highlightAction: {
component: HighlightActionDialogComponent,
},

2
apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts
View File

@ -139,7 +139,9 @@ export class ManualRedactionService extends GenericService<IManualAddResponse> {
}
add(body: List<IAddRedactionRequest>, dossierId: string, fileId: string, bulkLocal = false) {
bulkLocal = bulkLocal || !!body[0].pageNumbers.length;
const bulkPath = bulkLocal ? this.#bulkLocal : this.#bulkRedaction;
return this._post(bulkLocal ? body[0] : body, `${bulkPath}/add/${dossierId}/${fileId}`).pipe(this.#log('Add', body));
}

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

@ -148,7 +148,7 @@ export const getResizeRedactionOptions = (
tooltip: !dictBasedType ? translations.inDossier.tooltip : null,
icon: FOLDER_ICON,
value: ResizeOptions.IN_DOSSIER,
extraOption: {
additionalCheck: {
label: translations.inDossier.extraOptionLabel,
checked: applyToAllDossiers,
hidden: !isApprover,

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

@ -47,6 +47,12 @@ export const RemoveAnnotationOptions = RemoveRedactionOptions;
export type RemoveRedactionOption = keyof typeof RemoveRedactionOptions;
export type RemoveAnnotationOption = RemoveRedactionOption;
export interface LegalBasisOption {
label?: string;
legalBasis?: string;
description?: string;
}
export interface RedactTextData {
manualRedactionEntryWrapper: ManualRedactionEntryWrapper;
dossierId: string;

39
apps/red-ui/src/app/modules/file-preview/utils/enhance-manual-redaction-request.utils.ts
View File

@ -1,5 +1,6 @@
import { Dictionary, IAddRedactionRequest, SuperType } from '@red/domain';
import { LegalBasisOption } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
import { Dictionary, File, IAddRedactionRequest, SuperType } from '@red/domain';
import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
import { LegalBasisOption } from './dialog-types';
export interface EnhanceRequestData {
readonly type: SuperType | null;
@ -12,6 +13,12 @@ export interface EnhanceRequestData {
readonly applyToAllDossiers: boolean;
}
interface MultiplePagesRectangleData {
manualRedactionEntryWrapper: ManualRedactionEntryWrapper;
pages: string;
file: File;
}
export const enhanceManualRedactionRequest = (addRedactionRequest: IAddRedactionRequest, data: EnhanceRequestData) => {
addRedactionRequest.type = data.type;
addRedactionRequest.section = null;
@ -38,3 +45,31 @@ export const enhanceManualRedactionRequest = (addRedactionRequest: IAddRedaction
addRedactionRequest.comment = commentValue ? { text: commentValue } : null;
addRedactionRequest.addToAllDossiers = data.isApprover && data.dictionaryRequest && data.applyToAllDossiers;
};
export const getMultiplePagesRectangle = (data: MultiplePagesRectangleData) => {
const value: string = data.pages.replace(/[^0-9-,]/g, '');
const entry = { ...data.manualRedactionEntryWrapper.manualRedactionEntry, pageNumbers: [] };
const wrapper = {
...data.manualRedactionEntryWrapper,
manualRedactionEntry: entry,
};
value.split(',').forEach(range => {
const splitted = range.split('-');
const startPage = parseInt(splitted[0], 10);
const endPage = splitted.length > 1 ? parseInt(splitted[1], 10) : startPage;
if (!startPage || !endPage || startPage > data.file.numberOfPages || endPage > data.file.numberOfPages) {
throw new Error();
}
for (let page = startPage; page <= endPage; page++) {
if (page === wrapper.manualRedactionEntry.positions[0].page) {
continue;
}
wrapper.manualRedactionEntry.pageNumbers.push(page);
}
});
return wrapper;
};

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

@ -1,7 +1,7 @@
{
"ADMIN_CONTACT_NAME": null,
"ADMIN_CONTACT_URL": null,
"API_URL": "https://dan1.iqser.cloud",
"API_URL": "https://dan2.iqser.cloud",
"APP_NAME": "RedactManager",
"IS_DOCUMINE": false,
"RULE_EDITOR_DEV_ONLY": false,
@ -13,7 +13,7 @@
"MAX_RETRIES_ON_SERVER_ERROR": 3,
"OAUTH_CLIENT_ID": "redaction",
"OAUTH_IDP_HINT": null,
"OAUTH_URL": "https://dan1.iqser.cloud/auth",
"OAUTH_URL": "https://dan2.iqser.cloud/auth",
"RECENT_PERIOD_IN_HOURS": 24,
"SELECTION_MODE": "structural",
"MANUAL_BASE_URL": "https://docs.redactmanager.com/preview",

2
libs/common-ui

@ -1 +1 @@
Subproject commit 34387d49d29ba6449c1311cc1c5434b540398660
Subproject commit 3c89b8f7e71eb9253aa40f40c1598eac2c400c71

2
libs/red-domain/src/lib/redaction-log/add-redaction.request.ts
View File

@ -14,4 +14,6 @@ export interface IAddRedactionRequest {
section?: string;
rectangle?: boolean;
addToAllDossiers?: boolean;
pageNumbers?: [];
caseSensitive?: boolean;
}