From 40fb4ff56be6eb629945672b655160c5b569ffc1 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 30 Nov 2021 21:21:16 +0100 Subject: [PATCH] fix for "Today page does not work for 2021-11-20", closes #2359 --- package-lock.json | 2 +- src/services/attributes.js | 2 ++ src/services/date_notes.js | 15 --------------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72c9ddf43..af590fb83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.48.6", + "version": "0.48.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/services/attributes.js b/src/services/attributes.js index d2c8ac215..be7c26dae 100644 --- a/src/services/attributes.js +++ b/src/services/attributes.js @@ -62,6 +62,7 @@ const BUILTIN_ATTRIBUTES = [ { type: 'relation', name: 'renderNote', isDangerous: true } ]; +/** @returns {Note[]} */ function getNotesWithLabel(name, value) { const query = formatAttrForSearch({type: 'label', name, value}, true); return searchService.searchNotes(query, { @@ -71,6 +72,7 @@ function getNotesWithLabel(name, value) { } // TODO: should be in search service +/** @returns {Note|null} */ function getNoteWithLabel(name, value) { // optimized version (~20 times faster) without using normal search, useful for e.g. finding date notes const attrs = becca.findAttributes('label', name); diff --git a/src/services/date_notes.js b/src/services/date_notes.js index 66606f11a..7d9940690 100644 --- a/src/services/date_notes.js +++ b/src/services/date_notes.js @@ -25,15 +25,6 @@ function createNote(parentNote, noteTitle) { }).note; } -function getNoteStartingWith(parentNoteId, startsWith) { - const noteId = sql.getValue(`SELECT notes.noteId FROM notes JOIN branches USING(noteId) - WHERE parentNoteId = ? AND title LIKE '${startsWith}%' - AND notes.isDeleted = 0 AND isProtected = 0 - AND branches.isDeleted = 0`, [parentNoteId]); - - return becca.getNote(noteId); -} - /** @returns {Note} */ function getRootCalendarNote() { let rootNote = attributeService.getNoteWithLabel(CALENDAR_ROOT_LABEL); @@ -164,12 +155,6 @@ function getDateNote(dateStr) { const monthNote = getMonthNote(dateStr, rootNote); const dayNumber = dateStr.substr(8, 2); - dateNote = getNoteStartingWith(monthNote.noteId, dayNumber); - - if (dateNote) { - return dateNote; - } - const dateObj = dateUtils.parseLocalDate(dateStr); const noteTitle = getDateNoteTitle(rootNote, dayNumber, dateObj);