Merge pull request #1610 from netalertx/next_release

FIX: Add 'No Data' message for empty plugin tabs and enhance event da…
2026-04-13 05:31:28 -07:00 · 2026-04-13 08:36:22 +10:00
parent 36174a8cd9 b0c687a171
commit 79a9e9f8a3
25 changed files with 55 additions and 15 deletions
--- a/front/deviceDetailsEvents.php
+++ b/front/deviceDetailsEvents.php
@@ -31,6 +31,12 @@
 <script>

 function loadEventsData() {
+  const mac = getMac();
+  if (!mac) {
+    console.warn("loadEventsData: mac not set, skipping");
+    return;
+  }
+
  const hideConnections = $('#chkHideConnectionEvents')[0].checked;

  let period = $("#period").val();
@@ -65,7 +71,7 @@ function loadEventsData() {
      query,
      variables: {
        options: {
-          eveMac:   mac,
+          eveMac:   mac,  // local const from getMac() above
          dateFrom: start,
          dateTo:   end,
          limit:    500,
@@ -163,6 +169,11 @@ function initDeviceEventsPage()
    return; // exit early if nothing is visible
  }

+  // Only proceed if mac is available
+  if (!getMac()) {
+    return; // exit early if mac is not yet set
+  }
+
  // init page once
  if (eventsPageInitialized) return; //  ENSURE ONCE
  eventsPageInitialized = true;
--- a/front/php/templates/language/ar_ar.json
+++ b/front/php/templates/language/ar_ar.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "قاعدة البيانات مقفلة",
    "Gen_NetworkMask": "قناع الشبكة",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "غير متصل",
    "Gen_Okay": "موافق",
    "Gen_Online": "متصل",
--- a/front/php/templates/language/ca_ca.json
+++ b/front/php/templates/language/ca_ca.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "ERROR - DB podria estar bloquejada - Fes servir F12 Eines desenvolupament -> Consola o provar-ho més tard.",
    "Gen_NetworkMask": "Màscara de xarxa",
    "Gen_New": "Nou",
+    "Gen_No_Data": "",
    "Gen_Offline": "Fora de línia",
    "Gen_Okay": "Ok",
    "Gen_Online": "En línia",
--- a/front/php/templates/language/cs_cz.json
+++ b/front/php/templates/language/cs_cz.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "CHYBA - Databáze je možná zamčená - Zkontrolujte F12 -> Nástroje pro vývojáře -> Konzole. nebo to zkuste později.",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "Offline",
    "Gen_Okay": "Ok",
    "Gen_Online": "Online",
--- a/front/php/templates/language/de_de.json
+++ b/front/php/templates/language/de_de.json
@@ -348,6 +348,7 @@
    "Gen_LockedDB": "ERROR - DB eventuell gesperrt - Nutze die Konsole in den Entwickler Werkzeugen (F12) zur Überprüfung oder probiere es später erneut.",
    "Gen_NetworkMask": "Netzmaske",
    "Gen_New": "Neu",
+    "Gen_No_Data": "",
    "Gen_Offline": "Offline",
    "Gen_Okay": "Ok",
    "Gen_Online": "Online",
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "ERROR - DB might be locked - Check F12 Dev tools -> Console or try later.",
    "Gen_NetworkMask": "Network mask",
    "Gen_New": "New",
+    "Gen_No_Data": "No data",
    "Gen_Offline": "Offline",
    "Gen_Okay": "Ok",
    "Gen_Online": "Online",
--- a/front/php/templates/language/es_es.json
+++ b/front/php/templates/language/es_es.json
@@ -346,6 +346,7 @@
    "Gen_LockedDB": "Fallo - La base de datos puede estar bloqueada - Pulsa F1 -> Ajustes de desarrolladores -> Consola o prueba más tarde.",
    "Gen_NetworkMask": "Máscara de red",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "Desconectado",
    "Gen_Okay": "Aceptar",
    "Gen_Online": "En linea",
--- a/front/php/templates/language/fa_fa.json
+++ b/front/php/templates/language/fa_fa.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "",
    "Gen_Okay": "",
    "Gen_Online": "",
--- a/front/php/templates/language/fi_fi.json
+++ b/front/php/templates/language/fi_fi.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "",
    "Gen_Okay": "",
    "Gen_Online": "",
--- a/front/php/templates/language/fr_fr.json
+++ b/front/php/templates/language/fr_fr.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "Erreur - La base de données est peut-être verrouillée - Vérifier avec les outils de dév via F12 -> Console ou essayer plus tard.",
    "Gen_NetworkMask": "Masque réseau",
    "Gen_New": "Nouveau",
+    "Gen_No_Data": "",
    "Gen_Offline": "Hors ligne",
    "Gen_Okay": "OK",
    "Gen_Online": "En ligne",
--- a/front/php/templates/language/he_il.json
+++ b/front/php/templates/language/he_il.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "",
    "Gen_Okay": "",
    "Gen_Online": "",
--- a/front/php/templates/language/id_id.json
+++ b/front/php/templates/language/id_id.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "",
    "Gen_Okay": "",
    "Gen_Online": "",
--- a/front/php/templates/language/it_it.json
+++ b/front/php/templates/language/it_it.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "ERRORE: il DB potrebbe essere bloccato, controlla F12 Strumenti di sviluppo -> Console o riprova più tardi.",
    "Gen_NetworkMask": "Maschera di rete",
    "Gen_New": "Nuovo",
+    "Gen_No_Data": "",
    "Gen_Offline": "Offline",
    "Gen_Okay": "Ok",
    "Gen_Online": "Online",
--- a/front/php/templates/language/ja_jp.json
+++ b/front/php/templates/language/ja_jp.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "エラー - DBがロックされている可能性があります - F12で開発者ツール→コンソールを確認するか、後で試してください。",
    "Gen_NetworkMask": "ネットワークマスク",
    "Gen_New": "New",
+    "Gen_No_Data": "",
    "Gen_Offline": "オフライン",
    "Gen_Okay": "Ok",
    "Gen_Online": "オンライン",
--- a/front/php/templates/language/nb_no.json
+++ b/front/php/templates/language/nb_no.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "FEIL - DB kan være låst - Sjekk F12 Dev tools -> Konsoll eller prøv senere.",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "Frakoblet",
    "Gen_Okay": "Ok",
    "Gen_Online": "",
--- a/front/php/templates/language/pl_pl.json
+++ b/front/php/templates/language/pl_pl.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "Błąd - Baza danych może być zablokowana - Sprawdź narzędzia deweloperskie F12 -> Konsola lub spróbuj później.",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "Niedostępne",
    "Gen_Okay": "Ok",
    "Gen_Online": "Dostępne",
--- a/front/php/templates/language/pt_br.json
+++ b/front/php/templates/language/pt_br.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "ERRO - O banco de dados pode estar bloqueado - Verifique F12 Ferramentas de desenvolvimento -> Console ou tente mais tarde.",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "Offline",
    "Gen_Okay": "Ok",
    "Gen_Online": "Online",
--- a/front/php/templates/language/pt_pt.json
+++ b/front/php/templates/language/pt_pt.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "ERRO - A base de dados pode estar bloqueada - Verifique F12 Ferramentas de desenvolvimento -> Console ou tente mais tarde.",
    "Gen_NetworkMask": "Máscara de Rede",
    "Gen_New": "Novo",
+    "Gen_No_Data": "",
    "Gen_Offline": "Offline",
    "Gen_Okay": "Ok",
    "Gen_Online": "Online",
--- a/front/php/templates/language/ru_ru.json
+++ b/front/php/templates/language/ru_ru.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "ОШИБКА - Возможно, база данных заблокирована. Проверьте инструменты разработчика F12 -> Консоль или повторите попытку позже.",
    "Gen_NetworkMask": "Маска сети",
    "Gen_New": "Новый",
+    "Gen_No_Data": "",
    "Gen_Offline": "Оффлайн",
    "Gen_Okay": "OK",
    "Gen_Online": "Онлайн",
--- a/front/php/templates/language/sv_sv.json
+++ b/front/php/templates/language/sv_sv.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "",
    "Gen_Okay": "",
    "Gen_Online": "",
--- a/front/php/templates/language/tr_tr.json
+++ b/front/php/templates/language/tr_tr.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "HATA - Veritabanı kilitlenmiş olabilir - F12 Geliştirici araçlarını -> Konsol kısmını kontrol edin veya daha sonra tekrar deneyin.",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "Çevrimdışı",
    "Gen_Okay": "Tamam",
    "Gen_Online": "Çevrimiçi",
--- a/front/php/templates/language/uk_ua.json
+++ b/front/php/templates/language/uk_ua.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "ПОМИЛКА – БД може бути заблоковано – перевірте F12 Інструменти розробника -> Консоль або спробуйте пізніше.",
    "Gen_NetworkMask": "Маска мережі",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "Офлайн",
    "Gen_Okay": "Гаразд",
    "Gen_Online": "Онлайн",
--- a/front/php/templates/language/vi_vn.json
+++ b/front/php/templates/language/vi_vn.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "",
    "Gen_NetworkMask": "",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "",
    "Gen_Okay": "",
    "Gen_Online": "",
--- a/front/php/templates/language/zh_cn.json
+++ b/front/php/templates/language/zh_cn.json
@@ -344,6 +344,7 @@
    "Gen_LockedDB": "错误 - DB 可能被锁定 - 检查 F12 开发工具 -> 控制台或稍后重试。",
    "Gen_NetworkMask": "网络掩码",
    "Gen_New": "",
+    "Gen_No_Data": "",
    "Gen_Offline": "离线",
    "Gen_Okay": "Ok",
    "Gen_Online": "在线",
--- a/front/pluginsCore.php
+++ b/front/pluginsCore.php
@@ -513,6 +513,12 @@ function generateTabs() {
    }
  });

+  if (visiblePlugins.length === 0) {
+    $('#tabs-content-location').html(`<p class="text-muted" style="padding: 15px;">${getString('Gen_No_Data')}</p>`);
+    hideSpinner();
+    return;
+  }
+
  // Auto-select tab from ?tab= URL param or cache (scoped to plugin nav only)
  initializeTabsShared({
    cacheKey:      'activePluginsTab',