Merge branch 'branches/rudder/7.3' into branches/rudder/8.0

Normation · Dec 5, 2023 · 5c99de3 · 5c99de3
2 parents fcababb + 48ba7a3
commit 5c99de3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
@@ -111,6 +111,9 @@ function createTooltiptr() {
     });
   }
 
+function removeBsTooltips(){
+  document.querySelectorAll(".tooltip").forEach(e => e.remove());
+}
 
 function callPopupWithTimeout(timeout, popupName){
   setTimeout("createPopup('"+popupName+"')", timeout);

diff --git a/...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala b/...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
@@ -163,6 +163,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
         if( directiveId != null && directiveId.length > 0) {
           ${SHtml.ajaxCall(JsVar("directiveId"), displayDetails _)._2.toJsCmd};
         }
+        removeBsTooltips();
     """)
   }
 
@@ -219,10 +220,12 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
         } catch(e) {
           directiveId = '';
         }
-
         buildDirectiveTree('#${htmlId_activeTechniquesTree}', [ directiveId ], '${S.contextPath}', 1);
-        $$('#activeTechniquesTree').on('scroll',function(){$$('.tooltip').hide();});
+        removeBsTooltips();
         createTooltip();
+        $$('.sidebar-body').on('scroll', function(){
+          removeBsTooltips();
+        });
     """)
   }
 
@@ -417,7 +420,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
     }
     val dataArray               = JsArray(techniqueVersionInfo.toList)
     val actionsArray            = JsArray(techniqueVersionActions.toList)
-
+    
     Script(
       OnLoad(
         JsRaw(
@@ -444,9 +447,9 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
              |  if (getVersion === undefined) {
              |    createErrorNotification("Error while creating directive based on technique version '"+version+"'. Reason: Unknown version")
              |  }else{
-             |    console.log(getVersion);
              |    getVersion.action();
              |  }
+             |  removeBsTooltips();
              |});
           """.stripMargin
         )
@@ -608,7 +611,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
         this.window.location.hash = "#" + JSON.stringify(${json})
         sessionStorage.removeItem('tags-${directiveId.uid.value}');
       """.stripMargin) &
-    After(TimeSpan(0), JsRaw("""createTooltip();""")) // OnLoad or JsRaw createTooltip does not work ...
+    After(TimeSpan(0), JsRaw("""removeBsTooltips();createTooltip();""")) // OnLoad or JsRaw createTooltip does not work ...
   }
 
   private[this] case class MissingTechniqueException(directive: Directive) extends Exception(