YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: use username instead of uid (#1977)

Browse Source 
* #1916 replace userId to username

* resolve

---------

Co-authored-by: Александр Тумайкин <AATumaykin@tsum.ru>
This commit is contained in:
Alexandr Tumaykin
2023-07-20 14:48:39 +03:00
committed by GitHub
parent 336b32004d
commit f91f09adea
24 changed files with 189 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/components/MemoList.tsx
View File

@ -10,7 +10,12 @@ import Empty from "./Empty";
import Memo from "./Memo";
import "@/less/memo-list.less";
const MemoList = () => {
interface Props {
showCreator?: boolean;
}
const MemoList: React.FC<Props> = (props: Props) => {
const { showCreator } = props;
const t = useTranslate();
const memoStore = useMemoStore();
const userStore = useUserStore();
@ -20,7 +25,7 @@ const MemoList = () => {
const { memos, isFetching } = memoStore.state;
const [isComplete, setIsComplete] = useState<boolean>(false);
const currentUserId = userStore.getCurrentUserId();
const currentUsername = userStore.getCurrentUsername();
const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId, visibility } = filter;
const shortcut = shortcutId ? shortcutStore.getShortcutById(shortcutId) : null;
const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut || visibility);
@ -76,7 +81,7 @@ const MemoList = () => {
return shouldShow;
})
: memos
).filter((memo) => memo.creatorId === currentUserId && memo.rowStatus === "NORMAL");
).filter((memo) => memo.creatorUsername === currentUsername && memo.rowStatus === "NORMAL");
const pinnedMemos = shownMemos.filter((m) => m.pinned);
const unpinnedMemos = shownMemos.filter((m) => !m.pinned);
@ -103,7 +108,7 @@ const MemoList = () => {
console.error(error);
toast.error(error.response.data.message);
});
}, [currentUserId]);
}, [currentUsername]);
useEffect(() => {
const pageWrapper = document.body.querySelector(".page-wrapper");
@ -153,7 +158,7 @@ const MemoList = () => {
return (
<div className="memo-list-container">
{sortedMemos.map((memo) => (
<Memo key={`${memo.id}-${memo.displayTs}`} memo={memo} showVisibility />
<Memo key={`${memo.id}-${memo.displayTs}`} memo={memo} showVisibility showCreator={showCreator} />
))}
{isFetching ? (
<div className="status-text-container fetching-tip">