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

updating attributes widget based on sync data changes

Browse Source
This commit is contained in:
zadam 2019-08-06 23:20:27 +02:00
parent bfbc124e78
commit de4733e848
6 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,6 +268,12 @@ class Attributes {
this.$savedIndicator.fadeIn();
}
}
syncDataReceived(syncData) {
if (syncData.find(sd => sd.entityName === 'attributes' && sd.noteId === this.ctx.note.noteId)) {
this.reloadAttributes();
}
}
}
export default Attributes;

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

@ -357,6 +357,8 @@ class TabContext {
}
syncDataReceived(syncData) {
this.attributes.syncDataReceived(syncData);
if (this.sidebar) {
this.sidebar.syncDataReceived(syncData);
}

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

@ -26,8 +26,6 @@ class AttributesWidget {
async renderBody() {
const $body = this.$widget.find('.card-body');
$body.empty();
const attributes = await this.ctx.attributes.getAttributes();
const ownedAttributes = attributes.filter(attr => attr.noteId === this.ctx.note.noteId);
@ -35,7 +33,9 @@ class AttributesWidget {
$body.text("No own attributes yet...");
}
await this.renderAttributes(ownedAttributes, $body);
const $attributesContainer = $("<div>");
await this.renderAttributes(ownedAttributes, $attributesContainer);
const inheritedAttributes = attributes.filter(attr => attr.noteId !== this.ctx.note.noteId);
@ -57,14 +57,16 @@ class AttributesWidget {
$inheritedAttrs.hide();
});
$body.append($showInheritedAttributes);
$body.append($inheritedAttrs);
$attributesContainer.append($showInheritedAttributes);
$attributesContainer.append($inheritedAttrs);
await this.renderAttributes(inheritedAttributes, $inheritedAttrs);
$inheritedAttrs.append($hideInheritedAttributes);
$inheritedAttrs.hide();
}
$body.empty().append($attributesContainer);
}
async renderAttributes(attributes, $container) {
@ -86,6 +88,14 @@ class AttributesWidget {
}
}
}
syncDataReceived(syncData) {
if (syncData.find(sd => sd.entityName === 'attributes' && sd.noteId === this.ctx.note.noteId)) {
// no need to invalidate attributes since the Attribute class listens to this as well
// (and is guaranteed to run first)
this.renderBody();
}
}
}
export default AttributesWidget;

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

@ -57,8 +57,6 @@ class NoteInfoWidget {
syncDataReceived(syncData) {
if (syncData.find(sd => sd.entityName === 'notes' && sd.entityId === this.ctx.note.noteId)) {
console.log("Re-rendering note info");
this.renderBody();
}
}

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

@ -39,6 +39,12 @@ class NoteRevisionsWidget {
}).text(item.dateModifiedFrom)));
}
}
syncDataReceived(syncData) {
if (syncData.find(sd => sd.entityName === 'note_revisions' && sd.noteId === this.ctx.note.noteId)) {
this.renderBody();
}
}
}
export default NoteRevisionsWidget;

3
src/services/messaging.js
View File

@ -70,6 +70,9 @@ async function sendPing(client, lastSentSyncId) {
if (sync.entityName === 'attributes') {
sync.noteId = await sql.getValue(`SELECT noteId FROM attributes WHERE attributeId = ?`, [sync.entityId]);
}
else if (sync.entityName === 'note_revisions') {
sync.noteId = await sql.getValue(`SELECT noteId FROM note_revisions WHERE noteRevisionId = ?`, [sync.entityId]);
}
}
const stats = require('./sync').stats;