cleanup of hidden notes

src/services/app_info.js

@@ -4,7 +4,7 @@ const build = require('./build');
 const packageJson = require('../../package');
 const {TRILIUM_DATA_DIR} = require('./data_dir');
 
-const APP_DB_VERSION = 199;
+const APP_DB_VERSION = 202;
 const SYNC_VERSION = 27;
 const CLIPPER_PROTOCOL_VERSION = "1.0";
 

src/services/consistency_checks.js

@@ -140,7 +140,7 @@ class ConsistencyChecks {
             });
 
         this.findAndFixIssues(`
-                    SELECT branchId, branches.noteId AS parentNoteId
+                    SELECT branchId, branches.parentNoteId AS parentNoteId
                     FROM branches
                       LEFT JOIN notes ON notes.noteId = branches.parentNoteId
                     WHERE branches.isDeleted = 0

src/services/special_notes.js

@@ -56,6 +56,7 @@ function getSearchRoot() {
 
     if (!searchRoot) {
         searchRoot = noteService.createNewNote({
+            branchId: 'search',
             noteId: 'search',
             title: 'search',
             type: 'text',
@@ -67,32 +68,17 @@ function getSearchRoot() {
     return searchRoot;
 }
 
-function getSinglesNoteRoot() {
-    let singlesNoteRoot = becca.getNote('singles');
-
-    if (!singlesNoteRoot) {
-        singlesNoteRoot = noteService.createNewNote({
-            noteId: 'singles',
-            title: 'singles',
-            type: 'text',
-            content: '',
-            parentNoteId: getHiddenRoot().noteId
-        }).note;
-    }
-
-    return singlesNoteRoot;
-}
-
 function getGlobalNoteMap() {
     let globalNoteMap = becca.getNote('globalnotemap');
 
     if (!globalNoteMap) {
         globalNoteMap = noteService.createNewNote({
+            branchId: 'globalnotemap',
             noteId: 'globalnotemap',
             title: 'Global Note Map',
             type: 'note-map',
             content: '',
-            parentNoteId: getSinglesNoteRoot().noteId
+            parentNoteId: getHiddenRoot().noteId
         }).note;
 
         globalNoteMap.addLabel('mapRootNoteId', 'hoisted');
@@ -106,6 +92,7 @@ function getSqlConsoleRoot() {
 
     if (!sqlConsoleRoot) {
         sqlConsoleRoot = noteService.createNewNote({
+            branchId: 'sqlconsole',
             noteId: 'sqlconsole',
             title: 'SQL Console',
             type: 'text',
@@ -332,7 +319,6 @@ const shortcuts = [
 ];
 
 function createMissingSpecialNotes() {
-    getSinglesNoteRoot();
     getSqlConsoleRoot();
     getGlobalNoteMap();
     getBulkActionNote();
@@ -450,6 +436,7 @@ module.exports = {
     saveSearchNote,
     createMissingSpecialNotes,
     getShareRoot,
+    getHiddenRoot,
     getBulkActionNote,
     createShortcut
 };