gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

promoted attributes widget is now auto-updating, fixes #700

Browse Source
This commit is contained in:
zadam 2020-06-08 00:29:52 +02:00
parent 11b73b79ed
commit 2c609e8136
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/attribute.js
View File

@ -105,7 +105,7 @@ class Attribute extends Entity {
// cannot be static! // cannot be static!
updatePojo(pojo) { updatePojo(pojo) {
delete pojo.__note; delete pojo.__note; // FIXME: probably note necessary anymore
} }
createClone(type, name, value) { createClone(type, name, value) {

4
src/public/app/dialogs/attributes.js
View File

@ -152,10 +152,10 @@ function AttributesModel() {
attr.value = treeService.getNoteIdFromNotePath(attr.selectedPath); attr.value = treeService.getNoteIdFromNotePath(attr.selectedPath);
} }
else if (attr.type === 'label-definition') { else if (attr.type === 'label-definition') {
attr.value = attr.labelDefinition; attr.value = JSON.stringify(attr.labelDefinition);
} }
else if (attr.type === 'relation-definition') { else if (attr.type === 'relation-definition') {
attr.value = attr.relationDefinition; attr.value = JSON.stringify(attr.relationDefinition);
} }
delete attr.labelValue; delete attr.labelValue;

3
src/public/app/services/load_results.js
View File

@ -54,8 +54,9 @@ export default class LoadResults {
this.attributes.push({attributeId, sourceId}); this.attributes.push({attributeId, sourceId});
} }
getAttributes() { getAttributes(sourceId = 'none') {
return this.attributes return this.attributes
.filter(row => row.sourceId !== sourceId)
.map(row => this.treeCache.attributes[row.attributeId]) .map(row => this.treeCache.attributes[row.attributeId])
.filter(attr => !!attr); .filter(attr => !!attr);
} }

13
src/public/app/widgets/promoted_attributes.js
View File

@ -229,7 +229,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
.prop("title", "Remove this attribute") .prop("title", "Remove this attribute")
.on('click', async () => { .on('click', async () => {
if (valueAttr.attributeId) { if (valueAttr.attributeId) {
await server.remove("notes/" + this.noteId + "/attributes/" + valueAttr.attributeId); await server.remove("notes/" + this.noteId + "/attributes/" + valueAttr.attributeId, this.componentId);
} }
$tr.remove(); $tr.remove();
@ -263,13 +263,18 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
type: $attr.prop("attribute-type"), type: $attr.prop("attribute-type"),
name: $attr.prop("attribute-name"), name: $attr.prop("attribute-name"),
value: value value: value
}); }, this.componentId);
$attr.prop("attribute-id", result.attributeId); $attr.prop("attribute-id", result.attributeId);
} }
entitiesReloadedEvent({loadResults}) { entitiesReloadedEvent({loadResults}) {console.log("loadResults", loadResults);
if (loadResults.getAttributes().find(attr => attr.noteId === this.noteId)) { // relation/label definitions are very often inherited by tree or template,
// it's difficult to detect inheritance so we will
if (loadResults.getAttributes(this.componentId).find(attr =>
attr.noteId === this.noteId
|| ['label-definition', 'relation-definition'].includes(attr.type))) {
this.refresh(); this.refresh();
} }
} }