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

RED-5460 - filtered 'changeLogRemoved' redactions in preview mode

Browse Source
This commit is contained in:
Valentin Mihai 2022-11-04 17:34:11 +02:00
parent a8d016c6d5
commit 2a8e048a53
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
View File

@ -15,6 +15,7 @@ import { MatDialogRef, MatDialogState } from '@angular/material/dialog';
import scrollIntoView from 'scroll-into-view-if-needed'; import scrollIntoView from 'scroll-into-view-if-needed';
import { import {
AutoUnsubscribe, AutoUnsubscribe,
bool,
CircleButtonTypes, CircleButtonTypes,
Debounce, Debounce,
FilterService, FilterService,
@ -383,9 +384,12 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy
return; return;
} }
if (this._viewModeService.isRedacted && !this._userPreferencesService.getShowSuggestionsInPreview()) { if (this._viewModeService.isRedacted) {
annotations = annotations.filter(a => !bool(a.isChangeLogRemoved));
if (!this._userPreferencesService.getShowSuggestionsInPreview()) {
annotations = annotations.filter(a => !a.isSuggestion); annotations = annotations.filter(a => !a.isSuggestion);
} }
}
this.displayedAnnotations = this._annotationProcessingService.filterAndGroupAnnotations(annotations, primary, secondary); this.displayedAnnotations = this._annotationProcessingService.filterAndGroupAnnotations(annotations, primary, secondary);
const pagesThatDisplayAnnotations = [...this.displayedAnnotations.keys()]; const pagesThatDisplayAnnotations = [...this.displayedAnnotations.keys()];

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

@ -239,7 +239,9 @@ export class FilePreviewScreenComponent
break; break;
} }
case ViewModes.REDACTED: { case ViewModes.REDACTED: {
const nonRedactionEntries = annotations.filter(a => !bool(a.getCustomData('redaction'))); const nonRedactionEntries = annotations.filter(
a => !bool(a.getCustomData('redaction')) || bool(a.getCustomData('changeLogRemoved')),
);
if (this._readableRedactionsService.active) { if (this._readableRedactionsService.active) {
this._setAnnotationsOpacity(redactions, true); this._setAnnotationsOpacity(redactions, true);
this._setAnnotationsColor(redactions, 'annotationColor'); this._setAnnotationsColor(redactions, 'annotationColor');