zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-22 16:46:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

sharing improvements

Browse source
This commit is contained in:
zadam 2021-12-23 20:54:48 +01:00
parent 972f2f40bf
commit 47845930f4
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/becca/entities/branch.js
View file

@ -58,7 +58,10 @@ class Branch extends AbstractEntity {
}
init() {
this.becca.branches[this.branchId] = this;
if (this.branchId) {
this.becca.branches[this.branchId] = this;
}
this.becca.childParentToBranch[`${this.noteId}-${this.parentNoteId}`] = this;
if (this.branchId === 'root') {

14
src/services/tree.js
View file

@ -41,10 +41,15 @@ function validateParentChild(parentNoteId, childNoteId, branchId = null) {
const existing = getExistingBranch(parentNoteId, childNoteId);
console.log("BBBB", existing);
if (existing && (branchId === null || existing.branchId !== branchId)) {
const parentNote = becca.getNote(parentNoteId);
const childNote = becca.getNote(childNoteId);
return {
success: false,
message: 'This note already exists in the target.'
message: `Note "${childNote.title}" note already exists in the "${parentNote.title}".`
};
}
@ -59,7 +64,12 @@ function validateParentChild(parentNoteId, childNoteId, branchId = null) {
}
function getExistingBranch(parentNoteId, childNoteId) {
const branchId = sql.getValue('SELECT branchId FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0', [childNoteId, parentNoteId]);
const branchId = sql.getValue(`
SELECT branchId
FROM branches
WHERE noteId = ?
AND parentNoteId = ?
AND isDeleted = 0`, [childNoteId, parentNoteId]);
return becca.getBranch(branchId);
}

2
src/share/content_renderer.js
View file

@ -59,7 +59,7 @@ function getContent(note) {
content = document.body.innerHTML;
}
}
else if (note.type === 'code') {
else if (note.type === 'code' || note.type === 'mermaid') {
if (!content?.trim()) {
content = NO_CONTENT + getChildrenList(note);
}

9
src/share/routes.js
View file

@ -3,18 +3,21 @@ const shacaLoader = require("./shaca/shaca_loader");
const shareRoot = require("./share_root");
const contentRenderer = require("./content_renderer.js");
function getSubRoot(note) {
function getSharedSubTreeRoot(note) {
if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
// share root itself is not shared
return null;
}
// every path leads to share root, but which one to choose?
// for sake of simplicity URLs are not note paths
const parentNote = note.getParentNotes()[0];
if (parentNote.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
return note;
}
return getSubRoot(parentNote);
return getSharedSubTreeRoot(parentNote);
}
function register(router) {
@ -28,7 +31,7 @@ function register(router) {
if (note) {
const content = contentRenderer.getContent(note);
const subRoot = getSubRoot(note);
const subRoot = getSharedSubTreeRoot(note);
res.render("share/page", {
note,