Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

implemented "targetRelationCount" and exposed more of them in order by widget, fixes #1658

Browse Source
This commit is contained in:
zadam
2021-02-19 20:42:34 +01:00
parent 2cfd093cae
commit 4160da70be
5 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/widgets/search_options/order_by.js
View File

@@ -16,6 +16,11 @@ const TPL = `
<option value="contentSize">Note content size</option>
<option value="noteSize">Note content size including revisions</option>
<option value="revisionCount">Number of revisions</option>
<option value="childrenCount">Number of children notes</option>
<option value="parentCount">Number of clones</option>
<option value="ownedLabelCount">Number of labels</option>
<option value="ownedRelationCount">Number of relations</option>
<option value="targetRelationCount">Number of relations targeting the note</option>
</select>
<select name="orderDirection" class="form-control w-auto d-inline">

4
src/services/note_cache/entities/attribute.js
View File

@@ -46,6 +46,10 @@ class Attribute {
|| (this.type === 'relation' && this.name === 'template');
}
isAutoLink() {
return this.type === 'relation' && ['internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink'].includes(this.name);
}
get note() {
return this.noteCache.notes[this.noteId];
}

28
src/services/note_cache/entities/note.js
View File

@@ -319,14 +319,42 @@ class Note {
return this.attributes.filter(attr => attr.type === 'label').length;
}
get ownedLabelCount() {
return this.ownedAttributes.filter(attr => attr.type === 'label').length;
}
get relationCount() {
return this.attributes.filter(attr => attr.type === 'relation' && !attr.isAutoLink()).length;
}
get relationCountIncludingLinks() {
return this.attributes.filter(attr => attr.type === 'relation').length;
}
get ownedRelationCount() {
return this.ownedAttributes.filter(attr => attr.type === 'relation' && !attr.isAutoLink()).length;
}
get ownedRelationCountIncludingLinks() {
return this.ownedAttributes.filter(attr => attr.type === 'relation').length;
}
get targetRelationCount() {
return this.targetRelations.filter(attr => !attr.isAutoLink()).length;
}
get targetRelationCountIncludingLinks() {
return this.targetRelations.length;
}
get attributeCount() {
return this.attributes.length;
}
get ownedAttributeCount() {
return this.attributes.length;
}
get ancestors() {
if (!this.ancestorCache) {
const noteIds = new Set();

6
src/services/search/expressions/property_comparison.js
View File

@@ -23,7 +23,13 @@ const PROP_MAPPING = {
"childrencount": "childrenCount",
"attributecount": "attributeCount",
"labelcount": "labelCount",
"ownedlabelcount": "ownedLabelCount",
"relationcount": "relationCount",
"ownedrelationcount": "ownedRelationCount",
"relationcountincludinglinks": "relationCountIncludingLinks",
"ownedrelationcountincludinglinks": "ownedRelationCountIncludingLinks",
"targetrelationcount": "targetRelationCount",
"targetrelationcountincludinglinks": "targetRelationCountIncludingLinks",
"contentsize": "contentSize",
"notesize": "noteSize",
"revisioncount": "revisionCount"

6
src/services/search/value_extractor.js
View File

@@ -19,7 +19,13 @@ const PROP_MAPPING = {
"childrencount": "childrenCount",
"attributecount": "attributeCount",
"labelcount": "labelCount",
"ownedlabelcount": "ownedLabelCount",
"relationcount": "relationCount",
"ownedrelationcount": "ownedRelationCount",
"relationcountincludinglinks": "relationCountIncludingLinks",
"ownedrelationcountincludinglinks": "ownedRelationCountIncludingLinks",
"targetrelationcount": "targetRelationCount",
"targetrelationcountincludinglinks": "targetRelationCountIncludingLinks",
"contentsize": "contentSize",
"notesize": "noteSize",
"revisioncount": "revisionCount"