Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: visibility click filter #463

Merged
merged 3 commits into from
Nov 13, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion web/src/components/Memo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>}
Expand All @@ -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 && (
Expand Down
12 changes: 10 additions & 2 deletions web/src/components/MemoFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"}`}>
Expand Down Expand Up @@ -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.Globe className="icon-text" /> {visibility}
Zeng1998 marked this conversation as resolved.
Show resolved Hide resolved
</div>
{duration && duration.from < duration.to ? (
<div
className="filter-item-container"
Expand Down
7 changes: 5 additions & 2 deletions web/src/components/MemoList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -65,6 +65,9 @@ const MemoList = () => {
if (textQuery && !memo.content.toLowerCase().includes(textQuery.toLowerCase())) {
shouldShow = false;
}
if (visibility) {
shouldShow = memo.visibility === visibility;
}

return shouldShow;
})
Expand Down
10 changes: 10 additions & 0 deletions web/src/services/locationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const locationService = {
duration: undefined,
text: undefined,
shortcutId: undefined,
visibility: undefined,
})
);
updateLocationUrl();
Expand Down Expand Up @@ -113,6 +114,15 @@ const locationService = {
);
updateLocationUrl();
},

setMemoVisibilityQuery: (visibility?: Visibility) => {
store.dispatch(
setQuery({
visibility: visibility,
})
);
updateLocationUrl();
},
};

export default locationService;
2 changes: 2 additions & 0 deletions web/src/store/modules/location.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface Query {
type?: MemoSpecType;
text?: string;
shortcutId?: ShortcutId;
visibility?: Visibility;
}

interface State {
Expand Down Expand Up @@ -52,6 +53,7 @@ const getStateFromLocation = () => {
to,
};
}
state.query.visibility = (urlParams.get("visibility") as Visibility) ?? undefined;
}

return state;
Expand Down