From e5fd9127b73b640cd639695cbbcb59d985f836c0 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Tue, 13 Feb 2024 16:48:17 +0100
Subject: [PATCH] Don't animate admin monitor popup on page load, properly
 remove interactable UI elements (#8954)

* followup for #8941, don't animate on page load

PR #8941 caused a regression that the hiding animation was played on
page load.
This change ensures that the hiding animation is only applied when the
widget was visible before

* scale to 0
---
 .../AdministrativeMonitorsDecorator/resources.css           | 6 +++++-
 .../management/AdministrativeMonitorsDecorator/resources.js | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css
index 0630ae99e731..80fe16c8d8e7 100644
--- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css
+++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css
@@ -50,8 +50,12 @@
   box-shadow: var(--dropdown-box-shadow);
   border-radius: 15px;
   opacity: 0;
-  animation: hide-am-list 300ms ease-in 1 normal;
   z-index: 0;
+  transform: scale(0);
+}
+
+.am-container.am-hidden div.am-list {
+  animation: hide-am-list 300ms ease-in 1 normal;
 }
 
 .am-container.visible div.am-list {
diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.js b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.js
index 7278b6021ddf..5982e0302570 100644
--- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.js
+++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.js
@@ -38,6 +38,7 @@
             var popupContent = responseText;
             amList.innerHTML = popupContent;
             amMonitorRoot.classList.add("visible");
+            amMonitorRoot.classList.remove("am-hidden");
             document.addEventListener("click", onClose);
             document.addEventListener("keydown", onEscClose);
 
@@ -50,6 +51,9 @@
     }
 
     function close() {
+      if (amMonitorRoot.classList.contains("visible")) {
+        amMonitorRoot.classList.add("am-hidden");
+      }
       amMonitorRoot.classList.remove("visible");
       document.removeEventListener("click", onClose);
       document.removeEventListener("keydown", onEscClose);