zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-12-25 00:34:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

cleanup of hidden notes

Browse source
This commit is contained in:
zadam 2022-11-06 15:18:32 +01:00
parent 3122d0cc6b
commit c92b451033
9 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
db/migrations/0198__NOOP.js
View file

@ -1 +0,0 @@
module.exports = () => console.log("NOOP, increased because of new note type");

10
db/migrations/0198__create_hidden_subtree.js Normal file
View file

@ -0,0 +1,10 @@
module.exports = () => {
const specialNotesService = require('../../src/services/special_notes');
const cls = require("../../src/services/cls");
const beccaLoader = require("../../src/becca/becca_loader");
cls.init(() => {
beccaLoader.load();
specialNotesService.getHiddenRoot();
});
};

0
db/migrations/0199_move_share_under_hidden.sql → db/migrations/0199__move_share_under_hidden.sql
View file

1
db/migrations/0200__move_global_note_map_under_hidden.sql Normal file
View file

@ -0,0 +1 @@
UPDATE branches SET parentNoteId = 'hidden' WHERE noteId = 'globalnotemap';

3
db/migrations/0201__set_branch_id_in_hidden_subtree.sql Normal file
View file

@ -0,0 +1,3 @@
UPDATE branches SET branchId = 'search' WHERE parentNoteId = 'hidden' AND noteId = 'search';
UPDATE branches SET branchId = 'globalnotemap' WHERE parentNoteId = 'hidden' AND noteId = 'globalnotemap';
UPDATE branches SET branchId = 'sqlconsole' WHERE parentNoteId = 'hidden' AND noteId = 'sqlconsole';

6
db/migrations/0202__delete_singles_special_note.sql Normal file
View file

@ -0,0 +1,6 @@
DELETE FROM branches WHERE noteId = 'singles';
DELETE FROM notes WHERE noteId = 'singles';
DELETE FROM note_contents WHERE noteId = 'singles';
DELETE FROM note_revisions WHERE noteId = 'singles';
DELETE FROM attributes WHERE noteId = 'singles';
DELETE FROM entity_changes WHERE entityId = 'singles';

2
src/services/app_info.js
View file

@ -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";

2
src/services/consistency_checks.js
View file

@ -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

23
src/services/special_notes.js
View file

@ -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
};