Pull request: 3313 statistics settings UI

Closes #3313

Squashed commit of the following:

commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jul 14 15:53:18 2021 +0300

    Merge branch 'master' into 3313-statistics

commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 14 15:23:09 2021 +0300

    client: make client names clickable

commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 14 15:06:30 2021 +0300

    client: decreasing interval confirm, disabled stats message
This commit is contained in:
Ildar Kamalov
2021-07-14 16:01:12 +03:00
parent f4dde3f2c1
commit ebade2b6ce
6 changed files with 59 additions and 12 deletions

View File

@@ -3,7 +3,9 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { nanoid } from 'nanoid';
import classNames from 'classnames';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
import propTypes from 'prop-types';
import { checkFiltered, getBlockingClientName } from '../../../helpers/helpers';
import { BLOCK_ACTIONS } from '../../../helpers/constants';
import { toggleBlocking, toggleBlockingForClient } from '../../../actions';
@@ -192,12 +194,13 @@ const ClientCell = ({
{renderFormattedClientCell(client, clientInfo, isDetailed, true)}
</div>
{isDetailed && clientName && !whoisAvailable && (
<div
className="detailed-info d-none d-sm-block logs__text"
<Link
className="detailed-info d-none d-sm-block logs__text logs__text--link"
to={`logs?search=${encodeURIComponent(clientName)}`}
title={clientName}
>
{clientName}
</div>
</Link>
)}
</div>
{renderBlockingButton(isFiltered, domain)}

View File

@@ -51,6 +51,15 @@
color: #888888;
}
.logs__text--link {
color: #467fcf;
}
.logs__text--link:hover,
.logs__text--link:focus {
color: #295a9f;
}
.icon--selected {
background-color: var(--gray-f3);
border: solid 1px var(--gray-d8);