Merge branch 'main' into profileDescCharLimit

SCCapstone · Apr 14, 2024 · 2d0521b · 2d0521b
2 parents 8d53a1d + 44c0a4c
commit 2d0521b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/FU.SPA/src/components/pages/Discover.jsx b/FU.SPA/src/components/pages/Discover.jsx
@@ -35,6 +35,8 @@ const paramKey = {
   games: 'games',
   tags: 'tags',
   page: 'page',
+  postSort: 'psort',
+  userSort: 'usort',
 };
 
 const paramToDayjs = (searchParams, paramKey) => {
@@ -49,7 +51,7 @@ export default function Discover() {
     Users: 'Users',
   };
 
-  const queryLimit = 10;
+  const queryLimit = 12;
   const [totalResults, setTotalResults] = useState(0);
   const [searchParams, setSearchParams] = useSearchParams();
   const initialTab = searchParams.get('o') || tabOptions.Posts;
@@ -78,8 +80,13 @@ export default function Discover() {
   const [gameOptions, setGameOptions] = useState([]);
   const [tagOptions, setTagOptions] = useState([]);
 
-  const [postSortOption, setPostSortOption] = useState(null);
-  const [userSortOption, setUserSortOption] = useState(null);
+  const [postSortOption, setPostSortOption] = useState(
+    searchParams.get(paramKey.postSort) ||
+      config.POST_SORT_OPTIONS[1].value + ':asc',
+  );
+  const [userSortOption, setUserSortOption] = useState(
+    searchParams.get(paramKey.userSort) || null,
+  );
 
   const [dateRangeRadioValue, setDateRangeRadioValue] = useState(() => {
     const paramValue = searchParams.get(paramKey.dateRadio);
@@ -168,6 +175,20 @@ export default function Discover() {
             params.set('o', tabOption);
           }
 
+          if (postSortOption) {
+            params.set(paramKey.postSort, postSortOption);
+          }
+
+          if (userSortOption) {
+            params.set(paramKey.userSort, userSortOption);
+          }
+
+          if (tabOption === tabOptions.Posts) {
+            params.delete(paramKey.userSort);
+          } else {
+            params.delete(paramKey.postSort);
+          }
+
           return params;
         },
         { replace: true },
@@ -316,6 +337,7 @@ export default function Discover() {
   const renderPostSortSelector = () => {
     return (
       <SortOptionsSelector
+        initialValue={postSortOption}
         options={config.POST_SORT_OPTIONS}
         onChange={(newValue) => {
           setPostSortOption(newValue);
@@ -328,6 +350,7 @@ export default function Discover() {
   const renderUserSortSelector = () => {
     return (
       <SortOptionsSelector
+        initialValue={userSortOption}
         options={config.USER_SORT_OPTIONS}
         onChange={(newValue) => {
           setUserSortOption(newValue);

diff --git a/FU.SPA/src/components/pages/Social.jsx b/FU.SPA/src/components/pages/Social.jsx
@@ -37,7 +37,7 @@ export default function Social() {
   const [searchText, setSearchText] = useState(searchParams.get('q') || '');
   const initialPage = parseInt(searchParams.get(paramKey.page), 10) || 1;
 
-  const queryLimit = 10;
+  const queryLimit = 12;
   const [totalResults, setTotalResults] = useState(0);
 
   const [posts, setPosts] = useState([]);
@@ -47,10 +47,12 @@ export default function Social() {
   const [page, setPage] = useState(initialPage);
 
   const [postSortOption, setPostSortOption] = useState(
-    searchParams.get('psort') || null,
+    searchParams.get('psort') ||
+      config.SOCIAL_POST_SORT_OPTIONS[1].value + ':asc',
   );
   const [userSortOption, setUserSortOption] = useState(
-    searchParams.get('usort') || null,
+    searchParams.get('usort') ||
+      config.SOCIAL_USER_SORT_OPTIONS[2].value + ':desc',
   );
 
   const { user } = useContext(UserContext);