From 6658c375adc49306e33a5df7e51e76f772238eb3 Mon Sep 17 00:00:00 2001
From: Valentin Mihai <valentin@devplant.ro>
Date: Wed, 6 Apr 2022 12:14:55 +0300
Subject: [PATCH 1/2] RED-3780 - added separate component for help mode button

---
 .../base-screen/base-screen.component.html          | 13 +++++++------
 .../edit-dossier-dialog.component.html              |  1 +
 .../highlight-action-dialog.component.html          |  1 +
 apps/red-ui/src/assets/i18n/de.json                 |  4 ++--
 apps/red-ui/src/assets/i18n/en.json                 |  4 ++--
 libs/common-ui                                      |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
index 12454cfc3..59a9a2be9 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
@@ -22,12 +22,13 @@
                 [placeholder]="'search.placeholder' | translate"
                 iqserHelpMode="search_in_entire_application"
             ></redaction-spotlight-search>
-            <iqser-circle-button
-                icon="iqser:help-outline"
-                type="help"
-                [tooltip]="'help-mode.tooltip' | translate"
-                (action)="helpModeService.activateHelpMode()"
-            ></iqser-circle-button>
+            <!--            <iqser-circle-button-->
+            <!--                icon="iqser:help-outline"-->
+            <!--                type="help"-->
+            <!--                [tooltip]="'help-mode.button-text' | translate"-->
+            <!--                (action)="helpModeService.activateHelpMode()"-->
+            <!--            ></iqser-circle-button>-->
+            <iqser-help-button [dialogButton]="false"></iqser-help-button>
             <redaction-notifications iqserHelpMode="open_notifications"></redaction-notifications>
         </div>
         <redaction-user-button [matMenuTriggerFor]="userMenu" [userId]="currentUser.id"></redaction-user-button>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
index 84b40d777..7fefb6766 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
@@ -66,6 +66,7 @@
                 </iqser-icon-button>
 
                 <div (click)="revert()" id="revert" class="all-caps-label cancel" translate="edit-dossier-dialog.actions.revert"></div>
+                <iqser-help-button></iqser-help-button>
             </div>
         </div>
     </div>
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html
index add8e2521..6a97c8f2a 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html
@@ -28,6 +28,7 @@
                 {{ saveMessage | translate }}
             </button>
             <div class="all-caps-label cancel" mat-dialog-close translate="highlight-action-dialog.actions.cancel"></div>
+            <iqser-help-button></iqser-help-button>
         </div>
     </form>
 
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index bc57ba1c8..6e394412f 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -1410,8 +1410,8 @@
   "help-mode": {
     "clicking-anywhere-on": "<b>Klicken Sie auf eine beliebige Stelle des Bildschirms </b> um zu sehen, welche Bereiche interaktiv sind. Wenn Sie mit der Maus über einen interaktiven Bereich fahren, <b>verändert sich der Mauszeiger</b>, um Ihnen zu zeigen, ob ein Element interaktiv ist.",
     "instructions": "Hilfe-Modus-Anleitungen öffnen",
-    "text": "Hilfe-Modus",
-    "tooltip": "",
+    "bottom-text": "Hilfe-Modus",
+    "button-text": "",
     "welcome-to-help-mode": "<b> Willkommen im Hilfe-Modus! <br> Klicken Sie auf interaktive Elemente, um in einem neuen Tab Infos dazu zu erhalten. </b>"
   },
   "highlight-action-dialog": {
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index f2cf3b269..8874bb8e5 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1410,8 +1410,8 @@
   "help-mode": {
     "clicking-anywhere-on": "<b> Clicking anywhere on the screen </b> will show you which areas are interactive. Hovering an interactive area will <b> change the mouse cursor </b> to let you know if the element is interactive.",
     "instructions": "Open Help Mode Instructions",
-    "text": "Help Mode",
-    "tooltip": "Help Mode (H)",
+    "bottom-text": "Help Mode",
+    "button-text": "Help Mode (H)",
     "welcome-to-help-mode": "<b> Welcome to Help Mode! <br> Clicking on interactive elements will open info about them in new tab. </b>"
   },
   "highlight-action-dialog": {
diff --git a/libs/common-ui b/libs/common-ui
index 37edb34d0..ab64ca71a 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 37edb34d0fc3cf49dd889e98f5ec3d39227649f5
+Subproject commit ab64ca71ade0d2f159597e61f9aba70a717c5bce

From 87426b95b06c1b846e84ece3eada46d729a41702 Mon Sep 17 00:00:00 2001
From: Valentin Mihai <valentin@devplant.ro>
Date: Wed, 6 Apr 2022 21:35:48 +0300
Subject: [PATCH 2/2] RED-3780 -> removed not needed code

---
 .../app/components/base-screen/base-screen.component.html   | 6 ------
 .../edit-dossier-dialog/edit-dossier-dialog.component.html  | 1 -
 libs/common-ui                                              | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
index 59a9a2be9..400a065d2 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
@@ -22,12 +22,6 @@
                 [placeholder]="'search.placeholder' | translate"
                 iqserHelpMode="search_in_entire_application"
             ></redaction-spotlight-search>
-            <!--            <iqser-circle-button-->
-            <!--                icon="iqser:help-outline"-->
-            <!--                type="help"-->
-            <!--                [tooltip]="'help-mode.button-text' | translate"-->
-            <!--                (action)="helpModeService.activateHelpMode()"-->
-            <!--            ></iqser-circle-button>-->
             <iqser-help-button [dialogButton]="false"></iqser-help-button>
             <redaction-notifications iqserHelpMode="open_notifications"></redaction-notifications>
         </div>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
index 7fefb6766..84b40d777 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
@@ -66,7 +66,6 @@
                 </iqser-icon-button>
 
                 <div (click)="revert()" id="revert" class="all-caps-label cancel" translate="edit-dossier-dialog.actions.revert"></div>
-                <iqser-help-button></iqser-help-button>
             </div>
         </div>
     </div>
diff --git a/libs/common-ui b/libs/common-ui
index ab64ca71a..70b612823 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit ab64ca71ade0d2f159597e61f9aba70a717c5bce
+Subproject commit 70b61282309cb290406c538b5218341cb4f1c40a