@@ -63,7 +75,7 @@ const TPL = `
| Search string: |
-
+
|
@@ -85,6 +97,8 @@ const TPL = `
+
+
`;
export default class SearchTypeWidget extends TypeWidget {
@@ -93,13 +107,26 @@ export default class SearchTypeWidget extends TypeWidget {
doRender() {
this.$widget = $(TPL);
this.$searchString = this.$widget.find(".search-string");
+ this.$searchString.on('input', () => this.spacedUpdate.scheduleUpdate());
+
this.$component = this.$widget.find('.note-detail-search');
this.$settingsArea = this.$widget.find('.search-settings');
+ this.spacedUpdate = new SpacedUpdate(() => this.updateSearch(), 2000);
+
this.$limitSearchToSubtree = this.$widget.find('.limit-search-to-subtree');
noteAutocompleteService.initNoteAutocomplete(this.$limitSearchToSubtree);
+ this.$limitSearchToSubtree.on('autocomplete:closed', e => {
+ this.spacedUpdate.scheduleUpdate();
+ });
+
+ this.$searchWithinNoteContent = this.$widget.find('.search-within-note-content');
+ this.$searchWithinNoteContent.on('change', () => {
+ this.spacedUpdate.scheduleUpdate();
+ });
+
this.$settingExpander = this.$widget.find('.area-expander');
this.$settingExpander.on('click', async () => {
const collapse = this.$settingsArea.is(":visible");
@@ -110,25 +137,42 @@ export default class SearchTypeWidget extends TypeWidget {
this.$settingsArea.slideDown(200);
}
});
+
+ this.$noteResultWrapper = this.$widget.find('.note-result-wrapper');
+ }
+
+ async updateSearch() {
+ const searchString = this.$searchString.val();
+ const subNoteId = this.$limitSearchToSubtree.getSelectedNoteId();
+ const includeNoteContent = this.$searchWithinNoteContent.is(":checked");
+
+ const response = await server.get(`search/${encodeURIComponent(searchString)}?includeNoteContent=${includeNoteContent}&excludeArchived=true&fuzzyAttributeSearch=false`);
+
+ if (!response.success) {
+ toastService.showError("Search failed: " + response.message, 10000);
+ // even in this case we'll show the results
+ }
+
+ const resultNoteIds = response.results.map(res => res.notePathArray[res.notePathArray.length - 1]);
+
+ const noteListRenderer = new NoteListRenderer(this.note, resultNoteIds);
+
+ this.$noteResultWrapper.empty().append(await noteListRenderer.renderList());
}
async doRefresh(note) {
- this.$help.html(window.glob.SEARCH_HELP_TEXT);
-
this.$component.show();
- try {
- const noteComplement = await this.tabContext.getNoteComplement();
- const json = JSON.parse(noteComplement.content);
-
- this.$searchString.val(json.searchString);
- }
- catch (e) {
- console.log(e);
- this.$searchString.val('');
- }
-
- this.$searchString.on('input', () => this.spacedUpdate.scheduleUpdate());
+ // try {
+ // const noteComplement = await this.tabContext.getNoteComplement();
+ // const json = JSON.parse(noteComplement.content);
+ //
+ // this.$searchString.val(json.searchString);
+ // }
+ // catch (e) {
+ // console.log(e);
+ // this.$searchString.val('');
+ // }
}
getContent() {
diff --git a/src/routes/api/date_notes.js b/src/routes/api/date_notes.js
index b4fcb20fe..d00e1f648 100644
--- a/src/routes/api/date_notes.js
+++ b/src/routes/api/date_notes.js
@@ -51,10 +51,27 @@ function createSqlConsole() {
return note;
}
+function createSearchNote() {
+ const today = dateUtils.localNowDate();
+
+ const todayNote = dateNoteService.getDateNote(today);
+
+ const {note} = noteService.createNewNote({
+ parentNoteId: todayNote.noteId,
+ title: 'Search',
+ content: "",
+ type: 'search',
+ mime: 'application/json'
+ });
+
+ return note;
+}
+
module.exports = {
getDateNote,
getMonthNote,
getYearNote,
getDateNotesForMonth,
- createSqlConsole
+ createSqlConsole,
+ createSearchNote
};
diff --git a/src/routes/routes.js b/src/routes/routes.js
index 101babdf8..73eb241d4 100644
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -190,6 +190,7 @@ function register(app) {
apiRoute(GET, '/api/date-notes/year/:year', dateNotesRoute.getYearNote);
apiRoute(GET, '/api/date-notes/notes-for-month/:month', dateNotesRoute.getDateNotesForMonth);
apiRoute(POST, '/api/sql-console', dateNotesRoute.createSqlConsole);
+ apiRoute(POST, '/api/search-note', dateNotesRoute.createSearchNote);
route(GET, '/api/images/:noteId/:filename', [auth.checkApiAuthOrElectron], imageRoute.returnImage);
route(POST, '/api/images', [auth.checkApiAuthOrElectron, uploadMiddleware, csrfMiddleware], imageRoute.uploadImage, apiResultHandler);