#559 feat : go back data update story curation community (#576)

* #559 feat : go back data update story curation community * #559 fix : go back getItem all
sdp-tech · Nov 17, 2023 · 6791820 · 6791820
1 parent 01190b6
commit 6791820
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/src/components/Community/CommunityList.jsx b/src/components/Community/CommunityList.jsx
@@ -119,7 +119,7 @@ export default function CommunityList({ board, format }) {
     setLoading(true);
     const response = await request.get("/community/posts/", {
       board: board,
-      query: search.trim(),
+      query: queryString.search,
       query_type: 'default',
       page: queryString.page,
       latest: 'true',
@@ -199,9 +199,10 @@ export default function CommunityList({ board, format }) {
   useEffect(() => {
     getItem();
     if (parseInt(queryString.page) !== page) setPage(parseInt(queryString.page));
+    if (queryString.search) setTempSearch(queryString.search);
     setMode(false);
     return () => setLoading(false);
-  }, [queryString.page, search, board]);
+  }, [queryString.page, search, board, queryString.search]);
   return (
     <>
       {mode ?

diff --git a/src/components/Curation/CurationListPage.jsx b/src/components/Curation/CurationListPage.jsx
@@ -236,7 +236,10 @@ const CurationListPage = () => {
       search: search.trim(),
     }, null);
     const basePath = orderList ? `/curation/curationlist` : `/curation/usercurationlist`
-    if(search) navigate(`${basePath}?page=1&search=${search}`, {state : {search: search.trim()}});
+    if(search) {
+      navigate(`${basePath}?page=1&search=${search}`);
+      localStorage.setItem('place_name', search);
+    }
     setLoading(false);
   };
 

diff --git a/src/components/Curation/components/CurationMoreView.jsx b/src/components/Curation/components/CurationMoreView.jsx
@@ -139,16 +139,16 @@ const CurationMoreView = () => {
   }
   const getList = async () => {
     let searched
-    if (location.state?.search) {
-      searched = location.state.search;
-      setSearch(location.state.search);
-      location.state.search = "";
+    if (localStorage.getItem('place_name')) {
+      searched = localStorage.getItem('place_name');
+      setTempSearch(searched);
+      localStorage.removeItem('place_name');
     } else {
       searched = search.trim();
     }
       const response = await request.get("/curations/admin_curations/", {
       page: queryString.page,
-      search: queryString.search || searched
+      search: queryString.search
     }, null);
       setItem(response.data.data.results);
       setPageCount(response.data.data.count);
@@ -158,10 +158,7 @@ const CurationMoreView = () => {
       const params = { page: page };
       if (search) params.search = search;
 
-      if (location.state?.name && page === 1) {
-        setSearch(location.state.name);
-        location.state.name = null;
-      } else if ((page===1 && search)||page !== 1) {
+      if ((page===1 && search)||page !== 1) {
         setSearchParams(params);
         setPageOneFlag(true);
       } else if (page === 1 && pageOneFlag) {
@@ -173,8 +170,9 @@ const CurationMoreView = () => {
   useEffect(() => {
     getList();
     if (parseInt(queryString.page) !== page) setPage(parseInt(queryString.page));
+    if (queryString.search) setTempSearch(queryString.search);
     checkSasmAdmin(token, setLoading, navigate).then((result) => setIsSasmAdmin(result));
-  }, [queryString.page, search]);
+  }, [queryString.page, search, queryString.search]);
 
   return (
     <>

diff --git a/src/components/Curation/components/CurationUserMoreView.jsx b/src/components/Curation/components/CurationUserMoreView.jsx
@@ -148,16 +148,16 @@ const CurationUserMoreView = () => {
   }
   const getList = async () => {
     let searched
-    if (location.state?.search) {
-      searched = location.state.search;
-      setSearch(location.state.search);
-      location.state.search = "";
+    if (localStorage.getItem('place_name')) {
+      searched = localStorage.getItem('place_name');
+      setTempSearch(searched);
+      localStorage.removeItem('place_name');
     } else {
       searched = search.trim();
     }
     const response = await request.get("/curations/verified_user_curations/", {
       page: queryString.page,
-      search: queryString.search || searched
+      search: queryString.search
     }, null);
     setItem(response.data.data.results);
     setPageCount(response.data.data.count);
@@ -168,10 +168,7 @@ const CurationUserMoreView = () => {
     const params = { page: page };
     if (search) params.search = search;
 
-    if (location.state?.name && page === 1) {
-      setSearch(location.state.name);
-      location.state.name = null;
-    } else if ((page===1 && search)||page !== 1) {
+    if ((page===1 && search)||page !== 1) {
       setSearchParams(params);
       setPageOneFlag(true);
     } else if (page === 1 && pageOneFlag) {
@@ -183,9 +180,10 @@ const CurationUserMoreView = () => {
   useEffect(() => {
     getList();
     if (parseInt(queryString.page) !== page) setPage(parseInt(queryString.page));
+    if (queryString.search) setTempSearch(queryString.search);
     checkVerfied();
     checkSasmAdmin(token, setLoading, navigate).then((result) => setIsSasmAdmin(result));
-  }, [queryString.page, search]);
+  }, [queryString.page, search, queryString.search]);
 
   return (
     <>

diff --git a/src/components/Story/StoryListPage.jsx b/src/components/Story/StoryListPage.jsx
@@ -170,8 +170,9 @@ const StoryListPage = () => {
   useEffect(() => {
     getList();
     if (parseInt(queryString.page) !== page) setPage(parseInt(queryString.page));
+    if (queryString.search) setTempSearch(queryString.search);
     checkSasmAdmin(token, setLoading, navigate).then((result) => setIsSasmAdmin(result));
-  }, [queryString.page, orderList, search]);
+  }, [queryString.page, orderList, queryString.search]);
 
   useEffect(() => {
   const params = { page: page };
@@ -198,7 +199,7 @@ const StoryListPage = () => {
   const getList = async () => {
     setSearchToggle(true);
     setLoading(true);
-    let searched = search && search.trim() || queryString.search;
+    let searched = queryString.search
     const order = orderList ? "latest" : "oldest";
     setSearch(searched);
     const response = await request.get("/stories/story_search/", {