Restore old behaviour with new logic (hopefully less buggy)

Heath123 · Dec 3, 2020 · 8bd0c6e · 8bd0c6e
1 parent 50e2c5e
commit 8bd0c6e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/html/mainPage/index.html b/html/mainPage/index.html
@@ -101,7 +101,7 @@ <h3>Scripting (beta)</h3>
     </div>
 
     <div class="search">
-      <input type="text" class="filter" id="filter" placeholder="Filter by name, ID or content" onkeyup="updateFilter()">
+      <input type="text" class="filter" id="filter" placeholder="Filter by name, ID or content" onkeyup="updateFilterBox()">
     </div>
 
     <div class="container">

diff --git a/html/mainPage/js/filteringLogic.js b/html/mainPage/js/filteringLogic.js
@@ -1,7 +1,12 @@
-exports.packetFilteredByFilterBox = function (packet, filter) {
+exports.packetFilteredByFilterBox = function (packet, filter, hiddenPackets) {
+  if (hiddenPackets[packet.direction].includes(packet.meta.name)) {
+    return true
+  }
+
   if (filter === '') {
     return false
   }
+
   const comparisonString = packet.hexIdString + ' ' + packet.meta.name + ' ' + JSON.stringify(packet.data)
   return !comparisonString.includes(filter)
 }
diff --git a/html/mainPage/js/main.js b/html/mainPage/js/main.js
@@ -58,29 +58,36 @@ function toggleCheckbox (box, packetName, direction) {
     // Add it to the hidden packets
     sharedVars.hiddenPackets[direction].push(packetName)
   }
+
+  updateFiltering()
 }
 
-function updateFilter () {
-  // TODO
+function updateFilterBox () {
   const newValue = filterInput.value
   if (sharedVars.lastFilter !== newValue) {
     sharedVars.lastFilter = newValue
     deselectPacket()
-    sharedVars.allPacketsHTML.forEach(function(item, index, array) {
-      if (!filteringLogic.packetFilteredByFilterBox(sharedVars.allPackets[index], newValue)) {
-        // If it's hidden, show it
-        array[index] = [item[0].replace('filter-hidden', 'filter-shown')]
-      } else {
-        // If it's shown, hide it
-        array[index] = [item[0].replace('filter-shown', 'filter-hidden')]
-      }
-    })
-    wrappedClusterizeUpdate(sharedVars.allPacketsHTML)
-    clusterize.refresh()
+    updateFiltering()
   }
 }
 
-setInterval(updateFilter, 100)
+function updateFiltering () {
+  sharedVars.allPacketsHTML.forEach(function(item, index, array) {
+    if (!filteringLogic.packetFilteredByFilterBox(sharedVars.allPackets[index],
+      sharedVars.lastFilter,
+      sharedVars.hiddenPackets)) {
+      // If it's hidden, show it
+      array[index] = [item[0].replace('filter-hidden', 'filter-shown')]
+    } else {
+      // If it's shown, hide it
+      array[index] = [item[0].replace('filter-shown', 'filter-hidden')]
+    }
+  })
+  wrappedClusterizeUpdate(sharedVars.allPacketsHTML)
+  clusterize.refresh()
+}
+
+setInterval(updateFilterBox, 100)
 
 /* let hiddenPackets = [
   // TODO: Do this properly
@@ -305,6 +312,7 @@ function hideAll (id) {
   checkbox.checked = false
   checkbox.readOnly = false
   checkbox.indeterminate = false
+  updateFiltering()
 }
 
 sharedVars.ipcRenderer.on('hideAllOfType', (event, arg) => { // Context menu

diff --git a/html/mainPage/js/packetDom.js b/html/mainPage/js/packetDom.js
@@ -34,7 +34,7 @@ function trimData (data) { // Function to trim the size of stringified data for
 function addPacketToDOM (packet) {
   sharedVars.allPacketsHTML.push([
     `<li id="packet${packet.uid}" onclick="packetClick(${packet.uid})" class="packet ${packet.direction} ${
-      filteringLogic.packetFilteredByFilterBox(packet, sharedVars.lastFilter) ? 'filter-hidden' : 'filter-shown'
+      filteringLogic.packetFilteredByFilterBox(packet, sharedVars.lastFilter, sharedVars.hiddenPackets) ? 'filter-hidden' : 'filter-shown'
     }">
         <span class="id">${escapeHtml(packet.hexIdString)}</span>
         <span class="name">${escapeHtml(packet.meta.name)}</span>
@@ -85,9 +85,6 @@ exports.setup = function (passedSharedVars) {
 }
 
 exports.addPacket = function (data) {
-  if (sharedVars.hiddenPackets[data.direction].includes(data.meta.name)) {
-    return
-  }
   sharedVars.allPackets.push(data)
   data.uid = sharedVars.allPackets.length - 1
   addPacketToDOM(data)