Use Object methods when possible

Signed-off-by: XhmikosR <xhmikosr@gmail.com>

scripts/js/index.js

@@ -485,10 +485,10 @@ function labelWithPercentage(tooltipLabel, skipZero = false) {
   // Sum all queries for the current time by iterating over all keys in the
   // current dataset
   let sum = 0;
-  const keys = Object.keys(tooltipLabel.parsed._stacks.y);
-  for (let i = 0; i < keys.length; i++) {
-    if (tooltipLabel.parsed._stacks.y[i] === undefined) continue;
-    sum += Number.parseInt(tooltipLabel.parsed._stacks.y[i], 10);
+  for (const value of Object.values(tooltipLabel.parsed._stacks.y)) {
+    if (value === undefined) continue;
+    const num = Number.parseInt(value, 10);
+    if (num) sum += num;
   }
 
   let percentage = 0;

scripts/js/queries.js

@@ -416,12 +416,7 @@ function addSelectSuggestion(name, dict, data) {
   }
 
   // Add data obtained from API
-  for (const key in data) {
-    if (!Object.hasOwn(data, key)) {
-      continue;
-    }
-
-    const text = data[key];
+  for (const text of Object.values(data)) {
     obj.append($("<option />").val(text).text(text));
   }
 
@@ -435,11 +430,8 @@ function getSuggestions(dict) {
   $.get(
     document.body.dataset.apiurl + "/queries/suggestions",
     data => {
-      for (const key in filters) {
-        if (Object.hasOwn(filters, key)) {
-          const f = filters[key];
-          addSelectSuggestion(f, dict, data.suggestions[f]);
-        }
+      for (const filter of Object.values(filters)) {
+        addSelectSuggestion(filter, dict, data.suggestions[filter]);
       }
     },
     "json"
@@ -447,15 +439,7 @@ function getSuggestions(dict) {
 }
 
 function parseFilters() {
-  const filter = {};
-  for (const key in filters) {
-    if (Object.hasOwn(filters, key)) {
-      const f = filters[key];
-      filter[f] = $("#" + f + "_filter").val();
-    }
-  }
-
-  return filter;
+  return Object.fromEntries(filters.map(filter => [filter, $(`#${filter}_filter`).val()]));
 }
 
 function filterOn(param, dict) {
@@ -465,13 +449,10 @@ function filterOn(param, dict) {
 
 function getAPIURL(filters) {
   let apiurl = document.body.dataset.apiurl + "/queries?";
-  for (const key in filters) {
-    if (Object.hasOwn(filters, key)) {
-      const filter = filters[key];
-      if (filterOn(key, filters)) {
-        if (!apiurl.endsWith("?")) apiurl += "&";
-        apiurl += key + "=" + encodeURIComponent(filter);
-      }
+  for (const [key, filter] of Object.entries(filters)) {
+    if (filterOn(key, filters)) {
+      if (!apiurl.endsWith("?")) apiurl += "&";
+      apiurl += `${key}=${encodeURIComponent(filter)}`;
     }
   }
 
@@ -503,16 +484,13 @@ $(() => {
   // Do we want to filter queries?
   const GETDict = utils.parseQueryString();
 
-  for (const sel in filters) {
-    if (Object.hasOwn(filters, sel)) {
-      const element = filters[sel];
-      $("#" + element + "_filter").select2({
-        width: "100%",
-        tags: sel < 4, // Only the first four (client(IP/name), domain, upstream) are allowed to freely specify input
-        placeholder: "Select...",
-        allowClear: true,
-      });
-    }
+  for (const [sel, element] of Object.entries(filters)) {
+    $(`#${element}_filter`).select2({
+      width: "100%",
+      tags: sel < 4, // Only the first four (client(IP/name), domain, upstream) are allowed to freely specify input
+      placeholder: "Select...",
+      allowClear: true,
+    });
   }
 
   getSuggestions(GETDict);

scripts/js/utils.js

@@ -539,12 +539,9 @@ function parseQueryString() {
 
 // https://stackoverflow.com/q/21647928
 function hexEncode(string) {
-  let hex;
-  let i;
-
   let result = "";
-  for (i = 0; i < string.length; i++) {
-    hex = string.codePointAt(i).toString(16);
+  for (let i = 0; i < string.length; i++) {
+    const hex = string.codePointAt(i).toString(16);
     result += ("000" + hex).slice(-4);
   }
 
@@ -553,11 +550,10 @@ function hexEncode(string) {
 
 // https://stackoverflow.com/q/21647928
 function hexDecode(string) {
-  let j;
   const hexes = string.match(/.{1,4}/g) || [];
   let back = "";
-  for (j = 0; j < hexes.length; j++) {
-    back += String.fromCodePoint(Number.parseInt(hexes[j], 16));
+  for (const hex of hexes) {
+    back += String.fromCodePoint(Number.parseInt(hex, 16));
   }
 
   return back;
@@ -566,7 +562,10 @@ function hexDecode(string) {
 function listsAlert(type, items, data) {
   // Show simple success message if there is no "processed" object in "data" or
   // if all items were processed successfully
-  if (data.processed === undefined || data.processed.success.length === items.length) {
+  const successLength = data.processed.success.length;
+  const errorsLength = data.processed.errors.length;
+
+  if (data.processed === undefined || successLength === items.length) {
     showAlert(
       "success",
       "fas fa-plus",
@@ -581,54 +580,40 @@ function listsAlert(type, items, data) {
   let message = "";
 
   // Show a list of successful items if there are any
-  if (data.processed.success.length > 0) {
+  if (successLength > 0) {
     message +=
-      "Successfully added " +
-      data.processed.success.length +
-      " " +
-      type +
-      (data.processed.success.length !== 1 ? "s" : "") +
-      ":";
+      "Successfully added " + successLength + " " + type + (successLength !== 1 ? "s" : "") + ":";
 
     // Loop over data.processed.success and print "item"
-    for (const item in data.processed.success) {
-      if (Object.hasOwn(data.processed.success, item)) {
-        message += "\n- " + data.processed.success[item].item;
-      }
+    for (const item of Object.values(data.processed.success)) {
+      message += "\n- " + item.item;
     }
   }
 
   // Add a line break if there are both successful and failed items
-  if (data.processed.success.length > 0 && data.processed.errors.length > 0) {
+  if (successLength > 0 && errorsLength > 0) {
     message += "\n\n";
   }
 
   // Show a list of failed items if there are any
-  if (data.processed.errors.length > 0) {
+  if (errorsLength > 0) {
     message +=
-      "Failed to add " +
-      data.processed.errors.length +
-      " " +
-      type +
-      (data.processed.errors.length !== 1 ? "s" : "") +
-      ":\n";
+      "Failed to add " + errorsLength + " " + type + (errorsLength !== 1 ? "s" : "") + ":\n";
 
     // Loop over data.processed.errors and print "item: error"
-    for (const item in data.processed.errors) {
-      if (Object.hasOwn(data.processed.errors, item)) {
-        let error = data.processed.errors[item].error;
-        // Replace some error messages with a more user-friendly text
-        if (error.includes("UNIQUE constraint failed")) {
-          error = "Already present";
-        }
-
-        message += "\n- " + data.processed.errors[item].item + ": " + error;
+    for (const errorItem of Object.values(data.processed.errors)) {
+      let error = errorItem.error;
+      // Replace some error messages with a more user-friendly text
+      if (error.includes("UNIQUE constraint failed")) {
+        error = "Already present";
       }
+
+      message += `\n- ${errorItem.item}: ${error}`;
     }
   }
 
   // Show the warning message
-  const total = data.processed.success.length + data.processed.errors.length;
+  const total = successLength + errorsLength;
   const processed = "(" + total + " " + type + (total !== 1 ? "s" : "") + " processed)";
   showAlert(
     "warning",