From b9d94ccd83dab245331d542e1eb33184275f9ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dro=C5=84?= <dron.official@yahoo.com>
Date: Tue, 26 Apr 2022 15:30:18 +0200
Subject: [PATCH] Trim queries with whitespace (#2002)

* Disable rank sorting when query is empty

* Trim query in handlers

* Fix crash on empty query
---
 src/products/views/ProductList/useSortRedirects.ts | 6 ++++--
 src/utils/handlers/filterHandlers.ts               | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/products/views/ProductList/useSortRedirects.ts b/src/products/views/ProductList/useSortRedirects.ts
index b1682a04e..24bc3dafe 100644
--- a/src/products/views/ProductList/useSortRedirects.ts
+++ b/src/products/views/ProductList/useSortRedirects.ts
@@ -14,6 +14,8 @@ export function useSortRedirects(
 ) {
   const navigate = useNavigator();
 
+  const hasQuery = !!params.query?.trim();
+
   useEffect(() => {
     const sortWithQuery = ProductListUrlSortField.rank;
     const sortWithoutQuery =
@@ -23,8 +25,8 @@ export function useSortRedirects(
     navigate(
       productListUrl({
         ...params,
-        asc: params.query ? false : params.asc,
-        sort: params.query ? sortWithQuery : sortWithoutQuery
+        asc: hasQuery ? false : params.asc,
+        sort: hasQuery ? sortWithQuery : sortWithoutQuery
       })
     );
   }, [params.query]);
diff --git a/src/utils/handlers/filterHandlers.ts b/src/utils/handlers/filterHandlers.ts
index d108fa9d8..b46686d28 100644
--- a/src/utils/handlers/filterHandlers.ts
+++ b/src/utils/handlers/filterHandlers.ts
@@ -62,7 +62,7 @@ function createFilterHandlers<
         after: undefined,
         before: undefined,
         activeTab: undefined,
-        query
+        query: query?.trim()
       })
     );
   };