From 1010d11827643a3e9c7261292d7fbcf0c3976a47 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 18 Feb 2024 00:22:46 +0200 Subject: [PATCH] server-ts: Port services/hoisted_note --- src/services/date_notes.js | 2 +- src/services/{hoisted_note.js => hoisted_note.ts} | 8 ++++---- src/services/search/search_context.js | 2 +- src/services/search/services/search.js | 2 +- src/services/special_notes.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/services/{hoisted_note.js => hoisted_note.ts} (81%) diff --git a/src/services/date_notes.js b/src/services/date_notes.js index 628ed886f..8bc6f9eb1 100644 --- a/src/services/date_notes.js +++ b/src/services/date_notes.js @@ -7,7 +7,7 @@ const sql = require('./sql'); const protectedSessionService = require('./protected_session'); const searchService = require('../services/search/services/search.js'); const SearchContext = require('../services/search/search_context.js'); -const hoistedNoteService = require('./hoisted_note.js'); +const hoistedNoteService = require('./hoisted_note'); const CALENDAR_ROOT_LABEL = 'calendarRoot'; const YEAR_LABEL = 'yearNote'; diff --git a/src/services/hoisted_note.js b/src/services/hoisted_note.ts similarity index 81% rename from src/services/hoisted_note.js rename to src/services/hoisted_note.ts index a75d4addc..fca423269 100644 --- a/src/services/hoisted_note.js +++ b/src/services/hoisted_note.ts @@ -1,5 +1,5 @@ -const cls = require('./cls'); -const becca = require('../becca/becca'); +import cls = require('./cls'); +import becca = require('../becca/becca'); function getHoistedNoteId() { return cls.getHoistedNoteId(); @@ -26,14 +26,14 @@ function isHoistedInHiddenSubtree() { function getWorkspaceNote() { const hoistedNote = becca.getNote(cls.getHoistedNoteId()); - if (hoistedNote.isRoot() || hoistedNote.hasLabel('workspace')) { + if (hoistedNote && (hoistedNote.isRoot() || hoistedNote.hasLabel('workspace'))) { return hoistedNote; } else { return becca.getRoot(); } } -module.exports = { +export = { getHoistedNoteId, getWorkspaceNote, isHoistedInHiddenSubtree diff --git a/src/services/search/search_context.js b/src/services/search/search_context.js index 6827e3841..ff8fe8256 100644 --- a/src/services/search/search_context.js +++ b/src/services/search/search_context.js @@ -1,6 +1,6 @@ "use strict"; -const hoistedNoteService = require('../hoisted_note.js'); +const hoistedNoteService = require('../hoisted_note'); class SearchContext { constructor(params = {}) { diff --git a/src/services/search/services/search.js b/src/services/search/services/search.js index 828c624a8..17e379864 100644 --- a/src/services/search/services/search.js +++ b/src/services/search/services/search.js @@ -10,7 +10,7 @@ const becca = require('../../../becca/becca'); const beccaService = require('../../../becca/becca_service'); const utils = require('../../utils'); const log = require('../../log'); -const hoistedNoteService = require('../../hoisted_note.js'); +const hoistedNoteService = require('../../hoisted_note'); function searchFromNote(note) { let searchResultNoteIds, highlightedTokens; diff --git a/src/services/special_notes.js b/src/services/special_notes.js index 749f43325..712a01fdf 100644 --- a/src/services/special_notes.js +++ b/src/services/special_notes.js @@ -4,7 +4,7 @@ const becca = require('../becca/becca'); const noteService = require('./notes'); const dateUtils = require('./date_utils'); const log = require('./log'); -const hoistedNoteService = require('./hoisted_note.js'); +const hoistedNoteService = require('./hoisted_note'); const searchService = require('./search/services/search.js'); const SearchContext = require('./search/search_context.js'); const {LBTPL_NOTE_LAUNCHER, LBTPL_CUSTOM_WIDGET, LBTPL_SPACER, LBTPL_SCRIPT} = require('./hidden_subtree');