From 499ea9b80591848c88b7ce7617cbc98f1d83af9a Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Wed, 7 Feb 2024 09:21:42 +0100
Subject: [PATCH 1/3] #12633 fix visuals errors

---
 .../include/javascript/graph_analytics.js     | 51 ++++++++++---------
 pandora_console/include/styles/pandora.css    |  4 ++
 .../operation/reporting/graph_analytics.php   |  3 +-
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/pandora_console/include/javascript/graph_analytics.js b/pandora_console/include/javascript/graph_analytics.js
index 475a310ebc..5a83c7c88f 100644
--- a/pandora_console/include/javascript/graph_analytics.js
+++ b/pandora_console/include/javascript/graph_analytics.js
@@ -253,30 +253,35 @@ function createDroppableZones(
               )
             );
 
-            // Create remove button.
             if (
-              graphDiv
-                .children()
-                .children()
-                .hasClass("parent_graph") === true
+              $("#hidden-section").val() ===
+              "operation/reporting/graph_analytics"
             ) {
-              graphDiv
-                .children()
-                .children()
-                .children(":first-child")
-                .prepend(
-                  $(
-                    '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
-                  )
-                );
-            } else {
-              graphDiv
-                .children()
-                .append(
-                  $(
-                    '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
-                  )
-                );
+              // Create remove button.
+              if (
+                graphDiv
+                  .children()
+                  .children()
+                  .hasClass("parent_graph") === true
+              ) {
+                graphDiv
+                  .children()
+                  .children()
+                  .children(":first-child")
+                  .prepend(
+                    $(
+                      '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
+                    )
+                  );
+              } else {
+                graphDiv
+                  .children()
+                  .append(
+                    $(
+                      '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
+                    )
+                  );
+              }
             }
           }
         }
@@ -753,7 +758,7 @@ $("#button-share-modal").click(function(e) {
 
   window.open(
     configHomeurl +
-      "/operation/reporting/graph_analytics_public.php?" +
+      "operation/reporting/graph_analytics_public.php?" +
       queryParams
   );
 });
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index a1f76eef71..7b9bd5ed17 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -13504,3 +13504,7 @@ tr.shown td.details-control {
   mask: url(../../images/minimizar.svg) no-repeat right / contain;
   -webkit-mask: url(../../images/minimizar.svg) no-repeat right / contain;
 }
+
+#modules-toggle > .modules > .white-box-content div {
+  z-index: 1 !important;
+}
diff --git a/pandora_console/operation/reporting/graph_analytics.php b/pandora_console/operation/reporting/graph_analytics.php
index ff6272bdd6..3a118c6943 100644
--- a/pandora_console/operation/reporting/graph_analytics.php
+++ b/pandora_console/operation/reporting/graph_analytics.php
@@ -811,6 +811,7 @@ ui_print_standard_header(
         $tab_new,
         $tab_pause_realtime,
         $tab_start_realtime,
+        html_print_input_hidden('section', get_parameter('sec2'), true),
     ],
     [
         [
@@ -885,7 +886,7 @@ $left_content .= '
     'modules-toggle',
     true,
     true,
-    '',
+    'modules',
     'white-box-content',
     'box-flat white_table_graph',
     'images/arrow@svg.svg',

From 94d12d9010aaa42fe17f7cac2dbbe6bf83d4ab18 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 19 Feb 2024 14:11:50 +0100
Subject: [PATCH 2/3] #12633 fix z-index for graph analytics

---
 pandora_console/include/styles/pandora.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 57ecd8544e..25e4e1e146 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1945,7 +1945,7 @@ div.title_line {
 #menu_tab_frame_view_bc {
   position: sticky;
   top: 61px;
-  z-index: 2;
+  z-index: 3;
   display: flex;
   align-items: flex-end;
   justify-content: space-between;

From bb6e8194f93013417cd9d872a93e79428537a04e Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 19 Feb 2024 16:08:54 +0100
Subject: [PATCH 3/3] #12633 fix z-index bug drag graph analytics

---
 pandora_console/include/styles/pandora.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 25e4e1e146..2b347fd81a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -13588,3 +13588,7 @@ button.disabled {
   background: #c0ccdc !important;
   border: 0px;
 }
+
+.ui-draggable-handle {
+  z-index: 2 !important;
+}