+ client: handle rewrite auto

This commit is contained in:
Ildar Kamalov
2020-03-19 16:09:17 +03:00
parent 2f9bc13ffd
commit c7f8f20aad
5 changed files with 29 additions and 3 deletions

View File

@@ -5,6 +5,7 @@ import { withNamespaces } from 'react-i18next';
import {
checkFiltered,
checkRewrite,
checkRewriteHosts,
checkBlackList,
checkNotFilteredNotFound,
checkWhiteList,
@@ -38,6 +39,10 @@ const getTitle = (reason, filterName, t, onlyFiltered) => {
return t('rewrite_applied');
}
if (checkRewriteHosts(reason)) {
return t('rewrite_hosts_applied');
}
if (checkBlackList(reason)) {
return filterName;
}
@@ -75,7 +80,7 @@ const getTitle = (reason, filterName, t, onlyFiltered) => {
const getColor = (reason) => {
if (checkFiltered(reason)) {
return 'red';
} else if (checkRewrite(reason)) {
} else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
return 'blue';
} else if (checkWhiteList(reason)) {
return 'green';

View File

@@ -12,6 +12,7 @@ import {
isToday,
checkFiltered,
checkRewrite,
checkRewriteHosts,
checkWhiteList,
checkBlackList,
checkBlockedService,
@@ -170,6 +171,7 @@ class Logs extends Component {
const isFiltered = checkFiltered(reason);
const isBlackList = checkBlackList(reason);
const isRewrite = checkRewrite(reason);
const isRewriteAuto = checkRewriteHosts(reason);
const isWhiteList = checkWhiteList(reason);
const isBlockedService = checkBlockedService(reason);
const isBlockedCnameIp = originalAnswer;
@@ -221,6 +223,13 @@ class Logs extends Component {
<Trans>rewrite_applied</Trans>
</strong>
)}
{isRewriteAuto && (
<span className="logs__text">
<strong>
<Trans>rewrite_hosts_applied</Trans>
</strong>
</span>
)}
</div>
<div className="logs__list-wrap">
{this.renderResponseList(responses, status)}
@@ -236,6 +245,15 @@ class Logs extends Component {
const { reason, domain } = original;
const isFiltered = checkFiltered(reason);
const isRewrite = checkRewrite(reason);
const isAutoRewrite = checkRewriteHosts(reason);
if (isAutoRewrite) {
return (
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
);
}
return (
<Fragment>
@@ -364,7 +382,7 @@ class Logs extends Component {
return {
className: 'green',
};
} else if (checkRewrite(reason)) {
} else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
return {
className: 'blue',
};