diff --git a/src/pages/admin/hooks/useAdminFilters.ts b/src/pages/admin/hooks/useAdminFilters.ts index e6c2b5a..e85f3a1 100644 --- a/src/pages/admin/hooks/useAdminFilters.ts +++ b/src/pages/admin/hooks/useAdminFilters.ts @@ -1,44 +1,43 @@ -import { useState, useMemo } from 'react' -import type { FilterValues } from '@/components/Filters' -import type { GetAdminsParams } from '../types/Types' +import { useState, useMemo } from "react"; +import type { FilterValues } from "@/components/Filters"; +import type { GetAdminsParams } from "../types/Types"; -const DEFAULT_PAGE = 1 -const DEFAULT_LIMIT = 10 +const DEFAULT_PAGE = 1; +const DEFAULT_LIMIT = 10; export const useAdminFilters = () => { - const [filters, setFilters] = useState({}) - const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE) - const [limit] = useState(DEFAULT_LIMIT) + const [filters, setFilters] = useState({}); + const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE); + const [limit] = useState(DEFAULT_LIMIT); - const apiParams = useMemo(() => { - const params: GetAdminsParams = { - page: currentPage, - limit: limit, - } + const apiParams = useMemo(() => { + const params: GetAdminsParams = { + page: currentPage, + limit: limit, + }; - if (filters.search) { - params.search = filters.search - } - - return params - }, [filters, currentPage, limit]) - - const handleFiltersChange = (newFilters: FilterValues) => { - setFilters(newFilters) - setCurrentPage(DEFAULT_PAGE) + if (filters.search) { + params.search = filters.search as string; } - const handlePageChange = (page: number) => { - setCurrentPage(page) - } + return params; + }, [filters, currentPage, limit]); - return { - filters, - currentPage, - apiParams, - handleFiltersChange, - handlePageChange, - limit, - } -} + const handleFiltersChange = (newFilters: FilterValues) => { + setFilters(newFilters); + setCurrentPage(DEFAULT_PAGE); + }; + const handlePageChange = (page: number) => { + setCurrentPage(page); + }; + + return { + filters, + currentPage, + apiParams, + handleFiltersChange, + handlePageChange, + limit, + }; +}; diff --git a/src/pages/coupon/List.tsx b/src/pages/coupon/List.tsx index 35dc426..5663731 100644 --- a/src/pages/coupon/List.tsx +++ b/src/pages/coupon/List.tsx @@ -27,7 +27,7 @@ const CouponsList: FC = () => { const coupons = useMemo(() => couponsData?.data || [], [couponsData]) const filteredCoupons = useMemo(() => { - const searchValue = (filters.search || '').toLowerCase().trim() + const searchValue = (filters.search as string || '').toLowerCase().trim() const statusFilter = filters.status || 'all' const typeFilter = filters.type || 'all' diff --git a/src/pages/customers/List.tsx b/src/pages/customers/List.tsx index 8927d12..f40bb39 100644 --- a/src/pages/customers/List.tsx +++ b/src/pages/customers/List.tsx @@ -51,7 +51,7 @@ const CustomersList: FC = () => { const customers = useMemo(() => usersData?.data ?? [], [usersData]) const filteredCustomers = useMemo(() => { - const searchValue = (filters.search || '').toLowerCase().trim() + const searchValue = (filters.search as string || '').toLowerCase().trim() const statusFilter = filters.status || 'all' return customers.filter((customer) => { diff --git a/src/pages/food/hooks/useFoodFilters.ts b/src/pages/food/hooks/useFoodFilters.ts index adecf7e..2b9a231 100644 --- a/src/pages/food/hooks/useFoodFilters.ts +++ b/src/pages/food/hooks/useFoodFilters.ts @@ -1,44 +1,43 @@ -import { useState, useMemo } from 'react' -import type { FilterValues } from '@/components/Filters' -import type { GetFoodsParams } from '../types/Types' +import { useState, useMemo } from "react"; +import type { FilterValues } from "@/components/Filters"; +import type { GetFoodsParams } from "../types/Types"; -const DEFAULT_PAGE = 1 -const DEFAULT_LIMIT = 10 +const DEFAULT_PAGE = 1; +const DEFAULT_LIMIT = 10; export const useFoodFilters = () => { - const [filters, setFilters] = useState({}) - const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE) - const [limit] = useState(DEFAULT_LIMIT) + const [filters, setFilters] = useState({}); + const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE); + const [limit] = useState(DEFAULT_LIMIT); - const apiParams = useMemo(() => { - const params: GetFoodsParams = { - page: currentPage, - limit: limit, - } + const apiParams = useMemo(() => { + const params: GetFoodsParams = { + page: currentPage, + limit: limit, + }; - if (filters.search) { - params.search = filters.search - } - - return params - }, [filters, currentPage, limit]) - - const handleFiltersChange = (newFilters: FilterValues) => { - setFilters(newFilters) - setCurrentPage(DEFAULT_PAGE) + if (filters.search) { + params.search = filters.search as string; } - const handlePageChange = (page: number) => { - setCurrentPage(page) - } + return params; + }, [filters, currentPage, limit]); - return { - filters, - currentPage, - apiParams, - handleFiltersChange, - handlePageChange, - limit, - } -} + const handleFiltersChange = (newFilters: FilterValues) => { + setFilters(newFilters); + setCurrentPage(DEFAULT_PAGE); + }; + const handlePageChange = (page: number) => { + setCurrentPage(page); + }; + + return { + filters, + currentPage, + apiParams, + handleFiltersChange, + handlePageChange, + limit, + }; +}; diff --git a/src/pages/paymentMethods/hooks/usePaymentMethodFilters.ts b/src/pages/paymentMethods/hooks/usePaymentMethodFilters.ts index 08d29b9..0c33ab0 100644 --- a/src/pages/paymentMethods/hooks/usePaymentMethodFilters.ts +++ b/src/pages/paymentMethods/hooks/usePaymentMethodFilters.ts @@ -17,7 +17,7 @@ export const usePaymentMethodFilters = () => { }; if (filters.search) { - params.search = filters.search; + params.search = filters.search as string; } return params; diff --git a/src/pages/shipmentMethod/hooks/useShipmentMethodFilters.ts b/src/pages/shipmentMethod/hooks/useShipmentMethodFilters.ts index 2c541ff..9edff85 100644 --- a/src/pages/shipmentMethod/hooks/useShipmentMethodFilters.ts +++ b/src/pages/shipmentMethod/hooks/useShipmentMethodFilters.ts @@ -17,7 +17,7 @@ export const useShipmentMethodFilters = () => { }; if (filters.search) { - params.search = filters.search; + params.search = filters.search as string; } return params; @@ -41,4 +41,3 @@ export const useShipmentMethodFilters = () => { limit, }; }; -