gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

note complement is now loaded through tree cache

Browse Source
This commit is contained in:
zadam 2020-02-01 18:29:18 +01:00
parent f0cbca2838
commit 0e13678f7c
8 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/javascripts/services/app_context.js
View File

@ -345,6 +345,7 @@ class AppContext {
this.openTabsChangedListener();
}
// FIXME non existent event
noteChangesSavedListener() {
const activeTabContext = this.getActiveTabContext();

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

@ -1,5 +1,3 @@
import server from './server.js';
import NoteComplement from "../entities/note_complement.js";
import appContext from "./app_context.js";
function getActiveEditor() {
@ -13,16 +11,6 @@ function getActiveEditor() {
}
}
async function loadNoteComplement(noteId) {
if (!noteId) {
return null;
}
const row = await server.get('notes/' + noteId);
return new NoteComplement(row);
}
function focusOnTitle() {
appContext.trigger('focusOnTitle');
}
@ -47,7 +35,6 @@ $(window).on('beforeunload', () => {
});
export default {
loadNoteComplement,
focusOnTitle,
focusAndSelectTitle,
getActiveEditor,

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

@ -44,7 +44,7 @@ async function mouseEnterHandler() {
const noteId = treeService.getNoteIdFromNotePath(notePath);
const note = await treeCache.getNote(noteId);
const noteComplement = await noteDetailService.loadNoteComplement(noteId);
const noteComplement = await treeCache.getNoteComplement(noteId);
const html = await renderTooltip(note, noteComplement);

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

@ -85,11 +85,7 @@ class TabContext extends Component {
return null;
}
if (!this.noteComplementPromise) {
this.noteComplementPromise = noteDetailService.loadNoteComplement(this.noteId);
}
return await this.noteComplementPromise;
return await treeCache.getNoteComplement(this.noteId);
}
async remove() {

14
src/public/javascripts/services/tree_cache.js
View File

@ -3,6 +3,7 @@ import NoteShort from "../entities/note_short.js";
import Attribute from "../entities/attribute.js";
import server from "./server.js";
import {LoadResults} from "./load_results.js";
import NoteComplement from "../entities/note_complement.js";
/**
* TreeCache keeps a read only cache of note tree structure in frontend's memory.
@ -26,6 +27,9 @@ class TreeCache {
/** @type {Object.<string, Attribute>} */
this.attributes = {};
/** @type {Object.<string, Promise<NoteComplement>>} */
this.noteComplementPromises = {};
}
load(noteRows, branchRows, attributeRows) {
@ -216,6 +220,14 @@ class TreeCache {
return child.parentToBranch[parentNoteId];
}
async getNoteComplement(noteId) {
if (!this.noteComplementPromises[noteId]) {
this.noteComplementPromises[noteId] = server.get('notes/' + noteId).then(row => new NoteComplement(row));
}
return await this.noteComplementPromises[noteId];
}
// FIXME does not actually belong here
async processSyncRows(syncRows) {
const loadResults = new LoadResults(this);
@ -329,6 +341,8 @@ class TreeCache {
});
syncRows.filter(sync => sync.entityName === 'note_contents').forEach(sync => {
delete this.noteComplementPromises[sync.entityId];
loadResults.addNoteContent(sync.entityId, sync.sourceId);
});

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

@ -39,18 +39,11 @@ export default class NoteDetailWidget extends TabAwareWidget {
this.spacedUpdate = new SpacedUpdate(async () => {
const {note} = this.tabContext;
const {noteId} = note;
const noteComplement = await this.tabContext.getNoteComplement();
// FIXME hack
const dto = note.dto;
dto.content = noteComplement.content = this.getTypeWidget().getContent();
dto.content = this.getTypeWidget().getContent();
const resp = await server.put('notes/' + noteId, dto, this.componentId);
noteComplement.dateModified = resp.dateModified;
noteComplement.utcDateModified = resp.utcDateModified;
this.trigger('noteChangesSaved', {noteId})
await server.put('notes/' + noteId, dto, this.componentId);
});
}
@ -226,9 +219,9 @@ export default class NoteDetailWidget extends TabAwareWidget {
}
async entitiesReloadedListener({loadResults}) {
if (loadResults.isNoteContentReloaded(this.noteId, this.componentId)) {
this.tabContext.noteComplement = await noteDetailService.loadNoteComplement(this.noteId);
// we should test what happens when the loaded note is deleted
if (loadResults.isNoteContentReloaded(this.noteId, this.componentId)) {
this.refreshWithNote(this.note, this.notePath);
}
}

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

@ -67,13 +67,6 @@ class NoteInfoWidget extends StandardWidget {
.attr("title", note.mime);
}
// this is interesting for this widget since dateModified had to change after update
noteChangesSavedListener({noteId}) {
if (this.isNote(noteId)) {
this.refreshWithNote(this.note, this.notePath);
}
}
syncDataListener({data}) {
if (data.find(sd => sd.entityName === 'notes' && this.isNote(sd.entityId))) {
this.refresh();

8
src/public/javascripts/widgets/note_title.js
View File

@ -34,13 +34,7 @@ export default class NoteTitleWidget extends TabAwareWidget {
const noteId = this.tabContext.note.noteId;
const title = this.$noteTitle.val();
const resp = await server.put(`notes/${noteId}/change-title`, {title});
// FIXME: minor - does not propagate to other tab contexts with this note though
this.tabContext.note.dateModified = resp.dateModified;
this.tabContext.note.utcDateModified = resp.utcDateModified;
this.trigger('noteChangesSaved', {noteId})
await server.put(`notes/${noteId}/change-title`, {title});
});
}