- client: Clear input field when switching from logs page
Close #1523 Squashed commit of the following: commit 9ae9b0e480c2ec6bd835faf4caccacd8c1fdfe9f Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 3 17:56:34 2020 +0300 Setup babel and apply everywhere nullish coalescing and optional chaining operators commit 0966063842a79078e1d61a54c271e18c9427b2b1 Merge: 42a54f2b21dfb5ffAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 3 16:59:34 2020 +0300 Merge branch 'master' into fix/1523 commit 42a54f2ba0d8f5f4e4c04f16abc507b5d9009035 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 3 13:30:25 2020 +0300 Center mobile tooltip buttons commit 9cdd501a863b596f1d903f8dd3c449ffbe4c1604 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 3 13:21:37 2020 +0300 Add cross icon to clear input on click commit 1308b93c42ffea2ffb7457c34aef96e5cdaccaf2 Merge: 265fec7cda546790Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jun 29 19:42:04 2020 +0300 Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home commit 265fec7c72656b0c4738623cb470f1c14736230a Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jun 29 19:41:37 2020 +0300 - client: Clear input field when switching from logs page
This commit is contained in:
@@ -173,7 +173,7 @@ export const renderSelectField = ({
|
||||
</label>
|
||||
{!disabled
|
||||
&& touched
|
||||
&& (error && <span className="form__message form__message--error">{error}</span>)}
|
||||
&& error && <span className="form__message form__message--error">{error}</span>}
|
||||
</Fragment>;
|
||||
|
||||
renderSelectField.propTypes = {
|
||||
@@ -232,7 +232,7 @@ renderServiceField.propTypes = {
|
||||
// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
|
||||
export const required = (value) => {
|
||||
const formattedValue = typeof value === 'string' ? value.trim() : value;
|
||||
if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
|
||||
if (formattedValue || formattedValue === 0 || formattedValue?.length !== 0) {
|
||||
return undefined;
|
||||
}
|
||||
return <Trans>form_error_required</Trans>;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { Fragment } from 'react';
|
||||
import React from 'react';
|
||||
import { normalizeWhois } from './helpers';
|
||||
import { WHOIS_ICONS } from './constants';
|
||||
|
||||
@@ -11,12 +11,12 @@ const getFormattedWhois = (whois, t) => {
|
||||
return (
|
||||
<span className="logs__whois text-muted" key={key} title={t(key)}>
|
||||
{icon && (
|
||||
<Fragment>
|
||||
<>
|
||||
<svg className="logs__whois-icon icons">
|
||||
<use xlinkHref={`#${icon}`} />
|
||||
</svg>
|
||||
|
||||
</Fragment>
|
||||
</>
|
||||
)}{whoisInfo[key]}
|
||||
</span>
|
||||
);
|
||||
|
||||
@@ -142,7 +142,7 @@ export const addClientInfo = (data, clients, param) => (
|
||||
const info = clients.find((item) => item[clientIp]) || '';
|
||||
return {
|
||||
...row,
|
||||
info: (info && info[clientIp]) || '',
|
||||
info: info?.[clientIp] ?? '',
|
||||
};
|
||||
})
|
||||
);
|
||||
@@ -342,7 +342,7 @@ export const normalizeTopClients = (topClients) => topClients.reduce(
|
||||
|
||||
export const getClientInfo = (clients, ip) => {
|
||||
const client = clients
|
||||
.find((item) => item.ip_addrs && item.ip_addrs.find((clientIp) => clientIp === ip));
|
||||
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
|
||||
|
||||
if (!client) {
|
||||
return '';
|
||||
@@ -403,7 +403,7 @@ export const secondsToMilliseconds = (seconds) => {
|
||||
return seconds;
|
||||
};
|
||||
|
||||
export const normalizeRulesTextarea = (text) => text && text.replace(/^\n/g, '')
|
||||
export const normalizeRulesTextarea = (text) => text?.replace(/^\n/g, '')
|
||||
.replace(/\n\s*\n/g, '\n');
|
||||
|
||||
export const isVersionGreater = (currentVersion, previousVersion) => (
|
||||
@@ -415,7 +415,7 @@ export const normalizeWhois = (whois) => {
|
||||
const {
|
||||
city, country, ...values
|
||||
} = whois;
|
||||
let location = (country && country) || '';
|
||||
let location = country || '';
|
||||
|
||||
if (city && location) {
|
||||
location = `${location}, ${city}`;
|
||||
@@ -483,7 +483,7 @@ export const checkParental = (reason) => reason === FILTERED_STATUS.FILTERED_PAR
|
||||
export const checkBlockedService = (reason) => reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
|
||||
|
||||
export const getCurrentFilter = (url, filters) => {
|
||||
const filter = filters && filters.find((item) => url === item.url);
|
||||
const filter = filters?.find((item) => url === item.url);
|
||||
|
||||
if (filter) {
|
||||
const { enabled, name, url } = filter;
|
||||
|
||||
Reference in New Issue
Block a user