From 76b72dce1c69079939a6b54fbe442744ce283678 Mon Sep 17 00:00:00 2001 From: andrei Date: Sun, 8 Jun 2025 14:37:31 +0500 Subject: [PATCH] =?UTF-8?q?refactor(useIssues):=20=D0=A3=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=B8=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?Issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Pages/IssuesPage/useIssues.js | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/web-app/src/Components/Pages/IssuesPage/useIssues.js b/web-app/src/Components/Pages/IssuesPage/useIssues.js index 24820a9..c1d71f6 100644 --- a/web-app/src/Components/Pages/IssuesPage/useIssues.js +++ b/web-app/src/Components/Pages/IssuesPage/useIssues.js @@ -13,9 +13,8 @@ import { setCurrentPage, setEndFilterDate, setPageSize, - setSearchText, + setViewMode, setStartFilterDate, - setViewMode } from "../../../Redux/Slices/lensIssuesSlice.js"; import {getCachedInfo} from "../../../Utils/cachedInfoUtils.js"; import dayjs from "dayjs"; @@ -24,7 +23,6 @@ import {useGetNotIssuedLensesQuery} from "../../../Api/lensesApi.js"; const useIssues = () => { const dispatch = useDispatch(); const { - searchText, currentPage, pageSize, selectedIssue, @@ -34,7 +32,7 @@ const useIssues = () => { endFilterDate, } = useSelector(state => state.lensIssuesUI); - const [tempSearchText, setTempSearchText] = useState(searchText); + const [tempSearchText, setTempSearchText] = useState(""); const { data: issuesData = {issues: [], total_count: 0}, @@ -45,7 +43,7 @@ const useIssues = () => { } = useGetLensIssuesQuery({ page: currentPage, pageSize, - search: searchText || undefined, + search: tempSearchText || undefined, // Используем tempSearchText напрямую sortOrder: 'desc', startDate: startFilterDate ? dayjs(startFilterDate).format('YYYY-MM-DD') : undefined, endDate: endFilterDate ? dayjs(endFilterDate).format('YYYY-MM-DD') : undefined, @@ -107,18 +105,12 @@ const useIssues = () => { const handleSetTempSearchText = (value) => { setTempSearchText(value); - handleSearch(); - }; - - const handleSearch = () => { - dispatch(setSearchText(tempSearchText)); - dispatch(setCurrentPage(1)); - refetch(); + dispatch(setCurrentPage(1)); // Сбрасываем на первую страницу + refetch(); // Обновляем данные при изменении поиска }; const handleClearSearch = () => { setTempSearchText(''); - dispatch(setSearchText('')); dispatch(setCurrentPage(1)); refetch(); }; @@ -202,8 +194,7 @@ const useIssues = () => { isLoading, isError, isProcessing: isAdding, - searchText, - tempSearchText, + tempSearchText, // Возвращаем только tempSearchText selectedIssue, isModalVisible, viewMode, @@ -220,7 +211,6 @@ const useIssues = () => { handleAddIssue, handlePaginationChange, handleSetTempSearchText, - handleSearch, handleClearSearch, handleSetViewMode, handleCloseModal,