Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-07 22:05:44 +01:00
Code Issues Packages Projects Releases Activity

more cleanup of labels and relations from backend, dropping tables from db

Browse Source
This commit is contained in:
azivner
2018-08-07 13:44:51 +02:00
parent 1c0fd243d1
commit f1240c26bf
8 changed files with 16 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/services/note_cache.js
View File

@@ -30,7 +30,7 @@ async function load() {
childParentToBranchId[`${rel.noteId}-${rel.parentNoteId}`] = rel.branchId;
}
const hiddenLabels = await sql.getColumn(`SELECT noteId FROM labels WHERE isDeleted = 0 AND name = 'archived'`);
const hiddenLabels = await sql.getColumn(`SELECT noteId FROM attributes WHERE type = 'label' AND isDeleted = 0 AND name = 'archived'`);
for (const noteId of hiddenLabels) {
archived[noteId] = true;
@@ -265,19 +265,19 @@ eventService.subscribe(eventService.ENTITY_CHANGED, async ({entityName, entityId
childParentToBranchId[branch.noteId + '-' + branch.parentNoteId] = branch.branchId;
}
}
else if (entityName === 'labels') {
const label = await repository.getLabel(entityId);
else if (entityName === 'attributes') {
const attribute = await repository.getAttribute(entityId);
if (label.name === 'archived') {
if (attribute.type === 'label' && attribute.name === 'archived') {
// we're not using label object directly, since there might be other non-deleted archived label
const hideLabel = await repository.getEntity(`SELECT * FROM labels WHERE isDeleted = 0
AND name = 'archived' AND noteId = ?`, [label.noteId]);
const hideLabel = await repository.getEntity(`SELECT * FROM attributes WHERE isDeleted = 0 AND type = 'label'
AND name = 'archived' AND noteId = ?`, [attribute.noteId]);
if (hideLabel) {
archived[label.noteId] = true;
archived[attribute.noteId] = true;
}
else {
delete archived[label.noteId];
delete archived[attribute.noteId];
}
}
}