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

feat(collections): add label to show archived notes

Browse Source
This commit is contained in:
Elian Doran 2025-09-12 17:57:58 +03:00
parent f300b6c8a2
commit d1e57e85b6
No known key found for this signature in database
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,20 +256,20 @@ export default class FNote {
return this.children; return this.children;
} }
async getSubtreeNoteIds() { async getSubtreeNoteIds(includeArchived = false) {
let noteIds: (string | string[])[] = []; let noteIds: (string | string[])[] = [];
for (const child of await this.getChildNotes()) { for (const child of await this.getChildNotes()) {
if (child.isArchived) continue; if (child.isArchived && !includeArchived) continue;
noteIds.push(child.noteId); noteIds.push(child.noteId);
noteIds.push(await child.getSubtreeNoteIds()); noteIds.push(await child.getSubtreeNoteIds(includeArchived));
} }
return noteIds.flat(); return noteIds.flat();
} }
async getSubtreeNotes() { async getSubtreeNotes() {
const noteIds = await this.getSubtreeNoteIds(); const noteIds = await this.getSubtreeNoteIds();
return (await this.froca.getNotes(noteIds)).filter(note => !note.isArchived) return (await this.froca.getNotes(noteIds));
} }
async getChildNotes() { async getChildNotes() {

7
apps/client/src/widgets/collections/NoteList.tsx
View File

@ -1,5 +1,5 @@
import { allViewTypes, ViewModeProps, ViewTypeOptions } from "./interface"; import { allViewTypes, ViewModeProps, ViewTypeOptions } from "./interface";
import { useNoteContext, useNoteLabel, useTriliumEvent } from "../react/hooks"; import { useNoteContext, useNoteLabel, useNoteLabelBoolean, useTriliumEvent } from "../react/hooks";
import FNote from "../../entities/fnote"; import FNote from "../../entities/fnote";
import "./NoteList.css"; import "./NoteList.css";
import { ListView, GridView } from "./legacy/ListOrGridView"; import { ListView, GridView } from "./legacy/ListOrGridView";
@ -109,6 +109,7 @@ function useNoteViewType(note?: FNote | null): ViewTypeOptions | undefined {
function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOptions | undefined) { function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOptions | undefined) {
const [ noteIds, setNoteIds ] = useState<string[]>([]); const [ noteIds, setNoteIds ] = useState<string[]>([]);
const [ includeArchived ] = useNoteLabelBoolean(note, "includeArchived");
async function refreshNoteIds() { async function refreshNoteIds() {
if (!note) { if (!note) {
@ -118,12 +119,12 @@ function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOptions |
setNoteIds(note.getChildNoteIds()); setNoteIds(note.getChildNoteIds());
} else { } else {
console.log("Refreshed note IDs"); console.log("Refreshed note IDs");
setNoteIds(await note.getSubtreeNoteIds()); setNoteIds(await note.getSubtreeNoteIds(includeArchived));
} }
} }
// Refresh on note switch. // Refresh on note switch.
useEffect(() => { refreshNoteIds() }, [ note ]); useEffect(() => { refreshNoteIds() }, [ note, includeArchived ]);
// Refresh on alterations to the note subtree. // Refresh on alterations to the note subtree.
useTriliumEvent("entitiesReloaded", ({ loadResults }) => { useTriliumEvent("entitiesReloaded", ({ loadResults }) => {