A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
core: fix search results sorting not working
Abdullah Atta493ee81c4224
diff --git a/packages/core/src/api/lookup.ts b/packages/core/src/api/lookup.tsindex 110ca87db..bceeccb17 100644--- a/packages/core/src/api/lookup.ts+++ b/packages/core/src/api/lookup.ts@@ -214,13 +214,24 @@ export default class Lookup {const contentMatches = chunk.filter((c) => c.types.includes("content")).map((c) => c.id);- const results: HighlightedResult[] = [];-- const titles = await db- .selectFrom("notes")- .where("id", "in", titleMatches)- .select(["id", "title"])- .execute();+ const results: HighlightedResult[] = chunk.map((c) => ({+ id: c.id,+ title: [],+ type: "searchResult",+ content: [],+ rank: 0,+ dateCreated: 0,+ dateModified: 0+ }));++ const titles =+ titleMatches.length > 0+ ? await db+ .selectFrom("notes")+ .where("id", "in", titleMatches)+ .select(["id", "title"])+ .execute()+ : [];for (const title of titles) {const { text: highlighted } = highlightQueries(@@ -233,36 +244,27 @@ export default class Lookup {orTokens,notTokens);- results.push({- id: title.id,- title: hasMatches- ? splitHighlightedMatch(highlighted).flatMap((m) => m)- : [],- type: "searchResult",- content: [],- rank: 0,- dateCreated: 0,- dateModified: 0- });+ const result = results.find((c) => c.id === title.id);+ if (!result) continue;+ result.title = hasMatches+ ? splitHighlightedMatch(highlighted).flatMap((m) => m)+ : [];}- const htmls = await db- .selectFrom("content")- .where("noteId", "in", contentMatches)- .select(["data", "noteId as id"])- .$castTo<{ data: string; id: string }>()- .execute();+ const htmls =+ contentMatches.length > 0+ ? await db+ .selectFrom("content")+ .where("noteId", "in", contentMatches)+ .select(["data", "noteId as id"])+ .$castTo<{ data: string; id: string }>()+ .execute()+ : [];for (const html of htmls) {- const result = findOrAdd(results, (r) => r.id === html.id, {- id: html.id,- title: [],- type: "searchResult",- content: [],- rank: 0,- dateCreated: 0,- dateModified: 0- });+ const result = results.find((r) => r.id === html.id);+ if (!result) continue;+const highlighted = highlightHtmlContent(html.data, allTokens);if (!textContainsTokens(highlighted, andTokens, orTokens, notTokens))continue;