Merge in DNS/adguard-home from ADG-9415 to master Squashed commit of the following: commit76bf99499aMerge:29529970a0389515eeAuthor: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 26 18:31:41 2025 +0300 Merge branch 'master' into ADG-9415 commit29529970a3Merge:b49790daf782a1a982Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 24 15:44:38 2025 +0300 Merge branch 'master' into ADG-9415 commitb49790daf8Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 15:30:18 2025 +0300 fix default lease duration value commitcb307472ecAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:35:26 2025 +0300 fix default response status commit115e743e1aAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:32:46 2025 +0300 fix upstream description commit26b0eddacaAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:40:41 2025 +0300 use const for test config file commit58faa7c537Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:31:04 2025 +0300 fix install config commit0a3346d911Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 17 15:25:23 2025 +0300 fix install check config commit17c4c26ea8Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 17:18:20 2025 +0300 fix query log commit14a2685ae3Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 15:52:36 2025 +0300 fix dhcp initial values commite7a8db7afdAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:37:24 2025 +0300 fix encryption form values commit1c8917f7acAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:07:29 2025 +0300 fix blocked services submit commit4dfa536ceaAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 13:50:47 2025 +0300 dns config ip validation commit4fee83fe13Author: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 12 17:49:54 2025 +0300 add playwright warning commit8c2f36e7a6Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 18:36:18 2025 +0300 fix config file name commit83db5f33dcAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 16:16:43 2025 +0300 temp config file commit9080c1620fAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 15:01:46 2025 +0300 update readme commitee1520307fMerge:fd12e33c02fe2d254bAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 14:44:06 2025 +0300 Merge branch 'master' into ADG-9415 commitfd12e33c06Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 10:29:43 2025 +0100 added typecheck on build, fixed eslint commitb3849eebc4Merge:225167a8b9bf3ee128Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 09:43:32 2025 +0100 Merge branch 'ADG-9415' of https://bit.int.agrd.dev/scm/dns/adguard-home into ADG-9415 ... and 94 more commits
105 lines
3.1 KiB
TypeScript
105 lines
3.1 KiB
TypeScript
import React, { Dispatch, SetStateAction, useCallback, useEffect, useRef } from 'react';
|
|
import { useDispatch, useSelector } from 'react-redux';
|
|
import { useTranslation } from 'react-i18next';
|
|
import throttle from 'lodash/throttle';
|
|
|
|
import Loading from '../ui/Loading';
|
|
|
|
import Header from './Cells/Header';
|
|
import { getLogs } from '../../actions/queryLogs';
|
|
|
|
import Row from './Cells';
|
|
|
|
import { isScrolledIntoView } from '../../helpers/helpers';
|
|
import { QUERY_LOGS_PAGE_LIMIT } from '../../helpers/constants';
|
|
import { RootState } from '../../initialState';
|
|
|
|
interface InfiniteTableProps {
|
|
isLoading: boolean;
|
|
items: unknown[];
|
|
isSmallScreen: boolean;
|
|
currentQuery: string;
|
|
setDetailedDataCurrent: Dispatch<SetStateAction<any>>;
|
|
setButtonType: (...args: unknown[]) => unknown;
|
|
setModalOpened: (...args: unknown[]) => unknown;
|
|
}
|
|
|
|
const InfiniteTable = ({
|
|
isLoading,
|
|
items,
|
|
isSmallScreen,
|
|
currentQuery,
|
|
setDetailedDataCurrent,
|
|
setButtonType,
|
|
setModalOpened,
|
|
}: InfiniteTableProps) => {
|
|
const { t } = useTranslation();
|
|
const dispatch = useDispatch();
|
|
const loader = useRef(null);
|
|
const loadingRef = useRef(null);
|
|
|
|
const isEntireLog = useSelector((state: RootState) => state.queryLogs.isEntireLog);
|
|
|
|
const processingGetLogs = useSelector((state: RootState) => state.queryLogs.processingGetLogs);
|
|
const loading = isLoading || processingGetLogs;
|
|
|
|
const listener = useCallback(() => {
|
|
if (!loadingRef.current && loader.current && isScrolledIntoView(loader.current)) {
|
|
dispatch(getLogs(currentQuery));
|
|
}
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
loadingRef.current = processingGetLogs;
|
|
}, [processingGetLogs]);
|
|
|
|
useEffect(() => {
|
|
listener();
|
|
}, [items.length < QUERY_LOGS_PAGE_LIMIT, isEntireLog]);
|
|
|
|
useEffect(() => {
|
|
const THROTTLE_TIME = 100;
|
|
const throttledListener = throttle(listener, THROTTLE_TIME);
|
|
|
|
window.addEventListener('scroll', throttledListener);
|
|
return () => {
|
|
window.removeEventListener('scroll', throttledListener);
|
|
};
|
|
}, []);
|
|
|
|
const renderRow = (row: any, idx: any) => (
|
|
<Row
|
|
key={idx}
|
|
rowProps={row}
|
|
isSmallScreen={isSmallScreen}
|
|
setDetailedDataCurrent={setDetailedDataCurrent}
|
|
setButtonType={setButtonType}
|
|
setModalOpened={setModalOpened}
|
|
/>
|
|
);
|
|
|
|
const isNothingFound = items.length === 0 && !processingGetLogs;
|
|
|
|
return (
|
|
<div className="logs__table" role="grid">
|
|
{loading && <Loading />}
|
|
|
|
<Header />
|
|
{isNothingFound ? (
|
|
<label className="logs__no-data">{t('nothing_found')}</label>
|
|
) : (
|
|
<>
|
|
{items.map(renderRow)}
|
|
{!isEntireLog && (
|
|
<div ref={loader} className="logs__loading text-center">
|
|
{t('loading_table_status')}
|
|
</div>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default InfiniteTable;
|