From 78aace3403e44ea6efe30eb6782cea2c0a377374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Sun, 14 Nov 2021 22:38:18 +0100
Subject: [PATCH] Revert "Remove duplicated code as it is already part of
 utils.stateLoadCallback"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 395b1b6c1f656a4a77e4f50e408c5d352229e713.

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/js/groups-adlists.js | 5 +++++
 scripts/pi-hole/js/groups-clients.js | 5 +++++
 scripts/pi-hole/js/groups-domains.js | 5 +++++
 scripts/pi-hole/js/groups.js         | 5 +++++
 scripts/pi-hole/js/messages.js       | 4 ++++
 5 files changed, 24 insertions(+)

diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index c7da8c14..83b84a54 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -306,6 +306,11 @@ function initTable() {
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-adlists-table");
 
+      // Return if not available
+      if (data === null) {
+        return null;
+      }
+
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js
index 1d3c0fd9..171a939c 100644
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
@@ -230,6 +230,11 @@ function initTable() {
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-clients-table");
 
+      // Return if not available
+      if (data === null) {
+        return null;
+      }
+
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 9e7fd8b0..e70286d5 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -259,6 +259,11 @@ function initTable() {
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-domains-table");
 
+      // Return if not available
+      if (data === null) {
+        return null;
+      }
+
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Show group assignment column only on full page
diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js
index ae1dc8e5..417dd9ff 100644
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
@@ -99,6 +99,11 @@ $(function () {
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-table");
 
+      // Return if not available
+      if (data === null) {
+        return null;
+      }
+
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index cdfd25ee..1707d885 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -156,6 +156,10 @@ $(function () {
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("messages-table");
+      // Return if not available
+      if (data === null) {
+        return null;
+      }
 
       // Reset visibility of ID and blob columns
       var hiddenCols = [0, 4, 5, 6, 7, 8];