Merge branch 'fix' into dev

go-cham · Aug 9, 2023 · 36c9cea · 36c9cea
2 parents 16cde56 + ab59e8a
commit 36c9cea
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/apis/hooks/posts/useEditPost.tsx b/src/apis/hooks/posts/useEditPost.tsx
@@ -10,14 +10,11 @@ export default function useEditPost() {
     mutationFn: async (data: EditPostRequest) => {
       const res = await axiosInstance.patch<EditPostResponse>(
         `/worries/${data.id}`,
-        data
+        data,
       );
       return res.data;
     },
     onSuccess: (data) => {
-      queryClient.refetchQueries({
-        queryKey: ['posts'],
-      });
       queryClient.refetchQueries({
         queryKey: ['post', data.id],
       });

diff --git a/src/pages/edit/EditPage.tsx b/src/pages/edit/EditPage.tsx
@@ -10,8 +10,10 @@ import LoadingSpinner from '@/components/ui/LoadingSpinner';
 import Popup from '@/components/ui/modal/Popup';
 import withAuth from '@/components/withAuth';
 import { PostFormData } from '@/types/post';
+import { useQueryClient } from '@tanstack/react-query';
 
 function EditPage() {
+  const queryClient = useQueryClient();
   const params = useParams();
   const [modalOpen, setModalOpen] = useState(false);
   const navigate = useNavigate();
@@ -33,7 +35,7 @@ function EditPage() {
         categoryId !== post.worryCategory.id ||
         images.length !== post.worryFiles.length ||
         !post.worryFiles.every((file) =>
-          images.map((image) => image.url).includes(file.url)
+          images.map((image) => image.url).includes(file.url),
         ))
     ) {
       setHasChanges(true);
@@ -71,7 +73,14 @@ function EditPage() {
 
   useEffect(() => {
     if (isSuccess && data) {
-      navigate(`/feed/${data.id}`);
+      queryClient
+        .refetchQueries({
+          queryKey: ['posts'],
+        })
+        .then(() => {
+          const to = localStorage.getItem('navAfterEdit');
+          navigate(`/feed/${data.id}${to ? `/${to}` : ''}`);
+        });
     }
   }, [isSuccess, data]);
 
@@ -84,7 +93,7 @@ function EditPage() {
           1000 -
           new Date(createdAt).getTime()) /
           1000 /
-          3600
+          3600,
       );
     }
   };

diff --git a/src/pages/feed/FeedPage.tsx b/src/pages/feed/FeedPage.tsx
@@ -27,7 +27,7 @@ function FeedPage() {
   });
   const { chooseOption } = useChooseOption();
   const [selectedVoteOptionId, setSelectedVoteOptionId] = useAtom(
-    selectedVoteOptionIdAtom
+    selectedVoteOptionIdAtom,
   );
   const setVoteAnimationId = useSetAtom(voteAnimationIdAtom);
   const scrollRef = useScrollRestoration<HTMLUListElement>('feed');
@@ -50,6 +50,10 @@ function FeedPage() {
     setSelectedVoteOptionId(null);
   }, []);
 
+  useEffect(() => {
+    localStorage.setItem('navAfterEdit', route || '');
+  }, []);
+
   return (
     <div className="flex h-full flex-col">
       <TopAppBar