RED-7634 - Hide "Skipped" button not working as expected

apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html

@@ -219,5 +219,11 @@
         *ngIf="filter.id === 'skipped'"
         [icon]="(skippedService.hideSkipped$ | async) ? 'red:visibility-off' : 'red:visibility'"
         [type]="circleButtonTypes.dark"
+        [tooltip]="
+            ((skippedService.hideSkipped$ | async)
+                ? 'file-preview.tabs.annotations.show-skipped'
+                : 'file-preview.tabs.annotations.hide-skipped'
+            ) | translate
+        "
     ></iqser-circle-button>
 </ng-template>

apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts

@@ -223,7 +223,10 @@ export class FilePreviewScreenComponent
                     .filter(a => !bool(a.getCustomData('changeLogRemoved')) && !this._annotationManager.isHidden(a.Id))
                     .filter(a => !ocrAnnotationIds.includes(a.Id));
                 const nonStandardEntries = annotations.filter(
-                    a => bool(a.getCustomData('changeLogRemoved')) || this._annotationManager.isHidden(a.Id),
+                    a =>
+                        bool(a.getCustomData('changeLogRemoved')) ||
+                        this._annotationManager.isHidden(a.Id) ||
+                        (this._skippedService.hideSkipped && bool(a.getCustomData('skipped'))),
                 );
                 this._readableRedactionsService.setAnnotationsColor(standardEntries, 'annotationColor');
                 this._readableRedactionsService.setAnnotationsOpacity(standardEntries, true);

apps/red-ui/src/app/modules/file-preview/services/skipped.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { skip, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 import { bool, shareDistinctLast } from '@iqser/common-ui';
 import { REDAnnotationManager } from '../../pdf-viewer/services/annotation-manager.service';
 
@@ -13,7 +13,6 @@ export class SkippedService {
         this.hideSkipped$ = this.#hideSkipped$.pipe(
             tap(hideSkipped => this._handleIgnoreAnnotationsDrawing(hideSkipped)),
             shareDistinctLast(),
-            skip(1),
         );
     }
 

apps/red-ui/src/assets/i18n/redact/de.json

@@ -1217,6 +1217,17 @@
     "title": "Hoppla! Etwas ist schief gelaufen..."
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
+  "false-positive-dialog": {
+    "actions": {
+      "cancel": "",
+      "save": ""
+    },
+    "content": {
+      "body-text": "",
+      "comment": ""
+    },
+    "header": ""
+  },
   "file": "Datei",
   "file-attribute-encoding-types": {
     "ascii": "",
@@ -1229,9 +1240,6 @@
     "text": "Freier Text"
   },
   "file-attribute": {
-    "actions": {
-      "edit": ""
-    },
     "update": {
       "error": "",
       "success": ""
@@ -1375,6 +1383,7 @@
     "standard-tooltip": "In der Standard-Ansicht des Workloads werden alle Hinweise, Schwärzungen, Empfehlungen und Vorschläge angezeigt. In dieser Ansicht ist die Bearbeitung möglich.",
     "tabs": {
       "annotations": {
+        "hide-skipped": "",
         "jump-to-next": "Springe zu Nächster",
         "jump-to-previous": "Springe zu Vorheriger",
         "label": "Arbeitsvorrat",
@@ -1384,6 +1393,7 @@
         "select": "Auswählen",
         "select-all": "Alle",
         "select-none": "Keine",
+        "show-skipped": "",
         "the-filters": "",
         "wrong-filters": ""
       },
@@ -1633,16 +1643,18 @@
     "table-header": "{length} {length, plural, one{Begründung} other{Begründung}}"
   },
   "license-info-screen": {
-    "backend-version": "Backend-Version der Anwendung",
+    "analysis-capacity-usage": {
-    "chart": {
+      "analyzed-cumulative": "",
-      "cumulative": "Seiten insgesamt",
+      "analyzed-per-month": "",
-      "legend": "",
+      "licensed": "",
-      "pages-per-month": "Seiten pro Monat",
+      "section-title": "",
-      "total-pages": "Gesamtzahl der Seiten"
+      "total-analyzed-data": "",
+      "used-in-period": "",
+      "used-in-total": ""
     },
+    "backend-version": "Backend-Version der Anwendung",
     "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)",
     "copyright-claim-title": "Copyright",
-    "current-analyzed": "In aktuellem Lizenzzeitraum analysierte Seiten",
     "custom-app-title": "Name der Anwendung",
     "email-report": "E-Mail-Bericht",
     "email": {
@@ -1654,20 +1666,40 @@
     },
     "end-user-license-text": "Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.",
     "end-user-license-title": "Endbenutzer-Lizenzvereinbarung",
-    "license-title": "",
+    "licensing-details": {
-    "licensed-page-count": "Anzahl der lizenzierten Seiten",
+      "license-title": "",
-    "licensed-to": "Lizenziert für",
+      "licensed-analysis-capacity": "",
-    "licensing-details": "Lizenzdetails",
+      "licensed-page-count": "",
-    "licensing-period": "Laufzeit der Lizenz",
+      "licensed-retention-capacity": "",
-    "ocr-analyzed-pages": "Mit OCR konvertierte Seiten",
+      "licensed-to": "",
+      "licensing-period": "",
+      "section-title": ""
+    },
+    "page-usage": {
+      "cumulative-pages": "",
+      "current-analyzed-pages": "",
+      "ocr-analyzed-pages": "",
+      "pages-per-month": "",
+      "section-title": "",
+      "total-analyzed": "",
+      "total-ocr-analyzed": "",
+      "total-pages": "",
+      "unlicensed-analyzed": ""
+    },
+    "retention-capacity-usage": {
+      "active-documents": "",
+      "archived-documents": "",
+      "exceeded-capacity": "",
+      "section-title": "",
+      "storage-capacity": "",
+      "trash-documents": "",
+      "unused": "",
+      "used-capacity": ""
+    },
     "status": {
       "active": "Aktiv",
       "inactive": ""
-    },
+    }
-    "total-analyzed": "Seit {date} insgesamt analysierte Seiten",
-    "total-ocr-analyzed": "",
-    "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten",
-    "usage-details": "Nutzungsdetails"
   },
   "license-information": "Lizenzinformationen",
   "load-all-annotations-success": "",
@@ -1709,6 +1741,7 @@
     }
   },
   "minutes": "",
+  "no-active-license": "",
   "notification": {
     "assign-approver": "Sie wurden dem Dokument <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}<b> als Genehmiger zugewiesen!",
     "assign-reviewer": "Sie wurden dem Dokument <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}<b> als Reviewer zugewiesen!",
@@ -1998,17 +2031,6 @@
     "annotations": "",
     "title": ""
   },
-  "false-positive-dialog": {
-    "actions": {
-      "cancel": "",
-      "save": ""
-    },
-    "content": {
-      "comment": "",
-      "body-text": ""
-    },
-    "header": ""
-  },
   "rules-screen": {
     "error": {
       "generic": "Es ist ein Fehler aufgetreten ... Die Regeln konnten nicht aktualisiert werden!"
@@ -2284,12 +2306,5 @@
       "select": "Wählen"
     }
   },
-  "yesterday": "Gestern",
+  "yesterday": "Gestern"
-  "generic-errors": {
-    "400": "",
-    "403": "",
-    "404": "",
-    "409": "",
-    "500": ""
-  }
 }

apps/red-ui/src/assets/i18n/redact/en.json

@@ -1217,6 +1217,17 @@
     "title": "Oops! Something went wrong..."
   },
   "exact-date": "{day} {month} {year} at {hour}:{minute}",
+  "false-positive-dialog": {
+    "actions": {
+      "cancel": "Cancel",
+      "save": "Yes, proceed"
+    },
+    "content": {
+      "body-text": "''{value}'' is a false positive in this context: {context}",
+      "comment": "Comment"
+    },
+    "header": "False Positive"
+  },
   "file": "File",
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
@@ -1229,9 +1240,6 @@
     "text": "Free Text"
   },
   "file-attribute": {
-    "actions": {
-      "edit": "Edit"
-    },
     "update": {
       "error": "Failed to update file attribute value!",
       "success": "File attribute value has been updated successfully!"
@@ -1375,6 +1383,7 @@
     "standard-tooltip": "Standard Workload view shows all hints, redactions, recommendations & suggestions. This view allows editing.",
     "tabs": {
       "annotations": {
+        "hide-skipped": "Hide skipped in document",
         "jump-to-next": "Jump to Next",
         "jump-to-previous": "Jump to Previous",
         "label": "Workload",
@@ -1384,6 +1393,7 @@
         "select": "Select",
         "select-all": "All",
         "select-none": "None",
+        "show-skipped": "Show skipped in document",
         "the-filters": "the filters",
         "wrong-filters": "The selected filter combination is not possible. Please adjust or"
       },
@@ -1662,8 +1672,8 @@
       "licensed-page-count": "Licensed Pages",
       "licensed-retention-capacity": "Licensed Retention Capacity",
       "licensed-to": "Licensed to",
-      "section-title": "Licensing Details",
+      "licensing-period": "Licensing Period",
-      "licensing-period": "Licensing Period"
+      "section-title": "Licensing Details"
     },
     "page-usage": {
       "cumulative-pages": "Cumulative Pages",
@@ -1731,6 +1741,7 @@
     }
   },
   "minutes": "minutes",
+  "no-active-license": "",
   "notification": {
     "assign-approver": "You have been assigned as approver for <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> in dossier: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
     "assign-reviewer": "You have been assigned as reviewer for <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> in dossier: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
@@ -2020,17 +2031,6 @@
     "annotations": "",
     "title": "Structured Component Management"
   },
-  "false-positive-dialog": {
-    "actions": {
-      "cancel": "Cancel",
-      "save": "Yes, proceed"
-    },
-    "content": {
-      "comment": "Comment",
-      "body-text": "''{value}'' is a false positive in this context: {context}"
-    },
-    "header": "False Positive"
-  },
   "rules-screen": {
     "error": {
       "generic": "Something went wrong... Rules update failed!"
@@ -2306,12 +2306,5 @@
       "select": "Select"
     }
   },
-  "yesterday": "Yesterday",
+  "yesterday": "Yesterday"
-  "generic-errors": {
-    "400": "The sent request is not valid.",
-    "403": "Access to the requested resource is not allowed.",
-    "404": "The requested resource could not be found.",
-    "409": "The request is incompatible with the current state.",
-    "500": "The server encountered an unexpected condition that prevented it from fulfilling the request."
-  }
 }

apps/red-ui/src/assets/i18n/scm/de.json

@@ -1217,6 +1217,17 @@
     "title": "Hoppla! Etwas ist schief gelaufen..."
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
+  "false-positive-dialog": {
+    "actions": {
+      "cancel": "",
+      "save": ""
+    },
+    "content": {
+      "body-text": "",
+      "comment": ""
+    },
+    "header": ""
+  },
   "file": "Datei",
   "file-attribute-encoding-types": {
     "ascii": "",
@@ -1229,9 +1240,6 @@
     "text": "Freier Text"
   },
   "file-attribute": {
-    "actions": {
-      "edit": ""
-    },
     "update": {
       "error": "",
       "success": ""
@@ -1375,6 +1383,7 @@
     "standard-tooltip": "In der Standard-Ansicht des Workloads werden alle Hinweise, Schwärzungen, Empfehlungen und Vorschläge angezeigt. In dieser Ansicht ist die Bearbeitung möglich.",
     "tabs": {
       "annotations": {
+        "hide-skipped": "",
         "jump-to-next": "Springe zu Nächster",
         "jump-to-previous": "Springe zu Vorheriger",
         "label": "Arbeitsvorrat",
@@ -1384,6 +1393,7 @@
         "select": "Auswählen",
         "select-all": "Alle",
         "select-none": "Keine",
+        "show-skipped": "",
         "the-filters": "",
         "wrong-filters": ""
       },
@@ -1633,16 +1643,18 @@
     "table-header": "{length} {length, plural, one{Begründung} other{Begründung}}"
   },
   "license-info-screen": {
-    "backend-version": "Backend-Version der Anwendung",
+    "analysis-capacity-usage": {
-    "chart": {
+      "analyzed-cumulative": "",
-      "cumulative": "Seiten insgesamt",
+      "analyzed-per-month": "",
-      "legend": "",
+      "licensed": "",
-      "pages-per-month": "Seiten pro Monat",
+      "section-title": "",
-      "total-pages": "Gesamtzahl der Seiten"
+      "total-analyzed-data": "",
+      "used-in-period": "",
+      "used-in-total": ""
     },
+    "backend-version": "Backend-Version der Anwendung",
     "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)",
     "copyright-claim-title": "Copyright",
-    "current-analyzed": "In aktuellem Lizenzzeitraum analysierte Seiten",
     "custom-app-title": "Name der Anwendung",
     "email-report": "E-Mail-Bericht",
     "email": {
@@ -1654,20 +1666,40 @@
     },
     "end-user-license-text": "Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.",
     "end-user-license-title": "Endbenutzer-Lizenzvereinbarung",
-    "license-title": "",
+    "licensing-details": {
-    "licensed-page-count": "Anzahl der lizenzierten Seiten",
+      "license-title": "",
-    "licensed-to": "Lizenziert für",
+      "licensed-analysis-capacity": "",
-    "licensing-details": "Lizenzdetails",
+      "licensed-page-count": "",
-    "licensing-period": "Laufzeit der Lizenz",
+      "licensed-retention-capacity": "",
-    "ocr-analyzed-pages": "Mit OCR konvertierte Seiten",
+      "licensed-to": "",
+      "licensing-period": "",
+      "section-title": ""
+    },
+    "page-usage": {
+      "cumulative-pages": "",
+      "current-analyzed-pages": "",
+      "ocr-analyzed-pages": "",
+      "pages-per-month": "",
+      "section-title": "",
+      "total-analyzed": "",
+      "total-ocr-analyzed": "",
+      "total-pages": "",
+      "unlicensed-analyzed": ""
+    },
+    "retention-capacity-usage": {
+      "active-documents": "",
+      "archived-documents": "",
+      "exceeded-capacity": "",
+      "section-title": "",
+      "storage-capacity": "",
+      "trash-documents": "",
+      "unused": "",
+      "used-capacity": ""
+    },
     "status": {
       "active": "Aktiv",
       "inactive": ""
-    },
+    }
-    "total-analyzed": "Seit {date} insgesamt analysierte Seiten",
-    "total-ocr-analyzed": "",
-    "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten",
-    "usage-details": "Nutzungsdetails"
   },
   "license-information": "Lizenzinformationen",
   "load-all-annotations-success": "",
@@ -1709,6 +1741,7 @@
     }
   },
   "minutes": "",
+  "no-active-license": "",
   "notification": {
     "assign-approver": "Sie wurden dem Dokument <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}<b> als Genehmiger zugewiesen!",
     "assign-reviewer": "Sie wurden dem Dokument <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}<b> als Reviewer zugewiesen!",
@@ -2273,12 +2306,5 @@
       "select": "Wählen"
     }
   },
-  "yesterday": "Gestern",
+  "yesterday": "Gestern"
-  "generic-errors": {
-    "400": "",
-    "403": "",
-    "404": "",
-    "409": "",
-    "500": ""
-  }
 }

apps/red-ui/src/assets/i18n/scm/en.json

@@ -1217,6 +1217,17 @@
     "title": "Oops! Something went wrong..."
   },
   "exact-date": "{day} {month} {year} at {hour}:{minute}",
+  "false-positive-dialog": {
+    "actions": {
+      "cancel": "",
+      "save": ""
+    },
+    "content": {
+      "body-text": "",
+      "comment": ""
+    },
+    "header": ""
+  },
   "file": "File",
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
@@ -1229,9 +1240,6 @@
     "text": "Free Text"
   },
   "file-attribute": {
-    "actions": {
-      "edit": "Edit"
-    },
     "update": {
       "error": "Failed to update file attribute value!",
       "success": "File attribute value has been updated successfully!"
@@ -1375,6 +1383,7 @@
     "standard-tooltip": "Standard Workload view shows all hints, components, recommendations & suggestions. This view allows editing.",
     "tabs": {
       "annotations": {
+        "hide-skipped": "",
         "jump-to-next": "Jump to Next",
         "jump-to-previous": "Jump to Previous",
         "label": "Workload",
@@ -1384,6 +1393,7 @@
         "select": "Select",
         "select-all": "All",
         "select-none": "None",
+        "show-skipped": "",
         "the-filters": "the filters",
         "wrong-filters": "The selected filter combination is not possible. Please adjust or"
       },
@@ -1662,8 +1672,8 @@
       "licensed-page-count": "Licensed Pages",
       "licensed-retention-capacity": "Licensed Retention Capacity",
       "licensed-to": "Licensed to",
-      "section-title": "Licensing Details",
+      "licensing-period": "Licensing Period",
-      "licensing-period": "Licensing Period"
+      "section-title": "Licensing Details"
     },
     "page-usage": {
       "cumulative-pages": "Cumulative Pages",
@@ -1731,6 +1741,7 @@
     }
   },
   "minutes": "minutes",
+  "no-active-license": "",
   "notification": {
     "assign-approver": "You have been assigned as approver for <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> in dossier: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
     "assign-reviewer": "You have been assigned as reviewer for <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> in dossier: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
@@ -2295,12 +2306,5 @@
       "select": "Select"
     }
   },
-  "yesterday": "Yesterday",
+  "yesterday": "Yesterday"
-  "generic-errors": {
-    "400": "The sent request is not valid.",
-    "403": "Access to the requested resource is not allowed.",
-    "404": "The requested resource could not be found.",
-    "409": "The request is incompatible with the current state.",
-    "500": "The server encountered an unexpected condition that prevented it from fulfilling the request."
-  }
 }