solution

mate-academy · Jul 15, 2023 · 5bf523b · 5bf523b
1 parent 137e4d6
commit 5bf523b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/components/pages/DetailsPage/ProductDetailsPage.tsx b/src/components/pages/DetailsPage/ProductDetailsPage.tsx
@@ -1,4 +1,6 @@
-import { useEffect, useMemo, useState } from 'react';
+import {
+  useEffect, useMemo, useRef, useState,
+} from 'react';
 import { useParams } from 'react-router-dom';
 import classnames from 'classnames';
 import { Product } from '../../../utils/types/Product';
@@ -18,6 +20,7 @@ type Props = {
 export const ProductDetailsPage: React.FC<Props> = ({ products }) => {
   const [details, setDetails] = useState<Details>();
   const { id } = useParams();
+  const refPrevId = useRef('');
   const [isLoading, setIsLoading] = useState(false);
 
   const currentProduct = useMemo(() => {
@@ -30,7 +33,13 @@ export const ProductDetailsPage: React.FC<Props> = ({ products }) => {
     }, 100);
 
     getDetails(id)
-      .then((response) => setDetails(response))
+      .then((response) => {
+        setDetails(response);
+        refPrevId.current = window.location.hash;
+      })
+      .catch(() => {
+        (window.location.hash = refPrevId.current);
+      })
       .finally(() => {
         clearInterval(Id);
         setIsLoading(false);

diff --git a/src/utils/searchActions.ts b/src/utils/searchActions.ts
@@ -22,7 +22,8 @@ const SortList = (list: Product[], sortBy: string | null) => {
 const filterByQuery = (list: Product[], query: string) => {
   return list.filter(product => product.name
     .toLocaleLowerCase()
-    .replaceAll(' ', '').includes(query.toLocaleLowerCase()));
+    .replaceAll(' ', '').includes(query.toLocaleLowerCase()
+      .replaceAll(' ', '')));
 };
 
 const sliceProductList = (list: Product[], page: string, perPage: string) => {