Merge in DNS/adguard-home from 1898-hide-private-key to master Squashed commit of the following: commit 542569bbc098541f8e191cc5c1e5509a65fe2c5f Merge: a07d715f756c7064Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 27 13:29:15 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit a07d715f0f0932fdad4ec3f1e1a265b43809e21b Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 19:45:39 2021 +0300 fix bug commit 9f2b70719a24aab827c2dc300fc94bf2202527a7 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 19:07:17 2021 +0300 fixes commit e79f0e620844531a737fff5a88f5c2cffc403f51 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:35:32 2021 +0300 more documentation to god of documentation commit 47790964ed05f50c075f6b6497b1517b0d974bea Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:23:08 2021 +0300 changed var named && fixed description commit d35de5a34eafb3ffbd1148982dd31735a2000377 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:11:13 2021 +0300 revert locales commit 514ab1a5d90039bf9aad1389dd0ed966fd1a7e65 Merge: 5d9b992a16092e8bAuthor: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 14:41:27 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit 5d9b992a236dec276a46a035509da6938a7da7bf Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 14:41:13 2021 +0300 here we go again commit 2e7b30df5f19953f4e055394083be62b23028ad6 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:11:49 2021 +0300 update deps commit 5e58c3e22a77c42f321deb9707f34f031b345d75 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:10:19 2021 +0300 small fix commit c2096377de0a8ecf4f36567322ad9171c5fb5ab2 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:07:45 2021 +0300 fixes && updated translations commit ada2d4784e6288b1740b8564b6ffc1ef8f0dcf68 Merge: dc5ce072550b1798Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 13:17:34 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit dc5ce0721b5c095ed79f2a302ad90d9616785f93 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 13 20:12:18 2021 +0300 tls: hide saved private key If private key saved as a string, then hide it from the answer to UI
78 lines
2.1 KiB
JavaScript
78 lines
2.1 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
|
|
import { Trans } from 'react-i18next';
|
|
import { getSourceData, getTrackerData } from '../../helpers/trackers/trackers';
|
|
import Tooltip from '../ui/Tooltip';
|
|
import { captitalizeWords } from '../../helpers/helpers';
|
|
|
|
const renderLabel = (value) => <strong><Trans>{value}</Trans></strong>;
|
|
|
|
const renderLink = ({ url, name }) => <a
|
|
className="tooltip-custom__content-link"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
href={url}
|
|
>
|
|
<strong>{name}</strong>
|
|
</a>;
|
|
|
|
const getTrackerInfo = (trackerData) => [{
|
|
key: 'name_table_header',
|
|
value: trackerData,
|
|
render: renderLink,
|
|
},
|
|
{
|
|
key: 'category_label',
|
|
value: captitalizeWords(trackerData.category),
|
|
render: renderLabel,
|
|
},
|
|
{
|
|
key: 'source_label',
|
|
value: getSourceData(trackerData),
|
|
render: renderLink,
|
|
}];
|
|
|
|
const DomainCell = ({ value }) => {
|
|
const trackerData = getTrackerData(value);
|
|
|
|
const content = trackerData && <div className="popover__list">
|
|
<div className="tooltip-custom__content-title mb-1">
|
|
<Trans>found_in_known_domain_db</Trans>
|
|
</div>
|
|
{getTrackerInfo(trackerData)
|
|
.map(({ key, value, render }) => <div
|
|
key={key}
|
|
className="tooltip-custom__content-item"
|
|
>
|
|
<Trans>{key}</Trans>: {render(value)}
|
|
</div>)}
|
|
</div>;
|
|
|
|
return (
|
|
<div className="logs__row">
|
|
<div className="logs__text" title={value}>
|
|
{value}
|
|
</div>
|
|
{trackerData
|
|
&& <Tooltip content={content} placement="top"
|
|
className="tooltip-container tooltip-custom--wide">
|
|
<svg className="icons icon--24 icon--green ml-1">
|
|
<use xlinkHref="#privacy" />
|
|
</svg>
|
|
</Tooltip>}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
DomainCell.propTypes = {
|
|
value: PropTypes.string.isRequired,
|
|
};
|
|
|
|
renderLink.propTypes = {
|
|
url: PropTypes.string.isRequired,
|
|
name: PropTypes.string.isRequired,
|
|
};
|
|
|
|
export default DomainCell;
|