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

Merge branch 'VM/RED-8829' into 'master'

Browse Source 
RED-8829 - revert changes

Closes RED-8829

See merge request redactmanager/red-ui!365
This commit is contained in:
Dan Percic 2024-03-26 15:29:27 +01:00
commit d1491f0421
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,6 @@ export class AnnotationWrapper implements IListable {
hasBeenResized: boolean; hasBeenResized: boolean;
hasBeenRecategorized: boolean; hasBeenRecategorized: boolean;
hasLegalBasisChanged: boolean; hasLegalBasisChanged: boolean;
hasBeenForced: boolean;
hasBeenForcedHint: boolean; hasBeenForcedHint: boolean;
hasBeenForcedRedaction: boolean; hasBeenForcedRedaction: boolean;
hasBeenRemovedByManualOverride: boolean; hasBeenRemovedByManualOverride: boolean;
@ -260,7 +259,6 @@ export class AnnotationWrapper implements IListable {
annotationWrapper.hasLegalBasisChanged = !!logEntry.manualChanges?.find( annotationWrapper.hasLegalBasisChanged = !!logEntry.manualChanges?.find(
c => c.manualRedactionType === ManualRedactionTypes.LEGAL_BASIS_CHANGE, c => c.manualRedactionType === ManualRedactionTypes.LEGAL_BASIS_CHANGE,
); );
annotationWrapper.hasBeenForced = !!logEntry.manualChanges?.find(c => c.manualRedactionType === ManualRedactionTypes.FORCE);
annotationWrapper.hasBeenForcedHint = !!logEntry.manualChanges?.find( annotationWrapper.hasBeenForcedHint = !!logEntry.manualChanges?.find(
c => c.manualRedactionType === ManualRedactionTypes.FORCE_HINT, c => c.manualRedactionType === ManualRedactionTypes.FORCE_HINT,
); );

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

@ -133,7 +133,7 @@ export const getResizeRedactionOptions = (
label: translations.inDossier.label, label: translations.inDossier.label,
description: translations.inDossier.description, description: translations.inDossier.description,
descriptionParams: { dossierName: dossier.dossierName }, descriptionParams: { dossierName: dossier.dossierName },
disabled: !dictBasedType || redaction.hasBeenRecategorized || redaction.hasBeenForced, disabled: !dictBasedType || redaction.hasBeenRecategorized,
tooltip: !dictBasedType ? translations.inDossier.tooltip : null, tooltip: !dictBasedType ? translations.inDossier.tooltip : null,
icon: FOLDER_ICON, icon: FOLDER_ICON,
value: RedactOrHintOptions.IN_DOSSIER, value: RedactOrHintOptions.IN_DOSSIER,

1
libs/red-domain/src/lib/redaction-log/types.ts
View File

@ -15,7 +15,6 @@ export const ManualRedactionTypes = {
ADD_TO_DICTIONARY: 'ADD_TO_DICTIONARY', ADD_TO_DICTIONARY: 'ADD_TO_DICTIONARY',
REMOVE_LOCALLY: 'REMOVE_LOCALLY', REMOVE_LOCALLY: 'REMOVE_LOCALLY',
REMOVE_FROM_DICTIONARY: 'REMOVE_FROM_DICTIONARY', REMOVE_FROM_DICTIONARY: 'REMOVE_FROM_DICTIONARY',
FORCE: 'FORCE',
FORCE_REDACT: 'FORCE_REDACT', FORCE_REDACT: 'FORCE_REDACT',
FORCE_HINT: 'FORCE_HINT', FORCE_HINT: 'FORCE_HINT',
RECATEGORIZE: 'RECATEGORIZE', RECATEGORIZE: 'RECATEGORIZE',