Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(search): keep a search's progress when an earlier one finishes
Elian Doran2e590de1a96c
diff --git a/apps/client/src/widgets/search_result.spec.tsx b/apps/client/src/widgets/search_result.spec.tsxindex a819302688..1518ea5015 100644--- a/apps/client/src/widgets/search_result.spec.tsx+++ b/apps/client/src/widgets/search_result.spec.tsx@@ -168,6 +168,25 @@ describe("running a saved search when it is shown", () => {expect(container.textContent).toContain("Auto result");});+ it("keeps showing progress for a search when an earlier one in the same tab finishes first", async () => {+ const first = buildNote({ id: "firstSearch", title: "First", type: "search", "#searchString": "#a" });+ const second = buildNote({ id: "secondSearch", title: "Second", type: "search", "#searchString": "#b" });+ const answers: Record<string, () => void> = {};+ vi.spyOn(froca, "loadSearchNote").mockImplementation((noteId) =>+ new Promise((resolve) => { answers[noteId] = () => resolve(undefined); }));++ shownNote.current = first;+ await mount();+ await settle(() => {+ shownNote.current = second;+ shownNote.notify();+ });+ await settle(() => answers.firstSearch());++ expect(container.querySelector(".no-items .bx-loader-alt")).not.toBeNull();+ expect(container.querySelector("button")).toBeNull();+ });+it("waits for a background tab to be shown before running its saved search", async () => {const savedSearch = buildNote({ id: "backgroundSearch", title: "Background", type: "search", "#searchString": "#book" });const loadSearchNote = vi.spyOn(froca, "loadSearchNote").mockResolvedValue(undefined);diff --git a/apps/client/src/widgets/search_result.tsx b/apps/client/src/widgets/search_result.tsxindex d95923dc02..ca67ddf3da 100644--- a/apps/client/src/widgets/search_result.tsx+++ b/apps/client/src/widgets/search_result.tsx@@ -117,7 +117,8 @@ function useSavedSearchRun(toast.showError(result.error);}} finally {- setRunningNoteId(undefined);+ // Another search can have started in this tab meanwhile, and it keeps its progress.+ setRunningNoteId((current) => (current === noteId ? undefined : current));}}