btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Bastin
2023-07-04 14:54:30 +05:30
parent 235deb113c
commit ea03223b8e
1 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) => {
results.value = minisearch
.search(query, {
prefix: true,
fuzzy: true,
boost: {
reltime: 2,
},
weights: {
fuzzy: 0.2,
prefix: 0.8,
},
})
.map((x) => {
const entry = restHistoryStore.value.state[parseInt(x.id)]
watch(
[query, this.clearHistoryActionEnabled],
([query]) => {
results.value = minisearch
.search(query, {
prefix: true,
fuzzy: true,
boost: {
reltime: 2,
},
weights: {
fuzzy: 0.2,
prefix: 0.8,
},
})
.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",
icon: markRaw(IconTrash2),
id: x.id,
icon: markRaw(IconHistory),
score: x.score,
text: {
type: "text",
text: this.t("action.clear_history"),
type: "custom",
component: markRaw(SpotlightHistoryEntry),
componentProps: {
historyEntry: entry,
},
},
}
}
return {
id: x.id,
icon: markRaw(IconHistory),
score: x.score,
text: {
type: "custom",
component: markRaw(SpotlightHistoryEntry),
componentProps: {
historyEntry: entry,
},
},
}
})
})
})
},
{ immediate: true }
)
})
const onSessionEnd = () => {