From a26052ca9955e53a4b464378a50f2a2347e2dd5c Mon Sep 17 00:00:00 2001 From: Oleg Vavilov Date: Tue, 10 Jun 2025 23:16:24 +0300 Subject: [PATCH 1/3] Fixed defect #2752 --- frontend/src/hooks/useInfiniteScroll.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/frontend/src/hooks/useInfiniteScroll.ts b/frontend/src/hooks/useInfiniteScroll.ts index a6986a8226..9a4620248a 100644 --- a/frontend/src/hooks/useInfiniteScroll.ts +++ b/frontend/src/hooks/useInfiniteScroll.ts @@ -29,9 +29,7 @@ export const useInfiniteScroll = ({ const lastRequestParams = useRef(undefined); const [disabledMore, setDisabledMore] = useState(false); const { limit, ...argsProp } = args; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - const oldArgsProps = useRef>(argsProp); + const lastArgsProps = useRef>(null); const [getItems, { isLoading, isFetching }] = useLazyQuery({ ...args } as Args); @@ -57,13 +55,11 @@ export const useInfiniteScroll = ({ }; useEffect(() => { - if (!isEqual(argsProp, oldArgsProps.current)) { + if (!isEqual(argsProp, lastArgsProps.current)) { getEmptyList(); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - oldArgsProps.current = argsProp; + lastArgsProps.current = argsProp as Args; } - }, [argsProp, oldArgsProps]); + }, [argsProp, lastArgsProps]); const getMore = async () => { if (isLoadingRef.current || disabledMore) { @@ -72,6 +68,7 @@ export const useInfiniteScroll = ({ try { isLoadingRef.current = true; + console.log('test2'); const result = await getDataRequest({ ...argsProp, From a5b028adfadc3f2acb556f477c85f03a419c4472 Mon Sep 17 00:00:00 2001 From: Oleg Vavilov Date: Tue, 10 Jun 2025 23:44:03 +0300 Subject: [PATCH 2/3] Small fixes #2752 --- frontend/src/pages/Runs/List/hooks/useFilters.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/Runs/List/hooks/useFilters.ts b/frontend/src/pages/Runs/List/hooks/useFilters.ts index 70b87d0f30..951ceb35a5 100644 --- a/frontend/src/pages/Runs/List/hooks/useFilters.ts +++ b/frontend/src/pages/Runs/List/hooks/useFilters.ts @@ -136,7 +136,7 @@ export const useFilters = ({ localStorePrefix }: Args) => { ...params, only_active: onlyActive, }; - }, [propertyFilterQuery]); + }, [propertyFilterQuery, onlyActive]); return { filteringRequestParams, From 1dbc46e98f232d297b81d3e2aa3d6e07768ac6b5 Mon Sep 17 00:00:00 2001 From: Oleg Vavilov Date: Tue, 10 Jun 2025 23:45:24 +0300 Subject: [PATCH 3/3] Small fixes #2752 --- frontend/src/hooks/useInfiniteScroll.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/hooks/useInfiniteScroll.ts b/frontend/src/hooks/useInfiniteScroll.ts index 9a4620248a..f6db2fb8f3 100644 --- a/frontend/src/hooks/useInfiniteScroll.ts +++ b/frontend/src/hooks/useInfiniteScroll.ts @@ -68,7 +68,6 @@ export const useInfiniteScroll = ({ try { isLoadingRef.current = true; - console.log('test2'); const result = await getDataRequest({ ...argsProp,