docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
export default withTranslation()(Modal);
<mask> t: PropTypes.func.isRequired, <mask> whitelist: PropTypes.bool, <mask> }; <mask> <mask> export default withNamespaces()(Modal); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1eb89586dd7126...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Modal.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderInputField, required, domain, answer } from '../../...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Form.js
import { renderInputField, required, domain, answer, } from '../../../helpers/form';
<mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderInputField, required, domain, answer } from '../../../helpers/form'; <mask> <mask> const Form = (props) => { <mask> const ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Form.js
withTranslation(),
<mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default flow([ <mask> withNamespaces(), <mask> reduxForm({ <mask> form: 'rewritesForm', <mask> enableReinitialize: true, <mask> }), <mask> ])(Form); </s> + client: Update packages - Merge pull request #613 in...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Form.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import ReactModal from 'react-modal'; <mask> <mask> import Form from './Form'; <mask> <mask> const Modal = (props) => { </s> + client: Update packages - Merge pull...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Modal.js
export default withTranslation()(Modal);
<mask> processingAdd: PropTypes.bool.isRequired, <mask> processingDelete: PropTypes.bool.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Modal); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the fol...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Modal.js
import { withTranslation } from 'react-i18next';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import ReactTable from 'react-table'; <mask> import { withNamespaces } from 'react-i18next'; <mask> <mask> class Table extends Component { <mask> cellWrap = ({ value }) => ( <mask> <div className="log...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Table.js
Cell: (value) => (
<mask> { <mask> Header: this.props.t('actions_table_header'), <mask> accessor: 'actions', <mask> maxWidth: 100, <mask> Cell: value => ( <mask> <div className="logs__row logs__row--center"> <mask> <button <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Table.js
onClick={() => this.props.handleDelete({ answer: value.row.answer, domain: value.row.domain, })
<mask> <div className="logs__row logs__row--center"> <mask> <button <mask> type="button" <mask> className="btn btn-icon btn-outline-secondary btn-sm" <mask> onClick={() => <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Table.js
export default withTranslation()(Table);
<mask> processingDelete: PropTypes.bool.isRequired, <mask> handleDelete: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Table); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the foll...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/Table.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React, { Component, Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> <mask> import Table from './Table'; <mask> import Modal from './Modal'; <mask> import Card from '../../ui/Card'; <mask> import PageTitle fro...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/index.js
export default withTranslation()(Rewrites);
<mask> deleteRewrite: PropTypes.func.isRequired, <mask> rewrites: PropTypes.object.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Rewrites); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the follow...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Rewrites/index.js
import { withTranslation, Trans } from 'react-i18next';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import ReactTable from 'react-table'; <mask> import { withNamespaces, Trans } from 'react-i18next'; <mask> import CellWrap from '../ui/CellWrap'; <mask> import { MODAL_TYPE } from '../../helpers/constants'; <mask> ...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Table.js
getDateCell = (row) => CellWrap(row, formatDetailedDateTime);
<mask> import { formatDetailedDateTime } from '../../helpers/helpers'; <mask> import { isValidAbsolutePath } from '../../helpers/form'; <mask> <mask> class Table extends Component { <mask> getDateCell = row => CellWrap(row, formatDetailedDateTime); <mask> <mask> renderCheckbox = ({ original }) => { <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Table.js
{isValidAbsolutePath(value) ? value : <a
<mask> accessor: 'url', <mask> minWidth: 200, <mask> Cell: ({ value }) => ( <mask> <div className="logs__row logs__row--overflow"> <mask> {isValidAbsolutePath(value) ? value : <mask> <a <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Table.js
Cell: (props) => props.value.toLocaleString(),
<mask> Header: <Trans>rules_count_table_header</Trans>, <mask> accessor: 'rulesCount', <mask> className: 'text-center', <mask> minWidth: 100, <mask> Cell: props => props.value.toLocaleString(), <mask> }, <mask> { <mask> Head...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Table.js
onClick={() => toggleFilteringModal({ type: MODAL_TYPE.EDIT, url: value, })
<mask> <button <mask> type="button" <mask> className="btn btn-icon btn-outline-primary btn-sm mr-2" <mask> title={t('edit_table_action')} <mask> onClick={() => <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Table.js
export default withTranslation()(Table);
<mask> t: PropTypes.func.isRequired, <mask> whitelist: PropTypes.bool, <mask> }; <mask> <mask> export default withNamespaces()(Table); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1eb89586dd7126...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Filters/Table.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import { NavLink } from 'react-router-dom'; <mask> import PropTypes from 'prop-types'; <mask> import enhanceWithClickOutside from 'react-click-outside'; <mask> import classnames from 'classnames'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> <mask> import { SETTINGS_URLS, FILTERS_...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/Menu.js
const isActivePage = Object.values(URLS).some((item) => item === pathname);
<mask> }; <mask> <mask> getActiveClassForDropdown = (URLS) => { <mask> const { pathname } = this.props.location; <mask> const isActivePage = Object.values(URLS).some(item => item === pathname); <mask> <mask> return isActivePage ? 'active' : ''; <mask> }; <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/Menu.js
}) => (
<mask> ); <mask> <mask> getDropdown = ({ <mask> label, order, URLS, icon, ITEMS, <mask> }) => <mask> ( <mask> <Dropdown <mask> label={this.props.t(label)} <mask> baseClassName={`dropdown nav-item order-${order}`} <mask> c...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/Menu.js
{ITEMS.map((item) => (
<mask> label={this.props.t(label)} <mask> baseClassName={`dropdown nav-item order-${order}`} <mask> controlClassName={`nav-link ${this.getActiveClassForDropdown(URLS)}`} <mask> icon={icon}> <mask> {ITEMS.map(item => ( <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/Menu.js
);
<mask> order, <mask> className: 'dropdown-item', <mask> })))} <mask> </Dropdown> <mask> ); <mask> <mask> render() { <mask> const menuClass = classnames({ <mask> 'header__column mobile-menu': true, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/Menu.js
{MENU_ITEMS.map((item) => (
<mask> return ( <mask> <Fragment> <mask> <div className={menuClass}> <mask> <ul className="nav nav-tabs border-0 flex-column flex-lg-row flex-nowrap"> <mask> {MENU_ITEMS.map(item => ( <mask> <li <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/Menu.js
export default withTranslation()(enhanceWithClickOutside(Menu));
<mask> location: PropTypes.object, <mask> t: PropTypes.func, <mask> }; <mask> <mask> export default withNamespaces()(enhanceWithClickOutside(Menu)); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit ...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/Menu.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React, { Component } from 'react'; <mask> import { Link } from 'react-router-dom'; <mask> import PropTypes from 'prop-types'; <mask> import classnames from 'classnames'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> <mask> import Menu from './Menu'; <mask> import logo from ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/index.js
this.setState((prevState) => ({ isMenuOpen: !prevState.isMenuOpen }));
<mask> isMenuOpen: false, <mask> }; <mask> <mask> toggleMenuOpen = () => { <mask> this.setState(prevState => ({ isMenuOpen: !prevState.isMenuOpen })); <mask> }; <mask> <mask> closeMenu = () => { <mask> this.setState({ isMenuOpen: false }); <mask> }; </s> + client...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/index.js
{!dashboard.processingProfile && dashboard.name && <a href="control/logout" className="btn btn-sm btn-outline-secondary">
<mask> closeMenu={this.closeMenu} <mask> /> <mask> <div className="header__column"> <mask> <div className="header__right"> <mask> {!dashboard.processingProfile && dashboard.name &...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/index.js
export default withTranslation()(Header);
<mask> getVersion: PropTypes.func.isRequired, <mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Header); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Header/index.js
import { withTranslation } from 'react-i18next';
<mask> import React, { Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { withNamespaces, Trans } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderInputField } from '../../../helpers/f...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/Filters/Form.js
}) => <Fragment> <div className="logs__input-wrap"> <input {...input} id={id} placeholder={placeholder} type={type} className={className} disabled={disabled} autoComplete={autoComplete} /> <span className="lo...
<mask> disabled, <mask> autoComplete, <mask> tooltip, <mask> meta: { touched, error }, <mask> }) => ( <mask> <Fragment> <mask> <div className="logs__input-wrap"> <mask> <input <mask> {...input} <mask> id={id} <mask> place...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/Filters/Form.js
{!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)} </div> </Fragment>; renderFilterField.propTypes = { input: PropTypes.object.isRequired, id: PropTypes.string.isRequired, className: PropTypes.string, placeholder: PropTyp...
<mask> /> <mask> <span className="logs__notice"> <mask> <Tooltip text={tooltip} type='tooltip-custom--logs' /> <mask> </span> <mask> {!disabled && <mask> touched && <mask> (error && <span className="form__message form...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/Filters/Form.js
{t('show_all_filter_type')}
<mask> component="select" <mask> className="form-control custom-select" <mask> > <mask> <option value={RESPONSE_FILTER.ALL}> <mask> <Trans>show_all_filter_type</Trans> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/Filters/Form.js
{t('show_filtered_type')}
<mask> <option value={RESPONSE_FILTER.ALL}> <mask> <Trans>show_all_filter_type</Trans> <mask> </option> <mask> <option value={RESPONSE_FILTER.FILTERED}> <mask> <Trans>show_filtered_type</...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/Filters/Form.js
withTranslation(),
<mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default flow([ <mask> withNamespaces(), <mask> reduxForm({ <mask> form: 'logsFilterForm', <mask> }), <mask> ])(Form); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to maste...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/Filters/Form.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import PropTypes from 'prop-types'; <mask> import ReactTable from 'react-table'; <mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import endsWith from 'lodash/endsWith'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import { HashLink as Link } from 'react-router-hash-lin...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
import { SERVICES, TABLE_DEFAULT_PAGE_SIZE, CUSTOM_FILTERING_RULES_ID, FILTERED, } from '../../helpers/constants';
<mask> checkWhiteList, <mask> checkBlackList, <mask> checkBlockedService, <mask> } from '../../helpers/helpers'; <mask> import { SERVICES, TABLE_DEFAULT_PAGE_SIZE, CUSTOM_FILTERING_RULES_ID, FILTERED } from '../../helpers/constants'; <mask> import { getTrackerData } from '../../helpers/trackers/tracke...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
renderTooltip = (isFiltered, rule, filter, service) => isFiltered && <PopoverFiltered rule={rule} filter={filter} service={service} />;
<mask> refreshLogs = () => { <mask> window.location.reload(); <mask> }; <mask> <mask> renderTooltip = (isFiltered, rule, filter, service) => <mask> isFiltered && <PopoverFiltered rule={rule} filter={filter} service={service} />; <mask> <mask> renderResponseList = (response, sta...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
getDateCell = (row) => CellWrap(
<mask> </div> <mask> ); <mask> } <mask> <mask> getDateCell = row => CellWrap( <mask> row, <mask> (isToday(row.value) ? formatTime : formatDateTime), <mask> formatDateTime, <mask> ); <mask> </s> + client: Update packages - Merge pull request #613 in DN...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
normalizeResponse = (response) => (
<mask> </div> <mask> ); <mask> }; <mask> <mask> normalizeResponse = response => ( <mask> response.map((response) => { <mask> const { value, type, ttl } = response; <mask> return `${type}: ${value} (ttl=${ttl})`; <mask> }) <mask> ); </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
const filter = filters.find((filter) => filter.id === filterId) || whitelistFilters.find((filter) => filter.id === filterId);
<mask> if (filterId === CUSTOM_FILTERING_RULES_ID) { <mask> return t('custom_filter_rules'); <mask> } <mask> <mask> const filter = filters.find(filter => filter.id === filterId) <mask> || whitelistFilters.find(filter => filter.id === filterId); <mask> let ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
const currentService = SERVICES.find((service) => service.id === original.serviceName);
<mask> const isBlockedCnameIp = originalAnswer; <mask> <mask> const filterKey = reason.replace(FILTERED, ''); <mask> const parsedFilteredReason = t('query_log_filtered', { filter: filterKey }); <mask> const currentService = SERVICES.find(service => service.id === original.serviceNa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
} if (checkWhiteList(reason)) {
<mask> if (checkFiltered(reason)) { <mask> return { <mask> className: 'red', <mask> }; <mask> } else if (checkWhiteList(reason)) { <mask> return { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
} if (checkRewrite(reason) || checkRewriteHosts(reason)) {
<mask> } else if (checkWhiteList(reason)) { <mask> return { <mask> className: 'green', <mask> }; <mask> } else if (checkRewrite(reason) || checkRewriteHosts(reason)) { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
export default withTranslation()(Logs);
<mask> setLogsPage: PropTypes.func.isRequired, <mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Logs); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1e...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Logs/index.js
import { withTranslation } from 'react-i18next';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { withNamespaces } from 'react-i18next'; <mask> import ReactTable from 'react-table'; <mask> <mask> import Card from '../../ui/Card'; <mask> import CellWrap from '../../ui/CellWrap'; <mask> </s> + client...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/AutoClients.js
accessor: (row) => this.props.normalizedTopClients.auto[row.ip] || 0,
<mask> Cell: whoisCell(this.props.t), <mask> }, <mask> { <mask> Header: this.props.t('requests_count'), <mask> accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0, <mask> sortMethod: (a, b) => b - a, <mask> id: 'statistics...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/AutoClients.js
export default withTranslation()(AutoClients);
<mask> autoClients: PropTypes.array.isRequired, <mask> normalizedTopClients: PropTypes.object.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(AutoClients); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/AutoClients.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React, { Component, Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import ReactTable from 'react-table'; <mask> <mask> import { MODAL_TYPE } from '../../../helpers/constants'; <mask> import { normalizeTextare...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
.filter((service) => values.blocked_services[service]);
<mask> if (values) { <mask> if (values.blocked_services) { <mask> config.blocked_services = Object <mask> .keys(values.blocked_services) <mask> .filter(service => values.blocked_services[service]); <mask> } <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
config.tags = values.tags.map((tag) => tag.value);
<mask> config.upstreams = []; <mask> } <mask> <mask> if (values.tags) { <mask> config.tags = values.tags.map(tag => tag.value); <mask> } else { <mask> config.tags = []; <mask> } <mask> } <mask> </s> + cl...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
getOptionsWithLabels = (options) => ( options.map((option) => ({ value: option, label: option }))
<mask> this.handleFormAdd(config); <mask> } <mask> }; <mask> <mask> getOptionsWithLabels = options => ( <mask> options.map(option => ({ value: option, label: option })) <mask> ); <mask> <mask> getClient = (name, clients) => { <mask> const client = clients....
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
const client = clients.find((item) => name === item.name);
<mask> options.map(option => ({ value: option, label: option })) <mask> ); <mask> <mask> getClient = (name, clients) => { <mask> const client = clients.find(item => name === item.name); <mask> <mask> if (client) { <mask> const { <mask> upstreams, ta...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
{value.map((address) => (
<mask> <mask> return ( <mask> <div className="logs__row logs__row--overflow"> <mask> <span className="logs__text"> <mask> {value.map(address => ( <mask> <div key={address} title={address}> <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
? value.map((service) => (
<mask> <mask> return ( <mask> <div className="logs__row logs__row--icons"> <mask> {value && value.length > 0 <mask> ? value.map(service => ( <mask> <svg <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
{value.map((tag) => (
<mask> <mask> return ( <mask> <div className="logs__row logs__row--overflow"> <mask> <span className="logs__text"> <mask> {value.map(tag => ( <mask> <div key={tag} title={tag} className="small"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
accessor: (row) => this.props.normalizedTopClients.configured[row.name] || 0,
<mask> }, <mask> { <mask> Header: this.props.t('requests_count'), <mask> id: 'statistics', <mask> accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, <mask> sortMethod: (a, b) => b - a, <mask> minWidth: 120, <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
onClick={() => toggleClientModal({ type: MODAL_TYPE.EDIT, name: clientName, })
<mask> <div className="logs__row logs__row--center"> <mask> <button <mask> type="button" <mask> className="btn btn-icon btn-outline-primary btn-sm mr-2" <mask> onClick={() => <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
export default withTranslation()(ClientsTable);
<mask> getStats: PropTypes.func.isRequired, <mask> supportedTags: PropTypes.array.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(ClientsTable); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the fol...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/ClientsTable.js
import { Field, FieldArray, reduxForm, formValueSelector, } from 'redux-form'; import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import { connect } from 'react-redux'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, FieldArray, reduxForm, formValueSelector } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mas...
[ "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
const renderFieldsWrapper = (placeholder, buttonTitle) => function cell(row) { const { fields, } = row; return ( <div className="form__group"> {fields.map((ip, index) => ( <div key={index} className="mb-1"> <Field name={...
<mask> return errors; <mask> }; <mask> <mask> <mask> const renderFieldsWrapper = (placeholder, buttonTitle) => <mask> function cell(row) { <mask> const { <mask> fields, <mask> } = row; <mask> return ( <mask> <div className="form__group"> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
onChange={(value) => input.onChange(value)}
<mask> {...input} <mask> options={options} <mask> className="basic-multi-select" <mask> classNamePrefix="select" <mask> onChange={value => input.onChange(value)} <mask> onBlur={() => input.onBlur(input.value)} <mask> placeholder=...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
renderMultiselect.propTypes = { input: PropTypes.object.isRequired, placeholder: PropTypes.string, options: PropTypes.object, };
<mask> /> <mask> ); <mask> }; <mask> <mask> let Form = (props) => { <mask> const { <mask> t, <mask> handleSubmit, <mask> reset, </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the foll...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
normalizeOnBlur={(data) => data.trim()}
<mask> component={renderInputField} <mask> type="text" <mask> className="form-control" <mask> placeholder={t('form_client_name')} <mask> normalizeOnBlur={data => data.trim()} ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
<a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag" key="0">link</a>,
<mask> </strong> <mask> </div> <mask> <div className="form__desc mt-0 mb-2"> <mask> <Trans components={[ <mask> <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Bloc...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
{settingsCheckboxes.map((setting) => (
<mask> </div> <mask> <mask> <Tabs controlClass="form"> <mask> <div label="settings" title={props.t('main_settings')}> <mask> {settingsCheckboxes.map(setting => ( <mask> <div className="form__group" key={settin...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
{SERVICES.map((service) => (
<mask> </button> <mask> </div> <mask> </div> <mask> <div className="services"> <mask> {SERVICES.map(service => ( <mask> <F...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
submitting || invalid || pristine || processingAdding || processingUpdating
<mask> <button <mask> type="submit" <mask> className="btn btn-success btn-standard" <mask> disabled={ <mask> submitting || <mask> invalid || <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
withTranslation(),
<mask> }; <mask> })(Form); <mask> <mask> export default flow([ <mask> withNamespaces(), <mask> reduxForm({ <mask> form: 'clientForm', <mask> enableReinitialize: true, <mask> validate, <mask> }), </s> + client: Update packages - Merge pull request #613 in DNS/adguard-h...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Form.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import ReactModal from 'react-modal'; <mask> <mask> import { MODAL_TYPE } from '../../../helpers/constants'; <mask> import Form from './Form'; <mask> </s> + client...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Modal.js
export default withTranslation()(Modal);
<mask> processingUpdating: PropTypes.bool.isRequired, <mask> tagsOptions: PropTypes.array.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Modal); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the fo...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/Modal.js
import { withTranslation } from 'react-i18next';
<mask> import React, { Component, Fragment } from 'react'; <mask> import { withNamespaces } from 'react-i18next'; <mask> import PropTypes from 'prop-types'; <mask> <mask> import ClientsTable from './ClientsTable'; <mask> import AutoClients from './AutoClients'; <mask> import PageTitle from '../../ui/PageTitle';...
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/index.js
export default withTranslation()(Clients);
<mask> getClients: PropTypes.func.isRequired, <mask> getStats: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Clients); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: ...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/index.js
return (
<mask> const whoisCell = t => <mask> function cell(row) { <mask> const { value } = row; <mask> <mask> return ( <mask> <div className="logs__row logs__row--overflow"> <mask> <span className="logs__text logs__text--wrap">{getFormattedWhois(value, t)}</span> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/whoisCell.js
); };
<mask> return ( <mask> <div className="logs__row logs__row--overflow"> <mask> <span className="logs__text logs__text--wrap">{getFormattedWhois(value, t)}</span> <mask> </div> <mask> ); <mask> }; <mask> <mask> export default whoisCell; </s> + client: ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Clients/whoisCell.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import { connect } from 'react-redux'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm, formValueSelector } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
import { renderInputField, required, ipv4, isPositive, toNumber, } from '../../../helpers/form';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderInputField, required, ipv4, isPositive, toNumber } from '../../../helpers/form'; <mask> <mask> const renderI...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
const renderInterfaces = ((interfaces) => (
<mask> import flow from 'lodash/flow'; <mask> <mask> import { renderInputField, required, ipv4, isPositive, toNumber } from '../../../helpers/form'; <mask> <mask> const renderInterfaces = (interfaces => ( <mask> Object.keys(interfaces).map((item) => { <mask> const option = interfaces[item]; <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
const onlyIPv6 = option.ip_addresses.every((ip) => ip.includes(':'));
<mask> const renderInterfaces = (interfaces => ( <mask> Object.keys(interfaces).map((item) => { <mask> const option = interfaces[item]; <mask> const { name } = option; <mask> const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':')); <mask> let interfaceIP = option.ip_...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
const renderInterfaceValues = ((interfaceValues) => (
<mask> ); <mask> }) <mask> )); <mask> <mask> const renderInterfaceValues = (interfaceValues => ( <mask> <ul className="list-unstyled mt-1 mb-0"> <mask> <li> <mask> <span className="interface__title">MTU: </span> <mask> {interfaceValues.mtu} <mask> </li>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
.map((ip) => <span key={ip} className="interface__ip">{ip}</span>)
<mask> <li> <mask> <span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span> <mask> { <mask> interfaceValues.ip_addresses <mask> .map(ip => <span key={ip} className="interface__ip">{ip}</span>) <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
Object.keys(fields).forEach((field) => change(field, fields[field]));
<mask> }; <mask> <mask> // eslint-disable-next-line no-alert <mask> if (window.confirm(t('dhcp_reset'))) { <mask> Object.keys(fields).forEach(field => change(field, fields[field])); <mask> resetDhcp(); <mask> } <mask> }; <mask> <mask> let Form = (props) => { </s> + client: U...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
{!processingInterfaces && interfaces && <div className="row">
<mask> } = props; <mask> <mask> return ( <mask> <form onSubmit={handleSubmit}> <mask> {!processingInterfaces && interfaces && <mask> <div className="row"> <mask> <div className="col-sm-12 col-md-6"> <mask> <div className="f...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
{interfaceValue && <div className="col-sm-12 col-md-6"> {interfaces[interfaceValue] && renderInterfaceValues(interfaces[interfaceValue])}
<mask> {renderInterfaces(interfaces)} <mask> </Field> <mask> </div> <mask> </div> <mask> {interfaceValue && <mask> <div className="col-sm-12 col-md-6"> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
withTranslation(),
<mask> }; <mask> })(Form); <mask> <mask> export default flow([ <mask> withNamespaces(), <mask> reduxForm({ form: 'dhcpForm' }), <mask> ])(Form); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Form.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import ReactTable from 'react-table'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import { SMALL_TABLE_DEFAULT_PAGE_SIZE } from '../../../helpers/constants'; <mask> <mask> class Leases ext...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Leases.js
export default withTranslation()(Leases);
<mask> leases: PropTypes.array, <mask> t: PropTypes.func, <mask> }; <mask> <mask> export default withNamespaces()(Leases); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1eb89586dd71260e561420fe66...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/Leases.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderInputField, ipv4, mac, required } from '../../../.....
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/Form.js
import { renderInputField, ipv4, mac, required, } from '../../../../helpers/form';
<mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderInputField, ipv4, mac, required } from '../../../../helpers/form'; <mask> <mask> const Form = (props) => { <mask> const { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/Form.js
withTranslation(),
<mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default flow([ <mask> withNamespaces(), <mask> reduxForm({ form: 'leaseForm' }), <mask> ])(Form); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/Form.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import ReactModal from 'react-modal'; <mask> <mask> import Form from './Form'; <mask> <mask> const Modal = (props) => { </s> + client: Update packages - Merge pull...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/Modal.js
export default withTranslation()(Modal);
<mask> toggleLeaseModal: PropTypes.func.isRequired, <mask> processingAdding: PropTypes.bool.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Modal); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the ...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/Modal.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React, { Component, Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import ReactTable from 'react-table'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import { SMALL_TABLE_DEFAULT_PAGE_SIZE } from '../../../../helpers/constants'; <mask> <mask> imp...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/index.js
onClick={() => this.handleDelete(ip, mac, hostname)
<mask> type="button" <mask> className="btn btn-icon btn-outline-secondary btn-sm" <mask> title={t('delete_table_action')} <mask> disabled={p...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/index.js
export default withTranslation()(StaticLeases);
<mask> processingDeleting: PropTypes.bool.isRequired, <mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(StaticLeases); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the follow...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/StaticLeases/index.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React, { Component, Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import classnames from 'classnames'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> <mask> import { DHCP_STATUS_RESPONSE } from '../../../helpers/constants'; <mask> import Form from...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/index.js
const otherDhcpFound = check && check.otherServer && check.otherServer.found === DHCP_STATUS_RESPONSE.YES;
<mask> getToggleDhcpButton = () => { <mask> const { <mask> config, check, processingDhcp, processingConfig, <mask> } = this.props.dhcp; <mask> const otherDhcpFound = <mask> check && check.otherServer && check.otherServer.found === DHCP_STATUS_RESPONSE.YES; <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/index.js
} if ( check.staticIP.static === DHCP_STATUS_RESPONSE.NO && check.staticIP.ip && interfaceName
<mask> </div> <mask> <hr className="mt-4 mb-4" /> <mask> </Fragment> <mask> ); <mask> } else if ( <mask> check.staticIP.static === DHCP_STATUS_RESPONSE.NO && <mask> check.staticIP.ip && <mask> interfa...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/index.js
export default withTranslation()(Dhcp);
<mask> t: PropTypes.func.isRequired, <mask> resetDhcp: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Dhcp); </s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1eb8...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dhcp/index.js
import { Trans, withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> import { renderTextareaField } from '../../../../helpers/form'; <mask> <...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/components/Settings/Dns/Access/Form.js