Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

fixes, separation of notefull from noteshort

Browse Source
This commit is contained in:
zadam
2020-01-25 14:37:12 +01:00
parent 516e6c35da
commit ac7d5f2e81
18 changed files with 64 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/dialogs/attributes.js
View File

@@ -172,8 +172,6 @@ function AttributesModel() {
toastService.showMessage("Attributes have been saved.");
appContext.getActiveTabContext().attributes.refreshAttributes();
// FIXME detail should be also reloaded
appContext.trigger('reloadTree');
};

12
src/public/javascripts/dialogs/note_info.js
View File

@@ -16,13 +16,13 @@ export function showDialog() {
$dialog.modal();
const activeNote = appContext.getActiveTabNote();
const {note, noteFull} = appContext.getActiveTabContext();
$noteId.text(activeNote.noteId);
$dateCreated.text(activeNote.dateCreated);
$dateModified.text(activeNote.dateModified);
$type.text(activeNote.type);
$mime.text(activeNote.mime);
$noteId.text(note.noteId);
$dateCreated.text(noteFull.dateCreated);
$dateModified.text(noteFull.dateModified);
$type.text(note.type);
$mime.text(note.mime);
}
$okButton.on('click', () => $dialog.modal('hide'));

12
src/public/javascripts/entities/note_full.js
View File

@@ -3,10 +3,8 @@ import NoteShort from './note_short.js';
/**
* Represents full note, specifically including note's content.
*/
class NoteFull extends NoteShort {
constructor(treeCache, row, noteShort) {
super(treeCache, row, []);
class NoteFull {
constructor(row) {
/** @param {string} */
this.content = row.content;
@@ -21,12 +19,6 @@ class NoteFull extends NoteShort {
/** @param {string} */
this.utcDateModified = row.utcDateModified;
/* ugly */
this.parents = noteShort.parents;
this.parentToBranch = noteShort.parentToBranch;
this.children = noteShort.children;
this.childToBranch = noteShort.childToBranch;
}
}

8
src/public/javascripts/services/note_detail.js
View File

@@ -15,12 +15,10 @@ function getActiveEditor() {
}
}
async function loadNote(noteId) {
async function loadNoteFull(noteId) {
const row = await server.get('notes/' + noteId);
const noteShort = await treeCache.getNote(noteId);
return new NoteFull(treeCache, row, noteShort);
return new NoteFull(row);
}
function focusOnTitle() {
@@ -65,7 +63,7 @@ $(window).on('beforeunload', () => {
});
export default {
loadNote,
loadNoteFull,
focusOnTitle,
focusAndSelectTitle,
getActiveEditor,

17
src/public/javascripts/services/note_tooltip.js
View File

@@ -2,6 +2,7 @@ import noteDetailService from "./note_detail.js";
import treeService from "./tree.js";
import linkService from "./link.js";
import server from "./server.js";
import treeCache from "./tree_cache.js";
function setupGlobalTooltip() {
$(document).on("mouseenter", "a", mouseEnterHandler);
@@ -42,12 +43,10 @@ async function mouseEnterHandler() {
const noteId = treeService.getNoteIdFromNotePath(notePath);
const notePromise = noteDetailService.loadNote(noteId);
const attributePromise = server.get(`notes/${noteId}/attributes`);
const note = await treeCache.getNote(noteId);
const noteFull = await noteDetailService.loadNoteFull(noteId);
const [note, attributes] = await Promise.all([notePromise, attributePromise]);
const html = await renderTooltip(note, attributes);
const html = await renderTooltip(note, noteFull);
// we need to check if we're still hovering over the element
// since the operation to get tooltip content was async, it is possible that
@@ -72,7 +71,9 @@ function mouseLeaveHandler() {
$(this).tooltip('dispose');
}
async function renderTooltip(note, attributes) {
async function renderTooltip(note, noteFull) {
const attributes = await note.getAttributes();
let content = '';
const promoted = attributes.filter(attr =>
(attr.type === 'label-definition' || attr.type === 'relation-definition')
@@ -116,11 +117,11 @@ async function renderTooltip(note, attributes) {
if (note.type === 'text') {
// surround with <div> for a case when note's content is pure text (e.g. "[protected]") which
// then fails the jquery non-empty text test
content += '<div>' + note.content + '</div>';
content += '<div>' + noteFull.content + '</div>';
}
else if (note.type === 'code') {
content += $("<pre>")
.text(note.content)
.text(noteFull.content)
.prop('outerHTML');
}
else if (note.type === 'image') {

35
src/public/javascripts/services/tab_context.js
View File

@@ -1,13 +1,13 @@
import protectedSessionHolder from "./protected_session_holder.js";
import server from "./server.js";
import bundleService from "./bundle.js";
import Attributes from "./attributes.js";
import utils from "./utils.js";
import optionsService from "./options.js";
import appContext from "./app_context.js";
import treeService from "./tree.js";
import noteDetailService from "./note_detail.js";
import Component from "../widgets/component.js";
import treeCache from "./tree_cache.js";
let showSidebarInNewTab = true;
@@ -28,10 +28,6 @@ class TabContext extends Component {
this.tabId = state.tabId || utils.randomString(4);
this.state = state;
this.attributes = new Attributes(this.appContext, this);
this.children.push(this.attributes);
this.trigger('tabOpened', {tabId: this.tabId});
}
@@ -52,8 +48,11 @@ class TabContext extends Component {
this.notePath = notePath;
const noteId = treeService.getNoteIdFromNotePath(notePath);
/** @property {NoteShort} */
this.note = await treeCache.getNote(noteId);
/** @property {NoteFull} */
this.note = await noteDetailService.loadNote(noteId);
this.noteFull = await noteDetailService.loadNoteFull(noteId);
//this.cleanup(); // esp. on windows autocomplete is not getting closed automatically
@@ -85,30 +84,6 @@ class TabContext extends Component {
this.trigger('tabRemoved', {tabId: this.tabId});
}
async saveNote() {
return; // FIXME
if (this.note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable()) {
return;
}
this.note.title = this.$noteTitle.val();
this.note.content = this.getComponent().getContent();
// it's important to set the flag back to false immediatelly after retrieving title and content
// otherwise we might overwrite another change (especially async code)
this.isNoteChanged = false;
const resp = await server.put('notes/' + this.note.noteId, this.note.dto);
this.note.dateModified = resp.dateModified;
this.note.utcDateModified = resp.utcDateModified;
if (this.note.isProtected) {
protectedSessionHolder.touchProtectedSession();
}
}
isActive() {
return this.appContext.activeTabId === this.tabId;
}

6
src/public/javascripts/widgets/attributes.js
View File

@@ -23,9 +23,9 @@ class AttributesWidget extends StandardWidget {
return [$showFullButton];
}
async refreshWithNote() {
const attributes = await this.tabContext.attributes.getAttributes();
const ownedAttributes = attributes.filter(attr => attr.noteId === this.tabContext.note.noteId);
async refreshWithNote(note) {
const attributes = await note.getAttributes();
const ownedAttributes = note.getOwnedAttributes();
if (attributes.length === 0) {
this.$body.text("No attributes yet...");

17
src/public/javascripts/widgets/note_detail.js
View File

@@ -36,16 +36,19 @@ export default class NoteDetailWidget extends TabAwareWidget {
this.typeWidgetPromises = {};
this.spacedUpdate = new SpacedUpdate(async () => {
const note = this.tabContext.note;
note.content = this.getTypeWidget().getContent();
const {noteFull} = this.tabContext;
const {noteId} = this.tabContext.note;
const resp = await server.put('notes/' + note.noteId, note.dto);
const dto = note.dto;
dto.content = noteFull.content = this.getTypeWidget().getContent();
const resp = await server.put('notes/' + noteId, dto);
// FIXME: minor - does not propagate to other tab contexts with this note though
note.dateModified = resp.dateModified;
note.utcDateModified = resp.utcDateModified;
noteFull.dateModified = resp.dateModified;
noteFull.utcDateModified = resp.utcDateModified;
this.trigger('noteChangesSaved', {noteId: note.noteId})
this.trigger('noteChangesSaved', {noteId})
});
}
@@ -156,7 +159,7 @@ export default class NoteDetailWidget extends TabAwareWidget {
let type = note.type;
if (type === 'text' && !disableAutoBook
&& utils.isHtmlEmpty(note.content)
&& utils.isHtmlEmpty(this.tabContext.noteFull.content)
&& note.hasChildren()) {
type = 'book';

10
src/public/javascripts/widgets/note_info.js
View File

@@ -49,14 +49,16 @@ class NoteInfoWidget extends StandardWidget {
const $type = this.$body.find(".note-info-type");
const $mime = this.$body.find(".note-info-mime");
const {noteFull} = this.tabContext;
$noteId.text(note.noteId);
$dateCreated
.text(note.dateCreated)
.attr("title", note.dateCreated);
.text(noteFull.dateCreated)
.attr("title", noteFull.dateCreated);
$dateModified
.text(note.dateModified)
.attr("title", note.dateCreated);
.text(noteFull.dateModified)
.attr("title", noteFull.dateCreated);
$type.text(note.type);

4
src/public/javascripts/widgets/promoted_attributes.js
View File

@@ -35,10 +35,10 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
return this.$widget;
}
async refreshWithNote() {
async refreshWithNote(note) {
this.$container.empty();
const attributes = await this.tabContext.attributes.getAttributes();
const attributes = await note.getAttributes();
const promoted = attributes.filter(attr =>
(attr.type === 'label-definition' || attr.type === 'relation-definition')

2
src/public/javascripts/widgets/type_widgets/code.js
View File

@@ -75,7 +75,7 @@ export default class CodeTypeWidget extends TypeWidget {
this.spacedUpdate.allowUpdateWithoutChange(() => {
// CodeMirror breaks pretty badly on null so even though it shouldn't happen (guarded by consistency check)
// we provide fallback
this.codeEditor.setValue(note.content || "");
this.codeEditor.setValue(this.tabContext.noteFull.content || "");
const info = CodeMirror.findModeByMIME(note.mime);

6
src/public/javascripts/widgets/type_widgets/file.js
View File

@@ -118,7 +118,7 @@ export default class FileTypeWidget extends TypeWidget {
}
async doRefresh(note) {
const attributes = await server.get('notes/' + note.noteId + '/attributes');
const attributes = await note.getAttributes();
const attributeMap = utils.toObject(attributes, l => [l.name, l.value]);
this.$widget.show();
@@ -128,9 +128,9 @@ export default class FileTypeWidget extends TypeWidget {
this.$fileSize.text(note.contentLength + " bytes");
this.$fileType.text(note.mime);
if (note.content) {
if (this.tabContext.noteFull.content) {
this.$previewContent.show();
this.$previewContent.text(note.content);
this.$previewContent.text(this.tabContext.noteFull.content);
}
else {
this.$previewContent.empty().hide();

4
src/public/javascripts/widgets/type_widgets/image.js
View File

@@ -123,7 +123,7 @@ class NoteDetailImage extends TypeWidget {
}
async doRefresh(note) {
const attributes = await server.get('notes/' + note.noteId + '/attributes');
const attributes = await note.getAttributes();
const attributeMap = utils.toObject(attributes, l => [l.name, l.value]);
this.$widget.show();
@@ -132,7 +132,7 @@ class NoteDetailImage extends TypeWidget {
this.$fileSize.text(note.contentLength + " bytes");
this.$fileType.text(note.mime);
const imageHash = note.utcDateModified.replace(" ", "_");
const imageHash = this.tabContext.noteFull.utcDateModified.replace(" ", "_");
this.$imageView.prop("src", `api/images/${note.noteId}/${note.title}?${imageHash}`);
}

4
src/public/javascripts/widgets/type_widgets/relation_map.js
View File

@@ -254,9 +254,9 @@ export default class RelationMapTypeWidget extends TypeWidget {
}
};
if (this.tabContext.note.content) {
if (this.tabContext.noteFull.content) {
try {
this.mapData = JSON.parse(this.tabContext.note.content);
this.mapData = JSON.parse(this.tabContext.noteFull.content);
} catch (e) {
console.log("Could not parse content: ", e);
}

2
src/public/javascripts/widgets/type_widgets/search.js
View File

@@ -45,7 +45,7 @@ export default class SearchTypeWidget extends TypeWidget {
this.$component.show();
try {
const json = JSON.parse(note.content);
const json = JSON.parse(this.tabContext.noteFull.content);
this.$searchString.val(json.searchString);
}

10
src/public/javascripts/widgets/type_widgets/text.js
View File

@@ -137,10 +137,10 @@ export default class TextTypeWidget extends TypeWidget {
}
async doRefresh(note) {
this.textEditor.isReadOnly = await this.isReadOnly();
this.textEditor.isReadOnly = await note.hasLabel('readOnly');
this.spacedUpdate.allowUpdateWithoutChange(() => {
this.textEditor.setData(note.content);
this.textEditor.setData(this.tabContext.noteFull.content);
});
}
@@ -160,12 +160,6 @@ export default class TextTypeWidget extends TypeWidget {
&& !content.includes("<section")
}
async isReadOnly() {
const attributes = await this.tabContext.attributes.getAttributes();
return attributes.some(attr => attr.type === 'label' && attr.name === 'readOnly');
}
focus() {
this.$editor.trigger('focus');
}

2
src/public/javascripts/widgets/type_widgets/type_widget.js
View File

@@ -5,7 +5,7 @@ export default class TypeWidget extends TabAwareWidget {
static getType() {}
/**
* @param {NoteFull} note
* @param {NoteShort} note
*/
doRefresh(note) {}

14
src/routes/api/tree.js
View File

@@ -8,14 +8,7 @@ async function getNotesAndBranchesAndAttributes(noteIds) {
noteIds = Array.from(new Set(noteIds));
const notes = await treeService.getNotes(noteIds);
const noteMap = {};
noteIds = [];
for (const note of notes) {
note.attributes = [];
noteMap[note.noteId] = note;
noteIds.push(note.noteId);
}
noteIds = notes.map(note => note.noteId);
// joining child note to filter out not completely synchronised notes which would then cause errors later
// cannot do that with parent because of root note's 'none' parent
@@ -37,14 +30,19 @@ async function getNotesAndBranchesAndAttributes(noteIds) {
const attributes = await sql.getManyRows(`
SELECT
attributeId,
noteId,
type,
name,
value,
position,
isInheritable
FROM attributes
WHERE isDeleted = 0 AND noteId IN (???)`, noteIds);
// sorting in memory is faster
attributes.sort((a, b) => a.position - b.position < 0 ? -1 : 1);
return {
branches,
notes,