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

Merge branch 'master' into VM/RED-7761

Browse Source
This commit is contained in:
Valentin Mihai 2023-12-14 14:29:26 +02:00
commit 9fafc203f5
8 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/models/file/annotation-permissions.utils.ts
View File

@ -13,7 +13,7 @@ export const canForceRedaction = (annotation: AnnotationWrapper, canAddRedaction
export const canAcceptRecommendation = (annotation: AnnotationWrapper) => annotation.isRecommendation && !annotation.pending;
export const canMarkAsFalsePositive = (annotation: AnnotationWrapper, annotationEntity: Dictionary) =>
annotation.canBeMarkedAsFalsePositive && annotationEntity.hasDictionary;
annotation.canBeMarkedAsFalsePositive && annotationEntity?.hasDictionary;
export const canRemoveOnlyHere = (annotation: AnnotationWrapper, canAddRedaction: boolean) =>
canAddRedaction && !annotation.pending && (annotation.isRedacted || (annotation.isHint && !annotation.isImage));

2
apps/red-ui/src/app/models/file/annotation.permissions.ts
View File

@ -62,7 +62,7 @@ export class AnnotationPermissions {
permissions.canRemoveRedaction = canRemoveRedaction(annotation, permissions);
permissions.canChangeLegalBasis = canChangeLegalBasis(annotation, canAddRedaction);
permissions.canRecategorizeAnnotation = canRecategorizeAnnotation(annotation, canAddRedaction);
permissions.canResizeAnnotation = canResizeAnnotation(annotation, canAddRedaction, annotationEntity.hasDictionary);
permissions.canResizeAnnotation = canResizeAnnotation(annotation, canAddRedaction, annotationEntity?.hasDictionary);
permissions.canEditAnnotations = canEditAnnotation(annotation);
permissions.canEditHints = canEditHint(annotation);
permissions.canEditImages = canEditImage(annotation);

8
apps/red-ui/src/app/models/file/annotation.wrapper.ts
View File

@ -1,9 +1,11 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { IListable } from '@iqser/common-ui';
import {
annotationDefaultColorConfig,
annotationEntityColorConfig,
AnnotationIconType,
ChangeType,
DefaultColors,
Dictionary,
Earmark,
EntityTypes,
@ -213,6 +215,7 @@ export class AnnotationWrapper implements IListable {
changeLogType: ChangeType,
legalBasisList: ILegalBasis[],
isDocumine: boolean,
defaultColors: DefaultColors,
) {
const annotationWrapper = new AnnotationWrapper();
@ -273,10 +276,11 @@ export class AnnotationWrapper implements IListable {
annotationWrapper.isRemoved = logEntry.state === EntryStates.REMOVED;
annotationWrapper.isRemovedLocally = lastRelevantManualChange?.manualRedactionType === ManualRedactionTypes.REMOVE_LOCALLY;
annotationWrapper.typeLabel = dictionary.virtual ? undefined : dictionary.label;
annotationWrapper.typeLabel = dictionary?.virtual ? undefined : dictionary?.label;
const colorKey = annotationEntityColorConfig[annotationWrapper.superType];
annotationWrapper.color = dictionary[colorKey] as string;
const defaultColor = annotationDefaultColorConfig[annotationWrapper.superType];
annotationWrapper.color = dictionary ? (dictionary[colorKey] as string) : (defaultColors[defaultColor] as string);
annotationWrapper['entry'] = logEntry;
return annotationWrapper;

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

@ -26,8 +26,8 @@ export class ResizeAnnotationDialogComponent extends IqserDialogComponent<
this.close({
comment: formValue.comment,
updateDictionary: this.entity.hasDictionary,
addToAllDossiers: this.entity.hasDictionary,
updateDictionary: this.entity?.hasDictionary,
addToAllDossiers: this.entity?.hasDictionary,
});
}
}

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

@ -18,6 +18,7 @@ import { firstValueFrom, Observable } from 'rxjs';
import { FilePreviewStateService } from './file-preview-state.service';
import { MultiSelectService } from './multi-select.service';
import { ViewModeService } from './view-mode.service';
import { DefaultColorsService } from '@services/entity-services/default-colors.service';
const DELTA_VIEW_TIME = 10 * 60 * 1000; // 10 minutes;
@ -55,6 +56,7 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
private readonly _earmarksService: EarmarksService,
private readonly _multiSelectService: MultiSelectService,
private readonly _filesService: FilesService,
private readonly _defaultColorsService: DefaultColorsService,
) {
super();
this.annotations$ = toObservable(this.#annotations);
@ -167,6 +169,7 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
const file = this._state.file();
const annotations: AnnotationWrapper[] = [];
const dictionaries = this._state.dictionaries;
const defaultColors = this._defaultColorsService.find(this._state.dossierTemplateId);
let checkDictionary = true;
for (const entry of entityLog.entityLogEntry) {
@ -207,11 +210,17 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
if (!dictionary) {
this.missingTypes.add(entry.type);
continue;
}
const changeType = this.#getChangeLogType(entry, file);
const annotation = AnnotationWrapper.fromData(entry, dictionary, changeType, entityLog.legalBasis ?? [], this.#isDocumine);
const annotation = AnnotationWrapper.fromData(
entry,
dictionary,
changeType,
entityLog.legalBasis ?? [],
this.#isDocumine,
defaultColors,
);
annotations.push(annotation);
}

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

@ -18,8 +18,8 @@ import type {
import { dictionaryActionsTranslations, manualRedactionActionsTranslations } from '@translations/annotation-actions-translations';
import { Roles } from '@users/roles';
import { NGXLogger } from 'ngx-logger';
import { of } from 'rxjs';
import { tap } from 'rxjs/operators';
import { EMPTY, of, OperatorFunction, pipe } from 'rxjs';
import { catchError, tap } from 'rxjs/operators';
function getResponseType(error: boolean, isConflict: boolean) {
const isConflictError = isConflict ? 'conflictError' : 'error';
@ -150,22 +150,22 @@ export class ManualRedactionService extends GenericService<IManualAddResponse> {
}
#showToast(action: ManualRedactionActions | DictionaryActions, isDictionary = false) {
return tap({
next: () => this._toaster.success(getMessage(action, isDictionary), { positionClass: 'toast-file-preview' }),
error: (error: unknown) => {
return pipe(
catchError((error: unknown) => {
const isConflict = (error as HttpErrorResponse).status === HttpStatusCode.Conflict;
this._toaster.error(getMessage(action, isDictionary, true, isConflict), {
error: error as HttpErrorResponse,
positionClass: 'toast-file-preview',
});
},
});
return EMPTY;
}),
tap(() => this._toaster.success(getMessage(action, isDictionary), { positionClass: 'toast-file-preview' })),
);
}
#showAddToDictionaryToast(body: List<IAddRedactionRequest>, dictionaryLabel?: string) {
return tap({
next: () => this._toaster.success(getDictionaryMessage('add'), { positionClass: 'toast-file-preview' }),
error: (error: unknown) => {
return pipe(
catchError((error: unknown) => {
const isConflict = (error as HttpErrorResponse).status === HttpStatusCode.Conflict;
this._toaster.error(getDictionaryMessage('add', true, isConflict), {
error: error as HttpErrorResponse,
@ -175,7 +175,9 @@ export class ManualRedactionService extends GenericService<IManualAddResponse> {
},
positionClass: 'toast-file-preview',
});
},
});
return EMPTY;
}),
tap(() => this._toaster.success(getDictionaryMessage('add'), { positionClass: 'toast-file-preview' })),
);
}
}

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

@ -73,21 +73,21 @@ export class PdfAnnotationActionsService {
availableActions.push(editButton);
}
if (permissions.canAcceptRecommendation) {
if (permissions.canAcceptRecommendation && annotationChangesAllowed) {
const acceptRecommendationButton = this.#getButton('check', _('annotation-actions.accept-recommendation.label'), () =>
this.#annotationActionsService.convertRecommendationToAnnotation(annotations),
);
availableActions.push(acceptRecommendationButton);
}
if (permissions.canForceRedaction) {
if (permissions.canForceRedaction && annotationChangesAllowed) {
const forceRedactionButton = this.#getButton('thumb-up', _('annotation-actions.force-redaction.label'), () =>
this.#annotationActionsService.forceAnnotation(annotations),
);
availableActions.push(forceRedactionButton);
}
if (permissions.canForceHint) {
if (permissions.canForceHint && annotationChangesAllowed) {
const forceHintButton = this.#getButton('thumb-up', _('annotation-actions.force-hint.label'), () =>
this.#annotationActionsService.forceAnnotation(annotations, true),
);

12
apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.ts
View File

@ -21,11 +21,11 @@ export class TypeFilterComponent implements OnChanges {
this.filter.metadata?.shortLabel === ''
? ''
: this.filter.id === 'none'
? '-'
: this._needsAnalysisKeys.includes(this.filter.id)
? 'A'
: this.filter.skipTranslation
? this.filter.label.charAt(0)
: this._translateService.instant(this.filter.label).charAt(0);
? '-'
: this._needsAnalysisKeys.includes(this.filter.id)
? 'A'
: this.filter.skipTranslation
? this.filter.label?.charAt(0)
: this._translateService.instant(this.filter.label).charAt(0);
}
}