From e1e020c1a471b44fa8df74fc927cf0a4680803b0 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 14 Apr 2019 12:18:52 +0200 Subject: [PATCH] more reliable reimplementation of "create day sub note" --- electron.js | 7 +--- src/public/javascripts/desktop.js | 21 ++++------ src/public/javascripts/services/branches.js | 1 - src/public/javascripts/services/date_notes.js | 41 +++++++++++++++++++ .../services/frontend_script_api.js | 3 ++ src/public/javascripts/services/tree.js | 3 +- src/routes/api/date_notes.js | 21 ++++++++++ src/routes/routes.js | 5 +++ 8 files changed, 81 insertions(+), 21 deletions(-) create mode 100644 src/public/javascripts/services/date_notes.js create mode 100644 src/routes/api/date_notes.js diff --git a/electron.js b/electron.js index ecd3fb0de..380bacbce 100644 --- a/electron.js +++ b/electron.js @@ -97,15 +97,10 @@ app.on('ready', async () => { mainWindow = await createMainWindow(); const result = globalShortcut.register('CommandOrControl+Alt+P', cls.wrap(async () => { - const dateNoteService = require('./src/services/date_notes'); - const dateUtils = require('./src/services/date_utils'); - - const parentNote = await dateNoteService.getDateNote(dateUtils.localNowDate()); - // window may be hidden / not in focus mainWindow.focus(); - mainWindow.webContents.send('create-day-sub-note', parentNote.noteId); + mainWindow.webContents.send('create-day-sub-note'); })); if (!result) { diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js index 8650d22ec..2f8688f8b 100644 --- a/src/public/javascripts/desktop.js +++ b/src/public/javascripts/desktop.js @@ -39,6 +39,7 @@ import linkService from './services/link.js'; import noteAutocompleteService from './services/note_autocomplete.js'; import macInit from './services/mac_init.js'; import cssLoader from './services/css_loader.js'; +import dateNoteService from './services/date_notes.js'; // required for CKEditor image upload plugin window.glob.getActiveNode = treeService.getActiveNode; @@ -114,20 +115,14 @@ $("body").on("click", "a.external", function () { }); if (utils.isElectron()) { - require('electron').ipcRenderer.on('create-day-sub-note', async function(event, parentNoteId) { - await treeService.activateNote(parentNoteId); + require('electron').ipcRenderer.on('create-day-sub-note', async function(event) { + const todayNote = await dateNoteService.getTodayNote(); + const node = await treeService.expandToNote(todayNote.noteId); - setTimeout(async () => { - const parentNode = treeService.getActiveNode(); - - const {note} = await treeService.createNote(parentNode, parentNode.data.noteId, 'into', { - type: "text", - isProtected: parentNode.data.isProtected - }); - - await treeService.activateNote(note.noteId); - - }, 500); + await treeService.createNote(node, todayNote.noteId, 'into', { + type: "text", + isProtected: node.data.isProtected + }); }); } diff --git a/src/public/javascripts/services/branches.js b/src/public/javascripts/services/branches.js index 1b36769ac..d8b404210 100644 --- a/src/public/javascripts/services/branches.js +++ b/src/public/javascripts/services/branches.js @@ -3,7 +3,6 @@ import utils from './utils.js'; import server from './server.js'; import infoService from "./info.js"; import treeCache from "./tree_cache.js"; -import treeBuilder from "./tree_builder.js"; async function moveBeforeNode(nodesToMove, beforeNode) { nodesToMove = filterRootNote(nodesToMove); diff --git a/src/public/javascripts/services/date_notes.js b/src/public/javascripts/services/date_notes.js new file mode 100644 index 000000000..97da168fb --- /dev/null +++ b/src/public/javascripts/services/date_notes.js @@ -0,0 +1,41 @@ +import treeCache from "./tree_cache.js"; +import server from "./server.js"; + +/** @return {NoteShort} */ +async function getTodayNote() { + return await getDateNote(dayjs().format("YYYY-MM-DD")); +} + +/** @return {NoteShort} */ +async function getDateNote(date) { + const note = await server.get('date-notes/date/' + date); + + await treeCache.reloadParents(note.noteId); + + return await treeCache.getNote(note.noteId); +} + +/** @return {NoteShort} */ +async function getMonthNote(month) { + const note = await server.get('date-notes/month/' + month); + + await treeCache.reloadParents(note.noteId); + + return await treeCache.getNote(note.noteId); +} + +/** @return {NoteShort} */ +async function getYearNote(year) { + const note = await server.get('date-notes/year/' + year); + + await treeCache.reloadParents(note.noteId); + + return await treeCache.getNote(note.noteId); +} + +export default { + getTodayNote, + getDateNote, + getMonthNote, + getYearNote +} \ No newline at end of file diff --git a/src/public/javascripts/services/frontend_script_api.js b/src/public/javascripts/services/frontend_script_api.js index 1b315095a..a55e39649 100644 --- a/src/public/javascripts/services/frontend_script_api.js +++ b/src/public/javascripts/services/frontend_script_api.js @@ -25,6 +25,9 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { /** @property {object|null} entity whose event triggered this execution */ this.originEntity = originEntity; + // to keep consistency with backend API + this.dayjs = dayjs; + /** * Activates note in the tree and in the note detail. * diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js index 625aa8df7..6233c070b 100644 --- a/src/public/javascripts/services/tree.js +++ b/src/public/javascripts/services/tree.js @@ -817,5 +817,6 @@ export default { getNodesByNoteId, checkFolderStatus, reloadNote, - loadTreeCache + loadTreeCache, + expandToNote }; \ No newline at end of file diff --git a/src/routes/api/date_notes.js b/src/routes/api/date_notes.js new file mode 100644 index 000000000..0528d952c --- /dev/null +++ b/src/routes/api/date_notes.js @@ -0,0 +1,21 @@ +"use strict"; + +const dateNoteService = require('../../services/date_notes'); + +async function getDateNote(req) { + return await dateNoteService.getDateNote(req.params.date); +} + +async function getMonthNote(req) { + return await dateNoteService.getMonthNote(req.params.month); +} + +async function getYearNote(req) { + return await dateNoteService.getYearNote(req.params.year); +} + +module.exports = { + getDateNote, + getMonthNote, + getYearNote +}; \ No newline at end of file diff --git a/src/routes/routes.js b/src/routes/routes.js index 313993679..0aaf2b9d1 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -30,6 +30,7 @@ const scriptRoute = require('./api/script'); const senderRoute = require('./api/sender'); const filesRoute = require('./api/file_upload'); const searchRoute = require('./api/search'); +const dateNotesRoute = require('./api/date_notes'); const log = require('../services/log'); const express = require('express'); @@ -153,6 +154,10 @@ function register(app) { apiRoute(GET, '/api/attributes/names', attributesRoute.getAttributeNames); apiRoute(GET, '/api/attributes/values/:attributeName', attributesRoute.getValuesForAttribute); + apiRoute(GET, '/api/date-notes/date/:date', dateNotesRoute.getDateNote); + apiRoute(GET, '/api/date-notes/month/:month', dateNotesRoute.getMonthNote); + apiRoute(GET, '/api/date-notes/year/:year', dateNotesRoute.getYearNote); + route(GET, '/api/images/:noteId/:filename', [auth.checkApiAuthOrElectron], imageRoute.returnImage); route(POST, '/api/images', [auth.checkApiAuthOrElectron, uploadMiddleware, csrfMiddleware], imageRoute.uploadImage, apiResultHandler);