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.

Sign up for GitHub

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

Jump to bottom

fix: 읽음 상태 전체 > 북마크 없음 워딩 수정 및 삭제, 북마크 읽음 상태 update 수정 #245

Merged
merged 2 commits into from
Aug 6, 2023
Merged

fix: 읽음 상태 전체 > 북마크 없음 워딩 수정 및 삭제, 북마크 읽음 상태 update 수정 #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf2959
fix: 북마크 읽음 상태 바뀌지 않던 오류와 삭제시 query update 되지 않던 오류 수정
ww8007 Aug 6, 2023
9bae473
fix: 읽음 상태 전체 > 북마크 없음에 대한 워딩 수정
ww8007 Aug 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 61 additions & 21 deletions src/bookmarks/api/bookmark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,13 @@ export const useDELETEBookMarkMutation = ({
return useMutation(DELETEBookMarkList.API, {
onSuccess: () => {
queryClient.refetchQueries(
GET_BOOKMARK_LIST(userId, false, categoryId ?? 0),
GET_BOOKMARK_LIST(userId, true, categoryId ?? 0),
);
queryClient.refetchQueries(
GET_BOOKMARK_LIST(userId, true, categoryId ?? 0),
GET_BOOKMARK_LIST(userId, null, categoryId ?? 0),
);
queryClient.refetchQueries(
GET_BOOKMARK_LIST(userId, false, categoryId ?? 0),
);
toast.fireToast({
message: '삭제 되었습니다',
Expand Down Expand Up @@ -664,25 +667,37 @@ export const refetchAllBookmarkQuery = ({
queryClient.setQueryData<InfiniteData<SeverBookMarkItem>>(
GET_BOOKMARK_LIST(memberId, false, 0),
(prev) => {
if (prev) {
if (!prev) return undefined;
return {
...prev,
pages: prev.pages.map((page) => ({
...page,
contents: page.contents.map((bookmark) => {
if (bookmark.bookmarkId === Number(bookmarkId)) {
return {
...bookmark,
readByUser: true,
};
}
return bookmark;
}),
})),
};
}
return prev;
return toggleBookmarkRead(prev, Number(bookmarkId));
},
);
queryClient.setQueryData<InfiniteData<SeverBookMarkItem>>(
GET_BOOKMARK_LIST(memberId, false, categoryId ?? 0),
(prev) => {
return toggleBookmarkRead(prev, Number(bookmarkId));
},
);
queryClient.setQueryData<InfiniteData<SeverBookMarkItem>>(
GET_BOOKMARK_LIST(memberId, true, 0),
(prev) => {
return toggleBookmarkRead(prev, Number(bookmarkId));
},
);
queryClient.setQueryData<InfiniteData<SeverBookMarkItem>>(
GET_BOOKMARK_LIST(memberId, true, categoryId ?? 0),
(prev) => {
return toggleBookmarkRead(prev, Number(bookmarkId));
},
);
queryClient.setQueryData<InfiniteData<SeverBookMarkItem>>(
GET_BOOKMARK_LIST(memberId, null, 0),
(prev) => {
return toggleBookmarkRead(prev, Number(bookmarkId));
},
);
queryClient.setQueryData<InfiniteData<SeverBookMarkItem>>(
GET_BOOKMARK_LIST(memberId, null, categoryId ?? 0),
(prev) => {
return toggleBookmarkRead(prev, Number(bookmarkId));
},
);
queryClient.refetchQueries(GET_BOOKMARK_LIST(memberId, true, 0));
Expand All @@ -699,6 +714,31 @@ export const refetchAllBookmarkQuery = ({
);
};

const toggleBookmarkRead = (
prev: InfiniteData<SeverBookMarkItem> | undefined,
bookmarkId: number,
) => {
if (prev) {
if (!prev) return undefined;
return {
...prev,
pages: prev.pages.map((page) => ({
...page,
contents: page.contents.map((bookmark) => {
if (bookmark.bookmarkId === Number(bookmarkId)) {
return {
...bookmark,
readByUser: true,
};
}
return bookmark;
}),
})),
};
}
return prev;
};

// 북마크 수정

interface PUTBookmarkRequest {
Expand Down
23 changes: 14 additions & 9 deletions src/bookmarks/ui/Main/BookmarkListView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,28 @@ import BookmarkItem from './BookmarkItem';
import BookmarkSkeletonItem from './BookmarkSkeletonItem';
import BlankItem from '@/common-ui/BlankItem';
import BookmarkEditItem from './BookmarkEditItem';
import {
READ_OPTION,
READ_OPTIONS,
} from '@/bookmarks/service/hooks/home/useReadList';

interface BookmarkListViewProps {
memberId: number;
isReadMode: boolean | null;
readMode: READ_OPTION;
isEditMode: boolean;
selectedCategory?: number | null;
onClickBookmarkItemInEdit?: (bookmarkId: number) => void;
}

const BookmarkListView = ({
memberId,
isReadMode,
readMode,
isEditMode,
selectedCategory,
onClickBookmarkItemInEdit,
}: BookmarkListViewProps) => {
const { bookMarkList, fetchNextPage, isFetchingNextPage } = useBookmarkList({
readByUser: isReadMode,
readByUser: READ_OPTIONS[readMode],
categoryId: selectedCategory,
memberId,
});
Expand All @@ -38,16 +42,17 @@ const BookmarkListView = ({
<>
{!flatBookMarkList?.length && (
<>
{!!isReadMode && <BlankItem page="BOOKMARK" />}
{!isReadMode && <BlankItem page="BOOKMARK_READ" />}
{readMode === '📖 전체' && <BlankItem page="BOOKMARK" />}
{readMode === '👀 읽음' && <BlankItem page="BOOKMARK" />}
{readMode === '🫣 읽지 않음' && <BlankItem page="BOOKMARK_READ" />}
</>
)}
{!isEditMode && !!flatBookMarkList?.length && (
<BookmarkList
bookmarkList={
isReadMode !== null
READ_OPTIONS[readMode] !== null
? flatBookMarkList.filter(
(bookmark) => bookmark.readByUser === isReadMode,
(bookmark) => bookmark.readByUser === READ_OPTIONS[readMode],
)
: flatBookMarkList
}
Expand All @@ -59,9 +64,9 @@ const BookmarkListView = ({
{!!isEditMode && !!flatBookMarkList?.length && (
<BookmarkList
bookmarkList={
isReadMode !== null
READ_OPTIONS[readMode] !== null
? flatBookMarkList.filter(
(bookmark) => bookmark.readByUser === isReadMode,
(bookmark) => bookmark.readByUser === READ_OPTIONS[readMode],
)
: flatBookMarkList
}
Expand Down
6 changes: 2 additions & 4 deletions src/pages/FriendBookmarkPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import styled from '@emotion/styled';
import BookmarkToggle from '@/bookmarks/ui/Main/BookmarkToggle';
import BookmarkUserInfo from '@/bookmarks/ui/BookmarkUserInfo';
import useCategory from '@/bookmarks/service/hooks/home/useCategory';
import useReadList, {
READ_OPTIONS,
} from '@/bookmarks/service/hooks/home/useReadList';
import useReadList from '@/bookmarks/service/hooks/home/useReadList';
import getRem from '@/utils/getRem';
import { useParams } from 'react-router-dom';
import Header from '@/common-ui/Header/Header';
Expand Down Expand Up @@ -149,7 +147,7 @@ const FriendBookmarkPage = () => {
<BookmarkListView
memberId={friendId ? Number(friendId) : 0}
isEditMode={false}
isReadMode={READ_OPTIONS[selectedReadOption ?? '📖 전체']}
readMode={selectedReadOption ?? '📖 전체'}
/>
</Suspense>
</LMiddle>
Expand Down
6 changes: 2 additions & 4 deletions src/pages/MainPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import BookmarkToggle from '@/bookmarks/ui/Main/BookmarkToggle';
import BookmarkUserInfo from '@/bookmarks/ui/BookmarkUserInfo';
import BookmarkBSDeleteConfirmation from '@/bookmarks/ui/Main/BookmarkBSDeleteConfirmation';
import useCategory from '@/bookmarks/service/hooks/home/useCategory';
import useReadList, {
READ_OPTIONS,
} from '@/bookmarks/service/hooks/home/useReadList';
import useReadList from '@/bookmarks/service/hooks/home/useReadList';
import useDeleteBookmarkList from '@/bookmarks/service/hooks/home/useDeleteBookmarkList';
import getRem from '@/utils/getRem';
import useAuthStore from '@/store/auth';
Expand Down Expand Up @@ -69,7 +67,7 @@ const MainPage = () => {
<BookmarkListView
memberId={memberId}
isEditMode={isEdit}
isReadMode={READ_OPTIONS[selectedReadOption ?? '📖 전체']}
readMode={selectedReadOption ?? '📖 전체'}
selectedCategory={selectedCategoryId}
onClickBookmarkItemInEdit={onClickBookmarkItemInEdit}
/>
Expand Down
Loading