diff --git a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html index 14e4dcd00..85c983f25 100644 --- a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html +++ b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html @@ -1,6 +1,6 @@
- - + + diff --git a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts index 1b4f8a91d..19969e2f9 100644 --- a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts +++ b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts @@ -32,6 +32,14 @@ export class NeedsWorkBadgeComponent implements OnInit { return this._getDictionaryColor('image'); } + get updatedColor() { + return this._getDictionaryColor('updated'); + } + + get analysisColor() { + return this._getDictionaryColor('analysis'); + } + get hasImages() { return this.needsWorkInput instanceof FileStatusWrapper && this.needsWorkInput.hasImages; } diff --git a/apps/red-ui/src/app/components/status-bar/status-bar.component.ts b/apps/red-ui/src/app/components/status-bar/status-bar.component.ts index b1e4df16d..59dd95033 100644 --- a/apps/red-ui/src/app/components/status-bar/status-bar.component.ts +++ b/apps/red-ui/src/app/components/status-bar/status-bar.component.ts @@ -7,7 +7,7 @@ import { Color } from '../../utils/types'; styleUrls: ['./status-bar.component.scss'], encapsulation: ViewEncapsulation.None }) -export class StatusBarComponent implements OnInit { +export class StatusBarComponent { @Input() public config: { length: number; @@ -20,8 +20,4 @@ export class StatusBarComponent implements OnInit { public small = false; constructor() {} - - ngOnInit(): void { - console.log(this.config); - } } diff --git a/apps/red-ui/src/app/components/type-filter/type-filter.component.html b/apps/red-ui/src/app/components/type-filter/type-filter.component.html index cc9a70ffd..9bdcf77a1 100644 --- a/apps/red-ui/src/app/components/type-filter/type-filter.component.html +++ b/apps/red-ui/src/app/components/type-filter/type-filter.component.html @@ -32,7 +32,7 @@ - + {{ filter.label | translate }} diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts index 89adef6f9..a9a96e6d4 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -466,10 +466,18 @@ export class AppStateService { }; // manual dictionaryData['manual'] = { - hexColor: colors.defaultColor, + hexColor: colors.manualRedactionColor, type: 'manual', virtual: true }; + // manual + dictionaryData['manual-redaction'] = { + hexColor: colors.manualRedactionColor, + type: 'manual-redaction', + virtual: true + }; + + console.log(colors.manualRedactionColor); // dictionary actions dictionaryData['recommendation'] = { @@ -479,17 +487,17 @@ export class AppStateService { }; // dictionary actions dictionaryData['add-dictionary'] = { - hexColor: '#dd4d50', + hexColor: colors.analysisColor, type: 'add-dictionary', virtual: true }; dictionaryData['remove-dictionary'] = { - hexColor: '#dd4d50', + hexColor: colors.analysisColor, type: 'remove-dictionary', virtual: true }; dictionaryData['remove-only-here'] = { - hexColor: '#dd4d50', + hexColor: colors.analysisColor, type: 'remove-only-here', virtual: true }; @@ -506,7 +514,7 @@ export class AppStateService { virtual: true }; dictionaryData['suggestion-add-dictionary'] = { - hexColor: '#5B97DB', + hexColor: colors.dictionaryRequestColor, type: 'suggestion-add', virtual: true }; @@ -517,7 +525,7 @@ export class AppStateService { virtual: true }; dictionaryData['suggestion-remove-dictionary'] = { - hexColor: '#5B97DB', + hexColor: colors.dictionaryRequestColor, type: 'suggestion-add', virtual: true }; @@ -538,12 +546,12 @@ export class AppStateService { virtual: true }; dictionaryData['analysis'] = { - hexColor: '#dd4d50', + hexColor: colors.analysisColor, type: 'analysis', virtual: true }; dictionaryData['pending-analysis'] = { - hexColor: '#dd4d50', + hexColor: colors.analysisColor, type: 'analysis', virtual: true }; @@ -554,10 +562,15 @@ export class AppStateService { hint: true }; dictionaryData['redaction'] = { - hexColor: '#cccccc', + hexColor: colors.previewColor, type: 'redaction', virtual: true }; + dictionaryData['updated'] = { + hexColor: colors.updatedColor, + type: 'updated', + virtual: true + }; }) ); diff --git a/libs/red-ui-http/src/lib/model/colors.ts b/libs/red-ui-http/src/lib/model/colors.ts index a5f85fd39..843ed8b33 100644 --- a/libs/red-ui-http/src/lib/model/colors.ts +++ b/libs/red-ui-http/src/lib/model/colors.ts @@ -15,4 +15,9 @@ export interface Colors { notRedacted?: string; requestAdd?: string; requestRemove?: string; + analysisColor?: string; + dictionaryRequestColor?: string; + manualRedactionColor?: string; + previewColor?: string; + updatedColor?: string; }