YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-03-19 12:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update timeline filters

Browse Source
This commit is contained in:
Steven 2024-05-31 09:06:03 +08:00
parent 98f2cf6397
commit 08a9291964
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
web/src/pages/Timeline.tsx
View File

@ -29,7 +29,7 @@ const Timeline = () => {
const memoStore = useMemoStore(); const memoStore = useMemoStore();
const memoList = useMemoList(); const memoList = useMemoList();
const [, setLastVisited] = useLocalStorage<string>("lastVisited", Routes.TIMELINE); const [, setLastVisited] = useLocalStorage<string>("lastVisited", Routes.TIMELINE);
const { tag: tagQuery, text: textQuery } = useFilterWithUrlParams(); const filter = useFilterWithUrlParams();
const [activityStats, setActivityStats] = useState<Record<string, number>>({}); const [activityStats, setActivityStats] = useState<Record<string, number>>({});
const [selectedDateString, setSelectedDateString] = useState<string>(new Date().toDateString()); const [selectedDateString, setSelectedDateString] = useState<string>(new Date().toDateString());
const [isRequesting, setIsRequesting] = useState(true); const [isRequesting, setIsRequesting] = useState(true);
@ -44,21 +44,11 @@ const Timeline = () => {
useEffect(() => { useEffect(() => {
memoList.reset(); memoList.reset();
fetchMemos(""); fetchMemos("");
}, [selectedDateString, tagQuery, textQuery]); }, [selectedDateString, filter.text, filter.tag, filter.memoPropertyFilter]);
useEffect(() => { useEffect(() => {
(async () => { (async () => {
const filters = [`row_status == "NORMAL"`]; const filters = [`row_status == "NORMAL"`];
const contentSearch: string[] = [];
if (textQuery) {
contentSearch.push(JSON.stringify(textQuery));
}
if (contentSearch.length > 0) {
filters.push(`content_search == [${contentSearch.join(", ")}]`);
}
if (tagQuery) {
filters.push(`tag == "${tagQuery}"`);
}
const { stats } = await memoServiceClient.getUserMemosStats({ const { stats } = await memoServiceClient.getUserMemosStats({
name: user.name, name: user.name,
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone, timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
@ -79,14 +69,25 @@ const Timeline = () => {
setIsRequesting(true); setIsRequesting(true);
const filters = [`creator == "${user.name}"`, `row_status == "NORMAL"`]; const filters = [`creator == "${user.name}"`, `row_status == "NORMAL"`];
const contentSearch: string[] = []; const contentSearch: string[] = [];
if (textQuery) { if (filter.text) {
contentSearch.push(JSON.stringify(textQuery)); contentSearch.push(JSON.stringify(filter.text));
} }
if (contentSearch.length > 0) { if (contentSearch.length > 0) {
filters.push(`content_search == [${contentSearch.join(", ")}]`); filters.push(`content_search == [${contentSearch.join(", ")}]`);
} }
if (tagQuery) { if (filter.tag) {
filters.push(`tag == "${tagQuery}"`); filters.push(`tag == "${filter.tag}"`);
}
if (filter.memoPropertyFilter) {
if (filter.memoPropertyFilter.hasLink) {
filters.push(`has_link == true`);
}
if (filter.memoPropertyFilter.hasTaskList) {
filters.push(`has_task_list == true`);
}
if (filter.memoPropertyFilter.hasCode) {
filters.push(`has_code == true`);
}
} }
if (selectedDateString) { if (selectedDateString) {
const selectedDateStamp = getTimeStampByDate(selectedDateString); const selectedDateStamp = getTimeStampByDate(selectedDateString);