From 2a92b1b0ecf53f28c0cb82c747271fc3b697f7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Fri, 5 Feb 2021 21:55:23 +0200
Subject: [PATCH] Show Updated and Image Flag for File List

---
 .../app/common/filter/utils/filter-utils.ts    |  6 ++++++
 .../needs-work-badge.component.html            |  2 ++
 .../needs-work-badge.component.ts              | 18 +++++++++++++++++-
 .../type-filter/type-filter.component.html     |  4 ++++
 .../base-screen/base-screen.component.html     |  1 -
 .../project-overview-screen.component.ts       |  2 ++
 apps/red-ui/src/assets/i18n/en.json            |  4 +++-
 7 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts b/apps/red-ui/src/app/common/filter/utils/filter-utils.ts
index 858d33161..4b5458596 100644
--- a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts
+++ b/apps/red-ui/src/app/common/filter/utils/filter-utils.ts
@@ -133,6 +133,12 @@ export const annotationFilterChecker = (input: FileStatusWrapper | ProjectWrappe
         case 'none': {
             return input.hasNone;
         }
+        case 'updated': {
+            return input instanceof FileStatusWrapper && input.hasUpdates;
+        }
+        case 'image': {
+            return input instanceof FileStatusWrapper && input.hasImages;
+        }
     }
 };
 
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 ef1d99441..b10bdb442 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
@@ -3,4 +3,6 @@
     <redaction-annotation-icon *ngIf="needsWorkInput.hasRedactions" type="square" label="R" color="#283241"></redaction-annotation-icon>
     <redaction-annotation-icon *ngIf="needsWorkInput.hintsOnly" type="circle" label="H" color="#9398a0"></redaction-annotation-icon>
     <redaction-annotation-icon *ngIf="needsWorkInput.hasRequests" type="rhombus" label="S" [color]="suggestionColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="hasUpdates" type="square" label="U" color="#fdbd00"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="hasImages" type="square" label="G" [color]="imageColor"></redaction-annotation-icon>
 </div>
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 3617529a4..1b4f8a91d 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
@@ -25,11 +25,27 @@ export class NeedsWorkBadgeComponent implements OnInit {
     }
 
     get suggestionColor() {
+        return this._getDictionaryColor('suggestion');
+    }
+
+    get imageColor() {
+        return this._getDictionaryColor('image');
+    }
+
+    get hasImages() {
+        return this.needsWorkInput instanceof FileStatusWrapper && this.needsWorkInput.hasImages;
+    }
+
+    get hasUpdates() {
+        return this.needsWorkInput instanceof FileStatusWrapper && this.needsWorkInput.hasUpdates;
+    }
+
+    private _getDictionaryColor(type: string) {
         let ruleSetId = null;
         if (this.needsWorkInput instanceof ProjectWrapper) {
             ruleSetId = this.needsWorkInput.ruleSetId;
         }
 
-        return this.appStateService.getDictionaryColor('suggestion', ruleSetId);
+        return this.appStateService.getDictionaryColor(type, ruleSetId);
     }
 }
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 9d5afd5b4..52c885208 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
@@ -29,4 +29,8 @@
 <redaction-annotation-icon *ngIf="filter.key === 'declined-suggestion'" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
 
 <redaction-annotation-icon *ngIf="filter.key === 'none'" label="-" color="transparent" type="none"></redaction-annotation-icon>
+
+<redaction-annotation-icon *ngIf="filter.key === 'updated'" type="square" label="U" color="#fdbd00"></redaction-annotation-icon>
+
+<redaction-annotation-icon *ngIf="filter.key === 'image'" type="square" label="G" [color]="dictionaryColor"></redaction-annotation-icon>
 {{ filter.label | translate }}
diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html
index 7d44af788..da3ffd598 100644
--- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html
@@ -55,7 +55,6 @@
                 class="breadcrumb"
                 [routerLink]="'/ui/projects/' + appStateService.activeProjectId + '/file/' + appStateService.activeFile.fileId"
                 routerLinkActive="active"
-                [routerLinkActiveOptions]="{ exact: true }"
             >
                 {{ appStateService.activeFile.filename }}
             </a>
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
index 4dc44ca5f..b184eea3b 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
@@ -268,6 +268,8 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
             if (file.hasRedactions) allDistinctNeedsWork.add('redaction');
             if (file.hasRequests) allDistinctNeedsWork.add('suggestion');
             if (file.hasNone) allDistinctNeedsWork.add('none');
+            if (file.hasUpdates) allDistinctNeedsWork.add('updated');
+            if (file.hasImages) allDistinctNeedsWork.add('image');
         });
 
         const statusFilters = [];
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index b6ba99ff1..5eccd41aa 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -449,7 +449,9 @@
         "redaction": "Redacted",
         "suggestion": "Suggested Redaction",
         "analysis": "Analysis required",
-        "none": "No Annotations"
+        "none": "No Annotations",
+        "updated": "Updated",
+        "image": "Images"
     },
     "filter-menu": {
         "label": "Filter",