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

hide rules without devmode , fixed recommendation filters

Browse Source
This commit is contained in:
Timo 2021-01-21 11:21:26 +02:00
parent 8232a03f6e
commit 57f7dbc496
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/components/rule-set-view-switch/rule-set-view-switch.component.html
View File

@ -2,7 +2,7 @@
<div class="red-input-group slider-row">
<mat-button-toggle-group [value]="screen" (change)="switchView($event)" appearance="legacy">
<mat-button-toggle [value]="'dictionaries'"> {{ 'dictionaries' | translate }}</mat-button-toggle>
<mat-button-toggle [value]="'rules'"> {{ 'rule-editor' | translate }}</mat-button-toggle>
<mat-button-toggle [value]="'rules'" *ngIf="userPreferenceService.areDevFeaturesEnabled"> {{ 'rule-editor' | translate }}</mat-button-toggle>
<mat-button-toggle [value]="'watermark'"> {{ 'watermark' | translate }}</mat-button-toggle>
</mat-button-toggle-group>
</div>

7
apps/red-ui/src/app/components/rule-set-view-switch/rule-set-view-switch.component.ts
View File

@ -1,6 +1,7 @@
import { Component, Input, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { AppStateService } from '../../state/app-state.service';
import { UserPreferenceService } from '../../common/service/user-preference.service';
@Component({
selector: 'redaction-rule-set-view-switch',
@ -10,7 +11,11 @@ import { AppStateService } from '../../state/app-state.service';
export class RuleSetViewSwitchComponent implements OnInit {
@Input() public screen: 'rules' | 'dictionaries' | 'watermark';
constructor(private readonly _router: Router, private readonly _appStateService: AppStateService) {}
constructor(
public readonly userPreferenceService: UserPreferenceService,
private readonly _router: Router,
private readonly _appStateService: AppStateService
) {}
ngOnInit(): void {}

3
apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
View File

@ -84,7 +84,8 @@ export class AnnotationProcessingService {
for (const filter of flatFilters) {
if (
filter.checked &&
((filter.key === annotation.dictionary && (annotation.superType === 'hint' || annotation.superType === 'redaction')) ||
((filter.key === annotation.dictionary &&
(annotation.superType === 'hint' || annotation.superType === 'redaction' || annotation.superType === 'recommendation')) ||
filter.key === annotation.superType)
) {
found = true;