From 9812b9c272ede7a589b1f23661f9c9150bcdd48d Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 3 Dec 2019 21:31:46 +0100 Subject: [PATCH] (mostly) backwards compatible .createNote() backend API --- src/services/backend_script_api.js | 59 ++++++++++++++++++++++++++++++ src/services/build_search_query.js | 1 + 2 files changed, 60 insertions(+) diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js index 15953f241..de0b29212 100644 --- a/src/services/backend_script_api.js +++ b/src/services/backend_script_api.js @@ -230,6 +230,65 @@ function BackendScriptApi(currentNote, apiParams) { */ this.createNewNote = noteService.createNewNote; + /** + * @typedef {object} CreateNoteAttribute + * @property {string} type - attribute type - label, relation etc. + * @property {string} name - attribute name + * @property {string} [value] - attribute value + */ + + /** + * @typedef {object} CreateNoteExtraOptions + * @property {boolean} [json=false] - should the note be JSON + * @property {boolean} [isProtected=false] - should the note be protected + * @property {string} [type='text'] - note type + * @property {string} [mime='text/html'] - MIME type of the note + * @property {CreateNoteAttribute[]} [attributes=[]] - attributes to be created for this note + */ + + /** + * @method + * + * @param {string} parentNoteId - create new note under this parent + * @param {string} title + * @param {string} [content=""] + * @param {CreateNoteExtraOptions} [extraOptions={}] + * @returns {Promise<{note: Note, branch: Branch}>} object contains newly created entities note and branch + */ + this.createNote = async (parentNoteId, title, content = "", extraOptions= {}) => { + extraOptions.parentNoteId = parentNoteId; + extraOptions.title = title; + + const parentNote = await repository.getNote(parentNoteId); + + // code note type can be inherited, otherwise text is default + extraOptions.type = parentNote.type === 'code' ? 'code' : 'text'; + extraOptions.mime = parentNote.type === 'code' ? parentNote.mime : 'text/html'; + + if (extraOptions.json) { + extraOptions.content = JSON.stringify(content || {}, null, '\t'); + extraOptions.type = 'code'; + extraOptions.mime = 'application/json'; + } + else { + extraOptions.content = content; + } + + const {note, branch} = await noteService.createNewNote(extraOptions); + + for (const attr of extraOptions.attributes || []) { + await attributeService.createAttribute({ + noteId: note.noteId, + type: attr.type, + name: attr.name, + value: attr.value, + isInheritable: !!attr.isInheritable + }); + } + + return {note, branch}; + }; + /** * Log given message to trilium logs. * diff --git a/src/services/build_search_query.js b/src/services/build_search_query.js index 0bac8b428..cf45638a4 100644 --- a/src/services/build_search_query.js +++ b/src/services/build_search_query.js @@ -47,6 +47,7 @@ module.exports = function(filters, selectedColumns = 'notes.*') { else if (property === 'parentCount') { // need to cast as string for the equality operator to work // for >= etc. it is cast again to DECIMAL + // also cannot use COUNT() in WHERE so using subquery ... accessor = `CAST((SELECT COUNT(1) FROM branches WHERE branches.noteId = notes.noteId AND isDeleted = 0) AS STRING)`; } else {