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 1 Packages Projects Releases Wiki Activity

new "iconClass" property on note_short, now together with cssClass respecting template relationship, #707

Browse Source
This commit is contained in:
zadam 2019-11-16 08:59:27 +01:00
parent 95c37cfdd1
commit e00ab5dbf9
3 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/entities/note_short.js
View File

@ -35,6 +35,8 @@ class NoteShort {
this.archived = row.archived;
/** @param {string} */
this.cssClass = row.cssClass;
/** @param {string} */
this.iconClass = row.iconClass;
/** @type {string[]} */
this.parents = [];

5
src/public/javascripts/services/tree_builder.js
View File

@ -41,7 +41,10 @@ const NOTE_TYPE_ICONS = {
async function getIcon(note) {
const hoistedNoteId = await hoistedNoteService.getHoistedNoteId();
if (note.noteId === 'root') {
if (note.iconClass) {
return note.iconClass;
}
else if (note.noteId === 'root') {
return "bx bx-chevrons-right";
}
else if (note.noteId === hoistedNoteId) {

53
src/routes/api/tree.js
View File

@ -4,6 +4,7 @@ const sql = require('../../services/sql');
const optionService = require('../../services/options');
const protectedSessionService = require('../../services/protected_session');
const noteCacheService = require('../../services/note_cache');
const log = require('../../services/log');
async function getNotes(noteIds) {
// we return also deleted notes which have been specifically asked for
@ -18,23 +19,51 @@ async function getNotes(noteIds) {
FROM notes
WHERE noteId IN (???)`, noteIds);
const cssClassLabels = await sql.getManyRows(`
SELECT noteId, value FROM attributes WHERE isDeleted = 0 AND type = 'label'
AND name = 'cssClass' AND noteId IN (???)`, noteIds);
const noteMap = new Map(notes.map(note => [note.noteId, note]));
for (const label of cssClassLabels) {
// FIXME: inefficient!
const note = notes.find(note => note.noteId === label.noteId);
const templateClassLabels = await sql.getManyRows(`
SELECT
templAttr.noteId,
attr.name,
attr.value
FROM attributes templAttr
JOIN attributes attr ON attr.noteId = templAttr.value
WHERE
templAttr.isDeleted = 0
AND templAttr.type = 'relation'
AND templAttr.name = 'template'
AND templAttr.noteId IN (???)
AND attr.isDeleted = 0
AND attr.type = 'label'
AND attr.name IN ('cssClass', 'iconClass')`, noteIds);
if (!note) {
continue;
const noteClassLabels = await sql.getManyRows(`
SELECT
noteId, name, value
FROM attributes
WHERE
isDeleted = 0
AND type = 'label'
AND name IN ('cssClass', 'iconClass')
AND noteId IN (???)`, noteIds);
// first template ones, then on the note itself so that note class label have priority
// over template ones for iconClass (which can be only one)
const allClassLabels = templateClassLabels.concat(noteClassLabels);
for (const label of allClassLabels) {
const note = noteMap.get(label.noteId);
if (note) {
if (label.name === 'cssClass') {
note.cssClass = note.cssClass ? `${note.cssClass} ${label.value}` : label.value;
}
if (note.cssClass) {
note.cssClass += " " + label.value;
else if (label.name === 'iconClass') {
note.iconClass = label.value;
}
else {
note.cssClass = label.value;
log.error(`Unrecognized label name ${label.name}`);
}
}
}