From ccd196dabc3fe24c746272e8a7abd3296b974eef Mon Sep 17 00:00:00 2001
From: Jaidyn Levesque <10477760+JadedCtrl@users.noreply.github.com>
Date: Sat, 26 Nov 2022 13:15:02 -0600
Subject: [PATCH] Deleting of engine presets

Adds a "Delete" button for removing an engine preset
---
 popup/search.html |  9 ++++++---
 popup/search.js   | 50 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/popup/search.html b/popup/search.html
index 757f57f..e41b551 100644
--- a/popup/search.html
+++ b/popup/search.html
@@ -8,10 +8,13 @@
     <button type="button" class="search button">Search</button>
     <br/>
     <script src="search.js"></script>
-    <select id="presets">
-    </select>
+    <div>
+      <select id="presets">
+      </select>
+      <button type="button" class="save">Save</button>
+      <button type="button" class="remove">Delete</button>
+    </div>
     <div id="boxes">
-      <button type="button" class="save default">Save preset</button>
       <br/>
     </div>
   </body>
diff --git a/popup/search.js b/popup/search.js
index 54bcdf8..8da1394 100644
--- a/popup/search.js
+++ b/popup/search.js
@@ -78,16 +78,11 @@ const savepreset = (preset, name) => {
 
   try { localStorage.removeItem('preset_' + presetName); } catch {}
 
-  let sanitizedPresets = presets.filter((thisName, i) =>
-    {
-      return (presets.indexOf(thisName) === i)
-        && (thisName != name);
-    });
-
-  sanitizedPresets.push(presetName);
+  presets = removefromarray(removeredundantitems(presets), presetName);
+  presets.push(presetName);
 
   localStorage.setItem('preset_' + presetName, preset);
-  localStorage.setItem('presets', sanitizedPresets);
+  localStorage.setItem('presets', presets);
 
   // Update UI & listed presets
   resetsearchbox(true);
@@ -95,11 +90,28 @@ const savepreset = (preset, name) => {
   enablepresetbyname(name);
 }
 
+const removecurrentpreset = () => {
+  let presetName = document.getElementById("presets").value;
+  if (presetName == "noPreset" || presetName == "newPreset")
+    return;
+
+  try {
+    let presets = localStorage.getItem('presets').split(',');
+    localStorage.removeItem('preset_' + presetName);
+    localStorage.setItem('presets', removefromarray(presets, presetName));
+  }
+  catch {}
+
+  deselectengines();
+  populatepresets();
+  document.getElementById("presets").value = "noPreset";
+}
+
+
 // Search-box is also used for setting the name of new
 // presets; this sets the placeholder accordingly
 const searchboxaspresetname = () => {
   let textbox = document.getElementById("searchbox");
-  textbox.focus();
   textbox.setAttribute("placeholder", "New preset name…");
   deselectengines();
 }
@@ -145,6 +157,22 @@ const onpresetselected = (value) => {
     searchboxaspresetname();
   else
     enablepresetbyname(value);
+
+  document.getElementById("searchbox").focus();
+}
+
+const removefromarray = (array, item) => {
+  return array.filter((testItem, index) =>
+    {
+      return testItem != item;
+    });
+}
+
+const removeredundantitems = (array) => {
+  return array.filter((item, index) =>
+    {
+      return (array.indexOf(item) === index);
+    })
 }
 
 browser.search.get().then(populateengines);
@@ -156,8 +184,10 @@ document.getElementById("searchbox").addEventListener("keypress", key => {
 document.addEventListener("click", e => {
   if (e.target.classList.contains("search"))
     search();
-  else if (e.target.classList.contains("default"))
+  else if (e.target.classList.contains("save"))
     saveselection();
+  else if (e.target.classList.contains("remove"))
+    removecurrentpreset();
   else if (e.target.tagName == "OPTION") {
     onpresetselected(e.target.getAttribute("value"));
   }