gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 03:29:02 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

attribute UI & saving now fully working

Browse Source
This commit is contained in:
azivner 2018-08-05 20:08:56 +02:00
parent f437be7af0
commit 2089c32839
4 changed files with 63 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,12 @@ function AttributesModel() {
this.availableTypes = [
{ text: "Label", value: "label" },
{ text: "Label definition", value: "definition" },
{ text: "Relation", value: "relation" }
{ text: "Label definition", value: "label-definition" },
{ text: "Relation", value: "relation" },
{ text: "Relation definition", value: "relation-definition" }
];
this.availableValueTypes = [
this.availableLabelTypes = [
{ text: "Text", value: "text" },
{ text: "Integer", value: "integer" },
{ text: "Decimal", value: "decimal" },
@ -36,7 +37,7 @@ function AttributesModel() {
self.getTargetAttribute(event.target).valueHasMutated();
};
this.valueTypeChanged = function(data, event) {
this.labelTypeChanged = function(data, event) {
self.getTargetAttribute(event.target).valueHasMutated();
};
@ -52,26 +53,32 @@ function AttributesModel() {
});
};
this.loadAttributes = async function() {
const noteId = noteDetailService.getCurrentNoteId();
const attributes = await server.get('notes/' + noteId + '/attributes');
function prepareAttributes(attributes) {
for (const attr of attributes) {
attr.labelValue = attr.type === 'label' ? attr.value : '';
attr.relationValue = attr.type === 'relation' ? attr.value : '';
attr.definition = {
valueType: "text",
attr.labelDefinition = attr.type === 'label-definition' ? JSON.parse(attr.value) : {
labelType: "text",
multiplicityType: "singlevalue",
showInUi: "true"
isPromoted: true
};
attr.relationDefinition = attr.type === 'relation-definition' ? JSON.parse(attr.value) : {
multiplicityType: "singlevalue",
isPromoted: true
};
delete attr.value;
}
self.attributes(attributes.map(ko.observable));
addLastEmptyRow();
}
this.loadAttributes = async function() {
const noteId = noteDetailService.getCurrentNoteId();
const attributes = await server.get('notes/' + noteId + '/attributes');
prepareAttributes(attributes);
// attribute might not be rendered immediatelly so could not focus
setTimeout(() => $(".attribute-name:last").focus(), 100);
@ -125,15 +132,37 @@ function AttributesModel() {
.map(attribute => attribute())
.filter(attribute => attribute.attributeId !== "" || attribute.name !== "");
for (const attr of attributesToSave) {
if (attr.type === 'label') {
attr.value = attr.labelValue;
}
else if (attr.type === 'relation') {
attr.value = attr.relationValue;
}
else if (attr.type === 'label-definition') {
attr.value = JSON.stringify(attr.labelDefinition);
}
else if (attr.type === 'relation-definition') {
attr.value = JSON.stringify(attr.relationDefinition);
}
delete attr.labelValue;
delete attr.relationValue;
delete attr.labelDefinition;
delete attr.relationDefinition;
}
const attributes = await server.put('notes/' + noteId + '/attributes', attributesToSave);
self.attributes(attributes.map(ko.observable));
addLastEmptyRow();
prepareAttributes(attributes);
infoService.showMessage("Attributes have been saved.");
noteDetailService.loadAttributeList();
// FIXME FIXME FIXME FIXME FIXME
// FIXME FIXME FIXME FIXME FIXME
// FIXME FIXME FIXME FIXME FIXME
// FIXME FIXME FIXME FIXME FIXME
//noteDetailService.loadAttributeList();
};
function addLastEmptyRow() {
@ -150,10 +179,10 @@ function AttributesModel() {
isInheritable: false,
isDeleted: 0,
position: 0,
definition: {
labelDefinition: {
valueType: "text",
multiplicityType: "singlevalue",
showInUi: "true"
isPromoted: true
}
}));
}
@ -177,7 +206,7 @@ function AttributesModel() {
for (let attributes = self.attributes(), i = 0; i < attributes.length; i++) {
const attribute = attributes[i]();
if (index !== i && cur.name === attribute.name) {
if (index !== i && cur.name === attribute.name && cur.type === attribute.type) {
return true;
}
}

2
src/routes/api/attributes.js
View File

@ -31,9 +31,11 @@ async function updateNoteAttributes(req) {
attributeEntity.noteId = noteId;
}
attributeEntity.type = attribute.type;
attributeEntity.name = attribute.name;
attributeEntity.value = attribute.value;
attributeEntity.position = attribute.position;
attributeEntity.isInheritable = attribute.isInheritable;
attributeEntity.isDeleted = attribute.isDeleted;
await attributeEntity.save();

5
src/services/repository.js
View File

@ -37,6 +37,10 @@ async function getImage(imageId) {
return await getEntity("SELECT * FROM images WHERE imageId = ?", [imageId]);
}
async function getAttribute(attributeId) {
return await getEntity("SELECT * FROM attributes WHERE attributeId = ?", [attributeId]);
}
async function getLabel(labelId) {
return await getEntity("SELECT * FROM labels WHERE labelId = ?", [labelId]);
}
@ -75,6 +79,7 @@ module.exports = {
getNote,
getBranch,
getImage,
getAttribute,
getLabel,
getRelation,
getOption,

13
src/views/index.ejs
View File

@ -591,21 +591,20 @@
<td>
<input type="text" class="label-value form-control" data-bind="visible: type == 'label', value: labelValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }" style="width: 300px"/>
<div class="relation-value input-group" data-bind="visible: type == 'relation'">
<div class="relation-value input-group" data-bind="visible: type == 'relation'" style="width: 300px;">
<input class="form-control relation-target-note-id"
placeholder="search for note by its name"
data-bind="value: relationValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }"
style="width: 300px;">
data-bind="value: relationValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }">
<span class="input-group-addon relations-show-recent-notes" title="Show recent notes" style="background: url('/images/icons/clock-16.png') no-repeat center; cursor: pointer;"></span>
</div>
<div data-bind="visible: type == 'definition'">
<select data-bind="options: $parent.availableValueTypes, optionsText: 'text', optionsValue: 'value', value: definition.valueType"></select>
<div data-bind="visible: type == 'label-definition'">
<select data-bind="options: $parent.availableLabelTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.labelType"></select>
<select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: definition.multiplicityType"></select>
<select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.multiplicityType"></select>
<input type="checkbox" value="true" data-bind="checked: definition.showInUi" /> Show In UI
<input type="checkbox" value="true" data-bind="checked: labelDefinition.isPromoted" /> Promoted
</div>
</td>
<td title="Inheritable relations are automatically inherited to the child notes">