mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-10-15 11:22:21 +02:00
Alexandre TeixeiraandLéo
f1a47f3812
* refactor(notes): decompose Notes into feature-owned modules * fix(notes): avoid HTML interpolation in reminder picker * docs(notes): drop checkpoint archives, session logs and publication drafts The N0-N6 tarballs and raw pytest/node logs are not read by any script or test, and the logs carry absolute home-directory paths. Once squashed into dev they would stay in history for good. notes-pr.md and notes-issue.md were the drafts used to open #6712 and #6713, not documentation. notes-validation.md keeps the counts, the checkpoint hashes and implementation.sha256 as the record; local interpreter paths and the local Docker image name are replaced with portable placeholders. * fix(notes): keep the state store raw and stop masonry re-observing after close - state: writes built from views (filter, spread, splice) stored nested read-only views in the store, so structuredClone on a stored note threw DataCloneError. Store writes now unwrap nested views. - layout: a save that resolves after closePanel re-renders the leaving pane and re-created the masonry ResizeObserver that teardown had disposed. Skip creating it once Notes is closed. - index.js: drop 30 imported or declared names that were never used and group the imports at the top. Import order is unchanged. - Revert unrelated punctuation edits in .gitattributes and keep the header comment and docstring first in compare/vote.js and test_notes_dom_xss_helpers.py. Both fixes have a node test that fails on the previous head. * test(notes): make script rejection assertion case-insensitive Address CodeQL js/bad-tag-filter alert #1150 in test-only assertion and refresh Notes evidence manifest checksum. --------- Co-authored-by: Léo <leograndcontact@gmail.com>
67 lines
2.9 KiB
JavaScript
67 lines
2.9 KiB
JavaScript
/** Application-owned filtering, searching and note ordering. */
|
|
import { _noteTags, _visibleNoteTags, _nextGoalStep, _isCalendarReminderNote } from '../domain/noteRules.js';
|
|
import { _hasTimeComponent } from '../domain/recurrence.js';
|
|
export function createQueries({
|
|
_hasActiveReminder,
|
|
state
|
|
}) {
|
|
function _sortedVisibleNotes() {
|
|
const displayNotes = _userVisibleNotes();
|
|
let filtered = state.activeLabel ? displayNotes.filter(n => _noteTags(n).includes(state.activeLabel)) : displayNotes;
|
|
if (state.activeFilter === 'reminders') {
|
|
filtered = filtered.filter(n => n.due_date && _hasTimeComponent(n.due_date));
|
|
} else if (state.activeFilter === 'no-reminders') {
|
|
filtered = filtered.filter(n => !(n.due_date && _hasTimeComponent(n.due_date)));
|
|
} else if (state.activeFilter === 'default') {
|
|
filtered = filtered.filter(n => _visibleNoteTags(n).length === 0);
|
|
} else if (state.activeFilter === 'goals') {
|
|
filtered = filtered.filter(n => n.note_type === 'goal' && !n.archived);
|
|
} else if (state.activeFilter === 'today') {
|
|
// Today view: only goals that still have an unchecked step.
|
|
filtered = filtered.filter(n => n.note_type === 'goal' && !n.archived && _nextGoalStep(n));
|
|
}
|
|
if (state.searchQuery) {
|
|
filtered = filtered.filter(n => {
|
|
const q = state.searchQuery;
|
|
if ((n.title || '').toLowerCase().includes(q)) return true;
|
|
if ((n.content || '').toLowerCase().includes(q)) return true;
|
|
if ((n.label || '').toLowerCase().includes(q)) return true;
|
|
if (Array.isArray(n.items) && n.items.some(it => (it.text || '').toLowerCase().includes(q))) return true;
|
|
return false;
|
|
});
|
|
}
|
|
const sorted = [...filtered].sort((a, b) => {
|
|
// In reminders view: sort by due date ascending (soonest first)
|
|
if (state.activeFilter === 'reminders') {
|
|
const da = new Date(a.due_date || 0).getTime();
|
|
const db = new Date(b.due_date || 0).getTime();
|
|
return da - db;
|
|
}
|
|
// Archived view: newest archived first (ignore manual sort_order).
|
|
if (state.showingArchived) {
|
|
return new Date(b.updated_at || 0) - new Date(a.updated_at || 0);
|
|
}
|
|
if (a.pinned && !b.pinned) return -1;
|
|
if (!a.pinned && b.pinned) return 1;
|
|
// Active reminders (due date in the past, not done/archived) rank
|
|
// immediately under the pinned block.
|
|
const aActive = _hasActiveReminder(a);
|
|
const bActive = _hasActiveReminder(b);
|
|
if (aActive && !bActive) return -1;
|
|
if (!aActive && bActive) return 1;
|
|
const so = (a.sort_order || 0) - (b.sort_order || 0);
|
|
if (so !== 0) return so;
|
|
return new Date(b.updated_at || 0) - new Date(a.updated_at || 0);
|
|
});
|
|
|
|
|
|
return sorted;
|
|
}
|
|
|
|
function _userVisibleNotes() {
|
|
return state.notes.filter(n => !_isCalendarReminderNote(n));
|
|
}
|
|
|
|
return { _sortedVisibleNotes, _userVisibleNotes };
|
|
}
|