gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 19:08:56 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

feat(board/relation): group by relation

Browse Source
This commit is contained in:
Elian Doran 2025-11-15 10:15:11 +02:00
parent 455b190a5b
commit 47f7968dc4
No known key found for this signature in database
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/client/src/entities/fnote.ts
View File

@ -804,6 +804,16 @@ export default class FNote {
return this.getAttributeValue(LABEL, name); return this.getAttributeValue(LABEL, name);
} }
getLabelOrRelation(nameWithPrefix: string) {
if (nameWithPrefix.startsWith("#")) {
return this.getLabelValue(nameWithPrefix.substring(1));
} else if (nameWithPrefix.startsWith("~")) {
return this.getRelationValue(nameWithPrefix.substring(1));
} else {
return this.getLabelValue(nameWithPrefix);
}
}
/** /**
* @param name - relation name * @param name - relation name
* @returns relation value if relation exists, null otherwise * @returns relation value if relation exists, null otherwise

5
apps/client/src/widgets/collections/board/data.ts
View File

@ -57,7 +57,8 @@ export async function getBoardData(parentNote: FNote, groupByColumn: string, per
return { return {
byColumn, byColumn,
newPersistedData newPersistedData,
isInRelationMode: groupByColumn.startsWith("~")
}; };
} }
@ -70,7 +71,7 @@ async function recursiveGroupBy(branches: FBranch[], byColumn: ColumnMap, groupB
await recursiveGroupBy(note.getChildBranches(), byColumn, groupByColumn, includeArchived, seenNoteIds); await recursiveGroupBy(note.getChildBranches(), byColumn, groupByColumn, includeArchived, seenNoteIds);
} }
const group = note.getLabelValue(groupByColumn); const group = note.getLabelOrRelation(groupByColumn);
if (!group || seenNoteIds.has(note.noteId)) { if (!group || seenNoteIds.has(note.noteId)) {
continue; continue;
} }