gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix searching by label

Browse Source
This commit is contained in:
zadam 2021-07-04 21:05:47 +02:00
parent 8d3a3d4873
commit e25b965cb3
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/attribute_formatter.js
View File

@ -28,7 +28,7 @@ function formatAttrForSearch(attr, searchWithValue) {
}
function formatValue(val) {
if (!/[^\w_-]/.test(val)) {
if (!/[^\w_]/.test(val)) {
return val;
}
else if (!val.includes('"')) {

6
src/services/attributes.js
View File

@ -60,7 +60,11 @@ const BUILTIN_ATTRIBUTES = [
];
function getNotesWithLabel(name, value) {
return searchService.searchNotes(formatAttrForSearch({type: 'label', name, value}, true));
const query = formatAttrForSearch({type: 'label', name, value}, true);
return searchService.searchNotes(query, {
includeArchivedNotes: true,
ignoreHoistedNote: true
});
}
function getNoteIdsWithLabels(names) {

4
src/services/search/services/search.js
View File

@ -136,8 +136,8 @@ function parseQueryToExpression(query, searchContext) {
* @param {string} query
* @return {Note[]}
*/
function searchNotes(query) {
const searchResults = findResultsWithQuery(query, new SearchContext());
function searchNotes(query, params = {}) {
const searchResults = findResultsWithQuery(query, new SearchContext(params));
return searchResults.map(sr => becca.notes[sr.noteId]);
}