From 7f71f1d5fe33ae232a51ab2b1a810eaf97b1aac8 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 25 May 2020 12:36:55 +0300
Subject: [PATCH] Move `objectToArray()` to utils.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
---
 db_graph.php                   |  1 +
 scripts/pi-hole/js/db_graph.js | 24 +++---------------------
 scripts/pi-hole/js/index.js    | 24 +++---------------------
 scripts/pi-hole/js/utils.js    | 23 +++++++++++++++++++++--
 4 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/db_graph.php b/db_graph.php
index fba0909b..98b66cb3 100644
--- a/db_graph.php
+++ b/db_graph.php
@@ -77,6 +77,7 @@ $token = $_SESSION['token'];
 </div>
 
 <script src="scripts/vendor/daterangepicker.js"></script>
+<script src="scripts/pi-hole/js/utils.js"></script>
 <script src="scripts/pi-hole/js/db_graph.js"></script>
 
 <?php
diff --git a/scripts/pi-hole/js/db_graph.js b/scripts/pi-hole/js/db_graph.js
index 0c79be81..924ad745 100644
--- a/scripts/pi-hole/js/db_graph.js
+++ b/scripts/pi-hole/js/db_graph.js
@@ -5,7 +5,7 @@
  *  This file is copyright under the latest version of the EUPL.
  *  Please see LICENSE file for your rights under this license. */
 
-/* global Chart:false, moment:false */
+/* global utils:false, Chart:false, moment:false */
 
 var start__ = moment().subtract(6, "days");
 var from = moment(start__).utc().valueOf() / 1000;
@@ -54,24 +54,6 @@ function padNumber(num) {
   return ("00" + num).substr(-2, 2);
 }
 
-// Helper function needed for converting the Objects to Arrays
-
-function objectToArray(p) {
-  var keys = Object.keys(p);
-  keys.sort(function (a, b) {
-    return a - b;
-  });
-
-  var arr = [],
-    idx = [];
-  for (var i = 0; i < keys.length; i++) {
-    arr.push(p[keys[i]]);
-    idx.push(keys[i]);
-  }
-
-  return [idx, arr];
-}
-
 var timeLineChart;
 
 function compareNumbers(a, b) {
@@ -110,8 +92,8 @@ function updateQueriesOverTime() {
     "api_db.php?getGraphData&from=" + from + "&until=" + until + "&interval=" + interval,
     function (data) {
       // convert received objects to arrays
-      data.domains_over_time = objectToArray(data.domains_over_time);
-      data.ads_over_time = objectToArray(data.ads_over_time);
+      data.domains_over_time = utils.objectToArray(data.domains_over_time);
+      data.ads_over_time = utils.objectToArray(data.ads_over_time);
       // Remove possibly already existing data
       timeLineChart.data.labels = [];
       timeLineChart.data.datasets[0].data = [];
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 75d01dc4..718e038c 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -34,24 +34,6 @@ function padNumber(num) {
   return ("00" + num).substr(-2, 2);
 }
 
-// Helper function needed for converting the Objects to Arrays
-
-function objectToArray(p) {
-  var keys = Object.keys(p);
-  keys.sort(function (a, b) {
-    return a - b;
-  });
-
-  var arr = [],
-    idx = [];
-  for (var i = 0; i < keys.length; i++) {
-    arr.push(p[keys[i]]);
-    idx.push(keys[i]);
-  }
-
-  return [idx, arr];
-}
-
 var customTooltips = function (tooltip) {
   var tooltipEl = document.getElementById(this._chart.canvas.id + "-customTooltip");
   if (!tooltipEl) {
@@ -245,8 +227,8 @@ function updateQueriesOverTime() {
     }
 
     // convert received objects to arrays
-    data.domains_over_time = objectToArray(data.domains_over_time);
-    data.ads_over_time = objectToArray(data.ads_over_time);
+    data.domains_over_time = utils.objectToArray(data.domains_over_time);
+    data.ads_over_time = utils.objectToArray(data.ads_over_time);
     // remove last data point since it not representative
     data.ads_over_time[0].splice(-1, 1);
     // Remove possibly already existing data
@@ -369,7 +351,7 @@ function updateClientsOverTime() {
     }
 
     // convert received objects to arrays
-    data.over_time = objectToArray(data.over_time);
+    data.over_time = utils.objectToArray(data.over_time);
 
     // remove last data point since it not representative
     data.over_time[0].splice(-1, 1);
diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js
index 810ab5df..3870e616 100644
--- a/scripts/pi-hole/js/utils.js
+++ b/scripts/pi-hole/js/utils.js
@@ -7,7 +7,7 @@
 
 /* global moment:false */
 
-// Credit: https://stackoverflow.com/questions/1787322/htmlspecialchars-equivalent-in-javascript/4835406#4835406
+// Credit: https://stackoverflow.com/a/4835406
 function escapeHtml(text) {
   var map = {
     "&": "&amp;",
@@ -22,7 +22,25 @@ function escapeHtml(text) {
   });
 }
 
-var info = null;
+// Helper function for converting Objects to Arrays after sorting the keys
+function objectToArray(obj) {
+  var arr = [];
+  var idx = [];
+  var keys = Object.keys(obj);
+
+  keys.sort(function (a, b) {
+    return a - b;
+  });
+
+  for (var i = 0; i < keys.length; i++) {
+    arr.push(obj[keys[i]]);
+    idx.push(keys[i]);
+  }
+
+  return [idx, arr];
+}
+
+var info = null; // TODO clear this up; there shouldn't be a global var here
 function showAlert(type, icon, title, message) {
   var opts = {};
   title = "&nbsp;<strong>" + title + "</strong><br>";
@@ -188,6 +206,7 @@ function stateLoadCallback(itemName) {
 window.utils = (function () {
   return {
     escapeHtml: escapeHtml,
+    objectToArray: objectToArray,
     showAlert: showAlert,
     datetime: datetime,
     disableAll: disableAll,