From abe3e64883a2612fa56ca87d6a84e62df798381f Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Thu, 27 Jul 2023 12:00:22 +0300
Subject: [PATCH] Added initial loading setting Enabled pushing to history on
 filter setting

---
 front/src/hooks/useFetch.ts   | 10 +++++-----
 front/src/hooks/useFilters.ts |  6 +++---
 front/src/hooks/useSend.ts    |  3 ++-
 front/src/utils/filters.ts    |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/front/src/hooks/useFetch.ts b/front/src/hooks/useFetch.ts
index fdeda57..327ba63 100644
--- a/front/src/hooks/useFetch.ts
+++ b/front/src/hooks/useFetch.ts
@@ -19,16 +19,16 @@ type UseFetchErrored<T> = {
     data: undefined
 } & UseFetchShared<T>
 
-const gotError = <T>(res: UseFetchErrored<T> | UseFetchSucced<T>): res is UseFetchErrored<T> => (
+type UseFetchReturn<T> = UseFetchSucced<T> | UseFetchErrored<T>
+
+const gotError = <T>(res: UseFetchReturn<T>): res is UseFetchErrored<T> => (
     typeof res.error === 'string'
 )
 
-const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored<T>) => (
+const fallbackError = <T>(res: UseFetchReturn<T>) => (
     gotError(res) ? res.error : res.data
 )
 
-type UseFetchReturn<T> = UseFetchSucced<T> | UseFetchErrored<T>
-
 function useFetch<R, T>(
     url: string,
     method: RequestInit['method'],
@@ -40,7 +40,7 @@ function useFetch<R, T>(
 ): UseFetchReturn<T> {
     const [data, setData] = useState(initialData)
 
-    const { doSend, loading, error } = useSend(url, method, needAuth, guardResponse, processResponse, params)
+    const { doSend, loading, error } = useSend(url, method, needAuth, guardResponse, processResponse, true, params)
 
     useEffect(() => {
         doSend().then(
diff --git a/front/src/hooks/useFilters.ts b/front/src/hooks/useFilters.ts
index 2394b13..e6238c6 100644
--- a/front/src/hooks/useFilters.ts
+++ b/front/src/hooks/useFilters.ts
@@ -8,11 +8,11 @@ function useFilters(initialFilters: FiltersType = defaultFilters): [FiltersType,
 
     const [filters, setFilters] = useState(initialFilters)
 
-    const appendFiltersSearchParams = (filters: FiltersType) => (
+    const appendFiltersSearchParams = (filters: FiltersType, replace = false) => (
         setSearchParams(params => ({
             ...Object.fromEntries(params),
             ...URLEncodeFilters(filters)
-        }), { replace: true })
+        }), { replace })
     )
 
     useEffect(() => {
@@ -26,7 +26,7 @@ function useFilters(initialFilters: FiltersType = defaultFilters): [FiltersType,
         appendFiltersSearchParams({
             ...URLEncodeFilters(initialFilters),
             ...URLEncodeFilters(urlFilters),
-        })
+        }, true)
         // searchParams have actual query string at first render
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [])
diff --git a/front/src/hooks/useSend.ts b/front/src/hooks/useSend.ts
index 6928512..48345bd 100644
--- a/front/src/hooks/useSend.ts
+++ b/front/src/hooks/useSend.ts
@@ -10,9 +10,10 @@ function useSend<R, T>(
     needAuth: boolean,
     guardResponse: (data: unknown) => data is R,
     processResponse: (data: R) => T,
+    startWithLoading = false,
     defaultParams?: Omit<RequestInit, 'method'>
 ) {
-    const [loading, setLoading] = useState(false)
+    const [loading, setLoading] = useState(startWithLoading)
     const [error, setError] = useState<string | null>(null)
 
     const navigate = useNavigate()
diff --git a/front/src/utils/filters.ts b/front/src/utils/filters.ts
index 50039d6..df05a09 100644
--- a/front/src/utils/filters.ts
+++ b/front/src/utils/filters.ts
@@ -15,7 +15,7 @@ const URLEncodeFilters = (filters: FiltersType) => (
             fName => {
                 const v = filters[fName]
                 if (v) {
-                    return [fName, encodeURIComponent(v)]
+                    return [fName, v.toString()]
                 }
                 return [fName, undefined]
             }