From 6f94b1198ac7120b3304c4d8ea7b38f75ead9244 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 15 Sep 2023 13:42:09 +0300
Subject: [PATCH 01/12] fix text formatting for multiline redactions

---
 .../redact-text-dialog.component.html         | 10 ++-
 .../redact-text-dialog.component.scss         |  4 ++
 .../redact-text-dialog.component.ts           | 66 ++++++++-----------
 .../services/pdf-proxy.service.ts             |  2 +-
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
index e900cddfb..71f903cf8 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
@@ -6,14 +6,16 @@
             <div class="iqser-input-group w-450 selected-text-group">
                 <label
                     [translate]="
-                        initialText === form.get('selectedText').value
+                        initialText === form.controls.selectedText.value
                             ? 'redact-text.dialog.content.selected-text'
                             : 'redact-text.dialog.content.text'
                     "
                     class="selected-text"
                 ></label>
+
                 <div [ngClass]="isEditingSelectedText ? 'flex relative' : 'flex-align-items-center'" class="fixed-height">
-                    <span *ngIf="!isEditingSelectedText">{{ form.get('selectedText').value }}</span>
+                    <span *ngIf="!isEditingSelectedText" [innerHTML]="form.controls.selectedText.value" class="use-n-as-line-break"></span>
+
                     <textarea
                         *ngIf="isEditingSelectedText"
                         [rows]="selectedTextRows"
@@ -23,6 +25,7 @@
                         name="comment"
                         type="text"
                     ></textarea>
+
                     <iqser-circle-button
                         (action)="toggleEditingSelectedText()"
                         *ngIf="dictionaryRequest"
@@ -34,6 +37,7 @@
                         icon="iqser:edit"
                         tooltipPosition="below"
                     ></iqser-circle-button>
+
                     <iqser-circle-button
                         (action)="undoTextChange()"
                         *ngIf="isEditingSelectedText"
@@ -74,7 +78,7 @@
 
             <div *ngIf="!dictionaryRequest" class="iqser-input-group w-450">
                 <label [translate]="'redact-text.dialog.content.legal-basis'"></label>
-                <input [value]="form.get('reason').value?.legalBasis" disabled type="text" />
+                <input [value]="form.controls.reason.value?.legalBasis" disabled type="text" />
             </div>
 
             <div *ngIf="dictionaryRequest" class="iqser-input-group required w-450">
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
index f3381afc3..f1487499b 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
@@ -43,3 +43,7 @@
 textarea {
     margin-top: 0;
 }
+
+.use-n-as-line-break {
+    white-space: pre-line !important;
+}
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
index 3a11a87a2..c63635e4e 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
@@ -1,18 +1,18 @@
 import { Component, inject, OnInit } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormBuilder, UntypedFormGroup } from '@angular/forms';
+import { FormBuilder } from '@angular/forms';
 import { DetailsRadioOption, IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui';
 import { Dictionary, IAddRedactionRequest, SuperTypes } from '@red/domain';
 import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { DictionaryService } from '@services/entity-services/dictionary.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Roles } from '@users/roles';
+import { calcTextWidthInPixels } from '@utils/functions';
 import { firstValueFrom } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { getRedactOrHintOptions, RedactOrHintOption, RedactOrHintOptions } from '../../utils/dialog-options';
 import { RedactTextData, RedactTextResult } from '../../utils/dialog-types';
 import { LegalBasisOption } from '../manual-redaction-dialog/manual-annotation-dialog.component';
-import { calcTextWidthInPixels } from '@utils/functions';
 
 const MAXIMUM_SELECTED_TEXT_WIDTH = 421;
 
@@ -24,19 +24,19 @@ export class RedactTextDialogComponent
     extends IqserDialogComponent<RedactTextDialogComponent, RedactTextData, RedactTextResult>
     implements OnInit
 {
-    readonly #manualRedactionTypeExists: boolean;
     readonly #dossier = inject(ActiveDossiersService).find(this.data.dossierId);
+    readonly #manualRedactionTypeExists = inject(DictionaryService).hasManualType(this.#dossier.dossierTemplateId);
     #applyToAllDossiers = this.data.applyToAllDossiers ?? true;
     readonly roles = Roles;
     readonly iconButtonTypes = IconButtonTypes;
-    readonly options: DetailsRadioOption<RedactOrHintOption>[];
-    readonly form: UntypedFormGroup;
-    readonly initialText: string;
+    readonly options = getRedactOrHintOptions(this.#dossier, this.#applyToAllDossiers, this.data.isApprover);
+    readonly initialText = this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value;
+    readonly form = this.#getForm();
     dictionaryRequest = false;
     legalOptions: LegalBasisOption[] = [];
     dictionaries: Dictionary[] = [];
     isEditingSelectedText = false;
-    modifiedText: string;
+    modifiedText = this.initialText;
     selectedTextRows = 1;
 
     constructor(
@@ -45,16 +45,8 @@ export class RedactTextDialogComponent
         private readonly _formBuilder: FormBuilder,
     ) {
         super();
-        this.#manualRedactionTypeExists = this._dictionaryService.hasManualType(this.#dossier.dossierTemplateId);
-        this.options = getRedactOrHintOptions(this.#dossier, this.#applyToAllDossiers, this.data.isApprover);
-
-        this.form = this.#getForm();
-        this.initialText = this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value;
-        this.modifiedText = this.initialText;
-
-        this.form
-            .get('option')
-            .valueChanges.pipe(
+        this.form.controls.option.valueChanges
+            .pipe(
                 tap((option: DetailsRadioOption<RedactOrHintOption>) => {
                     this.dictionaryRequest = option.value === RedactOrHintOptions.IN_DOSSIER;
                     if (this.dictionaryRequest) {
@@ -62,7 +54,7 @@ export class RedactTextDialogComponent
                         this.form.patchValue({ selectedText: this.modifiedText });
                     } else {
                         this.isEditingSelectedText = false;
-                        this.modifiedText = this.form.get('selectedText').value;
+                        this.modifiedText = this.form.controls.selectedText.value;
                         this.form.patchValue({ selectedText: this.initialText });
                     }
                     this.#resetValues();
@@ -73,7 +65,7 @@ export class RedactTextDialogComponent
     }
 
     get displayedDictionaryLabel() {
-        const dictType = this.form.get('dictionary').value;
+        const dictType = this.form.controls.dictionary.value;
         if (dictType) {
             return this.dictionaries.find(d => d.type === dictType)?.label ?? null;
         }
@@ -82,9 +74,9 @@ export class RedactTextDialogComponent
 
     get disabled() {
         if (this.dictionaryRequest) {
-            return !this.form.get('dictionary').value;
+            return !this.form.controls.dictionary.value;
         }
-        return !this.form.get('reason').value;
+        return !this.form.controls.dictionary.value;
     }
 
     async ngOnInit(): Promise<void> {
@@ -108,18 +100,18 @@ export class RedactTextDialogComponent
         this.#applyToAllDossiers = option.extraOption.checked;
 
         this.#setDictionaries();
-        if (this.#applyToAllDossiers && this.form.get('dictionary').value) {
-            const selectedDictionaryLabel = this.form.get('dictionary').value;
+        if (this.#applyToAllDossiers && this.form.controls.dictionary.value) {
+            const selectedDictionaryLabel = this.form.controls.dictionary.value;
             const selectedDictionary = this.dictionaries.find(d => d.type === selectedDictionaryLabel);
             if (!selectedDictionary) {
-                this.form.get('dictionary').setValue(null);
+                this.form.controls.dictionary.setValue(null);
             }
         }
     }
 
     typeChanged() {
         if (!this.#applyToAllDossiers) {
-            const selectedDictionaryType = this.form.get('dictionary').value;
+            const selectedDictionaryType = this.form.controls.dictionary.value;
             const selectedDictionary = this.dictionaries.find(d => d.type === selectedDictionaryType);
             this.options[1].extraOption.disabled = selectedDictionary.dossierDictionaryOnly;
         }
@@ -130,14 +122,14 @@ export class RedactTextDialogComponent
         const redaction = this.data.manualRedactionEntryWrapper.manualRedactionEntry;
         this.close({
             redaction,
-            dictionary: this.dictionaries.find(d => d.type === this.form.get('dictionary').value),
+            dictionary: this.dictionaries.find(d => d.type === this.form.controls.dictionary.value),
         });
     }
 
     toggleEditingSelectedText() {
         this.isEditingSelectedText = !this.isEditingSelectedText;
         if (this.isEditingSelectedText) {
-            const width = calcTextWidthInPixels(this.form.get('selectedText').value);
+            const width = calcTextWidthInPixels(this.form.controls.selectedText.value);
             this.selectedTextRows = Math.ceil(width / MAXIMUM_SELECTED_TEXT_WIDTH);
         }
     }
@@ -149,25 +141,25 @@ export class RedactTextDialogComponent
     #getForm() {
         return this._formBuilder.group({
             selectedText: this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value,
-            reason: [null],
+            reason: null as LegalBasisOption,
             comment: [null],
             dictionary: [this.#manualRedactionTypeExists ? SuperTypes.ManualRedaction : null],
-            option: [this.options[0]],
+            option: this.options[0],
         });
     }
 
     #selectReason() {
         if (this.legalOptions.length === 1) {
-            this.form.get('reason').setValue(this.legalOptions[0]);
+            this.form.controls.reason.setValue(this.legalOptions[0]);
         }
     }
 
     #enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
-        addRedactionRequest.type = this.form.get('dictionary').value;
+        addRedactionRequest.type = this.form.controls.dictionary.value;
         addRedactionRequest.section = null;
-        addRedactionRequest.value = this.form.get('selectedText').value;
+        addRedactionRequest.value = this.form.controls.selectedText.value;
 
-        const legalOption: LegalBasisOption = this.form.get('reason').value;
+        const legalOption: LegalBasisOption = this.form.controls.reason.value;
         if (legalOption) {
             addRedactionRequest.reason = legalOption.description;
             addRedactionRequest.legalBasis = legalOption.legalBasis;
@@ -184,7 +176,7 @@ export class RedactTextDialogComponent
         if (!addRedactionRequest.reason) {
             addRedactionRequest.reason = 'Dictionary Request';
         }
-        const commentValue = this.form.get('comment').value;
+        const commentValue = this.form.controls.comment.value;
         addRedactionRequest.comment = commentValue ? { text: commentValue } : null;
         addRedactionRequest.addToAllDossiers = this.data.isApprover && this.dictionaryRequest && this.#applyToAllDossiers;
     }
@@ -193,10 +185,10 @@ export class RedactTextDialogComponent
         this.#applyToAllDossiers = this.data.applyToAllDossiers ?? true;
         this.options[1].extraOption.checked = this.#applyToAllDossiers;
         if (this.dictionaryRequest) {
-            this.form.get('reason').setValue(null);
-            this.form.get('dictionary').setValue(null);
+            this.form.controls.reason.setValue(null);
+            this.form.controls.dictionary.setValue(null);
             return;
         }
-        this.form.get('dictionary').setValue(this.#manualRedactionTypeExists ? SuperTypes.ManualRedaction : null);
+        this.form.controls.dictionary.setValue(this.#manualRedactionTypeExists ? SuperTypes.ManualRedaction : null);
     }
 }
diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
index ce5b804d2..a63e2d645 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
@@ -274,7 +274,7 @@ export class PdfProxyService {
     #formatSelectedText(text: string): string {
         return text?.replace(
             // eslint-disable-next-line no-control-regex,max-len
-            /([^\s\d-]{2,})[-\u00AD]\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
+            /([^\s\d-]{2,})[-\u00AD]\u000D|[\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
             '$1',
         );
     }

From 33e0ba3d574159f9e3820a0a5c799c7b2e98163a Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 15 Sep 2023 13:43:13 +0300
Subject: [PATCH 02/12] update node version

---
 docker/red-ui/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile
index e73829193..2aea4ec1e 100644
--- a/docker/red-ui/Dockerfile
+++ b/docker/red-ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.5-buster as builder
+FROM node:20.6-buster as builder
 
 WORKDIR /ng-app
 

From 258a304b94bc5bdc63f9ae3e780756e9a9d40fde Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 15 Sep 2023 13:53:31 +0300
Subject: [PATCH 03/12] use \n as line break

---
 .../add-annotation-dialog.component.html      |  2 +-
 .../add-annotation-dialog.component.ts        | 21 ++++++++++---------
 .../redact-text-dialog.component.html         |  6 +++++-
 .../redact-text-dialog.component.scss         |  4 ----
 libs/common-ui                                |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
index 4993b949f..97a163b1a 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
@@ -5,7 +5,7 @@
         <div class="dialog-content redaction">
             <div class="iqser-input-group w-450">
                 <label [translate]="'add-annotation.dialog.content.selected-text'" class="selected-text"></label>
-                {{ form.get('selectedText').value }}
+                <span [innerHTML]="form.controls.selectedText.value" class="use-backslash-n-as-line-break"></span>
             </div>
 
             <div class="iqser-input-group required w-450">
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.ts
index f58b626b4..f2e596777 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.ts
@@ -1,10 +1,9 @@
 import { Component, inject, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
-import { IconButtonTypes, IqserDialogComponent, IqserPermissionsService } from '@iqser/common-ui';
+import { IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui';
 import { Dictionary, IAddRedactionRequest } from '@red/domain';
 import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { DictionaryService } from '@services/entity-services/dictionary.service';
-import { Roles } from '@users/roles';
 import { AddAnnotationData, AddAnnotationResult } from '../../../utils/dialog-types';
 
 @Component({
@@ -15,17 +14,19 @@ export class AddAnnotationDialogComponent
     implements OnInit
 {
     readonly #dossier = inject(ActiveDossiersService).find(this.data.dossierId);
-    readonly #isRss = inject(IqserPermissionsService).has(Roles.getRss);
     readonly iconButtonTypes = IconButtonTypes;
     dictionaries: Dictionary[] = [];
     readonly form = this.#getForm();
 
-    constructor(private readonly _dictionaryService: DictionaryService, private readonly _formBuilder: FormBuilder) {
+    constructor(
+        private readonly _dictionaryService: DictionaryService,
+        private readonly _formBuilder: FormBuilder,
+    ) {
         super();
     }
 
     get displayedDictionaryLabel() {
-        const dictType = this.form.get('dictionary').value;
+        const dictType = this.form.controls.dictionary.value;
         if (dictType) {
             return this.dictionaries.find(d => d.type === dictType)?.label ?? null;
         }
@@ -33,7 +34,7 @@ export class AddAnnotationDialogComponent
     }
 
     get disabled() {
-        return !this.#isRss || !this.form.get('dictionary').value;
+        return !this.form.controls.dictionary.value;
     }
 
     ngOnInit() {
@@ -45,7 +46,7 @@ export class AddAnnotationDialogComponent
         const redaction = this.data.manualRedactionEntryWrapper.manualRedactionEntry;
         this.close({
             redaction,
-            dictionary: this.dictionaries.find(d => d.type === this.form.get('dictionary').value),
+            dictionary: this.dictionaries.find(d => d.type === this.form.controls.dictionary.value),
         });
     }
 
@@ -58,16 +59,16 @@ export class AddAnnotationDialogComponent
     }
 
     #enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
-        addRedactionRequest.type = this.form.get('dictionary').value;
+        addRedactionRequest.type = this.form.controls.dictionary.value;
 
         const selectedType = this.dictionaries.find(d => d.type === addRedactionRequest.type);
         addRedactionRequest.addToDictionary = !!selectedType?.hasDictionary;
         addRedactionRequest.reason ??= 'Dictionary Request';
 
-        const commentValue = this.form.get('comment').value;
+        const commentValue = this.form.controls.comment.value;
         addRedactionRequest.comment = commentValue ? { text: commentValue } : null;
         addRedactionRequest.section = null;
-        addRedactionRequest.value = this.form.get('selectedText').value;
+        addRedactionRequest.value = this.form.controls.selectedText.value;
         addRedactionRequest.addToAllDossiers = addRedactionRequest.addToDictionary || !!this.data.applyToAllDossiers;
     }
 }
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
index 71f903cf8..150c83ee9 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
@@ -14,7 +14,11 @@
                 ></label>
 
                 <div [ngClass]="isEditingSelectedText ? 'flex relative' : 'flex-align-items-center'" class="fixed-height">
-                    <span *ngIf="!isEditingSelectedText" [innerHTML]="form.controls.selectedText.value" class="use-n-as-line-break"></span>
+                    <span
+                        *ngIf="!isEditingSelectedText"
+                        [innerHTML]="form.controls.selectedText.value"
+                        class="use-backslash-n-as-line-break"
+                    ></span>
 
                     <textarea
                         *ngIf="isEditingSelectedText"
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
index f1487499b..f3381afc3 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
@@ -43,7 +43,3 @@
 textarea {
     margin-top: 0;
 }
-
-.use-n-as-line-break {
-    white-space: pre-line !important;
-}
diff --git a/libs/common-ui b/libs/common-ui
index d1df30b56..a4132b82f 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit d1df30b56ea5abd03b0c8623f68fc96db9fef271
+Subproject commit a4132b82f52e92025f2348fb83587680790ca3a8

From 26dd9567fb364aa3ee4e68379cb650688400535f Mon Sep 17 00:00:00 2001
From: George <george.balanesc.ext@knecon.com>
Date: Fri, 15 Sep 2023 14:06:19 +0300
Subject: [PATCH 04/12] DM-424, add component rules screen, update title for
 entity rule screen, adapt api flags to reflect changes

---
 .../app/modules/admin/admin-routing.module.ts |   4 +-
 .../src/app/modules/admin/admin.module.ts     |   3 +-
 .../component-rules-screen.component.html     |   0
 .../component-rules-screen.component.scss     |   0
 .../component-rules-screen.component.ts       |   9 +-
 .../component-rules/component-rules.module.ts |   2 +-
 .../entity-rules-screen.component.html}       |  10 +-
 .../entity-rules-screen.component.scss}       |   0
 .../entity-rules-screen.component.ts}         |  10 +-
 ...rules.module.ts => entity-rules.module.ts} |   8 +-
 .../admin/services/component-rules.service.ts |  16 --
 .../modules/admin/services/rules.service.ts   |   6 +-
 .../admin-side-nav.component.ts               |   4 +-
 apps/red-ui/src/assets/i18n/redact/de.json    | 170 +++++++++---------
 apps/red-ui/src/assets/i18n/redact/en.json    |  30 ++--
 apps/red-ui/src/assets/i18n/scm/de.json       |  28 +--
 apps/red-ui/src/assets/i18n/scm/en.json       |  28 +--
 libs/red-domain/src/lib/shared/rules.ts       |   6 +-
 18 files changed, 161 insertions(+), 173 deletions(-)
 rename apps/red-ui/src/app/modules/admin/screens/component-rules/{rules-screen => component-rules-screen}/component-rules-screen.component.html (100%)
 rename apps/red-ui/src/app/modules/admin/screens/component-rules/{rules-screen => component-rules-screen}/component-rules-screen.component.scss (100%)
 rename apps/red-ui/src/app/modules/admin/screens/component-rules/{rules-screen => component-rules-screen}/component-rules-screen.component.ts (96%)
 rename apps/red-ui/src/app/modules/admin/screens/rules/{rules-screen/rules-screen.component.html => entity-rules-screen/entity-rules-screen.component.html} (66%)
 rename apps/red-ui/src/app/modules/admin/screens/rules/{rules-screen/rules-screen.component.scss => entity-rules-screen/entity-rules-screen.component.scss} (100%)
 rename apps/red-ui/src/app/modules/admin/screens/rules/{rules-screen/rules-screen.component.ts => entity-rules-screen/entity-rules-screen.component.ts} (95%)
 rename apps/red-ui/src/app/modules/admin/screens/rules/{rules.module.ts => entity-rules.module.ts} (71%)
 delete mode 100644 apps/red-ui/src/app/modules/admin/services/component-rules.service.ts

diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
index a29289c29..1c619cd87 100644
--- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
@@ -49,7 +49,7 @@ const dossierTemplateIdRoutes: IqserRoutes = [
         ],
     },
     {
-        path: 'rules',
+        path: 'entity-rules',
         component: BaseDossierTemplateScreenComponent,
         canActivate: [CompositeRouteGuard, IqserPermissionsGuard],
         data: {
@@ -59,7 +59,7 @@ const dossierTemplateIdRoutes: IqserRoutes = [
                 redirectTo: 'info',
             },
         },
-        loadChildren: () => import('./screens/rules/rules.module').then(m => m.RulesModule),
+        loadChildren: () => import('./screens/rules/entity-rules.module').then(m => m.EntityRulesModule),
     },
     {
         path: 'component-rules',
diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts
index 495528870..fc8df4e81 100644
--- a/apps/red-ui/src/app/modules/admin/admin.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin.module.ts
@@ -57,7 +57,6 @@ import { DossierTemplateActionsComponent } from './shared/components/dossier-tem
 import { IqserUsersModule } from '@iqser/common-ui/lib/users';
 import { TenantPipe } from '@iqser/common-ui/lib/tenants';
 import { SelectComponent } from '@shared/components/select/select.component';
-import { ComponentRulesService } from './services/component-rules.service';
 
 const dialogs = [
     AddEditCloneDossierTemplateDialogComponent,
@@ -98,7 +97,7 @@ const components = [
 
 @NgModule({
     declarations: [...components],
-    providers: [AdminDialogService, AuditService, DigitalSignatureService, RulesService, ComponentRulesService, SmtpConfigService],
+    providers: [AdminDialogService, AuditService, DigitalSignatureService, RulesService, SmtpConfigService],
     imports: [
         CommonModule,
         SharedModule,
diff --git a/apps/red-ui/src/app/modules/admin/screens/component-rules/rules-screen/component-rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules-screen/component-rules-screen.component.html
similarity index 100%
rename from apps/red-ui/src/app/modules/admin/screens/component-rules/rules-screen/component-rules-screen.component.html
rename to apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules-screen/component-rules-screen.component.html
diff --git a/apps/red-ui/src/app/modules/admin/screens/component-rules/rules-screen/component-rules-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules-screen/component-rules-screen.component.scss
similarity index 100%
rename from apps/red-ui/src/app/modules/admin/screens/component-rules/rules-screen/component-rules-screen.component.scss
rename to apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules-screen/component-rules-screen.component.scss
diff --git a/apps/red-ui/src/app/modules/admin/screens/component-rules/rules-screen/component-rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules-screen/component-rules-screen.component.ts
similarity index 96%
rename from apps/red-ui/src/app/modules/admin/screens/component-rules/rules-screen/component-rules-screen.component.ts
rename to apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules-screen/component-rules-screen.component.ts
index c17ee1beb..cf7839551 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-rules/rules-screen/component-rules-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules-screen/component-rules-screen.component.ts
@@ -8,7 +8,7 @@ import { DOSSIER_TEMPLATE_ID } from '@red/domain';
 import { EditorThemeService } from '@services/editor-theme.service';
 import { ComponentCanDeactivate } from '@guards/can-deactivate.guard';
 import { Debounce, getParam } from '@iqser/common-ui/lib/utils';
-import { ComponentRulesService } from '../../../services/component-rules.service';
+import { RulesService } from '../../../services/rules.service';
 import ICodeEditor = monaco.editor.ICodeEditor;
 import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration;
 import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions;
@@ -46,7 +46,7 @@ export class ComponentRulesScreenComponent implements OnInit, ComponentCanDeacti
 
     constructor(
         readonly permissionsService: PermissionsService,
-        private readonly _componentRulesService: ComponentRulesService,
+        private readonly _rulesService: RulesService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
         private readonly _toaster: Toaster,
         private readonly _loadingService: LoadingService,
@@ -99,9 +99,10 @@ export class ComponentRulesScreenComponent implements OnInit, ComponentCanDeacti
         this._loadingService.start();
         this._removeErrorMarkers();
         await firstValueFrom(
-            this._componentRulesService.uploadRules({
+            this._rulesService.uploadRules({
                 rules: this._codeEditor.getModel().getValue(),
                 dossierTemplateId: this.#dossierTemplateId,
+                ruleFileType: 'COMPONENT',
             }),
         ).then(
             async () => {
@@ -205,7 +206,7 @@ export class ComponentRulesScreenComponent implements OnInit, ComponentCanDeacti
 
     private async _initialize() {
         this._loadingService.start();
-        await firstValueFrom(this._componentRulesService.download(this.#dossierTemplateId)).then(
+        await firstValueFrom(this._rulesService.download(this.#dossierTemplateId, 'COMPONENT')).then(
             rules => {
                 this.currentLines = this.initialLines = rules.rules.split('\n');
                 this.revert();
diff --git a/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules.module.ts b/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules.module.ts
index 14c171ff2..d5abe3232 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules.module.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/component-rules/component-rules.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { ComponentRulesScreenComponent } from './rules-screen/component-rules-screen.component';
+import { ComponentRulesScreenComponent } from './component-rules-screen/component-rules-screen.component';
 import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
 import { PendingChangesGuard } from '@guards/can-deactivate.guard';
 import { TranslateModule } from '@ngx-translate/core';
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.html
similarity index 66%
rename from apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.html
rename to apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.html
index 88a74ec4e..d06c91ec7 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.html
@@ -1,6 +1,6 @@
 <div class="header-container">
-    <div [translate]="'rules-screen.title'" class="heading-l"></div>
-    <div [translate]="'rules-screen.warning-text'" class="error"></div>
+    <div [translate]="'entity-rules-screen.title'" class="heading-l"></div>
+    <div [translate]="'entity-rules-screen.warning-text'" class="error"></div>
 </div>
 
 <ngx-monaco-editor (init)="onCodeEditorInit($event)" [(ngModel)]="codeEditorText" [options]="editorOptions"></ngx-monaco-editor>
@@ -9,18 +9,18 @@
     <div (click)="goToErrors()" *ngIf="numberOfErrors()" class="errors">
         <span>
             <mat-icon [svgIcon]="'iqser:alert-circle'" class="icon"></mat-icon>
-            <span [translateParams]="{ errors: numberOfErrors() }" [translate]="'rules-screen.errors-found'"></span>
+            <span [translateParams]="{ errors: numberOfErrors() }" [translate]="'entity-rules-screen.errors-found'"></span>
         </span>
         <mat-icon [svgIcon]="'iqser:expand'" class="icon face-up"></mat-icon>
     </div>
     <div class="actions">
         <iqser-icon-button
             (action)="save()"
-            [label]="'rules-screen.save-changes' | translate"
+            [label]="'entity-rules-screen.save-changes' | translate"
             [type]="iconButtonTypes.primary"
             icon="iqser:check"
         ></iqser-icon-button>
 
-        <div (click)="revert()" [translate]="'rules-screen.revert-changes'" class="all-caps-label cancel"></div>
+        <div (click)="revert()" [translate]="'entity-rules-screen.revert-changes'" class="all-caps-label cancel"></div>
     </div>
 </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.scss
similarity index 100%
rename from apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.scss
rename to apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.scss
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.ts
similarity index 95%
rename from apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts
rename to apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.ts
index 2635ec949..2798fed49 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/rules/entity-rules-screen/entity-rules-screen.component.ts
@@ -20,11 +20,11 @@ interface SyntaxError {
 }
 
 @Component({
-    templateUrl: './rules-screen.component.html',
-    styleUrls: ['./rules-screen.component.scss'],
+    templateUrl: './entity-rules-screen.component.html',
+    styleUrls: ['./entity-rules-screen.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class RulesScreenComponent implements OnInit, ComponentCanDeactivate {
+export class EntityRulesScreenComponent implements OnInit, ComponentCanDeactivate {
     readonly iconButtonTypes = IconButtonTypes;
     readonly editorOptions: IStandaloneEditorConstructionOptions = {
         theme: 'vs',
@@ -106,13 +106,13 @@ export class RulesScreenComponent implements OnInit, ComponentCanDeactivate {
         ).then(
             async () => {
                 await this._initialize();
-                this._toaster.success(_('rules-screen.success.generic'));
+                this._toaster.success(_('entity-rules-screen.success.generic'));
             },
             error => {
                 const errors = error.error as SyntaxError[] | undefined;
                 this._drawErrorMarkers(errors);
                 this._loadingService.stop();
-                this._toaster.error(_('rules-screen.error.generic'));
+                this._toaster.error(_('entity-rules-screen.error.generic'));
             },
         );
     }
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts b/apps/red-ui/src/app/modules/admin/screens/rules/entity-rules.module.ts
similarity index 71%
rename from apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts
rename to apps/red-ui/src/app/modules/admin/screens/rules/entity-rules.module.ts
index e6b248714..901f1f727 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/rules/entity-rules.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { RulesScreenComponent } from './rules-screen/rules-screen.component';
+import { EntityRulesScreenComponent } from './entity-rules-screen/entity-rules-screen.component';
 import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
 import { PendingChangesGuard } from '@guards/can-deactivate.guard';
 import { TranslateModule } from '@ngx-translate/core';
@@ -9,10 +9,10 @@ import { IconButtonComponent } from '@iqser/common-ui';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 
-const routes = [{ path: '', component: RulesScreenComponent, canDeactivate: [PendingChangesGuard] }];
+const routes = [{ path: '', component: EntityRulesScreenComponent, canDeactivate: [PendingChangesGuard] }];
 
 @NgModule({
-    declarations: [RulesScreenComponent],
+    declarations: [EntityRulesScreenComponent],
     imports: [
         RouterModule.forChild(routes),
         CommonModule,
@@ -23,4 +23,4 @@ const routes = [{ path: '', component: RulesScreenComponent, canDeactivate: [Pen
         MatIconModule,
     ],
 })
-export class RulesModule {}
+export class EntityRulesModule {}
diff --git a/apps/red-ui/src/app/modules/admin/services/component-rules.service.ts b/apps/red-ui/src/app/modules/admin/services/component-rules.service.ts
deleted file mode 100644
index 74b4ffa61..000000000
--- a/apps/red-ui/src/app/modules/admin/services/component-rules.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { GenericService } from '@iqser/common-ui';
-import { IComponentRules } from '@red/domain';
-
-@Injectable()
-export class ComponentRulesService extends GenericService<IComponentRules> {
-    protected readonly _defaultModelPath = 'rules';
-
-    download(dossierTemplateId: string) {
-        return this._getOne([dossierTemplateId]);
-    }
-
-    uploadRules(body: IComponentRules) {
-        return this._post<unknown>(body);
-    }
-}
diff --git a/apps/red-ui/src/app/modules/admin/services/rules.service.ts b/apps/red-ui/src/app/modules/admin/services/rules.service.ts
index bb221a185..5e3cf34e3 100644
--- a/apps/red-ui/src/app/modules/admin/services/rules.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/rules.service.ts
@@ -6,11 +6,11 @@ import { IRules } from '@red/domain';
 export class RulesService extends GenericService<IRules> {
     protected readonly _defaultModelPath = 'rules';
 
-    download(dossierTemplateId: string) {
-        return this._getOne([dossierTemplateId]);
+    download(dossierTemplateId: string, ruleFileType: IRules['ruleFileType'] = 'ENTITY') {
+        return this._getOne([dossierTemplateId], this._defaultModelPath, [{ key: 'ruleFileType', value: ruleFileType }]);
     }
 
     uploadRules(body: IRules) {
-        return this._post<unknown>(body);
+        return this._post<unknown>({ ...body, ruleFileType: body.ruleFileType ?? 'ENTITY' });
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
index 71888466f..73bc932a9 100644
--- a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
@@ -95,8 +95,8 @@ export class AdminSideNavComponent implements OnInit {
                 show: true,
             },
             {
-                screen: 'rules',
-                label: _('admin-side-nav.rule-editor'),
+                screen: 'entity-rules',
+                label: _('admin-side-nav.entity-rule-editor'),
                 show: (this.isIqserDevMode || this.canAccessRulesInDocumine) && this._permissionsService.has(Roles.rules.read),
             },
             {
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 12448eefa..20ab33b87 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -245,20 +245,17 @@
     "dossier-templates": "Dossier-Vorlage",
     "entities": "Entities",
     "entity-info": "Info",
+    "entity-rule-editor": "",
     "false-positive": "False Positive",
     "false-recommendations": "False Recommendations",
     "file-attributes": "File Attributes",
     "justifications": "Justifications",
     "license-information": "License Information",
     "reports": "Reports",
-    "rule-editor": "Rule Editor",
     "settings": "Einstellungen",
     "user-management": "User Management",
     "watermarks": "Watermarks"
   },
-  "annotation": {
-    "pending": "(Pending Analysis)"
-  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -341,14 +338,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove": {
-          "error": "Fehler beim Entfernen der Schwärzung: {error}",
-          "success": "Schwärzung entfernt!"
-        },
         "remove-hint": {
           "error": "Failed to remove hint: {error}",
           "success": "Hint removed!"
         },
+        "remove": {
+          "error": "Fehler beim Entfernen der Schwärzung: {error}",
+          "success": "Schwärzung entfernt!"
+        },
         "request-change-legal-basis": {
           "error": "Fehler beim Vorschlagen der Änderung der Begründung:",
           "success": "Die Änderung der in der Anmerkung genannten Begründung wurde beantragt."
@@ -365,14 +362,14 @@
           "error": "Fehler beim Vorschlagen der Neukategorisierung des Bilds: {error}",
           "success": "Bild-Neuklassifizierung angefordert."
         },
-        "request-remove": {
-          "error": "Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}",
-          "success": "Entfernen der Schwärzung wurde vorgeschlagen!"
-        },
         "request-remove-hint": {
           "error": "Failed to request removal of hint: {error}",
           "success": "Requested to remove hint!"
         },
+        "request-remove": {
+          "error": "Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}",
+          "success": "Entfernen der Schwärzung wurde vorgeschlagen!"
+        },
         "suggest": {
           "error": "Vorschlag einer Schwärzung wurde nicht gespeichert: {error}",
           "success": "Vorschlag einer Schwärzung gespeichert"
@@ -389,15 +386,15 @@
     "remove-highlights": {
       "label": "Remove Selected Earmarks"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "see-references": {
       "label": "See References"
     },
@@ -439,6 +436,9 @@
     "suggestion-resize": "Vorgeschlagene Größenänderung",
     "text-highlight": "Earmark"
   },
+  "annotation": {
+    "pending": "(Pending Analysis)"
+  },
   "archived-dossiers-listing": {
     "no-data": {
       "title": "No archived dossiers."
@@ -618,18 +618,14 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new redactions.",
       "title": "Warning!"
     },
-    "approve-multiple-files": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+    "approve-file": {
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -638,6 +634,10 @@
       "question": "Analysis required to detect new redactions for at least one file.",
       "title": "Warning"
     },
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -983,13 +983,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1058,14 +1058,6 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{User} other {Users}}"
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone Template",
@@ -1101,6 +1093,14 @@
       "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
     }
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1284,6 +1284,19 @@
       "title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
     }
   },
+  "entity-rules-screen": {
+    "error": {
+      "generic": ""
+    },
+    "errors-found": "",
+    "revert-changes": "",
+    "save-changes": "",
+    "success": {
+      "generic": ""
+    },
+    "title": "",
+    "warning-text": ""
+  },
   "entity": {
     "info": {
       "actions": {
@@ -1299,13 +1312,13 @@
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file": {
-        "action": "Zurück zum Dossier",
-        "label": "Diese Datei wurde gelöscht!"
-      },
       "file-dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Das Dossier dieser Datei wurde gelöscht!"
+      },
+      "file": {
+        "action": "Zurück zum Dossier",
+        "label": "Diese Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1323,12 +1336,6 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1339,6 +1346,12 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1552,6 +1565,15 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
+  "filter-menu": {
+    "filter-options": "Filteroptionen",
+    "filter-types": "Filter",
+    "label": "Filter",
+    "pages-without-annotations": "Only pages without annotations",
+    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
+    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
+    "with-comments": "Nur Anmerkungen mit Kommentaren"
+  },
   "filter": {
     "analysis": "Analyse erforderlich",
     "comment": "Kommentare",
@@ -1562,15 +1584,6 @@
     "suggestion": "Vorgeschlagene Schwärzung",
     "updated": "Aktualisiert"
   },
-  "filter-menu": {
-    "filter-options": "Filteroptionen",
-    "filter-types": "Filter",
-    "label": "Filter",
-    "pages-without-annotations": "Only pages without annotations",
-    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
-    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
-    "with-comments": "Nur Anmerkungen mit Kommentaren"
-  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents State",
@@ -1737,6 +1750,7 @@
   },
   "license-info-screen": {
     "backend-version": "Backend-Version der Anwendung",
+    "capacity-details": "Capacity Details",
     "capacity": {
       "active-documents": "Active Documents",
       "all-documents": "Retention Capacity Used",
@@ -1746,12 +1760,12 @@
       "trash-documents": "Documents in Trash",
       "unused": "Unused Storage"
     },
-    "capacity-details": "Capacity Details",
     "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon",
     "copyright-claim-title": "Copyright",
     "current-analyzed-pages": "In aktuellem Lizenzzeitraum analysierte Seiten",
     "current-volume-analyzed": "Data Volume Analyzed in Licensing Period",
     "custom-app-title": "Name der Anwendung",
+    "email-report": "E-Mail-Bericht",
     "email": {
       "body": {
         "analyzed": "Im aktuellen Lizenzzeitraum insgesamt analysierte Seiten: {pages}.",
@@ -1759,7 +1773,6 @@
       },
       "title": "Lizenzbericht {licenseCustomer}"
     },
-    "email-report": "E-Mail-Bericht",
     "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": "License Title",
@@ -1844,13 +1857,6 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted Dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1864,6 +1870,7 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1881,7 +1888,6 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1889,6 +1895,13 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted Dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -1980,16 +1993,16 @@
     "warnings-subtitle": "Do not show again options",
     "warnings-title": "Prompts and Dialogs Settings"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
     "processed": "Processed",
     "processing": "Processing"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2239,25 +2252,6 @@
     },
     "title": "Structured Component Management"
   },
-  "rules-screen": {
-    "error": {
-      "generic": "Es ist ein Fehler aufgetreten ... Die Regeln konnten nicht aktualisiert werden!"
-    },
-    "errors-found": "{errors, plural, one{An error} other{{errors} errors}} found in rules",
-    "revert-changes": "Anmeldedaten speichern",
-    "save-changes": "Änderungen speichern",
-    "success": {
-      "generic": "Die Regeln wurden aktualisiert!"
-    },
-    "title": "Rule Editor",
-    "warning-text": "Warning: experimental feature!"
-  },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2281,6 +2275,12 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Gestern"
-}
\ No newline at end of file
+}
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 1a5d3bf82..3c777e4b3 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -245,13 +245,13 @@
     "dossier-templates": "Dossier Templates",
     "entities": "Entities",
     "entity-info": "Info",
+    "entity-rule-editor": "Entity Rule Editor",
     "false-positive": "False Positive",
     "false-recommendations": "False Recommendations",
     "file-attributes": "File Attributes",
     "justifications": "Justifications",
     "license-information": "License Information",
     "reports": "Reports",
-    "rule-editor": "Rule Editor",
     "settings": "Settings",
     "user-management": "User Management",
     "watermarks": "Watermarks"
@@ -1284,6 +1284,19 @@
       "title": "{length} {length, plural, one{entity} other{entities}}"
     }
   },
+  "entity-rules-screen": {
+    "error": {
+      "generic": "Something went wrong... Entity rules update failed!"
+    },
+    "errors-found": "{errors, plural, one{An error} other{{errors} errors}} found in rules",
+    "revert-changes": "Revert",
+    "save-changes": "Save Changes",
+    "success": {
+      "generic": "Entity rules updated!"
+    },
+    "title": "Entity Rule Editor",
+    "warning-text": "Warning: experimental feature!"
+  },
   "entity": {
     "info": {
       "actions": {
@@ -2239,19 +2252,6 @@
     },
     "title": "Structured Component Management"
   },
-  "rules-screen": {
-    "error": {
-      "generic": "Something went wrong... Rules update failed!"
-    },
-    "errors-found": "{errors, plural, one{An error} other{{errors} errors}} found in rules",
-    "revert-changes": "Revert",
-    "save-changes": "Save Changes",
-    "success": {
-      "generic": "Rules updated!"
-    },
-    "title": "Rule Editor",
-    "warning-text": "Warning: experimental feature!"
-  },
   "search-screen": {
     "cols": {
       "assignee": "Assignee",
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
\ No newline at end of file
+}
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 6bef9e9c2..f422a3d72 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -245,13 +245,13 @@
     "dossier-templates": "Dossier-Vorlage",
     "entities": "",
     "entity-info": "",
+    "entity-rule-editor": "",
     "false-positive": "",
     "false-recommendations": "",
     "file-attributes": "",
     "justifications": "",
     "license-information": "",
     "reports": "",
-    "rule-editor": "",
     "settings": "Einstellungen",
     "user-management": "",
     "watermarks": ""
@@ -1284,6 +1284,19 @@
       "title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
     }
   },
+  "entity-rules-screen": {
+    "error": {
+      "generic": ""
+    },
+    "errors-found": "",
+    "revert-changes": "",
+    "save-changes": "",
+    "success": {
+      "generic": ""
+    },
+    "title": "",
+    "warning-text": ""
+  },
   "entity": {
     "info": {
       "actions": {
@@ -2239,19 +2252,6 @@
     },
     "title": ""
   },
-  "rules-screen": {
-    "error": {
-      "generic": "Es ist ein Fehler aufgetreten ... Die Regeln konnten nicht aktualisiert werden!"
-    },
-    "errors-found": "",
-    "revert-changes": "Anmeldedaten speichern",
-    "save-changes": "Änderungen speichern",
-    "success": {
-      "generic": "Die Regeln wurden aktualisiert!"
-    },
-    "title": "",
-    "warning-text": ""
-  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 54780a8cd..e0b4ab8df 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -245,13 +245,13 @@
     "dossier-templates": "Dossier Templates",
     "entities": "Entities",
     "entity-info": "Info",
+    "entity-rule-editor": "Entity Rule Editor",
     "false-positive": "False Positive",
     "false-recommendations": "False Recommendations",
     "file-attributes": "File Attributes",
     "justifications": "Justifications",
     "license-information": "License Information",
     "reports": "Reports",
-    "rule-editor": "Rule Editor",
     "settings": "Settings",
     "user-management": "User Management",
     "watermarks": "Watermarks"
@@ -1284,6 +1284,19 @@
       "title": "{length} {length, plural, one{entity} other{entities}}"
     }
   },
+  "entity-rules-screen": {
+    "error": {
+      "generic": "Something went wrong... Entity rules update failed!"
+    },
+    "errors-found": "{errors, plural, one{An error} other{{errors} errors}} found in rules",
+    "revert-changes": "Revert",
+    "save-changes": "Save Changes",
+    "success": {
+      "generic": "Entity rules updated!"
+    },
+    "title": "Entity Rule Editor",
+    "warning-text": "Warning: experimental feature!"
+  },
   "entity": {
     "info": {
       "actions": {
@@ -2239,19 +2252,6 @@
     },
     "title": "Component View"
   },
-  "rules-screen": {
-    "error": {
-      "generic": "Something went wrong... Rules update failed!"
-    },
-    "errors-found": "{errors, plural, one{An error} other{{errors} errors}} found in rules",
-    "revert-changes": "Revert",
-    "save-changes": "Save Changes",
-    "success": {
-      "generic": "Rules updated!"
-    },
-    "title": "Rule Editor",
-    "warning-text": "Warning: experimental feature!"
-  },
   "search-screen": {
     "cols": {
       "assignee": "Assignee",
diff --git a/libs/red-domain/src/lib/shared/rules.ts b/libs/red-domain/src/lib/shared/rules.ts
index 64a4f9550..a94c435ec 100644
--- a/libs/red-domain/src/lib/shared/rules.ts
+++ b/libs/red-domain/src/lib/shared/rules.ts
@@ -3,9 +3,13 @@
  */
 export interface IRules {
     /**
-     * The DossierTemplate Id for these rules
+     * The DossierTemplate ID for these rules
      */
     dossierTemplateId?: string;
+    /**
+     * The file type to be retrieved/saved under, defaults to ENTITY
+     */
+    ruleFileType?: 'ENTITY' | 'COMPONENT';
     /**
      * The actual string of rules.
      */

From 91fce725ce42fff1103de18be1d3f9aa422a7349 Mon Sep 17 00:00:00 2001
From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1
 <project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1@noreply.gitlab.knecon.com>
Date: Fri, 15 Sep 2023 11:09:09 +0000
Subject: [PATCH 05/12] push back localazy update

---
 apps/red-ui/src/assets/i18n/redact/de.json | 170 ++++++++++-----------
 apps/red-ui/src/assets/i18n/redact/en.json |   2 +-
 2 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 20ab33b87..1e62363f2 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -245,7 +245,7 @@
     "dossier-templates": "Dossier-Vorlage",
     "entities": "Entities",
     "entity-info": "Info",
-    "entity-rule-editor": "",
+    "entity-rule-editor": "Entity Rule Editor",
     "false-positive": "False Positive",
     "false-recommendations": "False Recommendations",
     "file-attributes": "File Attributes",
@@ -256,6 +256,9 @@
     "user-management": "User Management",
     "watermarks": "Watermarks"
   },
+  "annotation": {
+    "pending": "(Pending Analysis)"
+  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -338,14 +341,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove-hint": {
-          "error": "Failed to remove hint: {error}",
-          "success": "Hint removed!"
-        },
         "remove": {
           "error": "Fehler beim Entfernen der Schwärzung: {error}",
           "success": "Schwärzung entfernt!"
         },
+        "remove-hint": {
+          "error": "Failed to remove hint: {error}",
+          "success": "Hint removed!"
+        },
         "request-change-legal-basis": {
           "error": "Fehler beim Vorschlagen der Änderung der Begründung:",
           "success": "Die Änderung der in der Anmerkung genannten Begründung wurde beantragt."
@@ -362,14 +365,14 @@
           "error": "Fehler beim Vorschlagen der Neukategorisierung des Bilds: {error}",
           "success": "Bild-Neuklassifizierung angefordert."
         },
-        "request-remove-hint": {
-          "error": "Failed to request removal of hint: {error}",
-          "success": "Requested to remove hint!"
-        },
         "request-remove": {
           "error": "Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}",
           "success": "Entfernen der Schwärzung wurde vorgeschlagen!"
         },
+        "request-remove-hint": {
+          "error": "Failed to request removal of hint: {error}",
+          "success": "Requested to remove hint!"
+        },
         "suggest": {
           "error": "Vorschlag einer Schwärzung wurde nicht gespeichert: {error}",
           "success": "Vorschlag einer Schwärzung gespeichert"
@@ -386,15 +389,15 @@
     "remove-highlights": {
       "label": "Remove Selected Earmarks"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "see-references": {
       "label": "See References"
     },
@@ -436,9 +439,6 @@
     "suggestion-resize": "Vorgeschlagene Größenänderung",
     "text-highlight": "Earmark"
   },
-  "annotation": {
-    "pending": "(Pending Analysis)"
-  },
   "archived-dossiers-listing": {
     "no-data": {
       "title": "No archived dossiers."
@@ -618,14 +618,18 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
+    "approve-file": {
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new redactions.",
       "title": "Warning!"
     },
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -634,10 +638,6 @@
       "question": "Analysis required to detect new redactions for at least one file.",
       "title": "Warning"
     },
-    "approve-multiple-files": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -983,13 +983,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1058,6 +1058,14 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{User} other {Users}}"
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone Template",
@@ -1093,14 +1101,6 @@
       "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
     }
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1284,19 +1284,6 @@
       "title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
     }
   },
-  "entity-rules-screen": {
-    "error": {
-      "generic": ""
-    },
-    "errors-found": "",
-    "revert-changes": "",
-    "save-changes": "",
-    "success": {
-      "generic": ""
-    },
-    "title": "",
-    "warning-text": ""
-  },
   "entity": {
     "info": {
       "actions": {
@@ -1306,19 +1293,32 @@
       "heading": "Edit Entity"
     }
   },
+  "entity-rules-screen": {
+    "error": {
+      "generic": "Something went wrong... Entity rules update failed!"
+    },
+    "errors-found": "{errors, plural, one{An error} other{{errors} errors}} found in rules",
+    "revert-changes": "Revert",
+    "save-changes": "Save Changes",
+    "success": {
+      "generic": "Entity rules updated!"
+    },
+    "title": "Entity Rule Editor",
+    "warning-text": "Warning: experimental feature!"
+  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file-dossier": {
-        "action": "Zurück zur Übersicht",
-        "label": "Das Dossier dieser Datei wurde gelöscht!"
-      },
       "file": {
         "action": "Zurück zum Dossier",
         "label": "Diese Datei wurde gelöscht!"
+      },
+      "file-dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Das Dossier dieser Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1336,6 +1336,12 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1346,12 +1352,6 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1565,15 +1565,6 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
-  "filter-menu": {
-    "filter-options": "Filteroptionen",
-    "filter-types": "Filter",
-    "label": "Filter",
-    "pages-without-annotations": "Only pages without annotations",
-    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
-    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
-    "with-comments": "Nur Anmerkungen mit Kommentaren"
-  },
   "filter": {
     "analysis": "Analyse erforderlich",
     "comment": "Kommentare",
@@ -1584,6 +1575,15 @@
     "suggestion": "Vorgeschlagene Schwärzung",
     "updated": "Aktualisiert"
   },
+  "filter-menu": {
+    "filter-options": "Filteroptionen",
+    "filter-types": "Filter",
+    "label": "Filter",
+    "pages-without-annotations": "Only pages without annotations",
+    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
+    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
+    "with-comments": "Nur Anmerkungen mit Kommentaren"
+  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents State",
@@ -1750,7 +1750,6 @@
   },
   "license-info-screen": {
     "backend-version": "Backend-Version der Anwendung",
-    "capacity-details": "Capacity Details",
     "capacity": {
       "active-documents": "Active Documents",
       "all-documents": "Retention Capacity Used",
@@ -1760,12 +1759,12 @@
       "trash-documents": "Documents in Trash",
       "unused": "Unused Storage"
     },
+    "capacity-details": "Capacity Details",
     "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon",
     "copyright-claim-title": "Copyright",
     "current-analyzed-pages": "In aktuellem Lizenzzeitraum analysierte Seiten",
     "current-volume-analyzed": "Data Volume Analyzed in Licensing Period",
     "custom-app-title": "Name der Anwendung",
-    "email-report": "E-Mail-Bericht",
     "email": {
       "body": {
         "analyzed": "Im aktuellen Lizenzzeitraum insgesamt analysierte Seiten: {pages}.",
@@ -1773,6 +1772,7 @@
       },
       "title": "Lizenzbericht {licenseCustomer}"
     },
+    "email-report": "E-Mail-Bericht",
     "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": "License Title",
@@ -1857,6 +1857,13 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted Dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1870,7 +1877,6 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1888,6 +1894,7 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1895,13 +1902,6 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted Dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -1993,16 +1993,16 @@
     "warnings-subtitle": "Do not show again options",
     "warnings-title": "Prompts and Dialogs Settings"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
     "processed": "Processed",
     "processing": "Processing"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2252,6 +2252,12 @@
     },
     "title": "Structured Component Management"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2275,12 +2281,6 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
   },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Gestern"
-}
+}
\ No newline at end of file
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 3c777e4b3..3caa260f4 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}
\ No newline at end of file

From 5be720bc7e558dbfebf49f7ce8bf92a05e8b992a Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 15 Sep 2023 14:43:07 +0300
Subject: [PATCH 06/12] DM-473 revert to original behaviour

---
 .../add-annotation-dialog.component.html               |  2 +-
 .../manual-annotation-dialog.component.ts              |  2 ++
 .../redact-text-dialog.component.html                  |  6 +-----
 .../file-preview/file-preview-screen.component.ts      |  3 ++-
 .../modules/file-preview/services/pdf-proxy.service.ts | 10 +---------
 apps/red-ui/src/app/utils/functions.ts                 | 10 +++++++++-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
index 97a163b1a..b00923b5d 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
@@ -5,7 +5,7 @@
         <div class="dialog-content redaction">
             <div class="iqser-input-group w-450">
                 <label [translate]="'add-annotation.dialog.content.selected-text'" class="selected-text"></label>
-                <span [innerHTML]="form.controls.selectedText.value" class="use-backslash-n-as-line-break"></span>
+                <span [innerHTML]="form.controls.selectedText.value"></span>
             </div>
 
             <div class="iqser-input-group required w-450">
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index 829047265..53595cb9b 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -9,6 +9,7 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic
 import { DictionaryService } from '@services/entity-services/dictionary.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Roles } from '@users/roles';
+import { removeHyphensAndSpecialChars } from '@utils/functions';
 import { firstValueFrom } from 'rxjs';
 import { ManualRedactionService } from '../../services/manual-redaction.service';
 
@@ -185,6 +186,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
         addRedactionRequest.value = addRedactionRequest.rectangle
             ? this.form.get('classification').value
             : this.form.get('selectedText').value;
+        addRedactionRequest.value = removeHyphensAndSpecialChars(addRedactionRequest.value);
     }
 
     #selectReason() {
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
index 150c83ee9..048b49c85 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
@@ -14,11 +14,7 @@
                 ></label>
 
                 <div [ngClass]="isEditingSelectedText ? 'flex relative' : 'flex-align-items-center'" class="fixed-height">
-                    <span
-                        *ngIf="!isEditingSelectedText"
-                        [innerHTML]="form.controls.selectedText.value"
-                        class="use-backslash-n-as-line-break"
-                    ></span>
+                    <span *ngIf="!isEditingSelectedText" [innerHTML]="form.controls.selectedText.value"></span>
 
                     <textarea
                         *ngIf="isEditingSelectedText"
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
index cf56904e0..27edbab0c 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@@ -52,7 +52,7 @@ import JSZip from 'jszip';
 import { NGXLogger } from 'ngx-logger';
 import { combineLatest, first, firstValueFrom, of, pairwise } from 'rxjs';
 import { catchError, filter, map, startWith, switchMap, tap } from 'rxjs/operators';
-import { byId, byPage, download, handleFilterDelta, hasChanges } from '../../utils';
+import { byId, byPage, download, handleFilterDelta, hasChanges, removeHyphensAndSpecialChars } from '../../utils';
 import { AnnotationDrawService } from '../pdf-viewer/services/annotation-draw.service';
 import { REDAnnotationManager } from '../pdf-viewer/services/annotation-manager.service';
 import { REDDocumentViewer } from '../pdf-viewer/services/document-viewer.service';
@@ -533,6 +533,7 @@ export class FilePreviewScreenComponent
         }
 
         const hint = manualRedactionEntryWrapper.type === ManualRedactionEntryTypes.HINT;
+        result.redaction.value = removeHyphensAndSpecialChars(result.redaction.value);
         const add$ = this._manualRedactionService.addAnnotation([result.redaction], this.dossierId, this.fileId, {
             hint,
             dictionaryLabel: result.dictionary?.label,
diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
index a63e2d645..4c190375d 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
@@ -266,19 +266,11 @@ export class PdfProxyService {
             }
         }
 
-        entry.value = this.#formatSelectedText(text);
+        entry.value = text;
         entry.rectangle = !text;
         return entry;
     }
 
-    #formatSelectedText(text: string): string {
-        return text?.replace(
-            // eslint-disable-next-line no-control-regex,max-len
-            /([^\s\d-]{2,})[-\u00AD]\u000D|[\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
-            '$1',
-        );
-    }
-
     #deactivateMultiSelect() {
         this._logger.info('[PDF] Deactivating multi-select');
         this._multiSelectService.deactivate();
diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts
index 83190316a..df12eb1d3 100644
--- a/apps/red-ui/src/app/utils/functions.ts
+++ b/apps/red-ui/src/app/utils/functions.ts
@@ -1,5 +1,5 @@
-import type { List } from '@iqser/common-ui/lib/utils';
 import { ITrackable } from '@iqser/common-ui';
+import type { List } from '@iqser/common-ui/lib/utils';
 import type { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Dayjs } from 'dayjs';
 
@@ -133,3 +133,11 @@ export function calcTextWidthInPixels(text: string): number {
 
     return width;
 }
+
+export function removeHyphensAndSpecialChars(text: string): string {
+    return text?.replace(
+        // eslint-disable-next-line no-control-regex,max-len
+        /([^\s\d-]{2,})[-\u00AD]\u000A\u000D|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
+        '$1',
+    );
+}

From 138a2c7f03ffe623f84c707dd1457bd8be282539 Mon Sep 17 00:00:00 2001
From: George <george.balanesc.ext@knecon.com>
Date: Fri, 15 Sep 2023 14:55:01 +0300
Subject: [PATCH 07/12] DM-424, replace query param with route param

---
 apps/red-ui/src/app/modules/admin/services/rules.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/red-ui/src/app/modules/admin/services/rules.service.ts b/apps/red-ui/src/app/modules/admin/services/rules.service.ts
index 5e3cf34e3..01b5b0886 100644
--- a/apps/red-ui/src/app/modules/admin/services/rules.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/rules.service.ts
@@ -7,7 +7,7 @@ export class RulesService extends GenericService<IRules> {
     protected readonly _defaultModelPath = 'rules';
 
     download(dossierTemplateId: string, ruleFileType: IRules['ruleFileType'] = 'ENTITY') {
-        return this._getOne([dossierTemplateId], this._defaultModelPath, [{ key: 'ruleFileType', value: ruleFileType }]);
+        return this._getOne([dossierTemplateId, ruleFileType]);
     }
 
     uploadRules(body: IRules) {

From a967793377675c20715c834ec517b20ef4db2ccc Mon Sep 17 00:00:00 2001
From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1
 <project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1@noreply.gitlab.knecon.com>
Date: Fri, 15 Sep 2023 11:56:11 +0000
Subject: [PATCH 08/12] push back localazy update

---
 apps/red-ui/src/assets/i18n/redact/de.json | 170 ++++++++++-----------
 apps/red-ui/src/assets/i18n/redact/en.json |   2 +-
 2 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 20ab33b87..1e62363f2 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -245,7 +245,7 @@
     "dossier-templates": "Dossier-Vorlage",
     "entities": "Entities",
     "entity-info": "Info",
-    "entity-rule-editor": "",
+    "entity-rule-editor": "Entity Rule Editor",
     "false-positive": "False Positive",
     "false-recommendations": "False Recommendations",
     "file-attributes": "File Attributes",
@@ -256,6 +256,9 @@
     "user-management": "User Management",
     "watermarks": "Watermarks"
   },
+  "annotation": {
+    "pending": "(Pending Analysis)"
+  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -338,14 +341,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove-hint": {
-          "error": "Failed to remove hint: {error}",
-          "success": "Hint removed!"
-        },
         "remove": {
           "error": "Fehler beim Entfernen der Schwärzung: {error}",
           "success": "Schwärzung entfernt!"
         },
+        "remove-hint": {
+          "error": "Failed to remove hint: {error}",
+          "success": "Hint removed!"
+        },
         "request-change-legal-basis": {
           "error": "Fehler beim Vorschlagen der Änderung der Begründung:",
           "success": "Die Änderung der in der Anmerkung genannten Begründung wurde beantragt."
@@ -362,14 +365,14 @@
           "error": "Fehler beim Vorschlagen der Neukategorisierung des Bilds: {error}",
           "success": "Bild-Neuklassifizierung angefordert."
         },
-        "request-remove-hint": {
-          "error": "Failed to request removal of hint: {error}",
-          "success": "Requested to remove hint!"
-        },
         "request-remove": {
           "error": "Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}",
           "success": "Entfernen der Schwärzung wurde vorgeschlagen!"
         },
+        "request-remove-hint": {
+          "error": "Failed to request removal of hint: {error}",
+          "success": "Requested to remove hint!"
+        },
         "suggest": {
           "error": "Vorschlag einer Schwärzung wurde nicht gespeichert: {error}",
           "success": "Vorschlag einer Schwärzung gespeichert"
@@ -386,15 +389,15 @@
     "remove-highlights": {
       "label": "Remove Selected Earmarks"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "see-references": {
       "label": "See References"
     },
@@ -436,9 +439,6 @@
     "suggestion-resize": "Vorgeschlagene Größenänderung",
     "text-highlight": "Earmark"
   },
-  "annotation": {
-    "pending": "(Pending Analysis)"
-  },
   "archived-dossiers-listing": {
     "no-data": {
       "title": "No archived dossiers."
@@ -618,14 +618,18 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
+    "approve-file": {
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new redactions.",
       "title": "Warning!"
     },
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -634,10 +638,6 @@
       "question": "Analysis required to detect new redactions for at least one file.",
       "title": "Warning"
     },
-    "approve-multiple-files": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -983,13 +983,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1058,6 +1058,14 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{User} other {Users}}"
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone Template",
@@ -1093,14 +1101,6 @@
       "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
     }
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1284,19 +1284,6 @@
       "title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
     }
   },
-  "entity-rules-screen": {
-    "error": {
-      "generic": ""
-    },
-    "errors-found": "",
-    "revert-changes": "",
-    "save-changes": "",
-    "success": {
-      "generic": ""
-    },
-    "title": "",
-    "warning-text": ""
-  },
   "entity": {
     "info": {
       "actions": {
@@ -1306,19 +1293,32 @@
       "heading": "Edit Entity"
     }
   },
+  "entity-rules-screen": {
+    "error": {
+      "generic": "Something went wrong... Entity rules update failed!"
+    },
+    "errors-found": "{errors, plural, one{An error} other{{errors} errors}} found in rules",
+    "revert-changes": "Revert",
+    "save-changes": "Save Changes",
+    "success": {
+      "generic": "Entity rules updated!"
+    },
+    "title": "Entity Rule Editor",
+    "warning-text": "Warning: experimental feature!"
+  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file-dossier": {
-        "action": "Zurück zur Übersicht",
-        "label": "Das Dossier dieser Datei wurde gelöscht!"
-      },
       "file": {
         "action": "Zurück zum Dossier",
         "label": "Diese Datei wurde gelöscht!"
+      },
+      "file-dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Das Dossier dieser Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1336,6 +1336,12 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1346,12 +1352,6 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1565,15 +1565,6 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
-  "filter-menu": {
-    "filter-options": "Filteroptionen",
-    "filter-types": "Filter",
-    "label": "Filter",
-    "pages-without-annotations": "Only pages without annotations",
-    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
-    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
-    "with-comments": "Nur Anmerkungen mit Kommentaren"
-  },
   "filter": {
     "analysis": "Analyse erforderlich",
     "comment": "Kommentare",
@@ -1584,6 +1575,15 @@
     "suggestion": "Vorgeschlagene Schwärzung",
     "updated": "Aktualisiert"
   },
+  "filter-menu": {
+    "filter-options": "Filteroptionen",
+    "filter-types": "Filter",
+    "label": "Filter",
+    "pages-without-annotations": "Only pages without annotations",
+    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
+    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
+    "with-comments": "Nur Anmerkungen mit Kommentaren"
+  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents State",
@@ -1750,7 +1750,6 @@
   },
   "license-info-screen": {
     "backend-version": "Backend-Version der Anwendung",
-    "capacity-details": "Capacity Details",
     "capacity": {
       "active-documents": "Active Documents",
       "all-documents": "Retention Capacity Used",
@@ -1760,12 +1759,12 @@
       "trash-documents": "Documents in Trash",
       "unused": "Unused Storage"
     },
+    "capacity-details": "Capacity Details",
     "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon",
     "copyright-claim-title": "Copyright",
     "current-analyzed-pages": "In aktuellem Lizenzzeitraum analysierte Seiten",
     "current-volume-analyzed": "Data Volume Analyzed in Licensing Period",
     "custom-app-title": "Name der Anwendung",
-    "email-report": "E-Mail-Bericht",
     "email": {
       "body": {
         "analyzed": "Im aktuellen Lizenzzeitraum insgesamt analysierte Seiten: {pages}.",
@@ -1773,6 +1772,7 @@
       },
       "title": "Lizenzbericht {licenseCustomer}"
     },
+    "email-report": "E-Mail-Bericht",
     "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": "License Title",
@@ -1857,6 +1857,13 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted Dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1870,7 +1877,6 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1888,6 +1894,7 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1895,13 +1902,6 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted Dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -1993,16 +1993,16 @@
     "warnings-subtitle": "Do not show again options",
     "warnings-title": "Prompts and Dialogs Settings"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
     "processed": "Processed",
     "processing": "Processing"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2252,6 +2252,12 @@
     },
     "title": "Structured Component Management"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2275,12 +2281,6 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
   },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Gestern"
-}
+}
\ No newline at end of file
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 3c777e4b3..3caa260f4 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}
\ No newline at end of file

From 6affd59ca98d7e1c01ebf6ad5d1d32829b9d1a2c Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 15 Sep 2023 18:06:42 +0300
Subject: [PATCH 09/12] DM-473 no line breaks or hyphens removal needed

---
 .../manual-annotation-dialog.component.ts                 | 2 --
 .../modules/file-preview/file-preview-screen.component.ts | 3 +--
 apps/red-ui/src/app/utils/functions.ts                    | 8 --------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index 53595cb9b..829047265 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -9,7 +9,6 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic
 import { DictionaryService } from '@services/entity-services/dictionary.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Roles } from '@users/roles';
-import { removeHyphensAndSpecialChars } from '@utils/functions';
 import { firstValueFrom } from 'rxjs';
 import { ManualRedactionService } from '../../services/manual-redaction.service';
 
@@ -186,7 +185,6 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
         addRedactionRequest.value = addRedactionRequest.rectangle
             ? this.form.get('classification').value
             : this.form.get('selectedText').value;
-        addRedactionRequest.value = removeHyphensAndSpecialChars(addRedactionRequest.value);
     }
 
     #selectReason() {
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
index 27edbab0c..cf56904e0 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@@ -52,7 +52,7 @@ import JSZip from 'jszip';
 import { NGXLogger } from 'ngx-logger';
 import { combineLatest, first, firstValueFrom, of, pairwise } from 'rxjs';
 import { catchError, filter, map, startWith, switchMap, tap } from 'rxjs/operators';
-import { byId, byPage, download, handleFilterDelta, hasChanges, removeHyphensAndSpecialChars } from '../../utils';
+import { byId, byPage, download, handleFilterDelta, hasChanges } from '../../utils';
 import { AnnotationDrawService } from '../pdf-viewer/services/annotation-draw.service';
 import { REDAnnotationManager } from '../pdf-viewer/services/annotation-manager.service';
 import { REDDocumentViewer } from '../pdf-viewer/services/document-viewer.service';
@@ -533,7 +533,6 @@ export class FilePreviewScreenComponent
         }
 
         const hint = manualRedactionEntryWrapper.type === ManualRedactionEntryTypes.HINT;
-        result.redaction.value = removeHyphensAndSpecialChars(result.redaction.value);
         const add$ = this._manualRedactionService.addAnnotation([result.redaction], this.dossierId, this.fileId, {
             hint,
             dictionaryLabel: result.dictionary?.label,
diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts
index df12eb1d3..06fd984ca 100644
--- a/apps/red-ui/src/app/utils/functions.ts
+++ b/apps/red-ui/src/app/utils/functions.ts
@@ -133,11 +133,3 @@ export function calcTextWidthInPixels(text: string): number {
 
     return width;
 }
-
-export function removeHyphensAndSpecialChars(text: string): string {
-    return text?.replace(
-        // eslint-disable-next-line no-control-regex,max-len
-        /([^\s\d-]{2,})[-\u00AD]\u000A\u000D|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
-        '$1',
-    );
-}

From ae2797f2b8fb09dd18462aec39887b687a66affc Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 15 Sep 2023 19:10:03 +0300
Subject: [PATCH 10/12] RED-7612 fix annotations selected when opened file

---
 .../annotation-wrapper.component.ts           | 15 +++---
 .../annotations-list.component.ts             |  2 +-
 .../file-workload/file-workload.component.ts  | 46 +++++++++----------
 .../services/annotation-manager.service.ts    |  1 -
 libs/common-ui                                |  2 +-
 5 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts
index 5ec1cb170..ce271befd 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts
@@ -1,10 +1,10 @@
 import { Component, HostBinding, inject, Input, OnChanges } from '@angular/core';
+import { getConfig } from '@iqser/common-ui';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { PdfProxyService } from '../../services/pdf-proxy.service';
-import { ActionsHelpModeKeys } from '../../utils/constants';
 import { ListItem } from '@models/file/list-item';
 import { MultiSelectService } from '../../services/multi-select.service';
-import { getConfig } from '@iqser/common-ui';
+import { PdfProxyService } from '../../services/pdf-proxy.service';
+import { ActionsHelpModeKeys } from '../../utils/constants';
 
 @Component({
     selector: 'redaction-annotation-wrapper',
@@ -12,14 +12,13 @@ import { getConfig } from '@iqser/common-ui';
     styleUrls: ['./annotation-wrapper.component.scss'],
 })
 export class AnnotationWrapperComponent implements OnChanges {
-    @Input({ required: true }) annotation!: ListItem<AnnotationWrapper>;
-
-    @HostBinding('attr.annotation-id') annotationId: string;
-    @HostBinding('class.active') active = false;
-    actionsHelpModeKey?: string;
     readonly #isDocumine = getConfig().IS_DOCUMINE;
     protected readonly _pdfProxyService = inject(PdfProxyService);
     protected readonly _multiSelectService = inject(MultiSelectService);
+    @Input({ required: true }) annotation!: ListItem<AnnotationWrapper>;
+    @HostBinding('attr.annotation-id') annotationId: string;
+    @HostBinding('class.active') active = false;
+    actionsHelpModeKey?: string;
 
     ngOnChanges() {
         this.annotationId = this.annotation.item.id;
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts
index 2abe4b8fe..1c53f1b14 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts
@@ -24,7 +24,7 @@ export class AnnotationsListComponent extends HasScrollbarDirective implements O
         }
         return [] as EarmarkGroup[];
     });
-    @Input() annotations: ListItem<AnnotationWrapper>[];
+    @Input({ required: true }) annotations: ListItem<AnnotationWrapper>[];
     @Output() readonly pagesPanelActive = new EventEmitter<boolean>();
 
     constructor(
diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
index 78dcd0814..8a2de4483 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
@@ -37,7 +37,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
     @ViewChild('annotationsElement') private readonly _annotationsElement: ElementRef;
     @ViewChild('quickNavigation') private readonly _quickNavigationElement: ElementRef;
     readonly #isDocumine = getConfig().IS_DOCUMINE;
-    readonly #devMode = this._userPreferenceService.isIqserDevMode;
+    readonly #isIqserDevMode = this._userPreferenceService.isIqserDevMode;
     readonly iconButtonTypes = IconButtonTypes;
     readonly circleButtonTypes = CircleButtonTypes;
     displayedAnnotations = new Map<number, AnnotationWrapper[]>();
@@ -96,14 +96,14 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         });
 
         effect(() => {
-            const __ = this.viewModeService.viewMode();
+            this.viewModeService.viewMode();
             this._scrollViews();
         });
 
         effect(
             () => {
                 if (this.excludedPagesService.shown()) {
-                    this._disableMultiSelectAndDocumentInfo();
+                    this.#disableMultiSelectAndDocumentInfo();
                 }
             },
             { allowSignalWrites: true },
@@ -130,8 +130,8 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
             this._pageRotationService.rotations$,
         ]).pipe(
             delay(0),
-            map(([annotations, primary, secondary]) => this._filterAnnotations(annotations, primary, secondary)),
-            map(annotations => this._mapListItemsFromAnnotationWrapperArray(annotations)),
+            map(([annotations, primary, secondary]) => this.#filterAnnotations(annotations, primary, secondary)),
+            map(annotations => this.#mapListItemsFromAnnotationWrapperArray(annotations)),
         );
     }
 
@@ -196,7 +196,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
             // selected annotation on this page and not in multi select mode
             if (!this.pagesPanelActive && this.multiSelectService.inactive()) {
                 this._documentViewer.clearSelection();
-                this._selectFirstAnnotationOnCurrentPageIfNecessary();
+                this.#selectFirstAnnotationOnCurrentPageIfNecessary();
             }
             this._changeDetectorRef.markForCheck();
             return;
@@ -209,7 +209,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
                 this.navigateAnnotations($event);
             }
         } else {
-            this._navigatePages($event);
+            this.#navigatePages($event);
         }
 
         this._changeDetectorRef.markForCheck();
@@ -247,7 +247,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         if (quickNavPageIndex === -1 || this.displayedPages[quickNavPageIndex] !== currentPage) {
             quickNavPageIndex = Math.max(0, quickNavPageIndex - 1);
         }
-        this._scrollQuickNavigationToPage(this.displayedPages[quickNavPageIndex]);
+        this.#scrollQuickNavigationToPage(this.displayedPages[quickNavPageIndex]);
     }
 
     scrollQuickNavFirst(): void {
@@ -265,11 +265,11 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
     }
 
     jumpToPreviousWithAnnotations(): void {
-        this.pdf.navigateTo(this._prevPageWithAnnotations());
+        this.pdf.navigateTo(this.#prevPageWithAnnotations());
     }
 
     jumpToNextWithAnnotations(): void {
-        this.pdf.navigateTo(this._nextPageWithAnnotations());
+        this.pdf.navigateTo(this.#nextPageWithAnnotations());
     }
 
     navigateAnnotations($event: KeyboardEvent) {
@@ -281,12 +281,12 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
             }
             // Displayed page doesn't have annotations
             if ($event.key === 'ArrowDown') {
-                const nextPage = this._nextPageWithAnnotations();
+                const nextPage = this.#nextPageWithAnnotations();
 
                 return this.listingService.selectAnnotations(this.displayedAnnotations.get(nextPage)[0]);
             }
 
-            const prevPage = this._prevPageWithAnnotations();
+            const prevPage = this.#prevPageWithAnnotations();
             const prevPageAnnotations = this.displayedAnnotations.get(prevPage);
 
             return this.listingService.selectAnnotations(prevPageAnnotations[prevPageAnnotations.length - 1]);
@@ -339,12 +339,12 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         this.scrollAnnotations();
     }
 
-    private _disableMultiSelectAndDocumentInfo(): void {
+    #disableMultiSelectAndDocumentInfo(): void {
         this.multiSelectService.deactivate();
         this.documentInfoService.hide();
     }
 
-    private _filterAnnotations(
+    #filterAnnotations(
         annotations: AnnotationWrapper[],
         primary: INestedFilter[],
         secondary: INestedFilter[] = [],
@@ -359,7 +359,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
             annotations = annotations.filter(a => !bool(a.isChangeLogRemoved));
         }
 
-        if (this.#isDocumine && !this.#devMode) {
+        if (this.#isDocumine && !this.#isIqserDevMode) {
             annotations = annotations.filter(a => !a.isOCR);
         }
 
@@ -383,7 +383,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         return this.displayedAnnotations;
     }
 
-    private _selectFirstAnnotationOnCurrentPageIfNecessary() {
+    #selectFirstAnnotationOnCurrentPageIfNecessary() {
         const currentPage = this.pdf.currentPage();
         if (
             (!this._firstSelectedAnnotation || currentPage !== this._firstSelectedAnnotation.pageNumber) &&
@@ -394,13 +394,13 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         }
     }
 
-    private _navigatePages($event: KeyboardEvent) {
+    #navigatePages($event: KeyboardEvent) {
         const pageIdx = this.displayedPages.indexOf(this.pdf.currentPage());
 
         if ($event.key !== 'ArrowDown') {
             if (pageIdx === -1) {
                 // If active page doesn't have annotations
-                const prevPage = this._prevPageWithAnnotations();
+                const prevPage = this.#prevPageWithAnnotations();
                 if (prevPage) {
                     this.pdf.navigateTo(prevPage);
                 }
@@ -414,7 +414,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         }
         if (pageIdx === -1) {
             // If active page doesn't have annotations
-            const nextPage = this._nextPageWithAnnotations();
+            const nextPage = this.#nextPageWithAnnotations();
             if (nextPage) {
                 this.pdf.navigateTo(nextPage);
             }
@@ -426,7 +426,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         }
     }
 
-    private _nextPageWithAnnotations() {
+    #nextPageWithAnnotations() {
         let idx = 0;
         for (const page of this.displayedPages) {
             if (page > this.pdf.currentPage() && this.displayedAnnotations.get(page)) {
@@ -437,7 +437,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         return idx < this.displayedPages.length ? this.displayedPages[idx] : this.displayedPages[this.displayedPages.length - 1];
     }
 
-    private _prevPageWithAnnotations() {
+    #prevPageWithAnnotations() {
         let idx = this.displayedPages.length - 1;
         const reverseDisplayedPages = [...this.displayedPages].reverse();
         for (const page of reverseDisplayedPages) {
@@ -449,14 +449,14 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         return idx >= 0 ? this.displayedPages[idx] : this.displayedPages[0];
     }
 
-    private _scrollQuickNavigationToPage(page: number) {
+    #scrollQuickNavigationToPage(page: number) {
         if (this._quickNavigationElement) {
             const elements: HTMLElement[] = this._quickNavigationElement.nativeElement.querySelectorAll(`#quick-nav-page-${page}`);
             FileWorkloadComponent._scrollToFirstElement(elements);
         }
     }
 
-    private _mapListItemsFromAnnotationWrapperArray(annotations: Map<number, AnnotationWrapper[]>) {
+    #mapListItemsFromAnnotationWrapperArray(annotations: Map<number, AnnotationWrapper[]>) {
         const listItemsMap = new Map<number, ListItem<AnnotationWrapper>[]>();
         if (!annotations) {
             return listItemsMap;
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts
index 8aa406601..e19af623a 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts
@@ -154,7 +154,6 @@ export class REDAnnotationManager {
                 this.#manager.selectAnnotation(annotation);
                 annotation.disableRotationControl();
             }
-            this.#annotationSelected$.next([annotations, action]);
         });
     }
 
diff --git a/libs/common-ui b/libs/common-ui
index a4132b82f..6cb63fcf4 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit a4132b82f52e92025f2348fb83587680790ca3a8
+Subproject commit 6cb63fcf43fbbf522b847f57467156808bbe72a1

From ef22ea5953890ddc083d86eac7b48dae6dc7b7a8 Mon Sep 17 00:00:00 2001
From: George <george.balanesc.ext@knecon.com>
Date: Mon, 18 Sep 2023 10:15:31 +0300
Subject: [PATCH 11/12] DM-424, disregard config flag for rule editor
 accesibility

---
 .../components/admin-side-nav/admin-side-nav.component.ts    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
index 73bc932a9..59e82a3be 100644
--- a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
@@ -102,10 +102,7 @@ export class AdminSideNavComponent implements OnInit {
             {
                 screen: 'component-rules',
                 label: _('admin-side-nav.component-rule-editor'),
-                show:
-                    this.isDocumine &&
-                    (this.isIqserDevMode || this.canAccessRulesInDocumine) &&
-                    this._permissionsService.has(Roles.rules.read),
+                show: this.isDocumine && this.isIqserDevMode && this._permissionsService.has(Roles.rules.read),
             },
             {
                 screen: 'default-colors',

From 85f564a06a0cd406ff6c6c52baf7644cd8a02192 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Mon, 18 Sep 2023 14:36:36 +0300
Subject: [PATCH 12/12] RED-7554 update translations

---
 .../edit-redaction-dialog.component.html                  | 6 +++++-
 .../src/app/modules/file-preview/utils/dialog-options.ts  | 3 ++-
 apps/red-ui/src/assets/i18n/redact/de.json                | 8 ++++----
 apps/red-ui/src/assets/i18n/redact/en.json                | 8 ++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
index 0f7faf0f4..68e887241 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
@@ -8,7 +8,11 @@
 
         <div class="dialog-content redaction">
             <div *ngIf="!allRectangles && redactedText" class="iqser-input-group w-450">
-                <label [translate]="'edit-redaction.dialog.content.redacted-text'" class="selected-text"></label>
+                <label
+                    [translateParams]="{ type: isImage ? 'image' : isHint ? 'hint' : 'redaction' }"
+                    [translate]="'edit-redaction.dialog.content.redacted-text'"
+                    class="selected-text"
+                ></label>
                 {{ redactedText }}
             </div>
 
diff --git a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
index 9befd59e2..dde15aeac 100644
--- a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
+++ b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
@@ -159,6 +159,7 @@ export const getRemoveRedactionOptions = (
             description: isBulk ? translations.ONLY_HERE.descriptionBulk : translations.ONLY_HERE.description,
             descriptionParams: {
                 value: redactions[0].value,
+                type: redactions[0].hint ? 'hint' : redactions[0].type,
             },
             icon: PIN_ICON,
             value: RemoveRedactionOptions.ONLY_HERE,
@@ -168,7 +169,7 @@ export const getRemoveRedactionOptions = (
         options.push({
             label: isBulk ? translations.IN_DOSSIER.labelBulk : translations.IN_DOSSIER.label,
             description: isBulk ? translations.IN_DOSSIER.descriptionBulk : translations.IN_DOSSIER.description,
-            descriptionParams: { value: redactions[0].value, type: redactions[0].type },
+            descriptionParams: { value: redactions[0].value, type: redactions[0].hint ? 'hint' : redactions[0].type },
             icon: FOLDER_ICON,
             value: RemoveRedactionOptions.IN_DOSSIER,
             extraOption: !isDocumine
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 1e62363f2..8287d047a 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -1249,7 +1249,7 @@
           }
         },
         "reason": "Reason",
-        "redacted-text": "Redacted text",
+        "redacted-text": "{type, select, hint{Hint} other{Redacted}} text",
         "section": "Paragraph / Location",
         "type": "Type",
         "unchanged": "Unchanged"
@@ -2099,14 +2099,14 @@
             "label": "False positive"
           },
           "in-dossier": {
-            "description": "Do not {type} \"{value}\" in any document of the current dossier.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} \"{value}\" in any document of the current dossier.",
             "description-bulk": "Do not redact the selected terms as their respective types in any dossier.",
             "extraOptionLabel": "Apply to all dossiers",
             "label": "Remove from dossier",
             "label-bulk": "No longer redact in any dossier"
           },
           "only-here": {
-            "description": "Do not {type, select, undefined{redact} other{type}} \"{value}\" at this position in the current document.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} \"{value}\" at this position in the current document.",
             "description-bulk": "Do not redact the selected terms at this position in the current document.",
             "label": "Remove here"
           }
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Gestern"
-}
\ No newline at end of file
+}
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 3caa260f4..a7df22787 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -1249,7 +1249,7 @@
           }
         },
         "reason": "Reason",
-        "redacted-text": "Redacted text",
+        "redacted-text": "{type, select, hint{Hint} other{Redacted}} text",
         "section": "Paragraph / Location",
         "type": "Type",
         "unchanged": "Unchanged"
@@ -2099,14 +2099,14 @@
             "label": "False positive"
           },
           "in-dossier": {
-            "description": "Do not {type} \"{value}\" in any document of the current dossier.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} \"{value}\" in any document of the current dossier.",
             "description-bulk": "Do not redact the selected terms as their respective types in any dossier.",
             "extraOptionLabel": "Apply to all dossiers",
             "label": "Remove from dossier",
             "label-bulk": "No longer redact in any dossier"
           },
           "only-here": {
-            "description": "Do not {type, select, undefined{redact} other{type}} \"{value}\" at this position in the current document.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} \"{value}\" at this position in the current document.",
             "description-bulk": "Do not redact the selected terms at this position in the current document.",
             "label": "Remove here"
           }
@@ -2541,4 +2541,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
\ No newline at end of file
+}