Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: implement memo metadata store
Stevendc15e8f30f84
diff --git a/web/src/components/ExploreSidebar/ExploreSidebar.tsx b/web/src/components/ExploreSidebar/ExploreSidebar.tsxindex ae2ef4ad5..a550d5db8 100644--- a/web/src/components/ExploreSidebar/ExploreSidebar.tsx+++ b/web/src/components/ExploreSidebar/ExploreSidebar.tsx@@ -1,5 +1,8 @@import clsx from "clsx";+import { useLocation } from "react-router-dom";+import useDebounce from "react-use/lib/useDebounce";import SearchBar from "@/components/SearchBar";+import { useMemoList, useMemoMetadataStore } from "@/store/v1";import TagsSection from "../HomeSidebar/TagsSection";interface Props {@@ -7,6 +10,19 @@ interface Props {}const ExploreSidebar = (props: Props) => {+ const location = useLocation();+ const memoList = useMemoList();+ const memoMetadataStore = useMemoMetadataStore();++ useDebounce(+ async () => {+ if (memoList.size() === 0) return;+ await memoMetadataStore.fetchMemoMetadata({ location });+ },+ 300,+ [memoList.size(), location.pathname],+ );+return (<asideclassName={clsx(diff --git a/web/src/components/HomeSidebar/HomeSidebar.tsx b/web/src/components/HomeSidebar/HomeSidebar.tsxindex df5070b2b..11a9d2928 100644--- a/web/src/components/HomeSidebar/HomeSidebar.tsx+++ b/web/src/components/HomeSidebar/HomeSidebar.tsx@@ -1,6 +1,10 @@import clsx from "clsx";+import { useLocation } from "react-router-dom";+import useDebounce from "react-use/lib/useDebounce";import SearchBar from "@/components/SearchBar";import UserStatisticsView from "@/components/UserStatisticsView";+import useCurrentUser from "@/hooks/useCurrentUser";+import { useMemoList, useMemoMetadataStore } from "@/store/v1";import TagsSection from "./TagsSection";interface Props {@@ -8,6 +12,19 @@ interface Props {}const HomeSidebar = (props: Props) => {+ const location = useLocation();+ const user = useCurrentUser();+ const memoList = useMemoList();+ const memoMetadataStore = useMemoMetadataStore();++ useDebounce(+ async () => {+ await memoMetadataStore.fetchMemoMetadata({ user, location });+ },+ 300,+ [memoList.size(), user, location.pathname],+ );+return (<asideclassName={clsx(diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsxindex e41c8a155..7a078cf91 100644--- a/web/src/components/HomeSidebar/TagsSection.tsx+++ b/web/src/components/HomeSidebar/TagsSection.tsx@@ -3,11 +3,10 @@ import clsx from "clsx";import { Edit3Icon, HashIcon, MoreVerticalIcon, TagsIcon, TrashIcon } from "lucide-react";import toast from "react-hot-toast";import { useLocation } from "react-router-dom";-import useDebounce from "react-use/lib/useDebounce";import useLocalStorage from "react-use/lib/useLocalStorage";import { memoServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";-import { useMemoFilterStore, useMemoList, useTagStore } from "@/store/v1";+import { useMemoFilterStore, useMemoMetadataStore, useMemoTagList } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import showRenameTagDialog from "../RenameTagDialog";import TagTree from "../TagTree";@@ -22,26 +21,12 @@ const TagsSection = (props: Props) => {const location = useLocation();const user = useCurrentUser();const memoFilterStore = useMemoFilterStore();- const tagStore = useTagStore();- const memoList = useMemoList();+ const memoMetadataStore = useMemoMetadataStore();const [treeMode, setTreeMode] = useLocalStorage<boolean>("tag-view-as-tree", false);- const tagAmounts = Object.entries(tagStore.getState().tagAmounts)+ const tags = Object.entries(useMemoTagList()).sort((a, b) => a[0].localeCompare(b[0])).sort((a, b) => b[1] - a[1]);- useDebounce(- () => {- if (memoList.size() === 0) return;- fetchTags();- },- 300,- [memoList.size(), location.pathname],- );-- const fetchTags = async () => {- await tagStore.fetchTags({ user, location });- };-const handleTagClick = (tag: string) => {const isActive = memoFilterStore.getFiltersByFactor("tagSearch").some((filter) => filter.value === tag);if (isActive) {@@ -61,7 +46,7 @@ const TagsSection = (props: Props) => {parent: "memos/-",tag: tag,});- await tagStore.fetchTags({ location, user }, { skipCache: true });+ await memoMetadataStore.fetchMemoMetadata({ user, location });toast.success(t("message.deleted-successfully"));}};@@ -70,7 +55,7 @@ const TagsSection = (props: Props) => {<div className="flex flex-col justify-start items-start w-full mt-3 px-1 h-auto shrink-0 flex-nowrap hide-scrollbar"><div className="flex flex-row justify-between items-center w-full gap-1 mb-1 text-sm leading-6 text-gray-400 select-none"><span>{t("common.tags")}</span>- {tagAmounts.length > 0 && (+ {tags.length > 0 && (<Popover><PopoverTrigger><MoreVerticalIcon className="w-4 h-auto shrink-0 opacity-60" />@@ -84,12 +69,12 @@ const TagsSection = (props: Props) => {</Popover>)}</div>- {tagAmounts.length > 0 ? (+ {tags.length > 0 ? (treeMode ? (- <TagTree tagAmounts={tagAmounts} />+ <TagTree tagAmounts={tags} />) : (<div className="w-full flex flex-row justify-start items-center relative flex-wrap gap-x-2 gap-y-1">- {tagAmounts.map(([tag, amount]) => (+ {tags.map(([tag, amount]) => (<divkey={tag}className="shrink-0 w-auto max-w-full text-sm rounded-md leading-6 flex flex-row justify-start items-center select-none hover:opacity-80 text-gray-600 dark:text-gray-400 dark:border-zinc-800"diff --git a/web/src/components/MemoEditor/ActionButton/TagSelector.tsx b/web/src/components/MemoEditor/ActionButton/TagSelector.tsxindex 3c864e86a..ccfbc33f5 100644--- a/web/src/components/MemoEditor/ActionButton/TagSelector.tsx+++ b/web/src/components/MemoEditor/ActionButton/TagSelector.tsx@@ -3,9 +3,7 @@ import { HashIcon } from "lucide-react";import { useRef, useState } from "react";import useClickAway from "react-use/lib/useClickAway";import OverflowTip from "@/components/kit/OverflowTip";-import useAsyncEffect from "@/hooks/useAsyncEffect";-import useCurrentUser from "@/hooks/useCurrentUser";-import { useTagStore } from "@/store/v1";+import { useMemoTagList } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import { EditorRefActions } from "../Editor";@@ -16,21 +14,12 @@ interface Props {const TagSelector = (props: Props) => {const t = useTranslate();const { editorRef } = props;- const tagStore = useTagStore();const [open, setOpen] = useState(false);const containerRef = useRef<HTMLDivElement>(null);- const tags = tagStore.sortedTags();- const user = useCurrentUser();-- useAsyncEffect(async () => {- if (!open) return;-- try {- await tagStore.fetchTags({ user });- } catch (error) {- // do nothing.- }- }, [open]);+ const tags = Object.entries(useMemoTagList())+ .sort((a, b) => a[0].localeCompare(b[0]))+ .sort((a, b) => b[1] - a[1])+ .map(([tag]) => tag);useClickAway(containerRef, () => {setOpen(false);diff --git a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx b/web/src/components/MemoEditor/Editor/TagSuggestions.tsxindex e4f1847e3..cd0a57407 100644--- a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx+++ b/web/src/components/MemoEditor/Editor/TagSuggestions.tsx@@ -3,7 +3,7 @@ import Fuse from "fuse.js";import { useEffect, useRef, useState } from "react";import getCaretCoordinates from "textarea-caret";import OverflowTip from "@/components/kit/OverflowTip";-import { useTagStore } from "@/store/v1";+import { useMemoTagList } from "@/store/v1";import { EditorRefActions } from ".";type Props = {@@ -15,12 +15,13 @@ type Position = { left: number; top: number; height: number };const TagSuggestions = ({ editorRef, editorActions }: Props) => {const [position, setPosition] = useState<Position | null>(null);- const tagStore = useTagStore();- const tags = tagStore.sortedTags();-const [selected, select] = useState(0);const selectedRef = useRef(selected);selectedRef.current = selected;+ const tags = Object.entries(useMemoTagList())+ .sort((a, b) => a[0].localeCompare(b[0]))+ .sort((a, b) => b[1] - a[1])+ .map(([tag]) => tag);const hide = () => setPosition(null);diff --git a/web/src/components/RenameTagDialog.tsx b/web/src/components/RenameTagDialog.tsxindex 3d24ef266..4db50121a 100644--- a/web/src/components/RenameTagDialog.tsx+++ b/web/src/components/RenameTagDialog.tsx@@ -5,7 +5,7 @@ import { toast } from "react-hot-toast";import { memoServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import useLoading from "@/hooks/useLoading";-import { useTagStore } from "@/store/v1";+import { useMemoMetadataStore } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import { generateDialog } from "./Dialog";@@ -16,7 +16,7 @@ interface Props extends DialogProps {const RenameTagDialog: React.FC<Props> = (props: Props) => {const { tag, destroy } = props;const t = useTranslate();- const tagStore = useTagStore();+ const memoMetadataStore = useMemoMetadataStore();const [newName, setNewName] = useState(tag);const requestState = useLoading(false);const user = useCurrentUser();@@ -42,7 +42,7 @@ const RenameTagDialog: React.FC<Props> = (props: Props) => {newTag: newName,});toast.success("Rename tag successfully");- tagStore.fetchTags({ user }, { skipCache: true });+ memoMetadataStore.fetchMemoMetadata({ user });} catch (error: any) {console.error(error);toast.error(error.details);diff --git a/web/src/components/UserStatisticsView.tsx b/web/src/components/UserStatisticsView.tsxindex 9718737fc..c2c60d083 100644--- a/web/src/components/UserStatisticsView.tsx+++ b/web/src/components/UserStatisticsView.tsx@@ -19,15 +19,11 @@ import { memoServiceClient } from "@/grpcweb";import useAsyncEffect from "@/hooks/useAsyncEffect";import useCurrentUser from "@/hooks/useCurrentUser";import i18n from "@/i18n";-import { useMemoFilterStore, useMemoList, useMemoStore } from "@/store/v1";-import { MemoView } from "@/types/proto/api/v1/memo_service";+import { useMemoFilterStore, useMemoMetadataStore } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import ActivityCalendar from "./ActivityCalendar";import { Popover, PopoverContent, PopoverTrigger } from "./ui/Popover";-// Set the maximum number of memos to fetch.-const DEFAULT_MEMO_PAGE_SIZE = 1000000;-interface UserMemoStats {link: number;taskList: number;@@ -38,9 +34,9 @@ interface UserMemoStats {const UserStatisticsView = () => {const t = useTranslate();const currentUser = useCurrentUser();- const memoStore = useMemoStore();- const memoList = useMemoList();const memoFilterStore = useMemoFilterStore();+ const memoMetadataStore = useMemoMetadataStore();+ const metadataList = Object.values(memoMetadataStore.getState().dataMapByName);const [memoAmount, setMemoAmount] = useState(0);const [memoStats, setMemoStats] = useState<UserMemoStats>({ link: 0, taskList: 0, code: 0, incompleteTasks: 0 });const [activityStats, setActivityStats] = useState<Record<string, number>>({});@@ -49,14 +45,8 @@ const UserStatisticsView = () => {const days = Math.ceil((Date.now() - currentUser.createTime!.getTime()) / 86400000);useAsyncEffect(async () => {- if (memoList.size() === 0) return;-- const { memos } = await memoServiceClient.listMemos({- pageSize: DEFAULT_MEMO_PAGE_SIZE,- view: MemoView.MEMO_VIEW_METADATA_ONLY,- });const memoStats: UserMemoStats = { link: 0, taskList: 0, code: 0, incompleteTasks: 0 };- memos.forEach((memo) => {+ metadataList.forEach((memo) => {const { property } = memo;if (property?.hasLink) {memoStats.link += 1;@@ -72,9 +62,9 @@ const UserStatisticsView = () => {}});setMemoStats(memoStats);- setMemoAmount(memos.length);- setActivityStats(countBy(memos.map((memo) => dayjs(memo.displayTime).format("YYYY-MM-DD"))));- }, [memoStore.stateId]);+ setMemoAmount(metadataList.length);+ setActivityStats(countBy(metadataList.map((memo) => dayjs(memo.displayTime).format("YYYY-MM-DD"))));+ }, [memoMetadataStore.stateId]);const rebuildMemoProperty = async () => {await memoServiceClient.rebuildMemoProperty({diff --git a/web/src/store/v1/index.ts b/web/src/store/v1/index.tsindex 58215f435..9cc46daa2 100644--- a/web/src/store/v1/index.ts+++ b/web/src/store/v1/index.ts@@ -4,5 +4,5 @@ export * from "./inbox";export * from "./resourceName";export * from "./resource";export * from "./workspaceSetting";-export * from "./tag";export * from "./memoFilter";+export * from "./memoMetadata";diff --git a/web/src/store/v1/memoMetadata.ts b/web/src/store/v1/memoMetadata.tsnew file mode 100644index 000000000..2c92f3852--- /dev/null+++ b/web/src/store/v1/memoMetadata.ts@@ -0,0 +1,68 @@+import { uniqueId } from "lodash-es";+import { Location } from "react-router-dom";+import { create } from "zustand";+import { combine } from "zustand/middleware";+import { memoServiceClient } from "@/grpcweb";+import { Routes } from "@/router";+import { Memo, MemoView } from "@/types/proto/api/v1/memo_service";+import { User } from "@/types/proto/api/v1/user_service";++// Set the maximum number of memos to fetch.+const DEFAULT_MEMO_PAGE_SIZE = 1000000;++interface State {+ // stateId is used to identify the store instance state.+ // It should be update when any state change.+ stateId: string;+ dataMapByName: Record<string, Memo>;+}++const getDefaultState = (): State => ({+ stateId: uniqueId(),+ dataMapByName: {},+});++export const useMemoMetadataStore = create(+ combine(getDefaultState(), (set, get) => ({+ setState: (state: State) => set(state),+ getState: () => get(),+ fetchMemoMetadata: async (params: { user?: User; location?: Location<any> }) => {+ const filters = [`row_status == "NORMAL"`];+ if (params.user) {+ if (params.location?.pathname === Routes.EXPLORE) {+ filters.push(`visibilities == ["PUBLIC", "PROTECTED"]`);+ }+ filters.push(`creator == "${params.user.name}"`);+ } else {+ filters.push(`visibilities == ["PUBLIC"]`);+ }+ const { memos, nextPageToken } = await memoServiceClient.listMemos({+ filter: filters.join(" && "),+ view: MemoView.MEMO_VIEW_METADATA_ONLY,+ pageSize: DEFAULT_MEMO_PAGE_SIZE,+ });+ const memoMap = { ...get().dataMapByName };+ for (const memo of memos) {+ memoMap[memo.name] = memo;+ }+ set({ stateId: uniqueId(), dataMapByName: memoMap });+ return { memos, nextPageToken };+ },+ })),+);++export const useMemoTagList = () => {+ const memoStore = useMemoMetadataStore();+ const data = Object.values(memoStore.getState().dataMapByName);+ const tagAmounts: Record<string, number> = {};+ data.forEach((memo) => {+ memo.property?.tags.forEach((tag) => {+ if (tagAmounts[tag]) {+ tagAmounts[tag] += 1;+ } else {+ tagAmounts[tag] = 1;+ }+ });+ });+ return tagAmounts;+};diff --git a/web/src/store/v1/tag.ts b/web/src/store/v1/tag.tsdeleted file mode 100644index 8f989aa8d..000000000--- a/web/src/store/v1/tag.ts+++ /dev/null@@ -1,62 +0,0 @@-import { Location } from "react-router-dom";-import { create } from "zustand";-import { combine } from "zustand/middleware";-import { memoServiceClient } from "@/grpcweb";-import { Routes } from "@/router";-import { MemoView } from "@/types/proto/api/v1/memo_service";-import { User } from "@/types/proto/api/v1/user_service";--// Set the maximum number of memos to fetch.-const DEFAULT_MEMO_PAGE_SIZE = 1000000;--interface State {- tagAmounts: Record<string, number>;-}--const getDefaultState = (): State => ({- tagAmounts: {},-});--export const useTagStore = create(- combine(getDefaultState(), (set, get) => ({- setState: (state: State) => set(state),- getState: () => get(),- sortedTags: () => {- return Object.entries(get().tagAmounts)- .sort((a, b) => a[0].localeCompare(b[0]))- .sort((a, b) => b[1] - a[1])- .map(([tag]) => tag);- },- fetchTags: async (params: { user?: User; location?: Location<any> }, options?: { skipCache?: boolean }) => {- const { tagAmounts: cache } = get();- if (cache.length > 0 && !options?.skipCache) {- return cache;- }- const filters = [`row_status == "NORMAL"`];- if (params.user) {- if (params.location?.pathname === Routes.EXPLORE) {- filters.push(`visibilities == ["PUBLIC", "PROTECTED"]`);- }- filters.push(`creator == "${params.user.name}"`);- } else {- filters.push(`visibilities == ["PUBLIC"]`);- }- const { memos } = await memoServiceClient.listMemos({- pageSize: DEFAULT_MEMO_PAGE_SIZE,- filter: filters.join(" && "),- view: MemoView.MEMO_VIEW_METADATA_ONLY,- });- const tagAmounts: Record<string, number> = {};- memos.forEach((memo) => {- memo.property?.tags.forEach((tag) => {- if (tagAmounts[tag]) {- tagAmounts[tag] += 1;- } else {- tagAmounts[tag] = 1;- }- });- });- set({ tagAmounts });- },- })),-);