From 638ba75894a5f09701ad16ebb23f8cf115fe5e0a Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 24 Oct 2023 14:18:48 +0200
Subject: [PATCH] #12288 fixed spinner in empty page

---
 pandora_console/include/functions_html.php    |  2 +-
 .../operation/network/network_report.php      | 49 ++++++++++++-------
 .../operation/network/network_usage_map.php   |  1 +
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 5481152ac6..888531e915 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -5409,7 +5409,7 @@ function html_print_link_with_params($text, $params=[], $type='text', $style='',
         $formStyle = ' style="'.$formStyle.'"';
     }
 
-    $html = '<form method="POST"'.$formStyle.'>';
+    $html = '<form method="POST"'.$formStyle.' class="link-with-params">';
     switch ($type) {
         case 'image':
             $html .= html_print_input_image($text, $text, $text, $style, true);
diff --git a/pandora_console/operation/network/network_report.php b/pandora_console/operation/network/network_report.php
index cbcf1328cc..c0f1e4bc18 100644
--- a/pandora_console/operation/network/network_report.php
+++ b/pandora_console/operation/network/network_report.php
@@ -554,25 +554,24 @@ if (empty($data)) {
             'content' => $resultsTable.$pieGraph,
         ]
     );
-
-    $spinner = html_print_div(
-        [
-            'content' => '<span></span>',
-            'class'   => 'spinner-fixed inherit',
-            'style'   => 'position: initial;',
-        ],
-        true
-    );
-    html_print_div(
-        [
-            'id'      => 'spinner',
-            'content' => '<p class="loading-text">'.__('Loading netflow data, please wait...').'</p>'.$spinner,
-            'class'   => 'invisible',
-            'style'   => 'position: initial;',
-        ]
-    );
 }
 
+$spinner = html_print_div(
+    [
+        'content' => '<span></span>',
+        'class'   => 'spinner-fixed inherit',
+        'style'   => 'position: initial;',
+    ],
+    true
+);
+html_print_div(
+    [
+        'id'      => 'spinner',
+        'content' => '<p class="loading-text">'.__('Loading netflow data, please wait...').'</p>'.$spinner,
+        'class'   => 'invisible',
+        'style'   => 'position: initial;',
+    ]
+);
 ?>
 <script>
 $(document).ready(function(){
@@ -594,9 +593,25 @@ $(document).ready(function(){
     });
 
     $('#button-update').on('click', function(){
+        $('.info_box_information').remove();
         $('#content-netflow').remove();
         $('#spinner').removeClass("invisible");
     });
+
+    $('.link-with-params').on('submit', function(e){
+        setTimeout(() => {
+            if ($('.info_box_information').length > 0) {
+                $('.info_box_information').remove();
+            }
+            if ($('#content-netflow').length > 0) {
+                $('#content-netflow').remove();
+            }
+            if ($('#spinner').length > 0) {
+                $('#spinner').removeClass("invisible");
+
+            }
+        }, 100); // Prevent fields from being deleted before being sent.
+    })
 });
 
 // Configure jQuery timepickers.
diff --git a/pandora_console/operation/network/network_usage_map.php b/pandora_console/operation/network/network_usage_map.php
index f28b765673..097241a610 100644
--- a/pandora_console/operation/network/network_usage_map.php
+++ b/pandora_console/operation/network/network_usage_map.php
@@ -398,6 +398,7 @@ $(document).ready(function(){
     });
 
     $('#button-update_netflow').on('click', function(){
+        $('.info_box_information').remove();
         $('.networkconsole').remove();
         $('#spinner').removeClass("invisible");
     });