From cde3734844f9e321af2e5e203722174fb71db411 Mon Sep 17 00:00:00 2001 From: Timo Date: Thu, 26 Nov 2020 09:50:17 +0200 Subject: [PATCH] UI adjustments --- .../app/screens/base-screen/base-screen.component.scss | 4 ++-- .../src/app/screens/file/model/annotation.wrapper.ts | 3 +++ libs/red-ui-http/src/lib/model/redactionLogEntry.ts | 8 +++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss b/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss index 32dc88c7e..5d60d1f37 100644 --- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss +++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss @@ -7,13 +7,13 @@ .breadcrumb { text-decoration: none; - color: $grey-7; + color: $grey-1; font-weight: 600; width: fit-content; white-space: nowrap; &:last-child { - color: $accent; + color: $primary; @include line-clamp(1); } diff --git a/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts b/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts index 92dd53cd5..05853fe1d 100644 --- a/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts +++ b/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts @@ -195,6 +195,9 @@ export class AnnotationWrapper { private static createContent(entry: any) { let content = ''; + if (entry.matchedRule) { + content += 'Rule ' + entry.matchedRule + ' matched \n\n'; + } if (entry.reason) { content += entry.reason + '\n\n'; } diff --git a/libs/red-ui-http/src/lib/model/redactionLogEntry.ts b/libs/red-ui-http/src/lib/model/redactionLogEntry.ts index cd2342b33..f7e397654 100644 --- a/libs/red-ui-http/src/lib/model/redactionLogEntry.ts +++ b/libs/red-ui-http/src/lib/model/redactionLogEntry.ts @@ -17,10 +17,11 @@ export interface RedactionLogEntry { id?: string; legalBasis?: string; manual?: boolean; + manualRedactionType?: RedactionLogEntry.ManualRedactionTypeEnum; + matchedRule?: number; positions?: Array; reason?: string; redacted?: boolean; - manualRedactionType?: string; section?: string; sectionNumber?: number; status?: RedactionLogEntry.StatusEnum; @@ -28,6 +29,11 @@ export interface RedactionLogEntry { value?: string; } export namespace RedactionLogEntry { + export type ManualRedactionTypeEnum = 'ADD' | 'REMOVE'; + export const ManualRedactionTypeEnum = { + ADD: 'ADD' as ManualRedactionTypeEnum, + REMOVE: 'REMOVE' as ManualRedactionTypeEnum + }; export type StatusEnum = 'REQUESTED' | 'APPROVED' | 'DECLINED'; export const StatusEnum = { REQUESTED: 'REQUESTED' as StatusEnum,