From 6f1b0b92fe8dcea736c15217c69512c7fee769cb Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 26 Apr 2021 22:27:12 +0200 Subject: [PATCH 1/4] fix searchForNote backend API method --- src/services/backend_script_api.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js index 527b5d98f..8450dd3f6 100644 --- a/src/services/backend_script_api.js +++ b/src/services/backend_script_api.js @@ -121,11 +121,12 @@ function BackendScriptApi(currentNote, apiParams) { * "#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search * * @method - * @param {string} searchString + * @param {string} query + * @param {Object} [searchParams] * @returns {Note|null} */ - this.searchForNote = searchString => { - const notes = searchService.searchNoteEntities(searchString); + this.searchForNote = (query, searchParams = {}) => { + const notes = this.searchForNotes(query, searchParams); return notes.length > 0 ? notes[0] : null; }; From 03f3e46f8b07a706b9926a7e2668fad047d6a511 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 26 Apr 2021 22:32:54 +0200 Subject: [PATCH 2/4] release 0.47.2 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 852553822..1cc9bd480 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.47.1-beta", + "version": "0.47.2", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index ded67e430..f304c7fce 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-04-19T22:43:03+02:00", buildRevision: "6136243d6117910b80feafad4fc7121ecc42d794" }; +module.exports = { buildDate:"2021-04-26T22:32:54+02:00", buildRevision: "6f1b0b92fe8dcea736c15217c69512c7fee769cb" }; From b1131844d603e7b285bee419999c818cccca1412 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 27 Apr 2021 22:59:08 +0200 Subject: [PATCH 3/4] fix filling entity changes from Options' Advanced tab, closes #1898 --- src/services/entity_changes.js | 42 +++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js index 72a389dfa..92c2e441c 100644 --- a/src/services/entity_changes.js +++ b/src/services/entity_changes.js @@ -80,31 +80,37 @@ function cleanupEntityChangesForMissingEntities(entityName, entityPrimaryKey) { function fillEntityChanges(entityName, entityPrimaryKey, condition = '') { try { cleanupEntityChangesForMissingEntities(entityName, entityPrimaryKey); + const repository = require("./repository.js"); - const entityIds = sql.getColumn(`SELECT ${entityPrimaryKey} FROM ${entityName}` - + (condition ? ` WHERE ${condition}` : '')); + sql.transactional(() => { + const entityIds = sql.getColumn(`SELECT ${entityPrimaryKey} FROM ${entityName}` + + (condition ? ` WHERE ${condition}` : '')); - let createdCount = 0; + let createdCount = 0; - for (const entityId of entityIds) { - const existingRows = sql.getValue("SELECT COUNT(1) FROM entity_changes WHERE entityName = ? AND entityId = ?", [entityName, entityId]); + for (const entityId of entityIds) { + const existingRows = sql.getValue("SELECT COUNT(1) FROM entity_changes WHERE entityName = ? AND entityId = ?", [entityName, entityId]); - // we don't want to replace existing entities (which would effectively cause full resync) - if (existingRows === 0) { - createdCount++; + // we don't want to replace existing entities (which would effectively cause full resync) + if (existingRows === 0) { + createdCount++; - sql.insert("entity_changes", { - entityName: entityName, - entityId: entityId, - sourceId: "SYNC_FILL", - isSynced: 1 - }); + const entity = repository.getEntity(`SELECT * FROM ${entityName} WHERE ${entityPrimaryKey} = ?`, [entityId]); + + addEntityChange({ + entityName, + entityId, + hash: entity.generateHash(), + isErased: false, + utcDateChanged: entity.getUtcDateChanged() + }, null); + } } - } - if (createdCount > 0) { - log.info(`Created ${createdCount} missing entity changes for ${entityName}.`); - } + if (createdCount > 0) { + log.info(`Created ${createdCount} missing entity changes for ${entityName}.`); + } + }); } catch (e) { // this is to fix migration from 0.30 to 0.32, can be removed later From f22c76d9fb751baa1c3097a70ecdde26a4bf0ea2 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 27 Apr 2021 23:05:28 +0200 Subject: [PATCH 4/4] fix focusing tree from note detail, closes #1897 --- src/public/app/widgets/note_tree.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index 961053d44..a1dcc129b 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -813,6 +813,7 @@ export default class NoteTreeWidget extends TabAwareWidget { const activeContext = appContext.tabManager.getActiveTabContext(); if (activeContext && activeContext.notePath) { + this.tree.$container.focus(); this.tree.setFocus(true); const node = await this.expandToNote(activeContext.notePath);