From 033dd531a8a6a9c6c68cdf1f68f89893b345b519 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 20 Oct 2020 17:47:35 +0200
Subject: [PATCH 1/2] Minor fix all group empty label

---
 pandora_console/include/functions_html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 092044765c..02e31a4754 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -510,7 +510,7 @@ function html_print_select_groups(
         }
     } else {
         foreach ($selected as $k) {
-            $fields[$k] = groups_get_name($k);
+            $fields[$k] = groups_get_name($k, $returnAllGroup);
         }
     }
 

From 25295f7b0b87d42ffdb75c2889673d15ba4371f7 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 20 Oct 2020 18:06:05 +0200
Subject: [PATCH 2/2] fixes

---
 pandora_console/include/functions_html.php                | 8 ++++++++
 .../lib/Dashboard/Widgets/top_n_events_by_group.php       | 7 ++++++-
 .../lib/Dashboard/Widgets/top_n_events_by_module.php      | 7 ++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 02e31a4754..025416ec47 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -510,8 +510,16 @@ function html_print_select_groups(
         }
     } else {
         foreach ($selected as $k) {
+            if ($k === null || $k === '') {
+                continue;
+            }
+
             $fields[$k] = groups_get_name($k, $returnAllGroup);
         }
+
+        if (empty($fields) === true && $returnAllGroup) {
+            $fields[0] = groups_get_name(null, true);
+        }
     }
 
     if (empty($nothing) === false) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
index 2acd7f32fa..bd7d7d5886 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
@@ -278,6 +278,11 @@ class TopNEventByGroupWidget extends Widget
         ];
 
         // Groups.
+        $selected_groups = [];
+        if ($values['groupId']) {
+            $selected_groups = explode(',', $values['groupId'][0]);
+        }
+
         $inputs[] = [
             'label'     => __('Groups'),
             'arguments' => [
@@ -285,7 +290,7 @@ class TopNEventByGroupWidget extends Widget
                 'name'           => 'groupId[]',
                 'returnAllGroup' => true,
                 'privilege'      => 'AR',
-                'selected'       => explode(',', $values['groupId'][0]),
+                'selected'       => $selected_groups,
                 'return'         => true,
                 'multiple'       => true,
             ],
diff --git a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php
index 4bbaee22a8..148ace6aac 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php
@@ -277,6 +277,11 @@ class TopNEventByModuleWidget extends Widget
             ],
         ];
 
+        $selected_groups = [];
+        if ($values['groupId']) {
+            $selected_groups = explode(',', $values['groupId'][0]);
+        }
+
         // Groups.
         $inputs[] = [
             'label'     => __('Groups'),
@@ -285,7 +290,7 @@ class TopNEventByModuleWidget extends Widget
                 'name'           => 'groupId[]',
                 'returnAllGroup' => true,
                 'privilege'      => 'AR',
-                'selected'       => explode(',', $values['groupId'][0]),
+                'selected'       => $selected_groups,
                 'return'         => true,
                 'multiple'       => true,
             ],