Skip to content

Build your personal knowledge base with Trilium Notes

fix(search): support slashes in search queries (#11311)

Elian Doraned475292c321
diff --cc apps/client/src/services/search.ts
index 24cb927a92,1a6f392d5e..4c9190f54b
--- a/apps/client/src/services/search.ts
+++ b/apps/client/src/services/search.ts
@@@ -1,13 -1,10 +1,13 @@@
import type { SearchWithTokensResponse } from "@triliumnext/commons";
-import server from "./server.js";
+import type Component from "../components/component.js";
import froca from "./froca.js";
+import server from "./server.js";
+import toast from "./toast.js";
+import { getErrorMessage } from "./utils.js";
async function searchForNoteIds(searchString: string) {
- return await server.get<string[]>(`search/${encodeURIComponent(searchString)}`);
+ return await server.get<string[]>(`search?searchString=${encodeURIComponent(searchString)}`);
}
async function searchForNotes(searchString: string) {
@@@ -22,26 -19,10 +22,26 @@@
*/
async function searchInSubtree(searchString: string, ancestorNoteId: string) {
return await server.get<SearchWithTokensResponse>(
- `search/${encodeURIComponent(searchString)}`
- + `?ancestorNoteId=${encodeURIComponent(ancestorNoteId)}&includeTokens=true`);
+ `search?searchString=${encodeURIComponent(searchString)}`
+ + `&ancestorNoteId=${encodeURIComponent(ancestorNoteId)}&includeTokens=true`);
}
+/**
+ * Runs a saved search and triggers `searchRefreshed` so the tab shows its results. Returns the
+ * query's error for the caller to show, or `undefined` after showing a failed request as a toast.
+ */
+async function runSearchNote(component: Component | null | undefined, noteId: string, ntxId: string | null | undefined) {
+ let result: { error: string | undefined } | undefined;
+ try {
+ result = { error: (await froca.loadSearchNote(noteId))?.error ?? undefined };
+ } catch (e: unknown) {
+ toast.showError(getErrorMessage(e));
+ }
+
+ component?.triggerEvent("searchRefreshed", { ntxId });
+ return result;
+}
+
export default {
searchForNoteIds,
searchForNotes,