Merge pull request #56 from StarsbySea/search-bug-fix

Respect URL params & display correct bucket content
ScoopInstaller · May 6, 2023 · 6d45590 · 6d45590
2 parents c12c9b6 + ab859ed
commit 6d45590
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/components/Buckets.tsx b/src/components/Buckets.tsx
@@ -167,7 +167,7 @@ const Buckets = (): JSX.Element => {
                         <Link
                           to={{
                             pathname: '/apps',
-                            search: `?q="${encodeURIComponent(item.bucket)}"`,
+                            search: `?q="${encodeURIComponent(item.bucket)}"${item.official ? '' : '&o=false'}`,
                           }}
                         >
                           {Utils.extractPathFromUrl(item.bucket)}

diff --git a/src/components/Search.tsx b/src/components/Search.tsx
@@ -127,10 +127,12 @@ const Search = (): JSX.Element => {
   }, [getCurrentPageFromSearchParams]);
 
   useEffect(() => {
-    updateSearchParams(SEARCH_PARAM_SORT_INDEX, sortIndex.toString(), true);
-    updateSearchParams(SEARCH_PARAM_SORT_DIRECTION, sortDirection.toString(), true);
-    updateSearchParams(SEARCH_PARAM_FILTER_OFFICIALONLY, searchOfficialOnly.toString(), true);
-  }, [updateSearchParams, sortIndex, sortDirection, searchOfficialOnly]);
+    const sortIndexFromUrl = getSortIndexFromSearchParams();
+    const sortDirectionFromUrl = getSortDirectionFromSearchParams(sortIndexFromUrl);
+    setSortIndex(sortIndexFromUrl);
+    setSortDirection(sortDirectionFromUrl);
+    setSearchOfficialOnly(getSearchOfficialOnlyFromSearchParams());
+  }, [getSortIndexFromSearchParams, getSortDirectionFromSearchParams, getSearchOfficialOnlyFromSearchParams]);
 
   useEffect(() => {
     if (searchResults?.results && selectedResultId) {
@@ -190,11 +192,14 @@ const Search = (): JSX.Element => {
   );
 
   const handleSortChange = (newSortIndex: number, newSortDirection: SortDirection): void => {
+    updateSearchParams(SEARCH_PARAM_SORT_INDEX, newSortIndex.toString(), true);
+    updateSearchParams(SEARCH_PARAM_SORT_DIRECTION, newSortDirection.toString(), true);
     setSortIndex(newSortIndex);
     setSortDirection(newSortDirection);
   };
 
   const handleSearchOfficialOnlyChange = (newSearchOfficialOnly: boolean): void => {
+    updateSearchParams(SEARCH_PARAM_FILTER_OFFICIALONLY, newSearchOfficialOnly.toString(), true);
     setSearchOfficialOnly(newSearchOfficialOnly);
   };