From 94847c7fbd9b27a4b9004a93e42e6cdbda4896e7 Mon Sep 17 00:00:00 2001
From: Valentin <valentin@devplant.ro>
Date: Mon, 16 Aug 2021 18:18:22 +0300
Subject: [PATCH] solved comments

---
 .../shared/directives/help-mode.directive.ts  |  4 +-
 .../shared/services/help-mode.service.ts      | 38 ++++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/apps/red-ui/src/app/modules/shared/directives/help-mode.directive.ts b/apps/red-ui/src/app/modules/shared/directives/help-mode.directive.ts
index 36a79ab85..dfc6d0f9f 100644
--- a/apps/red-ui/src/app/modules/shared/directives/help-mode.directive.ts
+++ b/apps/red-ui/src/app/modules/shared/directives/help-mode.directive.ts
@@ -9,7 +9,6 @@ import { LanguageService } from '@i18n/language.service';
 })
 export class HelpModeDirective implements OnInit {
     @Input('redactionHelpMode') elementName: string;
-    private _lastChildCreated = null;
 
     constructor(
         private readonly _elementRef: ElementRef,
@@ -29,8 +28,7 @@ export class HelpModeDirective implements OnInit {
         this._renderer.addClass(helperElement, 'help-mode-on-mouse-over');
         this._renderer.addClass(helperElement, `help-mode-on-mouse-over-${this.elementName}`);
 
-        this._helpModeService.elements.push(element);
-        this._helpModeService.helperElements[this.elementName] = helperElement;
+        this._helpModeService.addElement(this.elementName, element, helperElement);
     }
 
     @HostListener('click') onClick() {
diff --git a/apps/red-ui/src/app/modules/shared/services/help-mode.service.ts b/apps/red-ui/src/app/modules/shared/services/help-mode.service.ts
index a29e0f8ec..e9f09f454 100644
--- a/apps/red-ui/src/app/modules/shared/services/help-mode.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/help-mode.service.ts
@@ -1,7 +1,6 @@
 import { Injectable, Renderer2, RendererFactory2 } from '@angular/core';
 import { HelpModeDialogComponent } from '@components/help-mode-dialog/help-mode-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
-import { forEach } from 'lodash';
 
 @Injectable({
     providedIn: 'root'
@@ -9,10 +8,10 @@ import { forEach } from 'lodash';
 export class HelpModeService {
     isHelpModeActive = false;
     helpModeDialogIsOpened = false;
-    elements = [];
-    helperElements = {};
 
-    private _renderer: Renderer2;
+    private _elements = {};
+
+    private readonly _renderer: Renderer2;
 
     constructor(private readonly _dialog: MatDialog, private readonly _rendererFactory: RendererFactory2) {
         this._renderer = this._rendererFactory.createRenderer(null, null);
@@ -42,30 +41,33 @@ export class HelpModeService {
     }
 
     highlightHelperElements() {
-        for (const key of Object.keys(this.helperElements)) {
-            this._renderer.addClass(this.helperElements[key], 'highlight');
+        for (const key of Object.keys(this._elements)) {
+            const helperElement = this._elements[key].helperElement;
+            this._renderer.addClass(helperElement, 'highlight');
             setTimeout(() => {
-                this._renderer.removeClass(this.helperElements[key], 'highlight');
+                this._renderer.removeClass(helperElement, 'highlight');
             }, 500);
         }
     }
 
-    private _enableHelperElements() {
-        for (const [index, [elementName, helperElement]] of Object.entries(Object.entries(this.helperElements))) {
-            const element = this.elements[index];
-            this._renderer.setStyle(element, 'position', 'relative');
+    addElement(elementName, element, helperElement) {
+        this._elements[elementName] = { element, helperElement };
+    }
 
-            if (elementName === 'quick-filters') {
-                this._renderer.insertBefore(element, helperElement, element.firstChild);
-            } else {
-                this._renderer.appendChild(element, helperElement);
-            }
+    private _enableHelperElements() {
+        for (const key of Object.keys(this._elements)) {
+            const element = this._elements[key].element;
+            const helperElement = this._elements[key].helperElement;
+
+            this._renderer.setStyle(element, 'position', 'relative');
+            this._renderer.appendChild(element, helperElement);
         }
     }
 
     private _disableHelperElements() {
-        for (const [index, [elementName, helperElement]] of Object.entries(Object.entries(this.helperElements))) {
-            const element = this.elements[index];
+        for (const key of Object.keys(this._elements)) {
+            const element = this._elements[key].element;
+            const helperElement = this._elements[key].helperElement;
 
             this._renderer.removeStyle(element, 'position');
             this._renderer.removeChild(element, helperElement);