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
feat: visibility click filter (#463)
Zeng1998d208731f5f10
diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsxindex dc1fc9b18..73e8a5a4b 100644--- a/web/src/components/Memo.tsx+++ b/web/src/components/Memo.tsx@@ -195,6 +195,15 @@ const Memo: React.FC<Props> = (props: Props) => {editorStateService.setEditMemoWithId(memo.id);};+ const handleMemoVisibilityClick = (visibility: Visibility) => {+ const currVisibilityQuery = locationService.getState().query?.visibility;+ if (currVisibilityQuery === visibility) {+ locationService.setMemoVisibilityQuery(undefined);+ } else {+ locationService.setMemoVisibilityQuery(visibility);+ }+ };+return (<div className={`memo-wrapper ${"memos-" + memo.id} ${memo.pinned ? "pinned" : ""}`} ref={memoContainerRef}>{memo.pinned && <div className="corner-container"></div>}@@ -204,7 +213,12 @@ const Memo: React.FC<Props> = (props: Props) => {{displayTimeStr}</span>{memo.visibility !== "PRIVATE" && !isVisitorMode && (- <span className={`status-text ${memo.visibility.toLocaleLowerCase()}`}>{memo.visibility}</span>+ <span+ className={`status-text ${memo.visibility.toLocaleLowerCase()}`}+ onClick={() => handleMemoVisibilityClick(memo.visibility)}+ >+ {memo.visibility}+ </span>)}</div>{!isVisitorMode && (diff --git a/web/src/components/MemoFilter.tsx b/web/src/components/MemoFilter.tsxindex 40b620d9e..f71fb241a 100644--- a/web/src/components/MemoFilter.tsx+++ b/web/src/components/MemoFilter.tsx@@ -9,9 +9,9 @@ import "../less/memo-filter.less";const MemoFilter = () => {const { t } = useTranslation();const query = useAppSelector((state) => state.location.query);- const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId } = query;+ const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId, visibility } = query;const shortcut = shortcutId ? shortcutService.getShortcutById(shortcutId) : null;- const showFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut);+ const showFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut || visibility);return (<div className={`filter-query-container ${showFilter ? "" : "!hidden"}`}>@@ -40,6 +40,14 @@ const MemoFilter = () => {><Icon.Box className="icon-text" /> {t(getTextWithMemoType(memoType as MemoSpecType))}</div>+ <div+ className={"filter-item-container " + (visibility ? "" : "!hidden")}+ onClick={() => {+ locationService.setMemoVisibilityQuery(undefined);+ }}+ >+ <Icon.Eye className="icon-text" /> {visibility}+ </div>{duration && duration.from < duration.to ? (<divclassName="filter-item-container"diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsxindex 1a727fcaa..161cf3143 100644--- a/web/src/components/MemoList.tsx+++ b/web/src/components/MemoList.tsx@@ -17,9 +17,9 @@ const MemoList = () => {const { memos, isFetching } = useAppSelector((state) => state.memo);const [isComplete, setIsComplete] = useState<boolean>(false);- const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId } = query ?? {};+ const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId, visibility } = query ?? {};const shortcut = shortcutId ? shortcutService.getShortcutById(shortcutId) : null;- const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut);+ const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut || visibility);const shownMemos =showMemoFilter || shortcut@@ -65,6 +65,9 @@ const MemoList = () => {if (textQuery && !memo.content.toLowerCase().includes(textQuery.toLowerCase())) {shouldShow = false;}+ if (visibility) {+ shouldShow = memo.visibility === visibility;+ }return shouldShow;})diff --git a/web/src/services/locationService.ts b/web/src/services/locationService.tsindex 65267c48a..a1e31d324 100644--- a/web/src/services/locationService.ts+++ b/web/src/services/locationService.ts@@ -59,6 +59,7 @@ const locationService = {duration: undefined,text: undefined,shortcutId: undefined,+ visibility: undefined,}));updateLocationUrl();@@ -116,6 +117,15 @@ const locationService = {);updateLocationUrl();},++ setMemoVisibilityQuery: (visibility?: Visibility) => {+ store.dispatch(+ setQuery({+ visibility: visibility,+ })+ );+ updateLocationUrl();+ },};export default locationService;diff --git a/web/src/store/modules/location.ts b/web/src/store/modules/location.tsindex 108014186..bba5a2b0c 100644--- a/web/src/store/modules/location.ts+++ b/web/src/store/modules/location.ts@@ -11,6 +11,7 @@ export interface Query {type?: MemoSpecType;text?: string;shortcutId?: ShortcutId;+ visibility?: Visibility;}interface State {@@ -52,6 +53,7 @@ const getStateFromLocation = () => {to,};}+ state.query.visibility = (urlParams.get("visibility") as Visibility) ?? undefined;}return state;