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 "show in full text search" in jump to note dialog

Browse Source
This commit is contained in:
zadam 2020-12-05 23:19:02 +01:00
parent 90d33f56c3
commit 4078b32e9d
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/dialogs/jump_to_note.js
View File

@ -47,10 +47,9 @@ function showInFullText(e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
const searchText = $autoComplete.val(); const searchString = $autoComplete.val();
appContext.triggerCommand('showSearch', {searchText}); appContext.triggerCommand('searchNotes', {searchString});
appContext.triggerCommand('searchForResults', {searchText});
$dialog.modal('hide'); $dialog.modal('hide');
} }

17
src/public/app/services/date_notes.js
View File

@ -43,20 +43,21 @@ async function createSqlConsole() {
} }
/** @return {NoteShort} */ /** @return {NoteShort} */
async function createSearchNote(subTreeNoteId = null) { async function createSearchNote(opts = {}) {
const note = await server.post('search-note'); const note = await server.post('search-note');
if (subTreeNoteId) { const attrsToUpdate = [
await server.put(`notes/${note.noteId}/attributes`, [ opts.subTreeNoteId ? { type: 'label', name: 'subTreeNoteId', value: opts.subTreeNoteId } : undefined,
{ type: 'label', name: 'subTreeNoteId', value: subTreeNoteId } opts.searchString ? { type: 'label', name: 'searchString', value: opts.searchString } : undefined
]); ].filter(attr => !!attr);
if (attrsToUpdate.length > 0) {
await server.put(`notes/${note.noteId}/attributes`, attrsToUpdate);
} }
await ws.waitForMaxKnownEntityChangeId(); await ws.waitForMaxKnownEntityChangeId();
const noteShort = await treeCache.getNote(note.noteId); return await treeCache.getNote(note.noteId);
return noteShort;
} }
export default { export default {

10
src/public/app/services/dialog_command_executor.js
View File

@ -67,8 +67,8 @@ export default class DialogCommandExecutor extends Component {
appContext.triggerCommand('focusOnDetail', {tabId: tabContext.tabId}); appContext.triggerCommand('focusOnDetail', {tabId: tabContext.tabId});
} }
async searchNotesCommand() { async searchNotesCommand({searchString, subTreeNoteId}) {
const searchNote = await dateNoteService.createSearchNote(); const searchNote = await dateNoteService.createSearchNote({searchString, subTreeNoteId});
const tabContext = await appContext.tabManager.openTabWithNote(searchNote.noteId, true); const tabContext = await appContext.tabManager.openTabWithNote(searchNote.noteId, true);
@ -78,11 +78,7 @@ export default class DialogCommandExecutor extends Component {
async searchInSubtreeCommand({notePath}) { async searchInSubtreeCommand({notePath}) {
const noteId = treeService.getNoteIdFromNotePath(notePath); const noteId = treeService.getNoteIdFromNotePath(notePath);
const searchNote = await dateNoteService.createSearchNote(noteId); this.searchNotesCommand({subTreeNoteId: noteId});
const tabContext = await appContext.tabManager.openTabWithNote(searchNote.noteId, true);
appContext.triggerCommand('focusOnSearchDefinition', {tabId: tabContext.tabId});
} }
showBackendLogCommand() { showBackendLogCommand() {