From 5f95429427c2a305de80dac5166d24a2a236647f Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Fri, 6 Nov 2020 21:10:42 +0200
Subject: [PATCH] fixed suggestion

---
 .../annotation-icon/annotation-icon.component.html   |  3 +--
 .../annotation-icon/annotation-icon.component.ts     |  4 +++-
 .../needs-work-badge/needs-work-badge.component.html |  2 +-
 .../file-preview-screen.component.html               |  8 ++++----
 .../src/app/screens/file/model/annotation.wrapper.ts |  6 +++---
 .../screens/file/service/annotation-draw.service.ts  |  2 +-
 .../project-details/project-details.component.html   |  2 +-
 apps/red-ui/src/app/state/app-state.service.ts       | 12 ++++++------
 8 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.html b/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.html
index e66fe0a43..0cd9c7b60 100644
--- a/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.html
+++ b/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.html
@@ -1,9 +1,8 @@
 <div
     [class.hint]="typeValue?.hint"
-    [class.request]="typeValue?.type === 'request'"
+    [class.request]="typeValue?.type === 'suggestion'"
     [style.background-color]="typeValue?.hexColor"
     class="icon"
 >
     <span>{{ (typeValue?.type)[0] }}</span>
-    <!--    {{typeValue | json }}-->
 </div>
diff --git a/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.ts b/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.ts
index ec379aa5e..6eff84630 100644
--- a/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.ts
+++ b/apps/red-ui/src/app/components/annotation-icon/annotation-icon.component.ts
@@ -9,10 +9,12 @@ import { TypeValue } from '@redaction/red-ui-http';
 export class AnnotationIconComponent implements OnInit {
     @Input() typeValue: TypeValue;
 
+    label: string;
+
     constructor() {}
 
     ngOnInit(): void {
-        if (this.typeValue?.type === 'request') {
+        if (this.typeValue?.type === 'suggestion') {
             const styleSheet = document.styleSheets[0];
             styleSheet.insertRule(
                 `.request:after { border-top-color: ${this.typeValue.hexColor} !important; }`,
diff --git a/apps/red-ui/src/app/screens/common/needs-work-badge/needs-work-badge.component.html b/apps/red-ui/src/app/screens/common/needs-work-badge/needs-work-badge.component.html
index b897522d6..84815eee0 100644
--- a/apps/red-ui/src/app/screens/common/needs-work-badge/needs-work-badge.component.html
+++ b/apps/red-ui/src/app/screens/common/needs-work-badge/needs-work-badge.component.html
@@ -9,6 +9,6 @@
     ></redaction-annotation-icon>
     <redaction-annotation-icon
         *ngIf="needsWorkInput.hasRequests"
-        [typeValue]="appStateService.getDictionaryTypeValue('request')"
+        [typeValue]="appStateService.getDictionaryTypeValue('suggestion')"
     ></redaction-annotation-icon>
 </div>
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
index 626b61059..dd5be7dc0 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
@@ -210,8 +210,8 @@
                                     (click)="openAcceptSuggestionMenu($event, annotation)"
                                     *ngIf="
                                         appStateService.isActiveProjectOwnerAndManager &&
-                                        (annotation.superType === 'request' ||
-                                            annotation.superType === 'request-remove')
+                                        (annotation.superType === 'suggestion' ||
+                                            annotation.superType === 'suggestion-remove')
                                     "
                                     [class.active]="isAnnotationMenuOpen(annotation)"
                                     [matMenuTriggerFor]="menu"
@@ -253,8 +253,8 @@
                                 <button
                                     (click)="rejectSuggestion($event, annotation)"
                                     *ngIf="
-                                        annotation.superType === 'request' ||
-                                        annotation.superType === 'request-remove'
+                                        annotation.superType === 'suggestion' ||
+                                        annotation.superType === 'suggestion-remove'
                                     "
                                     mat-icon-button
                                 >
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 25d332d5f..bd7cf9ff2 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
@@ -16,7 +16,7 @@ export const SuperTypeSorter = {
 };
 
 export class AnnotationWrapper {
-    superType: 'request' | 'redaction' | 'hint' | 'ignore' | 'request-remove';
+    superType: 'suggestion' | 'redaction' | 'hint' | 'ignore' | 'suggestion-remove';
     dictionary: string;
     color: string;
     comments: Comment[] = [];
@@ -93,7 +93,7 @@ export class AnnotationWrapper {
         // change super-type based on toRemove
         annotationWrapper.superType = toRemove
             ? toRemove.status === 'REQUESTED'
-                ? 'request-remove'
+                ? 'suggestion-remove'
                 : toRemove.status === 'APPROVED'
                 ? 'ignore'
                 : annotationWrapper.superType
@@ -106,7 +106,7 @@ export class AnnotationWrapper {
     ) {
         const dictionary = dictionaryData[manualRedactionEntry.type];
         return manualRedactionEntry.status === 'REQUESTED'
-            ? 'request'
+            ? 'suggestion'
             : dictionary.hint
             ? 'hint'
             : 'redaction';
diff --git a/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts b/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts
index 1eb2eb93a..e6344018b 100644
--- a/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts
+++ b/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts
@@ -38,7 +38,7 @@ export class AnnotationDrawService {
             this._appStateService.dictionaryData
         );
         const color =
-            superType === 'request'
+            superType === 'suggestion'
                 ? this._appStateService.getDictionaryColor(superType)
                 : this._appStateService.getDictionaryColor(manualRedactionEntry.type);
 
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html
index 9975b8c77..d29471eb6 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html
@@ -84,7 +84,7 @@
     </div>
     <div>
         <redaction-annotation-icon
-            [typeValue]="appStateService.getDictionaryTypeValue('request')"
+            [typeValue]="appStateService.getDictionaryTypeValue('suggestion')"
         ></redaction-annotation-icon>
         {{ 'project-overview.legend.contains-suggestions' | translate }}
     </div>
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 8edcdbc0b..216ba8e8d 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -495,14 +495,14 @@ export class AppStateService {
             );
             const colorsObs = this._dictionaryControllerService.getColors().pipe(
                 tap((colors) => {
-                    this._dictionaryData['request'] = {
+                    this._dictionaryData['suggestion'] = {
                         hexColor: colors.requestAdd,
-                        type: 'request',
+                        type: 'suggestion',
                         virtual: true
                     };
-                    this._dictionaryData['request-remove'] = {
+                    this._dictionaryData['suggestion-remove'] = {
                         hexColor: colors.requestRemove,
-                        type: 'request-remove',
+                        type: 'suggestion-remove',
                         virtual: true
                     };
                     this._dictionaryData['ignore'] = {
@@ -553,9 +553,9 @@ export class AppStateService {
 
     getDictionaryTypeValueForAnnotation(annotation: AnnotationWrapper) {
         if (
-            annotation.superType === 'request' ||
+            annotation.superType === 'suggestion' ||
             annotation.superType === 'ignore' ||
-            annotation.superType === 'request-remove'
+            annotation.superType === 'suggestion-remove'
         ) {
             return this._dictionaryData[annotation.superType];
         }