fix: history returning no entries until query update and minisearch conflicts

packages/hoppscotch-common/src/services/spotlight/searchers/history.searcher.ts

@@ -68,11 +68,15 @@ export class HistorySpotlightSearcherService
       this.clearHistoryActionEnabled,
       (enabled) => {
         if (enabled) {
+          if (minisearch.has("clear-history")) return
+
           minisearch.add({
             id: "clear-history",
             title: this.t("action.clear_history"),
           })
         } else {
+          if (!minisearch.has("clear-history")) return
+
           minisearch.discard("clear-history")
         }
       },
@@ -101,48 +105,52 @@ export class HistorySpotlightSearcherService
     const scopeHandle = effectScope()
 
     scopeHandle.run(() => {
-      watch(query, (query) => {
+      watch(
-        results.value = minisearch
+        [query, this.clearHistoryActionEnabled],
-          .search(query, {
+        ([query]) => {
-            prefix: true,
+          results.value = minisearch
-            fuzzy: true,
+            .search(query, {
-            boost: {
+              prefix: true,
-              reltime: 2,
+              fuzzy: true,
-            },
+              boost: {
-            weights: {
+                reltime: 2,
-              fuzzy: 0.2,
+              },
-              prefix: 0.8,
+              weights: {
-            },
+                fuzzy: 0.2,
-          })
+                prefix: 0.8,
-          .map((x) => {
+              },
-            const entry = restHistoryStore.value.state[parseInt(x.id)]
+            })
+            .map((x) => {
+              const entry = restHistoryStore.value.state[parseInt(x.id)]
+
+              if (x.id === "clear-history") {
+                return {
+                  id: "clear-history",
+                  icon: markRaw(IconTrash2),
+                  score: x.score,
+                  text: {
+                    type: "text",
+                    text: this.t("action.clear_history"),
+                  },
+                }
+              }
 
-            if (x.id === "clear-history") {
               return {
-                id: "clear-history",
+                id: x.id,
-                icon: markRaw(IconTrash2),
+                icon: markRaw(IconHistory),
                 score: x.score,
                 text: {
-                  type: "text",
+                  type: "custom",
-                  text: this.t("action.clear_history"),
+                  component: markRaw(SpotlightHistoryEntry),
+                  componentProps: {
+                    historyEntry: entry,
+                  },
                 },
               }
-            }
+            })
-
+        },
-            return {
+        { immediate: true }
-              id: x.id,
+      )
-              icon: markRaw(IconHistory),
-              score: x.score,
-              text: {
-                type: "custom",
-                component: markRaw(SpotlightHistoryEntry),
-                componentProps: {
-                  historyEntry: entry,
-                },
-              },
-            }
-          })
-      })
     })
 
     const onSessionEnd = () => {