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

minor fixes

Browse Source
This commit is contained in:
Timo 2021-02-16 18:30:11 +02:00
parent dd8b90bb20
commit da1070da10
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
View File

@ -290,11 +290,7 @@
<ng-template #annotationFilterActionTemplate let-filter="filter">
<ng-container *ngIf="filter.key === 'skipped'">
<redaction-circle-button
[icon]="areIgnoresVisible ? 'red:visibility-off' : 'red:visibility'"
(action)="toggleIgnoresVisible($event)"
class="skipped-toggle-button"
>
<redaction-circle-button [icon]="hideSkipped ? 'red:visibility-off' : 'red:visibility'" (action)="toggleSkipped($event)" class="skipped-toggle-button">
</redaction-circle-button>
</ng-container>
</ng-template>

10
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
View File

@ -133,8 +133,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
filesAutoUpdateTimer: Subscription;
fileReanalysedSubscription: Subscription;
// <!-- End Dev Mode Features-->
areIgnoresVisible = false;
hideSkipped = true;
updateViewMode() {
const allAnnotations = this._instance.annotManager.getAnnotationsList();
@ -558,7 +557,6 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
this.fileData.manualRedactions = manualRedactions;
this._rebuildFilters();
this._annotationDrawService.drawAnnotations(this._instance, this.annotationData.allAnnotations);
this._handleIgnoreAnnotationsDrawing();
});
}
@ -689,10 +687,10 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
});
}
toggleIgnoresVisible($event) {
toggleSkipped($event) {
$event.stopPropagation();
$event.preventDefault();
this.areIgnoresVisible = !this.areIgnoresVisible;
this.hideSkipped = !this.hideSkipped;
this._handleIgnoreAnnotationsDrawing();
@ -702,7 +700,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
private _handleIgnoreAnnotationsDrawing() {
const allAnnotations = this._instance.annotManager.getAnnotationsList();
const ignoreAnnotations = allAnnotations.filter((a) => a.getCustomData('skipped'));
if (this.areIgnoresVisible) {
if (this.hideSkipped) {
this._instance.annotManager.hideAnnotations(ignoreAnnotations);
} else {
this._instance.annotManager.showAnnotations(ignoreAnnotations);

4
apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts
View File

@ -16,7 +16,7 @@ export class AnnotationDrawService {
private readonly _userPreferenceService: UserPreferenceService
) {}
public drawAnnotations(activeViewer: WebViewerInstance, annotationWrappers: AnnotationWrapper[]) {
public drawAnnotations(activeViewer: WebViewerInstance, annotationWrappers: AnnotationWrapper[], drawSkipped: boolean = false) {
const annotations = [];
annotationWrappers.forEach((annotation) => {
annotations.push(this.computeAnnotation(activeViewer, annotation));
@ -83,7 +83,7 @@ export class AnnotationDrawService {
highlight.ReadOnly = true;
// change log entries are drawn lighter
highlight.Opacity = annotationWrapper.isChangeLogRemoved ? 0.2 : 1;
highlight.Hidden = annotationWrapper.isChangeLogRemoved;
highlight.Hidden = annotationWrapper.isChangeLogRemoved || annotationWrapper.isSkipped;
highlight.setCustomData('redaction', annotationWrapper.isRedacted);
highlight.setCustomData('skipped', annotationWrapper.isSkipped);