back
deploy to danak / build_and_deploy (push) Has been cancelled

This commit is contained in:
hamid zarghami
2026-07-02 09:46:08 +03:30
parent 24b792fbf2
commit e322b18b5a
16 changed files with 44 additions and 79 deletions
-1
View File
@@ -108,7 +108,6 @@ const Filters: FC<FiltersProps> = ({
setFilters(defaultValues);
setInputValues(defaultInputs);
setMultiSelectValues(defaultMultiSelects);
onChange(defaultValues);
}
}
}, [fields, initialValues, onChange]);
+2 -2
View File
@@ -12,7 +12,7 @@ export const useUrlPagination = (defaultPage = 1) => {
}, [searchParams, defaultPage]);
const handlePageChange = useCallback(
(page: number) => {
(page: number, options?: { replace?: boolean }) => {
setSearchParams(
(prev) => {
const next = new URLSearchParams(prev);
@@ -23,7 +23,7 @@ export const useUrlPagination = (defaultPage = 1) => {
}
return next;
},
{ replace: false },
{ replace: options?.replace ?? false },
);
},
[setSearchParams, defaultPage],
+3 -6
View File
@@ -1,5 +1,6 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
import type { GetAdminsParams } from "../types/Types";
const DEFAULT_PAGE = 1;
@@ -7,7 +8,7 @@ const DEFAULT_LIMIT = 10;
export const useAdminFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const apiParams = useMemo<GetAdminsParams>(() => {
@@ -25,11 +26,7 @@ export const useAdminFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {
+3 -6
View File
@@ -1,4 +1,4 @@
import { type FC, useState } from 'react'
import { type FC } from 'react'
import Table from '@/components/Table'
import Filters from '@/components/Filters'
import Switch from '@/components/Switch'
@@ -8,6 +8,7 @@ import type { FilterValues } from '@/components/Filters'
import { Link } from 'react-router-dom'
import { Pages } from '@/config/Pages'
import { formatOptionalDate } from '@/helpers/func'
import { useUrlPagination } from '@/hooks/useUrlPagination'
interface CommentData extends RowDataType {
id: number
@@ -21,13 +22,9 @@ interface CommentData extends RowDataType {
}
const CommentsList: FC = () => {
const [currentPage, setCurrentPage] = useState(1)
const { currentPage, handlePageChange } = useUrlPagination()
const totalPages = 2
const handlePageChange = (page: number) => {
setCurrentPage(page)
}
const handleFiltersChange = (newFilters: FilterValues) => {
console.log('فیلترها:', newFilters)
}
+3 -6
View File
@@ -1,21 +1,18 @@
import { useState } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
const DEFAULT_PAGE = 1;
const DEFAULT_LIMIT = 10;
export const useCouponFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {
+3 -2
View File
@@ -71,10 +71,11 @@ const CustomersList: FC = () => {
const effectivePage = Math.min(currentPage, totalPages)
useEffect(() => {
if (isLoading) return
if (currentPage > totalPages) {
handlePageChange(totalPages)
handlePageChange(totalPages, { replace: true })
}
}, [currentPage, totalPages, handlePageChange])
}, [currentPage, totalPages, handlePageChange, isLoading])
const paginatedCustomers = useMemo(() => {
const startIndex = (effectivePage - 1) * limit
@@ -1,12 +1,13 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
const DEFAULT_PAGE = 1;
const DEFAULT_LIMIT = 10;
export const useNotificationFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const apiParams = useMemo(() => {
@@ -28,11 +29,7 @@ export const useNotificationFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {
+3 -2
View File
@@ -29,10 +29,11 @@ const OrdersList: FC = () => {
const effectivePage = Math.min(currentPage, totalPages)
useEffect(() => {
if (isLoading || !ordersData) return
if (currentPage > totalPages) {
handlePageChange(totalPages)
handlePageChange(totalPages, { replace: true })
}
}, [currentPage, totalPages, handlePageChange])
}, [currentPage, totalPages, handlePageChange, isLoading, ordersData])
return (
<div className='mt-5'>
+3 -6
View File
@@ -1,21 +1,18 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
const DEFAULT_PAGE = 1;
const DEFAULT_LIMIT = 10;
export const usePagerFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
const filteredData = useMemo(() => {
@@ -1,5 +1,6 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
import type { GetRestaurantPaymentMethodsParams } from "../types/Types";
const DEFAULT_PAGE = 1;
@@ -7,7 +8,7 @@ const DEFAULT_LIMIT = 10;
export const usePaymentMethodFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const apiParams = useMemo<GetRestaurantPaymentMethodsParams>(() => {
@@ -25,11 +26,7 @@ export const usePaymentMethodFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {
+3 -6
View File
@@ -1,5 +1,6 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
import type { GetProductsParams } from "../types/Types";
const DEFAULT_PAGE = 1;
@@ -7,7 +8,7 @@ const DEFAULT_LIMIT = 10;
export const useProductFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const apiParams = useMemo<GetProductsParams>(() => {
@@ -25,11 +26,7 @@ export const useProductFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {
+3 -6
View File
@@ -1,12 +1,13 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
const DEFAULT_PAGE = 1;
const DEFAULT_LIMIT = 10;
export const useReportFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const apiParams = useMemo(() => {
@@ -28,11 +29,7 @@ export const useReportFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {
+3 -6
View File
@@ -1,12 +1,13 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
const DEFAULT_PAGE = 1;
const DEFAULT_LIMIT = 10;
export const useReviewFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const apiParams = useMemo(() => {
@@ -32,11 +33,7 @@ export const useReviewFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {
+3 -6
View File
@@ -1,12 +1,13 @@
import { useState, useMemo } from 'react'
import type { FilterValues } from '@/components/Filters'
import { useUrlPagination } from '@/hooks/useUrlPagination'
const DEFAULT_PAGE = 1
const DEFAULT_LIMIT = 10
export const useRolesFilters = () => {
const [filters, setFilters] = useState<FilterValues>({})
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE)
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE)
const [limit] = useState(DEFAULT_LIMIT)
const apiParams = useMemo(() => {
@@ -24,11 +25,7 @@ export const useRolesFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters)
setCurrentPage(DEFAULT_PAGE)
}
const handlePageChange = (page: number) => {
setCurrentPage(page)
resetPage()
}
return {
@@ -1,12 +1,13 @@
import { useState, useMemo } from 'react'
import type { FilterValues } from '@/components/Filters'
import { useUrlPagination } from '@/hooks/useUrlPagination'
const DEFAULT_PAGE = 1
const DEFAULT_LIMIT = 10
export const useScheduleFilters = () => {
const [filters, setFilters] = useState<FilterValues>({})
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE)
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE)
const [limit] = useState(DEFAULT_LIMIT)
const apiParams = useMemo(() => {
@@ -24,11 +25,7 @@ export const useScheduleFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters)
setCurrentPage(DEFAULT_PAGE)
}
const handlePageChange = (page: number) => {
setCurrentPage(page)
resetPage()
}
return {
@@ -1,5 +1,6 @@
import { useState, useMemo } from "react";
import type { FilterValues } from "@/components/Filters";
import { useUrlPagination } from "@/hooks/useUrlPagination";
import type { GetRestaurantShipmentMethodsParams } from "../types/Types";
const DEFAULT_PAGE = 1;
@@ -7,7 +8,7 @@ const DEFAULT_LIMIT = 10;
export const useShipmentMethodFilters = () => {
const [filters, setFilters] = useState<FilterValues>({});
const [currentPage, setCurrentPage] = useState(DEFAULT_PAGE);
const { currentPage, handlePageChange, resetPage } = useUrlPagination(DEFAULT_PAGE);
const [limit] = useState(DEFAULT_LIMIT);
const apiParams = useMemo<GetRestaurantShipmentMethodsParams>(() => {
@@ -25,11 +26,7 @@ export const useShipmentMethodFilters = () => {
const handleFiltersChange = (newFilters: FilterValues) => {
setFilters(newFilters);
setCurrentPage(DEFAULT_PAGE);
};
const handlePageChange = (page: number) => {
setCurrentPage(page);
resetPage();
};
return {