gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fixing promoted attributes

Browse Source
This commit is contained in:
zadam 2020-07-01 00:02:13 +02:00
parent c012620338
commit bf073690e0
2 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/public/app/entities/attribute.js
View File

@ -31,15 +31,6 @@ class Attribute {
return this.type === 'relation' ? this.value : undefined;
}
get jsonValue() {
try {
return JSON.parse(this.value);
}
catch (e) {
return null;
}
}
get isAutoLink() {
return this.type === 'relation' && ['internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink'].includes(this.name);
}
@ -79,6 +70,42 @@ class Attribute {
return false;
}
isDefinition() {
return this.type === 'label' && (this.name.startsWith('label:') || this.name.startsWith('relation:'));
}
getDefinition() {
const tokens = this.value.split(',').map(t => t.trim());
const defObj = {};
for (const token of tokens) {
if (token === 'promoted') {
defObj.isPromoted = true;
}
else if (['text', 'number', 'boolean', 'date', 'url'].includes(token)) {
defObj.labelType = token;
}
else if (['single', 'multi'].includes(token)) {
defObj.multiplicity = token;
}
else if (token.startsWith('precision')) {
const chunks = token.split('=');
defObj.numberPrecision = parseInt(chunks[1]);
}
else if (token.startsWith('inverse')) {
const chunks = token.split('=');
defObj.inverseRelation = chunks[1];
}
else {
console.log("Unrecognized attribute definition token:", token);
}
}
return defObj;
}
}
export default Attribute;

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

@ -42,40 +42,37 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
const attributes = note.getAttributes();
const promoted = attributes
.filter(attr => attr.type === 'label-definition' || attr.type === 'relation-definition')
.filter(attr => !attr.name.startsWith("child:"))
.filter(attr => attr.isDefinition())
.filter(attr => {
const json = attr.jsonValue;
const def = attr.getDefinition();
return json && json.isPromoted;
return def && def.isPromoted;
});
const hidePromotedAttributes = attributes.some(attr => attr.type === 'label' && attr.name === 'hidePromotedAttributes');
if (promoted.length > 0 && !hidePromotedAttributes) {
if (promoted.length > 0 && !note.hasLabel('hidePromotedAttributes')) {
const $tbody = $("<tbody>");
for (const definitionAttr of promoted) {
const definitionType = definitionAttr.type;
const valueType = definitionType.substr(0, definitionType.length - 11);
const definitionType = definitionAttr.name.startsWith('label:') ? 'label' : 'relation';
const valueName = definitionAttr.name.substr(definitionType.length + 1);
let valueAttrs = attributes.filter(el => el.name === definitionAttr.name && el.type === valueType);
let valueAttrs = attributes.filter(el => el.name === definitionAttr.name && el.type === definitionType);
if (valueAttrs.length === 0) {
valueAttrs.push({
attributeId: "",
type: valueType,
name: definitionAttr.name,
type: definitionType,
name: valueName,
value: ""
});
}
if (definitionAttr.value.multiplicityType === 'singlevalue') {
if (definitionAttr.value.multiplicity === 'single') {
valueAttrs = valueAttrs.slice(0, 1);
}
for (const valueAttr of valueAttrs) {
const $tr = await this.createPromotedAttributeRow(definitionAttr, valueAttr);
const $tr = await this.createPromotedAttributeRow(definitionAttr, valueAttr, valueName);
$tbody.append($tr);
}
@ -93,10 +90,10 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
return attributes;
}
async createPromotedAttributeRow(definitionAttr, valueAttr) {
const definition = definitionAttr.jsonValue;
async createPromotedAttributeRow(definitionAttr, valueAttr, valueName) {
const definition = definitionAttr.getDefinition();
const $tr = $("<tr>");
const $labelCell = $("<th>").append(valueAttr.name);
const $labelCell = $("<th>").append(valueName);
const $input = $("<input>")
.prop("tabindex", 200 + definitionAttr.position)
.prop("attribute-id", valueAttr.noteId === this.noteId ? valueAttr.attributeId : '') // if not owned, we'll force creation of a new attribute instead of updating the inherited one
@ -209,7 +206,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
return;
}
if (definition.multiplicityType === "multivalue") {
if (definition.multiplicity === "multivalue") {
const addButton = $("<span>")
.addClass("bx bx-plus pointer")
.prop("title", "Add new attribute")