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
256 lines
8.1 KiB
TypeScript
256 lines
8.1 KiB
TypeScript
import React, { useEffect, useState } from 'react';
|
|
import { Trans } from 'react-i18next';
|
|
|
|
import Modal from 'react-modal';
|
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
|
|
|
import { useHistory } from 'react-router-dom';
|
|
import queryString from 'query-string';
|
|
import classNames from 'classnames';
|
|
import { FormProvider, useForm } from 'react-hook-form';
|
|
import { BLOCK_ACTIONS, DEFAULT_LOGS_FILTER, MEDIUM_SCREEN_SIZE } from '../../helpers/constants';
|
|
|
|
import Loading from '../ui/Loading';
|
|
|
|
import Filters from './Filters';
|
|
|
|
import Disabled from './Disabled';
|
|
import { getFilteringStatus } from '../../actions/filtering';
|
|
|
|
import { getClients } from '../../actions';
|
|
import { getDnsConfig } from '../../actions/dnsConfig';
|
|
import { getAccessList } from '../../actions/access';
|
|
import { getAllBlockedServices } from '../../actions/services';
|
|
import { getLogsConfig, resetFilteredLogs, setFilteredLogs, toggleDetailedLogs } from '../../actions/queryLogs';
|
|
|
|
import InfiniteTable from './InfiniteTable';
|
|
import './Logs.css';
|
|
import { BUTTON_PREFIX } from './Cells/helpers';
|
|
|
|
import AnonymizerNotification from './AnonymizerNotification';
|
|
import { RootState } from '../../initialState';
|
|
|
|
export type SearchFormValues = {
|
|
search: string;
|
|
response_status: string;
|
|
};
|
|
|
|
const processContent = (data: any, _buttonType: string) =>
|
|
Object.entries(data).map(([key, value]) => {
|
|
if (!value) {
|
|
return null;
|
|
}
|
|
|
|
const isTitle = value === 'title';
|
|
const isButton = key.startsWith(BUTTON_PREFIX);
|
|
const isBoolean = typeof value === 'boolean';
|
|
const isHidden = isBoolean && value === false;
|
|
|
|
let keyClass = 'key-colon';
|
|
|
|
if (isTitle) {
|
|
keyClass = 'title--border';
|
|
}
|
|
if (isButton || isBoolean) {
|
|
keyClass = '';
|
|
}
|
|
|
|
return isHidden ? null : (
|
|
<div className="grid__row" key={key}>
|
|
<div
|
|
className={classNames(`key__${key}`, keyClass, {
|
|
'font-weight-bold': isBoolean && value === true,
|
|
})}>
|
|
<Trans>{isButton ? value : key}</Trans>
|
|
</div>
|
|
|
|
<div className={`value__${key} text-pre text-truncate`}>
|
|
<Trans>{isTitle || isButton || isBoolean ? '' : value || '—'}</Trans>
|
|
</div>
|
|
</div>
|
|
);
|
|
});
|
|
|
|
const Logs = () => {
|
|
const dispatch = useDispatch();
|
|
const history = useHistory();
|
|
|
|
const { response_status: response_status_url_param, search: search_url_param } = queryString.parse(
|
|
history.location.search,
|
|
);
|
|
|
|
const {
|
|
enabled,
|
|
processingGetConfig,
|
|
processingGetLogs,
|
|
anonymize_client_ip: anonymizeClientIp,
|
|
} = useSelector((state: RootState) => state.queryLogs, shallowEqual);
|
|
|
|
const filter = useSelector((state: RootState) => state.queryLogs.filter, shallowEqual);
|
|
|
|
const logs = useSelector((state: RootState) => state.queryLogs.logs, shallowEqual);
|
|
|
|
const search = search_url_param || filter?.search || '';
|
|
const response_status = response_status_url_param || filter?.response_status || '';
|
|
|
|
const formMethods = useForm<SearchFormValues>({
|
|
mode: 'onBlur',
|
|
defaultValues: {
|
|
search: search || DEFAULT_LOGS_FILTER.search,
|
|
response_status: response_status || DEFAULT_LOGS_FILTER.response_status,
|
|
},
|
|
});
|
|
|
|
const { watch } = formMethods;
|
|
const currentQuery = watch('search');
|
|
|
|
const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth <= MEDIUM_SCREEN_SIZE);
|
|
const [detailedDataCurrent, setDetailedDataCurrent] = useState({});
|
|
const [buttonType, setButtonType] = useState(BLOCK_ACTIONS.BLOCK);
|
|
const [isModalOpened, setModalOpened] = useState(false);
|
|
const [isLoading, setIsLoading] = useState(false);
|
|
|
|
const closeModal = () => setModalOpened(false);
|
|
|
|
useEffect(() => {
|
|
(async () => {
|
|
setIsLoading(true);
|
|
await dispatch(
|
|
setFilteredLogs({
|
|
search,
|
|
response_status,
|
|
}),
|
|
);
|
|
setIsLoading(false);
|
|
})();
|
|
}, [response_status, search]);
|
|
|
|
const mediaQuery = window.matchMedia(`(max-width: ${MEDIUM_SCREEN_SIZE}px)`);
|
|
const mediaQueryHandler = (e: any) => {
|
|
setIsSmallScreen(e.matches);
|
|
if (e.matches) {
|
|
dispatch(toggleDetailedLogs(false));
|
|
} else {
|
|
dispatch(toggleDetailedLogs(true));
|
|
}
|
|
};
|
|
|
|
useEffect(() => {
|
|
try {
|
|
mediaQuery.addEventListener('change', mediaQueryHandler);
|
|
} catch (e1) {
|
|
try {
|
|
// Safari 13.1 do not support mediaQuery.addEventListener('change', handler)
|
|
mediaQuery.addListener(mediaQueryHandler);
|
|
} catch (e2) {
|
|
console.error(e2);
|
|
}
|
|
}
|
|
|
|
(async () => {
|
|
setIsLoading(true);
|
|
dispatch(getFilteringStatus());
|
|
dispatch(getClients());
|
|
dispatch(getAllBlockedServices());
|
|
try {
|
|
await Promise.all([dispatch(getLogsConfig()), dispatch(getDnsConfig()), dispatch(getAccessList())]);
|
|
} catch (err) {
|
|
console.error(err);
|
|
} finally {
|
|
setIsLoading(false);
|
|
}
|
|
})();
|
|
|
|
return () => {
|
|
try {
|
|
mediaQuery.removeEventListener('change', mediaQueryHandler);
|
|
} catch (e1) {
|
|
try {
|
|
// Safari 13.1 do not support mediaQuery.addEventListener('change', handler)
|
|
mediaQuery.removeListener(mediaQueryHandler);
|
|
} catch (e2) {
|
|
console.error(e2);
|
|
}
|
|
}
|
|
|
|
dispatch(resetFilteredLogs());
|
|
};
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
if (!history.location.search) {
|
|
(async () => {
|
|
setIsLoading(true);
|
|
|
|
await dispatch(setFilteredLogs());
|
|
setIsLoading(false);
|
|
})();
|
|
}
|
|
}, [history.location.search]);
|
|
|
|
const renderPage = () => (
|
|
<>
|
|
<FormProvider {...formMethods}>
|
|
<Filters
|
|
setIsLoading={setIsLoading}
|
|
processingGetLogs={processingGetLogs}
|
|
/>
|
|
</FormProvider>
|
|
|
|
<InfiniteTable
|
|
isLoading={isLoading}
|
|
items={logs}
|
|
isSmallScreen={isSmallScreen}
|
|
setDetailedDataCurrent={setDetailedDataCurrent}
|
|
setButtonType={setButtonType}
|
|
setModalOpened={setModalOpened}
|
|
currentQuery={currentQuery}
|
|
/>
|
|
|
|
<Modal
|
|
portalClassName="grid"
|
|
isOpen={isSmallScreen && isModalOpened}
|
|
onRequestClose={closeModal}
|
|
style={{
|
|
content: {
|
|
width: 'calc(100% - 32px)',
|
|
height: 'fit-content',
|
|
left: '50%',
|
|
top: 47,
|
|
padding: '0',
|
|
maxWidth: '720px',
|
|
transform: 'translateX(-50%)',
|
|
},
|
|
overlay: {
|
|
backgroundColor: 'rgba(0,0,0,0.5)',
|
|
},
|
|
}}>
|
|
<div className="logs__modal-wrap">
|
|
<svg className="icon icon--24 icon-cross d-block cursor--pointer" onClick={closeModal}>
|
|
<use xlinkHref="#cross" />
|
|
</svg>
|
|
|
|
{processContent(detailedDataCurrent, buttonType)}
|
|
</div>
|
|
</Modal>
|
|
</>
|
|
);
|
|
|
|
return (
|
|
<>
|
|
{enabled && (
|
|
<>
|
|
{processingGetConfig && <Loading />}
|
|
|
|
{anonymizeClientIp && <AnonymizerNotification />}
|
|
{!processingGetConfig && renderPage()}
|
|
</>
|
|
)}
|
|
|
|
{!enabled && !processingGetConfig && <Disabled />}
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default Logs;
|