category search fixes

client/src/routes/Search.tsx

@@ -39,24 +39,25 @@ export default class Search extends PureComponent<SearchProps, SearchState> {
     }
 
     public async componentDidMount() {
-        const searchTerm = await queryString.parse(this.props.location.search)
+        const { search } = this.props.location
-            .text
+        const { text, page, categories } = queryString.parse(search)
-        const searchPage = await queryString.parse(this.props.location.search)
-            .page
-        const searchCategories = await queryString.parse(
-            this.props.location.search
-        ).categories
 
-        if (searchTerm || searchCategories) {
+        if (text) {
+            await this.setState({
+                searchTerm: `${text}`
+            })
+        }
+
+        if (categories) {
             await this.setState({
                 searchTerm: encodeURIComponent(`${searchTerm}`),
-                searchCategories: `${searchCategories}`
+                searchCategories: `${categories}`
             })
         }
 
         // switch to respective page if query string is present
-        if (searchPage) {
+        if (page) {
-            const currentPage = Number(searchPage)
+            const currentPage = Number(page)
             await this.setState({ currentPage })
         }
 
@@ -67,12 +68,18 @@ export default class Search extends PureComponent<SearchProps, SearchState> {
         const { ocean } = this.context
         const { offset, currentPage, searchTerm, searchCategories } = this.state
 
+        const queryValues =
+            searchCategories !== '' && searchTerm !== ''
+                ? { text: [searchTerm], categories: [searchCategories] }
+                : searchCategories !== '' && searchTerm === ''
+                ? { categories: [searchCategories] }
+                : { text: [searchTerm] }
+
         const searchQuery = {
             offset,
             page: currentPage,
             query: {
-                text: [decodeURIComponent(searchTerm)],
+                ...queryValues,
-                categories: [decodeURIComponent(searchCategories)],
                 price: [-1, 1]
             },
             sort: {